4011 files changed, 0 insertions, 236765 deletions

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.editorconfig
deleted file mode 100644
index 3942fe21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[{src}/*]
-indent_style = space
-indent_size = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitattributes b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitattributes
deleted file mode 100644
index 5ef989a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitattributes
+++ /dev/null
@@ -1,13 +0,0 @@
-*                            text=auto
-
-tests/**                     -text
-
-src/**                       eol=lf
-scripts/**                   eol=lf
-
-tests/**/*.cfg               eol=lf
-
-tests/*.test                 eol=lf
-
-*.sh                         eol=lf
-*.bat                        eol=crlf
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/ISSUE_TEMPLATE b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/ISSUE_TEMPLATE
deleted file mode 100644
index d98e5cf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/ISSUE_TEMPLATE
+++ /dev/null
@@ -1,26 +0,0 @@
-[//]: # "  If the issue is connected to existing Uncrustify options please, if possible, add the"
-[//]: # "  following information to ease up the process:"
-[//]: # "  • a link to a debug file:"
-[//]: # "      generated with: 'uncrustify -p debug.txt -c pathToUsedConfig.cfg -f toBeFormatedFile.cpp' "
-[//]: # "      Example: [debug.txt](https://linkToTheFile)"
-[//]: # "      Example hosters for debug files: pastebin.com, gist.github.com, ..."
-[//]: # "      The used config file is included in the debug file and does not need to be included here."
-[//]: # 
-[//]: # "  • include a small but complete test file that will be uncrustifyed"
-[//]: # "  • include the generated results"
-[//]: # "  • include the expected results"
-[//]: # 
-[//]: # "  ✋ please add a line containing ``` above and below of each of those three code sections"
-[//]: # 
-[//]: # "  • include the current version of your Uncrustify executable"
-[//]: # "      printout via 'uncrustify -v'"
-[//]: # "      Example: current version: uncrustify 0.63"
-[//]: # "      or if possible additionally with the git sha of the commit"
-[//]: # "                    current version: uncrustify 0.63 dc7b412"
-[//]: # 
-[//]: # "  • if possible include a version that worked"
-[//]: # "      Example: working version: uncrustify 0.63"
-[//]: # "      or"
-[//]: # "                    working version: uncrustify 0.63 2a5e88f"
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/workflows/uncrustify_test.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/workflows/uncrustify_test.yml
deleted file mode 100644
index 8d2198ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/workflows/uncrustify_test.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-
-name: uncrustify_test
-on: [push]
-jobs:
-  check-uncrustify:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: cmake-part-and-tests
-        env:
-          BADGE: linux
-        run: mkdir build;
-          cd build;
-          cmake -DCMAKE_BUILD_TYPE=Release ..;
-          make;
-          ../scripts/run_ctest.py
-
-
-  debug-ninja-uncrustify:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: seanmiddleditch/gha-setup-ninja@master
-      - name: cmake-part-and-tests
-        env:
-          BADGE: linux
-        run: mkdir build;
-          cd build;
-          cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..;
-          ninja;
-          ../scripts/run_ctest.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitignore b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitignore
deleted file mode 100644
index 9fb21e7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitignore
+++ /dev/null
@@ -1,64 +0,0 @@
-# "Default" build tree
-/build/
-
-# PyCharm help directory
-venv/
-
-# Compiled Python code
-*.pyc
-
-# Testing framework (if run_tests.py is run from the source tree)
-results/
-results_2/
-
-# Static analysis and code coverage
-/tests/pclint/
-/cov-int
-gcov_test/
-
-# SlickEdit workspace history and tag files
-*.vtg
-*.vpwh*
-
-# for projects that use Waf for building: http://code.google.com/p/waf/
-.waf-*
-.lock*
-waf*
-
-# KDevelop
-*.kdev4
-.kdev4/
-
-# XCode
-*.xcodeproj/*.pbxuser
-*.xcodeproj/*.perspectivev3
-*.xcodeproj/*.mode1v3
-*.xcodeproj/*.tm_build_errors
-*.tmproj
-*.xcworkspace
-xcuserdata
-
-# Sublime
-*.sublime-workspace
-
-# Eclipse Configuration
-.cproject
-.project
-.settings
-
-# backup files
-#   texteditor (kate, etc.)
-*~
-#   git mergetool.keepBackup or KDiff3
-*.orig
-
-# uncrustified files
-*.uncrustify
-
-
-# CLion
-.idea/
-cmake-build-*/
-
-# Vim
-*.swp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.travis.yml
deleted file mode 100644
index a3bfcf7a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.travis.yml
+++ /dev/null
@@ -1,188 +0,0 @@
-language: cpp
-sudo: false
-
-matrix:
-  include:
-
-    # bionic 18
-    # 2
-    - os: linux
-      dist: Bionic
-      env: BADGE=linux BUILD_TYPE=debug
-      addons:
-        apt:
-          update: true
-          packages:
-            - ninja-build
-
-    # Clang 4.0 address sanitizer
-    # 3
-    - os: linux
-      dist: Bionic
-      env: BADGE=linux BUILD_TYPE=asan C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-4.0
-          packages:
-            - clang-4.0
-
-    # GCC 6
-    # 4
-    - os: linux
-      dist: Bionic
-      env: BADGE=linux C_COMPILER=gcc-6 CXX_COMPILER=g++-6
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-6
-            - g++-6
-            - ninja-build
-
-    # OSX
-    # 5
-    - os: osx
-      env: BADGE=osx BUILD_TYPE=debug
-
-    # 6
-    - os: osx
-      env: BADGE=osx BUILD_TYPE=release
-
-    # focal 20
-    # 7
-    - os: linux
-      dist: focal
-      env: BADGE=linux BUILD_TYPE=debug
-      addons:
-        apt:
-          update: true
-          packages:
-            - ninja-build
-
-    # 8
-    - os: linux
-      dist: focal
-      env: BADGE=linux BUILD_TYPE=release
-      addons:
-        apt:
-          update: true
-          packages:
-            - ninja-build
-
-    # 9
-    - os: linux
-      dist: focal
-      env: BADGE=linux BUILD_TYPE=release NO_MACRO_VARARG=1
-
-    ### Clang address sanitizer
-    ### 10
-    ##- os: linux
-    ##  dist: focal
-    ##  env: BADGE=linux BUILD_TYPE=asan C_COMPILER=clang-12.0 CXX_COMPILER=clang++-12.0
-    ##  addons:
-    ##    apt:
-    ##      sources:
-    ##        - ubuntu-toolchain-r-test
-    ##        - llvm-toolchain-precise-12.0
-    ##      packages:
-    ##        - clang-12.0
-
-    # mingw-w64 Win64 cross-compile
-    # 11
-    - os: linux
-      dist: focal
-      env: BADGE=linux BUILD_TYPE=cross C_COMPILER=x86_64-w64-mingw32-gcc CXX_COMPILER=x86_64-w64-mingw32-g++
-      addons:
-        apt:
-          packages:
-            - mingw-w64
-            - binutils-mingw-w64
-            - binutils-mingw-w64-i686
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64
-            - gcc-mingw-w64-i686
-            - gcc-mingw-w64-x86-64
-            - g++-mingw-w64
-            - g++-mingw-w64-i686
-            - g++-mingw-w64-x86-64
-
-    # 12
-    - os: linux
-      dist: focal
-      env: BUILD_TYPE=coverage COVERALLS_TOKEN="Dy94SOU3ajc1VbIy1wnWaNaeIUzfgdtEg"
-      compiler: gcc
-
-branches:
-  only:
-  - master
-
-before_install:
-  - |
-    if [ "x${BUILD_TYPE}" == "xcoverage" ]; then
-      sudo apt-get update
-      sudo apt-get install -qy python3-pip lcov
-      pip3 install --user --upgrade setuptools
-      pip3 install --user --upgrade pip
-      pip3 install --user PyYAML
-      pip3 install --user --upgrade cpp-coveralls
-    fi
-  - if [ -n "${C_COMPILER}" ]; then export CC="${C_COMPILER}"; fi
-  - if [ -n "${CXX_COMPILER}" ]; then export CXX="${CXX_COMPILER}"; fi
-  - ${CXX} --version
-  - cmake --version
-  - mkdir build
-  - cd build
-  - type -p ninja && export GENERATOR=-GNinja || true
-
-before_script:
-  # to stop the script after an error/warning
-  - set -e
-  # workarounds for OSX traivs build failure issues:
-  # 1. rvm overrides cd with a function so that it can hook into it to run some scripts from the new
-  # working directory. The workaround is to revert it to the builtin shell one.
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then unset -f cd; fi
-  # 2. Redefine shell_session_update as a dummy function to avoid travis error:
-  # /Users/travis/.rvm/scripts/functions/support: line 57: shell_session_update: command not found.
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then shell_session_update() { :; }; fi
-  # prepare make files with cmake
-  - |-
-    case "${BUILD_TYPE}" in
-      "coverage")
-        cmake ${GENERATOR} -DCMAKE_BUILD_TYPE=Debug -DENABLE_CODECOVERAGE=ON ..
-        ;;
-      "asan")
-        cmake ${GENERATOR} -DCMAKE_BUILD_TYPE=Debug -DENABLE_SANITIZER=address ..
-        ;;
-      "ubsan")
-        cmake ${GENERATOR} -DCMAKE_BUILD_TYPE=Debug -DENABLE_SANITIZER=undefined ..
-        ;;
-      "cross")
-        cmake ${GENERATOR} -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw64.cmake -DCMAKE_EXE_LINKER_FLAGS="-static -s" ..
-        ;;
-      "release")
-        cmake ${GENERATOR} -DCMAKE_BUILD_TYPE=Release ..
-        ;;
-      *)
-        cmake ${GENERATOR} ..
-        ;;
-    esac
-
-
-script:
-  # build
-  - if [ -f build.ninja ]; then ninja -v; else make VERBOSE=1; fi
-  # run all tests
-  - if [ "x${BUILD_TYPE}" != "xcross" ]; then ../scripts/run_ctest.py; fi
-  # collect coverage (needs to be after running tests)
-  - if [ "x${BUILD_TYPE}" == "xcoverage" ]; then make coverage; fi
-
-  # DO NOT REMOVE (debugging purposes)
-  #- /home/travis/build/uncrustify/uncrustify/build/uncrustify -l cs -c /home/travis/build/uncrustify/uncrustify/tests/config/U10-Cpp.cfg -f /home/travis/build/uncrustify/uncrustify/tests/input/cs/newlines.mm -L A
-
-after_success:
-  # publish coverage data to coveralls
-  - if [ "x${BUILD_TYPE}" == "xcoverage" ]; then cd ../ && coveralls -l build/cmake_coverage.output -t $COVERALLS_TOKEN; fi
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/AUTHORS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/AUTHORS
deleted file mode 100644
index 4a565037..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/AUTHORS
+++ /dev/null
@@ -1,158 +0,0 @@
-Author:
-2005 - 2016 : Ben Gardner
-
-Maintenance:
-Guy Maurel
-Matthew Woehlke
-
-until 2020-11-05:
-Other collaborators:
-Alan Fineberg
-Alexander GQ Gerasiov
-André Berg
-Andrei Alexandrescu
-Andrey Starodubtsev
-Anirban Pramanick
-Antti Tapaninen
-Arne Forlie
-Arseniy Shestakov
-asobhy
-atauzki
-Aurélien Gâteau
-Benio
-Ben Iofel
-Ben Mayo
-Beren Minor
-Biswa96
-Biswapriyo Nath
-B. Kevin Hardman
-Bogdan Popescu
-Brandon Slack
-Brendan Long
-CharlieYJH
-Chris Lalancette
-Clemens Rabe
-Code Able
-Cody Schafer
-Corentin Noël
-Daniel Chumak
-Dan Rose
-Dave Lee
-David Catmull
-David E. O'Brien
-David Lechner
-David Schaefgen
-Dirk Thomas
-Dittrich, Rico
-Dmitry Marakasov
-Dmitry Povolotsky
-Dmytro Povolotskyi
-Dženan Zukić
-Eism
-Emerson Knapp
-Emmanuel Christophe
-Ethan Gao
-Florin Pop
-Gary Ash
-Ger Hobbelt
-Hackerpilot
-Hannes Schmidt
-Huang-Ming Huang
-Husk3r
-Ilya Lyubimov
-Ingo Brückl
-Ivan Nazarenko
-Ivan Romanov
-Jakub Schmidtke
-Jan Weiß
-Jason
-JavDevGames
-Jeremy H
-Jeremy T Hilliker
-Jim Meyering
-Jiri Hruska
-Joel Ostraat
-Joergen Ibsen
-Johnny Oskarsson
-Jonas Hurrelmann
-Joshua Gross
-Joshua Parker
-Julian Picht
-Kalle Raiskila
-Keepun
-krys
-Laurent Tréguier
-Lauri Kasanen
-lbmaian
-Leon Breedt
-Lorenz Haas
-Lykurg
-Marco Stephan
-Marek Fort
-Marius Zwicker
-Mark Stegeman
-Markus Geimer
-Martin Simonovsky
-Martin Storsjo
-Matthew McDole
-Matthew Woehlke
-Maxim Mikityanskiy
-Max Smolens
-MeXx
-Michaël Peeters
-Michele Calgaro
-Mihai Popescu
-Mike
-Mike Gelfand
-Mirko König
-MrTheMake
-Nate
-neok-m4700
-Nico Decker
-Oleg Liatte
-Oleg Smolsky
-Owen Rudge
-Pat Notz
-Patrick Rohr
-Paul Cercueil
-Paul Smith
-Pavel Geiger
-Pawel Benetkiewicz
-Paweł Benetkiewicz
-PerfectCarl
-Peter Bruin
-Peter Hartley
-Peter Jonas
-Peter Kolbus
-Peter Waller
-Piet Van Reepingen
-Randolph R. Settgast
-Randolph Settgast
-RaveTheTadpole
-Roland Schulz
-Ryan Maxwell
-Samish Chandra Kolli
-Samish Kolli
-Scott Bilas
-Sebastian Andersson
-S. Gilles
-Shazron Abdullah
-Siddharth Kannan
-Spark-NF
-Stefan Koch
-Stefan Nunninger
-Stephen Gilles
-Steven Lee
-Suhaib Ishaque
-t-bltg
-Tim Hütz
-Timotheus Pokorra
-Todd Richmond
-Twigz
-U-RDEC\ParkerJS
-Vadim Zeitlin
-Viktor Kireev
-Vincent Rouille�
-Vyacheslav Shegai
-Waldir Pimenta
-Yannick Bühler
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/BUGS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/BUGS
deleted file mode 100644
index a6e2ccaa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/BUGS
+++ /dev/null
@@ -1,67 +0,0 @@
--------------------------------------------------------------------------------
-BUGS:
-
-Post any bugs to the issue tracker found on the project's GitHub page:
-  https://github.com/uncrustify/uncrustify/issues
-
-Before you do so, try running with the latest code from git.
-The bug might have already been fixed.
-
-If it hasn't already been reported, then you'll need to file a bug report.
-
-First, reduce your input file to the minimum that still causes the problem.
-This is important, as a 1000-line input file is much more difficult to diagnose
-than a 5-line file.
-
-Next, rename your functions, change your strings, comments, etc, to protect
-any trade secrets or whatnot.
-If you attach an input file with a bug, it will most likely appear as a future
-test case.
-
-Finally, create a bug report.
-
-Here's what I like to see in a bug report.
-
-1. The type of problem (crash, bad formatting, etc)
-2. The version of uncrustify you tested with (ie, the git hash)
-3. The operating system
-4. The input file or code snippet, including the language (C, C++, Java, etc)
-5. The configuration file you used.
-   If it isn't one of the 'standard' ones, then attach it.
-6. The expected output (not needed for crash bugs)
-
-
-If you are the code writing type (and you are, since you are using a code
-formatting tool), I'd like you to take a quick look and see if you can pinpoint
-the source of the problem.
-
-Here is what I do when I get a bug report.
-
-1. Check for options that control the desired behavior.
-   About half the time a user missed an option.
-
-2. Run with the supplied input and config to verify the problem.
-   $ uncrustify -c bug.cfg -f bug.c
-
-2a. For a crash-bug, I create a core dump to quickly find the offending code.
-   $ ulimit -c unlimited
-   $ uncrustify -c bug.cfg -f bug.c
-   $ gdb uncrustify core
-
-3. Formatting bugs usually land in one of three catagories.
-   a. Incorrectly labeled chunks
-   b. Bad formatting logic or unexpected input
-   c. Missing options
-
-Debugging help:
-
-I run with the "-p" option to get a dump of the chunks.
-$ uncrustify -c bug.cfg -f bug.c -p parsed.txt
-
-This tells me the configuration and how each chunk is labeled, indented, and
-otherwise processed.
-
-I also selectively turn on log levels (the -L command line option) to aid
-debugging of specific areas of interest.
-Don't turn on all log levels -- the result is excessive and not at all helpful.
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CMakeLists.txt
deleted file mode 100644
index c66fb661..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CMakeLists.txt
+++ /dev/null
@@ -1,538 +0,0 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(uncrustify)
-
-if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
-  message(FATAL_ERROR "
-    In-source builds are not supported, please remove the `CMakeFiles'
-    folder and `CMakeCache.txt', and create a folder for the build:
-    mkdir build; cd build; cmake ..
-  ")
-endif()
-
-include(CheckCXXCompilerFlag)
-include(CheckIncludeFileCXX)
-include(CheckSymbolExists)
-include(CheckCXXSymbolExists)
-include(CheckTypeSize)
-include(CTest)
-
-find_package(Python3 REQUIRED)
-set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
-
-#
-# Check compiler flags
-#
-if(MSVC)
-  add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /wd4267)
-  add_definitions(/utf-8)
-elseif(CMAKE_COMPILER_IS_GNUCXX)
-  set(gcc_warning_flags
-    -Wall
-    -Wextra
-    -Wshadow
-    -Wpointer-arith
-    -Wcast-qual
-    -Wcast-align
-    -Wc++11-extensions
-  )
-  foreach(flag ${gcc_warning_flags})
-    string(REGEX REPLACE "[^a-zA-Z0-9]+" "_" flag_var "CXXFLAG_${flag}")
-    CHECK_CXX_COMPILER_FLAG("${flag}" ${flag_var})
-    if(${flag_var})
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-    endif()
-    unset(flag_var)
-  endforeach()
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
-  endif()
-  unset(gcc_warning_flags)
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-endif()
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED YES)
-
-if(ENABLE_SANITIZER)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fno-omit-frame-pointer -fsanitize=${ENABLE_SANITIZER}")
-endif()
-
-#set(UNCRUSTIFY_SEPARATE_TESTS "True")
-
-include_directories(
-  ${PROJECT_BINARY_DIR}/src
-  ${PROJECT_SOURCE_DIR}/src
-  ${PROJECT_BINARY_DIR}
-)
-
-#
-# Determine config
-#
-if(WIN32)
-  # Windows builds use src/windows_compat.h instead of config.h
-else()
-  # Generate config.h
-  set(avail_headers "")
-
-  set(headers
-    inttypes.h
-    memory.h
-    stdint.h
-    stdlib.h
-    strings.h
-    string.h
-    sys/stat.h
-    sys/types.h
-    unistd.h
-    utime.h
-  )
-  foreach(header ${headers})
-    string(TOUPPER "${header}" header_uc)
-    string(REGEX REPLACE "[^A-Z0-9_]" "_" include_var "HAVE_${header_uc}")
-    check_include_file_cxx("${header}" ${include_var})
-    if(${include_var})
-      list(APPEND avail_headers ${header})
-    endif()
-    unset(include_var)
-    unset(header_uc)
-  endforeach()
-  unset(headers)
-
-  check_include_file("stdbool.h" HAVE_STDBOOL_H)
-
-  set(symbols
-    memset
-    strcasecmp
-    strchr
-    strdup
-    strerror
-    strtol
-    strtoul
-  )
-  foreach(symbol ${symbols})
-    string(TOUPPER "${symbol}" symbol_uc)
-    string(REGEX REPLACE "[^A-Z0-9_]" "_" symbol_var "HAVE_${symbol_uc}")
-    check_cxx_symbol_exists("${symbol}" "${avail_headers}" ${symbol_var})
-    unset(symbol_var)
-    unset(symbol_uc)
-  endforeach()
-  unset(symbols)
-
-  unset(avail_headers)
-
-  check_type_size(_Bool _BOOL LANGUAGE C)
-
-  configure_file(src/config.h.in config.h @ONLY)
-endif()
-
-#
-# Generate uncrustify_version.h
-#
-
-set(UNCRUSTIFY_VERSION "0.73.0_f")
-
-option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
-if(NoGitVersionString)
-  configure_file(src/uncrustify_version.h.in uncrustify_version.h @ONLY)
-  add_custom_target(generate_version_header) # Dummy target
-else()
-  # Add target to generate version header;
-  # do this every build to ensure git SHA is up to date
-  add_custom_target(generate_version_header
-    BYPRODUCTS "${PROJECT_BINARY_DIR}/uncrustify_version.h"
-    COMMAND
-      ${CMAKE_COMMAND}
-      -D PYTHON_EXECUTABLE:STRING=${PYTHON_EXECUTABLE}
-      -D SOURCE_DIR:PATH="${PROJECT_SOURCE_DIR}"
-      -D INPUT:PATH="${PROJECT_SOURCE_DIR}/src/uncrustify_version.h.in"
-      -D OUTPUT:PATH="${PROJECT_BINARY_DIR}/uncrustify_version.h"
-      -D UNCRUSTIFY_VERSION:STRING="${UNCRUSTIFY_VERSION}"
-      -P ${PROJECT_SOURCE_DIR}/cmake/GenerateVersionHeader.cmake
-    COMMENT "Generating version header"
-  )
-  set_source_files_properties(
-    "${PROJECT_BINARY_DIR}/uncrustify_version.h"
-    PROPERTIES GENERATED TRUE
-  )
-endif()
-
-#
-# Generate token_names.h
-#
-add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/token_names.h"
-  COMMAND ${CMAKE_COMMAND}
-    "-Dsrc_file=${PROJECT_SOURCE_DIR}/src/token_enum.h"
-    "-Ddst_file=${CMAKE_CURRENT_BINARY_DIR}/token_names.h"
-    -P "${PROJECT_SOURCE_DIR}/cmake/GenerateTokenNames.cmake"
-  MAIN_DEPENDENCY src/token_enum.h
-  COMMENT "Generating token_names.h"
-)
-
-# Set up commands for generated source files
-function(py_gen OUTPUT SCRIPT INPUT)
-  set(out "${PROJECT_BINARY_DIR}/src/${OUTPUT}")
-  set(deps "${PROJECT_SOURCE_DIR}/src/${INPUT}")
-  get_filename_component(outdir "${out}" DIRECTORY)
-  foreach(arg IN LISTS ARGN)
-    if (IS_ABSOLUTE "${arg}")
-      list(APPEND deps "${arg}")
-    else()
-      list(APPEND deps "${PROJECT_SOURCE_DIR}/src/${arg}")
-    endif()
-  endforeach()
-
-  add_custom_command(
-    OUTPUT "${out}"
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${outdir}"
-    COMMAND ${PYTHON_EXECUTABLE}
-      "${PROJECT_SOURCE_DIR}/scripts/${SCRIPT}"
-      "${out}"
-      ${deps}
-    DEPENDS ${deps} "${PROJECT_SOURCE_DIR}/scripts/${SCRIPT}"
-    MAIN_DEPENDENCY src/${INPUT}
-    COMMENT "Generating ${OUTPUT}"
-  )
-endfunction()
-
-py_gen(punctuator_table.h
-  make_punctuator_table.py
-  symbols_table.h
-)
-
-py_gen(options.cpp
-  make_options.py
-  options.h
-  options.cpp.in
-)
-
-py_gen(option_enum.h
-  make_option_enum.py
-  option.h
-  option_enum.h.in
-)
-
-py_gen(option_enum.cpp
-  make_option_enum.py
-  option.h
-  option_enum.cpp.in
-)
-
-py_gen(../etc/uncrustify.xml
-  make_katehl.py
-  ../etc/uncrustify.xml.in
-  "${PROJECT_BINARY_DIR}/uncrustify_version.h"
-  options.h
-  option.h
-  token_enum.h
-)
-
-#
-# Uncrustify
-#
-set(uncrustify_sources
-  src/align_add.cpp
-  src/align_asm_colon.cpp
-  src/align_assign.cpp
-  src/align.cpp
-  src/align_eigen_comma_init.cpp
-  src/align_func_params.cpp
-  src/align_func_proto.cpp
-  src/align_init_brace.cpp
-  src/align_left_shift.cpp
-  src/align_log_al.cpp
-  src/align_nl_cont.cpp
-  src/align_oc_decl_colon.cpp
-  src/align_oc_msg_colons.cpp
-  src/align_oc_msg_spec.cpp
-  src/align_preprocessor.cpp
-  src/align_same_func_call_params.cpp
-  src/align_stack.cpp
-  src/align_struct_initializers.cpp
-  src/align_tab_column.cpp
-  src/align_tools.cpp
-  src/align_trailing_comments.cpp
-  src/align_typedefs.cpp
-  src/align_var_def_brace.cpp
-  src/args.cpp
-  src/backup.cpp
-  src/brace_cleanup.cpp
-  src/braces.cpp
-  src/calculate_closing_brace_position.cpp
-  src/chunk_list.cpp
-  src/ChunkStack.cpp
-  src/combine.cpp
-  src/combine_fix_mark.cpp
-  src/combine_labels.cpp
-  src/combine_tools.cpp
-  src/combine_skip.cpp
-  src/compat_posix.cpp
-  src/compat_win32.cpp
-  src/cs_top_is_question.cpp
-  src/detect.cpp
-  src/enum_cleanup.cpp
-  src/EnumStructUnionParser.cpp
-  src/EnumStructUnionParser.h
-  src/flag_braced_init_list.cpp
-  src/flag_decltype.cpp
-  src/flag_parens.cpp
-  src/frame_list.cpp
-  src/indent.cpp
-  src/keywords.cpp
-  src/lang_pawn.cpp
-  src/language_tools.cpp
-  src/logger.cpp
-  src/logmask.cpp
-  src/log_rules.cpp
-  src/md5.cpp
-  src/newlines.cpp
-  src/option.cpp
-  src/options_for_QT.cpp
-  src/output.cpp
-  src/parens.cpp
-  src/parent_for_pp.cpp
-  src/ParseFrame.cpp
-  src/pcf_flags.cpp
-  src/punctuators.cpp
-  src/quick_align_again.cpp
-  src/remove_extra_returns.cpp
-  src/semicolons.cpp
-  src/sorting.cpp
-  src/space.cpp
-  src/tokenize_cleanup.cpp
-  src/tokenize.cpp
-  src/uncrustify.cpp
-  src/uncrustify_emscripten.cpp
-  src/uncrustify_types.cpp
-  src/unc_text.cpp
-  src/unc_tools.cpp
-  src/unicode.cpp
-  src/universalindentgui.cpp
-  src/width.cpp
-  ${PROJECT_BINARY_DIR}/src/options.cpp
-  ${PROJECT_BINARY_DIR}/src/option_enum.cpp
-)
-
-set(uncrustify_headers
-  src/add_space_table.h
-  src/align_add.h
-  src/align_asm_colon.h
-  src/align_assign.h
-  src/align_func_params.h
-  src/align_func_proto.h
-  src/align.h
-  src/align_eigen_comma_init.h
-  src/align_init_brace.h
-  src/align_left_shift.h
-  src/align_log_al.h
-  src/align_nl_cont.h
-  src/align_oc_decl_colon.h
-  src/align_oc_msg_colons.h
-  src/align_oc_msg_spec.h
-  src/align_preprocessor.h
-  src/align_same_func_call_params.h
-  src/align_stack.h
-  src/align_struct_initializers.h
-  src/align_tab_column.h
-  src/align_tools.h
-  src/align_trailing_comments.h
-  src/align_typedefs.h
-  src/align_var_def_brace.h
-  src/args.h
-  src/backup.h
-  src/base_types.h
-  src/brace_cleanup.h
-  src/braces.h
-  src/calculate_closing_brace_position.h
-  src/char_table.h
-  src/chunk_list.h
-  src/ChunkStack.h
-  src/combine.h
-  src/combine_fix_mark.h
-  src/combine_labels.h
-  src/combine_skip.h
-  src/combine_tools.h
-  src/compat.h
-  src/cs_top_is_question.h
-  src/detect.h
-  src/enum_cleanup.h
-  src/enum_flags.h
-  src/error_types.h
-  src/flag_braced_init_list.h
-  src/flag_decltype.h
-  src/flag_parens.h
-  src/frame_list.h
-  src/indent.h
-  src/keywords.h
-  src/lang_pawn.h
-  src/language_tools.h
-  src/ListManager.h
-  src/logger.h
-  src/log_levels.h
-  src/logmask.h
-  src/log_rules.h
-  src/md5.h
-  src/newlines.h
-  src/option.h
-  src/options_for_QT.h
-  src/options.h
-  src/output.h
-  src/parens.h
-  src/parent_for_pp.h
-  src/ParseFrame.h
-  src/pcf_flags.h
-  src/prototypes.h
-  src/punctuators.h
-  src/quick_align_again.h
-  src/remove_extra_returns.h
-  src/semicolons.h
-  src/sorting.h
-  src/space.h
-  src/symbols_table.h
-  src/token_enum.h
-  src/tokenize_cleanup.h
-  src/tokenize.h
-  src/unc_ctype.h
-  src/uncrustify.h
-  src/uncrustify_limits.h
-  src/uncrustify_types.h
-  src/unc_text.h
-  src/unc_tools.h
-  src/unicode.h
-  src/universalindentgui.h
-  src/width.h
-  src/windows_compat.h
-  ${PROJECT_BINARY_DIR}/src/option_enum.h
-  ${PROJECT_BINARY_DIR}/uncrustify_version.h
-)
-
-set(uncrustify_docs
-  "${PROJECT_SOURCE_DIR}/AUTHORS"
-  "${PROJECT_SOURCE_DIR}/BUGS"
-  "${PROJECT_SOURCE_DIR}/ChangeLog"
-  "${PROJECT_SOURCE_DIR}/COPYING"
-  "${PROJECT_SOURCE_DIR}/HELP"
-  "${PROJECT_SOURCE_DIR}/README.md"
-)
-
-add_executable(uncrustify ${uncrustify_sources} ${uncrustify_headers})
-add_dependencies(uncrustify generate_version_header)
-
-if(CMAKE_VERSION VERSION_LESS 2.8.10)
-  if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-    # Multi-configuration or build type set
-    set_property(TARGET uncrustify APPEND PROPERTY
-      COMPILE_DEFINITIONS_DEBUG DEBUG
-    )
-  else()
-    # Single-configuration with no build type set
-    set_property(TARGET uncrustify APPEND PROPERTY
-      COMPILE_DEFINITIONS DEBUG
-    )
-  endif()
-else()
-  set_property(TARGET uncrustify APPEND PROPERTY
-    COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
-  )
-endif()
-
-#
-# Generate uncrustify.1
-#
-configure_file(man/uncrustify.1.in uncrustify.1 @ONLY)
-
-#
-# Generate uncrustify.xml (katepart highlighting file)
-#
-add_custom_target(katehl
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/etc/uncrustify.xml
-)
-
-#
-# Tests
-#
-if(BUILD_TESTING)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
-
-#
-# Coverage
-#
-OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
-if(ENABLE_CODECOVERAGE)
-    set(CODECOVERAGE_DEPENDS uncrustify)
-    include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
-endif(ENABLE_CODECOVERAGE)
-
-#
-# Build command to run uncrustify on its own sources
-#
-add_custom_target(format-sources)
-foreach(source IN LISTS uncrustify_sources uncrustify_headers)
-  get_filename_component(source_name  ${source} NAME)
-  add_custom_target(format-${source_name}
-    COMMAND uncrustify
-      -c forUncrustifySources.cfg
-      -lCPP --no-backup ${source}
-    COMMENT "Formatting ${source}"
-    WORKING_DIRECTORY ${uncrustify_SOURCE_DIR}
-  )
-  add_dependencies(format-sources format-${source_name})
-endforeach()
-
-#
-# Package
-#
-set(CPACK_PACKAGE_NAME "uncrustify")
-set(CPACK_PACKAGE_VERSION "${UNCRUSTIFY_VERSION}")
-set(CPACK_PACKAGE_VENDOR "Ben Gardner")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code beautifier")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
-set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;/\\\\.hg/;/tests/results/;/build.*/")
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE)
-  set(CPACK_GENERATOR "ZIP")
-endif()
-include(CPack)
-
-#
-# Install
-#
-if(MSVC)
-  install(TARGETS uncrustify DESTINATION ".")
-  install(FILES ${uncrustify_docs}
-    DESTINATION "."
-  )
-  install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
-    DESTINATION "doc"
-  )
-  install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/"
-    DESTINATION "cfg"
-    FILES_MATCHING PATTERN "*.cfg"
-  )
-else()
-  include(GNUInstallDirs)
-  install(TARGETS uncrustify
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-  )
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify.1"
-    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-  )
-  install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/"
-    DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples"
-    FILES_MATCHING PATTERN "*.cfg"
-  )
-  install(FILES ${uncrustify_docs}
-    DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-  )
-endif()
-
-#
-# add to build the compile_commands.json file, to be used by clang-tidy
-#
-set(CMAKE_EXPORT_COMPILE_COMMANDS "ON" CACHE BOOL "to create the compile_commands.json file" FORCE)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CODEOWNERS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CODEOWNERS
deleted file mode 100644
index b8b9012f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CODEOWNERS
+++ /dev/null
@@ -1,11 +0,0 @@
-*               @CDanU @gmaurel @mwoehlke-kitware
-
-.editorconfig   @mihaipopescu
-
-# CI
-.travis.yml     @mihaipopescu
-appveyor.yml    @mihaipopescu
-
-# emscripten
-/emscripten/    @CDanU
-/src/uncrustify_emscripten.cpp @CDanU
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CONTRIBUTING.md b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CONTRIBUTING.md
deleted file mode 100644
index 10f62999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CONTRIBUTING.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Contributing to Uncrustify
-
-## How to contribute
-
-There are lots of ways to contribute to Uncrustify:
-
-- Report Issues
-
-- Propose Features or Improvements
-
-- Submit Pull Requests
-
-## Making changes
-
-* Pull latest [master][master] and create a new branch:
-    - Branch name _should_ use lowercase, using `-` to separate words
-      and not `_`. Other special characters _should_ be avoided.
-      (However, feel free to use option names verbatim in branch names;
-      `_` _should_ be used when part of an option name.)
-    - A hierarchical structure _may_ be designated using `/`
-      (e.g. `area/topic`), although this is uncommon.
-      The last part of the name can be keywords like `bugfix`, `feature`,
-      `optim`, `docs`, `refactor`, `test`, etc.
-    - Branches _should_ be named after _what_ the change is about.
-    - Branches _should not_ be named after the issue number,
-      developer name, etc.
-
-* Organize your work:
-    - Specialize your branch to target only one thing.
-      Split your work in multiple branches if necessary.
-    - Make commits of logical units.
-    - Avoid "fix-up" commits.
-      Instead, rewrite your history so that the original commit is "clean".
-    - Try to write a [quality commit message][commits]:
-        + Separate subject line from body with a blank line.
-        + Limit subject line to 50 characters.
-        + Capitalize the subject line.
-        + Do not end the subject line with a period.
-        + Use imperative present tense in the subject line.
-          A proper subject can complete the sentence
-          "If applied, this commit will, [subject]".
-        + Wrap the body at 72 characters.
-        + Include motivation for the change
-          and contrast its implementation with previous behavior.
-          Explain the _what_ and _why_ instead of _how_.
-    - If the git diff command, or the diff part of the git gui,
-      don't produce accurate output, it might be necessary to add
-      some lines to the ~/.gitconfig file:
-         [diff]
-                 algorithm = patience
-         [gui]
-                 diffopts = --patience
-
-
-* Add or update unit tests:
-    - All behavioral changes should come with a unit test that verifies
-      that the new feature or fixed issue works as expected.
-    - Consider improving existing tests if it makes sense to do so.
-    - Any unused test number may be used,
-      however it is preferred to keep related tests together, if possible.
-    - Read [Writing Tests][tests] for more details.
-
-* Polish your work:
-    - The code should be clean, with documentation where needed.
-    - The change must be complete (no upcoming fix-up commits).
-    - Functional changes should always be accompanied by tests (see above).
-      Changes without tests should explain why tests are not present.
-      (Changes that are non-functional, such as documentation changes,
-      can usually omit tests without justification.)
-
-* Prepare a Pull Request (PR):
-    - To reduce the likelihood of conflicts and test failures,
-      consider rebasing your work on top of latest master before creating a PR.
-    - Verify that your code is working properly
-      by running `ctest` in your build directory.
-      (Changes that fail CI will _not_ be merged.
-      Running the tests locally will help to avoid this.)
-      You can change the level of logging by changing the line 104 and 109
-      of the file tests/test_uncrustify/test.py to another value.
-    - The PR title should represent _what_ is being changed
-      (a rephrasing of the branch name if set correctly).
-    - The PR description should document the _why_ the change needed to be done
-      and not _how_, which should be obvious by doing the code review.
-    - After commiting a new PR, one may have a look to the results, running under other OS:
-        https://travis-ci.com/
-          Sign in
-            SIGN IN WITH GITHUB
-            you get a view of  <your github account> / uncrustify
-
-        https://coveralls.io/github/uncrustify/uncrustify
-
-
-[master]: https://github.com/uncrustify/uncrustify/tree/master
-[commits]: https://chris.beams.io/posts/git-commit/
-[tests]: https://github.com/uncrustify/uncrustify/wiki/Writing-Tests
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/COPYING b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/COPYING
deleted file mode 100644
index d60c31a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/ChangeLog b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/ChangeLog
deleted file mode 100644
index 1aedad53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/ChangeLog
+++ /dev/null
@@ -1,1476 +0,0 @@
-Change highlights in uncrustify-0.73.0 (May 2021)
--------------------------------------------------------------------------------
-
-  b514f25120b12db7b1ca57cdb93dd929a5bf43c4
-    Added   : indent_before_class_colon            Nov 16 2020
-  39c969b69663f6e6cee9673e23d349a308edc44a
-    Added   : sp_cmt_cpp_region                    Dec  9 2020
-  9ca37d0c32729570de2e51c97338bc567e124ae3
-    Added   : cmt_sp_before_doxygen_javadoc_tags   Dec 24 2020
-    Added   : cmt_align_doxygen_javadoc_tags       Dec 24 2020
-  84e2c750d19b47bbe2547141b092855ec1f64424
-    Added   : cmt_reflow_fold_regex_file           Dec 24 2020
-  3a8e33a12839ca3bac2e1e0b49eb279362a2ab89
-    Added   : processing_cmt_as_regex              Dec 31 2020
-  c622135751824705979d37681fe16d9a60e3d77a
-    Added   : cmt_reflow_indent_to_paragraph_start Jan  9 2021
-  9c0799aa096b68550507980a32a529099caf97c5
-    Added   : sp_cpp_lambda_argument_list          Jan 19 2021
-  02054b1085166903e8c1384308ac7922cb57bd59
-    Added   : nl_do_leave_one_liners               Jan 29 2021
-  6a4d27914fca0c64273fad979355e16021626f8a
-    Added   : debug_truncate                       Feb  7 2021
-  a711e96ef7be6afc9f014c4c7e1e5ea5347aad0d
-    Added   : indent_comma_brace                   Mar  9 2021
-
-Change highlights in uncrustify-0.72.0 (November 2020)
--------------------------------------------------------------------------------
-  new command option:
-  --debug-csv-format : Dump debug info to file in csv-delimited format.
-
-  b29dfb58d6bebb79a961d0e709543a152d260dbc
-    Added   : nl_inside_empty_func                 Aug  4 2020
-  5068a4a78d7770a7292ea7a016ab7ca0bf49cbf7
-    Added   : debug_timeout                        Sep  1 2020
-  cf3e5acfb4d55b47b25b7e7daa2844e2998b47cc
-    Added   : sp_inside_square_empty               Sep  8 2020
-  b66c26c669bf9752f468115f1e6444481c0b9e6d
-    Added   : align_eigen_comma_init               Sep  9 2020
-  7b5fd82fa5d6fc035ddfb7c087c5aeb7cf6f4bd7
-    Added   : pos_shift                            Sep 16 2020
-  b61b7952835be3451cd1131baeda7b54cb61a50e
-    Added   : donot_indent_func_def_close_paren    Sep 26 2020
-  85001632261196dc1c2f3760dc9180e4c443f9ba
-    Added   : donot_add_nl_before_cpp_comment      Oct 14 2020
-
-Change highlights in uncrustify-0.71.0 (May 2020)
--------------------------------------------------------------------------------
-
-  6bcfb640d908038402869cb3be7bd80adcdb4708
-    Added   : align_oc_msg_colon_xcode_like        Nov 29 2019
-  2fd5aaf255e1d0369842f54ae8d444bcbc079c7b
-    Added   : indent_compound_literal_return       Nov 19 2019
-  4b74315b6cf8e91801b663c4171c1e0a9e12ea5b
-    Added   : indent_sparen_extra                  Nov 19 2019
-  f012dd24e2d116d867404667ce15c3309466046f
-    Added   : sp_word_brace_init_lst               Jan 21 2020
-    Removed : sp_word_brace                        Jan 21 2020
-  466b8bcf5f8ee04686d2d7af62b5ce76241c777d
-    Added   : nl_func_call_args                    Jan 24 2020
-  807e27e81112f28ae71b21f43718a1b859ad473a
-    Added   : sp_before_oc_proto_list              Feb  4 2020
-  94f18ac9c0c7c7fab64f14425aea69f0f49bb240
-    Added   : indent_off_after_assign              Feb  7 2020
-  25e20f9e4ab389c06fc76bcf0dcb3fe07ab91aea
-    Added   : indent_off_after_return              Feb  7 2020
-  cee950462787ab3b7725c5fb77fa38b992527e99
-    Added   : indent_oc_inside_msg_sel             Feb 10 2020
-  2d04118314be95654f29fb32ae50b8cd46af8682
-    Added   : nl_func_call_args_multi_line_ignore_closures Dec 17 2019
-  369192830c01beedcfe87c432f9c26637c1e6587
-    Added   : indent_inside_ternary_operator       Dec  9 2019
-  100db726b938d263c6c7f07530385dec0cdd711e
-    Added   : use_form_feed_no_more_as_whitespace_character Feb 21 2020
-  24e27fe8cdda55e422b1db659f255da353b3022c
-    Added   : debug_max_number_of_loops            Feb 27 2020
-  30da6cafa6b0819c48a02513cadbc256a5b450c5
-    Added   : debug_line_number_to_protocol        Mar 17 2020
-  f5d8ee093eb521ecc0c57060b0009dd5f05e039e
-    Added   : mod_sort_incl_import_prioritize_filename Mar 27 2020
-  8d595cb0721b299db8f1169c22d38d45df899a51
-    Added   : mod_sort_incl_import_ignore_extension Mar 27 2020
-  9f8b7754f03aa970ede730a5cd4e2cbd94f139cc
-    Added   : mod_sort_incl_import_prioritize_extensionless Mar 27 2020
-  6d5829551886ee9e643e5d6019c5389dfa738c3b
-    Added   : mod_sort_incl_import_prioritize_angle_over_quotes Mar 27 2020
-  27b33d779e7aa33c1ebc39a52e54c3a95bc153d4
-    Added   : mod_sort_incl_import_grouping_enabled Mar 27 2020
-  ac62be9498fa195a54c0e2c76c438c641d68a917
-    Added   : disable_processing_nl_cont           Apr 12 2020
-  e2b17b724e00c6180c6bd6cb5b592e969c47b6a9
-    Added   : nl_before_opening_brace_func_class_def Apr 22 2020
-  981c761da5a4a71b059361a883c4bfff69148c49
-    Added   : nl_before_whole_file_endif           Apr 24 2020
-    Added   : nl_after_whole_file_endif            Apr 24 2020
-    Added   : nl_after_whole_file_ifdef            Apr 24 2020
-    Added   : nl_before_whole_file_ifdef           Apr 24 2020
-  d55e9d21cd6377a38f741854baf1a561b984de36
-    Added   : nl_func_call_end                     Apr 29 2020
-
-Change highlights in uncrustify-0.70.1 (November 2019)
--------------------------------------------------------------------------------
-
-  5114ea856acd79cbf52fd4261b83d423fafd98da
-    Added   : nl_before_member                     Nov 17 2019
-    Added   : nl_after_member                      Nov 17 2019
-  1e911250996a7138e33006af1b664362b255f4b5
-    Added   : nl_template_end_multi_line           Nov 17 2019
-    Added   : nl_template_start_multi_line         Nov 17 2019
-    Added   : nl_template_args_multi_line          Nov 17 2019
-  948bc227c46f89207346ad596e6199acb12d162f
-    Added   : sp_before_vardef_square              Nov 18 2019
-  1ff6fc2da0b1cdef35089a2d6ac3364fbba304be
-    Added   : nl_template_start                    Nov 21 2019
-    Added   : nl_template_args                     Nov 21 2019
-    Added   : nl_template_end                      Nov 21 2019
-    Removed : nl_template_end_multi_line           Nov 21 2019
-    Removed : nl_template_start_multi_line         Nov 21 2019
-    Removed : nl_template_args_multi_line          Nov 21 2019
-  2df82073bb1e3bc85f75c2165a541ba906f76b8d
-    Added   : indent_macro_brace                   Nov 18 2019
-  8cb5f1be52bcbcca4148cf0514b103dec5313c55
-    Added   : indent_switch_break_with_case        Nov 25 2019
-
-Change highlights in uncrustify-0.70.0 (is not released)
--------------------------------------------------------------------------------
-
-  710b9b90d063e1fac853b77ad9509bed37ff31ee
-    Added   : mod_sort_case_sensitive              May 12 2019
-  40c028454904f4fc87bd93b9703eaeb58fa57dd0
-    Added   : sp_before_square_asm_block           Jul 29 2019
-  b9b7f2fffb2c73925906ca7e5c8536d03c93c4bc
-    Added   : nl_multi_line_sparen_open            Aug  3 2019
-    Added   : nl_multi_line_sparen_close           Aug  3 2019
-  83a014197001ea815f92d977fc30aa36dec39e1b
-    Added   : sp_cpp_lambda_square_paren           Aug 20 2019
-    Added   : sp_cpp_lambda_square_brace           Aug 20 2019
-    Added   : sp_cpp_lambda_paren_brace            Aug 20 2019
-    Removed : sp_cpp_lambda_paren                  Aug 20 2019
-  8b6455c08c4f70b04b03b48c32fa14b9014354b4
-    Added   : use_sp_after_angle_always            Sep 13 2019
-  264ec3c988b5667c971b0d6508b17d0c9337c82c
-    Added   : sp_cpp_lambda_fparen                 Sep 13 2019
-  883ccefc3bf8c8cdf6b159f280e22c2d72ce83f5
-    Added   : sp_func_type_paren                   Oct 11 2019
-  8284db41edbb777829f26d247470c75d3d317641
-    Added   : nl_before_namespace                  Oct  8 2019
-    Added   : nl_after_namespace                   Oct  8 2019
-  3af190ceda3f8025028b5f8aae7541d35bda39c7
-    Added   : nl_template_class_def                Oct  2 2019
-    Added   : nl_template_func_def_special         Oct  2 2019
-    Added   : nl_template_using                    Oct  2 2019
-    Added   : nl_template_func_def                 Oct  2 2019
-    Added   : nl_template_class_decl               Oct  2 2019
-    Added   : nl_template_var                      Oct  2 2019
-    Added   : nl_template_class_decl_special       Oct  2 2019
-    Added   : nl_template_func                     Oct  2 2019
-    Added   : nl_template_func_decl_special        Oct  2 2019
-    Added   : nl_template_func_decl                Oct  2 2019
-    Added   : nl_template_class_def_special        Oct  2 2019
-  e9bc08c3baa3b7545a592b5e1d0d23e530c58b7f
-    Added   : sp_trailing_return                   Oct 23 2019
-  d783ecfe7f08b525eb882ff3a7c6525d8866d54b
-    Added   : nl_oc_before_interface               Oct 28 2019
-    Added   : nl_oc_before_implementation          Oct 28 2019
-    Added   : nl_oc_before_end                     Oct 28 2019
-  3741e59342c5741020b84eba147b0c1dfde0154b
-    Added   : indent_func_def_param_paren_pos_threshold Nov  6 2019
-  829b4124c02e36156489d06a8b33e3552e58d30b
-    Added   : sp_brace_close_while                 Nov  8 2019
-    Added   : sp_while_paren_open                  Nov  8 2019
-    Added   : sp_do_brace_open                     Nov  8 2019
-  ea6f4ac515c0ad5651be020a3295dcae01c3baf9
-    Added   : nl_create_list_one_liner             Nov 11 2019
-
-Change highlights in uncrustify-0.69.0 (May 2019)
--------------------------------------------------------------------------------
-
-Changing option:
-  - The option name is changed from 'align_assign_func_proto' to 'align_assign_func_proto_span'
-      Mar  4 17:19:40 2019
-
-New options:
-  - align_constr_value_gap               Apr 24 2019
-  - align_constr_value_span              Apr 24 2019
-  - align_constr_value_thresh            Apr 24 2019
-  - align_func_proto_thresh              Apr  5 2019
-  - indent_col1_multi_string_literal     Mar 31 2019
-  - sp_paren_noexcept                    Jan 13 2019
-  - sp_paren_qualifier                   Jan 11 2019
-  - sp_type_question                     Jan 11 2019
-  - sp_inside_angle_empty                Dec 27 2018
-  - nl_fdef_brace_cond                   Nov 29 2018
-  - nl_func_call_start                   Nov 29 2018
-
-
-Change highlights in uncrustify-0.68 (November 2018)
--------------------------------------------------------------------------------
-
-New options:
-  - align_same_func_call_params_span     Nov  9
-  - align_same_func_call_params_thresh   Nov  9
-  - nl_class_leave_one_liner_groups      Oct 17
-  - nl_inside_namespace                  Aug 26
-  - sp_return_brace                      Aug 21
-  - align_assign_decl_func               Jul 24
-  - sp_brace_brace                       Jul 23
-  - sp_after_decltype                    Jul 22
-  - sp_decltype_paren                    Jul 22
-  - align_right_cmt_same_level           Jul 14
-  - nl_oc_mdef_brace                     Jul  8
-  - mod_enum_last_comma                  Jul  8
-  - sp_type_ellipsis                     Jun 15
-  - sp_paren_ellipsis                    Jun 15
-  - sp_sizeof_ellipsis                   Jun 15
-  - sp_sizeof_ellipsis_paren             Jun 15
-  - indent_continue_class_head           May 30
-
-Bugfix:
- - Issue # 1709, 1713, 1729, 1736, 1739, 1740, 1748, 1752, 1755, 1758, 1760,
-     1762, 1763, 1776, 1778, 1782, 1783, 1784, 1786, 1788, 1789, 1804, 1827,
-     1832, 1838, 1839, 1854, 1865, 1867, 1870, 1875, 1876, 1888, 1904, 1916,
-     1917, 1918, 1919, 1942, 1946, 1947, 1958, 1960, 1962, 1965, 1969, 1979,
-     1982, 1985, 1997, 2000, 2001, 2009, 2014, 2015, 2024, 2028, 2032, 2033,
-     2035, 2037, 2046, 2055
-
-
-Change highlights in uncrustify-0.67 (May 2018)
--------------------------------------------------------------------------------
-
-Changing option:
-
-Removed option:
-
-New options:
-  - indent_first_for_expr                Apr 29
-  - indent_semicolon_for_paren           Apr 29
-  - nl_oc_interface_brace                Apr 13
-  - nl_oc_implementation_brace           Apr 13
-  - indent_cpp_lambda_only_once          Mar 24
-  - indent_cs_delegate_body              Mar 18
-  - sp_after_noexcept                    Mar 18
-  - indent_single_newlines               Mar  6
-  - sp_after_ptr_block_caret             Feb 24
-  - sp_after_oc_synchronized             Feb 24
-  - sp_inside_square_oc_array            Feb 23
-  - sp_oc_catch_paren                    Feb 23
-  - sp_oc_catch_brace                    Feb 23
-  - sp_oc_brace_catch                    Feb 23
-  - nl_oc_catch_brace                    Feb 23
-  - nl_oc_brace_catch                    Feb 23
-  - nl_cs_property_leave_one_liners      Feb 16
-  - indent_member_single                 Feb 10
-  - sp_func_call_user_paren_paren        Feb  5
-  - sp_func_call_user_inside_fparen      Feb  5
-  - sp_inside_braces_oc_dict             Feb  5
-  - nl_create_func_def_one_liner         Jan 17
-  - nl_namespace_two_to_one_liner        Jan 15
-  - nl_squeeze_paren_close               Jan 15
-  - sp_fparen_brace_initializer          Jan 12
-  - sp_cpp_before_struct_binding    2018 Jan 12
-  - indent_align_paren                   Dec 14
-  - nl_tsquare_brace                     Dec  9
-  - indent_single_after_return           Nov 28
-  - indent_off_after_return_new          Nov 28
-  - indent_ignore_asm_block         2017 Nov 05
-
-New keyword:
-  - __unused                             Apr 21
-  - @synchronized                        Feb 24
-  - @available                           Feb 23
-  - fixed                                Feb 16
-  - @protected                           Feb  4
-  - @public                              Feb  4
-  - __autoreleasing                      Feb  4
-  - __bridge                             Feb  4
-  - __bridge_retained                    Feb  4
-  - __bridge_transfer                    Feb  4
-  - __declspec                           Feb  4
-  - __has_include                        Feb  4
-  - __has_include_next                   Feb  4
-  - __strong                             Feb  4
-  - __typeof                             Feb  4
-  - __unsafe_unretained                  Feb  4
-  - __weak                               Feb  4
-  - self                                 Feb  4
-  - unsafe_unretained               2018 Feb  4
-  - where                           2017 Dec  6
-
-Bugfix:
- - Debian issue #881249 "FTBFS on armel/i386/mips64el/s390x: cpp_33057 fails"
-     is fixed
- - Adopt many bugfix and tests from UT:
-     10000, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009, 10011,
-     10012, 10013, 10014, 10015, 10016, 10018, 10019, 10020, 10021, 10022,
-     10023, 10024, 10025, 10027, 10028, 10029, 10030, 10031, 10032, 10033,
-     10034, 10035, 10036, 10039, 10044, 10045, 10046, 10047, 10048, 10049,
-     10050, 10051, 10052, 10053, 10054, 10054, 10055, 10056, 10057, 10058,
-     10060, 10062, 10063, 10065, 10066, 10067, 10069, 10070, 10071, 10072,
-     10073, 10074, 10075, 10076, 10077, 10078, 10079, 10080, 10100, 10102,
-     10103, 10104,
-     60001, 60002, 60003, 60004, 60005, 60006, 60007, 60008, 60009, 60011,
-     60012, 60013, 60014, 60015, 60016, 60017, 60018, 60019, 60020, 60021,
-     60022, 60023, 60024, 60025, 60026, 60027, 60028, 60029, 60030, 60031,
-     60032, 60033, 60034, 60036, 60037, 60038, 60039, 60040
-
-New:
-  - Add crash handling for Windows
-
-Change highlights in uncrustify-0.66 (November 2017)
--------------------------------------------------------------------------------
-
-New options:
-  - sp_arith_additive                    Oct 17
-  - sp_angle_colon                       Oct 17
-  - nl_func_call_empty                   Sep 30
-  - nl_func_call_paren_empty             Sep 30
-  - align_func_params_span               Sep 29
-  - align_func_params_thresh             Sep 29
-  - align_func_params_gap                Sep 29
-  - nl_func_call_paren                   Jul 25
-  - indent_paren_after_func_def          Jul 21
-  - indent_paren_after_func_decl         Jul 21
-  - indent_paren_after_func_call         Jul 21
-  - nl_func_paren_empty                  Jul 07
-  - nl_func_def_paren_empty              Jul 07
-  - indent_switch_pp                     Jun 22
-  - pp_indent_case                       Jun 22
-  - pp_indent_func_def                   Jun 22
-  - pp_indent_extern                     Jun 22
-  - pp_indent_brace                      Jun 22
-
-Changing option:
-  - The option name is changed from 'align_number_left' to 'align_number_right' 
-
-Bugfix:
- - Issue # 548, 1098, 1103, 1108, 1112, 1127, 1134, 1158, 1165, 1170, 1187,
-     1200, 1203, 1236, 1249, 1310, 1315, 1340, 1349, 1352, 1366 are fixed
-
-Change highlights in uncrustify-0.65 (May 2017)
--------------------------------------------------------------------------------
-
-New options:
-  - nl_before_if_closing_paren                     May 12
-  - sp_after_type_brace_init_lst_open              May 09
-  - sp_before_type_brace_init_lst_close            May 09
-  - sp_inside_type_brace_init_lst                  May 09
-  - sp_type_brace_init_lst                         May 09
-  - nl_type_brace_init_lst                         May 09
-  - nl_type_brace_init_lst_open                    May 09
-  - nl_type_brace_init_lst_close                   May 09
-  - mod_sort_oc_property_class_weight              May 05
-  - mod_full_brace_nl_block_rem_mlcond             Mar 17
-  - sp_inside_newop_paren_open                     Mar 13
-  - sp_inside_newop_paren                          Mar 13
-  - sp_after_newop_paren                           Mar 13
-  - sp_inside_newop_paren_close                    Mar 13
-  - pp_ignore_define_body                          Feb 18
-  - sp_enum_colon                                  Feb 13
-  - nl_enum_class                                  Feb 13
-  - nl_enum_class_identifier                       Feb 13
-  - nl_enum_identifier_colon                       Feb 13
-  - nl_enum_colon_type                             Feb 13
-  - indent_param                                   Feb 01
-  - include_category_0                             Jan 24
-  - include_category_1                             Jan 24
-  - include_category_2                       2017  Jan 24
-  - force_tab_after_define                   2016  Dec 29
-  - nl_max_blank_in_func                           Nov 26
-  - indent_ternary_operator                        Nov 24
-  - indent_using_block                             Oct 20
-
-New:
-  - emscripten interface
-  - removal of autogen / configure build
-  - list options that are now AT_UNUM type
-  - change option name from align_number_left to align_number_right
-
-Removed option:
-  - dont_protect_xcode_code_placeholders
-
-Removed MS calling convention keywords:
-  - __cdecl, __clrcall, __fastcall, __stdcall, __thiscall, __vectorcall
-
-Bugfix:
- - Issue # 324, 398, 404, 497, 525, 575, 633, 638, 643, 646, 663, 666,
-     679, 682, 687, 726, 752, 753, 793, 815, 825, 842, 857, 859, 869, 870,
-     889, 902, 916, 917, 928, 935, 938, 940, 972, 1002, 1005, 1020, 1030,
-     1032, 1041, 1068, 1117, 1139 are fixed
- - Proposal #381, 876 are adopted.
-
-Change highlights in uncrustify-0.64 (October 2016)
--------------------------------------------------------------------------------
-
-New:
- - Support for new C#6 language elements. (Bug #672)
-    Expression filter with the keyword 'when' in try/catch is now supported.
-    Null conditional operator (?.) is now supported.
-
-New options:
- - align_var_class_span                             Aug 23
- - align_var_class_thresh                           Aug 23
- - align_var_class_gap                              Aug 23
- - pos_enum_comma                                   Aug 14
- - indent_token_after_brace                         Aug  3
- - cmt_multi_first_len_minimum                      Aug  2
- - nl_enum_own_lines                                Aug  1
- - nl_func_class_scope                              Jul 26
- - nl_squeeze_ifdef_top_level                       Jul 24
- - sp_super_paren                                   Jul 21
- - sp_this_paren                                    Jul 21
- - sp_angle_paren_empty                             Jul 21
- - sp_after_operator_sym_empty                      Jul 20
- - sp_skip_vbrace_tokens                            Jul 13
- - indent_cs_delegate_brace                         Jul  9
- - cmt_insert_before_inlines                        Jun 29
- - cmt_insert_before_ctor_dtor                      Jun 29
- - mod_full_brace_if_chain_only                     Jun 28
- - nl_func_decl_start_multi_line                    Jun 28
- - nl_func_def_start_multi_line                     Jun 28
- - nl_func_decl_args_multi_line                     Jun 28
- - nl_func_def_args_multi_line                      Jun 28
- - nl_func_decl_end_multi_line                      Jun 28
- - nl_func_def_end_multi_line                       Jun 28
- - nl_func_call_start_multi_line                    Jun 28
- - nl_func_call_args_multi_line                     Jun 28
- - nl_func_call_end_multi_line                      Jun 28
- - use_options_overriding_for_qt_macros             Jun 16
- - sp_func_def_paren_empty                          Jun 15
- - sp_func_proto_paren_empty                        Jun 15
- - sp_func_class_paren_empty                        Jun 15
- - nl_oc_block_brace                                May 26
- - nl_split_if_one_liner                            May 26
- - nl_split_for_one_line                            May 24
- - nl_split_while_one_liner                         May 24
- - nl_after_func_class_proto                        May 12
- - nl_after_func_class_proto_group                  May 12 2016
-
-Bugfix:
- - Bugs #620, #651, #654, #662, #663, #664, #670, #671, #672, #674 are fixed
- - Issues #322, #323, #359, #405, #408, #412, #478, #481, #495, #503, #509, #512, #513, #514,
-    #518, #519, #520, #521, #522, #524, #529, #530, #533, #536, #539, #542,
-    #543, #544, #546, #568 are fixed
- - Proposals #409, #477 are implemented
- - Issue #411 is partialy fixed
-
-
-Change highlights in uncrustify-0.63 (Mar 2016)
--------------------------------------------------------------------------------
-
-New:
- - The branch uncrustify4Qt is now merged.
- - A configuration file for the sources of uncrustify is provided:
-     forUncrustifySources.cfg
- - Some considerations about the problem "stable" are described at
-     forUncrustifySources.txt
- - Simplify expressions such as:
-     if ((cpd.lang_flags & LANG_PAWN) != 0)
-   to
-     if (cpd.lang_flags & LANG_PAWN)
- - introduce CT_STDCALL to work with typedef void (__stdcall *func)(); Bug # 633
- - introduce some more MS calling conventions: __cdecl, __clrcall, __fastcall, __thiscall, __vectorcall
-     https://msdn.microsoft.com/en-us/library/984x0h58.aspx
-
-New options:
- - nl_before_func_class_def                         Apr 16
- - nl_before_func_class_proto                       Apr 16
- - nl_before_func_body_def                          Apr 25
- - nl_before_func_body_proto                        Apr 25
- - use_indent_continue_only_once                    Mar  7 2016
-
-Bugfix:
- - Simplify some more expressions.
- - Bugfix for win32 for the flags.
- - make test c/ 00617 stable
- - make test c/ 02501 stable
- - The issue #467 and the test tests/output/c/02100-i2c-core.c are not yet fixed.
- - uncrustify all the sources with forUncrustifySources.cfg
- - better descriptions for options
- - bug #631 is fixed
- - produce a better dump output
- - DbConfig::configuredDatabase()->apply(db); is NOT a declaration of a variable
- - bug # 657 is fixed: change 'mode' if necessary for 'pos_class_comma'
- - fix 3 calls of unc_add_option for "align_oc_msg_colon_span",
-     "indent_oc_block_msg", "indent_oc_msg_colon"
- - bugs #664, #662, #654, #653, #651 and #633 are fixed
-
-Reverse:
- - space: drop vbrace tokens... 2014-09-01 06:33:17
-   I cannot anderstand this change.
-   It makes some troubles: Bug # 637
-   No test file for it found
-   Reverse the change until more informations could be found
-
-Change:
- - CT_DC_MEMBER + CT_FOR into CT_DC_MEMBER + CT_FUNC_CALL
-
-Some more Qt-macros:
- - Q_GADGET
- - for_each
-
-
-Change highlights in uncrustify4Qt-0.62 (Oct 2015)
--------------------------------------------------------------------------------
-This is an extention of uncrustify to support Qt-macros
- - Q_OBJECT
- - Q_EMIT
- - SLOT
- - SIGNAL
- - Q_FOREACH
- - Q_FOREVER
-
-Change highlights in uncrustify4Qt-0.62 (Oct 2015)
--------------------------------------------------------------------------------
-New options:
- - use_indent_func_call_param
-
-
-Change highlights in uncrustify-0.62 (2 Feb 2016)
--------------------------------------------------------------------------------
-This release is just a roll-up of the past year.
-Many bugs were squashed and many options were added.
-
-New options:
- - string_replace_tab_chars
- - disable_processing_cmt
- - enable_processing_cmt
- - enable_digraphs
- - indent_class_on_colon
- - indent_shift
- - indent_min_vbrace_open
- - indent_vbrace_open_on_tabstop
- - sp_after_mdatype_commas
- - sp_before_mdatype_commas
- - sp_between_mdatype_commas
- - sp_cmt_cpp_doxygen
- - sp_cmt_cpp_qttr
- - sp_between_new_paren
- - nl_while_leave_one_liners
- - nl_synchronized_brace
- - nl_before_synchronized
- - nl_after_synchronized
- - nl_after_label_colon
-
-
-Change highlights in uncrustify-0.61 (22 Dec 2014)
--------------------------------------------------------------------------------
-This release is just a roll-up of the past two years.
-Many bugs were squashed and many options were added.
-
-New options:
- - indent_paren_open_brace
- - indent_namespace_single_indent
- - indent_constr_colon
- - indent_oc_msg_prioritize_first_colon
- - indent_oc_block_msg_xcode_style
- - indent_oc_block_msg_from_keyword
- - indent_oc_block_msg_from_colon
- - indent_oc_block_msg_from_caret
- - indent_oc_block_msg_from_brace
- - sp_enum_paren
- - sp_cparen_oparen
- - sp_after_ptr_star_qualifier
- - sp_after_constr_colon
- - sp_before_constr_colon
- - sp_fparen_dbrace
- - sp_word_brace
- - sp_word_brace_ns
- - sp_cond_colon_before
- - sp_cond_colon_after
- - sp_cond_question_before
- - sp_cond_question_after
- - sp_cond_ternary_short
- - align_keep_extra_space
- - nl_cpp_lambda_leave_one_liners
- - nl_brace_square
- - nl_brace_fparen
- - nl_constr_init_args
- - nl_cpp_ldef_brace
- - nl_paren_dbrace_open
- - nl_constr_colon
- - pos_constr_comma
- - pos_constr_colon
- - mod_add_long_namespace_closebrace_comment
- - cmt_convert_tab_to_spaces
-
-
-Change highlights in uncrustify-0.60 (1 Jan 2013)
--------------------------------------------------------------------------------
-Objective C support was greatly enhanced in this release.
-Many bugs were squashed and many options were added.
-
-New options:
- - align_oc_msg_colon_first
- - align_pp_define_together
- - indent_ctor_init_leading
- - indent_func_def_force_col1
- - indent_oc_block
- - indent_oc_block_msg
- - indent_oc_msg_colon
- - ls_code_width
- - nl_after_annotation
- - nl_before_return
- - nl_between_annotation
- - nl_brace_struct_var
- - nl_oc_msg_args
- - nl_oc_msg_leave_one_liner
- - nl_remove_extra_newlines
- - nl_scope_brace
- - nl_typedef_blk_end
- - nl_typedef_blk_in
- - nl_typedef_blk_start
- - nl_unittest_brace
- - nl_var_def_blk_end
- - nl_var_def_blk_in
- - nl_var_def_blk_start
- - nl_version_brace
- - sp_after_for_colon
- - sp_after_oc_dict_colon
- - sp_after_oc_msg_receiver
- - sp_after_oc_property
- - sp_after_throw
- - sp_after_tparen_close
- - sp_annotation_paren
- - sp_before_for_colon
- - sp_before_oc_dict_colon
- - sp_before_pp_stringify
- - sp_before_template_paren
- - sp_cpp_lambda_assign
- - sp_cpp_lambda_paren
- - sp_extern_paren
- - sp_inside_sparen_open
- - sp_inside_tparen
- - sp_permit_cpp11_shift
- - sp_ptr_star_paren
-
-Changed default:
- - sp_pp_stringify = ignore (was add)
-
-See commit.log for details.
-
-
-Change highlights in uncrustify-0.59 (4 Oct 2011)
--------------------------------------------------------------------------------
-The biggest change in this release was to rework the string handling to add
-proper support for UTF-8 and UTF-16.
-
-New options:
- - nl_case_colon_brace
- - indent_ctor_init
- - sp_before_tr_emb_cmt
- - sp_num_before_tr_emb_cmt
- - utf8_bom
- - utf8_byte
- - utf8_force
- - sp_after_new
- - nl_after_struct
- - nl_after_class
- - nl_property_brace
- - nl_after_func_body_class
-
-See commit.log for details.
-
-
-Change highlights in uncrustify-0.58 (19 May 2011)
--------------------------------------------------------------------------------
-New options:
- - tok_split_gte
- - sp_catch_paren
- - sp_scope_paren
- - sp_version_paren
- - cmt_insert_oc_msg_header
-
-See commit.log for details.
-
-
-Change highlights in uncrustify-0.57 (25 Nov 2010)
--------------------------------------------------------------------------------
-New options:
- - sp_func_call_paren_empty
- - nl_func_def_start
- - nl_func_def_start_single
- - nl_func_def_paren
- - nl_func_def_args
- - nl_func_def_empty
- - nl_func_def_end
- - nl_func_def_end_single
-
-See commit.log for details.
-
-
-Change highlights in uncrustify-0.56 (27 Mar 2010)
--------------------------------------------------------------------------------
-New options:
- - indent_continue
- - indent_cmt_with_tabs
- - indent_first_bool_expr
- - indent_braces_no_class
- - indent_braces_no_struct
- - indent_var_def_cont
- - sp_assign_default
- - sp_after_oc_at_sel_parens
- - sp_inside_oc_at_sel_parens
- - align_oc_decl_colon
- - nl_after_vbrace_close
- - nl_using_brace
- - mod_full_brace_using
-
-See commit.log for details.
-
-
-Change highlights in uncrustify-0.55 (27 Nov 2009)
--------------------------------------------------------------------------------
- - See the GIT history for a full list of changes
- - Fix align_left_shift with array indexes
- - Objective C changes (Andre Berg)
- - Fix a close paren added inside a preprocessor line
- - Fix handling of 'mutable'
- - New options
-   - sp_endif_cmt
-   - nl_func_decl_start_single
-   - nl_func_decl_end_single
-   - nl_after_vbrace_open_empty
- - Improved options
-   - sp_before_ellipsis
-   - nl_struct_brace
-   - align_on_tabstop
-   - align_with_tabs
-   - align_left_shift
-   - nl_func_type_name
-   - nl_create_if_one_liner
-   - pos_assign
-
-
-Changes in uncrustify-0.54 (16 Oct 2009)
--------------------------------------------------------------------------------
- - Add mod_case_brace
- - Add sp_after_semi_for and sp_after_semi
- - Add align_oc_msg_colon
- - ObjC: Do not set the parent of everything in a message at OC_MSG (was breaking casts)
- - ObjC: sp_before_square does not apply in "if (i < [a count])"
- - Fix crash bug in chunk_get_prev() at the start of the file
- - Fix issue with #if COND followed by a cast on the next line
- - Add nl_func_decl_empty
- - Add nl_func_type_name_class
- - Add cmt_reflow_mode (Ger Hobbelt)
- - A case statement starts an expression. Fixes "case -1:"
- - Improve semicolon removal test
- - fix marking of brace/paren pairs that have a preproc inside
- - fix nl_func_type_name where the return type contains a template
- - Add mod_full_brace_if_chain
- - fix detection of deref in a macro function
- - fix detection of "std::vector<void (*)(void)> functions;"
- - Remove extra semicolons on an 'else if'
- - Add sp_before_ellipsis
- - treat a constructor the same as a function regarding nl_func_decl_*
- - Add nl_brace_brace
- - Allow any number of spaces between multi-line comments when combining them
- - Add pos_compare
- - Add pos_conditional
- - Fix indent_relative_single_line_comments
- - Add sp_after_oc_return_type and sp_after_oc_at_sel (Andre Berg)
- - Add indent_namespace_level (James LewisMoss)
- - Add indent_namespace_limit (Maciej Libera)
-
-
-Changes in uncrustify-0.53 (16 May 2009)
--------------------------------------------------------------------------------
- - Fix sp_inside_braces* options, which were broken by the fix to issue #2629652
- - Fix sp_after_cast, which was broken by a previous fix
- - Be a little more agressive in removing unecessary semicolons
- - Fix one case where the parser leaves a preprocessor #define
- - Fix indent of line starting with '(' after a function name
- - Add align_var_def_attribute
- - Fix nl_func_type_name for function without a return type (ie, cast operator)
- - Reset up state variables after processing a file
- - Fix a case where a semicolon was incorrectly removed
- - Fix a case where braces were incorrectly removed
- - Fix handling of 'force' setting for many newline options
- - Add func_wrap type for use with 'set func_wrap FSUB'
- - Add type_wrap type for use with 'set type_wrap STACK_OF'
- - Make file replacement more atomic - write to a temp file then rename
- - With the 'replace' option, only replace if the file content changes
- - Handle C# wide literal string prefix S"foo"
- - Handle the ObjC '@protocol' the same as '@interface'
- - Add 'make check' and 'make clean' (Ger Hobbelt)
- - Add align_right_cmt_at_col (Ger Hobbelt)
- - Add sp_pp_concat and sp_pp_stringify (Ger Hobbelt)
- - Add mod_add_long_ifdef_{else,endif}_comment (Ger Hobbelt)
- - Objective C improvements (Etienne Samson)
- - Only mess with escaped newlines in a comment if inside a preprocessor
- - Fix pos_xxx options when a preprocessor is near
- - Apply Debian patch to man file
- - Fix '<<' indenting/aligning (moved from indent.cpp to align.cpp)
- - Rework the sp_before_nl_cont option
- - Fix a few other bugs
-
-
-Changes in uncrustify-0.52 (28 Feb 2009)
--------------------------------------------------------------------------------
- - Add sp_before_assign and sp_after_assign
- - Add sp_enum_before_assign and sp_enum_after_assign
- - Add indent_var_def_blk
- - Add sp_inside_sparen_close for the 'CGAL' style
- - First pass at supporting ECMAScript (.es) files
- - Add support for the C# '??' operator
- - Fix conflict between nl_after_func_proto_group and nl_squeeze_ifdef
- - Add sp_cmt_cpp_start
- - Add align_on_operator
- - Fix nl_func_type_name for operators
- - Allow '$' to be part of identifiers (global change)
- - Fix detection of the '*' in 'int a = b[0] * c;'
- - Fix and improve the description of nl_multi_line_cond
- - Fix handling of global namespace type such as '::sockaddr'
- - Add nl_after_brace_close
- - Add nl_func_scope_name
- - Add cmt_insert_file_footer
-
-
-Changes in uncrustify-0.51 (27 Nov 2008)
--------------------------------------------------------------------------------
- - Prefer to split at ',' and then '=' in for() statements if at paren level
- - Fix a NULL deref crash
- - Fix nl_namespace_brace when something trails the open brace
- - Get sp_after_sparen and sp_sparen_brace to play well together
- - Ignore trailing comments when inserting the function header comment
- - Combine two C comments when they have no space between them "/***//***/"
- - Add cmt_insert_before_preproc
- - Add mod_remove_empty_return
- - Add nl_comment_func_def
- - Fix aligning of anonymous bit fields
- - Add indent_align_assign
- - Add sp_before_case_colon
- - Fix D 'invariant' handling
- - Add sp_invariant_after_paren and sp_invariant_paren
- - Fix handling of the C# [assembly: xxx] construct
- - Fix handling of the C# 'base()' construct
- - Add sp_range for the D '..' range operator as in [start .. end]
- - Update $(fclass) and $(function) to handle operators
- - Improve handling of inserted comments
- - Enable 'finally' blocks for C#
- - Add nl_after_try_catch_finally
- - Add nl_between_get_set and nl_around_cs_property
-
-
-Changes in uncrustify-0.50 (25-Oct-2008)
--------------------------------------------------------------------------------
- - Fix sp_before_unnamed_ptr_star in 'char ** n'
- - Fix crash when a open brace is at the end of a file
- - ObjC class definitions do not need { }
- - Fix ObjC msg detection
- - Add sp_after_ptr_star_func, sp_before_ptr_star_func
- - Add sp_after_byref_func, sp_before_byref_func
- - Treat an ObjC msg decl more like a function def
- - Add indent_func_const, indent_func_throw (Thanks, Ron)
- - Fix detection of prototype inside extern or namespace braces
- - Add align_left_shift to handle aligning of '<<'
- - Add sp_cpp_cast_paren
- - Add support for ObjC '@property' statements
- - Add sp_brace_typedef and sp_case_label
- - Merge in the lastest UniversalIndent support (Thanks, Thomas!)
- - Fix extra '\r' in multi-line comments and strings
- - Add sp_throw_paren
- - Assume a '<' in a preprocessor can't be part of a template
- - Don't align a constructor with class variables
- - Fix ending column error when tokenizing strings
-
-
-Changes in uncrustify-0.49 (22-Aug-2008)
--------------------------------------------------------------------------------
- - Allow the MSVC++ '64' suffix on numbers
- - Initialize align_stack class members for the MSVC++ compiler
- - Indent a line that starts with '='
- - Add pos_arith and pos_assign (Thanks, Ron!)
- - Fix pos_bool & code_width interaction (Thanks, Ron!)
- - Fix cmt_width, which was going one word over the limit. (Thanks, Ron!)
- - Major rework of the aligning code to better handle the gap options
- - Indent comments before 'case' at the same level as 'case'
- - mod_add_long_*_closebrace_comment adds the right comment type. (Thanks, Ron!)
- - Relax number parsing even further to accept stuff like "3A"
- - Add sp_after_oc_colon (Thanks, Kevin!)
- - Add better detection and labeling of Objective C messages
- - Add sp_after_send_oc_colon and sp_before_send_oc_colon (Thanks, Kevin!)
- - Fix detection of '*' in "return n * f();"
- - Add the 'set' config option which lets you create arbitrary keywords
- - Add sp_func_call_user_paren and the 'func_call_user' keyword type
-
-
-Changes in uncrustify-0.48 (18-Jul-2008)
--------------------------------------------------------------------------------
- - Fix classification of '(' in '#if defined (FOO)'
- - Add sp_defined_paren
- - Fix handling of negative in '#if X < -1'
- - Revert a change that broke indent continuation in an assignment
- - Fix interaction between nl_squeeze_ifdef and nl_after_{if,for,while,switch,do}
- - Preprocessor indents are indents, so indent_with_tabs=1 should do tabs
- - Add pp_indent_count
- - Handle C++ style casts, such as 'int(42.0)' a bit better
- - Another rework of template detection
- - Add sp_before_nl_cont, defaults to 'add'
- - If a statement starts with 'operator', it is a function call
- - Change sp_angle_word to be more generic
- - Add sp_after_operator_sym for "operator ++(" vs "operator ++ ("
- - Add sp_template_angle for "template<" vs "template <"
- - Add support for " *INDENT-OFF* " and " *INDENT-ON* "
- - Shuffle around spacing priorities
- - Add handling for '...' in variadic templates
- - Extend nl_template_class to handle anything after 'template <...>'
- - Treat the template '<' the same as '(' for indenting
- - Add indent_template_param
- - Split internal CT_CAST into CT_C_CAST, CT_CPP_CAST and CT_D_CAST
- - Swap priority of sp_after_angle and sp_before_ptr_star
- - Change cmt_multi_indent=false to disable all reformatting (needs more work)
- - Fix align_var_def_span - it wasn't counting newlines when it recursed
- - Add nl_else_if
- - mod_full_brace_if: Don't remove braces around certain 'else' statements
- - Tweak template detection a bit more
- - Rework and simplify multi-line comment indenting
- - Add indent_else_if
- - Improve right-comment aligning
- - Fix detection of functions with a 'const' return type
- - Add sp_cond_colon and sp_cond_question
- - Fine-tune the right comment align stuff
- - Add cmt_multi_check_last
- - Add align_right_cmt_gap
- - Add nl_return_expr
- - Indent FPAREN_OPEN if after a newline but not before a newline
- - Give sp_after_operator_sym priority over sp_func_call_paren
- - Add align_same_func_call_params
-
-
-Changes in uncrustify-0.47 (06-Jun-2008)
--------------------------------------------------------------------------------
- - Fix inifinite loop bug in reindent_line
- - Fix prototype detection with template parameter types
- - Fix off-by-1 error on positive values for indent_access_spec and indent_label
- - Add indent_extern to control indent extern-type namespaces
- - Add initial support for Objective C++ (extension '.mm')
- - Add nl_before_throw and indent 'throw' if after a prototype
- - Extend line numbers to 32 bits (used for logging)
- - Remove alternate token support for '<%', '%>', '<:', ':>', '%:', and '%:%:'
- - Fix recently-broken mixing of right-comment aligning (PP_ENDIF/PP_ELSE issue)
- - Indent a 'break' that follows a fully-braced 'case' at the level of the
-   close brace
- - Add mod_move_case_break
- - Fix '&' and '*' after 'delete'
- - Escape opening '/*' when converting C++ comments to C comments
- - Add sp_inside_braces_empty
- - Fix cmt_sp_after_star_cont
- - Fix cmt_sp_before_star_cont
- - Explicitly disallow a tab after a space
- - Improve multi-line comment indenting a bit
- - Add sp_before_unnamed_byref and sp_before_unnamed_ptr_star
-
-
-Changes in uncrustify-0.46 (22-Apr-2008)
--------------------------------------------------------------------------------
- - Load the config file, if available, before handling '--universalindent'
- - Add align_var_def_gap, align_var_def_colon_gap, align_var_struct_gap,
-   align_func_proto_gap, align_mix_var_proto, align_single_line_brace_gap
- - (internal) Eliminate the 'trailer' stuff, simplify aligning
-
-
-Changes in uncrustify-0.45 (7-Mar-2008)
--------------------------------------------------------------------------------
- - Fix buffer overflow in logger code
- - Add sp_enum_assign
- - For elipses handling in the GCC extension "case 1 ... 5:"
- - Add sp_after_class_colon, sp_before_class_colon, and sp_after_type
- - Send usage text to stdout instead of stderr
- - Fix mod_add_long_function_closebrace_comment if the file doesn't end in a newline
- - Redo alignments after splitting long lines
- - Add indent_relative_single_line_comments
- - Add indent_access_spec_body
- - Fix indent_func_proto_param to work on constructors
- - Add cmt_indent_multi
- - Add align_single_line_brace and align_single_line_func
- - Fix interaction of virtual braces and #pragma
- - Fix indenting problem with an assignment the last part of a for()
- - Fix the order of opening files so that '-f' and '-o' can be used together
- - Added a man file
- - Many improvements thanks to Stas Grabois
- - Fix a D problem due the lack of semicolons after struct/enum definitions
- - Improve the way aligning is done
-
-
-Changes in uncrustify-0.44 (12-Feb-2008)
--------------------------------------------------------------------------------
- - Fix issue with #else and unmatched braces (issue 1868493)
- - Update UnivarsalIndentGUI config output
- - Add the version to generated config files
- - Add nl_multi_line_define
- - Minimize distance between code and the backslash-newline in macros
- - Properly handle stuff like '#define MYHEADER <asm/arm.h>'
- - Fix detection of 'int foo(int);' in C++ (func proto, not class variable)
- - Improve handling of multi-line comments in a macro
- - Fix crash bug with some ctype implementations
- - Fix incorrect indenting of nested #endif with pp_if_indent_code
- - Fix problem with nl_after_if and nl_before_if w/ trailing comments
-
-
-Changes in uncrustify-0.43 (08-Jan-2008)
--------------------------------------------------------------------------------
- - Add align_right_cmt_mix to control aligning of comments after '}' and '#endif'
- - Allow a line split after an assignment
- - Fix infinite loop bug
- - Add sp_sign and sp_incdec
- - Fix vbrace conversion where some are converted and some aren't
- - Add a vbrace before a #pragma instead of after
- - Improve Objective C support
- - Add sp_before_oc_colon, sp_after_oc_scope, and sp_after_oc_type for ObjC
- - Add align_oc_msg_spec_span for ObjC
- - Add sp_member for spacing around '->' and '.'
- - More template handling improvements
- - Fix a NULL dereference related to __attribute__
-
-
-Changes in uncrustify-0.42 (30-Nov-2007)
--------------------------------------------------------------------------------
- - Fix bug that would remove a newline after a C++ comment
- - Add "--mtime" command line option to preserve the mtime
- - Remove extra semicolons before inserting newlines after semicolons
- - Fix broken struct initializer alignment
- - Fix problem with pos_class_comma in a #define
- - Fix problem with an incomplete statement in a #define and virtual braces
- - Add indent_func_proto_param and indent_func_def_param
- - Add nl_func_proto_type_name, split from nl_func_type_name
- - Add mod_add_long_switch_closebrace_comment, mod_add_long_function_closebrace_comment
- - Add mod_sort_import to sort import statements (Java/D)
- - Add mod_sort_using to sort using statements (C#)
- - Add mod_sort_include to sort #include (C/C++) and #import (ObjC) statements
- - Add indent_func_class_param, indent_func_ctor_var_param, and
-   indent_func_param_double
- - Fix inserting a newline before a preprocessor
- - Don't split empty function parens for code_width stuff
-
-
-Changes in uncrustify-0.41 (07-Nov-2007)
--------------------------------------------------------------------------------
- - Add cmt_insert_func_header, cmt_insert_file_header, and cmt_insert_class_header
- - Fix detection of prototypes without named parameters
- - sp_after_byref and sp_after_ptr_star only are applied if before a word
- - internal rework
- - Add pp_define_at_level
- - Fix detection of deref in "sizeof *x"
- - Fix broken output of backslash-newline in certain situations
- - Fix pp_indent_if stuff
- - Add nl_after_brace_open_cmt
- - Properly handle anonymous namespaces
- - Add pp_space_count
-
-
-Changes in uncrustify-0.40 (12-Oct-2007)
--------------------------------------------------------------------------------
- - Simplify preprocessor indenting
- - Add pp_indent_region and pp_region_indent_code
- - Add pp_indent_at_level
- - Add pp_indent_if and pp_if_indent_code
- - Add initial VALA support
- - Fix a problem with mod_full_paren_if_bool and functions
- - Add nl_func_paren
- - Fix function type parameter marking (broken in the last few releases)
- - Don't remove newline chunks before/after a preprocessor
-
-
-Changes in uncrustify-0.39 (25-Sep-2007)
--------------------------------------------------------------------------------
- - Improve conversion operators
- - Prevent undesired chunk combining ("~ ~" vs "~~" in D)
- - Add nl_after_multiline_comment
- - Fix handling of try/catch/finally blocks in virtual braces
- - Add sp_inv, sp_not, sp_addr, sp_deref (default to remove)
- - Fix nl_class_brace
- - Fix indent_func_call_param
- - Add nl_create_if_one_liner, nl_create_for_one_liner, nl_create_while_one_liner
- - Add indent_preserve_sql
- - Fix one-liner detection with multiple statements on one line
- - Add nl_func_leave_one_liners and nl_if_leave_one_liners
- - More template improvements
-
-
-Changes in uncrustify-0.38 (04-Sep-2007)
--------------------------------------------------------------------------------
- - Fix line splitting WRT the CT_SPACE token
- - Improve function call/prototype/definition detection
- - Fix some spacing issues
- - More template improvements
- - Allow for a C++ struct constructor
- - Add nl_before_access_spec and nl_after_access_spec
- - Add cmt_width, cmt_c_group, cmt_c_nl_start, cmt_c_nl_end
- - Handle conversion operators
-
-
-Changes in uncrustify-0.37 (16-Aug-2007)
--------------------------------------------------------------------------------
- - A bunch of D language improvements
- - Add sp_d_array_colon, nl_assign_square, nl_after_square_assign
- - Fix static keyword sort order
- - Improve typedef detection and aligning
- - Split nl_ds_struct_enum_close_brace out of nl_ds_struct_enum_cmt
- - Add indent_paren_close
- - Add indent_comma_paren and indent_bool_paren
-
-
-Changes in uncrustify-0.36 (04-Aug-2007)
--------------------------------------------------------------------------------
- - Add nl_after_vbrace_open
- - Improve option descriptions
- - Fix seg faults (check for NULL)
- - Fix spacing for operators () and []
- - Add sp_before_dc and sp_after_dc to control spacing around '::'
- - Split pos_class_comma from pos_comma
- - Improve line splitting a little - no longer break at '::' or '->' or '.'
- - Add nl_enum_leave_one_liners and nl_getset_leave_one_liners
- - Add mod_remove_extra_semicolon
- - Fix handling of macro-open and macro-close
- - Add align_var_struct_thresh
- - Improve handling of comments after braces
- - Add support for Qt slots and signals
- - Add align_typedef_amp_style and align_var_def_amp_style
- - Add sp_attribute_paren and handling of the '__attribute__' macro
- - Add align_typedef_func, improve aligning of typedefs
- - Add sp_after_semi_for_empty
-
-
-Changes in uncrustify-0.35 (14-Jul-2007)
--------------------------------------------------------------------------------
- - Fix bug with nl_func_type_name and empty param list: int foo() { ... }
- - Don't parse pragma bodies
- - Properly indent multiline #error and #warning
- - Change nl_after_func_body to force the newline count (was a minimum)
- - Fix handling of CT_PTR_STAR when all options are AV_IGNORE
- - Fix problem when the first token in the file isn't in column 1
- - Properly mark catch clauses that contain parameters, ie catch (Exception *e)
- - Add a newline after the open brace for nl_catch_brace, nl_do_brace,
-   nl_else_brace, nl_try_brace, nl_getset_brace, nl_finally_brace
- - Add nl_multi_line_cond
- - Fix a bug with mod_full_paren_if_bool
- - Fix handling of templated variables: Buffer<T>* buf
- - Fix handling of dynamic_cast<T*>(obj) stuff
- - Fix detection of templates in for() statements:
-   for (std::map<Key, Value*>::iterator it = map.begin(); ...
- - Add --no-backup command-line option to replace w/o a backup file
- - Fix nl_class_leave_one_liners when set to false
- - Add nl_class_colon, which split the functionality of nl_class_init_args
- - Improve detection of reference variable declarations (A& B)
-
-
-Changes in uncrustify-0.34 (11-May-2007)
--------------------------------------------------------------------------------
- - Add sp_angle_paren and sp_angle_word
- - Properly handle multi-line CPP comments
- - Add sp_inside_paren_cast
- - improve indent_class_colon
- - fix indenting on open parens
- - Add sp_before_semi_for_empty
- - Fix detection of while if the do is in a preprocessor chunk (1675673)
- - (pawn) Don't add vsemi after case/switch brace close (1684840)
- - Add nl_assign_leave_one_liners to allow "foo_t foo = { 0, 1 };"
- - Change handling of #region stuff so that it is indented at brace level
- - Fix handling of missing semicolon after while-of-do.
- - Fix crash-bug in handling bad code: "if (a && );"
- - Add pos_comma
-
-
-Changes in uncrustify-0.33 (05-Mar-2007)
--------------------------------------------------------------------------------
- - Fix converting C++ comments with embedded C comments
- - Fix nl_func_var_def_blk with class variables
- - Fix some output issues with the 1st line and C++ comments
- - Eliminate indent_case_body, which wasn't used
- - Change rules for indenting case braces and the use of indent_case_brace
- - Fix variable declaration detection at the start of a code block
- - Add support for custom open/close indenting macros
-   MACRO_OPEN, MACRO_ELSE, MACRO_CLOSE
- - Fix the config updating routines to NOT lose custom types and stuff
- - Add nl_after_func_body_one_liner
- - Fix nl_class_init_args
- - Add --universalindent option to output an ini file for UniversalIndentGUI
-
-
-Changes in uncrustify-0.32 (20-Feb-2007)
--------------------------------------------------------------------------------
- - Enable align_proto_var_def for constructors
- - Fix while-of-do handling inside virtual braces
- - Fix problem with comments between a close brace and else
- - Add sp_before_comma
- - Change align_var_def_star to align_var_def_star_style
- - Change align_proto_var_def to align_func_params
- - Add ls_func_split_full and ls_for_split_full
- - Rework code width code a bit
- - Start Objective C support
- - Add cmt_sp_before_star_cont and cmt_sp_after_star_cont
- - Fix spacing between (( and ))
- - Add nl_try_brace, nl_catch_brace, nl_finally_brace, nl_brace_catch,
-   nl_brace_finally, sp_catch_brace, sp_brace_catch, sp_finally_brace,
-   sp_brace_finally, sp_try_brace
- - Treat typedef functions the same as other function for param aligning
- - Turn any word after a enum/struct/union into a type
- - Add sp_getset_brace and nl_getset_brace
- - Add mod_full_paren_if_bool
- - Add nl_before_c_comment and nl_before_cpp_comment
- - Fix nl_class_leave_one_liners
- - Add nl_ds_struct_enum_cmt
- - Add sp_balance_nested_parens
-
-
-Changes in uncrustify-0.31 (24-Jan-2007)
--------------------------------------------------------------------------------
- - Improve mixed tab indent / space align
- - Try to fix spacing around embedded comments
- - Add indent_access_spec
- - Add __func__ and __FUNCTION__ detection for non-C99 compilers
- - General code cleanup (Thanks Tom!)
- - Add indent_xml_string
- - Add align_proto_var_def to align variables in prototypes
-
-
-Changes in uncrustify-0.30 (24-Nov-2006)
--------------------------------------------------------------------------------
- - Use environment variable UNCRUSTIFY_CONFIG if no '-c' option (non-WIN32)
- - Default to ~/.uncrustify.cfg if no '-c' option and no env var (non-WIN32)
- - Add '-q' option to the usage info
- - Added initial embedded SQL support
- - Many bug fixes
- - New options: indent_braces_no_func, indent_sing_line_comments, nl_before_if,
-   nl_before_for, nl_after_for, nl_before_while, nl_after_while,
-   nl_before_switch, nl_after_switch, nl_before_do, nl_after_do
-
-
-Changes in uncrustify-0.29 (26-Oct-2006)
--------------------------------------------------------------------------------
- - Add support for the 'Klaus' style
- - Fix a bunch of c++ template bugs
- - Add option nl_class_leave_one_liners
-
-
-Changes in uncrustify-0.28 (06-Oct-2006)
--------------------------------------------------------------------------------
- - Fix D range array detection a[1..4] => a[1 .. 4]
- - Fix D delegate variable aligning
- - More documentation updates (thanks Dirk!)
- - New options: nl_after_semicolon and nl_after_open_brace
-
-
-Changes in uncrustify-0.27 (23-Sep-2006)
--------------------------------------------------------------------------------
- - Improve template detection again (allow CT_TYPE in a template)
- - Fix bad formatting in "[ABC * 123]" and "[0xf & *val]"
- - Add --replace option to convert files in-place
- - Use a map for the options
- - Major configuration/option cleanup
- - add -o option to write to a file instead of stdout
-
-
-Changes in uncrustify-0.26 (09-Sep-2006) (removed a number from the version)
--------------------------------------------------------------------------------
- - Fix preprocessor labeling WRT comments
- - Fix an indenting problem
- - Add sp_after_byref
- - Fix alignment of global variable definitions
- - Fix detection of deref inside squares: a[*p]
- - Fix a weird indenting bug
- - Fix D template ! spacing
- - Add sp_after_operator
- - Add nl_template_class
- - Add start to detailed docs inside the program
- - Add --prefix and --suffix command line args
- - Add align_enum_equ_thresh and fix align_enum_equ_span
- - Fix formatting of function typedefs
- - Add indent_member
- - Simplify the indenting code a bit
- - Improve type_cast stuff (ie, dynamic_cast<> or static_cast<>) and templates
-
-
-Changes in uncrustify-0.0.25 (26-Aug-2006)
--------------------------------------------------------------------------------
- - Add sp_after_ptr_star, sp_before_ptr_star, sp_between_ptr_star
- - Fix D tokenizing for numbers and strings
- - Fix a bug with cast detection and with nl_after_func_proto
- - Improve template detection
- - Rename nl_bool_pos to pos_bool
- - Add pos_class_colon
- - Add indent_class_colon
- - Add nl_class_init_args
- - Add nl_collapse_empty_body
- - Add indent_square_nl
-
-
-Changes in uncrustify-0.0.24 (05-Aug-2006)
--------------------------------------------------------------------------------
- - Add initial PAWN support (thanks to Derek Evan Mart for testing and motivation!)
- - Fix parsing of numbers like 10.0
- - Fix double negative (- -x) vs (--x)
- - Add ability to convert C++ (//) comments into C (/* */) comments
- - Fix usage of indent_columns; output_tab_size is only needed if using tabs
- - Add first small step in code width handling
- - New options: sp_fparen_brace, sp_macro, sp_marco_func,
-   nl_elseif_brace, mod_pawn_semicolon, cmt_cpp_to_c, cmt_cpp_group,
-   cmt_cpp_nl_start, cmt_cpp_nl_end, sp_after_tag
-
-
-Changes in uncrustify-0.0.23 (22-Jul-2006)
--------------------------------------------------------------------------------
- - Fix some crash bugs and some formatting problems
- - Fix Windows CRLF issues (binary vs text mode)
- - Add indent_class and indent_namespace
- - Add nl_class_brace and nl_namespace_brace
- - Add handling of operator stuff in CPP
- - Improve the test script a bit
- - Add sp_inside_fparens
- - Add ability to define types in the config file
- - Started work on improving #ifdef handling by evaluating the preprocessor
-
-
-Changes in uncrustify-0.0.22 (15-Jul-2006)
--------------------------------------------------------------------------------
- - Implement nl_max, nl_before_block_comment, nl_after_func_body,
-    nl_after_func_proto, nl_after_func_proto_group
- - Improve detection of function prototypes
- - Improve marking of function prototype-related tokens
- - Improve variable definition aligning
- - fix align_var_def threshold
- - Improve handling of "private:" style stuff
- - Handle types with "::" in them
- - Add preprocessor spacing and indenting
- - Fix tab indenting style 1 (tab indent, space align)
- - Improve multi-line comment formatting
-
-
-Changes in uncrustify-0.0.21 (01-Jul-2006)
--------------------------------------------------------------------------------
- - Clean up some memory leaks & uninitialized variables
- - Add option to process multiple files at once
- - Change the newlines values from [UNIX, DOS, MAC] to [LF, CRLF, CR]
- - Properly mark the parens for functions
- - Implement control over the format of the function prototypes and definitions
- - Update configuration.txt
-
-
-Changes in uncrustify-0.0.20 (10-Jun-2006)
--------------------------------------------------------------------------------
- - Fix cast on a sizeof: (INT32)sizeof(x)
- - Fix this: "#define SOME_JUNK /*lint -e123 */(const mytype_t *)-1"
- - Don't align function typedefs (fixed again)
- - Finally fix the DOS and MAC line-ending support
- - Add line-ending autodetection
- - Add Windows build support
-
-
-Changes in uncrustify-0.0.19 (27-May-2006)
--------------------------------------------------------------------------------
- - Fix C/C++/C# casts
- - Improve D casts
-
-
-Changes in uncrustify-0.0.18 (12-May-2006)
--------------------------------------------------------------------------------
- - Add nl_bool_pos to move boolean ops between eol and sol
- - Improve C99 array initializer aligning/formatting
- - Replace nl_eat_start, nl_eat_end, and nl_eof_min with nl_start_of_file,
-   nl_start_of_file_min, nl_end_of_file, and nl_end_of_file_min
-
-
-Changes in uncrustify-0.0.17 (03-May-2006)
--------------------------------------------------------------------------------
- - Add nl_eat_start to remove newlines at the start of the file
- - Add nl_eat_end to remove newlines at the end of the file
- - Add nl_eof_min to set the minimum number of newlines at the end of file
- - Add newlines setting to configure the newline output
- - Add '-q' command line option to turn off logging
- - Fix bug in nl_func_var_def_blk handling
-
-
-Changes in uncrustify-0.0.16 (21-Apr-2006)
--------------------------------------------------------------------------------
- - Add a stack alignment helper class
- - Improve typedef formatting
- - Add aligning thresholds for typedefs and assignments
- - update the automake/autoconf stuff
-
-
-Changes in uncrustify-0.0.15 (14-Apr-2006)
--------------------------------------------------------------------------------
- - Switch to C++
- - Improve C++ template formatting
- - Improve C++ class handling
-
-
-Changes in uncrustify-0.0.14 (09-Apr-2006)
--------------------------------------------------------------------------------
- - Read from stdin if no file is specified
- - Build on OS X
-
-
-Changes in uncrustify-0.0.13 (07-Apr-2006)
--------------------------------------------------------------------------------
- - Rewrite the indent code
- - Fix a bunch of small problems with C casts
- - Rename a few files
- - Add more tests
-
-
-Changes in uncrustify-0.0.12 (30-Mar-2006)
--------------------------------------------------------------------------------
- - Add support for D template format "Foo!(int,char)"
- - Fix a format bug in a log
- - Fix elipsis spacing (remove space before elipsis)
- - Don't use getopt as it isn't all that portable (at least for QNX)
- - Rename some files
- - Bugfix: don't add virtual braces on the same line as a preprocessor
- - Bugfix: clean up indexed array aligning
-
-
-Changes in uncrustify-0.0.11 (27-Mar-2006)
--------------------------------------------------------------------------------
- - fix brace analysis on else statement
- - allow options to depend on other options
- - set the parent for case braces
- - handle/indent the C++ class colon thingy
- - handle C++ constructors and function defs
- - special handling for '::' operator
- - implement case indenting
- - handle cout '<<' indenting
- - handle DOS and MAC line endings in multiline comments
- - rename some indent options
- - fix ifndef handling
- - fix volatile handling
- - fix private/public/protected 'label' handling
- - alternate punctuators are also part of C++
- - handle C++ wide L"strings"
- - improve C# get/set handling
- - fix spacing bug "a++;" vs "a ++;" due to statement start misdetect
- - add nl_assign_brace
- - fix parent of vbrace close
- - more test enhancements
-
-
-Changes in uncrustify-0.0.10 (22-Mar-2006)
--------------------------------------------------------------------------------
- - Complete rewrite of tokenizer and brace parser
- - Added support for D nested comments
- - Fixed some virtual brace bugs
- - Added some documentation for the brace parsing stuff
- - Add more tests to improve coverage (still lacking)
-
-
-Changes in uncrustify-0.0.9 (18-Mar-2006)
--------------------------------------------------------------------------------
- - Major enhancements for D
- - Add handling for special "[]" sequence for C#/D
- - add some more tests
-
-
-Changes in uncrustify-0.0.8 (13-Mar-2006)
--------------------------------------------------------------------------------
- - update TODO list
- - add a threshold for brace removal
- - improve brace removal
- - keep track of whether a token follows a tab
- - add option to preserve non-indenting tabs
- - major keyword and operator cleanup for C++, C#, D, and Java
- - add 'string' variants for ARITH, COMPARE, etc
- - add C# get/set detection
- - add template <type> detection
- - add colon handling for class stuff and anonymous bitfields
- - pop the whole indent stack when leaving a preprocessor
- - fix embedded return handling in C#, ie: [ this should return negative ]
- - fix a problem with the ifdef frame stack (still a problem lurking...)
- - handle literal strings (C#)
- - handle non-keyword words (C#) -- example: @if @switch
- - set the parent on 'do' braces
- - handle C# #region preprocessor stuff
- - partially implement align on tabstop
- - fix virtual brace spacing (no more "else return;" => "elsereturn;")
- - add some more tests
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/Comments.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/Comments.txt
deleted file mode 100644
index 5375e829..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/Comments.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-2016-04-25
-
-While a line is indented, the comment at the end of the line stays at the original column.
-
-If we have:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))
-      {                  // guy 2016-04-16
-
-where the brace { is at new line with a comment.
-The option nl_elseif_brace = remove
-gives:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-                 (pc->type == CT_FUNC_DEF) ||
-                 (pc->type == CT_FUNC_CLASS_PROTO) ||
-                 (pc->type == CT_FUNC_PROTO)) { // guy 2016-04-16
-If using at new the same option again with a new value
-nl_elseif_brace = add
-is not able to reconstruct the original source. The comment has changed the line:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))       // guy 2016-04-16
-      {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/HELP b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/HELP
deleted file mode 100644
index 83792fa5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/HELP
+++ /dev/null
@@ -1,58 +0,0 @@
--------------------------------------------------------------------------------
-HELP:
-
-Are you looking to help with uncrustify development? Great!
-
-Here are some tasks that need to be done:
-
-1. New features
-
-Look at the feature requests on the GitHub project site.
-  https://github.com/uncrustify/uncrustify
-
-Do any interest you?
-Most are easily done, but I haven't had the 'itch' to implement them.
-
-
-2. Test Coverage
-
-The test coverage right now is hardly adequate.
-I would appreciate it if someone could make sure that every option is
-tested and add tests as needed.
-Automated testing is good.  Without it, we can't detect regressions.
-Any option that doesn't have an associated test isn't really supported.
-
-
-3. Code cleanup
-
-I don't have much time to work on uncrustify.
-When I do, it is usually a short span - only an hour or two.
-This leads to unreachable code and doing the same thing in multiple places.
-
-Trace through the code and find these "problems".
-I found one the other day in do_space().  A new feature didn't work because
-several lines of code were not reachable.
-
-
-4. Code redesign
-
-Code gets ugly over time when new features are added willy-nilly.
-The problem is that the requirements are not known before the design is done.
-
-There are a few areas in particular that could benefit from a redesign.
-
-4a. brace_cleanup
-
-The code in brace_cleanup is ugly.  It works, but it is ugly.
-It was written with the assumption that there is no 'next' chunk.
-I had planned to merge that code in with the tokenizer.
-That didn't happen.
-So we are left with code that is more complicated than it needs to be.
-I haven't had the time or energy to revisit that code; I probably never will.
-If you'd like to take a stab at it... the would be wonderful.
-
-4b. indent_text
-
-I think this function could be reworked to better take advantage of the
-paren stack.
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/LIMITATIONS.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/LIMITATIONS.txt
deleted file mode 100644
index a49f23f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/LIMITATIONS.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Limitations in uncrustify are describe at the file
-
-src/uncrustify_limits.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/NEWS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/NEWS
deleted file mode 100644
index 8b6344a0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/NEWS
+++ /dev/null
@@ -1,2 +0,0 @@
-No news is good news!
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/README.md
deleted file mode 100644
index 6a3df72f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/README.md
+++ /dev/null
@@ -1,377 +0,0 @@
-[![Travis CI](http://badges.herokuapp.com/travis/uncrustify/uncrustify?style=flat-square&env=BADGE=linux&label=Linux&branch=master)](https://travis-ci.org/uncrustify/uncrustify)
-[![Travis CI](http://badges.herokuapp.com/travis/uncrustify/uncrustify?style=flat-square&env=BADGE=osx&label=OSX&branch=master)](https://travis-ci.org/uncrustify/uncrustify)
-[![AppVeyor](https://img.shields.io/appveyor/ci/uncrustify/uncrustify/master.svg?style=flat-square&label=Windows)](https://ci.appveyor.com/project/uncrustify/uncrustify)
-[![Coverity](https://scan.coverity.com/projects/8264/badge.svg)](https://scan.coverity.com/projects/uncrustify)
-[![Coverage Status](https://coveralls.io/repos/github/uncrustify/uncrustify/badge.svg?branch=master)](https://coveralls.io/github/uncrustify/uncrustify?branch=master)
-<a href="#"><img src="https://img.shields.io/badge/C++-11-blue.svg?style=flat-square"></a>
-
----------------------------
-
-# Uncrustify
-A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA
-
-## Features
-* Highly configurable - 753 configurable options as of version 0.73.0
-- <details><summary>add/remove spaces</summary>
-
-  - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._
-  - `sp_compare`: _Add or remove space around compare operator '<', '>', '==', etc_
-</details>
-
-- <details><summary>add/remove newlines</summary>
-
-  - `nl_if_brace`: _Add or remove newline between 'if' and '{'_
-  - `nl_brace_while`: _Add or remove newline between '}' and 'while' of 'do' statement_
-</details>
-
-- <details><summary>add/remove blanklines</summary>
-
-  - `eat_blanks_before_close_brace`: _Whether to remove blank lines before '}'_
-  - `nl_max`: _The maximum consecutive newlines (3 = 2 blank lines)_
-</details>
-
-- <details><summary>indent code</summary>
-
-  - `indent_switch_case`: _indent_switch_case: Spaces to indent 'case' from 'switch'_
-  - `indent_class_colon`: _Whether to indent the stuff after a leading base class colon_
-</details>
-
-- <details><summary>align code</summary>
-
-  - `align_func_params`: _Align variable definitions in prototypes and functions_
-  - `align_struct_init_span`: _The span for aligning struct initializer values (0=don't align)_
-</details>
-
-- <details><summary>modify code</summary>
-
-  - `mod_full_brace_for`: _Add or remove braces on single-line 'for' statement_
-  - `mod_paren_on_return`: _Add or remove unnecessary paren on 'return' statement_
-</details>
-
-Here is an example [configuration file](https://raw.githubusercontent.com/uncrustify/uncrustify/master/documentation/htdocs/ben.cfg.txt),
-and here is a [before](https://raw.githubusercontent.com/uncrustify/uncrustify/master/documentation/htdocs/examples/c-1.in.c)
-and [after](https://raw.githubusercontent.com/uncrustify/uncrustify/master/documentation/htdocs/examples/c-1.out.c)
-C source example.
-That should give you a pretty good idea of what Uncrustify can do.
-
-
-
-
-
----------------------------------------------------------------------------
-
-## Binaries
-Pre compiled binaries for Windows can be downloaded [here](https://sourceforge.net/projects/uncrustify/files/uncrustify/).
-
-## Build
-[Python](https://www.python.org/) is an "interpreted high-level programming language for general-purpose programming", for this project it is needed to extend the capabilities of CMake.
-
-[CMake](https://cmake.org/) is a tool that generates build systems
-(Makefiles, Visual Studio project files, Xcode project files and others).
-
-To generate a build system for Uncrustify using CMake, create a build
-folder and run CMake from it:
-
-```bash
-$ mkdir build
-$ cd build
-$ cmake ..
-```
-(Use `cmake -G Xcode ..` for Xcode)
-
-Then use the build tools of your build system (in many cases this will
-simply be `make`, but on Windows it could be MSBuild or Visual Studio).
-Or use CMake to invoke it:
-
-```bash
-$ cmake --build .
-```
-
-If testing is enabled, CMake generates a `test` target, which you can
-_build_ using your build system tools (usually `make test`). This can also
-be invoked using CTest:
-
-```bash
-$ ctest -V -C Debug
-```
-
-There is also an `install` target, which can be used to install the
-Uncrustify executable (typically `make install`).
-
-### A note on CMake configurations
-Some build systems are single-configuration, which means you specify the
-build type when running CMake (by setting the `CMAKE_BUILD_TYPE`
-variable), and the generated files then build that configuration.
-
-An example of a single-configuration build system are Makefiles. You can
-build the Release configuration of Uncrustify (from the build folder) with:
-
-```bash
-$ cmake -DCMAKE_BUILD_TYPE=Release ..
-$ make
-```
-
-Other build systems are multi-configuration, which means you specify the
-build type when building.
-
-An example of a multi-configuration build system are Visual Studios project
-files. When you open the project in Visual Studio, you can select which
-configuration to build. You can also do this while building from the
-command line with `cmake --build . --config Release`.
-
-
-## Bugs
-Post any bugs to the issue tracker found on the projects GitHub page:
-  https://github.com/uncrustify/uncrustify/issues
-
-Please include the following with your issue:
- - a description of what is not working right
- - input code sufficient to demonstrate the issue
- - expected output code
- - configuration options used to generate the output
-
-More about this is in the [ISSUE_TEMPLATE](https://github.com/uncrustify/uncrustify/blob/master/.github/ISSUE_TEMPLATE)
-
-
-### Known problems
-[Look at the Wiki](https://github.com/uncrustify/uncrustify/wiki/Known-Problems)
-
-
-## Which repositories have uncrustify?
-[Look here](https://repology.org/metapackage/uncrustify/versions)
-
-
-## Contribute
-If you want to add a feature, fix a bug, or implement missing
-functionality, feel free to do so! Patches are welcome!
-Here are some areas that need attention:
-
-- __Patches for Objective-C support__. We really need someone who knows
-  this language as it has more than plenty open issues. A good starting
-  point would be to integrate changes made in the
-  [Unity fork](https://github.com/Unity-Technologies/uncrustify/tree/fixes/c-oc-java)
-- Test Java support and provide feedback (or patches!)
-- Test Embedded SQL to see what works
-- A logo of some sort
-- Anything else that you want to do to make it better?
-
-### A note about pull requests
-Firstly take a look at the [CONTRIBUTING.md](https://github.com/uncrustify/uncrustify/blob/master/CONTRIBUTING.md)
-
-Currently we have two continuous integration systems that test your PRs,
-TravisCI and Appveyor.
-Tested are the test cases, the formatting of the code base and
-the output of the command line options.
-
-Test cases can be found in the `tests/` directory. Every file ending with
-`.test` is a test set. Inside each line with these components is a
-single test: `testNr[!] testConfigFileName testInputFileName [lang]`
-
-The configuration file `testConfigFileName` has to be located inside `tests/config`,
-the input file `testInputFileName` inside `tests/input/<testSetName>/`,
-and expected results file inside the `tests/expected/<testSetName>/`
-directory.
-Expected results have the following naming convention: `testNr-testInputFileName`.
-
-Optionally a `!` can follow the `testNr` to enable a custom rerun
-configuration.
-Rerun configurations need to be named like this:
-`testConfigFileName`(without extension)+`.rerun`+`.extension`
-
-Also, optionally a language for the input can be provided with `lang`.
-
-The codebase has to be formatted by the options set up in
-`forUncrustifySources.cfg`. Failing to format the sources correctly will
-cause TravisCI build failures.
-
-The Command line interface (CLI) output is tested by the
-`test_cli_options.sh` script. It is located inside of `tests/cli/` and operates
-on the subdirectories of that folder.
-
-If a PR is altering the CLI output, files inside those directories might
-need to be manually updated. This often happens when options are
-added, removed or altered. Keep in mind that the version string line
-(example: `# Uncrustify-0.69.0_f`) of outputs from commands like
-`--show-config` should be replaced with a blank line.
-
-### Debugging
-
-The first method is to use uncrustify itself to get debug informations.
-Using:
-```.txt
-   uncrustify -c myExample.cfg -f myExample.cpp -p myExample.p -L A 2>myExample.A
-```
-you get two files for the first informations.
-The p-file gives you details of the parsing process and indentation.
-```.txt
-# Line                Tag              Parent          Columns Br/Lvl/pp     Flag   Nl  Text
-#   1>              CLASS[               NONE][  1/  1/  6/  0][0/0/0][  10070000][0-0] class
-#   1>               TYPE[              CLASS][  7/  7/ 14/  1][0/0/0][  10000000][0-0]       Capteur
-#   1>         BRACE_OPEN[              CLASS][ 15/ 15/ 16/  1][0/0/0][ 100000400][0-0]               {
-```
-
-The A-file gives you many details about the run itself, where the process is running thru,
-which values have the most important variables.
-```.txt
-tokenize(2351): orig_line is 1, orig_col is 1, text() 'class', type is CLASS, orig_col_end is 6
-tokenize(2351): orig_line is 1, orig_col is 7, text() 'Capteur', type is WORD, orig_col_end is 14
-tokenize(2351): orig_line is 1, orig_col is 15, text() '{', type is BRACE_OPEN, orig_col_end is 16
-```
-
-It might be usefull to add some code lines to see where something is happening.
-Use the package `unc_tools`.
-Remove the comment at line:
-```.cpp
-#define DEVELOP_ONLY
-```
-Import the package:
-```.cpp
-#include "unc_tools.h"
-```
-Add at some places the line:
-```.cpp
-prot_the_line(__LINE__, 6, 0);
-```
-Compile again with DEBUG option.
-
-
-
-### How to add an option
-
-If you need a new option, there are a few steps to follow.
-Take as example the option `sp_trailing_ret_t`
-
-First define the option:
-- Insert the code below to the file src/options.h
-_NOTE:
-This file is processed by make_options.py, and must conform to a particular
-format. Option groups are marked by '//begin ' (in upper case; this example
-is lower case to prevent being considered a region marker for code folding)
-followed by the group description. Options consist of two lines of
-declaration preceded by one or more lines of C++ comments. The comments form
-the option description and are taken verbatim, aside from stripping the
-leading '// '. Only comments immediately preceding an option declaration,
-with no blank lines, are taken as part of the description, so a blank line
-may be used to separate notations from a description.
-An option declaration is 'extern TYPE\nNAME;', optionally followed by
-' // = VALUE' if the option has a default value that is different from the
-default-constructed value type of the option. The 'VALUE' must be valid C++
-code, and is taken verbatim as an argument when creating the option's
-instantiation. Note also that the line break, as shown, is required.
-_
-```.cpp
-// Add or remove space around trailing return operator '->'.
-extern Option<iarf_e>
-sp_trailing_ret_t;
-```
-- Insert the code below to the file src/space.cpp
-```.cpp
-   if (chunk_is_token(first, CT_TRAILING_RET_T))
-   {
-      // Add or remove space around trailing return operator '->'.
-      log_rule("sp_trailing_ret_t");
-      return(options::sp_trailing_ret_t());
-   }
-```
-
-
-### Portability
-
-We are pretty sure that nothing OS-specific is used in the code base.
-The software has been previously tested on the following operating systems:
-- Linux
-- QNX
-- OS X
-- FreeBSD, NetBSD, OpenBSD
-- Sun Solaris 9
-- Windows (binary available)
-
-
----------------------------------------------------------------------------
-
-## Running the program
-
-__NOTE__ This application works reasonably well but it has bugs. Do __not__
-apply it on your whole codebase without checking the results!
-
-Here are ways to run it:
-```
-$ uncrustify -c mystyle.cfg -f somefile.c -o somefile.c.unc
-$ uncrustify -c mystyle.cfg -f somefile.c > somefile.c.unc
-$ uncrustify -c mystyle.cfg somefile.c
-$ uncrustify -c mystyle.cfg --no-backup somefile.c
-$ uncrustify -c mystyle.cfg *.c
-$ uncrustify -c mystyle.cfg --no-backup *.c
-```
-The `-c` flag selects the configuration file.
-The `-f` flag specifies the input file.
-The `-o` flag specifies the output file.
-If flag `-f` is used without flag `-o` the output will be send to `stdout`.
-
-Alternatively multiple or single files that should be processed can be
-specified at the command end without flags.
-If the flag `--no-backup` is missing, every file is saved with the initial
-name and an additional suffix (can be changed with --suffix).
-
-For more options descriptions call:
-```bash
-$ uncrustify -h
-```
-
-## Configuring the program
-Uncrustify usually reads configuration files that are passed via the `-c`
-flag. If the flag is not provided Uncrustify will try to find a
-configuration file via the `UNCRUSTIFY_CONFIG` environment variable or a
-file with the name `.uncrustify.cfg` or `uncrustify.cfg` in your home folder.
-
-To get a list of:
-- all available options use:
-  ```bash
-  uncrustify --show-config
-  ```
-
-- all available options in a usable configuration file format use:
-  ```bash
-  uncrustify --update-config
-  ```
-
-  or
-
-  ```bash
-  uncrustify --update-config-with-doc
-  ```
-
-  As the names suggest both options can produce output that adds newly
-  introduced options to your old configuration file. For this your old
-  configuration file has to be passed via the `-c` flag:
-  ```bash
-  uncrustify --update-config-with-doc -c path/to/your.cfg
-  ```
-
-Example configuration files that can be used as a starting point can be
-found in the `etc/` directory (such as [ben.cfg](./etc/ben.cfg)).
-
-Modify to your liking. Use a quality side-by-side diff tool to determine
-if the program did what you wanted. Repeat until your style is refined.
-
-To ease the process a bit, some 3rd party tools are available:
-- [Universal Indent GUI](http://universalindent.sourceforge.net/) - A
-  cross-platform graphical configuration file editor for many code
-  beautifiers, including Uncrustify.
-- [uncrustify_config](https://github.com/CDanU/uncrustify_config) - A web
-  configuration tool based on Uncrustify's emscripten interface.
-- [UncrustifyX](https://github.com/ryanmaxwell/UncrustifyX) - Uncrustify
-  utility and documentation browser for Mac OS X
-
-Under Windows:
-Uncrustify is a command-line tool, if you run it by double-clicking the
-executable, it will open a command prompt run the executable
-(which prints the help message), and then immediately close the window
-as uncrustify exits.
-
-You can open the command prompt (which is an interactive terminal
-window that allows you to run commands without it closing as soon as
-they exit) and run uncrustify.exe there.
-
-## Using uncrustify with vim
-Have a look [here]https://github.com/cofyc/vim-uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/TESTING b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/TESTING
deleted file mode 100644
index 63efbff7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/TESTING
+++ /dev/null
@@ -1,107 +0,0 @@
-Running the tests
------------------
-
-- All tests reside in the tests/ directory tree.
-
-- Running the tests is as simple as:
-    $ ctest
-
-- Alternatively, the test scripts can be run directly:
-    $ cd tests
-    $ ./run_format_tests.py
-
-- To run the only the tests associated with language X ("cpp", "java", etc.):
-    $ cd tests
-    $ ./run_format_tests.py X
-
-Adding new tests
-----------------
-
-- A test is defined by adding a line in one of the tests/*.test
-  files: you must pick the .test file for the proper programming
-  language, i.e. pick the X.test file which defines tests which use
-  inputs in language X.
-
-- A test has a (unique) number (a.k.a. test name) -- it does not have
-  to be a sequential number, but it might be handy to treat it like
-  that.
-
-- The X.test entry (line) has this format:
-
-    <test.name> <config.file> <input.file>
-
-  where the fields are separated by an arbitrary non-zero amount of
-  whitespace.
-
-- As each test references a config file and an input file (the latter
-  written in programming language X), these are assumed to exist in
-  the paths tests/config/<config.file> and tests/<input.file>
-  respectively. It is _strongly_ advised to put input files in their
-  own subdirectory, so a 'C' source formatting test entry might look
-  like this (in 'c.test'):
-
-    99902 ger-full-cmt-reflow.cfg c/cmt-not-a-boxed-cmt.c
-
-  where 'ger-full-cmt-reflow.cfg' is stored at
-  tests/config/ger-full-cmt-reflow.cfg and 'c/cmt-not-a-boxed-cmt.c'
-  will be fetched from tests/c/cmt-not-a-boxed-cmt.c when you run
-  the tests.
-  
-
-Features
---------
-
-- You can re-use config files and input files for multiple tests. So
-  one might observe test sets like these:
-
-  # clark's style - blank lines before and after flow control,
-  indented comments:
-  
-    20100 clark.cfg c/i2c-core.c
-    20101 clark.cfg c/comment-indent.c
-    20102 clark.cfg c/indent.cpp
-    20103 clark.cfg c/output.cpp
-
-  and
-
-    21051 return-1.cfg c/nl_return_expr.c
-    21052 return-2.cfg c/nl_return_expr.c
-    21053 return-3.cfg c/nl_return_expr.c
-    21054 return-4.cfg c/nl_return_expr.c
-
-- Reference output files (the reference against which the uncrustify
-  test run output is compared) are to be stored in the path
-  tests/expected/<X>/<NNN-TTTTT.TTT> where <X> is the 'language
-  directory' part of the input file, e.g. 'c' for input file
-  'c/nl_return_expr.c', <NNN> is the test name (number), e.g. '21051',
-  and <TTTTT.TTT> is the file name part of the input test filespec,
-  e.g. 'nl_return_expr.c' for input file spec 'c/nl_return_expr.c'.
-
-  This means that for test
-
-    21051 return-1.cfg c/nl_return_expr.c
-
-  the accompanying reference output is:
-
-    tests/expected/c/21051-nl_return_expr.c
-
-- When starting out with a new test, you don't need to have a
-  'reference output' yet: the test will simply be reported as a
-  'fail'ed test until you do.
-
-- Tip: the easiest way to produce 'reference output' is to copy the
-  test output (from tests/results/...etc... ) to
-  tests/expected/...etc... once you've ascertained that those tests
-  produce the desired (correct) output. The helper script
-  tests/fixtest.sh will copy the results file to the output folder:
-
-    $ fixtest.sh 30014 00110  # copy tests 30014 and 00110
-
-- Tip: the helper script tests/difftest.sh runs 'diff' on the result
-  and output versions to point out what changed.
-
-- Tip: There are also a few options to run_format_tests.py that can
-  help. Most interesting is '-d' will run 'diff' if the test fails.
-
-- Tip: If some errors occur with Windows, set the macro variable
-  NO_MACRO_VARARG to 1 to test some more pointer under Linux.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/appveyor.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/appveyor.yml
deleted file mode 100644
index e5c01aac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/appveyor.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "{build}"
-platform: x64
-environment:
-  matrix:
-  # MSVC
-  - GENERATOR: Visual Studio 15 2017 Win64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - GENERATOR: Visual Studio 14 2015 Win64
-configuration:
-  - Debug
-  - Release
-clone_folder: C:\projects\uncrustify
-branches:
-  only:
-    - master
-clone_depth: 10
-skip_tags: true
-#init:
-#  - echo This is for test only
-#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
-install:
-  - "SET PATH=C:/Python35-x64;C:/Python35-x64/Scripts;%PATH%"
-before_build:
-  - cd c:\projects\uncrustify
-  - mkdir build
-  - cd build
-  - cmake -DUNCRUSTIFY_SEPARATE_TESTS=ON -G "%GENERATOR%" ..
-build_script:
-  - cmake --build . --config %CONFIGURATION%
-test_script:
-#  - echo This is for test only
-#  - C:/projects/uncrustify/build/Debug/uncrustify.exe -c C:/projects/uncrustify/tests/config/mono.cfg -f C:/projects/uncrustify/tests/input/cs/simple.cs -L 66
-  - set PYTHONIOENCODING=utf-8
-  - python ../scripts/run_ctest.py -- -C %CONFIGURATION%
-deploy: off
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/CodeCoverage.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/CodeCoverage.cmake
deleted file mode 100644
index 670c5144..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/CodeCoverage.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Code Coverage
-#
-
-if ( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
-    message( WARNING "Code coverage results with an optimised (non-Debug) build may be misleading" )
-endif ( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
-
-if ( NOT DEFINED CODECOV_OUTPUTFILE )
-    set( CODECOV_OUTPUTFILE cmake_coverage.output )
-endif ( NOT DEFINED CODECOV_OUTPUTFILE )
-
-if ( NOT DEFINED CODECOV_HTMLOUTPUTDIR )
-    set( CODECOV_HTMLOUTPUTDIR coverage_results )
-endif ( NOT DEFINED CODECOV_HTMLOUTPUTDIR )
-
-if ( CMAKE_COMPILER_IS_GNUCXX )
-    find_program( CODECOV_LCOV lcov )
-    find_program( CODECOV_GENHTML genhtml )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -Wall -W -Wshadow \
-    -Wunused-variable -Wunused-parameter -Wunused-function -Wunused \
-    -Wno-system-headers -Wno-deprecated -Woverloaded-virtual -Wwrite-strings \
-    -fprofile-arcs -ftest-coverage" )
-    link_libraries( gcov )
-    set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage" )
-    add_custom_target( coverage_init ALL ${CODECOV_LCOV} --base-directory ${PROJECT_SOURCE_DIR}/src
-        --directory ${CMAKE_BINARY_DIR} --output-file ${CODECOV_OUTPUTFILE} --no-external --capture --initial
-        DEPENDS ${CODECOVERAGE_DEPENDS})
-    add_custom_target( coverage          ${CODECOV_LCOV} --base-directory ${PROJECT_SOURCE_DIR}/src
-        --directory ${CMAKE_BINARY_DIR} --output-file ${CODECOV_OUTPUTFILE} --no-external --capture)
-    add_custom_target( coverage_html     ${CODECOV_GENHTML} -o ${CODECOV_HTMLOUTPUTDIR} ${CODECOV_OUTPUTFILE}
-        DEPENDS coverage )
-endif ( CMAKE_COMPILER_IS_GNUCXX )
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateTokenNames.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateTokenNames.cmake
deleted file mode 100644
index 02a6241a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateTokenNames.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Generate token_names.h from token_enum.h
-#
-# This script is meant to be executed with `cmake -P` from a custom command,
-# and expects the variables `src_file` and `dst_file` to be set.
-#
-
-function(generate_token_names src_file dst_file)
-  set(tokens "")
-
-  file(READ "${src_file}" token_lines)
-  string(REGEX REPLACE ";|\\[|\\]" " " token_lines "${token_lines}")
-  string(REPLACE "\n" ";" token_lines "${token_lines}")
-
-  foreach(token_line ${token_lines})
-    if(${token_line} MATCHES "^[ \t]*CT_([A-Z0-9_]+),.*$")
-      list(APPEND tokens "   \"${CMAKE_MATCH_1}\",\n")
-    endif()
-  endforeach()
-
-  file(WRITE "${dst_file}"
-    "/*\n"
-    " * Generated by CMake\n"
-    " */\n"
-    "#ifndef TOKEN_NAMES_H_INCLUDED\n"
-    "#define TOKEN_NAMES_H_INCLUDED\n"
-    "\n"
-    "const char *token_names[] =\n"
-    "{\n"
-    ${tokens}
-    "};\n"
-    "\n"
-    "#endif /* TOKEN_NAMES_H_INCLUDED */\n"
-  )
-endfunction()
-
-generate_token_names("${src_file}" "${dst_file}")
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateVersionHeader.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateVersionHeader.cmake
deleted file mode 100644
index 3d6d376b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateVersionHeader.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Generate uncrustify_version.h from uncrustify_version.h.in
-#
-# This script is meant to be executed with `cmake -P` from a custom target,
-# and expects the variables `PYTHON_EXECUTABLE`, `SOURCE_DIR`, `INPUT`,
-# `OUTPUT` and `UNCRUSTIFY_VERSION` to be set.
-#
-
-
-execute_process(
-  COMMAND ${PYTHON_EXECUTABLE} ${SOURCE_DIR}/scripts/make_version.py
-  WORKING_DIRECTORY ${SOURCE_DIR}
-  RESULT_VARIABLE make_version_error
-  OUTPUT_VARIABLE make_version_output
-)
-
-if (make_version_error)
-  # It's normal for make_version.py to fail when building from a tarball, so we
-  # want to avoid anything that looks too much like a scary error. Thus, report
-  # the error in an innocuous-looking fashion.
-  #
-  # If make_version.py is failing unexpectedly and needs to be debugged,
-  # uncomment the next few lines.
-  # string(STRIP "${make_version_output}" make_version_output)
-  # message(STATUS
-  #   "scripts/make_version.py exited with code ${make_version_error}: "
-  #   "${make_version_output}")
-
-  message(STATUS
-    "Unable to determine version from source tree; "
-    "fallback version '${UNCRUSTIFY_VERSION}' will be used")
-  message(STATUS
-    "(This is normal if you are building from a zip / tarball)")
-else()
-  string(STRIP ${make_version_output} UNCRUSTIFY_VERSION)
-  message(STATUS "Version: '${UNCRUSTIFY_VERSION}'")
-endif()
-
-configure_file("${INPUT}" "${OUTPUT}" @ONLY)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw32.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw32.cmake
deleted file mode 100644
index badd6994..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw32.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Toolchain file for cross-compiling from Linux to Win32 using MinGW
-#
-
-set(CMAKE_SYSTEM_NAME Windows)
-
-if(NOT COMPILER_PREFIX)
-  if(EXISTS /usr/i686-w64-mingw32)
-    # mingw-w64
-    set(COMPILER_PREFIX "i686-w64-mingw32")
-  elseif(EXISTS /usr/i586-mingw32msvc)
-    # mingw
-    set(COMPILER_PREFIX "i586-mingw32msvc")
-  else()
-    message(FATAL_ERROR "Unable to detect cross-compiler prefix (COMPILER_PREFIX)")
-  endif()
-endif()
-
-find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
-find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
-find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
-
-set(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw64.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw64.cmake
deleted file mode 100644
index 399cc26b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw64.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Toolchain file for cross-compiling from Linux to Win64 using MinGW
-#
-
-set(CMAKE_SYSTEM_NAME Windows)
-
-if(NOT COMPILER_PREFIX)
-  if(EXISTS /usr/x86_64-w64-mingw32)
-    # mingw-w64
-    set(COMPILER_PREFIX "x86_64-w64-mingw32")
-  elseif(EXISTS /usr/amd64-mingw32msvc-gcc)
-    # mingw
-    set(COMPILER_PREFIX "amd64-mingw32msvc-gcc")
-  else()
-    message(FATAL_ERROR "Unable to detect cross-compiler prefix (COMPILER_PREFIX)")
-  endif()
-endif()
-
-find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
-find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
-find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
-
-set(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/commit.log b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/commit.log
deleted file mode 100644
index 1a725f4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/commit.log
+++ /dev/null
@@ -1,7666 +0,0 @@
-commit 6aeb46f1cd34104e6c9134f079469b3385274f4c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Feb 2 20:16:57 2016 -0600
-
-    Rework make_win32.sh to build outside of the source tree.
-
-commit b08b81937aa0ff9438d6479ddb83419356877b30
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Feb 2 20:16:31 2016 -0600
-
-    Update version, config files, run update-defaults.sh, etc
-
-commit 34a104aa67cb26c2c3273b769412a403dd6674db
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Feb 1 20:54:41 2016 -0600
-
-    Update release steps
-
-commit a8f4771b2e4ad48d91f14d2c2ceba228c5f93c9d
-Author: bengardner <gardner.ben@gmail.com>
-Date:   Sun Jan 31 19:23:17 2016 -0600
-
-    PAWN: Cannot modify the #define PATTERN at all
-
-    So keep it as a single chunk. Go with CT_MACRO for the type for now.
-
-commit 41d1e76ccf3ce9d5c968422f2ffe11b1782adc4c
-Author: bengardner <gardner.ben@gmail.com>
-Date:   Sun Jan 31 18:24:41 2016 -0600
-
-    Correctly parse PAWN #define args
-
-    Parses the following with %1=>WORD
-       #define xx(%1, %2) foo(%1, %2)
-
-commit 10478309dca1c5c5928a9851a4b5916a007969b0
-Author: bengardner <gardner.ben@gmail.com>
-Date:   Sun Jan 31 18:12:58 2016 -0600
-
-    Revert "Correctly parse VALA #define args"
-
-    This reverts commit 602b49c1f98eb51ec9589aa9edf1ac6c1ac1e4c9.
-
-commit 602b49c1f98eb51ec9589aa9edf1ac6c1ac1e4c9
-Author: bengardner <gardner.ben@gmail.com>
-Date:   Sun Jan 31 13:38:48 2016 -0600
-
-    Correctly parse VALA #define args
-
-    Parses the following with %1=WORD
-    #define xx(%1, %2) foo(%1, %2)
-
-commit 0ce3c3d1107f3fee593c374b87d31e31be74db9e
-Merge: 244c9de 4c69239
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jan 31 12:53:26 2016 -0600
-
-    Merge pull request #427 from benwaffle/master
-
-    Add some missing vala keywords
-
-commit 4c692395e54183409f31f86e12b51859a6bbc645
-Author: Ben Iofel <iofelben@gmail.com>
-Date:   Fri Jan 29 18:13:42 2016 -0500
-
-    Add some missing vala keywords
-
-commit 244c9de670ccfa47f63dffa7ce43643000d6d352
-Merge: 62a2ad9 97fab82
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 28 17:12:06 2016 -0600
-
-    Merge pull request #423 from Lykurg/assume2
-
-    Automatic language detection for stdin (--assume)
-
-commit 97fab8240389a9bc829588ed24c2b295c6ec3bec
-Author: Lorenz Haas <git@lorenz-haas.de>
-Date:   Mon Jan 18 21:00:41 2016 +0100
-
-    Automatic language detection for stdin (--assume)
-
-    While -f uses the simple automatic language detection with stdin
-    one is out of luck. With the new argument --assume one can specify
-    the filename Uncrustify should use to perform the automatic
-    language detection even for content pushed to stdin.
-
-commit 62a2ad9977f189bb4f6efb44ebfe07deffdd1e42
-Merge: 9a46c56 672fd1c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 9 17:32:30 2015 -0600
-
-    Merge pull request #413 from jlee975/patch-1
-
-    Address issue #373.
-    Checks the chunk prior to the '::' and forces a space if it is a known keyword.
-
-commit 672fd1c0143c535be37bf2bca4ea276a9ba352d3
-Author: jlee975 <jonathan.lee.975@gmail.com>
-Date:   Wed Dec 9 11:54:03 2015 -0600
-
-    Address issue #373
-
-    sp_before_dc should not apply to global scope operator.
-
-commit 9a46c565e315d3eae16085e759febc9c5e809591
-Merge: 15ee014 eef47c5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 24 21:33:10 2015 -0600
-
-    Merge pull request #372 from ravethetadpole/while_one_liners
-
-    add nl_while_leave_one_liners
-
-commit 15ee014c5261a26d46d3479f0f7330db719f183a
-Author: Lorenz Haas <lykurg@gmail.com>
-Date:   Fri Apr 24 14:01:11 2015 +0200
-
-    Doxygen comments in CPP style like '//:', '//=', '//~' where not handled
-    properly when spaces were to be added with option sp_cmt_cpp_start.
-
-    The new option sp_cmt_cpp_qttr treats those comment leadings as a unity,
-    if set to TRUE.
-
-    Before sp_cmt_cpp_start=add converted '//:foo' to '// :foo'. Now it will
-    correctly be converted to '//: foo'.
-
-commit efe1adb92ec09073778247412bba38a8f5dd4e64
-Merge: 97ac4c9 7d0f864
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 24 21:23:28 2015 -0600
-
-    Merge branch 'npnth-master'
-
-commit 7d0f864a52c0f58703ea1bc07cad592d3db10697
-Merge: 97ac4c9 55581c4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 24 21:22:26 2015 -0600
-
-    Merge branch 'master' of https://github.com/npnth/uncrustify into npnth-master
-
-commit 97ac4c96b24ab428a4325e05347cabe19cfdab93
-Merge: 4d68949 c2c2ac0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 27 16:26:25 2015 -0500
-
-    Merge pull request #392 from icyflame/patch-1
-
-    Add file links to the readme
-
-commit 4d6894996b26fd0ba26275b59ece063a5082bdb2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Oct 21 10:16:58 2015 -0500
-
-    Expand digraphs test a bit.
-
-commit 485eb91664716ffac58a49394e628e5e5db13af5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Oct 21 10:15:51 2015 -0500
-
-    Add option: enable_digraphs and disable digraphs by default
-
-commit c2c2ac07fc60efd80631c325e113963c1a605815
-Author: Siddharth Kannan <kannan.siddharth12@gmail.com>
-Date:   Mon Aug 10 17:42:20 2015 +0530
-
-    Add file links to the readme
-
-    - Instead of just referencing a file, add a link to it.
-    - This makes the configuration file location much more prominent.
-
-commit fc5228ecd9f579f366919e5d13f26ae5149f80f1
-Merge: b3f3e21 abf3bef
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jul 30 15:28:13 2015 -0500
-
-    Merge pull request #385 from tpltnt/md-readme
-
-    Readme markdown
-
-commit b3f3e216af06574e465fe315ef19927caff21ebc
-Merge: b6593c1 420c240
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jul 30 12:35:59 2015 -0500
-
-    Merge pull request #387 from dirk-thomas/fix_windows_warnings
-
-    fix warnings on Windows
-
-commit 420c240949aacf87d1924e488f65e80e8923c171
-Author: Dirk Thomas <dthomas@osrfoundation.org>
-Date:   Wed Jul 29 18:15:41 2015 -0700
-
-    fix warnings on Windows
-
-commit abf3bef2940b8e5450cc4fde46d3ddc6c92148a8
-Author: tpltnt <tpltnt.github@dropcut.net>
-Date:   Tue Jul 21 21:37:02 2015 +0200
-
-    added markdown to README, closes #383
-
-    * marked shell commands
-    * separated list of steps
-
-commit 55581c4e060763aa5984194aa3f948baa870ba99
-Author: Gilles <npnth2@gmail.com>
-Date:   Thu Jul 9 21:35:10 2015 -0400
-
-    Handle Java's `synchronized(foo){ ... }` construction
-
-    Add a new CT for `synchronized` for java, which behaves like a vanilla
-    if/for/while/switch construction if a parenthesis follows the keyword
-    (otherwise, tokenize_cleanup reverts it to being a qualifier). This
-    adds options `nl_synchronized_brace`, `nl_before_synchronized`, and
-    `nl_after_synchronized`, which work in the obvious way. Since
-    `synchronized` requires braces, no special handling of braceless code
-    is necessary.
-
-    Also update defaults.cfg by update-default-cfg.sh to appropriately
-    handle these new options and add tests 80060 and 80061.
-
-commit eef47c5b357912fe1c0136e338a895f580dc256e
-Author: RaveTheTadpole <RaveTheTadpole@users.noreply.github.com>
-Date:   Mon May 4 10:50:19 2015 -0500
-
-    add nl_while_leave_one_liners
-
-    Preserve one-line while statements. It is a
-    straightforward extension of other leave_one_liners
-    options.
-
-commit b6593c1bd9f2d5f2980c7e219df9109bef49e845
-Merge: 2f8c55d 27bbbfc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Apr 3 16:58:54 2015 -0500
-
-    Merge branch 'Unity-Technologies-features/msref-support'
-
-commit 27bbbfc407aa11ecc3ee4f5d2597bce280be6ddf
-Merge: 2f8c55d c8b80c8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Apr 3 16:58:18 2015 -0500
-
-    Merge branch 'features/msref-support' of https://github.com/Unity-Technologies/uncrustify into Unity-Technologies-features/msref-support
-
-    Conflicts:
-    	tests/cpp.test
-
-commit 2f8c55d3c41e6caeb71f8d9775ebefc60c43d511
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Apr 3 16:31:05 2015 -0500
-
-    run_tests.py needs Python 2.
-
-commit 9ac5184a3c7ceceedbe2777eb992565e39264091
-Author: Guy Maurel <guy.maurel@kde.org>
-Date:   Fri Mar 27 14:32:52 2015 +0100
-
-    correct the function keywords_are_sorted
-
-commit c0ee10411e8095c93c5baa845d168862f4ec2df1
-Author: Guy Maurel <guy.maurel@kde.org>
-Date:   Mon Mar 30 17:12:54 2015 +0200
-
-    Typo
-
-commit c8b80c898214f3c572532e6acf39238031079632
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Wed Mar 25 08:15:38 2015 +0100
-
-    Fixing issues as per Ben's review comments on https://github.com/bengardner/uncrustify/pull/350
-
-commit db37e6d0d01f050a530c7a1596099ea6a8ea249c
-Merge: f23de29 faa87cd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 24 22:10:13 2015 -0500
-
-    Merge pull request #346 from 4picht/master
-
-    allow indent_ctor_init to be negative
-
-commit f23de290bd80cedc4b2544c2e6243abc0b2dc57f
-Merge: 40a6abd a940421
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 24 22:07:25 2015 -0500
-
-    Merge pull request #347 from clbr/issue314
-
-    Add a new option for indenting continued shift expressions
-
-commit 40a6abd8008c7156b64c23b3e49258206da54479
-Merge: e4cd86e 12c1768
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 24 21:52:16 2015 -0500
-
-    Merge pull request #349 from Unity-Technologies/fixes/bit-colon-class
-
-    Fix: C++ bitfields were being detected in structs, but not in classes
-
-commit e4cd86ecbd32e6bc56337a4f2ee11af28759b590
-Merge: cd1c861 a0086de
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 24 21:48:21 2015 -0500
-
-    Merge pull request #356 from iv-mexx/feature/fixObjCTernaryMethodCall
-
-    Fix ObjC 'Methodcall in ternary expression'
-
-commit a0086de8b5e65c828c4a45058ea040e6d9836634
-Author: MeXx <mexx@devsub.net>
-Date:   Wed Mar 25 00:47:19 2015 +0100
-
-    Added a more complicated testcase for ternary operator in ObjC
-
-commit 55c91fb34857184d6e5cd97b3899eca36cd07537
-Merge: fa11a5e 2216026
-Author: MeXx <mexx@devsub.net>
-Date:   Wed Mar 25 00:44:31 2015 +0100
-
-    Merge branch 'fixes/objective-c-ternary' into feature/fixObjCTernaryMethodCall
-
-commit 2216026a78ccd0904b4f1a23fc2cf735601c142e
-Author: MeXx <mexx@devsub.net>
-Date:   Mon Mar 23 22:33:45 2015 +0100
-
-    ObjC: Add testcase to reproduce ObjC methodcall-in-ternary-expression issue #355
-
-commit 4da23e911865870cd2e7a1e3d2b6a5d79d7e3156
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Mar 19 15:39:48 2015 +0100
-
-    Ok that last hard coded fix wasn't the best idea. Too many cases. What we really need is a stack of question counts that is associated with the OC messages. I also updated the unit test for the case that was failing. Note that this has to be interpreted as OC+ to pick up the '::' in the sample.
-
-commit 2f9fb388111d644bf23b2a610b8c19d14084c8be
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Mar 19 14:18:52 2015 +0100
-
-    Fixed issue 635. Just a new case that needed to be handled surrounding ternary and OC messages.
-
-commit fa11a5e0e7ecfbbed7e712bfe92a6496ba675ef6
-Author: MeXx <mexx@devsub.net>
-Date:   Mon Mar 23 22:38:23 2015 +0100
-
-    ObjC/combine_labels: dont reduce question_count if the colon is inside a ObjC message call, fixes #355
-
-commit ead319cab7b2012ccb0e8d7880fe7a18f5d73505
-Author: MeXx <mexx@devsub.net>
-Date:   Mon Mar 23 22:33:45 2015 +0100
-
-    ObjC: Add testcase to reproduce ObjC methodcall-in-ternary-expression issue #355
-
-commit 8f3027c635041fdcf90c263b35cfda3bbeeed291
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Feb 26 11:46:15 2015 +0100
-
-    Pick a better number to base this on
-
-commit 083e919cdaaf3056bc3419b9ce659752bfa67296
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Wed Feb 25 16:04:59 2015 +0100
-
-    Implementing support for MS's C++ extensions for C++/CLI and WinRT on the ^ character acting as markup for a reference (similar to * for pointers).
-
-    Conflicts:
-    	tests/cpp.test
-
-commit 12c1768e10bf5423b77dc97a9f6382eec5197144
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Wed Feb 25 15:00:17 2015 +0100
-
-    Fix: C++ bitfields were being detected in structs, but not in classes
-
-commit a94042179131b1f7da04c137243c74c22eabb4d5
-Author: Lauri Kasanen <curaga@operamail.com>
-Date:   Fri Feb 13 21:04:57 2015 +0200
-
-    Add a new option for indenting continued shift expressions
-
-    Fixes #314. Including both a new more extensive test case
-    as well as an adapted existing test case.
-
-    This project has been sponsored by The Measurement Factory.
-
-    Signed-off-by: Lauri Kasanen <curaga@operamail.com>
-
-commit faa87cda17b896abb6b0893ae85bed57730c1ff9
-Author: Julian Picht <julian.picht@4Com.de>
-Date:   Mon Feb 23 10:51:28 2015 +0100
-
-    allow indent_ctor_init to be negative
-
-commit cd1c8619321efc96afc1ab1e7d09e924f008acaa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 20:49:42 2015 -0600
-
-    Allow casting of this in "(Foo)this"
-
-commit e13ae46d98fcb28448db8941ef65ffda47d4bd9c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 20:23:30 2015 -0600
-
-    run_tests.py: Don't add .test if it already has it
-
-commit bfdcd34d7d64dd030df10bd7e3bb0467934d4f33
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 20:23:08 2015 -0600
-
-    Add another semicolon removal test
-
-commit 85af83abab2f63cc9ef1ca9d4d0d6dba082ad479
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 20:22:46 2015 -0600
-
-    Prevent semicolon removal after 'new' statements by marking braces
-
-commit fd743dec0631d76100cf21c4875a55af5cc062ad
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 20:08:50 2015 -0600
-
-    Add test for sp_between_new_paren
-
-commit 88ade49e56e7b081c4a468623251d6c535ea9f46
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 20:08:09 2015 -0600
-
-    Add new option sp_between_new_paren
-
-commit 8a23fdf630d24decce329c3663d7d73d3eb0a964
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 19:53:48 2015 -0600
-
-    Add a test for not splitting "} while"
-
-commit ec88fea43c2ac1dbd85e5cf07423bb4e872e34ac
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 19:53:02 2015 -0600
-
-    Don't insert a newline in "do {} while()" via nl_after_brace_close
-
-commit 3801c8e4755a59f92b0ff3668470b37c5dd8103e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 19:46:08 2015 -0600
-
-    Add logging for adding newlines
-
-commit 288df3e25977ea8ead8ce19d31438240a29ab46c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 19:32:18 2015 -0600
-
-    Update test results for nl_squeeze_ifdef fix
-
-commit 2176b8bf65f93257a4e86b5f63db97b7192a193c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 19 19:30:37 2015 -0600
-
-    nl_squeeze_ifdef should not remove blanks before whole-file #endif.
-
-    This was messing up my style.
-
-commit 32bd357e9beefb5e72469c78208861e3f57985a5
-Merge: 3ea72e3 6155faf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 18 22:08:04 2015 -0600
-
-    Merge pull request #345 from shazron/npm-package
-
-    Added package.json for npm
-
-commit 3ea72e33125db3f854f6285f8efd69bc42e05d4f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 18 22:07:39 2015 -0600
-
-    Run uncrustify on itself using etc/ben.cfg, with a few manual fixes.
-
-commit 1369245fbb8d1cbed4957a97d9dd6cce2a5ac6d7
-Merge: 094e094 698dfcd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 18 21:53:04 2015 -0600
-
-    Merge pull request #341 from nicodecker/vbr_indent
-
-    New options for indenting at virtual brace open
-
-commit 094e0947415d5228ede9ccc2ab00f7f93adefbfa
-Merge: 58a76e6 c6aca7b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 18 21:52:37 2015 -0600
-
-    Merge pull request #342 from nicodecker/doxygen_comments
-
-    Option for space handling in doxygen comments
-
-commit 58a76e6131f6d23af8faa09401ff562552208041
-Merge: f62fda6 b44f525
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 18 21:51:19 2015 -0600
-
-    Merge pull request #340 from nicodecker/frag_at_col
-
-    Fixed wrong position of comment in case of --frag
-
-commit f62fda639756684d964d2b60c7549c6a9d176182
-Merge: 5d839c3 40b536a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 18 21:50:42 2015 -0600
-
-    Merge pull request #343 from nicodecker/fix_cmd_processing
-
-    Bugfix: Undesired effect of disable_processing_cmt
-
-commit 6155faf25f8a02578cf99b2b4fdbae7cfdea26d7
-Author: Shazron Abdullah <shazron@gmail.com>
-Date:   Wed Feb 18 15:08:22 2015 -0700
-
-    Added package.json for npm
-
-commit 40b536ae657a7f3d6c7ec4df051ad172516a5af7
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Wed Feb 18 13:05:23 2015 +0100
-
-    Bugfix: Undesired effect of enable_processing_cmt
-
-    The same bug as existed for disable_processing_cmt exists for
-    enable_processing_cmt as well.
-
-    Fixed in the same way by treating NULL and "" equally.
-
-commit f68d75d9dba517a9217cc5dd0cd4e5ae1fe7ca50
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Wed Feb 18 08:45:32 2015 +0100
-
-    Bugfix: Undesired effect of disable_processing_cmt
-
-    The new option disable_processing_cmt that has been added recently had
-    an undesired side effect. Unfortunatly, due to its nature, it was
-    not revealed by the test facility.
-
-    Configuration created before the option was introduced works fine
-    even with versions containing the new option. But in the configuration
-    created with those new versions  the option was automatically set to "".
-    In the code this lead to unformatted text after the first comment!
-
-    Fixed by treating NULL and "" equally.
-
-commit c6aca7b2c95079ef51d573c2538bd3067255012f
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Wed Feb 18 08:27:56 2015 +0100
-
-    Option for space handling in doxygen comments
-
-    Doxygen comments in CPP style like '//!', '//!<', '///' and '///<'
-    where not handled properly when spaces were to be added with option
-    sp_cmt_cpp_start.
-
-    The new option sp_cmt_cpp_doxygen treats those comment leadins
-    as a unity, if set to TRUE.
-
-    Before sp_cmt_cpp_start=add converted '//!x' to '// !x'. No it
-    will correctly be converted to '//! x'.
-
-commit 698dfcd40824635ba41d543abaec08b98d0abce0
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Sat Feb 14 18:35:38 2015 +0100
-
-    Added test for indenting after vbrace-open
-
-commit b44f5259de9d834d4aaf863720b204ae138d413b
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Sat Feb 14 17:54:39 2015 +0100
-
-    Fixed wrong position of comment in case of --frag
-
-    In case of command line option --frag the position configured
-    in align_right_cmt_at_col was not correct anymore.
-
-commit 5d839c344385bec76d5cf029c3bdb1576e4ca0d3
-Merge: 3105b16 fa34bee
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Feb 14 10:35:42 2015 -0600
-
-    Merge pull request #337 from nicodecker/frag_tabstop
-
-    Fixed wrong tabstop behaviour in case --frag is used.
-
-commit 3105b166dc7fd7b25d550d9cd1fd28c44c222bb6
-Merge: f0f17a1 73d1466
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Feb 14 10:35:25 2015 -0600
-
-    Merge pull request #339 from nicodecker/frag_eof
-
-    No eof/bof newline modifications for --frag
-
-commit 73d1466b974809a42e960b490ec80fe2b2a476fd
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Sat Feb 14 14:14:41 2015 +0100
-
-    No eof/bof newline modifications for --frag
-
-    When command line option --frag is used there is no real end-of-file
-    or begin-of-file; therefore do not perform any modifications concerning
-    options
-     - nl_end_of_file_min
-     - nl_end_of_file
-     - nl_start_of_file_min
-     - nl_start_of_file
-
-commit 343cfd27900724643762613fec811fd1c2d1b785
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Sat Feb 14 13:53:40 2015 +0100
-
-    Introduced new options indent_min_vbrace_open and indent_vbrace_open_on_tabstop.
-
-    The new options allow to applay special indent after virtual braces and
-    newline.
-
-commit fa34bee5a08abff08a71dddf019f1ffaf352afa9
-Author: Nico Decker <nico-gitcode@nicodecker.de>
-Date:   Sat Feb 14 13:24:55 2015 +0100
-
-    Fixed wrong tabstop behaviour in case --frag is used.
-
-    calc_next_tab_column() did not take indent of first line into accout
-    when command line option --frag was used.
-
-commit f0f17a1599f8a775942f2796761c80b06abee1b7
-Merge: 7757d42 ef37f0a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Feb 13 09:26:38 2015 -0600
-
-    Merge pull request #333 from Unity-Technologies/fixes/encoding-ignore
-
-    Fixed bug with my 'ignore' change that broke non-ASCII encodings.
-
-commit ef37f0a104f06e94caa74cad9f1f13ab8c9cebd4
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Feb 12 16:46:23 2015 +0100
-
-    Fixed bug with my 'ignore' change that broke non-ASCII encodings. Added tests to keep it from coming back.
-
-commit 7757d42c2c5124e00ef0a346d3f5e8ea7bb79d29
-Merge: 36cb55c ffaf3fb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 12 07:53:49 2015 -0600
-
-    Merge branch 'Unity-Technologies-features/string-replace-tab-chars'
-
-commit ffaf3fbdac70bd7befc47b415b0cc58a520cad40
-Merge: 36cb55c 3a27deb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 12 07:53:17 2015 -0600
-
-    Merge branch 'features/string-replace-tab-chars' of https://github.com/Unity-Technologies/uncrustify into Unity-Technologies-features/string-replace-tab-chars
-
-commit 36cb55cbb585da4ecba2706a9b2e39bde4d4d2d3
-Merge: 3c1b714 a97b482
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 12 07:47:12 2015 -0600
-
-    Merge pull request #332 from Unity-Technologies/fixes/indent-off-for-realz
-
-    Made *INDENT-OFF* truly disable all reformatting
-
-commit 3c1b714f44ede1f9badd88f9dc8db2a739fe168a
-Merge: 0f4fdaa 1933349
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Feb 12 07:46:12 2015 -0600
-
-    Merge pull request #330 from Unity-Technologies/fixes/windows-config-relative-paths
-
-    Implementing code on Windows to deal with relative file paths from an 'include' in a config file
-
-commit 3a27debe358b9f3b092a2a016822e014411bdbf4
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Feb 12 11:54:53 2015 +0100
-
-    New option 'string_replace_tab_chars' that will convert tab chars found in ordinary literal C style strings to '\t' instead.
-
-    It's very difficult to have tab chars in strings participate in reformatting of the outer code in a consistent way. For example, unit tests that compare code in strings against files on disk will suddenly fail if the contents of the strings change in any way. Switching to \t chars is one way to avoid this problem, plus make the code more readable.
-
-    Conflicts:
-    	src/options.h
-
-commit a97b4827d7d6d94206e63227dbe80b8c124ad9c4
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Feb 12 11:52:08 2015 +0100
-
-    Made *INDENT-OFF* truly disable all reformatting. Previously was still reformatting tab chars found in the ignored chunks.
-
-commit e2e0f40a852bc0480a781a66141b81a9c0d1d67d
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Feb 12 11:29:57 2015 +0100
-
-    minor spelling fix
-
-commit 193334979f55229daabcdcd520eeeafdc108e399
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Thu Feb 12 10:59:27 2015 +0100
-
-    Implementing code on Windows to deal with relative file paths from an 'include' in a config file
-
-commit 0f4fdaa2468624c100723841e1796fa9eb2e8e51
-Merge: b3f4c00 90e0d3a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 11 21:54:54 2015 -0600
-
-    Merge branch 'Unity-Technologies-staging'
-
-commit 90e0d3aa2c8c3695333752d8790ef304f92eb1a1
-Merge: b3f4c00 5bb6bc4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 11 21:54:31 2015 -0600
-
-    Merge branch 'staging' of https://github.com/Unity-Technologies/uncrustify into Unity-Technologies-staging
-
-    Conflicts:
-    	tests/c-sharp.test
-
-commit b3f4c005638e476b2e653b44b558111efbfc1b23
-Merge: 66812c4 5824499
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 11 21:51:55 2015 -0600
-
-    Merge pull request #325 from MarekFort/master
-
-    Add support for indent_class_on_colon
-
-commit 66812c4cf8228ea6ef91fef16399b90c18ff49bf
-Merge: 2286fad 3f4406d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 11 21:50:43 2015 -0600
-
-    Merge pull request #327 from Unity-Technologies/fixes/delegate-semicolon-removal
-
-    Fixed another case for bug #628 (older C# 'delegate' syntax)
-
-commit 2286fad0c73d83d0f477f386077dcf5b813d6d3e
-Merge: e3469f0 3a1e3bb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 11 21:48:49 2015 -0600
-
-    Merge pull request #321 from Ditti4/master
-
-    Fix some mistakes in the documentation
-
-commit e3469f0eec27845c7237462bc3e31b53c7e11cd5
-Merge: b5e20df 575453f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 11 21:46:29 2015 -0600
-
-    Merge pull request #328 from Unity-Technologies/features/option-processing-cmt
-
-    New options and tests for enable_processing_cmt/disable_processing_cmt t...
-
-commit b5e20dfeea723bc9fd7f8f9384dbafe3688e778a
-Merge: 261cfdb 77dbf12
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Feb 11 21:44:05 2015 -0600
-
-    Merge pull request #329 from mikekov/master
-
-    Keep trailing space in C++ comments if it follows backslash to prevent '\' from turning into line continuation
-
-commit 77dbf12633753fa2377db8c10354bbad84e89e6d
-Author: Mike <michal_kowalski@hotmail.com>
-Date:   Wed Feb 11 11:18:12 2015 -0800
-
-    Keep trailing space in C++ comments if it follows backslash to prevent '\'
-    from becoming line continuation
-
-commit 575453f1144d79c9c47d1e30dfc8e47fb3cfb746
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Tue Feb 10 15:51:11 2015 +0100
-
-    New options and tests for enable_processing_cmt/disable_processing_cmt that permits overriding the default UNCRUSTIFY_ON_TEXT/UNCRUSTIFY_OFF_TEXT.
-
-commit 3f4406ddf9f73d3ebacd2a385ae84fd21303379c
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Wed Feb 11 11:13:36 2015 +0100
-
-    Fixed another case for bug #628 (older C# 'delegate' syntax)
-
-commit 261cfdb0f19afa785fcab54d93e3522058c0645f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Feb 10 22:08:02 2015 -0600
-
-    Add test for SF#628
-
-commit 2e7f4d9660096e30d6c25e53e9e7bd068008561e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Feb 10 22:07:29 2015 -0600
-
-    Fix marking of "=> { }" lambda expressions in C#.
-
-    Prevents semicolon removal.
-
-commit e0706629876026a937bf36d2cafa9f7a990954c5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Feb 10 21:45:37 2015 -0600
-
-    Add C++ digraph test from SF#629
-
-commit 8182cd2658a8fc53911ea169b93d34bea2a07524
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Feb 10 21:44:31 2015 -0600
-
-    Add partial support for digraphs.
-
-    Uncrustify may still choke on them in the input, but it won't create them.
-
-commit 5bb6bc4eaa184f973f74e4aaf04232b5eedf3ad9
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Tue Feb 10 00:10:17 2015 +0100
-
-    Fixed bug with backslash at end of comment affecting the next line in C#. C# has no preprocessor, and backslashes at EOL don't mean anything special.
-
-    Also added tests for C# to verify fix, and to C++ to make sure normal behavior maintained.
-
-commit 9bad4d26b408b401a523687dbc6a55bba1ec7ef2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Feb 8 17:00:26 2015 -0600
-
-    Add tests for the new options.
-
-commit fa792758e12688aac95944204cb6430f4ad83d75
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Feb 8 16:59:38 2015 -0600
-
-    Add options to control spacing in C# array types: "int [,,] x;"
-
-    sp_before_mdatype_commas
-    sp_between_mdatype_commas
-    sp_after_mdatype_commas
-
-commit 5bfa2736a73d2ad6d6e91a33299bf2433a74c7b0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Feb 8 16:15:26 2015 -0600
-
-    Don't crash if the input ends with a VBRACE_CLOSE.
-
-    Fixes SF#616.
-
-commit 5824499fad6bbfa87e2066a38ae2e4d50b044eb9
-Author: Marek Fort <marek.fort@chyronhego.com>
-Date:   Sun Feb 8 15:20:07 2015 +0100
-
-    Add support for indent_class_on_colon
-
-commit 3a1e3bb0d06bcc4dc0f3ba235dea9aa227ea7df7
-Author: Dittrich, Rico <rico.dittrich@elcon-system.com>
-Date:   Thu Feb 5 11:01:47 2015 +0100
-
-    Fix some mistakes in the documentation
-
-commit 4e20f20fbeabae560f3471a99a9191ea7718875b
-Merge: 3319eef 2b82c2b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jan 6 20:40:10 2015 -0600
-
-    Merge pull request #316 from npnth/nl_after_label_colon
-
-    Add nl_after_label_colon option
-
-commit 2b82c2b06abd30ef7de2829b4fee7af3e068ceaf
-Author: Gilles <npnth2@gmail.com>
-Date:   Tue Jan 6 18:22:37 2015 -0500
-
-    Add tests for nl_after_label_colon
-
-    Ensure that nl_after_label_colon does not adversely affect colons in
-    switch statements or bitfields.
-
-commit 3561d7d4dedfa125d1d0b212f8ce2fb1397f18e4
-Author: Gilles <npnth2@gmail.com>
-Date:   Tue Jan 6 18:07:00 2015 -0500
-
-    Remove newline dependence in CT_LABEL_COLON detection
-
-    Make combine_labels default to viewing a WORD + COLON combination as a
-    label, not a bitfield definition. Colons that are inside structs or
-    typedefs are considered bitfields.  This allows labels to be tagged as
-    such even if they are not preceded by a newline.
-
-commit b4cbf3cd44ae1f2895617ba68c784deec2159e92
-Author: Gilles <npnth2@gmail.com>
-Date:   Tue Jan 6 17:15:28 2015 -0500
-
-    Add default value for nl_after_label_colon
-
-    This option defaults to false
-
-commit 083c2cb3f6caeae6b570a22242a19b6d4c482d35
-Author: Gilles <npnth2@gmail.com>
-Date:   Tue Jan 6 16:42:29 2015 -0500
-
-    Add support for nl_after_label_colon
-
-    Add as a boolean option nl_after_label_colon. If this is set to true,
-    a newline is appended to any LABEL COLON token sequence.
-
-commit 3319eefebdd947da8da84272e67fdf392c00790b
-Merge: f65394e 083a4fc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 3 12:07:24 2015 -0600
-
-    Merge pull request #315 from npnth/master
-
-    Unify handling of newlines following { among if/else
-
-commit 083a4fc7b517343e8790f22b418afd08fc209890
-Author: Gilles <npnth2@gmail.com>
-Date:   Thu Jan 1 22:50:56 2015 -0500
-
-    Add test for nl_remove_extra_newlines=2, nl_after_brace_open=false
-
-    In this situation, ensure that both if and else treat their
-    immediately-following open braces similarly.
-
-commit 12a955e769169d696eb9787451916568cfc84ac1
-Author: Gilles <npnth2@gmail.com>
-Date:   Thu Jan 1 22:34:52 2015 -0500
-
-    Make newlines_do_else handle braces like newlines_if_for_while_switch
-
-    Remove option-checking in the handling of newlines directly after
-    CT_BRACE_OPEN in newlines_do_else. This matches the way
-    newlines_if_for_while_switch handles the same situation, preventing
-    awkward mismatches visually between if/else blocks when
-    nl_after_brace_open is false.
-
-commit f65394e32925d3978bf2838f76bf19fa9791a7e0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 21:37:33 2014 -0600
-
-    Extract the commit log
-
-commit b82c7cbf7c8028fb91faa3767321e9e1c0f0e34b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 21:37:17 2014 -0600
-
-    Update changelog
-
-commit 2b76d7a8f4d0c80f3917064b2f4e8309ec55cb3a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 21:26:42 2014 -0600
-
-    Documentation and script updates for version 0.61.
-
-commit df5fe150195d38e63a173727bed8a60a296db4c5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 21:16:19 2014 -0600
-
-    Bump version to 0.61
-
-commit 15d8f44c4efac3323b991a6db91b4fcb88ace694
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 21:13:21 2014 -0600
-
-    Attempt to get cygwin builds working.
-    Not tested.
-
-commit c6a251f4329dc6911ba48a4b9cae88a62acb2c45
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 14:02:50 2014 -0600
-
-    Add test for SF#607.
-
-commit d330fda6ab18f77bfe6cb57b6cc64aae4a38b48f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 14:02:08 2014 -0600
-
-    Do not mark the parent of the brace that contains a CS_PROPERTY as GETSET.
-
-    Fixes SF#607
-
-commit 7909e742826539ec3d075df82439c72a6e93ddd6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 22 13:41:33 2014 -0600
-
-    C++11 supports the "final"  keyword in class declarations.
-
-commit 64439c58dbd8f6f2ce29eac53080823d49880d7d
-Merge: ffa7ea0 5814e8d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 18 20:28:08 2014 -0600
-
-    Merge pull request #312 from lgauthier/master
-
-    Added fix for issue #124
-
-commit 5814e8db5033408759d4f2785ed440a7f364d60d
-Author: logan.gauthier@metova.com <logan.gauthier@metova.com>
-Date:   Thu Dec 18 19:29:21 2014 -0600
-
-    Added fix for issue #124: https://github.com/bengardner/uncrustify/issues/124
-
-commit ffa7ea0fdc2dcdd26042fb814455fa03b58d1a00
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 10 20:41:49 2014 -0600
-
-    C#: mark a property in "new List<int> { 1, 2, 3 }"
-
-commit af87b4751cf5aabac349152e1307dd8767d0df0e
-Merge: 95ba72b e27e624
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 22 15:05:32 2014 -0600
-
-    Merge branch 'Twigz-feature/add-const-qualifier-rule'
-
-commit e27e624416ba523330879613bcebc410a3ad6232
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 22 15:04:39 2014 -0600
-
-    Whitespace cleanup
-
-commit 6364871846d53862fa8492217821e11fc838fdd8
-Author: Twigz <aharris.1990@gmail.com>
-Date:   Fri Nov 21 11:12:21 2014 -0500
-
-    Adds a new test
-
-commit 566d2afdd178477948347e8bafbf91198b236ba6
-Author: Twigz <aharris.1990@gmail.com>
-Date:   Fri Nov 21 11:12:04 2014 -0500
-
-    Adds a new test
-
-commit b460d25dd6e99b9132631f4bbb9af4fbde49cf81
-Author: Twigz <aharris.1990@gmail.com>
-Date:   Fri Nov 21 10:21:08 2014 -0500
-
-    Adds qualifier rule for spacing
-
-commit 95ba72baf7f0833edfaaca0b8f29f6b48ef077e6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 12 22:27:05 2014 -0600
-
-    D: Treat [ ] like { } as far as indenting content with tabs.
-
-commit 2046245afc355162c1dfecad59f076545c52d9dd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 14 14:50:37 2014 -0500
-
-    Update the year in the man page
-
-commit 86079866990368c0f18819f5fcf5cc689d3335ee
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 14 14:49:56 2014 -0500
-
-    Rework make_win32.sh to build with the latest mingw32.
-
-    Add a few more files.
-
-commit 531332f38876a189f849b20f47612958093c0924
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 14 14:46:33 2014 -0500
-
-    Update BUGS a bit
-
-commit ddbf42b6952a21a067991e716ab88cac974401bc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 14 14:20:07 2014 -0500
-
-    Rename variable "interface", as that makes mingw unhappy
-
-commit 51e931879a9844194e15197646be03268bdaa05a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 14 14:17:12 2014 -0500
-
-    Fix includes for Windows/mingw build
-
-commit 48001de690daf92d6d272f8ef5c8e71c8f627333
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 14 09:33:55 2014 -0500
-
-    Add include path to pick up windows_compat.h
-
-commit 03eb1c70fd36c6a0a23a53ad47198cf8335c7ad3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Oct 6 21:56:45 2014 -0500
-
-    Update multi-line string test
-
-commit 573fd546db2ec2e5171fb538e95f282fdb75337e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Oct 6 21:44:40 2014 -0500
-
-    Handle multi-line string spacing better.
-
-    Fixes SF#602
-
-commit 76ab215694fd733877f544635760658c1e021541
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Oct 6 21:28:14 2014 -0500
-
-    unc_text: Encode NL and CR as unicode for logs
-
-commit da1ab3de1363959adc2d82c0fa17ac008f93aae7
-Merge: 0cdc975 b28e364
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Oct 6 20:46:59 2014 -0500
-
-    Merge pull request #298 from Unity-Technologies/staging
-
-    Fix for bug #600
-
-commit b28e364b3778a9ae2ca912302fdb2ab6a24987c3
-Author: Scott Bilas <scobi@unity3d.com>
-Date:   Mon Oct 6 11:52:03 2014 +0200
-
-    Fix for bug #600 (https://sourceforge.net/p/uncrustify/bugs/600/). The nullable type was consuming the CT_QUESTION and appending it to itself, but wasn't also adjusting its end column.
-
-commit 0cdc9750dea4cea8a7db43287707b7c9f264b967
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 21:25:26 2014 -0500
-
-    Update semicolon removal test to cover new case.
-
-commit 757e2ad22a820d111758b4e8d0c864295f26ed87
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 21:24:09 2014 -0500
-
-    Do not remove the semicolon in '...) {...};'
-
-commit a60da588119327d6888230b1c47267ede3645242
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 21:22:47 2014 -0500
-
-    Log which path removed the semicolon
-
-commit 85614066efd65591305f75ad93f47b607209ee61
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 21:22:09 2014 -0500
-
-    Add a LOG_FUNC_CALL() to update the line number of the top entry.
-
-commit 72348985ddd768053ed685e503cff5f66734d1cf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 21:06:59 2014 -0500
-
-    Fixed cast detection in "(int *[])value"
-
-commit f11229b716a88f072f6d84d5b1f68cf5a415fcfe
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 17:17:50 2014 -0500
-
-    Skip the top function name in log_func_stack_inline()
-
-commit d9f939d3f9aa941f372df26cdb8c554d2c7fbb2f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 17:15:11 2014 -0500
-
-    Add test for multi-line C# @"" strings
-
-commit d236601bd10be25db3d3b52b0dfa147cbeae8b9e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 17:10:45 2014 -0500
-
-    Properly detect multi-line C# @"" strings
-
-commit e97370fc83980b385d961e8a4c27d3c3eb9d9515
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 17:09:59 2014 -0500
-
-    Use log_func_stack() instead of passing around the func name/line
-
-commit 5f99e44de4265402f38e989f2f86663fbbb09730
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 17:07:52 2014 -0500
-
-    Modify log_func_stack() a bit
-
-commit 94c189d6a50f6609b2c80c6da8d98998398e17ee
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 17:03:53 2014 -0500
-
-    Add a bunch of calls to LOG_FUNC_ENTRY();
-
-commit 6b888a6186d38b06196a4ea69482a75fa5654222
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 10 16:06:00 2014 -0500
-
-    Add a utility functions to track and log certain function calls
-
-commit 419b2a47a8c342226eb6a99b284d8e0ace401b4c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Sep 7 14:49:18 2014 -0500
-
-    Add a "file_ext" config option to specify custom file extensions.
-
-commit 172ff959f226e687b3ebb51c1c0fd0a7e90e1079
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 16:50:51 2014 -0500
-
-    Update man page for --check option
-
-commit f4a02cb29a863657c83d9f04946e8a9bc3f56866
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 16:28:22 2014 -0500
-
-    Fix odd whitespace issue
-
-commit 6f815360cf8003c74078f17e65f398afbe770508
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 16:28:10 2014 -0500
-
-    Change log that indicates the detected encoding
-
-commit 7fe2a24d34ef992ab78516d6e55f0edd5221be9a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 16:27:46 2014 -0500
-
-    Add --check option to see if a file changes when uncrustified
-
-commit b9bb1655b24911bc4629126d6121fe559e8b7a02
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:51:21 2014 -0500
-
-    Add missing fclose() before exit.
-
-commit c9ccb161739bb0db9b61f4aabcaba09d48ac49f4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:45:14 2014 -0500
-
-    Rename variable 'dq' to 'vv', as it is for a vector, not a deque
-
-commit 888e7ce045feed34d7633386cae050096312a435
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:44:42 2014 -0500
-
-    Add a hook to output the file to a byte deque.
-
-commit ff03971ad08da030ca850f5d9cf0916724909bcc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:41:13 2014 -0500
-
-    write_byte: protect against negative ch
-
-commit b3d0212545c278a9a5c8e6dcfb256f5d4ba49c18
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:40:45 2014 -0500
-
-    unicode.c: make exactly one place that writes to the output file
-
-commit 9432f7cad9e85cc3001fc933ab8920e373018662
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:34:39 2014 -0500
-
-    Don't pass the FILE or encoding to write_char().
-
-    Preparing for multiple output paths.
-
-commit 77473c4d192a18bb507f2db8daeeb97feb00c329
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:23:02 2014 -0500
-
-    unicode.c: Make all functions static that can be
-
-commit 16160b6ac5bc76a9e4caa39e8de4715b5f9446f6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 6 15:20:20 2014 -0500
-
-    Remove unused code: write_string()
-
-commit 54aee73007f4c9141a4fbc2892393d9aa673756b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 11:27:26 2014 -0500
-
-    Add option sp_fparen_dbrace
-
-commit c0a12ac85f3110aaa6c010b2ef2e25075b8c1623
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 11:20:03 2014 -0500
-
-    Fix nl_paren_dbrace_open in ')\n{{'
-
-commit 4120cd976bacfe11189795138138030acf65d03d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 11:14:37 2014 -0500
-
-    Add tests for nl_paren_dbrace_open
-
-commit 608543dec51e4ccfd64d5e80116fcf440e89d7a1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 11:14:04 2014 -0500
-
-    Add option nl_paren_dbrace_open
-
-commit 69f926e4797a1f514bc91c878b77b99737dbbb8b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 11:00:21 2014 -0500
-
-    Pass through func/line in set_paren_parent2() and flags_parens2()
-
-commit ae4f4449170dfbcac96db1b9eb695489230cfe53
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 10:59:23 2014 -0500
-
-    Mark the double-brace open/close with parent_type=CT_DOUBLE_BRACE
-
-commit 1d723646eaa1069de41dd0649def9a598bc14fca
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 10:52:28 2014 -0500
-
-    Clean up the log text for set_chunk_type() and set_chunk_parent()
-
-commit 0e78cafcdfadc0698b2ceb9c11474473e8823505
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 10:39:41 2014 -0500
-
-    Use set_chunk_type() instead of direct chunk_t->type assignments
-
-commit 7cdd71589f8c420588228c7ceef5bb31207a1ded
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 10:09:52 2014 -0500
-
-    Add function set_chunk_type() to log assignments to chunk_t.type
-
-commit 9f9e1c9944680d5fc064fe3d1f691dcb6d0a1056
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 10:01:36 2014 -0500
-
-    Add a log in set_paren_parent()
-
-commit 5d0d28a2eb61ef7eb20f1199dafe10e737db24d1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 3 09:47:01 2014 -0500
-
-    Refactor parent_type assignments to use set_chunk_parent() for logging
-
-commit b002966cfc90c6ecd835ea6a1e0241bd8928b563
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 2 17:39:08 2014 -0500
-
-    Add special handling for Java double brace initializers
-
-commit 2f53e1681fa5d33e3a3a4052671c3d49d464d5ee
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 2 17:04:31 2014 -0500
-
-    Update namespace indent test results
-
-commit d2f28752fbe980a7e100a6c720308ea46a80c865
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 2 17:03:11 2014 -0500
-
-    Rework indent_namespace_single_indent, don't indent the namespace
-
-commit adefc45c0f18078c9273607abe20aa2f156f212d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 2 16:46:31 2014 -0500
-
-    Add the token parent to the LINDPC log
-
-commit da1a8b2de08c9f7768eb5af7f2ed57ddf171c453
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 22:13:16 2014 -0500
-
-    Fix C-Sharp '#property' parsing
-
-commit 12d00abd4c33a04b1a1ddce40cc174a014b3ce84
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 21:53:09 2014 -0500
-
-    Add D language "static if" test
-
-commit ec025e4f1e993333b3c3ae4564b972c618115b3c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 21:49:33 2014 -0500
-
-    Add support for D language "static if" by merging the tokens
-
-commit 6218d70859db853bda2ccc0172b6f30dfef35eb3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 21:21:56 2014 -0500
-
-    Update test results for new '( {' indent rule
-
-commit 19b781e661b78dbd88c35e2da549c146ec2d7c90
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 21:20:30 2014 -0500
-
-    Change default to have the '{' indent override the '(' indent.
-
-    Example:
-    gtkwidget.enabled.connect((widdget) => {
-        message("Clicked");
-    });
-
-    The old way would have the brace indent relative to the open paren:
-    gtkwidget.enabled.connect((widdget) => {
-                                  message("Clicked");
-                              });
-
-commit da37c3a85fc898081004d19e3198f6ac3052341e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 21:07:31 2014 -0500
-
-    VALA also has preprocessors (#if/#else/#endif)
-
-commit d814973783c01b047c2911912459ee313f04ff59
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 20:59:06 2014 -0500
-
-    Change order of '--update-config' and config file required checks.
-
-commit e7ff01b89b69f47317f02db4c94e3bf5d45f718b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 20:56:24 2014 -0500
-
-    Add a TODO about complaining if --update-config is used with -f, etc
-
-commit ea04e51fdd98c1af67ad3372ca840fa4971571c2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 20:55:47 2014 -0500
-
-    Do not require a config file if generating one
-
-commit 441b3acc1ffef8d02567707d4917529c9aff558b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 20:34:39 2014 -0500
-
-    Fix variable def continuation indent for pointer vars.
-
-    Example:
-    SomeType *a,
-             *b;
-
-commit da75afc55f5221e1407181c6c84c54c362677539
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 19:26:35 2014 -0500
-
-    Update cmt_width test
-
-commit 040cf4036206278db5472cea2d061c9f616bdc81
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 19:22:59 2014 -0500
-
-    Do not wrap a comment word if nothing has been written on the line yet
-
-commit e8bf4cd13433216bb61a5f815a30b3bda7724486
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 16:25:00 2014 -0500
-
-    Add option sp_enum_paren
-
-commit 0de157e20f7306375fc7eb4da4fd4f9b0e3e5a25
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 15:37:54 2014 -0500
-
-    Add test for option indent_namespace_single_indent
-
-commit b536f4268d28f31fe45a03bcd78589f2029d11f0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 15:37:20 2014 -0500
-
-    Add option indent_namespace_single_indent
-
-    Thanks to gnoorlanderwork for the idea.
-
-commit 7f3296723c6f97adc7164c1fd3c922b1bd18a35c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 15:07:23 2014 -0500
-
-    Update tests for new align_same_func_call_params functionality
-
-commit 5513771a22ea83c56ddae18839e44c33a6bfa4de
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 15:03:44 2014 -0500
-
-    Let align_same_func_call_params() handle "class.func()"
-
-commit 17671d126a7d0285dc10b0db595694cdf611af1c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 14:30:47 2014 -0500
-
-    Don't align stuff after the last comma in align_init_brace()
-
-commit 21e7af10b5ddf3a1f48f4f56ba7edfb457dc462f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 14:29:30 2014 -0500
-
-    Enhance reindent_line() log
-
-commit df323401e80fcd7c86d277820f7c2fd42738d54c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 1 14:28:48 2014 -0500
-
-    Add more SPACE logs
-
-commit 7b966dc0b4502f4a1943e258668449837446cbc5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 23:36:31 2014 -0500
-
-    Update tests and results for latest code changes
-
-commit 2007ed17b1336406b81460d2381b8601a67ae0f1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 23:34:18 2014 -0500
-
-    Move the 'force one space before a END comment' from output to space
-
-commit e4e368890b86bda15e1ec230479aefc8363293ed
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 23:33:17 2014 -0500
-
-    space: drop vbrace tokens back to the previous and skip them
-
-commit ca1abde6b817dbccadbd81502aa1c2ecbdf9d163
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 23:32:10 2014 -0500
-
-    Force a space before a comment if there was a space in the input
-
-    Otherwise try to keep them in the same column as the input.
-
-commit bc5e0894f37b0b76d7cc87eef7a60c8dc1b4c683
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 23:30:23 2014 -0500
-
-    Enhance the space log a bit (show final column)
-
-commit 8a6b5b51b2da83e9b107ffcba14b3c1e944f7f1a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 23:06:39 2014 -0500
-
-    Fix duplicate rule log for sp_before_semi/sp_special_semi
-
-commit be9ea6a4ac3cfbca60a8e4c09144d74fca3381fc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 22:21:24 2014 -0500
-
-    Keep track of the original whitespace (columns) before a token
-
-commit 6ce863d5a6b2c10d4e2a1580db1b4addb4358deb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Aug 31 16:57:09 2014 -0500
-
-    Fix off-by-one error for indent_relative_single_line_comments
-
-commit 7d8e560bd8a67512bb8e17a867e01f3872b727d1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 22:33:09 2014 -0500
-
-    Run update-default-cfg.sh again
-
-commit e1728472645c0dace8f6995e2c3ca0bf5fb5d2ef
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 22:32:17 2014 -0500
-
-    Fix typo in indent_paren_open_brace description
-
-commit 02237e57fe852c2a179796777e5a269b50ef8442
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 22:30:55 2014 -0500
-
-    Run update-default-cfg.sh
-
-commit 5b1183a3f0af3ef8679698b105bc85561931ebf5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 22:25:09 2014 -0500
-
-    Add test for option cmt_convert_tab_to_spaces
-
-commit 8b04b2cc8943fb2688fa118c413d8b93492f941b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 22:22:00 2014 -0500
-
-    Add option cmt_convert_tabs_to_spaces
-
-commit a76f64c867700babbdecb07e20614a97172072b0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 22:20:07 2014 -0500
-
-    Revert logsev of whole file ifdef  log
-
-commit 38c6c324e7cebc04c0831bddcbe80a1b15687120
-Merge: 6209e9d 540e0b3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 21:46:51 2014 -0500
-
-    Merge branch 'master' of git@github.com:bengardner/uncrustify.git
-
-commit 6209e9d288a97fbc46c8ea1cd772c906249dfdd0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 21:46:05 2014 -0500
-
-    Update test for latest comment change
-
-commit f02f57730dff061975dfd3339357b0f01c1b780d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 21:37:11 2014 -0500
-
-    The comment continue should be " * " if not combining C++ comments
-
-commit 540e0b37abd802e3c2a92248063583a839d2983f
-Merge: 2b81408 3e00ee5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 16:41:12 2014 -0500
-
-    Merge pull request #283 from Speedy37/master
-
-    Fix parsing issue with Objective-C message send.
-
-commit 2b81408f08af6be29fa32adea9538759047378dc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 16:38:43 2014 -0500
-
-    Update test results based on other changes
-
-commit a15e4158741a69c51644d2695e68a0ea23f4b89c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 16:36:59 2014 -0500
-
-    Clean up ifdef_over_whole_file() usage a bit.
-
-commit c732f43af8def231f23beb6d523cd52f76504c8c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 16:30:13 2014 -0500
-
-    Cache the results of ifdef_over_whole_file()
-
-commit 6a3d100bdda9075394d09a89ae19d9573c6840ca
-Merge: 620747e 86ca62b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 30 16:00:01 2014 -0500
-
-    Merge branch 'no_include_guard_indent' of https://github.com/rdan/uncrustify into rdan-no_include_guard_indent
-
-commit 620747ec48e8e8aff87c0de68910b9fe15cd59b2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 28 23:01:32 2014 -0500
-
-    Add tests for new '({\n' functionality
-
-commit 1a16cfc6e2d6d40d2b4862ac391e9ebe7c73d409
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 28 23:00:33 2014 -0500
-
-    Indent by brace in '({\n', add option indent_paren_open_brace to revert
-
-    This is mainly for objective C code.
-
-commit c5e9583136dc576805dae5ea1ca2490622d56051
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 28 22:50:19 2014 -0500
-
-    Make the LINDPC logs much more verbose and easier to read
-
-commit 0f6dbafe9f79c4aad2d5c879ccb19c1a1e31edd1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 20:00:21 2014 -0500
-
-    Add missing config for test 562
-
-commit e85bc5a6eb32106f3d3d05d70d726be5c0492e5c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 15:20:33 2014 -0500
-
-    Update test results based on new comment substitution code
-
-commit 8e1742f64b8d14648d48ddce9126c866b26f0215
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 15:20:08 2014 -0500
-
-    Do comment keyword substitution before processing the comment.
-
-commit a91f95312e2b372f40ebca53021c666f15dadd38
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 12:54:43 2014 -0500
-
-    Add more tests
-
-commit 96a655df62e6d6ea92533de2906f8ea0367bb91b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 12:54:30 2014 -0500
-
-    Do comment keyword replacement earlier and directly on the comment text.
-
-commit b8d8b0202e31dac687b892f8c9a41fb687ec2024
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 12:53:36 2014 -0500
-
-    Enhance unc_text with insert(), erase(), rfind(), and replace().
-
-commit 68c76717b183c4e80fee468e3d317c5be6c02d4a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 10:57:50 2014 -0500
-
-    Fix comment keyword substitution of 'fclass' inside a class
-
-commit 43edc60aa6d58a767193b5e8d43457d9708ec65f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 22 10:27:56 2014 -0500
-
-    Clean up index.html a bit
-
-commit 622a0cbe0db7257cfd32f882d88a34e35de5cdc7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 23:11:26 2014 -0500
-
-    Add test for SF#562
-
-commit 0ffb183bd3f6c55a393d1fcf37581d5913a836ec
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 23:10:56 2014 -0500
-
-    Fix operator call detection in "baz(&operator[](bar));"
-
-commit a6ac4f0fedd98efe23fdd4f94087361b3eb522a5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 21:57:21 2014 -0500
-
-    make_version.py: no need to split lines of uncrustify_version.h.in
-
-commit f4af8773e815af8f3feae6251f19ac4a7f211cda
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 21:54:36 2014 -0500
-
-    Update make_version.py after the configure.ac rename
-
-commit e8e4c21a116fdea29def40aceaa0f4320f6b0d94
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 21:50:27 2014 -0500
-
-    Re-run autogen.sh on Ubuntu 14.04
-
-commit f199bd478471e7db1477ac15c5da3af5451d20d9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 21:45:37 2014 -0500
-
-    Rename configure.in to configure.ac
-
-commit 8b3f1083fe074cc14ea2e43ad18374ea1df09f3e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 21:44:25 2014 -0500
-
-    Add a script to update the version
-
-commit 1751709f4026da603f5ac5420669c4dcb50a48f8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 21:01:32 2014 -0500
-
-    Do not remove semicolon in "return {a, b};"
-
-commit f815d6b3964295c5d9864df14988aff6f55d7a5e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 21 20:48:44 2014 -0500
-
-    Remove incorrect warning about unmatched VBRACE_OPEN at the EOF
-
-commit 94a2eabf307fc7534c3be3de36a8670ce2623e05
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 20 20:47:15 2014 -0500
-
-    Add test for GH#287
-
-commit 39914d4e1e593f66f23505ce14cbfd4e5a69adf8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 20 10:32:24 2014 -0500
-
-    Add test for SF#588
-
-commit 7234f48a60ac0ec1a1798e1d9e535f4f104eea69
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 20 10:29:23 2014 -0500
-
-    Add support for VALA numeric identifiers: '@4' is a WORD, not a NUMBER
-
-commit 6f41f0ce00522f0bc3ccb1d475adfb8beb1eef72
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 20 10:28:36 2014 -0500
-
-    A change in preproc level should reset '<<' aligning.
-
-    It probably should reset other aligning, too, but no one has complained.
-
-commit 71417801533cb5e0c7c112fafcd0bdd520c7edfc
-Merge: 80b7109 d33176e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Aug 19 22:37:28 2014 -0500
-
-    Merge pull request #285 from PerfectCarl/patch-1
-
-    Mention VALA in -l option in the help message
-
-commit d33176e1afa755c1a9299fa5893c7179369e4339
-Author: PerfectCarl <name.is.carl@gmail.com>
-Date:   Tue Aug 19 11:08:36 2014 +0200
-
-    Mention VALA in -l option in the help message
-
-commit 80b7109e9465914721884681bcf7f8aa5d9a5ea4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Aug 18 14:56:47 2014 -0500
-
-    Add test for SF#594
-
-commit 18393d0345ecff19da0c4e15c718b1656263b27c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Aug 18 14:56:19 2014 -0500
-
-    Do not call tokenize_cleanup for the C language (and a few others).
-
-commit 3e00ee5dcb90f07056a02a995b9052f54fe6c8cb
-Author: Vincent Rouille� <v-rouille@logitud.fr>
-Date:   Mon Aug 18 16:29:30 2014 +0200
-
-    Fix parsing issue with Objective-C message send.
-
-    Parsing message like  [(id)obj msg:var] was failing.
-
-commit add39bf18ae0f76f53d9d8703805c7543d61db15
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 16 20:30:01 2014 -0500
-
-    Add a test for SF#593
-
-commit 1ac4301a450fc238ac4ff4f0a59579dbecb55e27
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 16 20:29:04 2014 -0500
-
-    indent_continue should also apply to class constructor calls.
-
-    Not sure why that was explicitly disabled, but no tests failed after
-    removing that check.
-
-commit 5d1bfcc1b2512283c1b72a79fd0abcc1a88543f4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 15 16:09:45 2014 -0500
-
-    Split FUNC_CLASS into FUNC_CLASS_DEV, FUNC_CLASS_PROTO
-
-commit 05a5d5bcc6d524d3290fbc10deacbf623360adab
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 15 15:22:02 2014 -0500
-
-    Remove invalid 'namespace' from C test
-
-commit ff21c4ff8dd77444143ce860f34620f71d82c2a6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 15 15:19:58 2014 -0500
-
-    "namespace" is not a keyword in the C language.
-
-commit 173e61aa02b98499474b694291d6cb7be70a7434
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 15 15:08:07 2014 -0500
-
-    Fix null deref if file starts with a newline
-
-commit 8ca5edfa5b30fa55ef72fe5c5cc8d8e268f3edb9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 13 09:39:32 2014 -0500
-
-    Missed a ctx.restore() in parse_code_placeholder()
-
-commit 53725db37577296299c3e5df961402cf6d24190b
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:54:36 2014 -0500
-
-    Protect trailing space inside a multi-line string
-
-commit 397b2f95193c2ee04a8e9b6d1dbb73e244bfe0c0
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:44:17 2014 -0500
-
-    VALA verbatim string: missing setting nl_count
-
-commit 12eb6a6ababa2dab992fe73475c6f8ec34117036
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:34:34 2014 -0500
-
-    Rework parse_code_placeholder()
-
-commit 420b06637bb19be1f9dba5a285f07521772cf5e6
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:33:34 2014 -0500
-
-    Drop new option dont_protect_xcode_code_placeholders
-
-    I don't see how anyone would not want this.
-
-commit a442258c580a71066b7b64cfe6fd033a7decb11c
-Merge: c55f777 6059686
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:24:03 2014 -0500
-
-    Merge branch 'jgross-xcode-placeholders' of https://github.com/JoshuaGross/uncrustify into JoshuaGross-jgross-xcode-placeholders
-
-    Conflicts:
-    	tests/objective-c.test
-
-commit c55f777dda2be74ed7d264f4ec298d7393d0e241
-Merge: f28d310 3214eac
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 8 17:19:29 2014 -0500
-
-    Merge pull request #263 from mys007/master
-
-    Fix Issue 262
-
-commit f28d310ae56840e50b22c51d9da5a9e4027b061d
-Merge: ade7245 3111f77
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:16:50 2014 -0500
-
-    Merge branch 'master' of https://github.com/orudge/uncrustify into orudge-master
-
-    Conflicts:
-    	src/punctuators.cpp
-
-commit ade7245cc6b1fda9239d5965bc47e2dfc8f1a369
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:07:14 2014 -0500
-
-    Clean up whitespace from merge
-
-commit 4d20bcaeef08eff40d60d389bea9e6e360d84a18
-Merge: dbc35fe faa3a8e
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Aug 8 17:04:56 2014 -0500
-
-    Merge branch 'java-try' of https://github.com/Keepun/uncrustify into Keepun-java-try
-
-commit dbc35fee81a99dc1dcda4e92aa991313c2d5a2fa
-Merge: 034f7e2 fad09d7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 8 16:58:16 2014 -0500
-
-    Merge pull request #277 from tintou/master
-
-    Added missing vala punctuators.
-
-commit 034f7e218e3140b2261ae5a0b2b2b7513d9ffc26
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Aug 4 22:53:47 2014 -0500
-
-    Add basic support for VALA verbatim strings.
-
-    It looks like it is stripping trailing spaces in the string, but that is
-    a separate issue.
-
-commit fad09d7ff1342a4f3bf3a27a7acb9bb32413a609
-Author: Corentin Noël <corentin@elementaryos.org>
-Date:   Tue Jul 29 02:37:35 2014 +0200
-
-    Added :: as it might be used in some projects.
-
-commit 1839b061d7af045abbf1433dd89e3a53f44588d6
-Author: Corentin Noël <corentin@elementaryos.org>
-Date:   Tue Jul 29 02:19:24 2014 +0200
-
-    Fixed missing vala ponctuators.
-
-commit 3111f775de155e7981aed56b6618a081e2db4767
-Author: Owen Rudge <owen@owenrudge.net>
-Date:   Fri Jul 18 15:12:41 2014 +0100
-
-    Fix right shift (">>") turning into "> >" in C#
-
-commit 3214eacea005b4ba73efdf7fe44d69b45518b327
-Author: Martin Simonovsky <mys007@seznam.cz>
-Date:   Sun Jun 1 13:21:16 2014 +0200
-
-    fixed operator priorities in line splittings
-
-commit faa3a8e407ad0b0c395b0b2c1b0f89c010d8164e
-Author: Keepun <keepun@gmail.com>
-Date:   Sat May 24 02:53:46 2014 +0400
-
-    Fix try-with-resources statement in Java 7
-
-commit 36a0f44c54ee6301a5a208a12c08f97e59fcaa42
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Apr 3 23:03:42 2014 -0500
-
-    Fix wrong test result.
-
-commit 1022db6785f99f26f944eb9d21690369a2eecde3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Apr 3 23:00:34 2014 -0500
-
-    Fix indent error if an open paren is the first thing on a line
-
-    We cannot use the column of the paren until it has been indented, so indent
-    it right away.
-
-    Fixes SF#572
-
-commit c883fb79794806105f01b02d45e8da69d288d9b5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Apr 3 22:58:42 2014 -0500
-
-    Enhance indent detailed logs - show the whole stack
-
-commit 4ddf2df6dbc480568f3d3a307eb29c5ae2361643
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Apr 3 22:00:26 2014 -0500
-
-    Add test case for SF#574
-
-commit 1bbac3f0021c44d9e2ff7b8a14bb1cda008b3b1a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Apr 3 21:57:22 2014 -0500
-
-    Do not remove a newline before a function if preceded by a Vbrace close
-
-    Fixes SF#574
-
-commit f4b55060cb678f5ab86af43f37ca1da88dbcbb1c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Apr 3 21:56:22 2014 -0500
-
-    Wrap newline_iarf() and newline_iarf_pair() in macros to trace calls
-
-commit 04a29f322b87d895b57792547f2fd1044b1403b9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Apr 3 21:37:44 2014 -0500
-
-    Work around labeling mix-up with ?: and OC messages
-
-commit 6059686712cacc0417ca652c291cdecaec577f26
-Author: Joshua Gross <jgross@yahoo-inc.com>
-Date:   Sat Jan 25 21:44:42 2014 -0800
-
-    Handle Xcode code placeholders.
-
-commit 20cd06a17c4ac6e1ceffe59028cc80657a877d6d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 23 21:37:59 2014 -0600
-
-    Whitespace and style clean up
-
-commit 2c27e1c95bb205d02662d3095eae24a435d6d856
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 23 21:23:14 2014 -0600
-
-    Fix compile warning about uninitialized variable.
-
-    The condition "can't happen", but may as well make the compiler happy.
-
-commit b4c8b3610166b580f557e0f90f9c091b63830e25
-Author: Joshua Gross <jgross@yahoo-inc.com>
-Date:   Wed Oct 23 17:19:07 2013 -0700
-
-    * Fix a segfault parsing Objective-C blocks
-    * More indenting options for Objective-C blocks, and passing blocks as method invocation parameters.
-    * Fix `for...in` for Objective-C.
-    * Allow methods to be invoked on Objective-C primitives, like NSStrings.
-    * Unit tests for the above.
-
-    Fix case of block literal being mistaken for block signature.
-
-    Adding another test case for situations where extra space is added around a block passed in as the first argument of a C method invocation.
-
-    Adding the cfg file for our new tests.
-
-    Fix case where a block is passed as the first argument of a C-style method invocation; the parser marked the whole thing as a block type definition.
-
-    Add another test for short ternary expressions and make sure it takes precedence over question mark spacing.
-
-    Strengthening tests to make sure that short ternary doesn't break regular ternary expressions.
-
-    Test showing how Uncrustify fails to treat messages on string literals properly.
-
-    Allow messages to be sent to NSStrings.
-
-    Add tests that show that casting to (id) breaks parsing (meaningless operation but syntactically valid).
-
-    Allow `(id)[obj args]` as a valid Objective-C casting statement.
-
-    Fix test case expected output.
-
-    Fix for (x in y) for objective-c
-
-    Improving indentation support of blocks being passed into message invocations.
-
-    New options for indenting blocks in message invocations in different ways.
-
-    Fix the block indentation options for Objective-C; it was very aggressively indenting more than was necessary.
-
-    Mimic Objective-C style inline-block indentation.
-
-    Prioritize aligning everything with the first message in a message invocation, if possible (as long as it doesn't force us to go below the current indentation level, we're fine).
-
-    Xcode-style block-in-message indenting.
-
-    Fix segfault
-
-    Put parens around bitwise op
-
-    Fix indentation
-
-    Move check for for...in loops in Objective-C to a helper function in chunk_list.h
-
-    Adding small test-case for for...in loops with id type declarations.
-
-    Adding small test-case for for...in loops with id type declarations.
-
-commit 59aef5ceaba9e7dfa8f0e7a5d31cbe1d21cb2d53
-Merge: b519818 b1ccf9d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jan 13 14:17:17 2014 -0800
-
-    Merge pull request #231 from Lykurg/fixspelling
-
-    Fix typo in documentation
-
-commit b1ccf9dbbd34a0a8533423e25412e418e2a9af33
-Author: Lykurg <lykurg@gmail.com>
-Date:   Sun Jan 12 13:15:32 2014 +0100
-
-    Fix typo in documentation
-
-commit b519818ff9cc4225b4bcd905cc15b472c35f367d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jan 5 21:57:01 2014 -0600
-
-    Clean up formatting.
-
-commit f15390ebacb54c3c2a2780e26ba0259ca9d63bc6
-Author: Joshua Gross <jgross@yahoo-inc.com>
-Date:   Mon Oct 28 16:26:50 2013 -0700
-
-    Differentiate between normal ternary (a ? b : c) and short ternary, (b ?: c) with option sp_cond_ternary_short
-
-commit 4b83d06c86ab949d1bc71d8eaa2cee9e9c7332bb
-Author: Tim Hütz <tim@huetz.biz>
-Date:   Sun Dec 29 12:35:48 2013 +0100
-
-    Fix build on Windows
-
-    Added the missing include statements to build uncrustify
-    on Windows (using Visual Studio Express 2013).
-
-commit 3dfe4933a0cf53cb966fb4312d4203911e66748e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 4 13:31:45 2014 -0600
-
-    Fix UniversalIndentGUI comment for newline options
-
-commit 8039738f68530f36a4edbaa254b2bdc0824ae594
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 16 20:50:01 2013 -0600
-
-    Update test 30750 for new option nl_brace_fparen
-
-commit 3ccea5e2702454f9da206f5b5f31c3cc13b33079
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 16 20:49:05 2013 -0600
-
-    Add option nl_brace_fparen to make test 30752 pass again
-
-commit fac76ee437b3e0a4adea2c6869f01aa3ff68d3ee
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 16 20:48:31 2013 -0600
-
-    Fix option name: nl_brace_fparen
-
-commit 277e83780bc1f9f141b2ff3d8adf6dc38ec9133e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 16 20:45:23 2013 -0600
-
-    Whitespace cleanup.
-
-commit 4e1ce1982a698d6e36b90b59447179b9b004b9f5
-Merge: 465c4cb 7c85198
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 16 20:37:49 2013 -0600
-
-    Merge branch 'alanf/space-between-block-and-square-brace' of https://github.com/alanf/uncrustify into alanf-alanf/space-between-block-and-square-brace
-
-commit 465c4cb4f770cf685bf7cc7611d4a85de0ccc97e
-Merge: f066915 a98ff1a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 16 17:37:02 2013 -0800
-
-    Merge pull request #205 from loudnate/patch-1
-
-    Correcting issues in default objc.cfg
-
-commit 7c85198f51d813884447bd2c8f2f9823aabc5252
-Author: Alan Fineberg <af@squareup.com>
-Date:   Mon Dec 9 14:22:01 2013 -0800
-
-    Allow removal or addition of newlines after blocks.
-
-commit f066915cb48fff599321268e2bdc72d4a411ae9f
-Merge: 72fc222 b8ed112
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 15 20:37:57 2013 -0700
-
-    Merge pull request #207 from idpaterson/pull-requests/oc-ns-enum-alt
-
-    Added support for NS_ENUM and NS_OPTIONS modern Obj-C enums
-
-commit b8ed112d479a23f7576e38f5e899eab4e38b9bea
-Author: ipaterson <ipaterson@newstex.com>
-Date:   Mon Oct 14 19:38:38 2013 -0400
-
-    Added basic support for NS_ENUM and NS_OPTIONS syntax using enum formatting rules. Fixes #143 and fixes #201.
-
-commit a98ff1aed753af485e855d2faab2c918258936f5
-Author: Nate <loudnate@gmail.com>
-Date:   Sun Oct 13 19:39:17 2013 -0700
-
-    Correcting issues in default objc.cfg
-
-commit 72fc222641ef6c592f70c5de5b92f04936bc6306
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Oct 7 22:01:02 2013 -0500
-
-    Do a little code-style clean up
-
-commit 62d836458b8ef3efb2cd7f24ded256967511ee8d
-Merge: 5c571d4 e4d50b7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Oct 7 21:53:13 2013 -0500
-
-    Merge branch 'java-class-names-with-brackets' of https://github.com/npnth/uncrustify into npnth-java-class-names-with-brackets
-
-commit 5c571d415182a668bf053ba31130575079b8bd22
-Author: ipaterson <ipaterson@newstex.com>
-Date:   Mon Oct 7 16:10:54 2013 -0400
-
-    Fixed handling of multiline arrays to match disctionaries. Previously the closing bracket was being aligned with the opening bracket, producing a very odd indentation.
-
-commit de982885cb09c2d91f1086e6473faaffab645029
-Author: ipaterson <ipaterson@newstex.com>
-Date:   Mon Oct 7 16:05:56 2013 -0400
-
-    Fixed invalid Objective-C array literal syntax in tests. Arrays use square brackets, not braces.
-
-commit e4d50b74db2f21eda5505069cab7e639cb4f7137
-Author: S. Gilles <sgilles@umd.edu>
-Date:   Sat Sep 7 01:41:48 2013 -0400
-
-    Less fragile array-as-type handling
-
-    Handle [], [N]-skipping in a better section of the code, which fixes
-    some restrictions on the number of type tokens before an array for
-    recognition (i.e. `final int[] a;' would be recognized, but `int a[];'
-    would not). Test 80030 is updated to reflect this.
-
-commit 612c4aa8eea099e26f7abb80a5d14adb5b4bee45
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Sep 5 20:49:12 2013 -0500
-
-    Update the README file to indicate that bugs should go on the sf.net site
-
-    That info is also in the BUGS file, but github.com doesn't show that.
-
-commit e84a5811953b5fe95edb74e8268dd504a5d540e5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 31 01:17:56 2013 -0500
-
-    Add another class colon test
-
-commit 058eac81bcb46c2804a30e684687b274e2a62eec
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 31 01:17:15 2013 -0500
-
-    There cannot be variables to align in a class base list
-
-commit 25031c042320bbbd51a64dfc857f37371a361fbe
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 31 01:14:15 2013 -0500
-
-    Mark stuff between a class base ':' and the '{' as IN_CLASS_BASE
-
-commit d2345631e2d49ada2c877eb0ad266c6d53c46373
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 31 00:38:35 2013 -0500
-
-    Update config files for the CLASS_COLON/CONSTR_COLON split
-
-commit 3dcffc22a4ec69afa82d4e35a3bab7943a62018e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 31 00:37:56 2013 -0500
-
-    New options: indent_constr_colon, nl_constr_colon, nl_constr_init_args,
-    pos_constr_comma, pos_constr_colon
-
-    This should finish the split between the class initializer list and base
-    class list.
-
-commit cdadf3b0127a3c7ce37efa9525bcbbf45f0789e3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 30 23:56:02 2013 -0500
-
-    Add options sp_after_constr_colon and sp_before_constr_colon
-
-    Assuming that indent_ctor_init_leading was only meant to apply to the
-    constructor colon, not the class declaration.
-    No tests fail, but that may be because there is no test coverage.
-
-commit 0404165b13e37bdbcaed38cd1feb5d7c783795cd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 30 23:48:13 2013 -0500
-
-    Split the constructor initializer use CLASS_COLON into CONSTR_COLON.
-
-    Keep all the options the same, so there is no change in test output.
-
-commit 25dd1fdc9923250ee0f1da92a8ceb3053ef0fa23
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 24 21:24:50 2013 -0500
-
-    Fix crash due to incorrect NULL check.
-
-commit 6d2b4980468c2f0c1d386fbe7d0625799463839b
-Author: Stephen Gilles <sgilles@carrastro.com>
-Date:   Wed Aug 21 17:02:10 2013 +0000
-
-    Simplify chunk_get_next_nisq
-
-commit ffb0d2693ea8d5d8c2e18c3e667e878d2f1bef03
-Author: S. Gilles <sgilles@umd.edu>
-Date:   Sat Aug 17 19:06:44 2013 -0400
-
-    Treat class names with array indicators as CT_TYPE in Java
-
-    Extends the 'word followed by word is type' check to skip past
-    intermediary (nested and stacked) sets of bracket.
-
-commit dd1dc2d81323bebdae2b85b2df49f6cddaaf2f2a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 15 00:48:18 2013 -0500
-
-    Use tok_ctx.expect() in a few more places.
-
-commit 28d53f6263d5ac24cc57f035a37fe898971ae84d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 15 00:28:46 2013 -0500
-
-    Remove unused local variable.
-
-commit 44cce3c3998233dc83c32d345e3db2e7bedbc1ca
-Merge: 5a2faae b2fbac9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 15 00:26:01 2013 -0500
-
-    Merge branch 'master' of https://github.com/npnth/uncrustify into npnth-master
-
-commit 5a2faae9790991f0d8879e785e8d12606525c393
-Merge: e11229f d8a4ec8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 14 22:16:55 2013 -0700
-
-    Merge pull request #196 from villytiger/decltype
-
-    Fix applying sp_before_dc rule with decltype
-
-commit d8a4ec8182c77f56b4389197c580d704bba0f706
-Author: Ilya Lyubimov <Lubimov@rutoken.ru>
-Date:   Thu Aug 8 22:07:46 2013 +0400
-
-    Fix applying sp_before_dc rule with decltype
-
-    Rule wasn't applied and one space was forcely added in the following example:
-    std::vector<uint8_t> v;
-    decltype(v)::const_iterator it;
-
-commit b2fbac97eaf58220a60713ac939b9f6518cc9c8c
-Author: S. Gilles <sgilles@umd.edu>
-Date:   Sun Aug 4 15:41:04 2013 -0400
-
-    Explicitly recognize '@interface' as class-like keyword
-
-    In Java, treat '@interface' like the keyword 'class', including all
-    implied indentation. This changes the results of 80010, and as such is
-    a distinct commit.
-
-commit 9c208322522772aa0483dbf0a318e0e99a502f95
-Author: S. Gilles <sgilles@umd.com>
-Date:   Sun Aug 4 04:10:13 2013 -0400
-
-    Better handling of Java interfaces
-
-    Handle Java interfaces without relying on untracked newlines so that
-    nl_remove_extra_newlines can be nonzero. Also handle the keyword
-    @interface during tokenization so that it is not mishandled. Tests
-    80011-80014 are added as well.
-
-commit e11229f1d86ad0acbfa84f5863d0fd094817fc4b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 13 13:09:39 2013 -0500
-
-    Add tests for fix for SF#557
-
-commit 860378c4ba6aa482711513e44ad90b1d59ee8c69
-Author: Huang-Ming Huang <huangh@ociweb.com>
-Date:   Sat Jul 13 13:07:06 2013 -0500
-
-    Fix function parameter classification bug
-
-commit b4a057cfd17618f459a80a589b46fdf696d5a4ec
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 13 12:33:31 2013 -0500
-
-    Add test for github issue 137 - objc indent issue
-
-commit 2b268a241f7244fa2b24a6c30caa25df41796524
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 13 12:32:44 2013 -0500
-
-    Fix whitespace around '+' in last commit
-
-commit 0326d0594f48e8c771d524d18778dc2975690f04
-Merge: 936558e 06c8ecb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 13 10:31:03 2013 -0700
-
-    Merge pull request #185 from mmcdole/master
-
-    Fix nested block indentation in Objective-C
-
-commit 936558e04a1a234cfb3c5eee34ee68b06b418f1b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 13 12:15:44 2013 -0500
-
-    Trailing whitespace fix
-
-commit cde6fea68d1f593c8ed3972c70669cdaebc4188b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 13 12:15:27 2013 -0500
-
-    Add a test for the new sp_cond_xx_xx options
-
-commit 58a2138e587576ad27c469053df625bf80bc41be
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 13 12:07:47 2013 -0500
-
-    Add sp_cond_colon_before/after and sp_cond_question_before/after.
-
-    Thanks to Daniel Burr.
-
-commit 67ce0bfe08b4b5f9282c1eaf508a67009bfae4c2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jun 30 22:00:55 2013 -0500
-
-    A stray colon in a 'for' statement is likely a FOR_COLON.
-
-    Thanks to github user shhccie for finding the issue.
-
-commit 06c8ecb30abd418c7e6297f43449ce24cc91f6b3
-Author: Matthew McDole <matthew.d.mcdole@ehi.com>
-Date:   Wed Jun 26 15:48:07 2013 -0500
-
-    Fix issue with nested blocks in OC
-
-commit 41f04c88dfdf3aa1769add9fbcbe195d20a72457
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 12 22:19:41 2013 -0500
-
-    Add a test for the long brace comment options.
-
-commit 49f5cd579166085a5fc42e4d5850973126f8a0b3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 12 22:19:02 2013 -0500
-
-    Grab the full namespace or function name.
-
-commit c0073178d2d4340e6a0fedf0c62b8907a0730eb1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 12 21:53:27 2013 -0500
-
-    Don't use standard lib name for a variable.
-
-commit 9117dc60e1e5aa7b230541dfad90f72480af99bf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 12 21:53:00 2013 -0500
-
-    Fix crash bug when running test 10010 due to NULL pointer (ns_pc).
-
-commit 29e33a35adf05ba75d46ceb2df5f04c45000e5cc
-Author: Marius Zwicker <marius@mlba-team.de>
-Date:   Tue Jun 11 17:05:46 2013 +0200
-
-    Added the option to add a comment after closing braces of namespaces, similar to functions
-
-commit 06fd7cd290136fe31c7687181599916fa8ff70c5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 8 12:10:12 2013 -0500
-
-    Add test for SF#538.
-
-commit 1478a195ea804a501d6354d7b5fdbbca6c86e70b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 8 12:07:02 2013 -0500
-
-    Allow types (var defs) inside for(), if(), while() loops.
-
-commit 12b722905b2b53de37d74309d32756afdd3a03fc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 8 12:05:57 2013 -0500
-
-    Remove unused label.
-
-commit c6af5594221da60e725a3466f83178f2e956efc2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 8 12:05:41 2013 -0500
-
-    Mark LVALUE in the first pass.
-
-commit acf6ae6abc4ffa096c93ff69acaa7006642043bc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jun 6 21:50:20 2013 -0500
-
-    Extend/add test case for SF#537
-
-commit aacacc7c443315320108d03e3d292c448f964de3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jun 6 21:43:09 2013 -0500
-
-    Extend the list of tokens that shouldn't be before a proto/def
-
-commit 485d7682a4cb5949c833c3260c950416d3d258bb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jun 6 21:18:40 2013 -0500
-
-    Try doing a class continuation indent.
-
-commit 20653f4ee86f0d44a95b756c5b1404a6ce2790ab
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jun 6 20:51:30 2013 -0500
-
-    Add something to a test to cover "(*x)();"
-
-commit 395b0fc45ae23b1fa1d7d34c57a7bb86d2be3fe1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jun 6 20:50:54 2013 -0500
-
-    Require *something* for a function type definition.
-
-commit a9bde78443c5da89ea5761e6a33ffe914ab6514e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 5 23:44:04 2013 -0500
-
-    Do a better job of skipping B:: in "A(B::*C)();"
-
-commit fd3cd8775ba6b940cec494a1d467049e69a6bf91
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 5 23:26:53 2013 -0500
-
-    Check the 'return' type for a function type.
-
-commit a5ecb4772c95dd818c474c1e38fa2dcc5087eff7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 5 22:55:07 2013 -0500
-
-    Require '{', ';', or '=' after a function type.
-
-    Fixes part of SF#532.
-
-commit 6bc77231195f6ca75472a428c8d5bc26629c4637
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 5 22:29:49 2013 -0500
-
-    Update test for C comment fix
-
-commit 6ad733743f5db519cd3edc84e7a300672361f0bf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 5 22:28:56 2013 -0500
-
-    Add some protection against adding a '*/' inside a C comment
-
-commit ed0b66aacd88b7e6c565c6feea20b216e977560d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jun 5 22:00:42 2013 -0500
-
-    No return type for constructor/destructor
-
-    Affects nl_func_proto_type_name and nl_func_type_name.
-    Fixes SF#530
-
-commit 77681bfd703af2de55c2550317400b012c89ac8b
-Merge: a290e0c bdfe301
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jun 4 21:32:15 2013 -0700
-
-    Merge pull request #180 from berenm/cpp-lambdas
-
-    Better support for C++11 lambdas formatting.
-
-commit a290e0c455383748f2e436671611dae758c711a9
-Merge: 1e38539 61f8b86
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jun 4 21:29:13 2013 -0700
-
-    Merge pull request #181 from berenm/cpp-braced-init
-
-    Support C++11 braced initializer lists.
-
-commit 61f8b869c18502375afacb8a325fd569ec4f500b
-Author: Beren Minor <beren.minor+git@gmail.com>
-Date:   Tue Jun 4 20:17:47 2013 +0200
-
-    Support C++11 braced initializer lists.
-
-commit bdfe301d4f21ee4be6940b200692f0fcf77bab0a
-Author: Beren Minor <beren.minor+git@gmail.com>
-Date:   Tue Jun 4 18:25:51 2013 +0200
-
-    Update etc/defaults.cfg with missing options, from --update-config-with-doc.
-
-commit faf210181cf57c5ecb895de1e83f710a6952772c
-Author: Beren Minor <beren.minor+git@gmail.com>
-Date:   Tue Jun 4 12:02:36 2013 +0200
-
-    Support newline addition/removal before opening brace for C++11 lambda.
-
-    Add new nl_cpp_ldef_brace option to add/remove/force newline before C++11
-    lambda opening brace.
-
-commit 05ba0c5e7ab7cfcdcc5bdf3fa053ccd7f7705e6f
-Author: Beren Minor <beren.minor+git@gmail.com>
-Date:   Tue Jun 4 11:04:27 2013 +0200
-
-    Support one-liner C++11 lambdas. (Closes #162)
-
-    Add new nl_cpp_lambda_leave_one_liners option to leave one-liner C++11
-    lambdas.
-
-commit 1e38539c662c662cf2b4d690be5addbb0b30c18f
-Merge: 2fc8bee 7ba2041
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 1 10:26:14 2013 -0500
-
-    Merge branch 'master' of github.com:bengardner/uncrustify
-
-commit 2fc8beea2586b931e22c80f03e18bbb138f324d8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 1 10:24:31 2013 -0500
-
-    Fix code indent
-
-commit fa8987ebb27f89f66f0c9b13c9c8033aec393cdc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 1 10:20:24 2013 -0500
-
-    Use parens in 'if' statement
-
-commit f4f1d6dfec4ba24a0f32f8af7a2239e2ea8bc7dc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 1 10:20:59 2013 -0500
-
-    Undo change that breaks the @return comment in java comments
-
-commit 9c7ff6f05360f0bfc8bd992eeab23aa6a1095c85
-Author: Florin Pop <florin@florins-macbook.speedport_w723_v_typ_a_1_00_096>
-Date:   Mon May 27 19:37:42 2013 +0200
-
-    Output Objective-C parameter names where $(javaparam) is used in a comment block.
-
-commit 7ba2041fb62f8f32969813ee59b4468df4cd83ad
-Merge: 6f840f2 7689235
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 1 08:09:09 2013 -0700
-
-    Merge pull request #173 from nightdelphin/fix_keyword
-
-    Fix "finally" keyword in keywords.cpp
-
-commit 6f840f2da5f316a67146fe7a366b412593cd189c
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 22:31:20 2013 -0500
-
-    Enhance test for align_same_func_call_params to cover brace levels.
-
-commit b338372bb6fd32c8faa7bac059ea6b3e7adbd879
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 22:30:25 2013 -0500
-
-    Fix align_same_func_call_params with different brace levels.
-
-commit a2741b1208eafeb3c12446c98008d1bcf4f088e3
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 22:03:08 2013 -0500
-
-    Add test for options sp_word_brace and sp_word_brace_ns
-
-commit 569d2cd0fa74376eef4ebb1b72c01ed65f86140f
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 22:02:50 2013 -0500
-
-    Set defaults to new options to not change current behavior
-
-commit 7496a1d2b40b6c46ccf46e42698a04f4ced370a9
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 22:02:27 2013 -0500
-
-    Set the parent for the braces around get/set pairs.
-
-commit cdc3e28d68c9fd07287289fbb2dae8aa3e35dc08
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 22:00:11 2013 -0500
-
-    Add sp_word_brace_ns and sp_word_brace to control space in 'word {'
-
-    Addresses SF#545
-
-commit 1b5bdb93aa143de4ad50d2446b73ac390fd62c1d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 21:22:14 2013 -0500
-
-    Update test to cover SF#547
-
-commit 3526839296295de7a5fa1f718e28a05656b5a0b2
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 21:21:50 2013 -0500
-
-    typename also indicates a function param type.
-
-commit 2158000a3652c4246051cab381308a1bf25faec2
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 21:08:22 2013 -0500
-
-    Add some logs that were useful in fixing SF#546
-
-commit 77c2a484f64ebf50319bb5edf45bf06fb6915d4d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 21:07:53 2013 -0500
-
-    Add two other function template patterns to the nl_func_type_name test.
-
-commit 5c33a3175bd1f1b319bc84054ca6b4e9063840d6
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun May 26 21:06:26 2013 -0500
-
-    Fix nl_func_type_name for template functions.
-
-    Fixes SF#546
-
-commit 0288131faf20267b174f44ecf87c0ea426940d3c
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat May 25 17:24:21 2013 -0500
-
-    Add test case for SF#548
-
-commit 3716f7f6605e0d1689220a953e3baf0e910de191
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat May 25 17:19:27 2013 -0500
-
-    Add a new token for the 'class' in 'enum class'.
-
-    May fix SF#548
-
-commit 9936f1b7d5de8b72a0f2d7f768e62403f6196589
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat May 25 17:01:52 2013 -0500
-
-    Add test coverage for SF#549
-
-commit cb9853b4cb653fccb8dee0321e3117bad9692b41
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat May 25 16:57:21 2013 -0500
-
-    Add test for SF#550
-
-commit 4c3e74457e31e69e95a99fd7622644a5dbc45b18
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat May 25 16:52:46 2013 -0500
-
-    Don't remove braces if it contains a switch statement and other stuff.
-
-    Fixes SF#549
-
-commit c658f44a26fe827577866585b0c359323e1a2e01
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat May 25 12:08:46 2013 -0500
-
-    Don't try to align '<<' in enums.
-
-    Fixes SF#550
-
-commit 7689235fda8d378ea09825ab049c8df7d465cbaa
-Author: Ivan Nazarenko <nasaivan@mail.ru>
-Date:   Thu May 23 18:54:07 2013 +0300
-
-    Fix "finally" keyword in keywords.cpp
-
-commit 265ca86b5d94e67443dd960832acdf7db85e113a
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Apr 9 07:13:58 2013 -0500
-
-    Fix off-by-one in enc_text::find()
-
-commit 52076100951f58927502f84cbbf8c90643c67adf
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Apr 9 06:56:01 2013 -0500
-
-    create_one_liner: Bail if there is more than one newline
-
-    This used to bail if there were any newlines, which prevented creating
-    one liners.
-
-commit 7a0c75e5ca74bcf23de2fad92072d7bf030c738d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Apr 9 06:54:02 2013 -0500
-
-    FORCE a space after a VBRACE OPEN instead of ADD
-
-commit be86509d80831f82c10fb38a12cb037798f69921
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Apr 9 06:41:59 2013 -0500
-
-    Update test results for new option
-
-commit 43cdd73953b55107f12c5547e3d73f7c7f13600f
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Apr 9 06:41:24 2013 -0500
-
-    Move sp_cparen_oparen so it doesn't conflict with other options
-
-commit 3c8fe04e45d779a3b9d1838152bb953bdd9c643a
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Apr 9 06:04:59 2013 -0500
-
-    Add option sp_cparen_oparen
-
-    Controls the spacing between a close paren and open paren.
-
-commit 20a311344bd331ac9bff4872582225111f1ff75f
-Merge: 816cbb9 620ff3c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Mar 25 19:06:06 2013 -0700
-
-    Merge pull request #158 from madscientist/ms/wrap
-
-    C++ comments with long first words were wrapped, leaving an empty comment line.
-
-commit 816cbb971be2a0ee6f2a2b8f898d3fbc228d2997
-Merge: 84dde5e 37076b2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Mar 25 19:04:48 2013 -0700
-
-    Merge pull request #157 from madscientist/ms/stdin
-
-    Allow "-" to mean read filenames from stdin with -F/--files.
-
-commit 620ff3ca8559f69381482336dd5b73872cf50f97
-Author: Paul Smith <psmith@gnu.org>
-Date:   Sat Mar 16 19:10:26 2013 -0400
-
-    C++ comments with long first words were wrapped, leaving an empty comment line.
-
-commit 37076b29113a2f5ee40858e897cdef0c5a365400
-Author: Paul Smith <psmith@gnu.org>
-Date:   Sat Mar 16 12:21:30 2013 -0400
-
-    Allow "-" to mean read filenames from stdin with -F/--files.
-
-commit 84dde5e2f8722dcfb511a1d264b0834b95f6f294
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Jan 16 21:18:25 2013 -0600
-
-    Fix detection of '[xx] =' when aligning initializers.
-
-commit cc67666318862116caa3b6c1682926c333e20dbb
-Merge: 847c1f0 299f2b4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jan 15 18:46:53 2013 -0800
-
-    Merge pull request #130 from rolandschulz/master
-
-    Add option to disable tightening when aligning
-
-commit 847c1f08134c717bdf813e0d82f1ce1001ee23fc
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 15 20:44:32 2013 -0600
-
-    Update semicolon removal test for typedefs.
-
-    This addresses NS_ENUM & NS_OPTIONS declarations (OC).
-
-    From: Jim Frisby
-
-commit 24d820b1db375efb142019eba47e5bb6e5b864dd
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 15 20:34:52 2013 -0600
-
-    Do not remove semicolons if the parent is CT_TYPEDEF
-
-commit 299f2b4356a28764188ea55b239e8917748d3b99
-Author: Roland Schulz <roland@utk.edu>
-Date:   Tue Jan 1 16:05:28 2013 -0500
-
-    Add option to disable tightening when aligning
-
-    Fixes #122
-
-commit 15dc4bb3a821b823ce96e7cd288b48d274b0900c
-Merge: be4dc5d 6983fea
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jan 14 06:05:44 2013 -0800
-
-    Merge pull request #128 from ryanmaxwell/master
-
-    Correction for issue #127
-
-commit be4dc5d7a229ea5280ef525876c27144dc747624
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Jan 14 07:54:31 2013 -0600
-
-    Fix the version in the ChangeLog
-
-commit 6983fea0e95e21300ea3c2ed0fbc21605dd98291
-Author: Ryan Maxwell <ryan@cactuslab.com>
-Date:   Tue Jan 8 16:16:07 2013 +1300
-
-    correct @finally keyword type
-
-commit 432aa0b373cb82928dcc359cc9246daa5d1a4f2e
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 1 16:00:04 2013 -0600
-
-    Update commit.log
-
-commit 20f85c688334859635b21b95951b1e115540c69d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 1 15:59:23 2013 -0600
-
-    Run scripts/update-defaults.sh
-
-commit d85e6222393b36fde7aa8275abdea0c86ffe7f8d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 1 15:57:34 2013 -0600
-
-    Run autogen.sh on Ubuntu 12.10.
-
-commit f9282e34b98da6733c502448bbb88dd4ae28048a
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 1 15:56:51 2013 -0600
-
-    Update the ChangeLog
-
-commit 5d1398028feaf5181a5e41e8893392bdac602afb
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 1 15:25:38 2013 -0600
-
-    Add a few files to the workspace
-
-commit cae8a0b9c1b913e428e219865bb46fa58d4539fc
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Jan 1 15:25:13 2013 -0600
-
-    Update version number to 0.60
-
-commit edfb4f0bd76c11af4d5bb7cd709c0857ab084042
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Dec 30 14:56:49 2012 -0600
-
-    Fix labeling of OC @property statements
-
-commit 4154cb656fd3344b72c10b757087344adb1fa190
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Dec 30 10:57:48 2012 -0600
-
-    Properly label 'using namespace XXX;'
-
-commit b3744a85a9273d05b80d05086cfc42024e1813c9
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 23:39:23 2012 -0600
-
-    Split 'prev' code in chunk_skip_to_match() to chunk_skip_to_match_rev()
-
-commit 182a0cae4cf0d2db4e41249043fd9ef9191ba54e
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 23:25:32 2012 -0600
-
-    Fix the pawn-only keyword 'sleep', which is like return or sizeof.
-
-commit d625ef6006159aa9272cf9be7c497b802b4c7e65
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 23:24:46 2012 -0600
-
-    Update test results (missed a file in the last commit)
-
-commit 51fe304d6dbb1d4ddf2e30a9e4e6c04f62aa903c
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 22:42:13 2012 -0600
-
-    Update config and test for indent_oc_block_msg
-
-commit 67d055ccfbcf7c3e9b2078b791e991c813eb847e
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 22:38:53 2012 -0600
-
-    Add option: indent_oc_block_msg
-
-    Indents blocks relative to the tag name inside messages.
-    Really hacky, but it seems to work.
-
-commit 0edf827adcb8b509b58607faacecec906ed0980b
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 15:51:59 2012 -0600
-
-    And and update tests for new ObjC options
-
-commit fa87f91938e520251d1380e0ebd2d69f7d11e1d7
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 15:47:04 2012 -0600
-
-    New option: indent_oc_msg_colon
-
-    Insert a CT_SPACE in front of the longest arg to make it work.
-
-commit f3aa1441a79f5968436e4b607ed8d3c8b8209c0f
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 15:43:09 2012 -0600
-
-    Finish option nl_oc_msg_leave_one_liner
-
-commit e2f941ab0c8f1f1d48cf88d4718efcb8e8b525bd
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 15:42:18 2012 -0600
-
-    Extend flag_series to both set and clear flags.
-
-commit bc7a55d957419cb4c01fa7a3a0cbad6cbf2573c1
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 15:41:05 2012 -0600
-
-    Add m_skip_first to AlignStack to anchor the first line.
-
-commit 626c3e5de763176d3b6d148a958786b712fd2b55
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 10:52:39 2012 -0600
-
-    Add a comment for undo_one_liner()
-
-commit e6248d0b55c066e76bc18c64245ebb0d6975f9da
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 10:52:16 2012 -0600
-
-    Add option: align_oc_msg_colon_first
-
-    Controls whether the first OC message arg is aligned with the rest if it is
-    short.
-
-commit d1fc8a0bdb2c04d057716be024063e4778b03799
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 10:50:40 2012 -0600
-
-    Add ChunkStack::Pop_Front()
-
-commit 493f3ed0bb1e3c21485ceaac1c6d7351ee5abe25
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 10:50:16 2012 -0600
-
-    Add options: nl_oc_msg_leave_one_liner and nl_oc_msg_args
-
-    Splits OC message arguments to one-per-line.
-
-commit a317d7df902664efdcff5797685e9587a92b7bd7
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 10:43:02 2012 -0600
-
-    Rename ChunkStack::Push() to ChunkStack::Push_Back()
-
-commit 79a889b0e4847a39c2543a940214ab3e4be515a0
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Dec 29 10:03:08 2012 -0600
-
-    Copy the level, pp_level and brace_level when inserting a newline.
-
-commit e1befa297644f4e53e79bd341cb68d3399203c31
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Dec 28 14:58:06 2012 -0600
-
-    Do a better job of labeling 'extern (C)' stuff in D
-
-commit 3e92b23534e7e96e57f360fc24082eff6b06025d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Dec 28 14:57:16 2012 -0600
-
-    Add option sp_extern_paren to control space in 'extern (C)' (D)
-
-commit c5916e04bc9f75d873660fa8e46baeb12ed1abd8
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Dec 28 14:28:42 2012 -0600
-
-    Add test for the Java for-each construct.
-
-commit 9d193c556f240a168ec679aa1d4c7e478f82a87b
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Dec 28 14:26:40 2012 -0600
-
-    Allow splitting after a Java for-each colon.
-
-commit 3c3db622f1eb8bd5496d542ea2d80c88c0cd59a9
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Dec 28 14:22:12 2012 -0600
-
-    Add options: sp_before_for_colon and sp_after_for_colon
-
-commit 7cbfd663b38859451612d7ad1b649359f6b808db
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Dec 28 14:03:57 2012 -0600
-
-    Label the ':' in the Java foreach: "for (TYPE VAR: EXPR) { }"
-
-commit ec14dea186351cf021e41bb7a7e7952a46734575
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Dec 28 14:02:50 2012 -0600
-
-    Remove the date from token_names.h/make_token_names.sh
-
-commit 4f37cdf81942be97894ec467bada3f7c5f917590
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Thu Dec 27 19:50:20 2012 -0600
-
-    Skip the 'mutable' keyword in C++ lambda expressions
-
-    Thanks to Jorge Amado
-
-commit 126a8b4474e9c260775a571804725316073a5db0
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 23:01:44 2012 -0600
-
-    Add option sp_after_oc_property
-
-commit dfff12d84896faa23e5832e0d28f8ffe78686935
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 22:53:05 2012 -0600
-
-    Update test for indent_oc_block option
-
-commit 697236aaf0b4b5979287e176f3a1773f25fe16db
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 22:50:02 2012 -0600
-
-    Add option indent_oc_block to drop back the brace indent of OC blocks
-
-commit ba2faf474b574d85a570f145c8c65693490f9ec0
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 22:08:37 2012 -0600
-
-    Add a basic test for the '&&' C++ move operator
-
-commit 1ced8f481245a154a575d47acae6e286bffd8f95
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 22:08:16 2012 -0600
-
-    Allow the '&&' operator to be interpreted as CT_BYREF
-
-commit 3bb91cc5cdf5c914e59b630b0d1153c2aef8cc34
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 21:51:20 2012 -0600
-
-    Add option sp_before_pp_stringify and default sp_pp_stringify to ignore.
-
-commit 0b34f6412ad9c3fa45cc00edcae2f86710bc3db0
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 21:30:25 2012 -0600
-
-    Add test for sp_cmt_cpp_start fix
-
-commit 44e0253a1648e9ba8c905e9aa7877d07268645e1
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 21:26:43 2012 -0600
-
-    Fix C++ comment continuation on wrapped lines.
-
-commit a5b7aad662e80a56db10e990ec35b48d032e6223
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Dec 4 21:20:15 2012 -0600
-
-    Add support for Objective C @throw and option sp_after_throw
-
-commit f91f1aa05b1f0f935fccebe50def5136a052f805
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 22:11:28 2012 -0600
-
-    Make a log less ambiguous, as there was the same text a few lines up.
-
-commit 9c3cf58acb6a45479147f4ccd849a83f3a0b9384
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 22:10:51 2012 -0600
-
-    Only flag parens after a function.
-    This code may be redundant.
-
-commit a18e0a8c33e426cb04ca28e93165a46e9103e35c
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 22:09:08 2012 -0600
-
-    Set the paren parent when marking a function call
-
-commit ce990e6d35316958c4f8a596c5c1efc1ef5e60e2
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 22:08:40 2012 -0600
-
-    Improve the flag_parens() log
-
-commit 53a19b1dbb088a468c50e6760785078503044126
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 20:32:23 2012 -0600
-
-    Add test case for SF#340
-
-commit e9cf4852e0783dadfb8a1d98edaa78512371ef1b
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 20:31:50 2012 -0600
-
-    Mark the parameter label with DONT_INDENT when aligning on the colon.
-    Fixes SF#340
-
-commit d5fabd4e79aabbc8cb0bb8f103c6a0a8c3776143
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 20:17:01 2012 -0600
-
-    Change template detection a little and enable for for Java
-
-commit 7556452ec8277f9b487b51b3682acec2d58536eb
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 30 20:02:51 2012 -0600
-
-    Add missing ANGLE_OPEN/ANGLE_CLOSE to chunk_skip_to_match()
-
-commit 55d4795178842bdafcff18b3e510528ecd5a79bb
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:40:17 2012 -0600
-
-    Rework test results based on recent changes.
-
-commit 93d0cc53ddaf5cc7e83b8515019c7700ec4183c4
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:38:07 2012 -0600
-
-    Add sp_after_tparen_close=remove to a few test config files
-
-commit 81d782116d6bce157c79609054d7419f0982cc06
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:31:14 2012 -0600
-
-    Rework ObjC block type, literal, and message marking
-
-commit f1152bde2a61f863730b5ef9d7377b7505abbcbd
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:28:57 2012 -0600
-
-    Allow ObjC '^' to be used as a function pointer
-
-commit 31d47719c594f3f8c5a59c498f66702e94ef46ac
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:27:15 2012 -0600
-
-    Use TPAREN_OPEN for aligning function defs
-
-commit 7a029ce0ea6e3489531ab28a84e4e4b335eeb2bf
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:25:59 2012 -0600
-
-    Add sp_after_tparen_close and sp_ptr_star_paren
-
-commit 1e6cf7a2a3b568b33e8fc39c65a356b1069039dd
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:05:57 2012 -0600
-
-    Make flag_parens() log who called it.
-
-commit 474fe3a8bec8f5f860598ca061859022b24b8a15
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:04:22 2012 -0600
-
-    Fix up fix_typedef()
-
-commit 2c5353d982c35ffa624fa369bdbbbd4741acb8dc
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 22:01:54 2012 -0600
-
-    Clean up mark_function_type() and make it handle more cases.
-
-commit bfd9a034944c29c8566ceadcea39812fd6f8b2ee
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 27 21:53:41 2012 -0600
-
-    Move log in align_typedefs and remove obsolete comment
-
-commit 4abb818058010d13478e924e443699e0c68b9565
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 26 23:04:43 2012 -0600
-
-    FUNC_WRAP and TYPE_WRAP need to be handled before the main loop.
-
-commit 6470b895835a897cfc0d195343c927525a277ea6
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 26 21:53:20 2012 -0600
-
-    Add an include statement to the config files to base of another config.
-
-commit e055dbc87cfae1b552dfa1512d87d04afd74dcc8
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 25 18:52:29 2012 -0600
-
-    Add TPAREN_OPEN and TPAREN_CLOSE for future function type stuff.
-
-commit 9c86d2f9f2ef023c48f709bbc7d1ae8a30241a77
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 25 18:49:24 2012 -0600
-
-    Change --decode to process all remaining args instead of just one.
-
-commit afc1f2aa1b1d3b765b3143613b718555fb0ddbd5
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 25 12:15:44 2012 -0600
-
-    Add a log sev for flag_parens()
-
-commit 3f528f93a2fd8a16aba5daed7a02a857e5afebda
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 25 10:02:13 2012 -0600
-
-    Add '__thread' (C/C++) keyword
-
-commit 146b50958d9f9a58d9690fe778c14d4f758abb04
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 25 10:01:48 2012 -0600
-
-    Add '__block' (ObjC) keyword
-
-commit cf8c379422c360d6f87da219b817b0e8ba53fad8
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Nov 24 15:04:44 2012 -0600
-
-    Try to clean up the objective C block code a little
-
-commit 2cb28330f9b0e4fd78d5d07364338ea1eda5667d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Nov 24 15:04:11 2012 -0600
-
-    Make chunk_skip_to_match() go both ways.
-
-commit d5b3d1c4ebf793947a0f47a9a81d53f1dd2f3620
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Nov 24 13:56:37 2012 -0600
-
-    Split out return type marking logic into mark_function_return_type()
-
-commit 877fc7f2bb65c3735a7c767d50d9f54e12ec3b36
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Nov 24 13:25:47 2012 -0600
-
-    Objective C: @end marks the end of a statement
-
-commit 23cd8b3faf4f009ef68ec26df1095cdf4b5f5d4d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Nov 24 13:25:20 2012 -0600
-
-    Objective C has the typedef keyword.
-
-commit dae38559646a0b4186e6464d9e40b1ed4c5d1213
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 23 15:21:30 2012 -0600
-
-    Split CT_CARET (^) from CT_ARITH
-
-commit 9fe010cbbca11f04ac31ca8a2f31f978ae805e38
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Fri Nov 23 13:38:02 2012 -0600
-
-    Patch over segfault in GH#107.
-
-commit 36c4414aa46b4d8378179bfc2630c363a10872ec
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Thu Nov 22 11:03:10 2012 -0600
-
-    Update test results for nl_squeeze_ifdef change
-
-commit 114c2ac0f5e6be54fbefeeae050e12b46df09569
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Thu Nov 22 11:02:49 2012 -0600
-
-    Make nl_squeeze_ifdef work before #else and #endif
-
-commit a18cd338149d97938e28e07f64809949ea16e5a9
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Thu Nov 22 10:38:06 2012 -0600
-
-    Fix cmt_sp_after_star_cont when wrapping long comment lines.
-
-commit 83f2e0a7e832341485f6d37b980eefb9c77f489c
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 20:20:48 2012 -0600
-
-    Add a test for bug SF#485
-
-commit 07f1938707162f95209772de8821fdfe707ee282
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 20:18:28 2012 -0600
-
-    A colon starts a statement on the next token.
-    Fixed SF#485
-
-commit b2bd23da3c103b5d3a0877bce31991b6e62b45fd
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 16:52:16 2012 -0600
-
-    Add test for variable aligning change for bug 495
-
-commit cc503cb277767988e7f9c4aefbf3f8e51a396db5
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 16:47:48 2012 -0600
-
-    Align FUNC_CTOR_VAR with regular variables
-
-    Patch from SF#495, thanks to Jean-Marc Bourguet
-
-commit 571d39af2e2ca5cec7d1665d25e2e2b640275b3a
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 16:42:09 2012 -0600
-
-    Add a test for bug 484
-
-commit 577f10774afd2a086c112fbc855db5f37876a635
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 16:41:35 2012 -0600
-
-    Do a better job of marking the C++ constructor initialization functions.
-
-    Fixes SF#484.
-
-commit a8b1eb768712d0e0dd5efd00e0ff88027160b787
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 15:52:37 2012 -0600
-
-    Expand tests to cover new functionality
-
-commit 2305faab70e6df3096305a419bddeb3c49312959
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 15:52:14 2012 -0600
-
-    sp_cmt_cpp_start: Do not insert a space in '////'
-
-    Thanks to sf.net user stsi
-
-commit 374c12df306f5d3f36c2026d734f758d87dc2e18
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 15:45:46 2012 -0600
-
-    Add a test for bug 481
-
-commit 570a17c1f6b20ab0d2db31d4f62816bef257f865
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 15:45:28 2012 -0600
-
-    Always allow '[]' in prototypes.
-    Fixes SF#481.
-
-commit 2654520e936bc91fbc18d4501b89965ee053c4b1
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 15:35:56 2012 -0600
-
-    Add a test for bug 472
-
-commit 316bbcf34494b2dd2a1565d664ffaee6019bd79c
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 15:35:11 2012 -0600
-
-    Handle old-school C function pointers as a prototype parameters.
-    void foo(int, (void));
-
-commit c2261b80c37d89ee56f7dcdd4cea00669e19e384
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Nov 21 15:33:33 2012 -0600
-
-    C/C++ casts cannot be followed by a comma, close paren or semicolon.
-
-commit ebff0b4e9299711d3237e92e21099af3d7eb4da3
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 22:44:32 2012 -0600
-
-    nl_before_return and nl_after_return should also check for vbrace.
-
-commit dd9adc5775e7a56cd2c0c39220f246fbe449fa14
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 22:36:44 2012 -0600
-
-    Add a test for negative values of indent_continue
-
-commit bfb6771bea22b12447f0f670332f344cfe9dcde2
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 22:36:13 2012 -0600
-
-    Fix negative values for indent_continue.
-
-commit 86f2e99a784ea5c6c04b91c463db4f4ed7b355ff
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 22:03:05 2012 -0600
-
-    Add a test to catch the tab-backslash-newline problem.
-
-commit 2faf4e699a49a0ca1c087bb135159afaa107bd93
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 22:02:25 2012 -0600
-
-    Do not allow a tab before a backslash-newline except if it was aligned.
-
-commit 102996568c1d3d53853b8142f27fe204cb30b772
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 21:43:44 2012 -0600
-
-    Expand the typedef aligning tests a bit.
-
-commit bf2a69a6e1ec7911e4b03da5fe944aa9570e796c
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 21:37:09 2012 -0600
-
-    Rework typedef processing to handle 'typedef void foo(int);'
-
-commit 286d3d38c852d76808ac079cdb8852084a90e2e1
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 15:27:51 2012 -0600
-
-    Update tests for latest fixes.
-
-commit 71409716a860cef542e08d680574dea8f46670dc
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 15:27:28 2012 -0600
-
-    Ignore vbraces when determining the comment position.
-
-commit b56f56b581a95c0cf86096c6162c7cb44749ddbb
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 15:13:31 2012 -0600
-
-    Do not allow the removal of braces if it contains any preprocessors.
-
-commit 78438169b21759238252faf917231d4b9422e529
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 14:57:56 2012 -0600
-
-    Handle mod_full_brace_if_chain first so that braces are not toggled.
-    Keep a flag to prevent a brace being virtualized.
-
-commit 70dfbd2d44ca1f7ff1c823bfbf9cdd2224b3c213
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 14:23:22 2012 -0600
-
-    Make nl_after_class force a newline after a semicolon for a class.
-
-commit 396480606490e9a22dc4e14d23e4ee3fd31d9e22
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 11:01:16 2012 -0600
-
-    Reuse the config file output code in the parsed output code.
-
-commit 55b5a029109a684851f77f05e8727bf6c53168b1
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 10:58:26 2012 -0600
-
-    Revert the test result 'fix'. The results are ugly, but correct.
-
-commit d93b3e57927ae6287d3d5aa336eb45e925213a1d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 10:57:50 2012 -0600
-
-    Fix prototype parameter marking when TYPE_WRAP is used.
-
-commit c7ba8cc65f8aa2995a241ff9145d967df2039aee
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 10:23:52 2012 -0600
-
-    Add version to the 'parsed' output and make it usable as a config file.
-
-commit 00fa127f3e0192db96e089d754b95bc3ebb71f9f
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 10:23:16 2012 -0600
-
-    Update test that had broken results, which were fixed by the last commit.
-
-commit 391b2919584ce149750d5ffe175fab0377f31a5a
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Tue Nov 20 10:13:27 2012 -0600
-
-    Fix marking of unnamed parameters in prototypes.
-
-commit 235be8d12a7d16e1fcd7d7b6effd68e99727dc53
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 19 21:32:55 2012 -0600
-
-    Also handle: '[ func(a,b,c) selector ]'
-
-commit 0375f45fca8fef84ea1b4f764a2fff246aef707f
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 19 21:32:19 2012 -0600
-
-    Update obj-c.cfg with new option: sp_after_oc_msg_receiver
-    Add a test that uses it.
-
-commit 69523163bf7cd2aefebfd911551bf00e0a2ad1eb
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 19 21:29:36 2012 -0600
-
-    Add Obj-C option: sp_after_oc_msg_receiver
-
-commit 24fe8b792003e513213f6c1d293063d61337afdc
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 19 20:26:03 2012 -0600
-
-    nl_after_func_body should control the newline after a ObjC block expression.
-
-commit 9c131cea93862c88b8bb403ffe0e61620301026a
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 19 14:29:04 2012 -0600
-
-    Update test results.
-    I had changed the input but didn't update the results.
-
-commit 45519f9fe1b2e287760ebfce874277b40286db76
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Nov 19 14:28:26 2012 -0600
-
-    Objective C messages: allow nested [] and protocols <>
-     [ class <proto> self method ] ;
-     [ [NSMutableString alloc] initWithString: @"" ];
-
-commit 43e36321bc80deceb31c2b46a27bf865ea6feec4
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 18 22:37:43 2012 -0600
-
-    Add some more Objective C literal tests
-
-commit 90828710bab8306971767f0372abc8676e53c2ee
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 18 22:35:33 2012 -0600
-
-    Do not do a space safety check on literal strings.
-
-commit cf4562d3ece8716d5bfa7257331369691b7a3401
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 18 22:11:25 2012 -0600
-
-    Parse Objective C literals: @2 or @"hello"
-
-commit 254c53bb55f51392ea6bbea73f9dad52ce6e3b02
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 18 21:48:49 2012 -0600
-
-    Clean up GCC compile warning about strict aliasing rules.
-
-commit 4e95ba9bb36c92f6807e322df2c15de3c79321a6
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 18 21:47:39 2012 -0600
-
-    Add a simple test for Java annotations
-
-commit b332a27a8f5fcd253bc736df4ed1d06b5882049a
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 18 21:45:45 2012 -0600
-
-    Add basic support for Java annotations.
-    New options:
-     sp_annotation_paren
-     nl_after_annotation
-     nl_between_annotation
-
-    Thanks to skarekar.
-
-commit 5421d10fca9a51e1311e3c791cbb8e2ab649eecd
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sun Nov 18 21:36:10 2012 -0600
-
-    Fix the 'package' keyword for Java, D, and ECMA.
-    The Java 'package' keyword is nothing like 'namespace'.
-    The D keyword is like 'private'.
-    ECMA just has it as a reserved word.
-
-commit 5f403057e4bc4cfe0adf5e10a9702d1c68af257d
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Sat Nov 10 11:53:50 2012 -0600
-
-    Add option sp_inside_sparen_open to mirror sp_inside_sparen_close
-
-commit 6407100375f6369bd2170d8d586af7742d4325c3
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 22:47:52 2012 -0500
-
-    Fix spelling errors in comments
-
-    Thanks to Ger Hobbelt
-
-commit 97bae9f6766596f45ae1a6f3b960aeff468b7bf6
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 22:28:51 2012 -0500
-
-    Remove unused parameter to print_options()
-
-    Thanks to Ger Hobbelt
-
-commit 46b78ef42a3ad960cee0eeb2c9b69f4cd6208e15
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 22:27:39 2012 -0500
-
-    Use the cross-platform 'safe' isalpha() wrapper.
-
-    Thanks to Ger Hobbelt
-
-commit eb7ce00527e1f9fb7e1b9748a9458fdea4a0cf87
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 22:23:53 2012 -0500
-
-    Use the log_sev_t enum instead of int where it makes sense
-
-    Thanks to Ger Hobbelt
-
-commit 4976ecf46bf5c99070442ed61d2c4d61d2313078
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 22:12:52 2012 -0500
-
-    Remove unused variable.
-
-    Thanks to Ger Hobbelt
-
-commit 8177f573f0c6e5915b82fc785ac4314408933290
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 21:41:49 2012 -0500
-
-    Use EXIT_SUCCESS and EXIT_FAILURE instead of 0 and 1 for portability
-
-    Thanks to Ger Hobbelt
-
-commit 9a96fd27e29d64ad813e9d99a135ef0e3079567b
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 21:38:25 2012 -0500
-
-    Add some enum value comments
-
-    Thanks to Ger Hobbelt
-
-commit 3653536c281c6bcc982da4bfe71a56536d734298
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 21:36:30 2012 -0500
-
-    Use GetEnvironmentVariableA() instead of GetEnvironmentVariable()
-
-    Thanks to Ger Hobbelt
-
-commit db25fd2c9345eb506d57db33a501a81e68121976
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 21:35:15 2012 -0500
-
-    Whitespace cleanup a bit
-
-    Thanks to Ger Hobbelt
-
-commit 6c430a023695451d5eb17027a098cc0d4e816aa6
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 21:13:02 2012 -0500
-
-    Uncrustify combined.cpp
-
-commit d35dc97ff2868e439cba3b5c331f442cc9391d13
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Wed Oct 17 21:09:16 2012 -0500
-
-    Update my preferred style and change mod_paren_on_return to ignore.
-
-commit 6bfecba0b345006c560793012d073db3b02bf585
-Author: David Schaefgen <david.schaefgen@gmail.com>
-Date:   Tue Oct 16 09:38:47 2012 -0500
-
-    Finish FIX | Issue #99
-
-    Found an additional case, anonymous block arguments to Objective-C
-    messages, i.e.:
-
-    - (void)resetCells:(void (^)(UIView *view, NSUInteger idx))handler {...}
-
-    or this in an @interface
-
-    - (void)resetCells:(void (^)(UIView *view, NSUInteger idx))handler;
-
-commit 4eaee0e7f8b7621eb24a0fe24b7959047e74b011
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Oct 15 20:46:09 2012 -0500
-
-    Fix the '>' + '>' => '>>' detection logic
-
-    The memcmp() was incorrect since the token string storage was changed.
-    The extra else if () logic added recently was not needed. At least, it
-    didn't make any difference in the tests once tif was fixed.
-
-commit 3f06a2cd5f98fc9b2e32b4da99681df664677402
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Oct 15 20:40:03 2012 -0500
-
-    Save off current template test results.
-
-    Apparently, this "bool X = j<3>>1;" is now the template 'j' passed a value
-    of 3 compared against 1.
-
-commit ab0cb3517a07482cd38e6857cdd5aa9cfdd2ac0f
-Author: Ben Gardner <ben@ben-MS-7637.(none)>
-Date:   Mon Oct 15 20:32:19 2012 -0500
-
-    Update test results for recent Objective C improvements.
-
-commit aea8b1b2a2eaac3f46bcb7afdeb92144187ce677
-Merge: be15b03 e91557f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Oct 12 10:39:47 2012 -0700
-
-    Merge pull request #89 from jasonfharris/master
-
-    Request for fix to make ObjC handle method one liners (nl_func_leave_one_liners)
-
-commit be15b031d9aa3ca652184bc4fc9d602e4e54688e
-Merge: ccd991f 4be6c27
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Oct 12 10:38:17 2012 -0700
-
-    Merge pull request #90 from aniec07/master
-
-    Bug 3555610, bugs of >> worked on version 0.57
-
-commit ccd991fc2e0a2865a79f11c82a92a863303b6788
-Merge: bc39f8b 0befe17
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Oct 12 10:36:18 2012 -0700
-
-    Merge pull request #100 from daschae/master
-
-    FIX | issue 99 -> Type pointers in Objective-C block argument definitions and literal blocks star is arith rather than ptr_type
-
-commit 0befe17a9705c9a1849dc8fd44f60a131f0a45b0
-Author: David Schaefgen <david.schaefgen@gmail.com>
-Date:   Thu Oct 11 18:24:01 2012 -0500
-
-    FIX | issue #99
-
-    Type pointers in Objective-C block argument definitions and literal
-    blocks star is arith rather than ptr_type.
-
-    Pass everything starting with the open paren through
-    fix_fcn_def_params(chunk_t *) to process the arguments like function
-    parameters.
-
-commit bc39f8b5dfc50037593247e6b290be802b479d72
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 26 21:45:23 2012 -0500
-
-    Fix tokenizing of comments such as '/*// ... */'
-
-commit 4be6c270cc1bd01164ab75a6a8e066b8de95e64a
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 12:22:44 2012 +0530
-
-    Update src/tokenize_cleanup.cpp
-
-    Changes pertaining to bugs of >> - ID: 3555610
-    Resolve conflict between template and comparator followed by shift operator
-    The function handle_double_angle_close is called when then second '>' of  '>>' is reached.
-    pc is then '>' which is of comparator type. pc->prev is also of comparator type. We delete pc and make prev as CT_ARITH. We also make the next field of prev point to pc->next.  prev now behaves has the current pc.
-    This invokes a case of angle mismatch because earlier a '<' was opened and detected as ANGLE_OPEN, which should now be CT_COMPARE. Thus the while loop helps us detect this '<' and make it CT_COMPARE.
-
-commit 96a59eb2493c5fd7754baad18433817d3655d791
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 12:09:27 2012 +0530
-
-    Update tests/output/cpp/30103-templates.cpp
-
-    bugs of >> - ID: 3555610
-    Resolve conflict between template and comparator followed by shift operator
-
-commit 648b2c2863a76eb5a830439467e73a510e15698b
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 12:07:54 2012 +0530
-
-    Update tests/output/cpp/30102-templates.cpp
-
-    Did not remove the syntax error line that was similar to bugs ID: 3555610
-
-commit 7d47d1624ae6affa797d75cfcb4462d4bbaa7542
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 12:07:05 2012 +0530
-
-    Update tests/output/cpp/30102-templates.cpp
-
-    bugs of >> - ID: 3555610
-    Resolve conflict between template and comparator followed by shift operator
-
-commit f6cfd7b9c394df1d18a984331e75f1fe94b2845d
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 12:05:56 2012 +0530
-
-    Update tests/output/cpp/30101-templates.cpp
-
-    bugs of >> - ID: 3555610
-    Resolve conflict between template and comparator followed by shift operator
-
-commit 92a4088e4d3725e82d637b50d1b9edbdddd653b4
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 12:04:10 2012 +0530
-
-    Update tests/output/cpp/30100-templates.cpp
-
-    bugs of >> - ID: 3555610
-    Resolve conflict between template and comparator followed by shift operator
-
-commit 110fabb014714dbacb838efedd24e38e65eb92ea
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 12:00:51 2012 +0530
-
-    Update tests/output/cpp/30023-templates.cpp
-
-    bugs of >> - ID: 3555610
-    Test case to resolve conflict between template and comparator followed by shift operator.
-
-commit b99e585ddc4e22f0b26e991048c2b47a1da96737
-Author: Anirban Pramanick <pramanick89@gmail.com>
-Date:   Wed Aug 22 11:53:16 2012 +0530
-
-    Update tests/input/cpp/templates.cpp
-
-    Y<X<6>>1>> x4 is detected as a syntax error in C++. However a condition like:
-    if ( j<3>>1 )
-    is not a syntax error. But Uncrustify detects the latter as a template and forces a space making it as:
-    if ( j<3> >1 )
-    which is a syntax error in C++.
-    Therefore the required test condition should be:
-    bool X = j<3>>1;
-    where 3>>1 does not need to be specified explicitly inside brackets
-
-commit e91557f0682b2d046b764613c30831d5a1724a96
-Author: Jason <jason@jasonfharris.com>
-Date:   Mon Aug 20 03:28:51 2012 +0200
-
-    fix leave function one liners alone for objective C methods
-
-commit acf6059a97e72b1b8fa596309accfc4c34d374c5
-Merge: 65dd559 234a1e9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 18 09:49:41 2012 -0700
-
-    Merge pull request #85 from kastiglione/fix-blocks-spacing
-
-    Mark functions inside block expressions
-
-commit 65dd5597686d1772d951fc6698578afbf8ebf3ac
-Merge: 1712cbe 4c8a034
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 18 09:47:32 2012 -0700
-
-    Merge pull request #86 from Hackerpilot/master
-
-    Add support for D's new lambda operator
-
-commit 4c8a0340cbb9c551e58618e5b485e304167a57fd
-Author: Hackerpilot <briancschott@gmail.com>
-Date:   Sat Jul 14 22:42:20 2012 +0000
-
-    Added lambda operator to D
-
-commit 234a1e932de5b8bfd18ffa688ceb30d10cf30acb
-Author: Dave Lee <davelee.com@gmail.com>
-Date:   Mon Jul 2 22:39:23 2012 -0600
-
-    Mark functions inside block expressions
-
-commit 1712cbe29a4afd2b00ec4f4a5b1698a080be8215
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jun 26 22:02:03 2012 -0500
-
-    Expand the ObjC boxed test
-
-commit b48b7c8ca701a2f281d527f8bf63b8e48873255b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jun 26 22:01:43 2012 -0500
-
-    Treat ObjC boxed strings the same as other boxed types.
-
-commit d466c318dec17f37a3a6e85d3f273a409422dcea
-Merge: f450527 16fdfdf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jun 24 15:27:57 2012 -0700
-
-    Merge pull request #84 from GerHobbelt/issue-084
-
-    bugfix: wrong offset passed to peek() --> CRLF not recognized correctly
-
-commit f4505271868e251e694f2aff5da8804342b55505
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jun 24 16:44:29 2012 -0500
-
-    Add a test for Objective C boxed literals
-
-commit b875c33fe318810b0a69317c0800e46b25f32685
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jun 24 16:41:50 2012 -0500
-
-    Add new option: nl_brace_struct_var
-
-commit 16fdfdfcc8df54c5b4082f786b81995f8b80cc03
-Author: Ger Hobbelt <ger@hobbelt.com>
-Date:   Sun Jun 24 19:11:15 2012 +0200
-
-    wrong offset passed to peek() --> CRLF not recognized correctly (as peek(1) points 1 PAST the LF!) in D /+...+/ comments.
-
-commit f91bb5a01c76caef5ba035f73c20b5ff3424161a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jun 24 02:00:34 2012 -0500
-
-    Add options: sp_before_oc_dict_colon and sp_after_oc_dict_colon
-
-commit c0db5d7584ef6103abe7a820c5f28cd4bb2ef2eb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jun 24 01:59:14 2012 -0500
-
-    Add basic support for Objective-C boxed expressions.
-
-commit 2e5f32e87834ca1239dc1481091c85db134c5f92
-Merge: cc65530 1b6c857
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jun 5 15:25:02 2012 -0700
-
-    Merge pull request #79 from pwaller/remove_ns_close_semicolon
-
-    Remove semicolons after namespace close brace
-
-commit 1b6c857876e78b46d1a2c6d0c7ae8dbba1504fb7
-Author: Peter Waller <peter.waller@gmail.com>
-Date:   Thu May 31 13:20:34 2012 +0100
-
-    Remove semicolons after namespace close brace
-
-commit 86ca62b2918a801ee4b1f2d1509439d313453cbb
-Merge: 7df80a1 cc65530
-Author: rdan <rdanioux@free.fr>
-Date:   Sat May 12 14:14:43 2012 +0200
-
-    Merge branch 'master' of git://github.com/bengardner/uncrustify into no_include_guard_indent
-
-commit 7df80a132e1176c5830ba307d26df19a7bafd12c
-Author: rdan <rdanioux@free.fr>
-Date:   Sat May 12 14:05:29 2012 +0200
-
-    Tests updated to validate the modifications in this branch
-
-commit a4b6730f26ba978a2614ca754466a43ac3e510af
-Author: rdan <rdanioux@free.fr>
-Date:   Mon May 7 20:15:03 2012 +0200
-
-    - Update of the management of the #include guard
-      Specific actions were taken for preprocessor directives.
-      It is now extended to all code:
-        - code inside the "#include guard" is not indented
-        - optimization of "ifdef_over_whole_file" to be able to call it several times
-    - Update of the comment of some options to clarify their actions
-
-commit cc65530fb55a9b24fda73f46474bf26589b43020
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 4 22:44:42 2012 -0500
-
-    Remove incorrect labeling of CT_CLASS_COLON in mark_function().
-    The proper place is in combine_labels().
-
-commit eb9bf3beda26457e3ff74d2359a16c14e8439a72
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 4 22:25:27 2012 -0500
-
-    nl_func_type_name[_class] should not affect template<type T> stuff
-    Fixes SF#3523347
-
-commit 3539361342da04a3286f0cf808d827ede1aba217
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 4 22:07:32 2012 -0500
-
-    Don't allow a definition or prototype after CT_ARITH.
-    This is a hack that fixed SF#3522432.
-
-commit dfa082ded986d024b4c429b27d86851467e94473
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 4 22:06:32 2012 -0500
-
-    Don't start a statement on a ')' or ']'.
-
-commit 11fa9162d6ffec46eb3dd9ceb92ed5acfde360e0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 4 22:03:18 2012 -0500
-
-    Improve logs for statement start detection
-
-commit 159921c86fb85bb44b9b8d18b5e44dfa56a459cc
-Merge: 088e4e1 a3a56c1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 28 14:26:40 2012 -0700
-
-    Merge pull request #65 from JanX2/master
-
-    Updated Xcode project with recent changes
-
-commit a3a56c1fad9d23afecc691723a622a3d9c678890
-Author: Jan Weiß <jan@geheimwerk.de>
-Date:   Thu Apr 26 15:24:37 2012 +0200
-
-    Updating Xcode project with recent file changes.
-
-commit 2bff457c9f0255a9a753ab5fd314eabcf5e6d920
-Author: Jan Weiß <jan@geheimwerk.de>
-Date:   Thu Apr 26 15:23:48 2012 +0200
-
-    Updating “.gitignore� for Xcode 4.
-
-commit 088e4e10adeee341e60d444b0a2bd07bdc960111
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 14 15:39:57 2012 -0500
-
-    Add test
-
-commit 62746441ccc52dee9b87e9ef133e8f7c6fab0831
-Author: Oleg Smolsky <oleg@smolsky.net>
-Date:   Sat Apr 14 15:36:30 2012 -0500
-
-    Fixed a small alignment bug in complex calls
-
-commit 7e40fd41ba6f99d43b2931deaec66534f52e637d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 7 15:43:29 2012 -0500
-
-    Fix detection of a cast in "(uint32)std::distance(a,b)"
-
-commit df0a2c1b661766f7581b9d47a1250abef7230633
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Apr 6 11:54:08 2012 -0500
-
-    Add another C++ test case
-
-commit f420f11b6966f33382390366e7ecd216b2fd99b8
-Author: Oleg Smolsky <oleg@smolsky.net>
-Date:   Thu Apr 5 21:05:06 2012 -0700
-
-    Fixed multi-line indentation in the 'return' case
-
-commit 06d1642da17fb9407577943d51d93a2442f45747
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Apr 6 11:35:40 2012 -0500
-
-    Update test results for latest fix to C++ lambda stuff
-
-commit 65867c045c4833d6d8034bbc6394d872c33c2b45
-Author: Oleg Smolsky <oleg@smolsky.net>
-Date:   Thu Apr 5 18:56:43 2012 -0700
-
-    Additional lambda/indent fix
-
-commit a54dfa1aa36561c025ed2ba56861f19436fb50af
-Author: Oleg Smolsky <oleg@smolsky.net>
-Date:   Sun Apr 1 11:33:14 2012 -0700
-
-    Moved a hard-coded constant out into an option
-
-        indent_ctor_init_leading  = 4        # virtual indent from the ':' for member
-                                             # initializers. Default is 2.
-                                             # (applies to the leading colon case)
-    this is needed for handling member initializer lists:
-
-    Thread::Thread()
-        :   m_bStarted(false),
-            m_log(/Thread)
-    {
-        ....
-    }
-
-commit 9d3ab48b138ecdfbee4ddbd0e35fce31ae785b92
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Apr 6 11:23:19 2012 -0500
-
-    Add an expanded test for '<<' alignment.
-    The results may not be correct based on pending patches.
-
-commit 7a9f6a9b9fa75dd143a9b4fd91c1a2dee1eb46c6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 19:36:18 2012 -0500
-
-    Update test for lambda return type
-
-commit 19dff2aea0dec7910fdae1065370e23ba2e7be1b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 19:35:58 2012 -0500
-
-    Handle C++ lambda return type
-
-commit bc1ea727dff5b73b86fc1a5f6f94690c5173e370
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 18:55:49 2012 -0500
-
-    Fix a few problems with the new options
-
-commit bd32896fd7f0fd73aa338b1a1340086097cbe649
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 18:55:19 2012 -0500
-
-    Add some tests for the new sp_cpp_lambda_xx options
-
-commit 7e2db96aa6cdba4e012e8adfa266a67e7cf2adda
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 18:34:44 2012 -0500
-
-    Add sp_cpp_lambda_assign and sp_cpp_lambda_paren
-
-commit c12a4c5ce4929eaff377486b36da690037d58345
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 17:53:12 2012 -0500
-
-    Label C++11 lambda expressions
-
-commit 9e92b900e5766dc2e95f611c5627625f17a9262b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 17:18:42 2012 -0500
-
-    Correct input file.
-
-commit d28e0fd97037eb548e62f177435bb675de5521a8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Mar 29 11:16:53 2012 -0500
-
-    Add VS2011 project files (Oleg Smolsky)
-
-commit b5d0a2c5edba524f49f984078f8740b7743af30c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 27 21:24:23 2012 -0500
-
-    Add test cases for new '<<' aligning functionality
-
-commit 5ff36433c85ca55a3b4f6d972dbbb5d7e9082b62
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 27 21:23:52 2012 -0500
-
-    Fix aligning of '<<' in C++
-    From: Oleg Smolsky
-
-commit 9fa0183f6a2f08e4b5c0a5f433481277fce0cb52
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 27 21:10:25 2012 -0500
-
-    Add sp_permit_cpp11_shift
-    From: Oleg Smolsky
-
-commit 5a930a5dc1e285513b52088f98a5dacd5fea4ea3
-Merge: c6e500a 868501f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 20 21:23:55 2012 -0500
-
-    Merge branch 'master' of github.com:bengardner/uncrustify
-
-commit c6e500aaaba0abba230311471a52f8b34776cdde
-Merge: d519bfa bbbee52
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 20 21:21:32 2012 -0500
-
-    Merge branch 'rdan-20120129' of https://github.com/rdan/uncrustify into rdan-rdan-20120129
-
-    Conflicts:
-    	src/indent.cpp
-
-commit 868501f35dead19b3731eefb5a1435105665dbdf
-Merge: d519bfa 5542d0b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 20 19:16:30 2012 -0700
-
-    Merge pull request #57 from mkonig/mos_extensions
-
-    Added a script that generates uncrustify_version.h on windows.
-
-commit d519bfa85552cebc5388b979668ea7c5d1c53853
-Merge: 82f70d3 e2e0756
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 20 19:13:46 2012 -0700
-
-    Merge pull request #63 from bitserf/objc-method-spec-colons
-
-    Tweak align_oc_decl_colon to also align colons of Objective-C method prototypes
-
-commit e2e075683a576be33afdab4eac922c3afd52bb2b
-Author: Leon Breedt <ljb@bitserf.org>
-Date:   Wed Mar 21 03:10:34 2012 +1300
-
-    Tweak align_oc_decl_colon to also align colons of Obj-C method prototypes.
-
-commit 5542d0b29f741f0fb97b9c9a617a99a04f03d3a7
-Author: Mirko König <koenig@v-i-t.de>
-Date:   Sat Feb 25 19:56:23 2012 +0100
-
-    Added a script that generates uncrustify_version.h on windows.
-    Added this script to vs2008 solution to run as pre-build event.
-    Added compat_win32.cpp to vs2008 solution file.
-
-commit bbbee52fd41dc240f3312d06cf4744e3337bf70e
-Author: rdan <rdanioux@free.fr>
-Date:   Mon Feb 13 01:41:36 2012 +0100
-
-    Update of test file to try to avoid an "UNSTABLE" result (for 00617).
-    It's still unstable because of "nl_max" which is applied everywhere even if another option specifies a different value (ex: nl_max is set to 2 to have a maximum of 1 consecutive blank line everywhere in the code. But we also want to have 2 blank lines after the declaration of local variables in a function).
-
-commit af232a0b7adc6ab1340f84c7fbc827a67f38887f
-Author: rdan <rdanioux@free.fr>
-Date:   Mon Feb 13 00:50:12 2012 +0100
-
-    - Correction of my previous commit (bug detected with file "pp-if-indent.c", file added to tests). The bug is present only when the option added is active.
-    - Correction of a bug that was already in uncrustify detected with file "pp-if-indent.c". It generated the following output:
-
-    pp-if-indent.c:19 Unmatched PP_IF_INDENT
-    pp-if-indent.c:21 Unmatched BRACE_OPEN
-    pp-if-indent.c:30 Unmatched PP_IF_INDENT
-    pp-if-indent.c:33 Unmatched BRACE_OPEN
-
-commit 82f70d3261904ac11caf7ca125a852ce10d0f6e2
-Merge: e5d2eff bc43061
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Feb 12 17:34:21 2012 -0600
-
-    Merge branch 'rdan-20120129' of https://github.com/rdan/uncrustify
-
-commit e5d2eff99f6f1042057d64dbbdaab817a7914606
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Feb 12 17:27:10 2012 -0600
-
-    Don't include src/config.h, as that is generated by configure.
-
-commit b7cf7809161b5d47d0786e051a779cb1c9002eb7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Feb 12 17:23:09 2012 -0600
-
-    Add missing file to MS VC++ 2010 project file
-
-commit bc43061e83f77d726c5891a4ded770a787207dc9
-Author: rdan <rdanioux@free.fr>
-Date:   Sun Feb 12 13:31:44 2012 +0100
-
-    New option to force the indentation of function definition to start on the first column even if this function is defined inside a #if/#endif directive.
-
-commit d8c5e80b1463282cee7a9fea7d8852804a4dd2b0
-Author: rdan <rdanioux@free.fr>
-Date:   Sun Feb 12 13:07:29 2012 +0100
-
-    Correction of an issue:
-    In the following code
-
-    #if A
-     void function(void)
-     {
-     }
-    #endif
-
-    A is qualified as Tag=CT_TYPE/Parent=FUNC_DEF instead of Tag=WORD/Parent=NONE.
-
-commit 95eb26256066b608063f42d8ca7ade73e8fb2922
-Author: rdan <rdanioux@free.fr>
-Date:   Sun Feb 12 13:02:48 2012 +0100
-
-    Updates to be able to generate the software with Visual C++ 2010
-
-commit dc89e72f61320fc95a15638ddd03663e937620e4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Feb 7 08:06:41 2012 -0600
-
-    Add include of windows_compat.h to compat_win32.cpp
-
-commit 6358b4865f18a0a8f75f6a534447524682cdb4bc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 14 16:06:13 2012 -0600
-
-    Debugging: also log the column_indent
-
-commit 948ec99cfdc6acbb1d13b489d7d2bbe39059fba9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 14 16:04:13 2012 -0600
-
-    Update tests to reflect the change in the last commit.
-
-commit c0b125fdfe6e6f5d02b466220961ac6731b4c728
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 14 16:02:26 2012 -0600
-
-    A #define body indent should have 1 level of tabs in mixed mode.
-
-commit 490986c7607c772cb76eb7bbf4eb62d3ccfc2bfa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 14 11:02:27 2012 -0600
-
-    Add custom type PROTO_WRAP for old-style prototype wrapper macros.
-
-commit 3359082eff68278e7d3b2cf0ebbdf0f914857852
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 14 10:22:38 2012 -0600
-
-    Rework the default config file check to avoid C99 constructs.
-    Fixes a compile error on MS VC++ 2010.
-
-commit 7aba80646c66fc45dcb9e8fdc9542b7d1794cc5a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 14 10:13:42 2012 -0600
-
-    Fix compile issue on MS VC++ 2010
-
-commit 2a220107fd1e0e9139c5bbe312b14b3b12e2cee7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 21:48:41 2012 -0600
-
-    Add option: nl_version_brace
-    Affects D
-
-commit 72c9645f0b57017063ed83f5db7e3d845eab56a7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 21:48:15 2012 -0600
-
-    Add option: nl_scope_brace
-    Affects D
-
-commit c4bdf597a32525548c43f80c4b36a9dabdb7475f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 21:10:15 2012 -0600
-
-    Fix crash if unittest is the first token in the file.
-
-commit 91701a4e5ec5de9cb4f71847da44e7f1ed3d8c26
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 21:09:48 2012 -0600
-
-    Add option: nl_unittest_brace
-
-commit 1691e461067922002c1dd5d3f42519715cce9001
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 16:59:35 2012 -0600
-
-    Add a few other C++ extensions.
-    Fixes SF#3470255
-
-commit 4dccc7487e0baaffb8f6a25a10adc8841514dcce
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 16:40:14 2012 -0600
-
-    Add test for sp_before_template_paren
-
-commit bdf2c6671c5b97c3120749499685f9458f0bdd5c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 16:39:25 2012 -0600
-
-    Add option: sp_before_template_paren
-    Controls the space for D in "class Foo(" and "template Foo(".
-
-commit 2501784474c6493bbfff3b7ede29ec8222a42b5c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 7 16:25:40 2012 -0600
-
-    Improve labeling of D templates.
-
-commit 3ffbfd5c7c0b6f618394ae6dfb4c1e88cc8a0b2c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 5 22:37:30 2012 -0600
-
-    Do a better job of marking types in a class
-
-commit e047b3d380003e3f6355dc8c88ef62b7ac063051
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 5 22:36:49 2012 -0600
-
-    Do a better job handling class forward declarations
-
-commit c321930e9ef4d989d596bdc068b17aaec0d8dad8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 5 22:34:23 2012 -0600
-
-    Fix incorrect test
-
-commit c0c4354016756ddb02984341a3b79295c1f1ba57
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 5 21:34:02 2012 -0600
-
-    Use unc_text::equals() instead of memcmp()
-
-commit 044ebe1c4ad8e11f99d2d49a1134fae86b490e79
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 29 16:47:09 2011 -0600
-
-    Add ability to get config from UNCRUSTIFY_CONFIG env var to win32
-
-commit d7b57f9fd59ff39e24503ffa8a822a1a46b48e29
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 29 15:27:10 2011 -0600
-
-    Update tests for nl_before_newline
-
-commit 3040f3887634b0f4331bee7b25f9f34f5f97adc7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 29 15:26:02 2011 -0600
-
-    Add option: nl_before_return
-    Move nl_after_return to the blankline group.
-
-commit 4e39f15b183b6e92531aa0bd88168515c4d8cbc3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 28 00:54:34 2011 -0600
-
-    Save off working notes about #if/#else/#endif code threads
-
-commit 47fa9b294210f07ecabedbf75ee30ffa5603be12
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 28 00:50:15 2011 -0600
-
-    Handle function pointers with complex return types (ie, unsigned char).
-    Fixes SF #3152653
-
-commit 6226fdb03c02b8e3ecbea1bbda2ea5d945322457
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 28 00:25:49 2011 -0600
-
-    Change newline_iarf_pair() to handle 'force' as 'add' + newline limit.
-    Fixed SF #3169766
-
-commit 3ee41a21c7a8c76e1db7d208d4f8eab6dfaf7065
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 28 00:05:46 2011 -0600
-
-    Get nl_class_init_args=force to work
-    Fixed SF #3444921
-
-commit 4775d8990fc8552b4384a833386b2aea0fb665aa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 27 23:25:26 2011 -0600
-
-    The '*' in "*," is always likely to be a pointer in the following:
-      FUNCDEF_MACRO( func, (arg1 *,arg2 *, arg3*));
-    Fixes SF #3464371
-
-commit 37ebfd815d1ed8b5ba33b69d76da980c7ec6644c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 26 12:03:15 2011 -0600
-
-    From: Jim Meyering
-    include <unitsd.h> for open, close, unlink
-
-    Otherwise, I get errors like these on Fedora 16:
-
-      uncrustify.cpp: In function 'bool file_content_matches(const string&,\
-        const string&)':
-      uncrustify.cpp:903:16: error: 'close' was not declared in this scope
-      uncrustify.cpp:915:45: error: 'read' was not declared in this scope
-      ...
-      uncrustify.cpp: In function 'void do_source_file(const char*,\
-        const char*, const char*, bool, bool)':
-      uncrustify.cpp:1046:46: error: 'unlink' was not declared in this scope
-
-commit 1c8aedbd1e845196f2a46491b8479596e7404856
-Merge: 34d4143 fbf046e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 26 09:56:03 2011 -0800
-
-    Merge pull request #47 from meyering/multi-line-comment--do-not-elide-utf8-characters
-
-    do not elide UTF-8 characters from multi-line comments
-
-commit fbf046e03e41fb8c137c2ed49c120bf389cbbc75
-Author: Jim Meyering <meyering@redhat.com>
-Date:   Fri Nov 25 19:47:25 2011 +0100
-
-    do not elide UTF-8 characters from multi-line comments
-
-    Before this change, uncrustify would remove UTF-8 characters from
-    multi-line comments.  E.g., here, uncrustify would remove an a-acute
-    from a 2-line comment:
-
-        $ printf '/*\303\241\n*/\n' > utf8.c
-        $ src/uncrustify -q utf8.c; wc -c utf8.c utf8.c.unc*
-         8 utf8.c
-         6 utf8.c.uncrustify
-
-    This fixes it and adds a test to exercise the fix.
-
-    * src/output.cpp (output_comment_multi_simple): Correct the type of
-    "ch": use "int", not char, to avoid sign-extension with signed char.
-    * tests/c.test: New file.
-    * tests/input/c/cmt_multi_utf8.c: New file.
-    * tests/output/c/02423-cmt_multi_utf8.c: New file.
-
-commit 34d41436cfc900c23edb55c161ae2086766ce56e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 21:23:18 2011 -0600
-
-    Update tests based on latest patch
-
-commit 2d0e192c23b3a24aa16566ca1aafaf0f470f5580
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 21:22:54 2011 -0600
-
-    From: Todd Richmond
-    Rework function parameter line splitting.
-
-commit 6df0bc53655d8bb590f028166fb17c6796d408b9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 21:15:43 2011 -0600
-
-    Whitespace cleanup
-
-commit e4f447789a2f6f4a1c1f0cb8e9e6c8871e67ee79
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 21:15:29 2011 -0600
-
-    From: Todd Richmond
-    Don't split '>>' into '> >' for C++ templates.
-    Fixes SF#3203335
-
-commit 4d2960bf02e840fd2c9bf80b7a2cb9122770b3ea
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:49:48 2011 -0600
-
-    From: Todd Richmond
-    Add support for __try, __except, and __finally.
-
-commit ceb60d60580cbdfc8cf72daf7244df5847759ce1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:44:36 2011 -0600
-
-    From: Todd Richmond
-    Add copy constructor to AlignStack.
-
-commit a920c2b08afeac1e4312daeb768871e4600972f4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:43:57 2011 -0600
-
-    From Todd Richmond
-    Fix off-by-one error in align_same_func_call_params()
-
-commit 2d9f50feaef2b80854bed2ce64e4d6eec9c5bbcc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:38:59 2011 -0600
-
-    Run uncrustify against some of its source.
-
-commit 867f0f7dad29a9ab08e2394140e43749f3e4c3fb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:38:29 2011 -0600
-
-    From: Todd Richmond
-    Update sun.cfg and update test results from the latest patch.
-
-commit 2e95b3c8bf4bf9d7ec688c769803ffaf3ca4be29
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:37:22 2011 -0600
-
-    From: Todd Richmond
-    Add a slew of new options:
-    nl_typedef_blk_start, nl_typedef_blk_end, nl_typedef_blk_in
-    nl_var_def_blk_start, nl_var_def_blk_end, nl_var_def_blk_in
-    nl_remove_extra_newlines
-    From SF #3426576
-
-commit b24579c1e5b68f8ce9757964c81686ce8a7a5b84
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:23:37 2011 -0600
-
-    Fix null dereferences
-
-commit 31265d3337be44b4499d3a673ff4a3622e27af53
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Nov 15 20:18:57 2011 -0600
-
-    Fix spelling recommed => recommend
-
-commit 122b7e7b3f44d3c0ae72f703874d123ef6d5d053
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:58:31 2011 -0600
-
-    Fix aligning on '<<' in the presence of 'operator <<'.
-
-commit d723b22b89b3a460fa8a7e6975b89d3059b45ad3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:52:17 2011 -0600
-
-    Increase the span of '<<' slignment so that 'q' and 'xyz' align in the
-    following code snippet:
-
-    void bar()
-    {
-      out << "q"
-      // << "abc"
-      // << "def"
-          << "xyz";
-    }
-
-commit 158cc8abe5e3ce1c3b53b161dd1c5d5fcd2e847c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:38:37 2011 -0600
-
-    Update test results to reflect virtual brace comment spacing fix.
-
-commit 491b8927f2305b4ed7d727e7de2e77970ffc526c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:37:07 2011 -0600
-
-    From: Jim Meyering
-    Fix handling of virtual braces when calculating the comment column.
-
-    foo ()
-    {
-      if (1)
-        a = b; /* c */
-    }
-
-commit 7021e495105caffa5d2f47be65984c75254ac692
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:29:04 2011 -0600
-
-    Fix handling of templates in constructors:
-
-    TOTO<char*const>::~TOTO<char*const> ()
-    {
-    }
-
-commit 88bb98e5e8b0a03fdcf8522cb62bf7c5ba175f56
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:18:30 2011 -0600
-
-    From: Todd Richmond
-    do_code_width() must be followed by newlines_cleanup_braces because
-    breaking lines might also break one-liners such as
-
-    enum x = { 1, var_too_long_for_code_width };
-
-    which reformats to
-
-    enum x = { 1,
-    var_too_long_for_code_width
-    };
-
-    instead of putting the newline after the {
-
-commit 004a21be1b633306c6e655719a06d09bf7e3ee95
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:13:25 2011 -0600
-
-    From: Todd Richmond
-    Allow a line split between two strings.
-
-commit 10c35ad427c9ab08f255f98ed60c1ffb57a668ec
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 10 05:08:34 2011 -0600
-
-    Java also uses the ellipsis
-
-commit e6ccc2551d533b75c435dd34ea030ed9ed02b783
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 9 07:18:30 2011 -0600
-
-    Change '-F' handling to match what the usage info says, one file per line.
-    More work is needed to support a prefix on windows, as drive letters aren't
-    handled.
-
-commit 8c2cc60bbe4fedf012331d8641fec5dce27d97df
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 9 07:01:53 2011 -0600
-
-    From: Todd Richmond
-    Create new option ls_code_width to better control line width splitting.
-
-commit e1ebb8b1592832dbcd6b5664fa05f2c4e2208243
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 3 21:11:26 2011 -0500
-
-    From: Todd Richmond
-    struct/enum/class variable definitions are using nl_after_struct/
-    nl_after_class newlines which were designed for the actual struct
-    definition, not instances of the struct. This adds an extra newline
-    within a var def block
-
-    int x() {
-    struct b c;
-    struct d e;
-    }
-
-    formats to
-
-    int x() {
-    struct b c;
-
-    struct d e;
-    }
-
-commit 4bdae67aa0cbb5858aae1065eea23c4a5dde89f3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 3 21:04:26 2011 -0500
-
-    From: Todd Richmond
-    Two wide strings concatenated together without a space causes the
-    second L to trail the first string instead of lead the 2nd string.
-
-    #define x L"a"L"b"
-    formats to L"a"L "b"
-    instead of
-    L"a" L"b"
-
-commit 1db8aaf384e2c74f98974df0d6a6ffa27903615b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 25 18:47:42 2011 -0500
-
-    From: Todd Richmond
-    Rework long line splitting code.
-
-    This patch does the following
-
-    1) makes indenting for indent_continue != 0 consistent except that >0 is
-    old behavior of grouping constructs like ?: or functions
-
-    2) fixes a bug found with the fix for 3426636 (long typedefs). The old
-    code never indented properly because it added indent_size to 0 instead of
-    the previous indent. In test cases that showed up as a 3 char indent
-    instead of 4
-
-    3) fix test cases for the long typedef lines. Note that your final typedef
-    change caused typedefed functions to tread the arguments as a function
-    which causes the lines to indent to the fparen. I think your change is
-    correct behavior and only the test case needed an update
-
-commit 4a0e1d63861d883ddacfcd6b9bf4ddab6c5adb7b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 25 18:40:05 2011 -0500
-
-    Rework 'class' detection to allow 'class' as a member name.
-
-commit 53d716f543709bb0b6f1e524bc910c64ecebaf21
-Merge: 716df3c d57307d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 25 18:29:42 2011 -0500
-
-    Merge branch 'master' of github.com:bengardner/uncrustify
-
-commit 716df3cfdad8f49daf4841c5b58593345ebbac6a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 25 18:27:31 2011 -0500
-
-    From: Todd Richmond
-    If mod_full_brace_if = add and mod_full_brace_if_chain = true, it will eat
-    a required line break after the closing if statement, regardless of having
-    { } or not.
-
-    if (a)
-    b();
-    c();
-
-    reformats to
-
-    if (a)
-    b(); c();
-
-commit d57307ddfec43dd3a9967b56b6b3e8cf935a2825
-Merge: 0650864 c9768db
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Oct 24 10:29:55 2011 -0700
-
-    Merge pull request #45 from Uncommon/master
-
-    Add missing files to Xcode project
-
-commit c9768db3e058dd2b63303f3f09d0a6a2ab479be6
-Author: David Catmull <uncommon@uncommonplace.com>
-Date:   Mon Oct 24 11:19:46 2011 -0600
-
-    Add unc_text.cpp and unicode.cpp to the Xcode project
-
-commit 06508646f3cc0fbccb7ad6eeb0c50d42b847ff29
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 22 15:50:15 2011 -0500
-
-    Add a log when the comment cont_text is set.
-
-commit c9fce40717e12c2feaec7f7a469baa351c213426
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 22 15:49:33 2011 -0500
-
-    Detect a comment lead without requiring a space after a single '*'.
-
-commit e02dd8a41e466876bc39aa8eaf55c1d6aee6b596
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 22 15:48:05 2011 -0500
-
-    Insert a space between '*' and text in a comment line start.
-
-commit 0461e187859eb2b227073edd6b74ccc39359b1ca
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 22 15:46:39 2011 -0500
-
-    Add unc_text::insert()
-
-commit cfa96cbe6c840ac11845cda0e55424cda764cd79
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 22 14:51:24 2011 -0500
-
-    Add a test for align_func_proto_span with align_on_operator
-
-commit abd74db2c35b9bfcf95d706d58ce3ab1e5d96562
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 22 14:37:03 2011 -0500
-
-    Set the gap on all aligned chunks
-
-commit 187f33f098806d9bd1cc4df618cd5e337381e0d4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 22 14:34:49 2011 -0500
-
-    Set the start and amp style for align_func_proto
-
-commit 95cac2cff979de9391f983f1de4fcb5d90aec525
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Oct 21 21:53:21 2011 -0500
-
-    Also need to end a typedef indent on an open paren
-
-commit ab66cf91f5b788ecd1a9f704f3f18ee5e1ac595f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Oct 21 21:52:55 2011 -0500
-
-    Update code-width.c test with long typedefs
-
-commit fbd5ad351a12808679ed029eaa4e14b115ab3a12
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Oct 21 21:44:27 2011 -0500
-
-    Use a continuation indent for typedefs that span two lines.
-    Fixes SF 3426636
-
-commit 0c8f3cc968820db79b04883a862f42355f3effdd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 20 22:21:20 2011 -0500
-
-    Allow '&' in a C-style cast. Ie, (Foo &).
-    Fixes SF#3266678
-
-commit ad9f2b11ec58e7d2458d07276263bb683bc87f19
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 20 21:54:03 2011 -0500
-
-    Remove unused variables that g++ 4.6 found.
-
-    Signed-off-by: Ben Gardner <gardner.ben@gmail.com>
-
-commit db9c795e9d756ed3eff50510311b62436f51ac20
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 20 21:44:17 2011 -0500
-
-    From: Todd Richmond
-    New option: align_pp_define_together
-    Align #define functions and variables together
-
-commit f3f6ac39f834e31fa703109e1ccdccd76c64066c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 15 21:48:03 2011 -0500
-
-    Change the 'class' check to require a 'word' after to be value.
-    Should now handle variables named 'interface' or members named 'class'.
-
-commit e5246380c0a64c878d070ff322b101509dc3813e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 15 21:37:27 2011 -0500
-
-    Back out absolute indent_continue check in split_line(), as it caused
-    ls_func_split_full to fail.
-
-commit 0f22bda9daa368017a46bd66994fa206194c99be
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 22:28:42 2011 -0500
-
-    Fix wording of the utf8_byte option
-
-commit 02342d6f0a241dfd52666334d0c363f7b5121bd4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 22:28:20 2011 -0500
-
-    From: Todd Richmond
-
-    Update sub.cfg
-
-commit 2720231d94a927f6ee9e83e9fecedef7e7b75e52
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 22:24:24 2011 -0500
-
-    Fix regression caused by labeling 'interface' as a keyword.
-
-commit 005fefb6fe223b45684d3f2f166cc6d1ad26450d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 22:06:04 2011 -0500
-
-    From: Todd Richmond
-
-    Rework long line splitting
-
-commit e00f3545a4430f89d627d92f0bdaf63b6f18cbfc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 21:58:05 2011 -0500
-
-    From: Todd Richmond
-
-    Add support for negative indent_continue values.
-
-commit 6aeed7a617bb0058092c36dc1cf5cbc6232b1831
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 21:55:05 2011 -0500
-
-    From: Todd Richmond
-
-    Add project name to VS2010 project file
-
-commit d3a972aaf7ea9ef20c0f7c5436ae4d598aa381c4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 21:49:16 2011 -0500
-
-    From: Todd Richmond
-
-    uncrustify needs a "join" option to go with the other lead/trail options.
-    The requirement is to remove extraneous newlines and merge them into the
-    same format they would have if newlines were not found in the original.
-    This is critical for function calls/deffs where arguments are not brought
-    back together to maximize line length
-
-    The attached diff is quite simple and resolves the test cases I tried so
-    far. It also undoes the splits that were added by the over-aggressive
-    splitting that I resolved in my previous large diff
-
-commit 345560f7d0c27e65725a91664e89ca544155df84
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 21:41:30 2011 -0500
-
-    From: Todd Richmond
-
-    If mod_remove_extra_semicolon=true, extra semicolons will be removed from
-    within a macro such as
-
-    #define ENDSTRUCT };
-
-    There might be other modifying options as well that should not take effect
-    within macros
-
-commit a36b09750273c9d3306e85684028d2cac0f32770
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 21:38:51 2011 -0500
-
-    From: Todd Richmond
-
-    To denote that a string is unicode, L"string" is used, but uncustify will
-    insert a space in the # cpp operator for common macros such as
-
-    #define KEYWORD(_keyword_) L#_keyword_
-
-    which reformats to
-
-    #define KEYWORD(_keyword_) L # _keyword_
-
-    sp_pp_stringify will remove the trailing space but not the leading space
-    which is an invalid construct
-
-commit befe3c513e69a08a3e90dc759da01b338687f5a5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 13 21:35:38 2011 -0500
-
-    From: Todd Richmond
-
-    In Visual Studio in C/C++, the "interface" keyword should be treated like
-    "class" as it allows derivations like ": public foo"
-
-commit 965c01bad535aa807e25f4b79a9a6495a3b18280
-Author: Jim Meyering <meyering@redhat.com>
-Date:   Sun Oct 2 12:59:57 2011 +0200
-
-    handle a backslash followed by a literal newline
-
-    Without this change, uncrustify's lexer would get confused for any C
-    code containing a string like this:
-
-      f ("\
-      Some text\n");
-
-    That led to a diagnostic like "Garbage in col 8: 5c" typically
-    followed by a cascade of unwarranted diagnostics.
-
-    The fix is to reset "escaped" also when handling a literal
-    newline or a carriage return.
-
-    Also included: a test case to exercise the bug/fix:
-      tests/c.test
-      tests/input/c/backslash-newline-lex.c
-      tests/output/c/01060-backslash-newline-lex.c
-
-    Signed-off-by: Ben Gardner <gardner.ben@gmail.com>
-
-commit c404574dd88dba6520ca545ed1b388d678049c21
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 8 21:34:42 2011 -0500
-
-    Update SlickEdit project files
-
-commit 68c59727a92ee887c110175258dacd27b589fcf8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 8 20:57:13 2011 -0500
-
-    Add OpenPorts.se link
-
-commit 8efb7ea7ff46a7b6196f9233541bb63a1a9d3142
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 4 21:37:04 2011 -0500
-
-    Save off changes for version 0.59
-
-commit ee20cffd27cafd99aac17c06e80ba954554fb76f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Oct 4 21:06:02 2011 -0500
-
-    Update two tests to reflect recent change to mod_full_paren_if_bool
-
-commit 3dfc51bf551358630722b7e931588f7c5b01b20e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 27 21:01:18 2011 -0500
-
-    Fix comma and boolean op precedence with mod_full_paren_if_bool
-
-commit dfbd1a86c0490e0a016ab1a40b125e42ec291c29
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 27 20:55:32 2011 -0500
-
-    Change cast to fix warning:
-    assuming signed overflow does not occur when assuming that (X - c) <= X is always true
-
-commit f30b92aac7008d942b36547e421c72d69ddbcc62
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 27 20:49:15 2011 -0500
-
-    Fix the log level in mark_change()
-
-commit e8f850c79ed93e16fca9e1902175419f05e95774
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 27 20:42:46 2011 -0500
-
-    Properly handle an empty source file
-
-commit 235ae27fa2dccfee5e44c7fb03bbf178b32d3260
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 27 20:40:44 2011 -0500
-
-    Don't add parens around BOOL comparisons if there is a preproc present
-
-commit cda1e865876bf577f74efac9fd4a720ff78b2a00
-Merge: 3de9050 26804b5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 19 21:21:24 2011 -0500
-
-    Merge branch 'master' of https://github.com/jott/uncrustify into jott-master
-
-commit 3de90503fc5b360c11ceb861bde3acc138d87ef4
-Merge: 51ee3f4 74f6836
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 19 21:17:56 2011 -0500
-
-    Merge branch 'jott-aa107f1'
-
-commit 74f6836d4aef70a9b4c9ef46810fcefdc6caa798
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 19 21:17:43 2011 -0500
-
-    From: Jott
-    Fixed a crash in indent_text.
-
-    When a closing paren is missing at the end of a file, the next token is NULL.
-    To reproduce, create a file with just x( in it and without a newline.
-
-commit 51ee3f4c7c39c4a337476c51ac576474cb3fac5d
-Merge: 0fa8fd4 6827f9f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 19 19:13:57 2011 -0700
-
-    Merge pull request #38 from jott/6827f9ff03920b7b2f178474292176c6078edc11
-
-    Fixed an infinite loop in parse_word.
-
-commit 26804b5098a0b1d7e288186caeadbd412e2297f6
-Author: Jonas Hurrelmann <j@outpo.st>
-Date:   Mon Sep 19 21:39:10 2011 +0200
-
-    Added new files to the VS2008 project file.
-
-commit aa107f1bc6926def0152b182541650cdb43d3744
-Author: Jonas Hurrelmann <j@outpo.st>
-Date:   Mon Sep 19 21:26:04 2011 +0200
-
-    Fixed a crash in indent_text.
-    When a closing paren is missing at the end of a file, the next token is NULL.
-    To reproduce, create a file with just x( in it and without a newline.
-
-commit 6827f9ff03920b7b2f178474292176c6078edc11
-Author: Jonas Hurrelmann <j@outpo.st>
-Date:   Mon Sep 19 21:18:58 2011 +0200
-
-    Fixed an infinite loop in parse_word.
-    When there are no more characters in the context, the parsing fails.
-    Create a file with just #x in it and without a new line to reproduce.
-
-commit 0fa8fd44c6a4ebffbe9378c932c604dd814ad2af
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 12 20:58:12 2011 -0500
-
-    Update the Win32 VS2010 project file (Todd Richmond)
-
-commit 2be051a1e0e155a96710bec43ab16c4eaffa79e2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 12 20:56:53 2011 -0500
-
-    Fix some build issues under Win32
-
-commit 60f3681da60462eda539b78e0c6c3eea823481e5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Sep 8 21:38:27 2011 -0500
-
-    Set the parent of '{' in cast '(foo){1,2,3}'
-    Fixes SF #3406144
-
-commit 2b6a3105f5bfeaef74821ffb714799871376ad62
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 7 21:34:18 2011 -0500
-
-    Add option nl_case_colon_brace
-
-commit ed129ba0f37055b4be02200e2bb644a51c29aa02
-Merge: eb394d1 b144060
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 6 22:25:52 2011 -0500
-
-    Merge branch 'master' of https://github.com/hschmidt/uncrustify into hschmidt-master
-
-    Conflicts:
-    	src/token_names.h
-
-    Assuming that the change in test 50007 was intentional
-
-commit eb394d1ad6001cebf6ef2ef3572e1ae13a200e86
-Merge: 9789753 caecd7c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 6 22:17:45 2011 -0500
-
-    Merge branch 'indent_ctor_init' of https://github.com/patnotz/uncrustify into patnotz-indent_ctor_init
-
-    Conflicts:
-    	tests/cpp.test
-
-commit 978975355fa1e8280400df3d742b48498d6af1b3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 6 22:10:31 2011 -0500
-
-    Rework the sp_before_tr_emb_cmt and sp_num_before_tr_emb_cmt options
-
-commit eaa5aef38a15b3c5aabb06943f8a2d0cea53dd04
-Merge: 235adfd 6dcaa68
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 6 21:47:20 2011 -0500
-
-    Merge branch 'sp_before_tr_emb_cmt' of https://github.com/patnotz/uncrustify into patnotz-sp_before_tr_emb_cmt
-
-    Conflicts:
-    	src/tokenize_cleanup.cpp
-
-commit 235adfd18147f35a196686efa2ddd084010ba505
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Sep 6 21:22:00 2011 -0500
-
-    Remove commented out memset's
-
-commit 727d23421b17a960e5fb8fe80e331739be278724
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Sep 5 20:26:07 2011 -0500
-
-    Remove some unused functions
-
-commit b18c4ee9b7a3240cfee3330559c8c4b64f1fc823
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Sep 4 22:36:24 2011 -0500
-
-    Need to check the real previous when looking for the start of the file
-
-commit 00f7f5d2a50e3ee504772387e7071fcf0111d684
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Sep 4 22:22:58 2011 -0500
-
-    Update some tests that had incorrect output due to newline issues
-
-commit c08cf0da0f2a8970848a6d601494beea49aff866
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Sep 4 22:22:24 2011 -0500
-
-    Fix some output stability issues by running the newline code twice
-
-commit 9160e075dcb81d895cac3fd8aee9164ea8cd637b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 16:21:13 2011 -0500
-
-    Don't nest complex statements when creating an 'if' one-liner
-
-commit 6b4cdc6ddd259ea6b7c210a7fdf8064a4080c6bd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 16:12:48 2011 -0500
-
-    Fix some test output
-
-commit 5230fbb00bd0cc3e28dba2645139378b21212a3b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 16:12:10 2011 -0500
-
-    Improve blank line handling
-
-commit 2f05596f4f7423c8b06eb28dac3d9d629dd7d1a3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 15:43:00 2011 -0500
-
-    Update test config to reflect new option name
-
-commit 8c57f4556d2ce43f3a6f41368f09b24db40aa6ab
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 15:40:11 2011 -0500
-
-    Add test of UTF-16 input files w/o a BOM (output contains the BOM)
-
-commit 9e45777e294ce778a46e43ae0e0c75d9027e7948
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 15:37:45 2011 -0500
-
-    Force the BOM on UTF-16, detect UTF-16 encoding without a BOM
-
-commit a44d84381db4f0882a5fa2a47f49f4ecc73a12fa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 15:07:34 2011 -0500
-
-    Rework the Byte Order Mark stuff (more options)
-
-commit c16a2f1ea6f001a6b12a51ade1befb7a38662f16
-Merge: ab8a73f 7ba9a91
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 12:06:05 2011 -0500
-
-    Merge branch 'unicode'
-
-commit ab8a73f782e1859bdb304189a2e2b098ad680d5a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 12:05:56 2011 -0500
-
-    Update vpj file
-
-commit bf40639ae0ab7b49e4dca7c5af0dddf5c173e63c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 12:05:37 2011 -0500
-
-    Fix error in comment
-
-commit 7ba9a91cd3a7f2ea5815ee61d7b838b7cb2bb36d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 12:02:16 2011 -0500
-
-    Save fixed test
-
-commit 1067a8b382521b62eadb099e23c80c3e649c81c6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 12:01:21 2011 -0500
-
-    Fix 1-liner splitting in "{ get; set; }"
-
-commit b16542872982674f8896fa68a22c28a0a383c945
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 11:11:40 2011 -0500
-
-    Add tests for UTF-16 handling
-
-commit 1dac0422c9d52d0cb84d25d3eb8ed20569cdc9a6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Sep 3 11:08:08 2011 -0500
-
-    Fix UTF-16 handling and the BOM
-
-commit d6c084a4f7f25ae05a43364ef52a7fc5c89df6fa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 02:29:02 2011 -0500
-
-    Add test for force_utf8
-
-commit d95d1fe639882fbe85e78403fbd871407ea14145
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 02:26:11 2011 -0500
-
-    Add force_utf8
-
-commit 10d5b16f6f207bd51d05ef232a328fa67165e262
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 02:13:57 2011 -0500
-
-    fix test - no idea why it was broken previously
-
-commit 8742ac03b5a7670938440eb9ab8eff1f7517a40c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 02:13:35 2011 -0500
-
-    Fix a few UTF-8 bugs
-
-commit 85a24120bd4b693024b9d6428ca260a2426ec176
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 01:47:16 2011 -0500
-
-    get output_comment_multi() working
-
-commit 9d3e02ed8091f86f00d095613b40d826f68ac7d8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 01:35:29 2011 -0500
-
-    save everything except output_comment_multi
-
-commit 090841b780f60c3ee9ff3c530f5693ea194196e1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 01:13:02 2011 -0500
-
-    rework output_comment_multi_simple to use unc_text
-
-commit b895188f6b093010125c2b26c6802233f56f1f10
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Sep 2 01:12:10 2011 -0500
-
-    More unc_text usage and cleanup
-
-commit f9736a041e65b92c6040776c73027c289b463e76
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Aug 30 22:32:23 2011 -0500
-
-    Fix combining of C comments
-
-commit 911d7c9d316235275094a539341fe7e192b41fb2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Aug 30 22:28:17 2011 -0500
-
-    Fix more string-related issues
-
-commit 95ee11320e9bf26c6715d73b1fdcb4301207497a
-Merge: 5f4855d a0f6fbc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 26 19:21:23 2011 -0700
-
-    Merge pull request #32 from patnotz/testing-howto
-
-    Tweaks to the TESTING how-to
-
-commit 878becb3b0f205974efe86fef36616326c706487
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 26 21:19:46 2011 -0500
-
-    Save off work
-
-commit 6dcaa6850aa475e76a83d77e7322c67cc1aee3ed
-Author: Pat Notz <patnotz@gmail.com>
-Date:   Tue Aug 2 22:29:59 2011 -0600
-
-    Add option for controlling space before trailing/embedded comments
-
-    Two new options:
-
-       # Controls the spaces before a trailing or embedded comment
-       sp_before_tr_emb_cmt = ignore
-
-       # Number of spaces before a trailing or embedded comment
-       sp_num_before_tr_emb_cmt = 0
-
-commit a0f6fbcc77cd45c867514b24d0d3e499f2e00fe3
-Author: Pat Notz <patnotz@gmail.com>
-Date:   Fri Aug 26 11:36:38 2011 -0600
-
-    Tweaks to the TESTING how-to
-
-     - correct "run-tests.py" to "run_tests.py"
-     - add tip about 'run_tests.py LANG'
-     - can do "cd tests; ./run_tests.py", not "./tests/run_tests.py"
-
-commit caecd7c26b58926fe00e9d3c110906d9f7e7050e
-Author: Pat Notz <patnotz@gmail.com>
-Date:   Fri Aug 26 15:54:21 2011 -0600
-
-    Add indent_ctor_init option for extra indenting of ctor initializers
-
-    if indent_ctor_init > 0 then that many extra spaces are added to the
-    indetation of the constructor initializer list.
-
-commit 63b1c684256183f773eca6740564395631857674
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 25 20:42:09 2011 -0500
-
-    Save off Unicode work
-
-commit 5f4855d5a9165fc083c2ed2d65a988e2786054c1
-Merge: 69486ca 9f6bdb7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 25 18:41:04 2011 -0700
-
-    Merge pull request #29 from JanX2/master
-
-    Fixed Xcode build settings
-
-commit 69486ca2d0187c8a3e0fe08da1ea1196f2d53237
-Merge: 3437cff c44ee6d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 25 18:32:21 2011 -0700
-
-    Merge pull request #31 from patnotz/testing-howto
-
-    Add TESTING file to document running and adding tests
-
-commit c44ee6dfb5b60e32725f8df25c9dc93f58177452
-Author: Pat Notz <patnotz@gmail.com>
-Date:   Tue Aug 23 10:16:34 2011 -0600
-
-    Add TESTING file to document running and adding tests
-
-    The content of this file is from messages from Ger Hobbelt and Ben
-    Gardner.
-
-commit fe42c67ae018c7ee44f276d0d4ab543710062678
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 18 22:31:37 2011 -0500
-
-    Add a completely untested unc_text class
-
-commit 97996a0b51d916d4f25f5b61aecbb4c367f5f19f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 17 22:28:55 2011 -0500
-
-    Add a start to UTF-8 and UTF-16 support
-
-commit 9f6bdb7f3880cf90eea86381a1ac7c96ea54f96a
-Author: Jan Weiß <jan@geheimwerk.de>
-Date:   Tue Aug 16 17:54:57 2011 +0200
-
-    Cleaning Xcode build settings.
-
-commit b4687cd969dba1ca92b51b6268aae109622ba5aa
-Author: Jan Weiß <jan@geheimwerk.de>
-Date:   Tue Aug 16 17:54:22 2011 +0200
-
-    Xcode project file touched by more recent Xcode version (3.2.5).
-
-commit a0639c2b9047e91e585bfbc009fc3eda961d137c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 13 22:56:16 2011 -0500
-
-    Fix comment
-
-commit 3437cffac02717c37c4f7b3d23adc7c73d2a2543
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 13 21:37:25 2011 -0500
-
-    Update test results for new sp_after_new option
-
-commit e7e09ab2b2b67341451bacc11472a6f5330c642d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 13 21:09:21 2011 -0500
-
-    Make do_space() static and don't log spacing if the 2nd chunk is a newline
-
-commit e0e50e81b0ba2c04242b7799d71dd2b6d77dcc01
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 13 21:08:49 2011 -0500
-
-    Add option sp_after_new
-
-commit 3bbe8521f46956d7d879505452b4c7b5273dfd88
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 13 21:07:52 2011 -0500
-
-    Mark the parent of '[]' in 'delete[] x'
-
-commit 7501cad6f93119ae3862a3b84d3934d6c9bd9df0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 13 14:14:10 2011 -0500
-
-    Add new options: nl_after_class and nl_after_struct
-
-commit 46718ae6f0873340e19dde925837ac657274ef7b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 13 14:13:05 2011 -0500
-
-    Set the parent type of the semicolon after a class/struct/enum/union
-
-commit 97bba2218fc491ed48bac794a6c2f093a9628dbc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 10 22:02:20 2011 -0500
-
-    Add nl_property_brace to handle "public foo bar { get; set; }"
-
-commit 1b30ae951777f26fbbb463bb2cc8e19b222be459
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Aug 10 21:44:11 2011 -0500
-
-    Fix the new option nl_after_func_body_class (too much cut-and-paste)
-    Improve logging so see what changes blank lines.
-
-commit 20b21c2f7cd9c3b635b0fc124541e17074fdf941
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 22:56:10 2011 -0500
-
-    Yell if a macro function ending with a semicolon is detected.
-    Using those in code confuses Uncrustify.
-
-commit 26a283192627880f598f857cf8892338098d038c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 22:55:15 2011 -0500
-
-    Update test for recent namespace/property fix
-
-commit 5f547a4988eab08f04d1d22c2c67a6a175fbd4bb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 22:50:42 2011 -0500
-
-    Fix detection of "void f(::a::b v);"
-
-commit 238d22c69c8a9bfc67bf029c1b6642f00fafc642
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 22:26:13 2011 -0500
-
-    Set the parent of everything between 'namespace' and '{' to fix false
-    property detection in C#.
-
-commit ef8350ecdbcf65988f708f8d072513deb85bfd5a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 22:11:49 2011 -0500
-
-    Add option nl_after_func_body_class
-
-commit a746876a46f9c0437be10248760cef9ea11a3d8e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 21:51:19 2011 -0500
-
-    Check for embedded 0's in the input file.
-    This causes undesired operation.
-
-commit bcee5c52f5922102e57c805141480bc5a41e14d1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 21:38:30 2011 -0500
-
-    Keywords 'and' and 'or' may be in C/C++ '#if' statements
-
-commit 057d9e4188d182147d5bd459530b4785811fe117
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 21:28:34 2011 -0500
-
-    Add some additional null checks in newline_add_after()
-
-commit 25b916cee118fa9ec92d96a45bd1bfed5bfb95b5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 6 21:00:50 2011 -0500
-
-    nl_before_throw only applies to after a ')'.
-
-commit e9d48e186b3969511d24a85c0c5def9ce278d757
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jul 28 21:50:10 2011 -0500
-
-    Use std::bitset for the log mask
-
-commit cb1dbd354b339ae81c03865ccf0e6fb60a4e03ca
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 16 15:38:11 2011 -0500
-
-    Add missing test results
-
-commit 0ab0127350eccdaf085c2b5a4e082679746acad5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 16 15:02:48 2011 -0500
-
-    Add config file for the 'sun' C++ format (Todd Richmond)
-
-commit 9519de3a7e44f903ce5fbc56b6182579fad8a1c4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 16 14:57:41 2011 -0500
-
-    Add Visual Studio 2010 project file.
-
-commit f4c5357612d26e94a5951336d58c5b351dab3c65
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jul 7 22:19:54 2011 -0500
-
-    Clarify the description for nl_func_var_def_blk
-
-commit 6cbeb6fba003f19fc4a56261072accd34900cbd2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jul 7 22:15:59 2011 -0500
-
-    The continuation indent applies to the next line, not the current
-    Fixes SF#3348571
-
-commit abb5ed155825b5756328d226881e041882a4e96b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 6 21:31:19 2011 -0500
-
-    Make the nl_func_var_def_blk option take priority over nl_before_if, etc
-    Fixes SF#3348594
-
-commit e7990ff73274f4d4ed6fe89853148c9a58d23efa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 6 20:37:57 2011 -0500
-
-    Remove arbitrary limits in align_same_func_call_params()
-
-commit 0fd87aad1bc102221d45d75caee772ea370e36fe
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 6 20:30:12 2011 -0500
-
-    Fix align_same_func_call_params()
-    Fixes SF#3354409
-
-commit f6ab1b08e9327f22c4077a212c793b14c55b08cb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jul 5 22:07:29 2011 -0500
-
-    Use feof() to detect the end of the stdin stream.
-
-commit 5ddffe8ca744cbe8cfbff11632460b59769f4939
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 22:49:35 2011 -0500
-
-    Remove std:: prefix, now that we are "using namespace std".
-
-commit c3224461bfdda91c8414095b31aa87ece0817434
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 22:49:09 2011 -0500
-
-    Re-run update-default-cfg.sh
-
-commit 313c87ae4403b76c31a7302c6d6374f0fbae6f39
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 22:48:46 2011 -0500
-
-    Remove newline at the end of the option text.
-
-commit 7d627682a0b5aeed41abf467d5f3253641ea75fb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 22:46:29 2011 -0500
-
-    No longer need malloc() or realloc()
-
-commit f7d16638d056a2e1a2df0e6f298b786153f02e6b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 22:40:45 2011 -0500
-
-    Use std namespace and use std::vector for file data.
-
-commit 067d13ae43eaca6c67036d459f51617b53bc17c8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 21:49:42 2011 -0500
-
-    Use std::map for custom keywords.
-
-commit 29371a4b44cb5af4375dcf2364af607c4c6952b7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 21:48:17 2011 -0500
-
-    Use a std::map for the custom defines.
-
-commit 4c7c49574de4360bd233b67622f62dba1bb4d413
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Jul 4 15:25:28 2011 -0500
-
-    Move add_long_preprocessor_conditional_block_comment() out of defines.cpp
-
-commit 183a3ab83f52c14d91fa71f6b9a845a4ff3ec55b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 2 17:32:11 2011 -0500
-
-    Remove unused typedefs and types.
-
-commit acc0a1488f581f1a5d3a0f389a29d645db24a13a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 2 17:24:14 2011 -0500
-
-    Rework ChunkStack to use std::deque and not manually manage memory
-
-commit c45d8a349f8964c6f36bece12c5fcfcbffd0a6bf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 2 16:15:23 2011 -0500
-
-    Replace C99 construct with new/delete.
-
-commit 7d2f25f76cd051e58d4599c07820778bbf6d543d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Jun 17 14:47:50 2011 -0500
-
-    Add more to the C++ operator test
-
-commit adb08f32bc3b8f77dc5efb86bd3f33be3da82b2b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Jun 17 14:45:58 2011 -0500
-
-    Clarify the description of sp_inside_square
-
-commit dd537926695d380f6aec1e4bd8ce551dd2f37219
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Jun 17 14:44:35 2011 -0500
-
-    Properly handle 'operator []', 'operator new[]' and 'operator delete[]'.
-    Fixes SF #3317841
-
-commit 314cf189824f261afd6673f5b90cdb9f3ac92778
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Jun 17 10:55:07 2011 -0500
-
-    Use the comment size as a guide for how large a line can be.
-    Fixes SF #3317781
-
-commit 2b9adf5b10bc501d4256bc77130c243d8bcd78e0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 17:25:54 2011 -0500
-
-    Remove obsolete subversion $Id$ tags
-
-commit 59e7dd641a525f3eb6086fc2a3774ccaaed4c30f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 17:18:13 2011 -0500
-
-    Redo the options to tests/run_tests.py
-
-commit 4cfad57e4785c0989a9192a2a0f8baf9d7ac8ee1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 17:06:27 2011 -0500
-
-    Extend the test script to check for stability.
-    If a test passes, it runs uncrustify on the output and checks to see if it
-    changes.
-
-commit 9073b78f0fb4219e229c4a161669eadc17a4e26b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:50:52 2011 -0500
-
-    Do not remove braces if set to AV_FORCE
-    Fixes SF #3289119
-
-commit 9db88d5c5831b599323fbd00290beaa64485e900
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:39:39 2011 -0500
-
-    Fix indent_cmt_with_tabs for comments in the first column.
-    Fixes SF #3310758
-
-commit 4cf28b5c5eafec045424084f69b21c1189e01ad7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:34:30 2011 -0500
-
-    Sort the keyword table. @synthesize and @selector were out of order.
-
-commit 317b7f0e04f575dd3de1dd50bf863cbf7c9562a6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:21:11 2011 -0500
-
-    Add handling for the Java assert statement
-    Fixes SF #3304061
-
-commit 4efe8c86ce16fc9fbfb00ab18725c3063e75dcfc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:18:37 2011 -0500
-
-    Add a test for the Java assert statement.
-
-commit b69eadfbc8f1b51b09fbb948373c486b2b7ef106
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:16:52 2011 -0500
-
-    Add a specific keyword for the Java 'assert'
-
-commit 28f342227228f6bed4fa65e92bf161ef6a898dca
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:15:58 2011 -0500
-
-    Add test number ranges to each language test file
-
-commit 9e911263e5d1055ad28fcec4745d592421025efd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 16:12:27 2011 -0500
-
-    Renumber the C tests
-
-commit 6175a01d970d9bad6138fea083ecce3b283d6747
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 15:37:50 2011 -0500
-
-    Fix some NULL-derefs in add_long_preprocessor_conditional_block_comment()
-    Closes SF #3306280
-
-commit 116e2e6d87bc741a47b3dcbdefadc0323c3000ee
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 15:29:07 2011 -0500
-
-    Try to do a better job at handling user-defined literal suffixes.
-    Fixes the second issue in SF #3306237.
-
-commit d42b30e474ffd4aabe262b748520ff05ca1f9159
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 14:54:53 2011 -0500
-
-    Recognize the C++0x 'constexpr' keyword
-
-commit 983dd90b2a03525955c0faa854ddc953c8a18cb8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jun 11 14:39:44 2011 -0500
-
-    Change parse_number() to allow decimal numbers starting with a 0, as in 08.
-    Fixed the first issue in SF# 3306237.
-
-commit 92a6a6b2ccb7916d56aa6d3956b2e773bd9f82c8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jun 7 20:50:38 2011 -0500
-
-    Remove diagnostic code about unexpect chunk in struct/enum/union
-
-commit 2cc9f6d51ba0d091c6e4e1b3f876528a6d2648b2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu May 26 21:21:27 2011 -0500
-
-    Suppress log on expected chunk
-    Fix SF #3307476
-
-commit 586f958edf0d2303fe6411370958fe15a6465ae2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun May 22 10:20:21 2011 -0500
-
-    Update tests for SF bug #3305534
-
-commit df55dc01c7f5358f8572ea23df46374d0752458f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun May 22 10:10:26 2011 -0500
-
-    Fix detection of operator() function calls.
-    Fixes SF #3305534
-
-commit 7bf25d620c3fd11f2edaad43ba71139deae6ca9f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu May 19 22:13:45 2011 -0500
-
-    Uncrustify 0.58
-
-commit 6ed81d30cf926218d873ea644fdfe016343cb1bf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed May 4 21:09:14 2011 -0500
-
-    Do not corrupt files that contain non-ASCII UTF-8 characters
-
-commit f4c1969ad44a8ae7c79dcb616aed2e70d81989a8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Apr 20 22:07:39 2011 -0500
-
-    Add missing test file
-
-commit 5b8cf13145ed0e104d6add03a338b8c80b1f6c1c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Apr 20 21:50:19 2011 -0500
-
-    Add a test for aligning static class variables
-
-commit c581c009194be58024a1eaf53d9c753ffdde06f0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Apr 20 21:49:28 2011 -0500
-
-    Skip over member stuff 'foo::bar' when aligning variables.
-
-commit c6266ba06538ebda17cc3bcd8b9ba5a218dda324
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Apr 20 21:37:47 2011 -0500
-
-    Back up past and class specifiers when aligning function prototypes and
-    single-line functions.
-
-commit edaa77817e796fbd54c55106da068aa8789f4b36
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 16 23:40:34 2011 -0500
-
-    Fix '*' detection in "BYTE** c = new BYTE*[12];"
-
-commit 7925530f1e5405d738729607d9761c7e8f1ead98
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 16 23:20:24 2011 -0500
-
-    Label the '&' in 'TYPE &' as BYREF.
-
-commit 4b8f3fb5ace5d2286315dcc815a4e6c0d6bf700f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 16 22:57:07 2011 -0500
-
-    Handle MS extension: 'for each ( xx in yy )'
-
-commit 5885e05beac1496cb9ad5688f28edd9d63c198b0
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 16 22:42:58 2011 -0500
-
-    Fix the description for mod_add_long_ifdef_else_comment and
-    mod_add_long_ifdef_endif_comment
-
-commit 837ccbf4713428383857453fcd1ef1831dfb2036
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 16 22:38:18 2011 -0500
-
-    Add test for D sized enums
-
-commit f9263ccd64d06fb2a9425ff55e8caaf522936645
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Apr 16 22:35:43 2011 -0500
-
-    Correctly handle D sized enums in "enum x : int { ... }"
-
-commit 8438283ffd1ce36116c2b252362c835a7f4f7326
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Apr 8 18:24:55 2011 -0500
-
-    Fix cut and paste error in description for cmt_insert_before_preproc
-
-commit bc33025cb4fa8772fe036cdc6f6cf1a665525f64
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 19 09:11:55 2011 -0500
-
-    Add inserted comment substitution for "$(message)".
-    From: Kevin Hardman
-
-commit d633b408c604babcaf349b7418d519e3f8f0bd20
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 19 09:10:42 2011 -0500
-
-    Add new option cmt_insert_oc_msg_header.
-    From: Kevin Hardman
-
-commit ce5edfe22ae1d6b0c3d27e516a8f2dff6b777fdc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 5 15:33:11 2011 -0600
-
-    The default for tok_split_gte is now false, so it needs to be set.
-
-commit 4a011f3b8d44762adadcef4f071bc04ab6c982ef
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 5 15:29:17 2011 -0600
-
-    Fix detection of this: d[i].e * f();
-    Was detecting 'f()' as a function prototype, should be a function call.
-
-commit e02cea59246cd98e2e4682a126a15a83d8f9a2fa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 5 15:28:10 2011 -0600
-
-    Fix segfault introduced in the last commit.
-
-commit ee31f327f5b1faf197bb86c7942fb2e35a685c89
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 5 15:14:26 2011 -0600
-
-    Mark the parent of braces if an open brace follows a function call.
-    Fixed SF issue 3171797.
-
-commit 01c2d27e0f8f4a4fccd037c4aabe00b7dd25eec2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 5 14:48:01 2011 -0600
-
-    Change the default to NOT split '>=' if it could be the closing part of
-    a template.
-
-commit 8a6089244856829128c3f0d2a7fe0b65010c765e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Jan 21 22:25:13 2011 -0600
-
-    Add a hack to allow a something named 'class' that isn't part of a class
-    definition. As in: "MyClass.class.getCanonicalName()"
-
-commit d57a1a30683db491fa00879509dfe506e3dad6c6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Jan 21 21:58:56 2011 -0600
-
-    Add some special handling to allow ObjC to use some keywords as identifiers
-
-commit 03b4a31c63a15b75d3c8759a6d92610e450c5ad6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 6 10:23:33 2011 -0600
-
-    Add a test for detecting function parameters
-
-commit 3e4c826e4cacd760c3b7860a4366549be917b445
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 6 10:05:50 2011 -0600
-
-    Function parameters may be arrays.
-
-commit b1b19b9ddd9411f99ccd642308856d071f157440
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jan 6 10:04:38 2011 -0600
-
-    Use chunk_skip_to_match() instead of chunk_get_next_type() where appropriate
-
-commit af7ee0f748283ff39e20eae928fd6eab630c54dc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 1 13:42:12 2011 -0600
-
-    Change logic so that align_keep_tabs doesn't break align_with_tabs.
-
-commit 2ad8fc4030d34aebd55ff1a138a3208f558680d7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 1 13:18:55 2011 -0600
-
-    Change some keywords to CT_WORD between '@interface' and '@end' (ObjC)
-
-commit a726617e74b739a54f6fda3487d17180de3e9ba1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 1 12:46:44 2011 -0600
-
-    Allow function types inside function parameters in a prototype.
-
-commit a6f728ec83a5798f65566cf70f67b0eea44e2050
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Dec 31 14:52:23 2010 -0600
-
-    Add tests for sp_catch_paren, sp_throw_paren, sp_version_paren and
-    sp_scope_paren.
-
-commit 135d677b97e3dea11600ea0adce9228563a0e583
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Dec 31 14:49:28 2010 -0600
-
-    Add new options for D: sp_scope_paren and sp_version_paren
-
-commit c6a66430edfc6d2e0705b396a0877511aa7d6042
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Dec 31 14:28:23 2010 -0600
-
-    Add option sp_catch_paren
-
-commit 27df8f102b8848b347a5788206795b175bdd4c9d
-Author: ben <ben@ben-desktop.(none)>
-Date:   Fri Dec 31 13:51:16 2010 -0600
-
-    Only mark a colon as a CT_CLASS_COLON if at the same level as the parens.
-
-commit 6840f94af18dcc30f252bf0c45642673f7ba901b
-Author: ben <ben@ben-desktop.(none)>
-Date:   Fri Dec 31 12:15:00 2010 -0600
-
-    Add option tok_split_gte to disable splitting '>>=' and '>=' in template
-    detection.
-
-commit e6528e71b685a73ee30da0eabe3521ce03c3d8a9
-Author: ben <ben@ben-desktop.(none)>
-Date:   Fri Dec 31 11:33:11 2010 -0600
-
-    Don't right-align if align_on_tabstop is set.
-
-commit 5c2a8b36760bf64059a5b60bf6f827b190cdb2cd
-Author: ben <ben@ben-desktop.(none)>
-Date:   Fri Dec 31 11:31:00 2010 -0600
-
-    Remove some duplicate tab-calculating code.
-
-commit b144060febe17aea8a38ee758f125452281d454c
-Author: Hannes Schmidt <git3@hannesschmidt.net>
-Date:   Sat Dec 4 16:06:49 2010 -0800
-
-    Fix detection of whether inside Obj-C msg send
-
-    Fixes sp_before_send_oc_colon and sp_after_send_oc_colon that were probabably broken by 42b1ed31999d4926188acf881912b49958282dac. Also revives the intent of cb9c866934ff2937e59eebab7dfeb937de73f792 broken by the same commit.
-
-    Signed-off-by: Hannes Schmidt <git3@hannesschmidt.net>
-
-commit a22f48121a9eeb207230c0063d0c51f38ce8fa82
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 25 10:46:38 2010 -0600
-
-    Add note about how to push a tag
-
-commit 0247755e1496b876c4fa5759eafb6ebc1b47a459
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 25 10:20:27 2010 -0600
-
-    Prep uncrustify 0.57 release
-
-commit cbb8025fd6ba45664ed49e7f4d4c4e215fc77b01
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 24 10:51:39 2010 -0600
-
-    Bail on template detection if we back up into a return and there is a
-    boolean op in the angles.
-
-commit ef6ccbacb8583b22c9d3df8a2b3c9bf808628cf7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 24 10:09:09 2010 -0600
-
-    Fix detection of anonymous bit fields in a structure
-
-commit bda365fd6805565584ab02237862cc961eb99723
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 20 10:25:09 2010 -0600
-
-    Fix incorrect removal of braces of an 'if' statement that is followed by
-    and 'else' and have a nested 'if' before the 'else'.
-
-commit 2d1498c30ae7aa985fbde3d882ab2d35092b4adf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Nov 15 17:22:08 2010 -0600
-
-    Don't change the '*' in the following to a ptr_type:
-    struct { int a; } b[2 * SZ];
-
-commit 233256cc6a661ff8ff56f31172602b11be9c4149
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Nov 15 17:12:34 2010 -0600
-
-    Improve labeling of the angled brackets in protocol lists as in:
-    @protocol Shape <NSObject>
-
-commit 5276460b2449fe3f4410a44c47ff29ff3ada3773
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 6 14:18:41 2010 -0500
-
-    Do not indent ignored text.
-
-commit 196b1e23fe67070290285ee9e180f2c3a1ff1949
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 4 10:09:44 2010 -0500
-
-    Add support for Q_SLOTS and Q_SIGNALS. (John Volpe)
-
-commit e936d42ed978b8e1497ec4b65171f52262795ff5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 4 09:55:04 2010 -0500
-
-    Update test to cover classes declared with scope.
-
-commit a690b7bcce5371935c569c0d9564da23e125070f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 4 09:52:14 2010 -0500
-
-    Skip over '::' when looking for the class name.
-
-commit cf154549c630206d22e4fca3b27e1672cc6ed26a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 4 09:44:08 2010 -0500
-
-    Fix indent of ObjC class if there are no messages declared.
-
-commit 2382da103bd64ff866d0ce4a875436a5e8fd7740
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 4 09:16:23 2010 -0500
-
-    Check for indent-on on the current line before parsing off whitespace.
-
-commit 91808ad839f2aeb6566192beeac2f10f55027259
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 3 22:13:04 2010 -0500
-
-    Add D support for 'unittest' as a plain old symbol instead of a keyword.
-
-commit 49ddde72b5c528633c37341123a2a09da12db431
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 3 22:04:35 2010 -0500
-
-    Fix detection of " *INDENT-ON*" when the comment isn't in column 1.
-
-commit f7c0b6f5edf89f72cf9a01405d4611b8da1c5223
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 3 21:48:06 2010 -0500
-
-    Fix handling of multi-line CPP comments.
-    These are '//' comments with escaped newlines.
-
-commit 4dffd493412a5811e0b1cbfe1b31470511c75e34
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 3 21:03:25 2010 -0500
-
-    Add support for the D template format that doesn't use parens.
-    Example: "to!string(1.2)" or "TFoo!int.t x;"
-    Fixed bug #3091128
-
-commit 2b2ceb78c6db5e1b1a099c11a1932b740ebb075a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 7 21:52:27 2010 -0500
-
-    Treat 'try' followed by a colon as a qualifier to handle this format:
-      A::A(int) try : B() { } catch (...) { }
-
-    Otherwise, a virtual brace is inserted after 'try'.
-
-commit 4c5d7b7377efcda9e2c1573e2178ebe5a5386b55
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 7 21:40:14 2010 -0500
-
-    Fix detection of the language of files passed on the command line.
-
-commit 11fb326964e5096b75f2a3edb171851794163bb5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 7 21:26:31 2010 -0500
-
-    Zero cpd.frame_count before scanning the file.
-    Force the preproc parent type to the correct value in pf_check().
-
-commit a0c308b86bff8f29609b3dbc866317293317de2f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 7 20:17:24 2010 -0500
-
-    Add minimal support for C++0x rvalue references
-
-commit 67365501baa5df7b617a97ede8597809f102b727
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Oct 7 19:26:58 2010 -0500
-
-    Add support for the MS-specific '#@' charizing preprocessor operator
-
-commit 52a3525fed0b407a01dace8f959b22e369f84fc1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Sep 1 20:12:49 2010 -0500
-
-    Comment out mark_struct_union_body log statement.
-
-commit 247a8053952291032b134b8ef2d35f94e4707d8c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 28 17:58:14 2010 -0500
-
-    Update test for C++0x R strings with embedded newlines.
-
-commit a20c582e003cccb1fa2f8f0f696c71ea3799dac2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Aug 28 17:57:50 2010 -0500
-
-    Newlines may appear inside the C++0x R"(xxx)" strings
-
-commit d1db1dd3ffa9983f9c07ecd824fba68785b55f9d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 26 20:51:22 2010 -0500
-
-    Update the tests for the newly added C++0x literals.
-
-commit 5af337c38f0dd8025ae46e2ccbf290d2b43a2638
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Aug 26 20:49:10 2010 -0500
-
-    Add support for C++0x string literals and the user-defined literals
-
-commit e63fe8b359ac2efa1e015c87ae4eb079de7071fa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Aug 13 09:00:40 2010 -0500
-
-    'foreach' isn't a C++ keyword
-
-commit f543e31a8c6fe5b9b31fead5caafd970277319d8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 28 21:41:59 2010 -0500
-
-    Fix incorrect log text
-
-commit 525014a12e3e5427e61f6f607d985fae87ab9657
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 28 21:41:47 2010 -0500
-
-    Improve support for D casts and const(type) qualifier.
-
-commit 0c9675a86e8225fe65bdaaf9a3138f6efe7c4d12
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 19:15:06 2010 -0500
-
-    Rework tests for new nl_func_def_xxx options
-
-commit fece00a87048a3e2631356c8d10ddd947498c6ad
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 19:10:09 2010 -0500
-
-    Adjust config to pass with new options
-
-commit 2d1e4acc633a1ddf65d1f6a19c0c25ca29b8bbe8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 19:09:41 2010 -0500
-
-    Add nl_func_def_paren, nl_func_def_start, nl_func_def_start_single,
-    nl_func_def_end, nl_func_def_end_single, nl_func_def_empty
-
-commit 494715379a4b277fa72ff029ae9593f063125730
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 18:46:34 2010 -0500
-
-    Enhance tests for nl_func_def_args
-
-commit 462b272579de97a1140fd7a8fc7f3f3bb21ee198
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 18:45:35 2010 -0500
-
-    Add option nl_func_def_args, which is nl_func_decl_args for function defs.
-
-commit 022a9f957da6f907a07f492af2cdcbf9e3d7883b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 18:22:40 2010 -0500
-
-    Fix interaction between mod_case_brace and mod_move_case_brace
-
-commit 74b73e29483c52fba4b34decde389a837373fbc9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 18:17:44 2010 -0500
-
-    Add more logging for inserting blank lines.
-
-commit 7449c779ffa8944adae43d4579515d1f1540de18
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 17:48:59 2010 -0500
-
-    Add option sp_func_call_paren_empty
-
-commit 033a4ff4fab8954f6f66e79245e550ef623dfe10
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 17:46:37 2010 -0500
-
-    Update tests for operator byref fix.
-    SF bug #3023966
-
-commit 54a60a6b912bfbd2fbe0366fe1907f4651d8c79f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 17:27:46 2010 -0500
-
-    Use column_indent for checking to see if a comment is off to the right.
-    Fixed detection inside of switch statements.
-    SF bug #3032787
-
-commit e54a3e147d4e7f44a5f54a82e7c8469c819bf0c1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 16:59:22 2010 -0500
-
-    Change operator tokens into a type before merging into CT_OPERATOR_VAL.
-    Fixed SF bug #3023966.
-
-commit 508abd9c8fc41e14f0f498df27afa1234d8ec79b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 16:45:18 2010 -0500
-
-    Try to do a better job of handling struct/union bodies, reusing code.
-    Fixes bug-3029014
-
-commit 7425e9e102cc81381b366a814176e8914bede5f1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jul 25 16:40:56 2010 -0500
-
-    Update test for bug 3029014
-
-commit e2166d7634e28f44352bdab4e5d0e70cc8dd1606
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jul 24 11:45:31 2010 -0500
-
-    Add missing ChoicesReadable for lead_break, lead_force, etc.
-
-commit 931d0b7e5d381c9849695f1f56c3dd19fdea1e93
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 21 21:54:33 2010 -0500
-
-    Add a test for templates.
-    Illustrates SF bug #3019852
-
-commit d5f09b310e3ac6acb7cee023a16a8fe8d98f75d2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 21 21:51:19 2010 -0500
-
-    Mark token after '+' as starting an expression
-    Fixes SF bug 3032782
-
-commit 07fc9a7e6179d77d0170ecadf66c285896f12542
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Jul 16 17:16:24 2010 -0500
-
-    Add --frag option for indenting a code fragment.
-
-commit 5777fe7d9a354b074e579a18630f5e30b90bbea7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Jul 15 20:43:23 2010 -0500
-
-    Templates: Only split a '>?' if the '<' is at the top of the stack
-
-commit 9b77f5bfe4dd4593e3b5e0a9da64c252704b7b2c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 14 21:51:02 2010 -0500
-
-    Improve throw() handling. It is either like return or const.
-
-commit 73a33f4b4952992351d9e2c6ab05660b03a76c0f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Jul 14 20:09:27 2010 -0500
-
-    Fix removal of braces when the body contains a braced statement + extra stuff
-
-commit 877bf9e44a20e8381ccd342d5f763789e12d10d9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jun 8 07:53:44 2010 -0500
-
-    Increase the hard-coded template depth from 16 to 1024.
-
-commit aefb0814b43b59ca3abfbfc5366653efe065075c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 17:05:16 2010 -0500
-
-    Rebuild automake stuff after applying the last silent build patch.
-
-commit d2c438a56776a04c945972961a4cd11c96b9630b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 17:03:52 2010 -0500
-
-    Use silent rules instead of nostdinc
-
-    A nice feature of automake is that it allows a VPATH build. That is,
-    a build from outside the source tree. This is disabled in uncrustify
-    via nostdinc in /src/Makefile.am. If the purpose of using nostdinc
-    is to clean up the output of the build, I recommend using
-    silent rules instead.
-
-commit 10ef222f462174a92d727f2afd669f346d0deb4c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 16:54:58 2010 -0500
-
-    Skip over CT_SPACE when looking for the chunk to align the open paren.
-
-commit 4b246dd11309323b446e31f4b75835f1289d471b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 16:18:22 2010 -0500
-
-    Close out the assign on a level drop inside a preprocessor.
-
-commit b120022d230e7c3e623269128ab27ea0838b8e11
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 15:41:20 2010 -0500
-
-    Clean up some minor (?) code issues.
-    Tests still pass, so I doubt the code in question mattered too much.
-    I'm sure someone will let me know if this change breaks something.
-
-commit 211a7366ea612ae18153b660a847f34ecd75ccf6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 15:11:17 2010 -0500
-
-    Properly mark the return type of an operator function def/proto.
-
-commit f446787e4de9add6467646d3b17dcc9c50b2a157
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 14:44:28 2010 -0500
-
-    Update test to cover a class declaration with a macro before the class name.
-
-commit 56de0a62647e9fe5970e6ce5c5242af81be36006
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 14:43:24 2010 -0500
-
-    Handle macros in the class name, detecting the last word/type as the class.
-    class MACRO foo {
-    };
-
-commit 84162ab363cb62b1e355d055aaaad23cf9b6429a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri May 28 14:24:05 2010 -0500
-
-    Reset the column after outputting the BOM.
-
-commit 5be5734967ad787c22d5e3a30d5c15d7646e8b6b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon May 17 18:23:44 2010 -0500
-
-    Clean up build and project files.
-    Rebuild the makefiles.
-
-commit 3fce21b5dd8f61adf4aab3a8c71209e22d957452
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon May 17 18:21:09 2010 -0500
-
-    Reduce the number of places where the version needs to be manually entered.
-    Automatically generate the man and version files.
-
-    From: Ger Hobbelt
-
-commit efb84c2491d76b5f32e22b54561c69afb11796bf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu May 6 08:25:53 2010 -0500
-
-    Check for NULL to prevent a segmentation fault.
-    Fixes Debian bug #580195.
-
-commit 9a25a81a035dd7c1fe3d25213be14b482d48465d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Apr 25 16:49:26 2010 -0500
-
-    Fix newline handling between 'private:' and a constructor.
-    Fixes bug 2983317
-
-commit e635598c2ccf3a8d017bd2d88df59e3aa18326e4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Apr 21 07:56:03 2010 -0500
-
-    Fix spelling (paramter -> parameter) and regenerate the default configs.
-
-commit d256f0dfb9ec59b74d145da2b02bcbfc969980fa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Apr 11 08:36:24 2010 -0500
-
-    Fix sp_paren_comma (was hard-coded to FORCE)
-
-commit a82bdbf9fa8b2f43340338329162ea61fde7496f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 30 19:03:11 2010 -0500
-
-    Do a better job of resolving '>>', '>=', '>>=' vs '> >' for templates.
-    Affects C++ and C#.
-    C# parses '>>' as two ANGLE_CLOSE and the logic must combine them when
-    it is supposed to be a right shift.
-    C++ parses '>>' as right shift and must peel off the leading '>' as needed.
-
-commit 7d5ef5c2d156b979ed1508ac1ad87ad4b40c39e6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 30 18:59:57 2010 -0500
-
-    Add sp_angle_shift to control the space between two ANGLE_CLOSE.
-    '>>' vs '> >'
-
-commit 48542c381460f20d5e5e4316e46c3a97d9d8fc35
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 30 18:07:47 2010 -0500
-
-    Make sp_cpp_cast_paren affect TYPE_WRAP.
-    Example (assuming SLIST_HEAD is set as TYPE_WRAP):
-    typedef SLIST_HEAD( , foo) foo_list_t;
-
-commit 495501c3a2e6e6450b4654b7524e4b87aee99775
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 30 18:00:46 2010 -0500
-
-    Add sp_paren_comma to handle the super-rare missing first argument in a
-    macro.
-    "typedef SLIST_HEAD( , foo) foo_list_t;"
-
-commit 2f37327eab974d6faa2148af43347eea9be653bd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 30 17:56:45 2010 -0500
-
-    For mod_full_brace_xxx, 'remove' must be done before 'add' to make
-    'force' work right.
-
-commit 174fc88607a0d4f0eb43bb66ccd7e5878bf33ebd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Mar 30 17:55:34 2010 -0500
-
-    Label colons inside a function call as CT_LABEL_COLON
-
-commit 044aa182b0cc8ea2699345fc713dd672ec4c48c3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 27 16:40:16 2010 -0500
-
-    Prep for version 0.56
-
-commit bf91a0e8452d67043c1f173d4c3891ee5e28ac44
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 27 16:10:56 2010 -0500
-
-    Add sp_assign_default to control spacing around '=' in a prototype.
-
-commit 6a2668606926b8c5e11317438e5b5264578bed91
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 27 15:52:28 2010 -0500
-
-    Improve test for nl_func_type_name
-
-commit f85b85ca8d5eb24316dbab512bbbf6467b5ed280
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 27 15:46:53 2010 -0500
-
-    Improve align_oc_msg_colon_span with nested messages.
-
-commit 1eebba4b93bdb9e76ee0beff1c5c710b52025215
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 27 15:24:56 2010 -0500
-
-    sp_after_oc_at_sel_parens should not change space if followed by a
-    square close.
-
-commit 18d8d2bba441dc81cf8f494bf3e6b689edebbe52
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 27 15:10:49 2010 -0500
-
-    Do a better job of labeling ObjC message statements.
-    Examples:
-    [class func: val name1: val1 name2: val2];
-    [class func: val : val1 : val2];
-
-commit f099fadff2e38c28d2e0ad3d9b897dee19dc76f4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Mar 27 14:07:39 2010 -0500
-
-    Insert function comment after the access specifier.
-
-commit e2fd5395a37392dd0ec26a0acc402aee2fe28794
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Mar 26 17:43:10 2010 -0500
-
-    Detect the C# using statement - using (xx) { }
-    Add mod_full_brace_using and nl_using_brace
-
-commit 62a453f2c01f3a4938025c5750c485e4271c3310
-Author: Emmanuel Christophe <emmanuel.christophe@gmail.com>
-Date:   Tue Mar 23 22:52:37 2010 +0800
-
-    Add test for indent_braces_no... options
-
-commit bd5f91f005dca20403680000b89b3fcbf5cb14d0
-Author: Emmanuel Christophe <emmanuel.christophe@gmail.com>
-Date:   Mon Mar 22 22:18:09 2010 +0800
-
-    Add indent_braces_no_struct option
-
-commit feec2a8fd4572f81b5a2f38ce91a1237255885d4
-Author: Emmanuel Christophe <emmanuel.christophe@gmail.com>
-Date:   Sat Mar 20 23:44:28 2010 +0800
-
-    Add indent_braces_no_class option
-
-commit b2354a0a0980bb827745372310b476b6c46afa45
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Mar 8 19:29:00 2010 -0600
-
-    Add a script to build a win32 release zip on linux
-
-commit faec052dcf9bfbed8788a63e283917ef7901eadf
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Mar 8 17:52:20 2010 -0600
-
-    Use PRIx64 to show the flags, like is done everywhere else.
-
-commit 42b1ed31999d4926188acf881912b49958282dac
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Feb 19 21:55:58 2010 -0600
-
-    Add sp_inside_oc_at_sel_parens and sp_after_oc_at_sel_parens.
-    Make some @selector options also apply to @protocol().
-    Set the PCF_IN_OC_MSG flag instead of changing the parent of everything
-    inside a OC msg.
-
-commit b2bc11feb5717f553e16a074dee90195b3752bfb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Feb 19 21:21:01 2010 -0600
-
-    Step back to a non-inserted token to get the backslash position.
-    Fixes issue 2935688.
-
-commit 58d7dbd5d9a88ecaf47e9f6d17e7988f26a6491d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Feb 19 20:59:29 2010 -0600
-
-    Fix mod_full_paren_if_bool interactions with ternary conditional (a?b:c)
-    Fixes issue #2943323.
-
-commit 8909c9fc0c8f9f308c1ccef1bfc4cef5ce889d5d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sun Jan 24 21:02:19 2010 -0600
-
-    Spelling: statment -> statement
-
-commit 5b4be42d368a2d8c049cd3361b1901649ec57c63
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 16 12:30:24 2010 -0600
-
-    Fix incorrect indenting inside enums.
-    Bug 2930752.
-
-commit 10b633d6d50af6faf979953fd07f2aec5e0b7f6f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Jan 9 11:09:56 2010 -0600
-
-    From: Mathieu Lacage
-
-    Force uncrustify to respect the nl_func_leave_one_liners configuration
-    option for constructors and destructors.
-
-    i.e., if nl_func_leave_one_liners=True:
-
-    Foo::Foo() {}
-
-    is left as-is.
-
-    Without this patch, it is transformed into:
-
-    Foo::Foo() {
-    }
-
-commit ba2bdf90a110bda22d5e865fadfd9db9afd2f74c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Jan 5 21:16:19 2010 -0600
-
-    Don't mess with the position of a backslash-newline in a comment, unless in a preprocessor.
-
-commit 0578f7c5b5202481756c16bbd480ab4787f80961
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 31 13:33:18 2009 -0600
-
-    Change 'newline' to 'blank line' in some descriptions.
-    Clarify an option description. -- Thanks Ronan (rdan)
-
-commit 921c1ca41e18772b1e70d90dc822508e2993221c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 31 13:31:35 2009 -0600
-
-    Add indent_first_bool_expr - Thanks to Ronan (rdan)
-
-commit e042712e0a623dd7db2df136fca4c391aa0fd9a2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 31 13:15:55 2009 -0600
-
-    Update the vpj file
-
-commit 0796009c9f506159d19d12440595e6c9786b5d65
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 31 13:15:42 2009 -0600
-
-    Extend the pos_xxx options to have xx_break and xx_force options.
-    xx_break adds a line break is one wasn't present and xx_force removes extra
-    newlines so that there is either one before or one after.
-
-commit 49f7ce6dbdcf48aea20c114aaadc24afa4aca45a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 16:51:01 2009 -0600
-
-    Update template test for the latest fix.
-
-commit a9df57a0d1d2849d01121e04ecd7ffa104ebaac7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 16:43:29 2009 -0600
-
-    Allow a function prototype to be wrapped in a function call at the top level.
-
-    #define MACRO(a) a
-    MACRO(void foo(void));
-
-commit 38870ae909a97a4e6cc065437c23da70f977a678
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 14:15:48 2009 -0600
-
-    Indent ObjC msg declarations that span more than one line.
-
-commit 6a360a75b81c6e5e821d4711b0e2e8d375e7afa7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 13:30:47 2009 -0600
-
-    Add option: align_oc_decl_colon
-
-commit d29556fc7ae373ed860842edee8d99163dbcf084
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 09:15:01 2009 -0600
-
-    Add a freebsd style test
-
-commit 096e5c1ce1cbf7df35146012ccce41e1f176e89d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 09:07:11 2009 -0600
-
-    Add indent_continue support to variable definition indenting.
-
-commit 09b97918833807fc7be2bc737d21ff4e98466ff6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 08:50:33 2009 -0600
-
-    Update test results for recent change in nl_else_brace with regards to
-    virtual braces.
-
-commit 74a1427b4c48c8cebeb192b635a184a5b7be941b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 08:47:59 2009 -0600
-
-    In if/for/while/switch/do/else statements, if a newline was added around the
-    vbrace open, also add one around the vbrace close.
-
-commit 098fc1598fac6ea19b2328502dcdc919223352a6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 08:46:52 2009 -0600
-
-    newline_add_before() and newline_add_after() should ignore virtual braces
-    when checking to see if there is already a newline present.
-
-commit 541ca14b9226aad5184ebffba9ee463857ce0afc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 08:45:58 2009 -0600
-
-    New option: nl_after_vbrace_close
-
-commit cf53884b8a5b066aba1f5d82995eb7b2162337d6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 08:03:10 2009 -0600
-
-    align_same_func_call_params: only align function calls that are right after
-    a newline.
-
-commit 7e0dd190729658e3db8a64c408d83c7cac3fbe1d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 30 07:52:12 2009 -0600
-
-    If an exact option name match doesn't work, try comparing only alphanumeric characters.
-    This will accept options that were copied from SF's broken web interface that have
-    the underscore characters stripped.
-
-commit d66f78b95905e2680e378fe4dab5e68e1771fc30
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 15:00:01 2009 -0600
-
-    Enhance one-liner tests
-
-commit 3b8acea8a478238db3b27290efbace5fd9b19a86
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 14:46:38 2009 -0600
-
-    Make nl_if_brace, nl_else_brace, etc, able to insert a newline between the
-    close paren and the "a++" in "if (foo) a++;".
-    Will not do that if leave_xx_one_liners is true.
-
-commit bec510f9ce24a89c25df786266fdfce75f8abec9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 14:29:16 2009 -0600
-
-    Mark virtual brace one-liners
-
-commit 1e86a51400bd99f94b120726f403f10e0f9996e8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 13:58:51 2009 -0600
-
-    Mention that cmt_indent_multi disables keyword substitution in multi-line comments.
-
-commit e63d84a58f7f4f7e13553e5c49d011a5e2866d6f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 13:42:17 2009 -0600
-
-    Add tests for indent_var_def_cont
-
-commit 399530476d7280b7d5888dbae5a8a6a8979fa784
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 13:35:10 2009 -0600
-
-    Use an empty config instead of /dev/null
-
-commit aa5a2135aded6a19e7995b5072db6a18097dde73
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 13:27:24 2009 -0600
-
-    Add indent_var_def_cont and indent 'a' by one tabstop in 'int \n a, b, c;'
-
-commit e0cae88fb3559e4a60a7e22fee9d9ff67e03ac99
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 28 13:31:00 2009 -0600
-
-    Add option indent_var_def_cont
-
-commit f7891ea8ec39151cc23f52a22de6322c0e370daa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 13:24:02 2009 -0600
-
-    Variable definitions cannot appear in an enum
-
-commit 8d72d2210ef3c9fd080cffcb26f080e55b32d6a5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 13:23:13 2009 -0600
-
-    Split the flag PCF_IN_ENUM, creating PCF_IN_STRUCT
-
-commit d55e99d732915ef38b2709b95dd7d00235bd3611
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 13:22:03 2009 -0600
-
-    Extend the flags variable to 64 bits
-
-commit 5c81851d01649f53ded1353d4471a5df27e4090d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 29 12:46:03 2009 -0600
-
-    Fix language check for PAWN and D enums.
-
-commit 992447afb354e34cd5b3cd3224c927fde113d6d9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 28 11:31:03 2009 -0600
-
-    Expand test to cover nl_func_type_name with constructor variables.
-
-commit 7a3fe5a03884e7928d1cd5d3452d81f18b61490a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Mon Dec 28 11:29:54 2009 -0600
-
-    The fparen parent was being set too early, breaking proper handling of 'constructor' variables.
-
-commit 4d1c3f01cc6f056c8e4860145c8380ebf83ecc73
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Dec 24 11:27:48 2009 -0600
-
-    Add LANG_CPP to 'foreach'
-
-commit 82b1ec3b5a705552b175fc80ee8d6c56e0edbd8c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 23 21:10:27 2009 -0600
-
-    Fix aligning '<<'. The code was too clever.
-
-commit 70363eb72ce236de774a89af0ca54195167078c4
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 23 20:42:10 2009 -0600
-
-    Make sp_before_dc handle any keyword before '::'.
-
-commit b18e56af0cdb1c312c30b7c84b449a3f9ea94d04
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Dec 23 20:29:05 2009 -0600
-
-    Fix off-by-one problem with align_right_cmt_gap.
-    Clarify what the option does.
-
-commit 3103fc2ff6163ba3c1b6bea0fe3c1f996d5946cc
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 22 22:04:06 2009 -0600
-
-    Fix marking of a destructor
-
-commit bae94e27a383b7dfcc35147cdb7815608dad4121
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 22 20:17:45 2009 -0600
-
-    Split out and handle the Objective C '@protocol'
-
-commit a856c5fd63c1fb946cfbea2ac07199efdd7aa812
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 22 19:01:19 2009 -0600
-
-    Don't change PAREN_CLOSE to OC_CLASS_EXT
-
-commit df905852d2661f230151da2e55c15282115537a6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 8 20:57:38 2009 -0600
-
-    Makefile.in is required to build with MinGW.
-
-commit c65e73ddc886f296e106e976df4dd800d9aefef2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Tue Dec 8 19:10:07 2009 -0600
-
-    Change include of windows_compat.h so that it builds under MinGW/MinSys on Windows
-
-commit 714500275add5b811d4bc0604f1748b394f59cef
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 22:20:42 2009 -0600
-
-    Finish removal of d.tokenize.cpp
-
-commit d99335251ac8974585c4e4763c1b724bc1b408d6
-Merge: 3d40b0f 78d5e7c
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 22:18:20 2009 -0600
-
-    Merge branch 'freebsd'
-
-commit 3d40b0f3ebe93eb333ca4ac6bb2f3dde03d37d93
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 22:10:34 2009 -0600
-
-    Update tests to reflect comment output improvements.
-
-commit b427544b4662856ffc0625a34e9e4690e4fe0077
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 22:15:54 2009 -0600
-
-    Add indent_cmt_with_tabs and rework the comment output code.
-
-commit 514d70eb81e80bc92f227a589a1e180437b73fdb
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 21:59:54 2009 -0600
-
-    Clean up some aligning
-
-commit 6cb7a7ed7b759ff69846a34958213a212404c93d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 20:26:21 2009 -0600
-
-    Fix bug in align_tab_column()
-
-commit 8c63eb3ccb7b811bbfa3854d369407c2f15de511
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 18:25:43 2009 -0600
-
-    Filter out trailing spaces
-
-commit 78d5e7cbbdaef7aa3945885ccc69bc5bf8378323
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 22:10:34 2009 -0600
-
-    Update tests to reflect comment output improvements.
-
-commit 51c1f51f86cc4f79f8b0f050122035ec5599ddfd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 22:09:35 2009 -0600
-
-    Add indent_cmt_with_tabs and rework the comment output code.
-
-commit fe7e8204856a591cb89939619badf93489d4be2a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 21:59:54 2009 -0600
-
-    Clean up some aligning
-
-commit a5b683c4f644a9ba2ba5e9cf367903fd87eafb54
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 20:26:21 2009 -0600
-
-    Fix bug in align_tab_column()
-
-commit 622bb1cf4531bff6028e78de83ff367176cb9688
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 18:25:43 2009 -0600
-
-    Filter out trailing spaces
-
-commit 5e60ea5aa84dc60a3221026538d14995d8fb3b58
-Merge: 837f579 72754d8
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 12:29:03 2009 -0600
-
-    Merge branch 'master' into freebsd
-
-commit 72754d8ce612b1f2e79a301bacd84456a410112a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 09:43:57 2009 -0600
-
-    Spelling corrections, thanks to Bill Cox
-
-commit 41086eb04d33d9c0589bdb9bf4d0c4b3e62692f7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 09:40:12 2009 -0600
-
-    Add more patterns to .gitignore
-
-commit 837f579390c814f5969cc7fb539d14ead000a72b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Dec 5 09:38:44 2009 -0600
-
-    save off work in the freebsd branch
-
-commit 2d39c44b4f8600600586213ae65584808c16ad14
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 28 20:31:37 2009 -0600
-
-    Add a start to the FreeBSD style (not yet perfect)
-
-commit c28ffcaeec772f85770e61c4ad09e4c994393272
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 28 20:18:03 2009 -0600
-
-    Add a note that the old K&R function declarations are not handled.
-
-commit 0bbae411beec75b78d368727aea2bdc61002d9be
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 28 20:17:25 2009 -0600
-
-    Add option indent_continue
-
-commit ae7a414ff4f153d3aea6149b01dcfc412c3f4a4a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 21:54:47 2009 -0600
-
-    Update release step.
-
-commit 709abc9d725d5b95a031057f2ad143325b99220a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 21:46:26 2009 -0600
-
-    Save off auto-generated files.
-
-commit c842cf4d9515f6d52a7f1cf8e72a9269517585c3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 21:46:07 2009 -0600
-
-    Missed some support files for Win32 and OSX
-
-commit f0e41e2ff8b0ba6782ee520f74748cb38a01f44f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 21:30:18 2009 -0600
-
-    Update the release steps.
-
-commit 22f60eb9e70b7162f879d3d5b4685b1692a516b5
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 21:29:50 2009 -0600
-
-    Update the default config files.
-
-commit fa38a4d0b356130780f2aafae4fa089dae7b0ea2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 21:17:48 2009 -0600
-
-    Move changelog to the root so 'make dist' can pick it up.
-
-commit 3fec51af2bac389ec34e9817ae3b22c2b196e48a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 20:59:52 2009 -0600
-
-    Update vpj file
-
-commit 7a426d5c03d9ef6fd721bc4474b647ce01ff1540
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 20:59:27 2009 -0600
-
-    Makefile.in doesn't need to be checked in.
-
-commit ea1432b6691ad678e23b470eae7473ad6e3d9646
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 20:57:41 2009 -0600
-
-    Fix operator-related breakage in pawn.
-
-commit 2ca1ce44ccc6da68f254ef7d2f88c01c856050ae
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 18:10:24 2009 -0600
-
-    Update makefile to get 'make dist' to work right.
-
-commit cdc226c38c2a0d87603f24cb72b61a4d40850b8a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 17:59:07 2009 -0600
-
-    Add the homepage URL
-
-commit 42ca2151714ef394392f929607b18e59a59707a9
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 15:32:29 2009 -0600
-
-    Run 'autogen.sh' on Ubuntu 9.10
-
-commit 163dfc47d406c4d709271a75380575d16afae923
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 15:31:47 2009 -0600
-
-    Updates for release 0.55
-
-commit 2daa03ce4df9479178d4c84c5965af895eb4d41d
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 11:27:26 2009 -0600
-
-    Add nl_func_decl_start_single and nl_func_decl_end_single
-
-commit 18dba54313c8aea3e59593fdab2a7beeb01fe5e2
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 11:06:41 2009 -0600
-
-    Add new option: nl_after_vbrace_open_empty
-
-commit 285dd9175bab26d9f44538131852210a24de20ea
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 27 10:30:49 2009 -0600
-
-    Fix possible out-of-bounds array access.
-
-commit 71daf98217f8ee4ade168f9cf786b99c119124f3
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 19 20:17:47 2009 -0600
-
-    'mutable' is a qualifier, just like const. Except different.
-
-commit 9855ec9cfd5b39daa35f389892cebcd48dd48452
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 19 20:08:54 2009 -0600
-
-    Update test
-
-commit 19463629dedebd2ac84d001ef6dbb4f419856654
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 19 20:05:15 2009 -0600
-
-    Don't insert a newline between a brace and comment for the else.
-
-commit d4270ec55aac03ad76b8816b07f2fcd7cc1ef15e
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 19 19:42:51 2009 -0600
-
-    Fix test to reflect nl_struct_brace fix.
-
-commit 93be59cf4e1d56df7798a247a640edac14eecdb6
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 19 19:42:09 2009 -0600
-
-    pos_assign should not affect '=' followed by '{'.
-
-commit 3cda54e81789ccaf198ce498ed49d50c15464e56
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 19 19:30:47 2009 -0600
-
-    nl_struct_brace should not apply outside of a 'struct' declaration.
-
-    // applies
-    struct foo { int x; int y; };
-
-    // does not apply
-    struct foo bar = { 5, 6 };
-
-commit b209fe1639061db4a2f59b5bb1656ce64697dfbd
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Thu Nov 19 18:55:53 2009 -0600
-
-    Change nl_create_if_one_liner to also work for 'else if' and 'else'.
-
-commit c20507f47e3d9db50e1d99eb91de9a4673955a17
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 18:13:33 2009 -0600
-
-    Fix align_on_tabstop
-
-commit e9c387ba3dd0f0d584156f12540d2668faafa635
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 18:13:21 2009 -0600
-
-    Fix align_with_tabs
-
-commit 90ca35b66e07ee5b9d695fde168eca016ee656c7
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 17:59:49 2009 -0600
-
-    Set PCF_WAS_ALIGNED when aligning chunks.
-
-commit 5c459ba07a32a2474522e31dd9873667fbd9ecde
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 17:44:42 2009 -0600
-
-    Improve template test
-
-commit 405eb7bbd3c53b6b8daa48a2d79259e94d9b5941
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 17:44:21 2009 -0600
-
-    Add support for templates inside a #define
-    Fixes SF bug #2887001
-
-commit 619b83477d37796f591477c35bb2c70ca96a779f
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 17:02:59 2009 -0600
-
-    Improve operator tests after recent bugfix.
-
-commit ef02353e0c7d20082bad9e2c9f5228f64a17c2d1
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 16:58:19 2009 -0600
-
-    Rework operator handling.
-    Everything after the 'operator' keyword that is part of the operator
-    type is put in one chunk.
-    Fixes SF bug #2889468
-
-commit f2941dd0dfa70431989d2d9f994532b3ac5aa019
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 13:32:23 2009 -0600
-
-    Improve test for nl_func_type_name
-
-commit b9f6aba423e6e08620ee83b7fe39d83f7b5bb823
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 13:31:58 2009 -0600
-
-    nl_func_type_name: Don't remove a newline after a brace open.
-    Fixed SF bug #2889292
-
-commit dc920c761a001e99305daf6d0531db50f0d47826
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 13:11:42 2009 -0600
-
-    Expand a test to include a destructor.
-
-commit 72846d01c88d2ab8a2843dffc97a3c04275e9608
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 14 13:11:01 2009 -0600
-
-    The destructor is part of the function name definition, not the type.
-    Fixes SF bug #2892606.
-
-commit ce39ae62f6b69aaa86e4a6365bddb50b09083cad
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Wed Nov 11 22:42:00 2009 -0600
-
-    Minor whitespace and comment changes
-
-    Signed-off-by: Ben Gardner <gardner.ben@gmail.com>
-
-commit e28fc35ab98e7efe5449bbae1f9ae5a92ec1808a
-Author: rdan <rdanioux@free.fr>
-Date:   Thu Nov 12 05:35:49 2009 +0800
-
-    Code updates to be able to run tests script in python under windoze with uncrustify compiled in debug mode with Visual C++ 2005
-
-    Signed-off-by: rdan <rdanioux@free.fr>
-
-commit b38dfb52efef5c703316bb9bcb33d64e1283b5ee
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Nov 7 13:36:36 2009 -0600
-
-    Clarify and rework sp_before_ellipsis.
-    It only applies when after a non-punctuator.
-    Fixes SF issue #2886991.
-
-commit ff4780d68465eb8b480a096c89310f85c5664f73
-Author: Ben Gardner <bgardner@wabtec.com>
-Date:   Fri Nov 6 09:27:04 2009 -0600
-
-    Add new option sp_endif_cmt
-
-commit 0fb8f11ec1302854e408db82b9fa6aaebfab19aa
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 6 07:49:24 2009 -0600
-
-    Update test to cover the bug where a close paren is added inside a preproc.
-
-commit 328aca7a107bdd9859079d431d71cabf2d52c037
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 6 07:48:25 2009 -0600
-
-    Fix SF issue #2892803.
-    The close paren was being added inside a preprocessor line.
-
-commit ad62ea13b11112f478c5b8f9c974ae8a98820768
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Fri Nov 6 07:47:29 2009 -0600
-
-    Update SlickEdit project due to recent file deletions
-
-commit fc97bf3fb1396f7f2928ff59c0e74aabcfc91db2
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Thu Nov 5 17:46:27 2009 -0600
-
-    Do a little whitspace cleanup in make_token_names.sh
-
-commit 30297231a5cffd865db53ec007295163bf2b15ca
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Thu Nov 5 17:44:52 2009 -0600
-
-    Add test for align_left_shift
-
-commit c8bba4c31bcc6e1956ee7519bcb037cbc07144ea
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Thu Nov 5 17:44:29 2009 -0600
-
-    Fix align_left_shift with array indexes.
-    Fixes #2887031
-
-commit 0eef7440ba20893e8b895bacda426dd756fa2fdc
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Thu Nov 5 17:42:01 2009 -0600
-
-    Remove unused files
-
-commit 011a65079177126b9e3c1d7c82e9c90594441e57
-Merge: 80db493 d8e30f3
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Tue Oct 27 19:12:38 2009 -0500
-
-    Merge branch 'objc'
-
-    Conflicts:
-    	src/align.cpp
-    	tests/run_tests.py
-
-commit 80db493b7f78d7ea9123c3a7a0b35a17597cc9c2
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Sun Oct 25 10:26:08 2009 -0500
-
-    Change exit value based on test results
-
-commit d8e30f3c3f11f867d52fe4c6b5e4fbeae5c05f7e
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Sun Oct 25 10:22:30 2009 -0500
-
-    Add back in token_names.h - needed for Windows build, which cannot recreated it.
-
-commit 6ac52866038bb3000b4e0e825aaddf8587770d71
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Sun Oct 25 10:20:37 2009 -0500
-
-    Run uncrustify on its own code
-
-commit 264967863eaab7cd77dad767ffd2faf2bbc07724
-Author: Ben Gardner <ben@ben-desktop.(none)>
-Date:   Sun Oct 25 10:10:16 2009 -0500
-
-    Run uncrustify on itself
-
-commit 5e696d6554fcec27f09ed244f1119cadcef52d89
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sun Oct 25 03:07:45 2009 +0800
-
-    Spelling fix. suprisingly -> surprisingly. Minor grammar tweaks.
-
-commit 809b47f672ee55915e203986a52633a26a762c30
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sun Oct 25 02:59:05 2009 +0800
-
-    Add OSX Xcode build & install instructions to README.
-
-commit d11d2dfbc83aa85ee9a6a06e7f86ac1f3a6f6221
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 16:43:07 2009 +0800
-
-    Remove some unneeded left-overs. Shorten the more info url.
-
-commit adab7441278cf2f54712894fd2b1c0dce008dcfa
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 14:27:15 2009 +0800
-
-    Replace those pesky tabs in some config files with spaces.
-
-commit 305e94a0ced1ea2deb1169aa9322802b89c73b8b
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 14:26:27 2009 +0800
-
-    Update existing block tests to better demonstrate that spacing options work as intended.
-
-commit bdf8181f1a2a2251e465e646ec516a3ee22c8c72
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 14:24:47 2009 +0800
-
-    Update existing test case which already was using blocks.
-
-commit dc82fcc501bbc75f00949d760c5a61da4a82acf3
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 14:24:11 2009 +0800
-
-    Add and register more test cases for block caret spacing.
-
-commit 08678af3a74ef7e55949ecf358ae2fde99f17bcd
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 14:22:00 2009 +0800
-
-    Update objc.cfg file.
-
-commit 5e39d01fe8b4e7c63133c3853047843b3b40341a
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 14:19:50 2009 +0800
-
-    Add new options for space before and after a block pointer caret.
-
-commit 511bc74d7cb4cf17d7dccfaa8c953f7b73b281ed
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 13:06:29 2009 +0800
-
-    Add test cases for blocks.
-
-commit 2d7013d9290a7e60e18ed786d63a72e6931dcb98
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 13:03:31 2009 +0800
-
-    Bug fix: Fix for detecting class category and extension parens.
-
-    Was confusing type with parent_type earlier.
-
-commit b92b77b739d9b652071dbf8067f0cb19f6f9eb96
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Sat Oct 24 12:49:32 2009 +0800
-
-    First (devel) version of changes for OC blocks support.
-
-    - Register new chunk types in token_enum.h
-    - Add early detection of block pointer caret to tokenize_cleanup.cpp
-    - Do the marking in combine.cpp
-
-commit cb9c866934ff2937e59eebab7dfeb937de73f792
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Thu Oct 22 00:24:41 2009 +0800
-
-    Bug fix: OC msg sends like [self class] are no longer marked as CT_CLASS.
-
-commit 1080cbdd00ee8b1535145d962265d16bb1bc85b2
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Thu Oct 22 00:08:38 2009 +0800
-
-    Improvement: Change oc_msg_colon_align from boolean to span with number.
-
-    Makes just much more sense that way. The align feature works great but
-    a bit too aggressively since it would just go and align method calls
-    happening at the very top of an enclosing method with method calls all
-    the way at the bottom of the enclosing method. I think a span of 1 will
-    fit what most Objective-C programmers use.
-
-    Uptaded a lot of the oc test cases to test for this behaviour.
-
-    Xcode project update: Add missing oc test cases.
-
-commit 0d8540ee1ab4f923e63474b31a355f467f47d1ae
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Wed Oct 21 19:33:19 2009 +0800
-
-    Update tests with real_world_file.m output. Make sure tests run cleanly.
-
-commit 257e93e999c2f8560160ebc4e42378665600bb6b
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Wed Oct 21 15:39:56 2009 +0800
-
-    Tests: Add a sample of real world objective-c code to the tests.
-
-    This sample also includes blocks which currently are not marked in uncrustify.
-    Will change that later.
-
-commit 8b97e6b3899da59c91e6ad4922da3d77cc63cbe7
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Wed Oct 21 15:36:19 2009 +0800
-
-    Bug fix: line_len can become 0 here which subsequently causes a segmentation fault.
-
-    This is a workaround because larger issues seem to be at stake as
-    I have seen line to contain garbage value at some point half into the
-    sentence.
-
-commit 7c44cc65fa378610d7f05230a3f128cd94504672
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Tue Oct 20 00:47:31 2009 +0800
-
-    Fix for (Type **) problems in msg decls/specs. Fix for missing parent type inside msg decl/spec type parens:
-    now correctly is OC_MSG_DECL/OC_MSG_SPEC.
-
-commit 80c7a10b4abca4e8fb583f49e9001fa1be002c8c
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Tue Oct 20 00:41:10 2009 +0800
-
-    Xcode project update: Rearranged some build scripts. Replaced some absolute group references with project relative ones.
-
-commit fe224a9c2ad6f11925539c0933f1cbcd63b74d33
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Tue Oct 20 00:32:08 2009 +0800
-
-    Make run_tests.py return 0 on all success or 1 on failure.
-    This plays better with shell script incorporating build systems.
-
-commit 441fa512bb0ef38217467ac4dd4b766345f485bb
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Tue Oct 20 00:24:17 2009 +0800
-
-    Add missing osx directory.
-
-commit 9884f5057576248f6014bb889b740f736ed25f6d
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Tue Oct 20 00:23:08 2009 +0800
-
-    obj.cfg again... dunno how that change got lost in the commit
-
-commit 4ac16b0c705a0a56c83be0fdcf47bbf4cbc9a30d
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Tue Oct 20 00:21:20 2009 +0800
-
-    Update objc.cfg. Add a few extra Xcode project specific entries to .gitignore.
-
-commit 344cf3524a5e6152668a168493339834a58ea946
-Author: André Berg <andre.bergmedia@googlemail.com>
-Date:   Tue Oct 20 00:29:46 2009 +0800
-
-    Add new Objective-C test for a more complex method. Details follow...
-
-    The complex_method.m test was showing a problem with method argument types in the form of (typeName **)
-    where the first star would get parsed as ARITH and the the second star would get parsed as DEREF.
-
-    I have a fix available, coming in one of the next commits.
-
-commit 67a83fb1248674908de7c8e14b82ac63a1032e9b
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 17 14:33:18 2009 -0500
-
-    Clean up the home page.
-     - add mention of Git
-     - add FreeBSD ports link
-
-commit 23632dae52e5a30a8ff595d9bd9d6c6d2eede07a
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 17 14:02:39 2009 -0500
-
-    Spelling fix: preceeded -> preceded
-
-commit fe25b6d06401b0a523e15a896831720c488bd5ce
-Author: Ben Gardner <gardner.ben@gmail.com>
-Date:   Sat Oct 17 13:13:55 2009 -0500
-
-    Import r1644 from subversion
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.sh
deleted file mode 100755
index e52a3594..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# ARGS: 1:remote
-#
-
-BRANCH=coverity_scan
-
-if [ -z "$1" ] ; then
-	cat <<EOF
-Usage: $0 REMOTE
-
-This script triggers a coverity build by pushing the current code to
-the '$BRANCH' branch.
-
-It copies the current (master) branch over the '$BRANCH' branch,
-then copies 'coverity.travis.yml' over '.travis.yml' and force-pushes
-the new branch.
-
-You obviously must have commit rights on the repository, so this is
-a maintainer-only script, unless you are pushing to your own fork.
-
-Example:
-  $0 origin
-EOF
-	exit 1
-fi
-REMOTE=$1
-
-set -e
-
-if [ -z "$NOTIFICATION_EMAIL" ] ; then
-	NOTIFICATION_EMAIL=$(git config user.email)
-	if [ -z "$NOTIFICATION_EMAIL" ] ; then
-		echo "No notification email address set."
-		exit 1
-	fi
-fi
-
-if [ $(git rev-parse --abbrev-ref HEAD) != 'master' ] ; then
-	cat <<EOF
-Please switch to the master branch before running this script.
-EOF
-	exit 1
-fi
-
-if git describe --dirty | grep -q dirty ; then
-	cat <<EOF
-Please clean up your dirty workspace before running this script.
-EOF
-	exit 1
-fi
-
-echo "NOTIFICATION_EMAIL: $NOTIFICATION_EMAIL"
-
-if git branch | grep $BRANCH ; then
-	echo "Deleting local coverity_scan branch..."
-	git branch -D $BRANCH
-fi
-
-git branch $BRANCH $REMOTE/master
-git checkout -f $BRANCH
-
-sed "s|{NOTIFICATION_EMAIL}|$NOTIFICATION_EMAIL|" coverity.travis.yml > .travis.yml
-
-git add .travis.yml
-git commit -m 'Copy coverity.travis.yml -> .travis.yml for coverity build.'
-git push -f $REMOTE $BRANCH
-git checkout master
-
-echo 'Finished.'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.travis.yml
deleted file mode 100644
index ef306e8c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: cpp
-sudo: required
-
-branches:
-  only:
-    - coverity_scan
-
-# Coverity stuff
-env:
-  global:
-    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-    #   via the "travis encrypt" command using the project repo's public key
-    - secure: "rHg6I3iGS/u7+sWDD0misaVVrmVy6sjTuTGp1NK5nxuoDBjZgJkXC61yIzhbbDywwt5lCTYhC1J08ljrfVl4OSblrQIy9ihSrOs2mA/SrPiKh5sB1B661Pd20GDK+hkLByrSyWR2UusgHxYly9KPykbo0wX7R0qdLJouv86Irx09SS+YggkQTiAxVD7dvxHagiZa609zau5sZvDDtmFs73nS+JAjRwj5iweSPO00ApHZSgIrhWMDCSoWXPEnOn8+Ruw02Eza0ArvceipuMtY5ju6kejQvgZ7l7y7nu4LwXUFxWE2z4C7lSTIjIk9cKGcEoSHAvTCAJor75AQY7NcMWq0MYNXj55e+CPzELBT5XCcR14CKirgOHaG7L9H7McvFdMTsmujkd61Qbxs9p2lro8nliFAvpG7yduuaF/XTCugzS8JwrPfq98mWgqhVO0ysowEsesOn0Bjo9XmjBUtjVJxg8hdq50XoVyWHnXLoEXgXLcRv4JFFfquvM5+nvd2pNxopTboO//KPsGIz1A1qCQ0g9ktaVM+be7wZzB6Lb3L2hnOdmTiNNirJXnNupwQF64ZUxmajyh3QF+SIcYEnoug+2X1bftC+qLKf2DkR4DwjCvWWVXAk0/Nn3ndfuKyGy8ZzUkHGw+BGjq5Z/SVC0l+AJ+y5UWtu8PNj+Bdtsw="
-
-before_install:
-  - mkdir $TRAVIS_BUILD_DIR/build
-  - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
-
-script: true
-
-addons:
-  coverity_scan:
-    project:
-      name: "uncrustify/uncrustify"
-      description: "Build submitted via Travis CI"
-    notification_email: {NOTIFICATION_EMAIL}
-    build_command_prepend: "(rm -rf $TRAVIS_BUILD_DIR/build ; mkdir $TRAVIS_BUILD_DIR/build ; cd $TRAVIS_BUILD_DIR/build ; cmake -DCMAKE_BUILD_TYPE=Release $TRAVIS_BUILD_DIR)"
-    build_command:   "make -C $TRAVIS_BUILD_DIR/build"
-    branch_pattern: coverity_scan
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/debian-tde.mk b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/versions.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog
deleted file mode 100644
index 44baffc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog
+++ /dev/null
@@ -1,328 +0,0 @@
-uncrustify-trinity (0.73.0-0debian11.0.0+2) unstable; urgency=medium
-
-  * Fix Python detection on CMake < 3.12.
-
- -- Slávek Banko <slavek.banko@axis.cz>  Wed, 20 May 2021 00:00:40 +0200
-
-uncrustify-trinity (0.73.0-0debian11.0.0+1) unstable; urgency=medium
-
-  * Backported commits cb1a42dd from upstream.
-
- -- Michele Calgaro <michele.calgaro@yahoo.it>  Wed, 19 May 2021 15:58:50 +0900
-
-uncrustify-trinity (0.73.0-0debian11.0.0+0) unstable; urgency=medium
-
-  * TDE version of upstream 0.73.0
-
- -- Michele Calgaro <michele.calgaro@yahoo.it>  Wed, 19 May 2021 15:58:50 +0900
-
-uncrustify-trinity (0.72.0-0debian11.0.0+8) unstable; urgency=medium
-
-  * Switch to build using ninja-build
-
- -- Slávek Banko <slavek.banko@axis.cz>  Tue, 18 May 2021 19:30:49 +0200
-
-uncrustify-trinity (0.72.0-0debian11.0.0+7) unstable; urgency=medium
-
-  * TDE version 0.72-0+7
-  * Backported commits 5f3f392a and fb66774e from upstream.
-
- -- Michele Calgaro <michele.calgaro@yahoo.it>  Thu, 05 Jan 2021 11:08:00 +0900
-
-uncrustify-trinity (0.72.0-0debian11.0.0+6) unstable; urgency=medium
-
-  * TDE version 0.72-0+6
-  * Backported commits 45681e88 and 64d93e3fb from upstream.
-
- -- Michele Calgaro <michele.calgaro@yahoo.it>  Thu, 24 Dec 2020 20:14:00 +0900
-
-uncrustify-trinity (0.72.0-0debian11.0.0+0) unstable; urgency=medium
-
-  * TDE version of upstream 0.72.0
-
- -- Michele Calgaro <michele.calgaro@yahoo.it>  Thu, 20 Dec 2020 17:52:23 +0900
-
-uncrustify (0.72.0) unstable; urgency=medium
-
-  * New upstream version 0.72.0
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Thu, 20 Dec 2020 17:34:01 +0900
-
-uncrustify (0.71.0+dfsg1-1) unstable; urgency=medium
-
-  * New upstream version 0.71.0
-  * d/control: Use debhelper-compat syntax, switch to level 12.
-  * d/control: Use python3 in B-D (Closes: #943295).
-  * d/control: Bump Standards-Version, no more changes needed.
-  * d/control: Remove unnnecessary --parallel.
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Thu, 27 Aug 2020 17:12:57 +0300
-
-uncrustify (0.69.0+dfsg1-1) unstable; urgency=medium
-
-  * New upstream version 0.69.0
-  * Remove fix_parallel_test.patch: Fixed upstream.
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Tue, 02 Jul 2019 19:00:32 +0300
-
-uncrustify (0.68.1+dfsg1-2) unstable; urgency=medium
-
-  * Add d/patches/fix_parallel_test.patch: Fix test failure on parallel run.
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Mon, 10 Dec 2018 02:36:22 +0300
-
-uncrustify (0.68.1+dfsg1-1) unstable; urgency=medium
-
-  * New upstream version 0.68.1
-  * d/control: Add python-all to Build-Depensds.
-  * d/rules: Run all tests (now disabled by default by upstream).
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Sun, 02 Dec 2018 16:19:42 +0300
-
-uncrustify (0.67+dfsg1-1) unstable; urgency=medium
-
-  * New upstream version 0.67
-  * debian/control: Move git to salsa.
-  * Add docs-remove-remote-images.patch: Remove remote images from docs.
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Mon, 18 Jun 2018 01:13:56 +0300
-
-uncrustify (0.66.1+dfsg1-1) unstable; urgency=medium
-
-  * Add debian/gbp.conf.
-  * New upstream version 0.66.1 Fixed FTBFS on some arches (Closes: #881249)
-  * Bump Standards-Version to 4.1.2 (no additional changes needed).
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Sun, 17 Dec 2017 18:49:06 +0300
-
-uncrustify (0.66+dfsg1-1) unstable; urgency=medium
-
-  * debian/control: Remove Fathi Boudra <fabo@debian.org> from uploaders.
-    (Closes: #879444.) Thanks for your job.
-  * New upstream version 0.66
-  * Bump Standards-Version to 4.1.1 (no additional changes needed).
-  * debian/control: Add more languages to short description.
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Wed, 08 Nov 2017 18:18:47 +0300
-
-uncrustify (0.65+git20170831+dfsg1-1) unstable; urgency=medium
-
-  * New upstream version 0.65+git20170831. Fixes various FTBFS and autotests
-    failures on exotic archs. (Closes: #867376)
-  * Bump Standards-Version to 4.1.0 (no additional changes needed).
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Thu, 31 Aug 2017 20:25:06 +0300
-
-uncrustify (0.65+dfsg1-1) unstable; urgency=medium
-
-  * New upstream version 0.65
-  * debian/control: Add python-minimal to Build-Depends.
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Tue, 04 Jul 2017 14:50:47 +0300
-
-uncrustify (0.64+dfsg1-1) unstable; urgency=medium
-
-  * Imported Upstream version 0.64
-    (Closes:  #748787, #814193, #594210, #775517, #594206, #616708)
-  * Remove non-free documentation/htdocs/project-support.jpg.
-  * Imported debian dir from previous version.
-  * Remove "debian/<q" file.
-  * Remove fix-ftbfs-with-gcc-4.7.patch (Fixed upstream).
-  * debian/control: Switch dependence from autotools to cmake.
-  * debian/control, debian/compat: Set compatibility level to 9.
-  * debian/rules: Remove legacy PRONY records.
-  * debian/control: Change Homepage to github.
-  * debian/watch: Update to github using current naming scheme.
-  * debian/copyright: Add myself.
-  * Install README.md and documentation dir into package's docs.
-  * debian/rules: Remove tests results on clean.
-  * debian/control: Set myself as maintainer. (Johann Rudloff is out of
-    business, thanks a lot for all; Fathi Boudra acked this.)
-  * Bump Standards-Version to 3.9.8 (no additional changes needed).
-  * Add debian/TODO file.
-  * debian/cotrol: Add link to collab-maint's git.
-
- -- Alexander GQ Gerasiov <gq@debian.org>  Sat, 03 Dec 2016 20:19:22 +0300
-
-uncrustify (0.59+dfsg1-1.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Remove non-free file (project-support.jpg). Closes: #753760
-
- -- Mathieu Malaterre <malat@debian.org>  Fri, 16 Jan 2015 16:52:15 +0100
-
-uncrustify (0.59-2) unstable; urgency=low
-
-  * Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> include.
-    (Closes: #667404)
-
- -- Fathi Boudra <fabo@debian.org>  Mon, 21 May 2012 15:40:46 +0300
-
-uncrustify (0.59-1) unstable; urgency=low
-
-  * New upstream release.
-  * Add myself to Uploaders.
-
- -- Fathi Boudra <fabo@debian.org>  Sat, 31 Dec 2011 12:49:32 +0200
-
-uncrustify (0.57-1) unstable; urgency=low
-
-  * New upstream release.
-
-  [ Fathi Boudra ]
-  * Removed patch to check for NULL - stolen upstream.
-  * Bumped Standards-Version to 3.9.1 (no changes needed).
-
- -- Johann Rudloff <cypheon@gmx.net>  Mon, 21 Feb 2011 11:54:28 +0200
-
-uncrustify (0.56-2) unstable; urgency=low
-
-  [ Fathi Boudra ]
-  * Added patch to check for NULL to prevent a segmentation fault.
-    (Closes: #580195)
-  * Bumped Standards-Version to 3.9.0 (no changes needed).
-
- -- Johann Rudloff <cypheon@gmx.net>  Thu, 01 Jul 2010 20:34:01 +0300
-
-uncrustify (0.56-1) unstable; urgency=low
-
-  * New upstream release.
-
-  [ Fathi Boudra ]
-  * Switch to dpkg-source 3.0 (quilt) format.
-  * debian/control:
-    - bumped debhelper version to 7.4.15
-    - fixed typo in long description.
-  * debian/copyright:
-    - added email author.
-    - added myself.
-
- -- Johann Rudloff <cypheon@gmx.net>  Tue, 20 Apr 2010 13:08:29 +0300
-
-uncrustify (0.55-1) unstable; urgency=low
-
-  * New upstream release (Closes: #540817)
-
-  [ Fathi Boudra ]
-  * debian/patches/manpage_fix_hyphens.diff: removed - merged upstream
-  * debian/compat: bumped to 7
-  * debian/control:
-    - bumped debhelper version to 7.4.13
-    - bumped Standards-Version to 3.8.4 (no changes needed)
-    - added ${misc:Depends}
-  * debian/docs: updated
-  * debian/rules: rewrited from scratch to use dh and enabled parallel build
-
- -- Johann Rudloff <cypheon@gmx.net>  Wed, 17 Feb 2010 09:18:41 +0100
-
-uncrustify (0.52-1) unstable; urgency=low
-
-  * New upstream release (closes: #526100)
-  * debian/copyright: changed years and wording of copyright
-  * debian/patches/manpage_fix_hyphens.diff: added patch to fix fixed hyphens
-    used as minus signs in manpage
-  * debian/rules: included usage of quilt
-  * debian/control: added build dependency quilt
-    bumped Standards-Version to 3.8.1 (no changes required)
-
- -- Johann Rudloff <cypheon@gmx.net>  Thu, 30 Apr 2009 11:32:27 +0200
-
-uncrustify (0.48-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/rules: removed CFLAGS settings (done by dpkg-buildpackage)
-
- -- Johann Rudloff <cypheon@gmx.net>  Tue, 22 Jul 2008 11:19:54 +0200
-
-uncrustify (0.47-1) unstable; urgency=low
-
-  * New upstream release (closes: #479372)
-  * Bumped Standards-Version to 3.8.0 (no changes required)
-  * removed debian/uncrustify.1, since upstream sources now include a
-    manpage
-  * debian/rules: removed call to dh_installman, manpage is installed by
-    make install
-  * debian/rules: removed unneeded call to dh_installdirs
-
- -- Johann Rudloff <cypheon@gmx.net>  Sun, 08 Jun 2008 10:09:53 +0200
-
-uncrustify (0.44-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/uncrustify.1: updated version number and date
-
- -- Johann Rudloff <cypheon@gmx.net>  Sun, 24 Feb 2008 09:13:49 +0100
-
-uncrustify (0.43-1) unstable; urgency=low
-
-  * New upstream release (closes: #461631)
-  * Bumped Standards-Version to 3.7.3 (no changes required)
-  * debian/copyright: updated years of copyright
-  * debian/control: moved homepage address from description to a separate field
-  * debian/uncrustify.1: updated year and month
-  * debian/rules: copy update config.{sub,guess} into source tree in
-    config.status target, remove them in clean target
-
- -- Johann Rudloff <cypheon@gmx.net>  Thu, 10 Jan 2008 15:37:19 +0100
-
-uncrustify (0.41-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Johann Rudloff <cypheon@gmx.net>  Mon, 12 Nov 2007 21:22:25 +0100
-
-uncrustify (0.40-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Johann Rudloff <cypheon@gmx.net>  Tue, 16 Oct 2007 21:26:13 +0200
-
-uncrustify (0.39-1) unstable; urgency=low
-
-  * New Upstream Version
-
- -- Johann Rudloff <cypheon@gmx.net>  Wed, 26 Sep 2007 23:50:30 +0200
-
-uncrustify (0.38-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Johann Rudloff <cypheon@gmx.net>  Thu, 06 Sep 2007 22:52:16 +0200
-
-uncrustify (0.37-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/uncrustify.1: added new command line options
-  * debian/uncrustify.1: changes in formatting and description
-
- -- Johann Rudloff <cypheon@gmx.net>  Sun, 19 Aug 2007 19:33:08 +0200
-
-uncrustify (0.36-1) unstable; urgency=low
-
-  * New upstream release (closes: #434938, #434939)
-
- -- Johann Rudloff <cypheon@gmx.net>  Tue, 07 Aug 2007 13:49:41 +0200
-
-uncrustify (0.35-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Johann Rudloff <cypheon@gmx.net>  Sat, 21 Jul 2007 20:41:52 +0200
-
-uncrustify (0.33-1) unstable; urgency=low
-
-  * New upstream release (closes: #416469)
-  * Added debian/watch file
-  * debian/uncrustify.1: added new command line options
-  * debian/uncrustify.1: removed leading colons
-  * debian/copyright: updated years of copyright
-  * debian/copyright: updated parts concerning cmpcfg.pl, since it
-    now contains a proper license statement
-
- -- Johann Rudloff <cypheon@gmx.net>  Fri, 30 Mar 2007 20:51:27 +0200
-
-uncrustify (0.30-1) unstable; urgency=low
-
-  * Initial release
-
- -- Johann Rudloff <cypheon@gmx.net>  Sat, 25 Nov 2006 14:06:44 +0100
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/compat b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/compat
deleted file mode 100644
index ec635144..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/control b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/control
deleted file mode 100644
index 97a69cb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: uncrustify-trinity
-Section: deps-r14/devel
-Priority: optional
-Maintainer: Alexander GQ Gerasiov <gq@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.0~), ninja-build, python3 (>= 3.3~), gcc (>= 4:4.9~)
-Standards-Version: 4.5.0
-Homepage: https://github.com/uncrustify/uncrustify
-
-Package: uncrustify-trinity
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: C, C++, ObjectiveC, C#, D, Java, Pawn and VALA source code beautifier
- Uncrustify is a highly configurable source code formatter. It aligns
- preprocessor define's, assignments, arithmetics and is able to fix spacing
- between operators.
- .
- This is a TDE packaged version of upstream uncrustify, used to have a consistent
- version for code formatting across multiple platforms.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/copyright b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/copyright
deleted file mode 100644
index 7c74f673..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/copyright
+++ /dev/null
@@ -1,107 +0,0 @@
-This work was packaged for Debian by:
-
-    Johann Rudloff <cypheon@gmx.net> on Sat, 25 Nov 2006 14:06:44 +0100.
-
-It was downloaded from:
-
-    http://uncrustify.sourceforge.net
-
-Upstream Author:
-
-    Ben Gardner <gardner.ben@gmail.com>
-
-Copyright:
-
-    2005-2010 Ben Gardner <gardner.ben@gmail.com>
-    1995-1999 Simon G. Vogl <simon@tk.uni-linz.ac.at>
-    2006 David Thompson <da.thompson@yahoo.com>
-    1999-2006 Digital Mars <http://digitalmars.com/>
-
-License (except src/md5.cpp, documentation/htdocs/examples/c-1.out.c,
-         documentation/htdocs/examples/c-1.in.c, scripts/cmpcfg.pl as
-         well as tests/input/d/Lexer.d, tests/input/d/HashMap.d,
-         tests/input/c/i2c-core.c, and the corresponding files in
-         tests/output, i. e.: tests/output/c/20100-i2c-core.c,
-         tests/output/c/20000-i2c-core.c, tests/output/d/40006-Lexer.d,
-         tests/output/d/40007-Lexer.d and tests/output/d/40000-HashMap.d):
-
-        Copyright (C) 2005-2008 by Ben Gardner
-
-        You are free to distribute this software under the terms of
-        the GNU General Public License, either version 2 of the License,
-        or (at your option) any later version.
-
-License (tests/input/c/i2c-core.c, documentation/htdocs/examples/c-1.out.c,
-         tests/output/c/20100-i2c-core.c, tests/output/c/20000-i2c-core.c,
-         and documentation/htdocs/examples/c-1.in.c):
-
-        Copyright (C) 1995-1999 by Simon G. Vogl <simon@tk.uni-linz.ac.at>
-
-        You are free to distribute this software under the terms of
-        the GNU General Public License, either version 2 of the License,
-        or (at your option) any later version.
-
-License (scripts/cmpcfg.pl):
-
-        Copyright (C) 2006 by David Thompson
-
-        You are free to distribute this software under the terms of
-        the GNU General Public License.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in the file /usr/share/common-licenses/GPL.
-
-License (src/md5.cpp):
-
-        This code was written by Colin Plumb in 1993, no copyright is claimed.
-        This code is in the public domain; do with it what you wish.
-
-License (tests/input/d/Lexer.d, tests/output/d/40006-Lexer.d
-         and tests/output/d/40007-Lexer.d):
-
-	Copyright (c) 1999-2006 by Digital Mars
-	All Rights Reserved
-	written by Walter Bright www.digitalmars.com
-
-	License for redistribution is either the Artistic License or
-        the GNU General Public License.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in the file /usr/share/common-licenses/GPL.
-The complete text of the Artistic License is available in the
-file /usr/share/common-licenses/Artistic.
-
-License (tests/input/d/HashMap.d and tests/output/d/40000-HashMap.d):
-
-        Copyright (C) 2004 by Doug Lea
-
-        This software is provided 'as-is', without any express or implied
-        warranty. In no event will the authors be held liable for damages
-        of any kind arising from the use of this software.
-
-        Permission is hereby granted to anyone to use this software for any
-        purpose, including commercial applications, and to alter it and/or
-        redistribute it freely, subject to the following restrictions:
-
-        1. The origin of this software must not be misrepresented; you must
-           not claim that you wrote the original software. If you use this
-           software in a product, an acknowledgment within documentation of
-           said product would be appreciated but is not required.
-
-        2. Altered source versions must be plainly marked as such, and must
-           not be misrepresented as being the original software.
-
-        3. This notice may not be removed or altered from any distribution
-           of the source.
-
-        4. Derivative works are permitted, but they must carry this notice
-           in full and credit the original source.
-
-The Debian packaging is
-
-    Copyright (C) 2006-2009 Johann Rudloff <cypheon@gmx.net>
-    Copyright (C) 2009-2012 Fathi Boudra <fabo@debian.org>
-    Copyright (C) 2016 Alexander GQ Gerasiov <gq@debian.org>
-
-and is licensed under the GPL version 2 or any later version,
-see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/docs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/docs
deleted file mode 100644
index d217a928..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.md
-documentation/*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/001_docs-remove-remote-images.patch b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/001_docs-remove-remote-images.patch
deleted file mode 100644
index 9c7d3e3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/001_docs-remove-remote-images.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Remove remote images from docs.
- This images does not held any information, but breaks user's privacy.
-Author: Alexander Gerasiov <gq@debian.org>
-Last-Update: 2018-06-17
-
---- uncrustify-0.67+dfsg1.orig/documentation/htdocs/index.html
-+++ uncrustify-0.67+dfsg1/documentation/htdocs/index.html
-@@ -16,25 +16,6 @@
- <div class="node2" align="left">
- <h1>Uncrustify</h1>
- <h2>Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA</h2>
--<table>
-- <tr>
--  <td valign="top">
--   <script type='text/javascript' language='JavaScript' src='http://www.ohloh.net/projects/4765/badge_js'></script>
--  </td>
--  <td valign="top">
--   <a href="https://travis-ci.org/uncrustify/uncrustify/builds">
--    <img alt="Travis CI Build Status"
--         src="https://travis-ci.org/uncrustify/uncrustify.svg?branch=master"/>
--   </a>
--  </td>
--  <td valign="top">
--   <a href="https://scan.coverity.com/projects/uncrustify">
--    <img alt="Coverity Scan Build Status"
--         src="https://scan.coverity.com/projects/8264/badge.svg"/>
--   </a>
--  </td>
-- </tr>
--</table>
- 
- <h2>Introduction</h2>
- <p>The goals of this project are simple:
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/002_trinity_customization.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/002_trinity_customization.diff
deleted file mode 100644
index f9de3615..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/002_trinity_customization.diff
+++ /dev/null
@@ -1,230 +0,0 @@
-Customize and repackage as a TDE package.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 3.2)
- 
--project(uncrustify)
-+project(uncrustify-trinity)
- 
- if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
-   message(FATAL_ERROR "
-@@ -232,7 +232,7 @@
- #
- # Uncrustify
- #
--set(uncrustify_sources
-+set(uncrustify-trinity_sources
-   src/align_add.cpp
-   src/align_asm_colon.cpp
-   src/align_assign.cpp
-@@ -315,7 +315,7 @@
-   ${PROJECT_BINARY_DIR}/src/option_enum.cpp
- )
- 
--set(uncrustify_headers
-+set(uncrustify-trinity_headers
-   src/add_space_table.h
-   src/align_add.h
-   src/align_asm_colon.h
-@@ -408,7 +408,7 @@
-   ${PROJECT_BINARY_DIR}/uncrustify_version.h
- )
- 
--set(uncrustify_docs
-+set(uncrustify-trinity_docs
-   "${PROJECT_SOURCE_DIR}/AUTHORS"
-   "${PROJECT_SOURCE_DIR}/BUGS"
-   "${PROJECT_SOURCE_DIR}/ChangeLog"
-@@ -417,31 +417,31 @@
-   "${PROJECT_SOURCE_DIR}/README.md"
- )
- 
--add_executable(uncrustify ${uncrustify_sources} ${uncrustify_headers})
--add_dependencies(uncrustify generate_version_header)
-+add_executable(uncrustify-trinity ${uncrustify-trinity_sources} ${uncrustify-trinity_headers})
-+add_dependencies(uncrustify-trinity generate_version_header)
- 
- if(CMAKE_VERSION VERSION_LESS 2.8.10)
-   if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-     # Multi-configuration or build type set
--    set_property(TARGET uncrustify APPEND PROPERTY
-+    set_property(TARGET uncrustify-trinity APPEND PROPERTY
-       COMPILE_DEFINITIONS_DEBUG DEBUG
-     )
-   else()
-     # Single-configuration with no build type set
--    set_property(TARGET uncrustify APPEND PROPERTY
-+    set_property(TARGET uncrustify-trinity APPEND PROPERTY
-       COMPILE_DEFINITIONS DEBUG
-     )
-   endif()
- else()
--  set_property(TARGET uncrustify APPEND PROPERTY
-+  set_property(TARGET uncrustify-trinity APPEND PROPERTY
-     COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
-   )
- endif()
- 
- #
--# Generate uncrustify.1
-+# Generate uncrustify-trinity.1
- #
--configure_file(man/uncrustify.1.in uncrustify.1 @ONLY)
-+configure_file(man/uncrustify.1.in uncrustify-trinity.1 @ONLY)
- 
- #
- # Generate uncrustify.xml (katepart highlighting file)
-@@ -463,7 +463,7 @@
- #
- OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
- if(ENABLE_CODECOVERAGE)
--    set(CODECOVERAGE_DEPENDS uncrustify)
-+    set(CODECOVERAGE_DEPENDS uncrustify-trinity)
-     include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
- endif(ENABLE_CODECOVERAGE)
- 
-@@ -471,10 +471,10 @@
- # Build command to run uncrustify on its own sources
- #
- add_custom_target(format-sources)
--foreach(source IN LISTS uncrustify_sources uncrustify_headers)
-+foreach(source IN LISTS uncrustify-trinity_sources uncrustify-trinity_headers)
-   get_filename_component(source_name  ${source} NAME)
-   add_custom_target(format-${source_name}
--    COMMAND uncrustify
-+    COMMAND uncrustify-trinity
-       -c forUncrustifySources.cfg
-       -lCPP --no-backup ${source}
-     COMMENT "Formatting ${source}"
-@@ -486,7 +486,7 @@
- #
- # Package
- #
--set(CPACK_PACKAGE_NAME "uncrustify")
-+set(CPACK_PACKAGE_NAME "uncrustify-trinity")
- set(CPACK_PACKAGE_VERSION "${UNCRUSTIFY_VERSION}")
- set(CPACK_PACKAGE_VENDOR "Ben Gardner")
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code beautifier")
-@@ -504,8 +504,8 @@
- # Install
- #
- if(MSVC)
--  install(TARGETS uncrustify DESTINATION ".")
--  install(FILES ${uncrustify_docs}
-+  install(TARGETS uncrustify-trinity DESTINATION ".")
-+  install(FILES ${uncrustify-trinity_docs}
-     DESTINATION "."
-   )
-   install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
-@@ -517,17 +517,17 @@
-   )
- else()
-   include(GNUInstallDirs)
--  install(TARGETS uncrustify
-+  install(TARGETS uncrustify-trinity
-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-   )
--  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify.1"
-+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify-trinity.1"
-     DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-   )
-   install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/"
-     DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples"
-     FILES_MATCHING PATTERN "*.cfg"
-   )
--  install(FILES ${uncrustify_docs}
-+  install(FILES ${uncrustify-trinity_docs}
-     DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-   )
- endif()
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -32,7 +32,7 @@
-   add_custom_command(
-     OUTPUT ${tests_ctest_file}
-     COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py
--      --executable $<TARGET_FILE:uncrustify>
-+      --executable $<TARGET_FILE:uncrustify-trinity>
-       --git ${GIT_EXECUTABLE}
-       --python ${PYTHON_EXECUTABLE}
-       --write-ctest ${tests_ctest_file}
-@@ -48,7 +48,7 @@
-     string(REPLACE ".test" "" lang "${suite}")
-     add_test(NAME ${lang}
-       COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py ${lang}
--        --executable $<TARGET_FILE:uncrustify>
-+        --executable $<TARGET_FILE:uncrustify-trinity>
-         -d --git ${GIT_EXECUTABLE}
-         --result-dir ${CMAKE_CURRENT_BINARY_DIR}
-       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -60,7 +60,7 @@
-   add_test(
-     NAME sources_format
-     COMMAND ${PYTHON_EXECUTABLE} run_sources_tests.py
--      --executable $<TARGET_FILE:uncrustify>
-+      --executable $<TARGET_FILE:uncrustify-trinity>
-       -d --git ${GIT_EXECUTABLE}
-       --result-dir ${CMAKE_CURRENT_BINARY_DIR}
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -72,7 +72,7 @@
-   COMMAND ${PYTHON_EXECUTABLE}
-     test_cli_options.py
-     --config $<CONFIG>
--    --build ${uncrustify_BINARY_DIR}
-+    --build ${uncrustify-trinity_BINARY_DIR}
-     --diff
-   ${_configs}
-   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli
-@@ -82,10 +82,10 @@
-   COMMAND ${PYTHON_EXECUTABLE}
-     test_cli_options.py
-     --config $<CONFIG>
--    --build ${uncrustify_BINARY_DIR}
-+    --build ${uncrustify-trinity_BINARY_DIR}
-     --apply
--  DEPENDS uncrustify
-+  DEPENDS uncrustify-trinity
-   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli
- )
- 
--add_test(NAME sanity COMMAND uncrustify --help)
-+add_test(NAME sanity COMMAND uncrustify-trinity --help)
---- a/tests/cli/output/help.txt
-+++ b/tests/cli/output/help.txt
-@@ -1,5 +1,5 @@
- Usage:
--uncrustify [options] [files ...]
-+uncrustify-trinity [options] [files ...]
- 
- If no input files are specified, the input is read from stdin
- If reading from stdin, you should specify the language using -l
---- a/tests/cli/test_cli_options.py
-+++ b/tests/cli/test_cli_options.py
-@@ -486,16 +486,16 @@
-     bin_found = False
-     uncr_bin = ''
-     bd_dir = parsed_args.build
--    bin_paths = [s_path_join(bd_dir, 'uncrustify'),
--                 s_path_join(bd_dir, 'uncrustify.exe'),
--                 s_path_join(bd_dir, 'Debug/uncrustify'),
--                 s_path_join(bd_dir, 'Debug/uncrustify.exe'),
--                 s_path_join(bd_dir, 'Release/uncrustify'),
--                 s_path_join(bd_dir, 'Release/uncrustify.exe'),
--                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify'),
--                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify.exe'),
--                 s_path_join(bd_dir, 'MinSizeRel/uncrustify'),
--                 s_path_join(bd_dir, 'MinSizeRel/uncrustify.exe')]
-+    bin_paths = [s_path_join(bd_dir, 'uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'Debug/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'Debug/uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'Release/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'Release/uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity.exe'),
-+                 s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity'),
-+                 s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity.exe')]
-     for uncr_bin in bin_paths:
-         if not isfile(uncr_bin):
-             eprint("is not a file: %s" % uncr_bin)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/003_allow_older_distributions.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/003_allow_older_distributions.diff
deleted file mode 100644
index 0dc9c476..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/003_allow_older_distributions.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: b/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.2)
-+cmake_minimum_required(VERSION 3.0)
- 
- project(uncrustify-trinity)
- 
-@@ -52,8 +52,12 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
- endif()
- 
--set(CMAKE_CXX_STANDARD 11)
--set(CMAKE_CXX_STANDARD_REQUIRED YES)
-+if( ${CMAKE_VERSION} VERSION_LESS "3.1" )
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-+else()
-+  set(CMAKE_CXX_STANDARD 11)
-+  set(CMAKE_CXX_STANDARD_REQUIRED YES)
-+endif()
- 
- if(ENABLE_SANITIZER)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fno-omit-frame-pointer -fsanitize=${ENABLE_SANITIZER}")
-@@ -140,8 +144,13 @@
- else()
-   # Add target to generate version header;
-   # do this every build to ensure git SHA is up to date
-+  if( ${CMAKE_VERSION} VERSION_LESS "3.2" )
-+    set( VERSION_HEADER_BYPRODUCTS "" )
-+  else()
-+    set( VERSION_HEADER_BYPRODUCTS "BYPRODUCTS" "${PROJECT_BINARY_DIR}/uncrustify_version.h" )
-+  endif()
-   add_custom_target(generate_version_header
--    BYPRODUCTS "${PROJECT_BINARY_DIR}/uncrustify_version.h"
-+    ${VERSION_HEADER_BYPRODUCTS}
-     COMMAND
-       ${CMAKE_COMMAND}
-       -D PYTHON_EXECUTABLE:STRING=${PYTHON_EXECUTABLE}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/004_fixed_usage.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/004_fixed_usage.diff
deleted file mode 100644
index d9f7cd5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/004_fixed_usage.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Fixed usage message to match uncrustify-trinity.
---- a/src/uncrustify.cpp
-+++ b/src/uncrustify.cpp
-@@ -295,14 +295,14 @@
-            "                         Cannot be used with the -o option'\n"
-            "\n"
-            "Usage Examples\n"
--           "cat foo.d | uncrustify -q -c my.cfg -l d\n"
--           "uncrustify -c my.cfg -f foo.d\n"
--           "uncrustify -c my.cfg -f foo.d -L0-2,20-23,51\n"
--           "uncrustify -c my.cfg -f foo.d -o foo.d\n"
--           "uncrustify -c my.cfg foo.d\n"
--           "uncrustify -c my.cfg --replace foo.d\n"
--           "uncrustify -c my.cfg --no-backup foo.d\n"
--           "uncrustify -c my.cfg --prefix=out -F files.txt\n"
-+           "cat foo.d | uncrustify-trinity -q -c my.cfg -l d\n"
-+           "uncrustify-trinity -c my.cfg -f foo.d\n"
-+           "uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51\n"
-+           "uncrustify-trinity -c my.cfg -f foo.d -o foo.d\n"
-+           "uncrustify-trinity -c my.cfg foo.d\n"
-+           "uncrustify-trinity -c my.cfg --replace foo.d\n"
-+           "uncrustify-trinity -c my.cfg --no-backup foo.d\n"
-+           "uncrustify-trinity -c my.cfg --prefix=out -F files.txt\n"
-            "\n"
-            "Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable\n"
-            "      processing of parts of the source file (these can be overridden with\n"
---- a/tests/cli/output/help.txt
-+++ b/tests/cli/output/help.txt
-@@ -60,14 +60,14 @@
-                          Cannot be used with the -o option'
- 
- Usage Examples
--cat foo.d | uncrustify -q -c my.cfg -l d
--uncrustify -c my.cfg -f foo.d
--uncrustify -c my.cfg -f foo.d -L0-2,20-23,51
--uncrustify -c my.cfg -f foo.d -o foo.d
--uncrustify -c my.cfg foo.d
--uncrustify -c my.cfg --replace foo.d
--uncrustify -c my.cfg --no-backup foo.d
--uncrustify -c my.cfg --prefix=out -F files.txt
-+cat foo.d | uncrustify-trinity -q -c my.cfg -l d
-+uncrustify-trinity -c my.cfg -f foo.d
-+uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51
-+uncrustify-trinity -c my.cfg -f foo.d -o foo.d
-+uncrustify-trinity -c my.cfg foo.d
-+uncrustify-trinity -c my.cfg --replace foo.d
-+uncrustify-trinity -c my.cfg --no-backup foo.d
-+uncrustify-trinity -c my.cfg --prefix=out -F files.txt
- 
- Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable
-       processing of parts of the source file (these can be overridden with
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/005_upstream_cb1a42dd.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/005_upstream_cb1a42dd.diff
deleted file mode 100644
index 860d75be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/005_upstream_cb1a42dd.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Backported commit cb1a42dd from upstream git repository. This fixes FTBFS when building with RelWithDebInfo.
---- a/tests/cli/test_cli_options.py
-+++ b/tests/cli/test_cli_options.py
-@@ -705,8 +705,8 @@
-     #
-     # Test --tracking_space FILE
-     #
--    if parsed_args.config == 'Release':
--        eprint("Release")
-+    if parsed_args.config == 'Release' or parsed_args.config == 'RelWithDebInfo':
-+        eprint(parsed_args.config)
-         if not check_uncrustify_output(
-                 uncr_bin,
-                 parsed_args,
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/006_fix_python_detection_on_older_cmake.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/006_fix_python_detection_on_older_cmake.diff
deleted file mode 100644
index 3b11610d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/006_fix_python_detection_on_older_cmake.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix Python detection on CMake < 3.12.
-===================================================================
---- uncrustify-trinity-0.73.0.orig/CMakeLists.txt
-+++ uncrustify-trinity-0.73.0/CMakeLists.txt
-@@ -17,8 +17,15 @@ include(CheckCXXSymbolExists)
- include(CheckTypeSize)
- include(CTest)
- 
--find_package(Python3 REQUIRED)
--set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
-+if( ${CMAKE_VERSION} VERSION_LESS "3.12" )
-+    find_package( PythonInterp )
-+    if( NOT PYTHON_EXECUTABLE )
-+        message( FATAL_ERROR "Python is required, but was not found on your system" )
-+    endif()
-+ else( )
-+    find_package(Python3 REQUIRED)
-+    set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
-+endif()
- 
- #
- # Check compiler flags
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series
deleted file mode 100644
index cd199706..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-001_docs-remove-remote-images.patch
-002_trinity_customization.diff
-003_allow_older_distributions.diff
-004_fixed_usage.diff
-005_upstream_cb1a42dd.diff
-006_fix_python_detection_on_older_cmake.diff
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules
deleted file mode 100755
index 96f84e87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_CMAKE_EXTRA_FLAGS := \
- -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DBUILD_TESTING="ON" \
- -DUNCRUSTIFY_SEPARATE_TESTS="ON"
-
-DEB_MAKE_CHECK_TARGET = test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/format b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/options b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/options
deleted file mode 100644
index d71748bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Track.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Track.jpg
deleted file mode 100644
index b18b0477..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Track.jpg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Tracking.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Tracking.txt
deleted file mode 100644
index a1fb7850..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Tracking.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-2020-11-09
-
-Tracking is used to put some marks within a copy of the source and
-in the log file. uncrustify generate a HTML file with the marks.
-
-Using a browser, one can see where, which options are working.
-
-The command option is:
-
-uncrustify --tracking Track.html -c config-FILE -f source-FILE -L A 2>A.txt
-
-Tracking puts a red "M" in the source to show where the options are working.
-A tracking number is used and writen in the Track.html file and the output file A.txt
-to make possible to link the changes together.
-
-An example:
-
-tracking.cpp
-{
-   a =     b +              111-55;
-}
-
-The config file:
-
-indent_with_tabs = 0
-sp_arith  = force
-sp_assign = force
-
-The tracking file is:
-
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<p>
-</p>
-<pre>
-{
-        a<a title="1,8,sp_assign"><font color="red">M</font></a>=<a title="2,9,16,sp_assign"><font color="red">M</font><
-/a>b<a title="3,10,17,22,sp_arith"><font color="red">M</font></a>+<a title="4,11,18,23,27,sp_arith"><font color="red">M<
-/font></a>111<a title="5,12,19,24,28,31,sp_arith"><font color="red">M</font></a>-<a title="6,13,20,25,29,32,34,sp_arith"
-><font color="red">M</font></a>55<a title="7,14,21,26,30,33,35,36,sp_before_semi"><font color="red">M</font></a>;
-}
-</pre>
-</body>
-</html>
-
-Use it with a browser and you can see the red "M"s.
-Let put the cursor on the "M"s, and you see the tracking number and the option used.
-(look at the picture track.jpg)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/align-thresholds.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/align-thresholds.txt
deleted file mode 100644
index 4c41f7db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/align-thresholds.txt
+++ /dev/null
@@ -1,239 +0,0 @@
--------------------------------------------------------------------------------
-Alignment thresholds:
-
-Alignment threshold are used to prevent aligning of certain text.
-
-Consider this example when aligning assignments:
-
-   a = 2;
-   gld.settings[somevariable] = 5;
-
-Without thresholds, this would result in:
-
-   a                          = 2;
-   gld.settings[somevariable] = 5;
-
-However, this is likely not desired.
-
-So to handle this, we set a limit on the number of columns that a alignment
-may move a token.  If we set the threshold to, say, 3 characters, then
-the two would not be aligned together because 'a = 2' would have to be moved
-by 25 columns.
-
-Here's a more complicated case:
-
-   a = 1;
-   bb = 2;
-   ccc = 3;
-   dddd = 4;
-   eeeee = 5;
-   ffffff = 6;
-
-In this case, we may want this output:
-
-   a      = 1;
-   bb     = 2;
-   ccc    = 3;
-   dddd   = 4;
-   eeeee  = 5;
-   ffffff = 6;
-
-But, with a threshold of 3, 'a' and 'ffffff' cannot be aligned together.
-
-So how should these thresholds be implemented?
-
-One approach is to use the threshold as the maximum difference between the
-current maximum and the new maximum.  Using this approach, all 6 lines above
-are aligned, because the change for each is 1 column.
-
-Consider this with a line-span of 3 and a column-threshold of 3.
-Note that we'll now need to keep track of the last line processed.
-(line and column numbers added for clarity)
-
-             111111
-    123456789012345
-   ---------------
-1 | a = 1;
-2 | eeeee = 5;
-3 | ffffff = 6;
-
-On line 1, the maxcol is set to 3.
-On line 2, the maxcol would be set to 7, except that exceeds the threshold.
-On line 3, the maxcol would be set to 8, except that exceeds the threshold.
-
-So, it ends up with one item in the align stack - line 1.
-Then we pick up from where we left off - on line 2.
-On line 2, the maxcol is set to 7.
-On line 3, the maxcol is set to 8.
-
-End result:
-             111111
-    123456789012345
-   ---------------
-1 | a = 1;
-2 | eeeee  = 5;
-3 | ffffff = 6;
-
-
-Now lets get tricky.
-
-             111111
-    123456789012345
-   ---------------
-1 | a = 1;
-2 | eeeee = 5;
-3 | ccc = 3;
-4 | ffffff = 6;
-
-How should this be aligned?
-I think we need to add another list - a 'skipped' list, that runs in parallel
-with the 'aligned' list.
-
-On line 1, the maxcol is set to 3, added to the aligned list.
-On line 2, col exceeds the threshold, so it is added to the skipped list.
-On line 3, the maxcol is set to 5, added to the aligned list.
-Now, after an item is added to the aligned list, the skipped list must be re-scanned.
-We now see that line 2 is only 2 columns different, so it is added and maxcol = 7.
-The skipped list is now empty.
-On line 4, the maxcol is set to 8, added to the aligned list.
-
-So the output is:
-
-             111111
-    123456789012345
-   ---------------
-1 | a      = 1;
-2 | eeeee  = 5;
-3 | ccc    = 3;
-4 | ffffff = 6;
-
-
-Now for a case where the skipped list is not absorbed:
-
-             111111
-    123456789012345
-   ---------------
-1 | a = 1;
-2 | iiiiiiiiiiiiieeeee = 5;
-3 | ccc = 3;
-4 | ffffff = 6;
-
-On line 1, the maxcol is set to 3, added to the aligned list.
-On line 2, col exceeds the threshold, so it is added to the skipped list.
-On line 3, the maxcol is set to 5, added to the aligned list.
-Skipped list is scanned, nothing moved from the skipped list to the aligned list.
-On line 4, the maxcol is set to 8, added to the aligned list.
-
-So the output is:
-
-             111111
-    123456789012345
-   ---------------
-1 | a      = 1;
-2 | iiiiiiiiiiiiieeeee = 5;
-3 | ccc    = 3;
-4 | ffffff = 6;
-
-As a reminder, the old system would have produced:
-
-1 | a                  = 1;
-2 | iiiiiiiiiiiiieeeee = 5;
-3 | ccc                = 3;
-4 | ffffff             = 6;
-
-Which is probably not wanted.
-
-
---===---===---===---===--
-Absolute thresholds
-To get a better grip on what thresholds do the absolute thresholds were introduced.
-An absolute threshold means that the item, in this case the assign statement, is never
-moved more than the threshold value.
-
-See the below example:
-Relative threshold = 10
-   000000000111111111122222222223
-   123456789012345678901234567890
-1| a                     = 1
-2| aaaaa                 = 1
-3| bbbbbbbbbbb           = 2
-4| ccccccccccccccccccccc = 3
-
-Absolute threshold:
-   000000000111111111122222222223
-   123456789012345678901234567890
-1| a     = 1
-2| aaaaa = 1
-3| bbbbbbbbbbb          = 2
-4| cccccccccccccccccccc = 3
-
---===---===---===---===--
-How to do this generically in the code...
-
-Easy case - one item per line.
-
-Here's the functions and what each do:
-align_start(line_span, col_thresh)
-align_add(pc)
-align_flush()
-align_newline(count)
-align_end()
-
-For each entry, a sequence number is kept.
-
-align_start(line_span, col_thresh)
-  - initializes the align and skipped lists
-  - zero max_column
-  - zero cur_seqnum
-  - zero nl_count
-
-align_add(pc)
-  - update cur_seqnum, assign to item
-  - if item column is within threshold
-    - zero nl_count
-    - add to the aligned list
-    - if item column is > max_col
-      - update max_col
-      - re-adds all items on the skipped list
-  - if item column is not within threshold, add to skipped list
-
-align_newline(count)
-  - adds count to nl_count
-  - if nl_count > line_span, call align_flush()
-
-align_flush()
-  - step through all the items in aligned list and align the items to max_column
-    - keep the seq_num of the last aligned item
-  - zero max_column
-  - remove all items with a seq_num < last aligned seq_num
-  - call align_add on all remaining items in the skipped list
-
-align_end()
-  - call align_flush
-  - clear the lists
-  - free resources, etc
-
-Example usage:  Aligning trailing comments
-
-void align_trailing_comments(void)
-{
-   chunk_t *pc;
-
-   align_start(cpd.settings[UO_align_right_cmt_span],
-               cpd.settings[UO_align_right_cmt_thresh]);
-
-   for(pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-   {
-      if ((pc->flags & PCF_RIGHT_COMMENT) != 0)
-      {
-         align_add(pc);
-      }
-      else if (chunk_is_newline(pc))
-      {
-         align_newline(pc->nl_count);
-      }
-   }
-
-   align_end();
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/control_the_spaces.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/control_the_spaces.txt
deleted file mode 100644
index 8ea2ac52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/control_the_spaces.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-2021-01-23
-
-Guy Maurel
-
-The do_space function within the file space.cpp controls the space between every two tokens.
-
-There are three categories of actions.
-The first one is the most important.
-Options control what is to do with the interval between the two token:
- *   "Ignore" means do not change it.
- *   "Add" in the context of spaces means make sure there is at least 1.
- *   "Add" elsewhere means make sure one is present.
- *   "Remove" mean remove the space/brace/newline/etc.
- *   "Force" in the context of spaces means ensure that there is exactly 1.
- *   "Force" in other contexts means the same as "add".
-For example the option "sp_before_assign":
-Add or remove space before assignment operator '=', '+=', etc.
-in such a statement:
-  a =5;
-
-The second categorie is used for all positions where no option is coded.
-The third categorie is a debug for the developer, who still have something to do.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/example.c
deleted file mode 100644
index 7c8edf79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/example.c
+++ /dev/null
@@ -1,117 +0,0 @@
-
-const char *token_names[] =
-{
-   [CT_POUND]        = "POUND",
-   [CT_PREPROC]      = "PREPROC",
-   [CT_PREPROC_BODY] = "PREPROC_BODY",
-   [CT_PP]           = "PP",
-};
-
-
-int main(int argc, char *argv[])
-{
-   struct junk a[] =
-   {
-      { "version",  0,   0,   0 },
-      { "file",     1, 150, 'f' },
-      { "config",   1,   0, 'c' },
-      { "parsed",  25,   0, 'p' },
-      { NULL,       0,   0,   0 }
-   };
-}
-
-
-color_t colors[] =
-{
-   { "red",   { 255, 0,   0 } }, { "blue",   {   0, 255, 0 } },
-   { "green", {   0, 0, 255 } }, { "purple", { 255, 255, 0 } },
-};
-
-
-struct foo_t bar =
-{
-   .name = "bar",
-   .age  = 21
-};
-
-
-struct foo_t bars[] =
-{
-   [0] = { .name = "bar",
-           .age  = 21 },
-   [1] = { .name = "barley",
-           .age  = 55 },
-};
-
-void foo(void)
-{
-   int  i;
-   char *name;
-
-   i    = 5;
-   name = "bob";
-}
-
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-{
-   int idx;
-   int res = 0;      // trailing comment
-                     // that spans two lines
-   for (idx = 1; idx < bar; idx++)
-      /* comment in virtual braces */
-      res += idx;
-
-   res *= idx;        // some comment
-
-   // almost continued, but a NL in between
-
-// col1 comment in level 1
-   return(res);
-}
-
-// col1 comment in level 0
-
-
-#define foobar(x)             \
-   {                          \
-      for (i = 0; i < x; i++) \
-      {                       \
-         junk(i, x);          \
-      }                       \
-   }
-
-
-void foo(void)
-{
-   switch(ch)
-   {
-   case 'a':
-      {
-         handle_a();
-         break;
-      }
-
-   case 'b':
-      handle_b();
-      break;
-
-   case 'c':
-   case 'd':
-      handle_cd();
-      break;
-
-   case 'e':
-      {
-         handle_a();
-      }
-      break;
-
-   default:
-      handle_default();
-      break;
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/goals.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/goals.txt
deleted file mode 100644
index 610ec121..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/goals.txt
+++ /dev/null
@@ -1,24 +0,0 @@
--------------------------------------------------------------------------------
-Goal:
-
-Do as little or as much reformatting as desired - everything should be configurable
-
-Features:
-
-Whitespace modifications
- + Indent code (tabs, tabs + spaces, spaces)
-   - brace indenting
-   - paren continuation
-   - '=' continuation
-   - broken string continuation
-   - comment indenting
- + Add/Remove spaces before/after/between symbols
- + position braces (same line, cuddle else/while, etc)
-
-Non-whitespace modifications
- + Put a '*' on the left in multi-line C comments
- + Add/Remove outter-most parens on return expressions
- + Add braces for 'fully braced' format
-
-(TODO: update the list to include more available features)
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/how_to_format_cpp_lambda_functions.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/how_to_format_cpp_lambda_functions.rst
deleted file mode 100644
index e15776d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/how_to_format_cpp_lambda_functions.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-#################################
-Formatting C++ Lambda Expressions
-#################################
-
-Uncrustify supports some formatting of c++ lambda expressions, although 
-the support is incomplete.
-The parts of c++ lambda expressions that are currently recognized by Uncrusitify
-are:
-
-.. code-block:: c++
-
-  [ captures ] execution_context ( params ) specifiers -> ret { body }
-  
-Explanations for all the tokens in the above lambda expression
-(except for ``execution_context``),
-as well as a complete description of c++ lambda expressions,
-are found `here <https://en.cppreference.com/w/cpp/language/lambda>`_.
-The ``execution_context`` token is a non-standard addition to allow for 
-specification of the execution space (e.g. host or device in CUDA).
-The native specifiers for the `execution_context` for lambda expression in CUDA 
-are ``__device__`` and ``__host__ __device__``.
-However, it is common for code to use a preprocessor variable in place of the 
-native specifiers.
-
-The Uncrustify options for formatting of c++ lambda expressions are:
-
-.. code-block::
-
-  sp_cpp_lambda_assign
-  sp_cpp_lambda_square_paren
-  sp_cpp_lambda_square_brace
-  sp_cpp_lambda_paren_brace
-  sp_cpp_lambda_fparen
-  nl_cpp_lambda_leave_one_liners
-  nl_cpp_ldef_brace
-  indent_cpp_lambda_body
-  indent_cpp_lambda_only_once
-
-Please refer to the example configuration file at 
-`uncrustify/documentation/htdocs/default.cfg <https://github.com/uncrustify/uncrustify/blob/master/documentation/htdocs/default.cfg>`_ 
-for an explanation of the options.
-Additionally, a multiple number of ``execution_context`` tokens may be set in 
-the configuration file:
-
-.. code-block::
-
-  set EXECUTION_CONTEXT __host__ __device__
-  set EXECUTION_CONTEXT DEVICE_LAMBDA_CONTEXT HOST_DEVICE_LAMBDA_CONTEXT
-
-The effect of these lines in the configuration file is that any of the strings
-(``__host__``, ``__device__``,
-``DEVICE_LAMBDA_CONTEXT``, ``HOST_DEVICE_LAMBDA_CONTEXT``)
-will be recognized by uncrusitfy
-and will allow the lambda to be properly identified.
-Note that each word after the token name
-(``EXECUTION_CONTEXT`` in this instance) is a separate token.
-This means that uncrustify will parse ``__host__`` and ``__device__``
-as separate tokens, and there is no need to specify ``__device__`` twice.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/align_typedef.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/align_typedef.html
deleted file mode 100644
index 6d94eadf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/align_typedef.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: The align typedef options</title>
-</head>
-<body lang="en-US">
-<h2>align_typedef</h2>
-<h3>align_typedef_span</h3>
-The span for aligning single-line typedefs (0=don't align)
-<table border="border">
-<tr>
-	<td valign="bottom">original<br>align_typedef_span=0</td>
-	<td valign="bottom">align_typedef_span=1</td>
-	<td valign="bottom">align_typedef_span=2</td>
-</tr>
-<tr>
-	<td><pre>
-typedef int MY_INT;
-int a;
-typedef int      *MY_INTP;
-typedef float  My_Float;
-   </pre>
-   <i>no alignment</i>
-   </td>
-	<td><pre>
-typedef int MY_INT;
-int a;
-typedef int   *MY_INTP;
-typedef float My_Float;
-   </pre>
-   <i>The third line is not catch in the span</i>
-   </td>
-	<td><pre>
-typedef int   MY_INT;
-int a;
-typedef int   *MY_INTP;
-typedef float My_Float;
-   </pre>
-   <i>all the lines are catched</i>
-   </td>
-</tr>
-</table>
-<p></p>
-<h3>align_typedef_gap</h3>
-The minimum space between the type and the synonym of a typedef<br>
-Can be only used if align_typedef_span >= 1
-<table border="border">
-<tr>
-	<td valign="bottom">original<br>align_typedef_span=2</td>
-	<td valign="bottom">align_typedef_gap=1</td>
-	<td valign="bottom">align_typedef_gap=3</td>
-</tr>
-<tr>
-	<td><pre>
-typedef int   MY_INT;
-int a;
-typedef int   *MY_INTP;
-typedef float My_Float;
-   </pre>
-   <i>as above</i>
-   </td>
-	<td><pre>
-typedef int   MY_INT;
-int a;
-typedef int   *MY_INTP;
-typedef float My_Float;
-   </pre>
-   <i>no change</i>
-   </td>
-   	<td><pre>
-typedef int     MY_INT;
-int a;
-typedef int     *MY_INTP;
-typedef float   My_Float;
-   </pre>
-   <i>the gap has 3 spaces</i>
-   </td>
-</tr>
-</table>
-<p></p>
-<h3>align_typedef_star_style</h3>
-Controls the positioning of the '*' in typedefs.<BR>
-0: Align on typedef type, ignore '*'<BR>
-1: The '*' is part of type name<BR>
-2: The '*' is part of the type, but dangling
-<table border="border">
-<tr>
-	<td valign="bottom">original</td>
-	<td valign="bottom">align_typedef_gap=3<br>align_typedef_star_style=0</td>
-	<td valign="bottom">align_typedef_gap=3<br>align_typedef_star_style=1</td>
-	<td valign="bottom">align_typedef_gap=3<br>align_typedef_star_style=2</td>
-</tr>
-<tr>
-	<td><pre>
-typedef int MY_INT;
-int a;
-typedef int  *    MY_INTP;
-typedef float  My_Float;
-   </pre>
-   <i>no alignment</i>
-   </td>
-	<td><pre>
-typedef int     MY_INT;
-int a;
-typedef int *   MY_INTP;
-typedef float   My_Float;
-	   </pre>
-   <i>the star is ignored</i>
-   </td>
-	<td><pre>
-typedef int     MY_INT;
-int a;
-typedef int     *MY_INTP;
-typedef float   My_Float;
-	   </pre>
-   <i>the star is part of type name</i>
-   </td>
-	<td><pre>
-typedef int     MY_INT;
-int a;
-typedef int    *MY_INTP;
-typedef float   My_Float;
-	   </pre>
-   <i>the star is part of type name, but dangling</i>
-   </td>
-</tr>
-</table>
-<p></p>
-<h3>align_typedef_func</h3>
-How to align typedef'd functions with other typedefs<BR>
-0: Don't mix them at all<BR>
-1: align the open paren with the types
-<table border="border">
-<tr>
-	<td valign="bottom">original</td>
-	<td valign="bottom">align_typedef_gap=3<br>align_typedef_star_style=1<br>align_typedef_func=1</td>
-</tr>
-<tr>
-	<td><pre>
-typedef int MY_INT;
-int a;
-typedef int  *    MY_INTP;
-typedef float  My_Float;
-typedef int      (*foo_t)(void *bar);
-typedef int          (*somefunc_t)(void *barstool);
-   </pre>
-   <i>no alignment</i>
-   </td>
-	<td><pre>
-typedef int     MY_INT;
-int a;
-typedef int     *MY_INTP;
-typedef float   My_Float;
-typedef int     (*foo_t)(void *bar);
-typedef int     (*somefunc_t)(void *barstool);
-	   </pre>
-   </td>
-</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/ben.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/ben.cfg.txt
deleted file mode 100644
index 97229cb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/ben.cfg.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# My favorite format
-#
-
-newlines                        = LF		# AUTO (default), CRLF, CR, or LF
-
-indent_with_tabs		= 0		# 1=indent to level only, 2=indent with tabs
-input_tab_size			= 8		# original tab size
-output_tab_size			= 3		# new tab size
-indent_columns			= output_tab_size
-# indent_label			= 0		# pos: absolute col, neg: relative column
-indent_align_string		= False		# align broken strings
-indent_brace			= 0
-indent_class			= true
-
-nl_start_of_file		= remove
-# nl_start_of_file_min		= 0
-nl_end_of_file			= force
-nl_end_of_file_min		= 1
-nl_max				= 4
-nl_before_block_comment		= 2
-nl_after_func_body		= 2
-nl_after_func_proto_group 	= 2
-
-nl_assign_brace			= add		# "= {" vs "= \n {"
-nl_enum_brace			= add		# "enum {" vs "enum \n {"
-nl_union_brace			= add		# "union {" vs "union \n {"
-nl_struct_brace			= add		# "struct {" vs "struct \n {"
-nl_do_brace			= add		# "do {" vs "do \n {"
-nl_if_brace			= add		# "if () {" vs "if () \n {"
-nl_for_brace			= add		# "for () {" vs "for () \n {"
-nl_else_brace			= add		# "else {" vs "else \n {"
-nl_while_brace			= add		# "while () {" vs "while () \n {"
-nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
-nl_before_case			= 1
-nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
-nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-nl_after_return			= TRUE
-nl_brace_while			= remove
-nl_brace_else			= add
-nl_squeeze_ifdef		= TRUE
-
-pos_bool			= trail		# BOOL ops on trailing end
-
-eat_blanks_before_close_brace	= TRUE
-eat_blanks_after_open_brace	= TRUE
-
-
-mod_paren_on_return		= add		# "return 1;" vs "return (1);"
-mod_full_brace_if		= add		# "if (a) a--;" vs "if (a) { a--; }"
-mod_full_brace_for		= add		# "for () a--;" vs "for () { a--; }"
-mod_full_brace_do		= add		# "do a--; while ();" vs "do { a--; } while ();"
-mod_full_brace_while		= add		# "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_byref			= remove
-sp_before_semi			= remove
-sp_paren_paren			= remove	# space between (( and ))
-sp_return_paren			= remove	# "return (1);" vs "return(1);"
-sp_sizeof_paren			= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen		= force		# "if (" vs "if("
-sp_after_sparen			= force		# "if () {" vs "if (){"
-sp_after_cast			= remove	# "(int) a" vs "(int)a"
-sp_inside_braces		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum		= force		# "{ 1 }" vs "{1}"
-sp_inside_paren			= remove
-sp_inside_fparen		= remove
-sp_inside_sparen		= remove
-sp_inside_square		= remove
-#sp_type_func			= ignore
-sp_assign			= force
-sp_arith			= force
-sp_bool				= force
-sp_compare			= force
-sp_assign			= force
-sp_after_comma			= force
-sp_func_def_paren		= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren		= remove	# "foo (" vs "foo("
-sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
-sp_func_class_paren		= remove
-sp_before_angle			= force
-sp_after_angle			= force
-sp_inside_angle			= remove
-sp_sparen_brace			= add
-sp_fparen_brace			= add
-sp_after_ptr_star		= remove
-sp_before_ptr_star		= force
-sp_between_ptr_star		= remove
-
-align_with_tabs			= FALSE		# use tabs to align
-align_on_tabstop		= FALSE		# align on tabstops
-align_enum_equ_span		= 4
-align_nl_cont			= TRUE
-align_var_def_span		= 1
-align_var_def_thresh		= 12
-align_var_def_inline		= TRUE
-align_var_def_star		= TRUE
-align_var_def_colon		= TRUE
-align_assign_span		= 1
-align_assign_thresh		= 12
-align_struct_init_span		= 3
-align_var_struct_span		= 99
-align_right_cmt_span		= 3
-align_pp_define_span		= 3
-align_pp_define_gap		= 4
-align_number_right		= TRUE
-align_typedef_span		= 5
-align_typedef_gap		= 3
-
-cmt_star_cont			= TRUE
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/config.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/config.txt
deleted file mode 100644
index e87d42ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/config.txt
+++ /dev/null
@@ -1,3214 +0,0 @@
-# Uncrustify-0.73.0
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
-
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
-
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
-
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Option to allow both disable_processing_cmt and enable_processing_cmt
-# strings, if specified, to be interpreted as ECMAScript regular expressions.
-# If true, a regex search will be performed within comments according to the
-# specified patterns in order to disable/enable processing.
-processing_cmt_as_regex         = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening parenthesis and before the closing
-# parenthesis of a argument list of a C++11 lambda, as in
-# '[]( <here> int x <here> ){ ... }'.
-sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype(...)' and word,
-# brace or function call.
-sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
-
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
-
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force/not_defined
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force/not_defined
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : <here> expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var <here> : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
-# A region marker is defined as a comment which is not preceded by other text
-# (i.e. the comment is the first non-whitespace on the line), and which starts
-# with either 'BEGIN' or 'END'.
-#
-# Overrides sp_cmt_cpp_start.
-sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
-
-# If true, space added with sp_cmt_cpp_start will be added after Doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space added with sp_cmt_cpp_start will be added after Qt translator
-# or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force/not_defined
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
-
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
-
-# Additional indent before the leading base class colon.
-# Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
-indent_before_class_colon       = 0        # number
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-# It might wise to choose the same value for the option indent_case_brace.
-indent_switch_case              = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-# It might wise to choose the same value for the option indent_switch_case.
-indent_case_brace               = 0        # number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = 1        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace
-#       (i.e. 2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only
-#        add the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statements inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = false    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line do statements, as in 'do { b++; } while(...);'.
-nl_do_leave_one_liners          = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option in case of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into three lines by
-# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option overrides eat_blanks_after_open_brace and
-# eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition. Where
-# applicable, this option is overridden with eat_blanks_after_open_brace=true
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Path to a file that contains regular expressions describing patterns for
-# which the end of one line and the beginning of the next will be folded into
-# the same sentence or paragraph during full comment reflow. The regular
-# expressions are described using ECMAScript syntax. The syntax for this
-# specification is as follows, where "..." indicates the custom regular
-# expression and "n" indicates the nth end_of_prev_line_regex and
-# beg_of_next_line_regex regular expression pair:
-#
-# end_of_prev_line_regex[1] = "...$"
-# beg_of_next_line_regex[1] = "^..."
-# end_of_prev_line_regex[2] = "...$"
-# beg_of_next_line_regex[2] = "^..."
-#             .
-#             .
-#             .
-# end_of_prev_line_regex[n] = "...$"
-# beg_of_next_line_regex[n] = "^..."
-#
-# Note that use of this option overrides the default reflow fold regular
-# expressions, which are internally defined as follows:
-#
-# end_of_prev_line_regex[1] = "[\w,\]\)]$"
-# beg_of_next_line_regex[1] = "^[\w,\[\(]"
-# end_of_prev_line_regex[2] = "\.$"
-# beg_of_next_line_regex[2] = "^[A-Z]"
-cmt_reflow_fold_regex_file      = ""         # string
-
-# Whether to indent wrapped lines to the start of the encompassing paragraph
-# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
-# specified by cmt_sp_after_star_cont.
-#
-# Note that cmt_align_doxygen_javadoc_tags overrides this option for
-# paragraphs associated with javadoc tags
-cmt_reflow_indent_to_paragraph_start = false    # true/false
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
-# and corresponding fields such that groups of consecutive block tags,
-# parameter names, and descriptions align with one another. Overrides that
-# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
-# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
-# in order to achieve the desired alignment for line-wrapping.
-cmt_align_doxygen_javadoc_tags  = false    # true/false
-
-# The number of spaces to insert after the star and before doxygen
-# javadoc-style tags (@param, @return, etc). Requires enabling
-# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
-# cmt_sp_after_star_cont.
-#
-# Default: 1
-cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list of whitespace
-# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Set the number of characters to be printed if the text is too long,
-# 0: do not truncate.
-debug_truncate                  = 0        # unsigned number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 0
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/configuration.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/configuration.txt
deleted file mode 100644
index f61b1176..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/configuration.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-Quick documentation (probably out of date - see options.h)
-
-There are five type of arguments:
-	- boolean (true/false)
-	- numeric
-	- ignore/add/remove/force
-	- LF/CRLF/CR/AUTO
-	- ignore/lead/trail
-
-"Ignore" means do not change it.
-"Add" in the context of spaces means make sure there is at least 1.
-"Add" elsewhere means make sure one is present.
-"Remove" mean remove the space/brace/newline/etc.
-"Force" in the context of spaces means ensure that there is exactly 1.
-"Force" in other contexts means the same as "add".
-
-Configuration items may reference previously defined configuration items.
-Numeric items may be prefixed with a '-' to invert the number.
-Boolean items may be prefixed with a '-' or '~' to invert the value.
-For example, the following is valid:
-  output_tab_size = 4
-  indent_columns  = output_tab_size
-
-
-All items default to false/0/ignore except:
-	- newlines = auto
-	- input_tab_size = 8
-	- output_tab_size = 8
-	- indent_columns = 8
-	- indent_with_tabs = 1
-	- indent_label = 1
-	- indent_access_spec = 1
-	- sp_before_comma = remove
-	- string_escape_char = 92  # '\'
-
-	Refer to set_option_defaults()
-
-Terminology:
-	There are three types of parenthesis: sparen, fparen, paren.
-	sparen are found with if/for/switch/while statements.
-	fparen are found with function prototypes, calls and implementations.
-	paren are everything else, such as those found with arithmetic ops.
-
-	A 'span' is the maximum number of lines that a aligning feature will be
-	considered.  This is done to limit the scope of the aligning.
-	So, if a span is set to 3 and more than 3 lines do not contain the item
-	that is to be aligned, then the aligning set is closed.
-
-	A 'gap' is the minimum spacing for aligned items.
-	So, if it is set to 3 for typedefs, then there are a minimum of three
-	spaces between the type and the typedef name.
-
-	A 'threshold' is the maximum number of columns that a aligning feature
-	will be considered.  This is done to limit the scope of the aligning.
-	This prevents really longs lines from being aligned with short lines.
-
-
-A list of all the options with documentation can be acquired by running
-uncrustify with the following options:
-
-$ uncrustify --show-config
-
-
-To get a valid configuration file with all defaults, run this:
-
-$ uncrustify -c /dev/null --update-config-with-doc
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/default.cfg
deleted file mode 100644
index e87d42ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/default.cfg
+++ /dev/null
@@ -1,3214 +0,0 @@
-# Uncrustify-0.73.0
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
-
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
-
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
-
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Option to allow both disable_processing_cmt and enable_processing_cmt
-# strings, if specified, to be interpreted as ECMAScript regular expressions.
-# If true, a regex search will be performed within comments according to the
-# specified patterns in order to disable/enable processing.
-processing_cmt_as_regex         = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening parenthesis and before the closing
-# parenthesis of a argument list of a C++11 lambda, as in
-# '[]( <here> int x <here> ){ ... }'.
-sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype(...)' and word,
-# brace or function call.
-sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
-
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
-
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force/not_defined
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force/not_defined
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : <here> expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var <here> : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
-# A region marker is defined as a comment which is not preceded by other text
-# (i.e. the comment is the first non-whitespace on the line), and which starts
-# with either 'BEGIN' or 'END'.
-#
-# Overrides sp_cmt_cpp_start.
-sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
-
-# If true, space added with sp_cmt_cpp_start will be added after Doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space added with sp_cmt_cpp_start will be added after Qt translator
-# or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force/not_defined
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
-
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
-
-# Additional indent before the leading base class colon.
-# Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
-indent_before_class_colon       = 0        # number
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-# It might wise to choose the same value for the option indent_case_brace.
-indent_switch_case              = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-# It might wise to choose the same value for the option indent_switch_case.
-indent_case_brace               = 0        # number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = 1        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace
-#       (i.e. 2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only
-#        add the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statements inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = false    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line do statements, as in 'do { b++; } while(...);'.
-nl_do_leave_one_liners          = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option in case of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into three lines by
-# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option overrides eat_blanks_after_open_brace and
-# eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition. Where
-# applicable, this option is overridden with eat_blanks_after_open_brace=true
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Path to a file that contains regular expressions describing patterns for
-# which the end of one line and the beginning of the next will be folded into
-# the same sentence or paragraph during full comment reflow. The regular
-# expressions are described using ECMAScript syntax. The syntax for this
-# specification is as follows, where "..." indicates the custom regular
-# expression and "n" indicates the nth end_of_prev_line_regex and
-# beg_of_next_line_regex regular expression pair:
-#
-# end_of_prev_line_regex[1] = "...$"
-# beg_of_next_line_regex[1] = "^..."
-# end_of_prev_line_regex[2] = "...$"
-# beg_of_next_line_regex[2] = "^..."
-#             .
-#             .
-#             .
-# end_of_prev_line_regex[n] = "...$"
-# beg_of_next_line_regex[n] = "^..."
-#
-# Note that use of this option overrides the default reflow fold regular
-# expressions, which are internally defined as follows:
-#
-# end_of_prev_line_regex[1] = "[\w,\]\)]$"
-# beg_of_next_line_regex[1] = "^[\w,\[\(]"
-# end_of_prev_line_regex[2] = "\.$"
-# beg_of_next_line_regex[2] = "^[A-Z]"
-cmt_reflow_fold_regex_file      = ""         # string
-
-# Whether to indent wrapped lines to the start of the encompassing paragraph
-# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
-# specified by cmt_sp_after_star_cont.
-#
-# Note that cmt_align_doxygen_javadoc_tags overrides this option for
-# paragraphs associated with javadoc tags
-cmt_reflow_indent_to_paragraph_start = false    # true/false
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
-# and corresponding fields such that groups of consecutive block tags,
-# parameter names, and descriptions align with one another. Overrides that
-# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
-# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
-# in order to achieve the desired alignment for line-wrapping.
-cmt_align_doxygen_javadoc_tags  = false    # true/false
-
-# The number of spaces to insert after the star and before doxygen
-# javadoc-style tags (@param, @return, etc). Requires enabling
-# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
-# cmt_sp_after_star_cont.
-#
-# Default: 1
-cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list of whitespace
-# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Set the number of characters to be printed if the text is too long,
-# 0: do not truncate.
-debug_truncate                  = 0        # unsigned number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 0
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.in.c
deleted file mode 100644
index c1a53476..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.in.c
+++ /dev/null
@@ -1,1234 +0,0 @@
-/* i2c-core.c - a device driver for the iic-bus interface		     */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-99 Simon G. Vogl
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
-   All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
-   SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/idr.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-
-
-static LIST_HEAD(adapters);
-static LIST_HEAD(drivers);
-static DECLARE_MUTEX(core_lists);
-static DEFINE_IDR(i2c_adapter_idr);
-
-static int i2c_device_match(struct device *dev, struct device_driver *drv)
-{
-	return 1;
-}
-
-static int i2c_bus_suspend(struct device * dev, pm_message_t state)
-{
-	int rc = 0;
-
-	if (dev->driver && dev->driver->suspend)
-		rc = dev->driver->suspend(dev,state,0);
-	return rc;
-}
-
-static int i2c_bus_resume(struct device * dev)
-{
-	int rc = 0;
-	
-	if (dev->driver && dev->driver->resume)
-		rc = dev->driver->resume(dev,0);
-	return rc;
-}
-
-struct bus_type i2c_bus_type = {
-	.name =	"i2c",
-	.match = i2c_device_match,
-	.suspend = i2c_bus_suspend,
-	.resume = i2c_bus_resume,
-};
-
-static int i2c_device_probe(struct device *dev)
-{
-	return -ENODEV;
-}
-
-static int i2c_device_remove(struct device *dev)
-{
-	return 0;
-}
-
-void i2c_adapter_dev_release(struct device *dev)
-{
-	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-	complete(&adap->dev_released);
-}
-
-struct device_driver i2c_adapter_driver = {
-	.name =	"i2c_adapter",
-	.bus = &i2c_bus_type,
-	.probe = i2c_device_probe,
-	.remove = i2c_device_remove,
-};
-
-static void i2c_adapter_class_dev_release(struct class_device *dev)
-{
-	struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-	complete(&adap->class_dev_released);
-}
-
-struct class i2c_adapter_class = {
-	.name =	"i2c-adapter",
-	.release =&i2c_adapter_class_dev_release,
-};
-
-static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-	return sprintf(buf, "%s\n", adap->name);
-}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
-static void i2c_client_release(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	complete(&client->released);
-}
-
-static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	return sprintf(buf, "%s\n", client->name);
-}
-
-/*
- * We can't use the DEVICE_ATTR() macro here as we want the same filename for a
- * different type of a device.  So beware if the DEVICE_ATTR() macro ever
- * changes, this definition will also have to change.
- */
-static struct device_attribute dev_attr_client_name = {
-	.attr = {.name = "name", .mode = S_IRUGO, .owner = THIS_MODULE },
-	.show   =  &show_client_name,
-};
-
-
-/* ---------------------------------------------------
- * registering functions
- * ---------------------------------------------------
- */
-
-/* -----
- * i2c_add_adapter is called from within the algorithm layer,
- * when a new hw adapter registers. A new device is register to be
- * available for clients.
- */
-int i2c_add_adapter(struct i2c_adapter *adap)
-{
-	int id, res = 0;
-	struct list_head   *item;
-	struct i2c_driver  *driver;
-
-	down(&core_lists);
-
-	if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0) {
-		res = -ENOMEM;
-		goto out_unlock;
-	}
-
-	res = idr_get_new(&i2c_adapter_idr, adap, &id);
-	if (res < 0) {
-		if (res == -EAGAIN)
-			res = -ENOMEM;
-		goto out_unlock;
-	}
-
-	adap->nr =  id & MAX_ID_MASK;
-	init_MUTEX(&adap->bus_lock);
-	init_MUTEX(&adap->clist_lock);
-	list_add_tail(&adap->list,&adapters);
-	INIT_LIST_HEAD(&adap->clients);
-
-	/* Add the adapter to the driver core.
-	 * If the parent pointer is not set up,
-	 * we add this adapter to the host bus.
-	 */
-	if (adap->dev.parent == NULL)
-		adap->dev.parent = &platform_bus;
-	sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
-	adap->dev.driver = &i2c_adapter_driver;
-	adap->dev.release = &i2c_adapter_dev_release;
-	device_register(&adap->dev);
-	device_create_file(&adap->dev, &dev_attr_name);
-
-	/* Add this adapter to the i2c_adapter class */
-	memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-	adap->class_dev.dev = &adap->dev;
-	adap->class_dev.class = &i2c_adapter_class;
-	strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-	class_device_register(&adap->class_dev);
-
-	dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
-
-	/* inform drivers of new adapters */
-	list_for_each(item,&drivers) {
-		driver = list_entry(item, struct i2c_driver, list);
-		if (driver->flags & I2C_DF_NOTIFY)
-		/* We ignore the return code; if it fails, too bad */
-		driver->attach_adapter(adap);
-	}
-
-out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-
-int i2c_del_adapter(struct i2c_adapter *adap)
-{
-	struct list_head  *item, *_n;
-	struct i2c_adapter *adap_from_list;
-	struct i2c_driver *driver;
-	struct i2c_client *client;
-	int res = 0;
-
-	down(&core_lists);
-
-	/* First make sure that this adapter was ever added */
-	list_for_each_entry(adap_from_list, &adapters, list) {
-		if (adap_from_list == adap)
-			break;
-	}
-	if (adap_from_list != adap) {
-		pr_debug("i2c-core: attempting to delete unregistered "
-			 "adapter [%s]\n", adap->name);
-		res = -EINVAL;
-		goto out_unlock;
-	}
-
-	list_for_each(item,&drivers) {
-		driver = list_entry(item, struct i2c_driver, list);
-		if (driver->detach_adapter)
-			if ((res = driver->detach_adapter(adap))) {
-				dev_err(&adap->dev, "detach_adapter failed "
-					"for driver [%s]\n", driver->name);
-				goto out_unlock;
-			}
-	}
-
-	/* detach any active clients. This must be done first, because
-	 * it can fail; in which case we give up. */
-	list_for_each_safe(item, _n, &adap->clients) {
-		client = list_entry(item, struct i2c_client, list);
-
-		/* detaching devices is unconditional of the set notify
-		 * flag, as _all_ clients that reside on the adapter
-		 * must be deleted, as this would cause invalid states.
-		 */
-		if ((res=client->driver->detach_client(client))) {
-			dev_err(&adap->dev, "detach_client failed for client "
-				"[%s] at address 0x%02x\n", client->name,
-				client->addr);
-			goto out_unlock;
-		}
-	}
-
-	/* clean up the sysfs representation */
-	init_completion(&adap->dev_released);
-	init_completion(&adap->class_dev_released);
-	class_device_unregister(&adap->class_dev);
-	device_remove_file(&adap->dev, &dev_attr_name);
-	device_unregister(&adap->dev);
-	list_del(&adap->list);
-
-	/* wait for sysfs to drop all references */
-	wait_for_completion(&adap->dev_released);
-	wait_for_completion(&adap->class_dev_released);
-
-	/* free dynamically allocated bus id */
-	idr_remove(&i2c_adapter_idr, adap->nr);
-
-	dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
-
- out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-
-/* -----
- * What follows is the "upwards" interface: commands for talking to clients,
- * which implement the functions to access the physical information of the
- * chips.
- */
-
-int i2c_add_driver(struct i2c_driver *driver)
-{
-	struct list_head   *item;
-	struct i2c_adapter *adapter;
-	int res = 0;
-
-	down(&core_lists);
-
-	/* add the driver to the list of i2c drivers in the driver core */
-	driver->driver.name = driver->name;
-	driver->driver.bus = &i2c_bus_type;
-	driver->driver.probe = i2c_device_probe;
-	driver->driver.remove = i2c_device_remove;
-
-	res = driver_register(&driver->driver);
-	if (res)
-		goto out_unlock;
-	
-	list_add_tail(&driver->list,&drivers);
-	pr_debug("i2c-core: driver [%s] registered\n", driver->name);
-
-	/* now look for instances of driver on our adapters */
-	if (driver->flags & I2C_DF_NOTIFY) {
-		list_for_each(item,&adapters) {
-			adapter = list_entry(item, struct i2c_adapter, list);
-			driver->attach_adapter(adapter);
-		}
-	}
-
- out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-int i2c_del_driver(struct i2c_driver *driver)
-{
-	struct list_head   *item1, *item2, *_n;
-	struct i2c_client  *client;
-	struct i2c_adapter *adap;
-	
-	int res = 0;
-
-	down(&core_lists);
-
-	/* Have a look at each adapter, if clients of this driver are still
-	 * attached. If so, detach them to be able to kill the driver
-	 * afterwards.
-	 *
-	 * Removing clients does not depend on the notify flag, else
-	 * invalid operation might (will!) result, when using stale client
-	 * pointers.
-	 */
-	list_for_each(item1,&adapters) {
-		adap = list_entry(item1, struct i2c_adapter, list);
-		if (driver->detach_adapter) {
-			if ((res = driver->detach_adapter(adap))) {
-				dev_err(&adap->dev, "detach_adapter failed "
-					"for driver [%s]\n", driver->name);
-				goto out_unlock;
-			}
-		} else {
-			list_for_each_safe(item2, _n, &adap->clients) {
-				client = list_entry(item2, struct i2c_client, list);
-				if (client->driver != driver)
-					continue;
-				dev_dbg(&adap->dev, "detaching client [%s] "
-					"at 0x%02x\n", client->name,
-					client->addr);
-				if ((res = driver->detach_client(client))) {
-					dev_err(&adap->dev, "detach_client "
-						"failed for client [%s] at "
-						"0x%02x\n", client->name,
-						client->addr);
-					goto out_unlock;
-				}
-			}
-		}
-	}
-
-	driver_unregister(&driver->driver);
-	list_del(&driver->list);
-	pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
-
- out_unlock:
-	up(&core_lists);
-	return 0;
-}
-
-static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
-{
-	struct list_head   *item;
-	struct i2c_client  *client;
-
-	list_for_each(item,&adapter->clients) {
-		client = list_entry(item, struct i2c_client, list);
-		if (client->addr == addr)
-			return -EBUSY;
-	}
-	return 0;
-}
-
-int i2c_check_addr(struct i2c_adapter *adapter, int addr)
-{
-	int rval;
-
-	down(&adapter->clist_lock);
-	rval = __i2c_check_addr(adapter, addr);
-	up(&adapter->clist_lock);
-
-	return rval;
-}
-
-int i2c_attach_client(struct i2c_client *client)
-{
-	struct i2c_adapter *adapter = client->adapter;
-
-	down(&adapter->clist_lock);
-	if (__i2c_check_addr(client->adapter, client->addr)) {
-		up(&adapter->clist_lock);
-		return -EBUSY;
-	}
-	list_add_tail(&client->list,&adapter->clients);
-	up(&adapter->clist_lock);
-	
-	if (adapter->client_register)  {
-		if (adapter->client_register(client))  {
-			dev_dbg(&adapter->dev, "client_register "
-				"failed for client [%s] at 0x%02x\n",
-				client->name, client->addr);
-		}
-	}
-
-	if (client->flags & I2C_CLIENT_ALLOW_USE)
-		client->usage_count = 0;
-
-	client->dev.parent = &client->adapter->dev;
-	client->dev.driver = &client->driver->driver;
-	client->dev.bus = &i2c_bus_type;
-	client->dev.release = &i2c_client_release;
-	
-	snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-		"%d-%04x", i2c_adapter_id(adapter), client->addr);
-	dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-		client->name, client->dev.bus_id);
-	device_register(&client->dev);
-	device_create_file(&client->dev, &dev_attr_client_name);
-	
-	return 0;
-}
-
-
-int i2c_detach_client(struct i2c_client *client)
-{
-	struct i2c_adapter *adapter = client->adapter;
-	int res = 0;
-	
-	if ((client->flags & I2C_CLIENT_ALLOW_USE)
-	 && (client->usage_count > 0)) {
-		dev_warn(&client->dev, "Client [%s] still busy, "
-			 "can't detach\n", client->name);
-		return -EBUSY;
-	}
-
-	if (adapter->client_unregister)  {
-		res = adapter->client_unregister(client);
-		if (res) {
-			dev_err(&client->dev,
-				"client_unregister [%s] failed, "
-				"client not detached\n", client->name);
-			goto out;
-		}
-	}
-
-	down(&adapter->clist_lock);
-	list_del(&client->list);
-	init_completion(&client->released);
-	device_remove_file(&client->dev, &dev_attr_client_name);
-	device_unregister(&client->dev);
-	up(&adapter->clist_lock);
-	wait_for_completion(&client->released);
-
- out:
-	return res;
-}
-
-static int i2c_inc_use_client(struct i2c_client *client)
-{
-
-	if (!try_module_get(client->driver->owner))
-		return -ENODEV;
-	if (!try_module_get(client->adapter->owner)) {
-		module_put(client->driver->owner);
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static void i2c_dec_use_client(struct i2c_client *client)
-{
-	module_put(client->driver->owner);
-	module_put(client->adapter->owner);
-}
-
-int i2c_use_client(struct i2c_client *client)
-{
-	int ret;
-
-	ret = i2c_inc_use_client(client);
-	if (ret)
-		return ret;
-
-	if (client->flags & I2C_CLIENT_ALLOW_USE) {
-		if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-			client->usage_count++;
-		else if (client->usage_count > 0)
-			goto busy;
-		else
-			client->usage_count++;
-	}
-
-	return 0;
- busy:
-	i2c_dec_use_client(client);
-	return -EBUSY;
-}
-
-int i2c_release_client(struct i2c_client *client)
-{
-	if(client->flags & I2C_CLIENT_ALLOW_USE) {
-		if(client->usage_count>0)
-			client->usage_count--;
-		else {
-			pr_debug("i2c-core: %s used one too many times\n",
-				__FUNCTION__);
-			return -EPERM;
-		}
-	}
-	
-	i2c_dec_use_client(client);
-	
-	return 0;
-}
-
-void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
-{
-	struct list_head  *item;
-	struct i2c_client *client;
-
-	down(&adap->clist_lock);
-	list_for_each(item,&adap->clients) {
-		client = list_entry(item, struct i2c_client, list);
-		if (!try_module_get(client->driver->owner))
-			continue;
-		if (NULL != client->driver->command) {
-			up(&adap->clist_lock);
-			client->driver->command(client,cmd,arg);
-			down(&adap->clist_lock);
-		}
-		module_put(client->driver->owner);
-       }
-       up(&adap->clist_lock);
-}
-
-static int __init i2c_init(void)
-{
-	int retval;
-
-	retval = bus_register(&i2c_bus_type);
-	if (retval)
-		return retval;
-	retval = driver_register(&i2c_adapter_driver);
-	if (retval)
-		return retval;
-	return class_register(&i2c_adapter_class);
-}
-
-static void __exit i2c_exit(void)
-{
-	class_unregister(&i2c_adapter_class);
-	driver_unregister(&i2c_adapter_driver);
-	bus_unregister(&i2c_bus_type);
-}
-
-subsys_initcall(i2c_init);
-module_exit(i2c_exit);
-
-/* ----------------------------------------------------
- * the functional interface to the i2c busses.
- * ----------------------------------------------------
- */
-
-int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
-{
-	int ret;
-
-	if (adap->algo->master_xfer) {
-#ifdef DEBUG
-		for (ret = 0; ret < num; ret++) {
-			dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
-				"len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
-				'R' : 'W', msgs[ret].addr, msgs[ret].len);
-		}
-#endif
-
-		down(&adap->bus_lock);
-		ret = adap->algo->master_xfer(adap,msgs,num);
-		up(&adap->bus_lock);
-
-		return ret;
-	} else {
-		dev_dbg(&adap->dev, "I2C level transfers not supported\n");
-		return -ENOSYS;
-	}
-}
-
-int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
-{
-	int ret;
-	struct i2c_adapter *adap=client->adapter;
-	struct i2c_msg msg;
-
-	msg.addr = client->addr;
-	msg.flags = client->flags & I2C_M_TEN;
-	msg.len = count;
-	msg.buf = (char *)buf;
-	
-	ret = i2c_transfer(adap, &msg, 1);
-
-	/* If everything went ok (i.e. 1 msg transmitted), return #bytes
-	   transmitted, else error code. */
-	return (ret == 1) ? count : ret;
-}
-
-int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
-{
-	struct i2c_adapter *adap=client->adapter;
-	struct i2c_msg msg;
-	int ret;
-
-	msg.addr = client->addr;
-	msg.flags = client->flags & I2C_M_TEN;
-	msg.flags |= I2C_M_RD;
-	msg.len = count;
-	msg.buf = buf;
-
-	ret = i2c_transfer(adap, &msg, 1);
-
-	/* If everything went ok (i.e. 1 msg transmitted), return #bytes
-	   transmitted, else error code. */
-	return (ret == 1) ? count : ret;
-}
-
-
-int i2c_control(struct i2c_client *client,
-	unsigned int cmd, unsigned long arg)
-{
-	int ret = 0;
-	struct i2c_adapter *adap = client->adapter;
-
-	dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
-	switch (cmd) {
-		case I2C_RETRIES:
-			adap->retries = arg;
-			break;
-		case I2C_TIMEOUT:
-			adap->timeout = arg;
-			break;
-		default:
-			if (adap->algo->algo_control!=NULL)
-				ret = adap->algo->algo_control(adap,cmd,arg);
-	}
-	return ret;
-}
-
-/* ----------------------------------------------------
- * the i2c address scanning function
- * Will not work for 10-bit addresses!
- * ----------------------------------------------------
- */
-static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-			     int (*found_proc) (struct i2c_adapter *, int, int))
-{
-	int err;
-
-	/* Make sure the address is valid */
-	if (addr < 0x03 || addr > 0x77) {
-		dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-			 addr);
-		return -EINVAL;
-	}
-
-	/* Skip if already in use */
-	if (i2c_check_addr(adapter, addr))
-		return 0;
-
-	/* Make sure there is something at this address, unless forced */
-	if (kind < 0) {
-		if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-				   I2C_SMBUS_QUICK, NULL) < 0)
-			return 0;
-
-		/* prevent 24RF08 corruption */
-		if ((addr & ~0x0f) == 0x50)
-			i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-				       I2C_SMBUS_QUICK, NULL);
-	}
-
-	/* Finally call the custom detection function */
-	err = found_proc(adapter, addr, kind);
-
-	/* -ENODEV can be returned if there is a chip at the given address
-	   but it isn't supported by this chip driver. We catch it here as
-	   this isn't an error. */
-	return (err == -ENODEV) ? 0 : err;
-}
-
-int i2c_probe(struct i2c_adapter *adapter,
-	      struct i2c_client_address_data *address_data,
-	      int (*found_proc) (struct i2c_adapter *, int, int))
-{
-	int i, err;
-	int adap_id = i2c_adapter_id(adapter);
-
-	/* Forget it if we can't probe using SMBUS_QUICK */
-	if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
-		return -1;
-
-	/* Force entries are done first, and are not affected by ignore
-	   entries */
-	if (address_data->forces) {
-		unsigned short **forces = address_data->forces;
-		int kind;
-
-		for (kind = 0; forces[kind]; kind++) {
-			for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-			     i += 2) {
-				if (forces[kind][i] == adap_id
-				 || forces[kind][i] == ANY_I2C_BUS) {
-					dev_dbg(&adapter->dev, "found force "
-						"parameter for adapter %d, "
-						"addr 0x%02x, kind %d\n",
-						adap_id, forces[kind][i + 1],
-						kind);
-					err = i2c_probe_address(adapter,
-						forces[kind][i + 1],
-						kind, found_proc);
-					if (err)
-						return err;
-				}
-			}
-		}
-	}
-
-	/* Probe entries are done second, and are not affected by ignore
-	   entries either */
-	for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
-		if (address_data->probe[i] == adap_id
-		 || address_data->probe[i] == ANY_I2C_BUS) {
-			dev_dbg(&adapter->dev, "found probe parameter for "
-				"adapter %d, addr 0x%02x\n", adap_id,
-				address_data->probe[i + 1]);
-			err = i2c_probe_address(adapter,
-						address_data->probe[i + 1],
-						-1, found_proc);
-			if (err)
-				return err;
-		}
-	}
-
-	/* Normal entries are done last, unless shadowed by an ignore entry */
-	for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
-		int j, ignore;
-
-		ignore = 0;
-		for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-		     j += 2) {
-			if ((address_data->ignore[j] == adap_id ||
-			     address_data->ignore[j] == ANY_I2C_BUS)
-			 && address_data->ignore[j + 1]
-			    == address_data->normal_i2c[i]) {
-				dev_dbg(&adapter->dev, "found ignore "
-					"parameter for adapter %d, "
-					"addr 0x%02x\n", adap_id,
-					address_data->ignore[j + 1]);
-			}
-			ignore = 1;
-			break;
-		}
-		if (ignore)
-			continue;
-
-		dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-			"addr 0x%02x\n", adap_id,
-			address_data->normal_i2c[i]);
-		err = i2c_probe_address(adapter, address_data->normal_i2c[i],
-					-1, found_proc);
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
-struct i2c_adapter* i2c_get_adapter(int id)
-{
-	struct i2c_adapter *adapter;
-	
-	down(&core_lists);
-	adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
-	if (adapter && !try_module_get(adapter->owner))
-		adapter = NULL;
-
-	up(&core_lists);
-	return adapter;
-}
-
-void i2c_put_adapter(struct i2c_adapter *adap)
-{
-	module_put(adap->owner);
-}
-
-/* The SMBus parts */
-
-#define POLY    (0x1070U << 3)
-static u8
-crc8(u16 data)
-{
-	int i;
-
-	for(i = 0; i < 8; i++) {
-		if (data & 0x8000)
-			data = data ^ POLY;
-		data = data << 1;
-	}
-	return (u8)(data >> 8);
-}
-
-/* CRC over count bytes in the first array plus the bytes in the rest
-   array if it is non-null. rest[0] is the (length of rest) - 1
-   and is included. */
-static u8 i2c_smbus_partial_pec(u8 crc, int count, u8 *first, u8 *rest)
-{
-	int i;
-
-	for(i = 0; i < count; i++)
-		crc = crc8((crc ^ first[i]) << 8);
-	if(rest != NULL)
-		for(i = 0; i <= rest[0]; i++)
-			crc = crc8((crc ^ rest[i]) << 8);
-	return crc;
-}
-
-static u8 i2c_smbus_pec(int count, u8 *first, u8 *rest)
-{
-	return i2c_smbus_partial_pec(0, count, first, rest);
-}
-
-/* Returns new "size" (transaction type)
-   Note that we convert byte to byte_data and byte_data to word_data
-   rather than invent new xxx_PEC transactions. */
-static int i2c_smbus_add_pec(u16 addr, u8 command, int size,
-			     union i2c_smbus_data *data)
-{
-	u8 buf[3];
-
-	buf[0] = addr << 1;
-	buf[1] = command;
-	switch(size) {
-		case I2C_SMBUS_BYTE:
-			data->byte = i2c_smbus_pec(2, buf, NULL);
-			size = I2C_SMBUS_BYTE_DATA;
-			break;
-		case I2C_SMBUS_BYTE_DATA:
-			buf[2] = data->byte;
-			data->word = buf[2] ||
-			            (i2c_smbus_pec(3, buf, NULL) << 8);
-			size = I2C_SMBUS_WORD_DATA;
-			break;
-		case I2C_SMBUS_WORD_DATA:
-			/* unsupported */
-			break;
-		case I2C_SMBUS_BLOCK_DATA:
-			data->block[data->block[0] + 1] =
-			             i2c_smbus_pec(2, buf, data->block);
-			size = I2C_SMBUS_BLOCK_DATA_PEC;
-			break;
-	}
-	return size;	
-}
-
-static int i2c_smbus_check_pec(u16 addr, u8 command, int size, u8 partial,
-			       union i2c_smbus_data *data)
-{
-	u8 buf[3], rpec, cpec;
-
-	buf[1] = command;
-	switch(size) {
-		case I2C_SMBUS_BYTE_DATA:
-			buf[0] = (addr << 1) | 1;
-			cpec = i2c_smbus_pec(2, buf, NULL);
-			rpec = data->byte;
-			break;
-		case I2C_SMBUS_WORD_DATA:
-			buf[0] = (addr << 1) | 1;
-			buf[2] = data->word & 0xff;
-			cpec = i2c_smbus_pec(3, buf, NULL);
-			rpec = data->word >> 8;
-			break;
-		case I2C_SMBUS_WORD_DATA_PEC:
-			/* unsupported */
-			cpec = rpec = 0;
-			break;
-		case I2C_SMBUS_PROC_CALL_PEC:
-			/* unsupported */
-			cpec = rpec = 0;
-			break;
-		case I2C_SMBUS_BLOCK_DATA_PEC:
-			buf[0] = (addr << 1);
-			buf[2] = (addr << 1) | 1;
-			cpec = i2c_smbus_pec(3, buf, data->block);
-			rpec = data->block[data->block[0] + 1];
-			break;
-		case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-			buf[0] = (addr << 1) | 1;
-			rpec = i2c_smbus_partial_pec(partial, 1,
-			                             buf, data->block);
-			cpec = data->block[data->block[0] + 1];
-			break;
-		default:
-			cpec = rpec = 0;
-			break;
-	}
-	if (rpec != cpec) {
-		pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n",
-			rpec, cpec);
-		return -1;
-	}
-	return 0;	
-}
-
-s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
-{
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
- 	                      value,0,I2C_SMBUS_QUICK,NULL);
-}
-
-s32 i2c_smbus_read_byte(struct i2c_client *client)
-{
-	union i2c_smbus_data data;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                   I2C_SMBUS_READ,0,I2C_SMBUS_BYTE, &data))
-		return -1;
-	else
-		return 0x0FF & data.byte;
-}
-
-s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
-{
-	union i2c_smbus_data data;	/* only for PEC */
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_WRITE,value, I2C_SMBUS_BYTE,&data);
-}
-
-s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
-{
-	union i2c_smbus_data data;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                   I2C_SMBUS_READ,command, I2C_SMBUS_BYTE_DATA,&data))
-		return -1;
-	else
-		return 0x0FF & data.byte;
-}
-
-s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
-{
-	union i2c_smbus_data data;
-	data.byte = value;
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_WRITE,command,
-	                      I2C_SMBUS_BYTE_DATA,&data);
-}
-
-s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
-{
-	union i2c_smbus_data data;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                   I2C_SMBUS_READ,command, I2C_SMBUS_WORD_DATA, &data))
-		return -1;
-	else
-		return 0x0FFFF & data.word;
-}
-
-s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
-{
-	union i2c_smbus_data data;
-	data.word = value;
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_WRITE,command,
-	                      I2C_SMBUS_WORD_DATA,&data);
-}
-
-s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
-			       u8 length, u8 *values)
-{
-	union i2c_smbus_data data;
-	int i;
-	if (length > I2C_SMBUS_BLOCK_MAX)
-		length = I2C_SMBUS_BLOCK_MAX;
-	for (i = 1; i <= length; i++)
-		data.block[i] = values[i-1];
-	data.block[0] = length;
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-			      I2C_SMBUS_WRITE,command,
-			      I2C_SMBUS_BLOCK_DATA,&data);
-}
-
-/* Returns the number of read bytes */
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
-{
-	union i2c_smbus_data data;
-	int i;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_READ,command,
-	                      I2C_SMBUS_I2C_BLOCK_DATA,&data))
-		return -1;
-	else {
-		for (i = 1; i <= data.block[0]; i++)
-			values[i-1] = data.block[i];
-		return data.block[0];
-	}
-}
-
-/* Simulate a SMBus command using the i2c protocol
-   No checking of parameters is done!  */
-static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
-                                   unsigned short flags,
-                                   char read_write, u8 command, int size,
-                                   union i2c_smbus_data * data)
-{
-	/* So we need to generate a series of msgs. In the case of writing, we
-	  need to use only one message; when reading, we need two. We initialize
-	  most things with sane defaults, to keep the code below somewhat
-	  simpler. */
-	unsigned char msgbuf0[34];
-	unsigned char msgbuf1[34];
-	int num = read_write == I2C_SMBUS_READ?2:1;
-	struct i2c_msg msg[2] = { { addr, flags, 1, msgbuf0 },
-	                          { addr, flags | I2C_M_RD, 0, msgbuf1 }
-	                        };
-	int i;
-
-	msgbuf0[0] = command;
-	switch(size) {
-	case I2C_SMBUS_QUICK:
-		msg[0].len = 0;
-		/* Special case: The read/write field is used as data */
-		msg[0].flags = flags | (read_write==I2C_SMBUS_READ)?I2C_M_RD:0;
-		num = 1;
-		break;
-	case I2C_SMBUS_BYTE:
-		if (read_write == I2C_SMBUS_READ) {
-			/* Special case: only a read! */
-			msg[0].flags = I2C_M_RD | flags;
-			num = 1;
-		}
-		break;
-	case I2C_SMBUS_BYTE_DATA:
-		if (read_write == I2C_SMBUS_READ)
-			msg[1].len = 1;
-		else {
-			msg[0].len = 2;
-			msgbuf0[1] = data->byte;
-		}
-		break;
-	case I2C_SMBUS_WORD_DATA:
-		if (read_write == I2C_SMBUS_READ)
-			msg[1].len = 2;
-		else {
-			msg[0].len=3;
-			msgbuf0[1] = data->word & 0xff;
-			msgbuf0[2] = (data->word >> 8) & 0xff;
-		}
-		break;
-	case I2C_SMBUS_PROC_CALL:
-		num = 2; /* Special case */
-		read_write = I2C_SMBUS_READ;
-		msg[0].len = 3;
-		msg[1].len = 2;
-		msgbuf0[1] = data->word & 0xff;
-		msgbuf0[2] = (data->word >> 8) & 0xff;
-		break;
-	case I2C_SMBUS_BLOCK_DATA:
-	case I2C_SMBUS_BLOCK_DATA_PEC:
-		if (read_write == I2C_SMBUS_READ) {
-			dev_err(&adapter->dev, "Block read not supported "
-			       "under I2C emulation!\n");
-			return -1;
-		} else {
-			msg[0].len = data->block[0] + 2;
-			if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2) {
-				dev_err(&adapter->dev, "smbus_access called with "
-				       "invalid block write size (%d)\n",
-				       data->block[0]);
-				return -1;
-			}
-			if(size == I2C_SMBUS_BLOCK_DATA_PEC)
-				(msg[0].len)++;
-			for (i = 1; i <= msg[0].len; i++)
-				msgbuf0[i] = data->block[i-1];
-		}
-		break;
-	case I2C_SMBUS_BLOCK_PROC_CALL:
-	case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-		dev_dbg(&adapter->dev, "Block process call not supported "
-		       "under I2C emulation!\n");
-		return -1;
-	case I2C_SMBUS_I2C_BLOCK_DATA:
-		if (read_write == I2C_SMBUS_READ) {
-			msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-		} else {
-			msg[0].len = data->block[0] + 1;
-			if (msg[0].len > I2C_SMBUS_I2C_BLOCK_MAX + 1) {
-				dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "
-				       "invalid block write size (%d)\n",
-				       data->block[0]);
-				return -1;
-			}
-			for (i = 1; i <= data->block[0]; i++)
-				msgbuf0[i] = data->block[i];
-		}
-		break;
-	default:
-		dev_err(&adapter->dev, "smbus_access called with invalid size (%d)\n",
-		       size);
-		return -1;
-	}
-
-	if (i2c_transfer(adapter, msg, num) < 0)
-		return -1;
-
-	if (read_write == I2C_SMBUS_READ)
-		switch(size) {
-			case I2C_SMBUS_BYTE:
-				data->byte = msgbuf0[0];
-				break;
-			case I2C_SMBUS_BYTE_DATA:
-				data->byte = msgbuf1[0];
-				break;
-			case I2C_SMBUS_WORD_DATA:
-			case I2C_SMBUS_PROC_CALL:
-				data->word = msgbuf1[0] | (msgbuf1[1] << 8);
-				break;
-			case I2C_SMBUS_I2C_BLOCK_DATA:
-				/* fixed at 32 for now */
-				data->block[0] = I2C_SMBUS_I2C_BLOCK_MAX;
-				for (i = 0; i < I2C_SMBUS_I2C_BLOCK_MAX; i++)
-					data->block[i+1] = msgbuf1[i];
-				break;
-		}
-	return 0;
-}
-
-
-s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
-                   char read_write, u8 command, int size,
-                   union i2c_smbus_data * data)
-{
-	s32 res;
-	int swpec = 0;
-	u8 partial = 0;
-
-	flags &= I2C_M_TEN | I2C_CLIENT_PEC;
-	if((flags & I2C_CLIENT_PEC) &&
-	   !(i2c_check_functionality(adapter, I2C_FUNC_SMBUS_HWPEC_CALC))) {
-		swpec = 1;
-		if(read_write == I2C_SMBUS_READ &&
-		   size == I2C_SMBUS_BLOCK_DATA)
-			size = I2C_SMBUS_BLOCK_DATA_PEC;
-		else if(size == I2C_SMBUS_PROC_CALL)
-			size = I2C_SMBUS_PROC_CALL_PEC;
-		else if(size == I2C_SMBUS_BLOCK_PROC_CALL) {
-			i2c_smbus_add_pec(addr, command,
-		                          I2C_SMBUS_BLOCK_DATA, data);
-			partial = data->block[data->block[0] + 1];
-			size = I2C_SMBUS_BLOCK_PROC_CALL_PEC;
-		} else if(read_write == I2C_SMBUS_WRITE &&
-		          size != I2C_SMBUS_QUICK &&
-		          size != I2C_SMBUS_I2C_BLOCK_DATA)
-			size = i2c_smbus_add_pec(addr, command, size, data);
-	}
-
-	if (adapter->algo->smbus_xfer) {
-		down(&adapter->bus_lock);
-		res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write,
-		                                command,size,data);
-		up(&adapter->bus_lock);
-	} else
-		res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,
-	                                      command,size,data);
-
-	if(res >= 0 && swpec &&
-	   size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA &&
-	   (read_write == I2C_SMBUS_READ || size == I2C_SMBUS_PROC_CALL_PEC ||
-	    size == I2C_SMBUS_BLOCK_PROC_CALL_PEC)) {
-		if(i2c_smbus_check_pec(addr, command, size, partial, data))
-			return -1;
-	}
-	return res;
-}
-
-
-/* Next four are needed by i2c-isa */
-EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
-EXPORT_SYMBOL_GPL(i2c_adapter_driver);
-EXPORT_SYMBOL_GPL(i2c_adapter_class);
-EXPORT_SYMBOL_GPL(i2c_bus_type);
-
-EXPORT_SYMBOL(i2c_add_adapter);
-EXPORT_SYMBOL(i2c_del_adapter);
-EXPORT_SYMBOL(i2c_add_driver);
-EXPORT_SYMBOL(i2c_del_driver);
-EXPORT_SYMBOL(i2c_attach_client);
-EXPORT_SYMBOL(i2c_detach_client);
-EXPORT_SYMBOL(i2c_use_client);
-EXPORT_SYMBOL(i2c_release_client);
-EXPORT_SYMBOL(i2c_clients_command);
-EXPORT_SYMBOL(i2c_check_addr);
-
-EXPORT_SYMBOL(i2c_master_send);
-EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_control);
-EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_get_adapter);
-EXPORT_SYMBOL(i2c_put_adapter);
-EXPORT_SYMBOL(i2c_probe);
-
-EXPORT_SYMBOL(i2c_smbus_xfer);
-EXPORT_SYMBOL(i2c_smbus_write_quick);
-EXPORT_SYMBOL(i2c_smbus_read_byte);
-EXPORT_SYMBOL(i2c_smbus_write_byte);
-EXPORT_SYMBOL(i2c_smbus_read_byte_data);
-EXPORT_SYMBOL(i2c_smbus_write_byte_data);
-EXPORT_SYMBOL(i2c_smbus_read_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
-
-MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
-MODULE_DESCRIPTION("I2C-Bus main module");
-MODULE_LICENSE("GPL");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.out.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.out.c
deleted file mode 100644
index ceb484c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.out.c
+++ /dev/null
@@ -1,1245 +0,0 @@
-/* i2c-core.c - a device driver for the iic-bus interface		     */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-99 Simon G. Vogl
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
-   All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
-   SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/idr.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-
-
-static LIST_HEAD(adapters);
-static LIST_HEAD(drivers);
-static DECLARE_MUTEX(core_lists);
-static DEFINE_IDR(i2c_adapter_idr);
-
-static int i2c_device_match(struct device *dev, struct device_driver *drv)
-{
-	return 1;
-}
-
-static int i2c_bus_suspend(struct device *dev, pm_message_t state)
-{
-	int rc = 0;
-
-	if (dev->driver && dev->driver->suspend)
-		rc = dev->driver->suspend(dev, state, 0);
-	return rc;
-}
-
-static int i2c_bus_resume(struct device *dev)
-{
-	int rc = 0;
-
-	if (dev->driver && dev->driver->resume)
-		rc = dev->driver->resume(dev, 0);
-	return rc;
-}
-
-struct bus_type i2c_bus_type = {
-	.name =		"i2c",
-	.match =	i2c_device_match,
-	.suspend =	i2c_bus_suspend,
-	.resume =	i2c_bus_resume,
-};
-
-static int i2c_device_probe(struct device *dev)
-{
-	return -ENODEV;
-}
-
-static int i2c_device_remove(struct device *dev)
-{
-	return 0;
-}
-
-void i2c_adapter_dev_release(struct device *dev)
-{
-	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-	complete(&adap->dev_released);
-}
-
-struct device_driver i2c_adapter_driver = {
-	.name =		"i2c_adapter",
-	.bus =		&i2c_bus_type,
-	.probe =	i2c_device_probe,
-	.remove =	i2c_device_remove,
-};
-
-static void i2c_adapter_class_dev_release(struct class_device *dev)
-{
-	struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-
-	complete(&adap->class_dev_released);
-}
-
-struct class i2c_adapter_class = {
-	.name =		"i2c-adapter",
-	.release =	&i2c_adapter_class_dev_release,
-};
-
-static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-	return sprintf(buf, "%s\n", adap->name);
-}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
-static void i2c_client_release(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-
-	complete(&client->released);
-}
-
-static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-
-	return sprintf(buf, "%s\n", client->name);
-}
-
-/*
- * We can't use the DEVICE_ATTR() macro here as we want the same filename for a
- * different type of a device.  So beware if the DEVICE_ATTR() macro ever
- * changes, this definition will also have to change.
- */
-static struct device_attribute dev_attr_client_name = {
-	.attr = { .name = "name", .mode = S_IRUGO, .owner = THIS_MODULE },
-	.show	=  &show_client_name,
-};
-
-
-/* ---------------------------------------------------
- * registering functions
- * ---------------------------------------------------
- */
-
-/* -----
- * i2c_add_adapter is called from within the algorithm layer,
- * when a new hw adapter registers. A new device is register to be
- * available for clients.
- */
-int i2c_add_adapter(struct i2c_adapter *adap)
-{
-	int id, res = 0;
-	struct list_head *item;
-	struct i2c_driver *driver;
-
-	down(&core_lists);
-
-	if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0) {
-		res = -ENOMEM;
-		goto out_unlock;
-	}
-
-	res = idr_get_new(&i2c_adapter_idr, adap, &id);
-	if (res < 0) {
-		if (res == -EAGAIN)
-			res = -ENOMEM;
-		goto out_unlock;
-	}
-
-	adap->nr =  id & MAX_ID_MASK;
-	init_MUTEX(&adap->bus_lock);
-	init_MUTEX(&adap->clist_lock);
-	list_add_tail(&adap->list, &adapters);
-	INIT_LIST_HEAD(&adap->clients);
-
-	/* Add the adapter to the driver core.
-	 * If the parent pointer is not set up,
-	 * we add this adapter to the host bus.
-	 */
-	if (adap->dev.parent == NULL)
-		adap->dev.parent = &platform_bus;
-	sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
-	adap->dev.driver = &i2c_adapter_driver;
-	adap->dev.release = &i2c_adapter_dev_release;
-	device_register(&adap->dev);
-	device_create_file(&adap->dev, &dev_attr_name);
-
-	/* Add this adapter to the i2c_adapter class */
-	memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-	adap->class_dev.dev = &adap->dev;
-	adap->class_dev.class = &i2c_adapter_class;
-	strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-	class_device_register(&adap->class_dev);
-
-	dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
-
-	/* inform drivers of new adapters */
-	list_for_each(item, &drivers) {
-		driver = list_entry(item, struct i2c_driver, list);
-		if (driver->flags & I2C_DF_NOTIFY)
-			/* We ignore the return code; if it fails, too bad */
-			driver->attach_adapter(adap);
-	}
-
- out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-
-int i2c_del_adapter(struct i2c_adapter *adap)
-{
-	struct list_head *item, *_n;
-	struct i2c_adapter *adap_from_list;
-	struct i2c_driver *driver;
-	struct i2c_client *client;
-	int res = 0;
-
-	down(&core_lists);
-
-	/* First make sure that this adapter was ever added */
-	list_for_each_entry(adap_from_list, &adapters, list) {
-		if (adap_from_list == adap)
-			break;
-	}
-	if (adap_from_list != adap) {
-		pr_debug("i2c-core: attempting to delete unregistered "
-			 "adapter [%s]\n", adap->name);
-		res = -EINVAL;
-		goto out_unlock;
-	}
-
-	list_for_each(item, &drivers) {
-		driver = list_entry(item, struct i2c_driver, list);
-		if (driver->detach_adapter)
-			if ((res = driver->detach_adapter(adap))) {
-				dev_err(&adap->dev, "detach_adapter failed "
-					"for driver [%s]\n", driver->name);
-				goto out_unlock;
-			}
-	}
-
-	/* detach any active clients. This must be done first, because
-	 * it can fail; in which case we give up. */
-	list_for_each_safe(item, _n, &adap->clients) {
-		client = list_entry(item, struct i2c_client, list);
-
-		/* detaching devices is unconditional of the set notify
-		 * flag, as _all_ clients that reside on the adapter
-		 * must be deleted, as this would cause invalid states.
-		 */
-		if ((res = client->driver->detach_client(client))) {
-			dev_err(&adap->dev, "detach_client failed for client "
-				"[%s] at address 0x%02x\n", client->name,
-				client->addr);
-			goto out_unlock;
-		}
-	}
-
-	/* clean up the sysfs representation */
-	init_completion(&adap->dev_released);
-	init_completion(&adap->class_dev_released);
-	class_device_unregister(&adap->class_dev);
-	device_remove_file(&adap->dev, &dev_attr_name);
-	device_unregister(&adap->dev);
-	list_del(&adap->list);
-
-	/* wait for sysfs to drop all references */
-	wait_for_completion(&adap->dev_released);
-	wait_for_completion(&adap->class_dev_released);
-
-	/* free dynamically allocated bus id */
-	idr_remove(&i2c_adapter_idr, adap->nr);
-
-	dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
-
- out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-
-/* -----
- * What follows is the "upwards" interface: commands for talking to clients,
- * which implement the functions to access the physical information of the
- * chips.
- */
-
-int i2c_add_driver(struct i2c_driver *driver)
-{
-	struct list_head *item;
-	struct i2c_adapter *adapter;
-	int res = 0;
-
-	down(&core_lists);
-
-	/* add the driver to the list of i2c drivers in the driver core */
-	driver->driver.name = driver->name;
-	driver->driver.bus = &i2c_bus_type;
-	driver->driver.probe = i2c_device_probe;
-	driver->driver.remove = i2c_device_remove;
-
-	res = driver_register(&driver->driver);
-	if (res)
-		goto out_unlock;
-
-	list_add_tail(&driver->list, &drivers);
-	pr_debug("i2c-core: driver [%s] registered\n", driver->name);
-
-	/* now look for instances of driver on our adapters */
-	if (driver->flags & I2C_DF_NOTIFY) {
-		list_for_each(item, &adapters) {
-			adapter = list_entry(item, struct i2c_adapter, list);
-			driver->attach_adapter(adapter);
-		}
-	}
-
- out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-int i2c_del_driver(struct i2c_driver *driver)
-{
-	struct list_head *item1, *item2, *_n;
-	struct i2c_client *client;
-	struct i2c_adapter *adap;
-
-	int res = 0;
-
-	down(&core_lists);
-
-	/* Have a look at each adapter, if clients of this driver are still
-	 * attached. If so, detach them to be able to kill the driver
-	 * afterwards.
-	 *
-	 * Removing clients does not depend on the notify flag, else
-	 * invalid operation might (will!) result, when using stale client
-	 * pointers.
-	 */
-	list_for_each(item1, &adapters) {
-		adap = list_entry(item1, struct i2c_adapter, list);
-		if (driver->detach_adapter) {
-			if ((res = driver->detach_adapter(adap))) {
-				dev_err(&adap->dev, "detach_adapter failed "
-					"for driver [%s]\n", driver->name);
-				goto out_unlock;
-			}
-		} else {
-			list_for_each_safe(item2, _n, &adap->clients) {
-				client = list_entry(item2, struct i2c_client, list);
-				if (client->driver != driver)
-					continue;
-				dev_dbg(&adap->dev, "detaching client [%s] "
-					"at 0x%02x\n", client->name,
-					client->addr);
-				if ((res = driver->detach_client(client))) {
-					dev_err(&adap->dev, "detach_client "
-						"failed for client [%s] at "
-						"0x%02x\n", client->name,
-						client->addr);
-					goto out_unlock;
-				}
-			}
-		}
-	}
-
-	driver_unregister(&driver->driver);
-	list_del(&driver->list);
-	pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
-
- out_unlock:
-	up(&core_lists);
-	return 0;
-}
-
-static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
-{
-	struct list_head *item;
-	struct i2c_client *client;
-
-	list_for_each(item, &adapter->clients) {
-		client = list_entry(item, struct i2c_client, list);
-		if (client->addr == addr)
-			return -EBUSY;
-	}
-	return 0;
-}
-
-int i2c_check_addr(struct i2c_adapter *adapter, int addr)
-{
-	int rval;
-
-	down(&adapter->clist_lock);
-	rval = __i2c_check_addr(adapter, addr);
-	up(&adapter->clist_lock);
-
-	return rval;
-}
-
-int i2c_attach_client(struct i2c_client *client)
-{
-	struct i2c_adapter *adapter = client->adapter;
-
-	down(&adapter->clist_lock);
-	if (__i2c_check_addr(client->adapter, client->addr)) {
-		up(&adapter->clist_lock);
-		return -EBUSY;
-	}
-	list_add_tail(&client->list, &adapter->clients);
-	up(&adapter->clist_lock);
-
-	if (adapter->client_register) {
-		if (adapter->client_register(client)) {
-			dev_dbg(&adapter->dev, "client_register "
-				"failed for client [%s] at 0x%02x\n",
-				client->name, client->addr);
-		}
-	}
-
-	if (client->flags & I2C_CLIENT_ALLOW_USE)
-		client->usage_count = 0;
-
-	client->dev.parent = &client->adapter->dev;
-	client->dev.driver = &client->driver->driver;
-	client->dev.bus = &i2c_bus_type;
-	client->dev.release = &i2c_client_release;
-
-	snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-		 "%d-%04x", i2c_adapter_id(adapter), client->addr);
-	dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-		client->name, client->dev.bus_id);
-	device_register(&client->dev);
-	device_create_file(&client->dev, &dev_attr_client_name);
-
-	return 0;
-}
-
-
-int i2c_detach_client(struct i2c_client *client)
-{
-	struct i2c_adapter *adapter = client->adapter;
-	int res = 0;
-
-	if ((client->flags & I2C_CLIENT_ALLOW_USE)
-	    && (client->usage_count > 0)) {
-		dev_warn(&client->dev, "Client [%s] still busy, "
-			 "can't detach\n", client->name);
-		return -EBUSY;
-	}
-
-	if (adapter->client_unregister) {
-		res = adapter->client_unregister(client);
-		if (res) {
-			dev_err(&client->dev,
-				"client_unregister [%s] failed, "
-				"client not detached\n", client->name);
-			goto out;
-		}
-	}
-
-	down(&adapter->clist_lock);
-	list_del(&client->list);
-	init_completion(&client->released);
-	device_remove_file(&client->dev, &dev_attr_client_name);
-	device_unregister(&client->dev);
-	up(&adapter->clist_lock);
-	wait_for_completion(&client->released);
-
- out:
-	return res;
-}
-
-static int i2c_inc_use_client(struct i2c_client *client)
-{
-
-	if (!try_module_get(client->driver->owner))
-		return -ENODEV;
-	if (!try_module_get(client->adapter->owner)) {
-		module_put(client->driver->owner);
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static void i2c_dec_use_client(struct i2c_client *client)
-{
-	module_put(client->driver->owner);
-	module_put(client->adapter->owner);
-}
-
-int i2c_use_client(struct i2c_client *client)
-{
-	int ret;
-
-	ret = i2c_inc_use_client(client);
-	if (ret)
-		return ret;
-
-	if (client->flags & I2C_CLIENT_ALLOW_USE) {
-		if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-			client->usage_count++;
-		else if (client->usage_count > 0)
-			goto busy;
-		else
-			client->usage_count++;
-	}
-
-	return 0;
- busy:
-	i2c_dec_use_client(client);
-	return -EBUSY;
-}
-
-int i2c_release_client(struct i2c_client *client)
-{
-	if (client->flags & I2C_CLIENT_ALLOW_USE) {
-		if (client->usage_count > 0)
-			client->usage_count--;
-		else {
-			pr_debug("i2c-core: %s used one too many times\n",
-				 __FUNCTION__);
-			return -EPERM;
-		}
-	}
-
-	i2c_dec_use_client(client);
-
-	return 0;
-}
-
-void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
-{
-	struct list_head *item;
-	struct i2c_client *client;
-
-	down(&adap->clist_lock);
-	list_for_each(item, &adap->clients) {
-		client = list_entry(item, struct i2c_client, list);
-		if (!try_module_get(client->driver->owner))
-			continue;
-		if (NULL != client->driver->command) {
-			up(&adap->clist_lock);
-			client->driver->command(client, cmd, arg);
-			down(&adap->clist_lock);
-		}
-		module_put(client->driver->owner);
-	}
-	up(&adap->clist_lock);
-}
-
-static int __init i2c_init(void)
-{
-	int retval;
-
-	retval = bus_register(&i2c_bus_type);
-	if (retval)
-		return retval;
-	retval = driver_register(&i2c_adapter_driver);
-	if (retval)
-		return retval;
-	return class_register(&i2c_adapter_class);
-}
-
-static void __exit i2c_exit(void)
-{
-	class_unregister(&i2c_adapter_class);
-	driver_unregister(&i2c_adapter_driver);
-	bus_unregister(&i2c_bus_type);
-}
-
-subsys_initcall(i2c_init);
-module_exit(i2c_exit);
-
-/* ----------------------------------------------------
- * the functional interface to the i2c busses.
- * ----------------------------------------------------
- */
-
-int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
-{
-	int ret;
-
-	if (adap->algo->master_xfer) {
-#ifdef DEBUG
-		for (ret = 0; ret < num; ret++) {
-			dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
-				"len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
-				'R' : 'W', msgs[ret].addr, msgs[ret].len);
-		}
-#endif
-
-		down(&adap->bus_lock);
-		ret = adap->algo->master_xfer(adap, msgs, num);
-		up(&adap->bus_lock);
-
-		return ret;
-	} else {
-		dev_dbg(&adap->dev, "I2C level transfers not supported\n");
-		return -ENOSYS;
-	}
-}
-
-int i2c_master_send(struct i2c_client *client, const char *buf, int count)
-{
-	int ret;
-	struct i2c_adapter *adap = client->adapter;
-	struct i2c_msg msg;
-
-	msg.addr = client->addr;
-	msg.flags = client->flags & I2C_M_TEN;
-	msg.len = count;
-	msg.buf = (char *)buf;
-
-	ret = i2c_transfer(adap, &msg, 1);
-
-	/* If everything went ok (i.e. 1 msg transmitted), return #bytes
-	   transmitted, else error code. */
-	return (ret == 1) ? count : ret;
-}
-
-int i2c_master_recv(struct i2c_client *client, char *buf, int count)
-{
-	struct i2c_adapter *adap = client->adapter;
-	struct i2c_msg msg;
-	int ret;
-
-	msg.addr = client->addr;
-	msg.flags = client->flags & I2C_M_TEN;
-	msg.flags |= I2C_M_RD;
-	msg.len = count;
-	msg.buf = buf;
-
-	ret = i2c_transfer(adap, &msg, 1);
-
-	/* If everything went ok (i.e. 1 msg transmitted), return #bytes
-	   transmitted, else error code. */
-	return (ret == 1) ? count : ret;
-}
-
-
-int i2c_control(struct i2c_client *client,
-		unsigned int cmd, unsigned long arg)
-{
-	int ret = 0;
-	struct i2c_adapter *adap = client->adapter;
-
-	dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
-	switch (cmd) {
-	case I2C_RETRIES:
-		adap->retries = arg;
-		break;
-	case I2C_TIMEOUT:
-		adap->timeout = arg;
-		break;
-	default:
-		if (adap->algo->algo_control != NULL)
-			ret = adap->algo->algo_control(adap, cmd, arg);
-	}
-	return ret;
-}
-
-/* ----------------------------------------------------
- * the i2c address scanning function
- * Will not work for 10-bit addresses!
- * ----------------------------------------------------
- */
-static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-			     int (*found_proc)(struct i2c_adapter *, int, int))
-{
-	int err;
-
-	/* Make sure the address is valid */
-	if (addr < 0x03 || addr > 0x77) {
-		dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-			 addr);
-		return -EINVAL;
-	}
-
-	/* Skip if already in use */
-	if (i2c_check_addr(adapter, addr))
-		return 0;
-
-	/* Make sure there is something at this address, unless forced */
-	if (kind < 0) {
-		if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-				   I2C_SMBUS_QUICK, NULL) < 0)
-			return 0;
-
-		/* prevent 24RF08 corruption */
-		if ((addr & ~0x0f) == 0x50)
-			i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-				       I2C_SMBUS_QUICK, NULL);
-	}
-
-	/* Finally call the custom detection function */
-	err = found_proc(adapter, addr, kind);
-
-	/* -ENODEV can be returned if there is a chip at the given address
-	   but it isn't supported by this chip driver. We catch it here as
-	   this isn't an error. */
-	return (err == -ENODEV) ? 0 : err;
-}
-
-int i2c_probe(struct i2c_adapter *adapter,
-	      struct i2c_client_address_data *address_data,
-	      int (*found_proc)(struct i2c_adapter *, int, int))
-{
-	int i, err;
-	int adap_id = i2c_adapter_id(adapter);
-
-	/* Forget it if we can't probe using SMBUS_QUICK */
-	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK))
-		return -1;
-
-	/* Force entries are done first, and are not affected by ignore
-	   entries */
-	if (address_data->forces) {
-		unsigned short **forces = address_data->forces;
-		int kind;
-
-		for (kind = 0; forces[kind]; kind++) {
-			for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-			     i += 2) {
-				if (forces[kind][i] == adap_id
-				    || forces[kind][i] == ANY_I2C_BUS) {
-					dev_dbg(&adapter->dev, "found force "
-						"parameter for adapter %d, "
-						"addr 0x%02x, kind %d\n",
-						adap_id, forces[kind][i + 1],
-						kind);
-					err = i2c_probe_address(adapter,
-								forces[kind][i + 1],
-								kind, found_proc);
-					if (err)
-						return err;
-				}
-			}
-		}
-	}
-
-	/* Probe entries are done second, and are not affected by ignore
-	   entries either */
-	for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
-		if (address_data->probe[i] == adap_id
-		    || address_data->probe[i] == ANY_I2C_BUS) {
-			dev_dbg(&adapter->dev, "found probe parameter for "
-				"adapter %d, addr 0x%02x\n", adap_id,
-				address_data->probe[i + 1]);
-			err = i2c_probe_address(adapter,
-						address_data->probe[i + 1],
-						-1, found_proc);
-			if (err)
-				return err;
-		}
-	}
-
-	/* Normal entries are done last, unless shadowed by an ignore entry */
-	for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
-		int j, ignore;
-
-		ignore = 0;
-		for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-		     j += 2) {
-			if ((address_data->ignore[j] == adap_id ||
-			     address_data->ignore[j] == ANY_I2C_BUS)
-			    && address_data->ignore[j + 1]
-			    == address_data->normal_i2c[i]) {
-				dev_dbg(&adapter->dev, "found ignore "
-					"parameter for adapter %d, "
-					"addr 0x%02x\n", adap_id,
-					address_data->ignore[j + 1]);
-			}
-			ignore = 1;
-			break;
-		}
-		if (ignore)
-			continue;
-
-		dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-			"addr 0x%02x\n", adap_id,
-			address_data->normal_i2c[i]);
-		err = i2c_probe_address(adapter, address_data->normal_i2c[i],
-					-1, found_proc);
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
-struct i2c_adapter * i2c_get_adapter(int id)
-{
-	struct i2c_adapter *adapter;
-
-	down(&core_lists);
-	adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
-	if (adapter && !try_module_get(adapter->owner))
-		adapter = NULL;
-
-	up(&core_lists);
-	return adapter;
-}
-
-void i2c_put_adapter(struct i2c_adapter *adap)
-{
-	module_put(adap->owner);
-}
-
-/* The SMBus parts */
-
-#define POLY    (0x1070U << 3)
-static u8
-crc8(u16 data)
-{
-	int i;
-
-	for (i = 0; i < 8; i++) {
-		if (data & 0x8000)
-			data = data ^ POLY;
-		data = data << 1;
-	}
-	return (u8)(data >> 8);
-}
-
-/* CRC over count bytes in the first array plus the bytes in the rest
-   array if it is non-null. rest[0] is the (length of rest) - 1
-   and is included. */
-static u8 i2c_smbus_partial_pec(u8 crc, int count, u8 *first, u8 *rest)
-{
-	int i;
-
-	for (i = 0; i < count; i++)
-		crc = crc8((crc ^ first[i]) << 8);
-	if (rest != NULL)
-		for (i = 0; i <= rest[0]; i++)
-			crc = crc8((crc ^ rest[i]) << 8);
-	return crc;
-}
-
-static u8 i2c_smbus_pec(int count, u8 *first, u8 *rest)
-{
-	return i2c_smbus_partial_pec(0, count, first, rest);
-}
-
-/* Returns new "size" (transaction type)
-   Note that we convert byte to byte_data and byte_data to word_data
-   rather than invent new xxx_PEC transactions. */
-static int i2c_smbus_add_pec(u16 addr, u8 command, int size,
-			     union i2c_smbus_data *data)
-{
-	u8 buf[3];
-
-	buf[0] = addr << 1;
-	buf[1] = command;
-	switch (size) {
-	case I2C_SMBUS_BYTE:
-		data->byte = i2c_smbus_pec(2, buf, NULL);
-		size = I2C_SMBUS_BYTE_DATA;
-		break;
-	case I2C_SMBUS_BYTE_DATA:
-		buf[2] = data->byte;
-		data->word = buf[2] ||
-			     (i2c_smbus_pec(3, buf, NULL) << 8);
-		size = I2C_SMBUS_WORD_DATA;
-		break;
-	case I2C_SMBUS_WORD_DATA:
-		/* unsupported */
-		break;
-	case I2C_SMBUS_BLOCK_DATA:
-		data->block[data->block[0] + 1] =
-			i2c_smbus_pec(2, buf, data->block);
-		size = I2C_SMBUS_BLOCK_DATA_PEC;
-		break;
-	}
-	return size;
-}
-
-static int i2c_smbus_check_pec(u16 addr, u8 command, int size, u8 partial,
-			       union i2c_smbus_data *data)
-{
-	u8 buf[3], rpec, cpec;
-
-	buf[1] = command;
-	switch (size) {
-	case I2C_SMBUS_BYTE_DATA:
-		buf[0] = (addr << 1) | 1;
-		cpec = i2c_smbus_pec(2, buf, NULL);
-		rpec = data->byte;
-		break;
-	case I2C_SMBUS_WORD_DATA:
-		buf[0] = (addr << 1) | 1;
-		buf[2] = data->word & 0xff;
-		cpec = i2c_smbus_pec(3, buf, NULL);
-		rpec = data->word >> 8;
-		break;
-	case I2C_SMBUS_WORD_DATA_PEC:
-		/* unsupported */
-		cpec = rpec = 0;
-		break;
-	case I2C_SMBUS_PROC_CALL_PEC:
-		/* unsupported */
-		cpec = rpec = 0;
-		break;
-	case I2C_SMBUS_BLOCK_DATA_PEC:
-		buf[0] = (addr << 1);
-		buf[2] = (addr << 1) | 1;
-		cpec = i2c_smbus_pec(3, buf, data->block);
-		rpec = data->block[data->block[0] + 1];
-		break;
-	case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-		buf[0] = (addr << 1) | 1;
-		rpec = i2c_smbus_partial_pec(partial, 1,
-					     buf, data->block);
-		cpec = data->block[data->block[0] + 1];
-		break;
-	default:
-		cpec = rpec = 0;
-		break;
-	}
-	if (rpec != cpec) {
-		pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n",
-			 rpec, cpec);
-		return -1;
-	}
-	return 0;
-}
-
-s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
-{
-	return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			      value, 0, I2C_SMBUS_QUICK, NULL);
-}
-
-s32 i2c_smbus_read_byte(struct i2c_client *client)
-{
-	union i2c_smbus_data data;
-
-	if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			   I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, &data))
-		return -1;
-	else
-		return 0x0FF & data.byte;
-}
-
-s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
-{
-	union i2c_smbus_data data;      /* only for PEC */
-
-	return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			      I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, &data);
-}
-
-s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
-{
-	union i2c_smbus_data data;
-
-	if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			   I2C_SMBUS_READ, command, I2C_SMBUS_BYTE_DATA, &data))
-		return -1;
-	else
-		return 0x0FF & data.byte;
-}
-
-s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
-{
-	union i2c_smbus_data data;
-
-	data.byte = value;
-	return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			      I2C_SMBUS_WRITE, command,
-			      I2C_SMBUS_BYTE_DATA, &data);
-}
-
-s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
-{
-	union i2c_smbus_data data;
-
-	if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			   I2C_SMBUS_READ, command, I2C_SMBUS_WORD_DATA, &data))
-		return -1;
-	else
-		return 0x0FFFF & data.word;
-}
-
-s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
-{
-	union i2c_smbus_data data;
-
-	data.word = value;
-	return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			      I2C_SMBUS_WRITE, command,
-			      I2C_SMBUS_WORD_DATA, &data);
-}
-
-s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
-			       u8 length, u8 *values)
-{
-	union i2c_smbus_data data;
-	int i;
-
-	if (length > I2C_SMBUS_BLOCK_MAX)
-		length = I2C_SMBUS_BLOCK_MAX;
-	for (i = 1; i <= length; i++)
-		data.block[i] = values[i - 1];
-	data.block[0] = length;
-	return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			      I2C_SMBUS_WRITE, command,
-			      I2C_SMBUS_BLOCK_DATA, &data);
-}
-
-/* Returns the number of read bytes */
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
-{
-	union i2c_smbus_data data;
-	int i;
-
-	if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-			   I2C_SMBUS_READ, command,
-			   I2C_SMBUS_I2C_BLOCK_DATA, &data))
-		return -1;
-	else {
-		for (i = 1; i <= data.block[0]; i++)
-			values[i - 1] = data.block[i];
-		return data.block[0];
-	}
-}
-
-/* Simulate a SMBus command using the i2c protocol
-   No checking of parameters is done!  */
-static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,
-				   unsigned short flags,
-				   char read_write, u8 command, int size,
-				   union i2c_smbus_data *data)
-{
-	/* So we need to generate a series of msgs. In the case of writing, we
-	   need to use only one message; when reading, we need two. We initialize
-	   most things with sane defaults, to keep the code below somewhat
-	   simpler. */
-	unsigned char msgbuf0[34];
-	unsigned char msgbuf1[34];
-	int num = read_write == I2C_SMBUS_READ ? 2 : 1;
-	struct i2c_msg msg[2] = { { addr, flags,            1, msgbuf0 },
-				  { addr, flags | I2C_M_RD, 0, msgbuf1 } };
-	int i;
-
-	msgbuf0[0] = command;
-	switch (size) {
-	case I2C_SMBUS_QUICK:
-		msg[0].len = 0;
-		/* Special case: The read/write field is used as data */
-		msg[0].flags = flags | (read_write == I2C_SMBUS_READ) ? I2C_M_RD : 0;
-		num = 1;
-		break;
-	case I2C_SMBUS_BYTE:
-		if (read_write == I2C_SMBUS_READ) {
-			/* Special case: only a read! */
-			msg[0].flags = I2C_M_RD | flags;
-			num = 1;
-		}
-		break;
-	case I2C_SMBUS_BYTE_DATA:
-		if (read_write == I2C_SMBUS_READ)
-			msg[1].len = 1;
-		else {
-			msg[0].len = 2;
-			msgbuf0[1] = data->byte;
-		}
-		break;
-	case I2C_SMBUS_WORD_DATA:
-		if (read_write == I2C_SMBUS_READ)
-			msg[1].len = 2;
-		else {
-			msg[0].len = 3;
-			msgbuf0[1] = data->word & 0xff;
-			msgbuf0[2] = (data->word >> 8) & 0xff;
-		}
-		break;
-	case I2C_SMBUS_PROC_CALL:
-		num = 2; /* Special case */
-		read_write = I2C_SMBUS_READ;
-		msg[0].len = 3;
-		msg[1].len = 2;
-		msgbuf0[1] = data->word & 0xff;
-		msgbuf0[2] = (data->word >> 8) & 0xff;
-		break;
-	case I2C_SMBUS_BLOCK_DATA:
-	case I2C_SMBUS_BLOCK_DATA_PEC:
-		if (read_write == I2C_SMBUS_READ) {
-			dev_err(&adapter->dev, "Block read not supported "
-				"under I2C emulation!\n");
-			return -1;
-		} else {
-			msg[0].len = data->block[0] + 2;
-			if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2) {
-				dev_err(&adapter->dev, "smbus_access called with "
-					"invalid block write size (%d)\n",
-					data->block[0]);
-				return -1;
-			}
-			if (size == I2C_SMBUS_BLOCK_DATA_PEC)
-				(msg[0].len)++;
-			for (i = 1; i <= msg[0].len; i++)
-				msgbuf0[i] = data->block[i - 1];
-		}
-		break;
-	case I2C_SMBUS_BLOCK_PROC_CALL:
-	case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-		dev_dbg(&adapter->dev, "Block process call not supported "
-			"under I2C emulation!\n");
-		return -1;
-	case I2C_SMBUS_I2C_BLOCK_DATA:
-		if (read_write == I2C_SMBUS_READ)
-			msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-		else {
-			msg[0].len = data->block[0] + 1;
-			if (msg[0].len > I2C_SMBUS_I2C_BLOCK_MAX + 1) {
-				dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "
-					"invalid block write size (%d)\n",
-					data->block[0]);
-				return -1;
-			}
-			for (i = 1; i <= data->block[0]; i++)
-				msgbuf0[i] = data->block[i];
-		}
-		break;
-	default:
-		dev_err(&adapter->dev, "smbus_access called with invalid size (%d)\n",
-			size);
-		return -1;
-	}
-
-	if (i2c_transfer(adapter, msg, num) < 0)
-		return -1;
-
-	if (read_write == I2C_SMBUS_READ)
-		switch (size) {
-		case I2C_SMBUS_BYTE:
-			data->byte = msgbuf0[0];
-			break;
-		case I2C_SMBUS_BYTE_DATA:
-			data->byte = msgbuf1[0];
-			break;
-		case I2C_SMBUS_WORD_DATA:
-		case I2C_SMBUS_PROC_CALL:
-			data->word = msgbuf1[0] | (msgbuf1[1] << 8);
-			break;
-		case I2C_SMBUS_I2C_BLOCK_DATA:
-			/* fixed at 32 for now */
-			data->block[0] = I2C_SMBUS_I2C_BLOCK_MAX;
-			for (i = 0; i < I2C_SMBUS_I2C_BLOCK_MAX; i++)
-				data->block[i + 1] = msgbuf1[i];
-			break;
-		}
-	return 0;
-}
-
-
-s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
-		   char read_write, u8 command, int size,
-		   union i2c_smbus_data *data)
-{
-	s32 res;
-	int swpec = 0;
-	u8 partial = 0;
-
-	flags &= I2C_M_TEN | I2C_CLIENT_PEC;
-	if ((flags & I2C_CLIENT_PEC) &&
-	    !(i2c_check_functionality(adapter, I2C_FUNC_SMBUS_HWPEC_CALC))) {
-		swpec = 1;
-		if (read_write == I2C_SMBUS_READ &&
-		    size == I2C_SMBUS_BLOCK_DATA)
-			size = I2C_SMBUS_BLOCK_DATA_PEC;
-		else if (size == I2C_SMBUS_PROC_CALL)
-			size = I2C_SMBUS_PROC_CALL_PEC;
-		else if (size == I2C_SMBUS_BLOCK_PROC_CALL) {
-			i2c_smbus_add_pec(addr, command,
-					  I2C_SMBUS_BLOCK_DATA, data);
-			partial = data->block[data->block[0] + 1];
-			size = I2C_SMBUS_BLOCK_PROC_CALL_PEC;
-		} else if (read_write == I2C_SMBUS_WRITE &&
-			   size != I2C_SMBUS_QUICK &&
-			   size != I2C_SMBUS_I2C_BLOCK_DATA)
-			size = i2c_smbus_add_pec(addr, command, size, data);
-	}
-
-	if (adapter->algo->smbus_xfer) {
-		down(&adapter->bus_lock);
-		res = adapter->algo->smbus_xfer(adapter, addr, flags, read_write,
-						command, size, data);
-		up(&adapter->bus_lock);
-	} else
-		res = i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
-					      command, size, data);
-
-	if (res >= 0 && swpec &&
-	    size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA &&
-	    (read_write == I2C_SMBUS_READ || size == I2C_SMBUS_PROC_CALL_PEC ||
-	     size == I2C_SMBUS_BLOCK_PROC_CALL_PEC))
-		if (i2c_smbus_check_pec(addr, command, size, partial, data))
-			return -1;
-	return res;
-}
-
-
-/* Next four are needed by i2c-isa */
-EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
-EXPORT_SYMBOL_GPL(i2c_adapter_driver);
-EXPORT_SYMBOL_GPL(i2c_adapter_class);
-EXPORT_SYMBOL_GPL(i2c_bus_type);
-
-EXPORT_SYMBOL(i2c_add_adapter);
-EXPORT_SYMBOL(i2c_del_adapter);
-EXPORT_SYMBOL(i2c_add_driver);
-EXPORT_SYMBOL(i2c_del_driver);
-EXPORT_SYMBOL(i2c_attach_client);
-EXPORT_SYMBOL(i2c_detach_client);
-EXPORT_SYMBOL(i2c_use_client);
-EXPORT_SYMBOL(i2c_release_client);
-EXPORT_SYMBOL(i2c_clients_command);
-EXPORT_SYMBOL(i2c_check_addr);
-
-EXPORT_SYMBOL(i2c_master_send);
-EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_control);
-EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_get_adapter);
-EXPORT_SYMBOL(i2c_put_adapter);
-EXPORT_SYMBOL(i2c_probe);
-
-EXPORT_SYMBOL(i2c_smbus_xfer);
-EXPORT_SYMBOL(i2c_smbus_write_quick);
-EXPORT_SYMBOL(i2c_smbus_read_byte);
-EXPORT_SYMBOL(i2c_smbus_write_byte);
-EXPORT_SYMBOL(i2c_smbus_read_byte_data);
-EXPORT_SYMBOL(i2c_smbus_write_byte_data);
-EXPORT_SYMBOL(i2c_smbus_read_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
-
-MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
-MODULE_DESCRIPTION("I2C-Bus main module");
-MODULE_LICENSE("GPL");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/example.c
deleted file mode 100644
index 7c8edf79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/example.c
+++ /dev/null
@@ -1,117 +0,0 @@
-
-const char *token_names[] =
-{
-   [CT_POUND]        = "POUND",
-   [CT_PREPROC]      = "PREPROC",
-   [CT_PREPROC_BODY] = "PREPROC_BODY",
-   [CT_PP]           = "PP",
-};
-
-
-int main(int argc, char *argv[])
-{
-   struct junk a[] =
-   {
-      { "version",  0,   0,   0 },
-      { "file",     1, 150, 'f' },
-      { "config",   1,   0, 'c' },
-      { "parsed",  25,   0, 'p' },
-      { NULL,       0,   0,   0 }
-   };
-}
-
-
-color_t colors[] =
-{
-   { "red",   { 255, 0,   0 } }, { "blue",   {   0, 255, 0 } },
-   { "green", {   0, 0, 255 } }, { "purple", { 255, 255, 0 } },
-};
-
-
-struct foo_t bar =
-{
-   .name = "bar",
-   .age  = 21
-};
-
-
-struct foo_t bars[] =
-{
-   [0] = { .name = "bar",
-           .age  = 21 },
-   [1] = { .name = "barley",
-           .age  = 55 },
-};
-
-void foo(void)
-{
-   int  i;
-   char *name;
-
-   i    = 5;
-   name = "bob";
-}
-
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-{
-   int idx;
-   int res = 0;      // trailing comment
-                     // that spans two lines
-   for (idx = 1; idx < bar; idx++)
-      /* comment in virtual braces */
-      res += idx;
-
-   res *= idx;        // some comment
-
-   // almost continued, but a NL in between
-
-// col1 comment in level 1
-   return(res);
-}
-
-// col1 comment in level 0
-
-
-#define foobar(x)             \
-   {                          \
-      for (i = 0; i < x; i++) \
-      {                       \
-         junk(i, x);          \
-      }                       \
-   }
-
-
-void foo(void)
-{
-   switch(ch)
-   {
-   case 'a':
-      {
-         handle_a();
-         break;
-      }
-
-   case 'b':
-      handle_b();
-      break;
-
-   case 'c':
-   case 'd':
-      handle_cd();
-      break;
-
-   case 'e':
-      {
-         handle_a();
-      }
-      break;
-
-   default:
-      handle_default();
-      break;
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/images/linuxlinks.gif b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/images/linuxlinks.gif
deleted file mode 100644
index d3adec5c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/images/linuxlinks.gif
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/index.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/index.html
deleted file mode 100644
index f1e82751..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/index.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Uncrustify - Source Code Beautifier for C-like languages</title>
-   <link rel="stylesheet" type="text/css" href="uncrustify1.css" />
-   <!-- <link rel="shortcut icon" href="images/favicon.ico" /> -->
-</head>
-<body lang="en-us" dir="ltr">
-
-<div align="center">
-<table>
-<tr>
-<td align="center">
-<div class="node1" align="center">
-<div class="node2" align="left">
-<h1>Uncrustify</h1>
-<h2>Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA</h2>
-<table>
- <tr>
-  <td valign="top">
-   <script type='text/javascript' language='JavaScript' src='http://www.ohloh.net/projects/4765/badge_js'></script>
-  </td>
-  <td valign="top">
-   <a href="https://travis-ci.org/uncrustify/uncrustify/builds">
-    <img alt="Travis CI Build Status"
-         src="https://travis-ci.org/uncrustify/uncrustify.svg?branch=master"/>
-   </a>
-  </td>
-  <td valign="top">
-   <a href="https://scan.coverity.com/projects/uncrustify">
-    <img alt="Coverity Scan Build Status"
-         src="https://scan.coverity.com/projects/8264/badge.svg"/>
-   </a>
-  </td>
- </tr>
-</table>
-
-<h2>Introduction</h2>
-<p>The goals of this project are simple:
-Create a highly configurable, easily modifiable source code beautifier.</p>
-
-<br />
-
-<h2>Features</h2>
-<ul>
-   <li>Indent code, aligning on parens, assignments, etc</li>
-   <li>Align on '=' and variable definitions</li>
-   <li>Align structure initializers</li>
-   <li>Align #define stuff</li>
-   <li>Align backslash-newline stuff</li>
-   <li>Reformat comments (a little bit)</li>
-   <li>Fix inter-character spacing</li>
-   <li>Add or remove parens on return statements</li>
-   <li>Add or remove braces on single-statement if/do/while/for statements</li>
-   <li>Supports embedded SQL 'EXEC SQL' stuff</li>
-   <li>Highly configurable - 753 configurable options as of version 0.73.0</li>
-</ul>
-
-<p>
-   See some example <a href="examples/example.c">output</a>.
-</p>
-
-<br />
-
-<h2>Where to get Uncrustify</h2>
-
-<h3>Project Websites</h3>
-<a href="http://sourceforge.net/projects/uncrustify/">Sourceforge project web site</a><BR>
-<a href="http://sourceforge.net/projects/uncrustify/files/">Release downloads</a><br>
-<a href="http://freshmeat.net/projects/uncrustify/">Freshmeat Project</a><BR>
-<a href="http://github.com/uncrustify/uncrustify">Git Hub</a><br>
-
-<h3>Source Code</h3>
-As of release 0.54, the source code is maintained in a <a href="http://git-scm.com/">Git</a> repository.<br>
-<br>
-The public Git URL for Sourceforge.net is <br>
-<code>git://uncrustify.git.sourceforge.net/gitroot/uncrustify/uncrustify</code><br>
-<br>
-The public Git URL for github.com is <br>
-<code>git://github.com/uncrustify/uncrustify.git</code><br>
-
-<h3>Prebuilt binaries</h3>
-Windows (i386) :
-<a href="http://sourceforge.net/project/showfiles.php?group_id=153164">Sourceforge</A><BR>
-
-SPARC/Solaris 2.5-10 and x86/Solaris 8-10 :
-<a href="http://sunfreeware.com/">sunfreeware.com</a><BR>
-
-<h3>Universal Indent GUI</h3>
-<a href="http://universalindent.sourceforge.net/">Universal Indent GUI</a> is a
-cross-platform graphical configuration file editor for many code beautifiers, including Uncrustify.
-
-<br />
-
-<h2>Want to help?</h2>
-<p>
-The most helpful way is to try it out and give feedback.
-Documentation and examples are available in the source tree, so check it out.
-</p>
-<p>
-You can find the output from 'uncrustify --show-config' <a href="config.txt">here</a>.<br />
-Here is the <a href="default.cfg">default config file</a>.
-And one I set up for <a href="linux.cfg.txt">Linux</a>.<br />
-And here is a <a href="examples/c-1.in.c">before</a> and <a href="examples/c-1.out.c">after</a> C source example.<br />
-That should give you a pretty good idea of what Uncrustify can do.<br />
-</p>
-
-<p>
-If you find a bug, please do the following:
-</p>
-<ul>
-<li>Reduce the input source file to the minimum that still has the problem</li>
-<li>Use the sourceforget.net bug tracker</li>
-<li>Attach the input source file, the configuration file, and a file that contains the expected output</li>
-</ul>
-
-<p>
-If you want to add a feature, fix a bug, or implement missing functionality, feel free to do so! Patches are welcome!<BR/>
-Here are some areas that need attention:
-</p>
-<ul>
-   <li>Test Java support and provide feedback (or patches!)</li>
-   <li>Test Objective C support and provide feedback (or patches!)</li>
-   <li>Test Embedded SQL to see what works</li>
-   <li>This web page need a (re)design</li>
-   <li>A logo of some sort</li>
-   <li>Examples that can be put on this website to show off what Uncrustify can do</li>
-   <li>Anything else that you want to do to make it better?</li>
-</ul>
-
-<h3>Project Mailing list</h3>
-We don't have a mailing list for Uncrustify.<BR/>
-We are using <a href="https://github.com/uncrustify/uncrustify/">github</a>.
-<br>
-You may use <a href="https://github.com/uncrustify/uncrustify/issues">Issues</a> to publish an error report.
-<br>
-Or <a href="https://github.com/uncrustify/uncrustify/pulls">PR</a> to make a bugfix proposal.
-
-<br />
-
-<h2>Portability</h2>
-<p>
-I'm pretty sure that I'm not using anything that is OS-specific.<br />
-The software has been tested on the following operating systems:
-</p>
-<ul>
-   <li>Linux</li>
-   <li>QNX</li>
-   <li>OS X</li>
-   <li>FreeBSD, NetBSD, OpenBSD</li>
-   <li>Sun Solaris 9</li>
-   <li>Windows XP (binary available)</li>
-</ul>
-
-<br />
-
-<h2>Links</h2>
-<ul>
-   <li><a href="http://universalindent.sourceforge.net/">Universal Indent GUI</a></li>
-   <li>Don't know what D is?  Check out the <a href="http://dlang.org/index.html">D Programming Language website</a>.</li>
-   <li><a href="http://www.linuxlinks.com">Linux Links</a></li>
-</ul>
-<h2>Distributions that package Uncrustify</h2>
-<ul>
-   <li><A href="http://www.debian.org/">Debian</A>
-   <li><A href="http://fedora.redhat.com/">Fedora</A></li>
-   <li><A href="http://www.altlinux.com/">ALT Linux</A></li>
-   <li><A href="http://www.t2-project.org/">T2</A></li>
-   <li><A href="http://www.macports.org/">MacPorts</a></li>
-   <li><A href="http://www.freebsd.org/cgi/ports.cgi?query=uncrustify">FreeBSD Ports (textproc/uncrustify)</a></li>
-   <li><A href="http://openports.se/textproc/uncrustify">OpenBSD Ports (textproc/uncrustify)</a></li>
-   <li>Others?</li>
-</ul>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<br />
-<a href="http://sourceforge.net/donate/index.php?group_id=153164">"Support This Project"</a>
-<br />
-
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/linux.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/linux.cfg.txt
deleted file mode 100644
index baae9848..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/linux.cfg.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# uncrustify config file for the linux kernel
-#
-
-indent_with_tabs	= 2		# 1=indent to level only, 2=indent with tabs
-input_tab_size		= 8		# original tab size
-output_tab_size		= 8		# new tab size
-indent_columns		= output_tab_size
-
-indent_label		= 1		# pos: absolute col, neg: relative column
-
-
-#
-# inter-symbol newlines
-#
-
-nl_enum_brace		= remove	# "enum {" vs "enum \n {"
-nl_union_brace		= remove	# "union {" vs "union \n {"
-nl_struct_brace		= remove	# "struct {" vs "struct \n {"
-nl_do_brace 		= remove	# "do {" vs "do \n {"
-nl_if_brace 		= remove	# "if () {" vs "if () \n {"
-nl_for_brace 		= remove	# "for () {" vs "for () \n {"
-nl_else_brace 		= remove	# "else {" vs "else \n {"
-nl_while_brace 		= remove	# "while () {" vs "while () \n {"
-nl_switch_brace 	= remove	# "switch () {" vs "switch () \n {"
-nl_brace_while		= remove	# "} while" vs "} \n while" - cuddle while
-nl_brace_else		= remove	# "} else" vs "} \n else" - cuddle else
-nl_func_var_def_blk	= 1
-nl_fcall_brace		= remove	# "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace		= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return		= TRUE;
-# nl_before_case	= 1
-
-
-#
-# Source code modifications
-#
-
-mod_paren_on_return	= remove	# "return 1;" vs "return (1);"
-mod_full_brace_if	= remove	# "if (a) a--;" vs "if (a) { a--; }"
-mod_full_brace_for	= remove	# "for () a--;" vs "for () { a--; }"
-mod_full_brace_do	= remove	# "do a--; while ();" vs "do { a--; } while ();"
-mod_full_brace_while	= remove	# "while (a) a--;" vs "while (a) { a--; }"
-mod_full_brace_nl	= 3		# don't remove if more than 3 newlines
-
-
-#
-# inter-character spacing options
-#
-
-# sp_return_paren	= force		# "return (1);" vs "return(1);"
-sp_sizeof_paren		= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen	= force		# "if (" vs "if("
-sp_after_sparen		= force		# "if () {" vs "if (){"
-sp_after_cast		= remove	# "(int) a" vs "(int)a"
-sp_inside_braces	= add		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct	= add		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum	= add		# "{ 1 }" vs "{1}"
-sp_assign		= add
-sp_arith		= add
-sp_bool			= add
-sp_compare		= add
-sp_assign		= add
-sp_after_comma		= add
-sp_func_def_paren	= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren	= remove	# "foo (" vs "foo("
-sp_func_proto_paren	= remove	# "int foo ();" vs "int foo();"
-
-
-#
-# Aligning stuff
-#
-
-align_with_tabs		= TRUE		# use tabs to align
-align_on_tabstop	= TRUE 		# align on tabstops
-# align_keep_tabs		= true
-align_enum_equ_span		= 4		# '=' in enum definition
-# align_nl_cont		= TRUE
-# align_var_def_span	= 2
-# align_var_def_inline	= TRUE
-# align_var_def_star	= FALSE
-# align_var_def_colon	= TRUE
-# align_assign_span	= 1
-align_struct_init_span	= 3		# align stuff in a structure init '= { }'
-align_right_cmt_span	= 3
-# align_pp_define_span	= 8;
-# align_pp_define_gap	= 4;
-
-# cmt_star_cont		= FALSE
-
-# indent_brace		= 0
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options.html
deleted file mode 100644
index 554836c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-Move the cursor to a caret to see which option operates at this part of the code.
-<h2>New lines</h2>
-You want to "add/ force/ ignore/ remove" a <a href="options_NewLines.html">new line.</a>
-<h2>Namespace</h2>
-You want to "add/ force/ ignore/ remove" a <a href="options_Namespace.html">new line.</a>
-<h2>Positioning</h2>
-You want to change a <a href="options_Positioning.html">position.</a>
-<h2>Spaces</h2>
-You want to "add/ force/ ignore/ remove" a <a href="options_Spaces.html">space</a> at some places.
-<h2>Code modifying</h2>
-You want to <a href="options_ModifyCode.html">modify the code.</a>
-<h2>Indenting</h2>
-You want to <a href="options_Indenting.html">indent the code.</a>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ASM.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ASM.html
deleted file mode 100644
index 4de0e7bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ASM.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work-Java</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work ASM ?</h1>
-
-<p>
-</p>
-<h2>Spaces for ASM</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-void foo()
-{
-        int head, bar;
-        __asm__ __volatile__
-        (
-                "movq %0,%%xmm0\n\t"    /* asm template */
-        "0:\n\t"
-                "bar    %0,<a title="sp_before_square_asm_block"><strong><font color="red">â–ˆ</font></strong></a>[%4]\n\t"   // in template
-        "1:\n\t"
-                : "=a", (bar)
-                : "=&b", (&head), "+m", (bar)
-                : "cc"
-        );
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Align.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Align.html
deleted file mode 100644
index b034a132..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Align.html
+++ /dev/null
@@ -1,44 +0,0 @@
-#define SUCCESS    0
-                â–ˆ
-align_pp_define_gap
-The minimum space between label and value of a preprocessor define
-
-#define set_chunk_type(pc, tt)      do { \
-      LOG_FUNC_CALL(); \
-      set_chunk_type_real((pc), (tt)); \
-} while (false)
-align_nl_cont                 = true
-
-#define LOG_STR(sev, str, len)                           \
-   do { if (log_sev_on(sev)) { log_str(sev, str, len); } } while (0)
-                                                          â–ˆ
-nl_after_brace_close
-
-
-extern struct cp_data cpd;
-
-extern bool           QT_SIGNAL_SLOT_found;
-extern int            QT_SIGNAL_SLOT_level;
-extern bool           restoreValues;
-align_var_def_span    â–ˆ
-
-enum argval_t
-{
-   AV_IGNORE      = 0,
-   AV_ADD         = 1,
-   AV_REMOVE      = 2,
-   AV_FORCE       = 3, /**< remove + add */
-   AV_NOT_DEFINED = 4  /* to be used with QT, SIGNAL SLOT macros */
-};
-                  â–ˆ
-align_var_struct_span
-
-
-   UO_indent_var_def_blk,            // indent a variable def block that appears at the top
-   UO_indent_var_def_cont,
-   UO_indent_shift,                  // if a shift expression spans multiple lines, indent
-
-   UO_indent_min_vbrace_open,        // min. indent after virtual brace open and newline
-   UO_indent_vbrace_open_on_tabstop, // when identing after virtual brace open and newline add further spaces to reach next tabstop
-
-align_right_cmt_span
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_CLI_NET.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_CLI_NET.html
deleted file mode 100644
index 8838cdf0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_CLI_NET.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work-Java</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work CLI .NET ?</h1>
-
-<p>
-</p>
-<h2>Spaces for CLI .NET</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-
-    Foo^ foo = dynamic_cast<Bar^>(bar);
-    <a title="sp_after_ptr_block_caret"><strong><font color="red">    â–ˆ</font></strong></a>
-
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_C_sharp.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_C_sharp.html
deleted file mode 100644
index 74767b9d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_C_sharp.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work-Java</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work C-# ?</h1>
-
-<p>
-</p>
-<h2>Spaces for C-#</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-
-    int[ , , ] testArray = new int[4, 2, 3];
-    <a title="sp_before_mdatype_commas"><strong><font color="red">    â–ˆ</font></strong></a><a title="sp_between_mdatype_commas"><strong><font color="red"> â–ˆ</font></strong></a><a title="sp_after_mdatype_commas"><strong><font color="red"> â–ˆ</font></strong></a>
-
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_D.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_D.html
deleted file mode 100644
index 308b5c58..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_D.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work-D</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work-D?</h1>
-
-<p>
-</p>
-<h2>Spaces-D</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-
-    invariant (C) c;
-    <a title="sp_after_invariant_paren"><strong><font color="red">             â–ˆ</font></strong></a>
-
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Indenting.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Indenting.html
deleted file mode 100644
index 132628da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Indenting.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Indenting options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Indenting</h2>
-<p>
-</p>
-<table border="1">
-<tr>
-<td>
-<pre><a name="indent_with_tabs"></a><a name="indent_cmt_with_tabs"></a>
-// indent_with_tabs     = 0 spaces only
-// indent_cmt_with_tabs = false
-int foo::bar()
-{<a name="indent_columns"></a>
-    int a;
-<a title="indent_columns"><strong><font color="red">████</font></strong></a><a name="indent_continue"></a><a name="use_indent_continue_only_once"></a>
-    double a_very_long_variable = test (foobar1,
-        foobar5);
-    <a title="indent_continue, use_indent_continue_only_once"><strong><font color="red">████</font></strong></a>
-}
-</pre>
-</td>
-</tr>
-<tr>
-<td>
-<pre>
-class Test
-{<a name="indent_access_spec"></a>
- private:
-<a title="indent_access_spec"><strong><font color="red">â–ˆ</font></strong></a>
-   int a;
-}
-</pre>
-</td>
-</tr>
-</table>
-<p></p>
-<h1>Register</h1>
-<table>
-  <tr>
-    <td><a href="#indent_columns">indent_columns</a></td>
-    <td><a href="#indent_continue">indent_continue</a></td>
-    <td><a href="#indent_with_tabs">indent_with_tabs</a></td>
-    <td><a href="#indent_cmt_with_tabs">indent_cmt_with_tabs</a></td>
-    <td><a href="#indent_align_string">indent_align_string</a></td>
-    <td><a href="#indent_xml_string">indent_xml_string</a></td>
-    <td><a href="#indent_brace">indent_brace</a></td>
-    <td><a href="#indent_braces">indent_braces</a></td>
-    <td><a href="#indent_braces_no_func">indent_braces_no_func</a></td>
-    <td><a href="#indent_braces_no_class">indent_braces_no_class</a></td>
-    <td><a href="#indent_braces_no_struct">indent_braces_no_struct</a></td>
-    <td><a href="#indent_brace_parent">indent_brace_parent</a></td>
-    <td><a href="#indent_paren_open_brace">indent_paren_open_brace</a></td>
-    <td><a href="#indent_namespace">indent_namespace</a></td>
-    <td><a href="#indent_namespace_single_indent">indent_namespace_single_indent</a></td>
-    <td><a href="#indent_namespace_level">indent_namespace_level</a></td>
-    <td><a href="#indent_namespace_limit">indent_namespace_limit</a></td>
-    <td><a href="#indent_extern">indent_extern</a></td>
-    <td><a href="#indent_class">indent_class</a></td>
-    <td><a href="#indent_class_colon">indent_class_colon</a></td>
-    <td><a href="#indent_class_on_colon">indent_class_on_colon</a></td>
-    <td><a href="#indent_constr_colon">indent_constr_colon</a></td>
-    <td><a href="#indent_ctor_init_leading">indent_ctor_init_leading</a></td>
-    <td><a href="#indent_ctor_init">indent_ctor_init</a></td>
-    <td><a href="#indent_else_if">indent_else_if</a></td>
-    <td><a href="#indent_var_def_blk">indent_var_def_blk</a></td>
-    <td><a href="#indent_var_def_cont">indent_var_def_cont</a></td>
-    <td><a href="#indent_shift">indent_shift</a></td>
-    <td><a href="#indent_func_def_force_col1">indent_func_def_force_col1</a></td>
-    <td><a href="#indent_func_call_param">indent_func_call_param</a></td>
-    <td><a href="#indent_func_def_param">indent_func_def_param</a></td>
-    <td><a href="#indent_func_proto_param">indent_func_proto_param</a></td>
-    <td><a href="#indent_func_class_param">indent_func_class_param</a></td>
-    <td><a href="#indent_func_ctor_var_param">indent_func_ctor_var_param</a></td>
-    <td><a href="#indent_template_param">indent_template_param</a></td>
-    <td><a href="#indent_func_param_double">indent_func_param_double</a></td>
-    <td><a href="#indent_func_const">indent_func_const</a></td>
-    <td><a href="#indent_func_throw">indent_func_throw</a></td>
-    <td><a href="#indent_member">indent_member</a></td>
-    <td><a href="#indent_sing_line_comments">indent_sing_line_comments</a></td>
-    <td><a href="#indent_relative_single_line_comments">indent_relative_single_line_comments</a></td>
-    <td><a href="#indent_switch_case">indent_switch_case</a></td>
-    <td><a href="#indent_case_shift">indent_case_shift</a></td>
-    <td><a href="#indent_case_brace">indent_case_brace</a></td>
-    <td><a href="#indent_col1_comment">indent_col1_comment</a></td>
-    <td><a href="#indent_label">indent_label</a></td>
-    <td><a href="#indent_access_spec">indent_access_spec</a></td>
-    <td><a href="#indent_access_spec_body">indent_access_spec_body</a></td>
-    <td><a href="#indent_paren_nl">indent_paren_nl</a></td>
-    <td><a href="#indent_paren_close">indent_paren_close</a></td>
-    <td><a href="#indent_comma_paren">indent_comma_paren</a></td>
-    <td><a href="#indent_bool_paren">indent_bool_paren</a></td>
-    <td><a href="#indent_first_bool_expr">indent_first_bool_expr</a></td>
-    <td><a href="#indent_square_nl">indent_square_nl</a></td>
-    <td><a href="#indent_preserve_sql">indent_preserve_sql</a></td>
-    <td><a href="#indent_align_assign">indent_align_assign</a></td>
-    <td><a href="#indent_off_after_assign">indent_off_after_assign</a></td>
-
-    <td><a href="#indent_min_vbrace_open">indent_min_vbrace_open</a></td>
-    <td><a href="#indent_vbrace_open_on_tabstop">indent_vbrace_open_on_tabstop</a></td>
-    <td><a href="#use_indent_continue_only_once">use_indent_continue_only_once</a></td>
-  </tr>
-  <tr>
-  </tr>
-</table>
-
-<h2>not yet shown</h2>
-
-<h2>only for Pawn</h2>
-
-<h2>only for Java</h2>
-
-<h2>only for objective C</h2>
-indent_oc_msg_colon<br>
-indent_oc_msg_prioritize_first_colon<br>
-indent_oc_block_msg_xcode_style<br>
-indent_oc_block_msg_from_keyword<br>
-indent_oc_block_msg_from_colon<br>
-indent_oc_block_msg_from_caret<br>
-indent_oc_block_msg_from_brace<br>
-indent_oc_inside_msg_sel<br>
-
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Java.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Java.html
deleted file mode 100644
index 80083042..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Java.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work-Java</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work-Java?</h1>
-
-<p>
-</p>
-<h2>Spaces-Java</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-
-    for (Type var : expr)
-    <a title="sp_after_for_colon"><strong><font color="red">               â–ˆ</font></strong></a>
-
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ModifyCode.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ModifyCode.html
deleted file mode 100644
index e20e1098..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ModifyCode.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Positioning options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Code modifying</h2>
-<p>
-</p>
-<table border="1">
-<tr>
-<td>
-<pre>
-namespace a::b
-{
-int foo::bar()
-{
-    switch(xx) {
-    case 1: <a name="mod_full_brace_do"></a><a name="mod_full_brace_for"></a>
-        do { ++i; } while (++cnt < 1000);
-        <a title="mod_full_brace_do"><strong><font color="red">   â–ˆ      â–ˆ</font></strong></a>
-        for (i = 0; i < 5; i++) { bar(i); }
-        <a title="mod_full_brace_for"><strong><font color="red">                        â–ˆ         â–ˆ</font></strong></a><a name="mod_full_brace_if"></a><a name="mod_full_brace_if_chain"></a><a name="mod_full_brace_nl"></a>
-        if (a != b) {
-        <a title="mod_full_brace_nl"><strong><font color="red">            â–ˆ</a>
-        <a title="mod_full_brace_if">            â–ˆ</a>
-        <a title="mod_full_brace_if_chain">            â–ˆ</font></strong></a>
-           x = a;
-           if (c == d)
-           <a title="mod_full_brace_if"><strong><font color="red">           â–ˆ</font></strong></a>
-              y = 5;
-        }
-        <a title="mod_full_brace_nl"><strong><font color="red">â–ˆ</a>
-        <a title="mod_full_brace_if">â–ˆ</a>
-        <a title="mod_full_brace_if_chain">â–ˆ</font></strong></a><a name="mod_full_brace_while"></a>
-        while (a == b)
-        <a title="mod_full_brace_while"><strong><font color="red">              â–ˆ</font></strong></a>
-            c++;
-        <a title="mod_full_brace_while"><strong><font color="red">â–ˆ</font></strong></a><a name="mod_full_paren_if_bool"></a>
-        if (( a < b) && ( b > c)) {
-        <a title="mod_full_paren_if_bool"><strong><font color="red">    â–ˆ      â–ˆ    â–ˆ      â–ˆ</font></strong></a><a name="mod_paren_on_return"></a>
-        return (nCount);
-        <a title="mod_paren_on_return"><strong><font color="red">       â–ˆ      â–ˆ</font></strong></a><a name="mod_remove_extra_semicolon"></a>
-        if (a) {
-            foo();;
-            <a title="mod_remove_extra_semicolon"><strong><font color="red">      â–ˆ</font></strong></a>
-        };
-        <a title="mod_remove_extra_semicolon"><strong><font color="red"> â–ˆ</font></strong></a>
-        break;<a name="mod_move_case_break"></a>
-    case 2: {<a name="mod_case_brace"></a>
-            int b;
-            b = 2;
-        }
-        <a title="mod_case_brace"><strong><font color="red">â–ˆ</font></strong></a>
-        break;
-        <a title="mod_move_case_break"><strong><font color="red">â–ˆ</font></strong></a>
-    default:<a name="mod_add_long_switch_closebrace_comment"></a>
-        handle_the_rest();
-        break;
-    } // switch
-    <a title="mod_add_long_switch_closebrace_comment"><strong><font color="red">  â–ˆ</font></strong></a><a name="mod_add_long_function_closebrace_comment"></a>
-} // foo::bar
-<a title="mod_add_long_function_closebrace_comment"><strong><font color="red">  â–ˆ</font></strong></a><a name="mod_add_long_namespace_closebrace_comment"></a>
-} // namespace a::b
-<a title="mod_add_long_namespace_closebrace_comment"><strong><font color="red">  â–ˆ</font></strong></a>
-<a name="mod_remove_empty_return"></a>
-void a()
-{
-    return;
-    <a title="mod_remove_empty_return"><strong><font color="red">â–ˆ</font></strong></a>
-}
-</pre>
-</td>
-</tr>
-</table>
-<p></p>
-<h1>Register</h1>
-<table>
-  <tr>
-    <td><a href="#mod_add_long_function_closebrace_comment">mod_add_long_function_closebrace_comment</a></td>
-    <td><a href="#mod_add_long_ifdef_else_comment">mod_add_long_ifdef_else_comment</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_add_long_ifdef_endif_comment">mod_add_long_ifdef_endif_comment</a></td>
-    <td><a href="#mod_add_long_namespace_closebrace_comment">mod_add_long_namespace_closebrace_comment</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_add_long_switch_closebrace_comment">mod_add_long_switch_closebrace_comment</a></td>
-    <td><a href="#mod_case_brace">mod_case_brace</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_full_brace_do">mod_full_brace_do</a></td>
-    <td><a href="#mod_full_brace_for">mod_full_brace_for</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_full_brace_function">mod_full_brace_function</a></td>
-    <td><a href="#mod_full_brace_if_chain">mod_full_brace_if_chain</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_full_brace_if">mod_full_brace_if</a></td>
-    <td><a href="#mod_full_brace_nl">mod_full_brace_nl</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_full_brace_using">mod_full_brace_using</a></td>
-    <td><a href="#mod_full_brace_while">mod_full_brace_while</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_full_paren_if_bool">mod_full_paren_if_bool</a></td>
-    <td><a href="#mod_move_case_break">mod_move_case_break</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_paren_on_return">mod_paren_on_return</a></td>
-    <td><a href="#mod_pawn_semicolon">mod_pawn_semicolon</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_remove_empty_return">mod_remove_empty_return</a></td>
-    <td><a href="#mod_remove_extra_semicolon">mod_remove_extra_semicolon</a></td>
-    </tr>
-  <tr>
-    <td><a href="#mod_sort_import">mod_sort_import</a></td>
-    <td><a href="#mod_sort_include">mod_sort_include</a></td>
-    <td><a href="#mod_sort_incl_import_prioritize_filename">mod_sort_incl_import_prioritize_filename</a></td>
-    <td><a href="#mod_sort_incl_import_prioritize_extensionless">mod_sort_incl_import_prioritize_extensionless</a></td>
-    <td><a href="#mod_sort_incl_import_prioritize_angle_over_quotes">mod_sort_incl_import_prioritize_angle_over_quotes</a></td>
-    <td><a href="#mod_sort_incl_import_ignore_extension">mod_sort_incl_import_ignore_extension</a></td>
-    <td><a href="#mod_sort_incl_import_grouping_enabled">mod_sort_incl_import_grouping_enabled</a></td>
-  </tr>
-  <tr>
-    <td><a href="#mod_sort_using">mod_sort_using</a></td>
-  </tr>
-</table>
-
-<h2>not yet shown</h2>
-mod_full_brace_using<br>
-mod_add_long_ifdef_endif_comment<br>
-mod_add_long_ifdef_else_comment<br>
-mod_sort_include<br>
-
-<h2>only for Pawn</h2>
-mod_full_brace_function<br>
-mod_pawn_semicolon<br>
-
-<h2>only for Java</h2>
-mod_sort_import<br>
-
-<h2>only for C#</h2>
-mod_sort_using<br>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Namespace.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Namespace.html
deleted file mode 100644
index 74589df0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Namespace.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the New Lines options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces and New lines for Namespace</h2>
-<p>
-</p>
-<hr><a name="nl_namespace_brace"></a>
-<pre>
-namespace fooA {
-<a title="nl_namespace_brace"><strong><font color="red">              â–ˆ</font></strong></a>
-  // use here nl_namespace_brace=false
-     ...
-<a name="sp_word_brace_ns"></a>
-namespace fooB {<a name="nl_after_brace_open"></a>
-<a title="sp_word_brace_ns"><strong><font color="red">              â–ˆ</font></strong></a>
-// sp_word_brace_ns=true
-<a title="indent_namespace"><strong><font color="red">          â–ˆ</font></strong></a><a title="indent_namespace_level"><strong><font color="red">     â–ˆ</font></strong></a>void a();
-// indent_namespace=true"
-// indent_namespace_level=5"
-     ...
-
-namespace foo1 {<a title="indent_namespace_single_indent"><strong><font color="red">     â–ˆ</font></strong></a>
-  // indent_namespace_single_indent=true
-namespace foo2 {
-<a title="indent_namespace"><strong><font color="red">    â–ˆ</font></strong></a>void a();
-  // indent_namespace=true
-     ...
-
-namespace fooC {
-<a title="indent_namespace"><strong><font color="red">     â–ˆ</font></strong></a>
-  // indent_namespace=true
-<a title="indent_namespace_limit"><strong><font color="red">  â–ˆ</font></strong></a>
-  // indent_namespace_limit=3
-void a();
-void b();
-void c();
-}
-
-namespace dudeNamespace
-<a title="nl_namespace_two_to_one_liner"><strong><font color="red">â–ˆ</font></strong></a>
-{ class ForwardFooClass; }
-
-
-namespace fooD {
-<a title="nl_inside_namespace"><strong><font color="red">  â–ˆ</font></strong></a>
-  // nl_inside_namespace=2
-	void a();
-	void b();
-	void c();
-<a title="nl_inside_namespace"><strong><font color="red">  â–ˆ</font></strong></a>
-  // nl_inside_namespace=2
-}
-
-namespace fooD {
-	void a();
-	void b();
-	void c();
-}<a title="mod_add_long_namespace_closebrace_comment"><strong><font color="red">  â–ˆ</font></strong></a>// namespace fooD
-  // mod_add_long_namespace_closebrace_comment=2
-
-
-</pre>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_NewLines.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_NewLines.html
deleted file mode 100644
index 9d9ad656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_NewLines.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the New Lines options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>New lines</h2>
-<p>
-</p>
-<hr>
-<pre>
-<a title="nl_remove_extra_newlines"><strong><font color="red">â–ˆ</font></strong></a>
-<a title="nl_start_of_file"><strong><font color="red"><strong><font color="red">â–ˆ</font></strong></font></strong></a>
-void bar_0();  // function definition
-<a title="nl_func_paren"><strong><font color="red">          â–ˆ</a><a title="nl_func_def_empty">â–ˆ</font></strong></a>
-void bar_0()   // function declaration
-<a title="nl_func_def_paren"><strong><font color="red">          â–ˆ</a><a title="nl_func_decl_empty">â–ˆ</font></strong></a>
-void A::bar_1(int a);
-<a title="nl_func_scope_name"><strong><font color="red">        â–ˆ</a><a title="nl_func_def_start">    â–ˆ</a><a title="nl_func_def_end_single">     â–ˆ</font></strong></a>
-void bar_2(int a) <a title="nl_fdef_brace"><strong><font color="red">â–ˆ</font></strong></a>
-<a title="nl_func_type_name"><strong><font color="red">    â–ˆ</a><a title="nl_func_decl_start">     â–ˆ</a><a title="nl_func_decl_end">     â–ˆ</font></strong></a>
-<a title="nl_func_decl_start_single"><strong><font color="red">          â–ˆ</a><a title="nl_func_decl_end_single">     â–ˆ</font></strong></a>
-{<a title="nl_collapse_empty_body"><strong><font color="red">â–ˆ</font></strong></a>
-}
-<a title="nl_after_func_body"><strong><font color="red">â–ˆ</font></strong></a>
-void bar_3(int x,
-           int y)
-<a title="nl_func_def_args"><strong><font color="red">          â–ˆ</a><a title="nl_func_decl_end">    â–ˆ</font></strong></a>
-{
-    int a = 5;<a title="nl_after_semicolon"><strong><font color="red"> â–ˆ</font></strong></a>
-    int b = 7;
-    <a title="nl_func_var_def_blk"><strong><font color="red">    â–ˆ</font></strong></a>
-    a = 135;
-    list_for_each(item, list) {
-<a title="nl_fcall_brace"><strong><font color="red">                             â–ˆ</font></strong></a>
-    }
-<a title="nl_before_block_comment"><strong><font color="red">    â–ˆ</font></strong></a>
-    /* c1
-     * c2
-     */
-<a title="nl_max"><strong><font color="red">    â–ˆ</font></strong></a>
-    int x2;
-<a title="nl_before_c_comment"><strong><font color="red">    â–ˆ</font></strong></a>
-    /* single comment */
-<a title="nl_before_cpp_comment"><strong><font color="red">    â–ˆ</font></strong></a>
-    // cpp comment
-    std::for_each(a, b, [] (int& b) -> foo {
-<a title="nl_cpp_ldef_brace"><strong><font color="red">                                            â–ˆ</font></strong></a>
-        b+=3;
-    }
-    A_function(parameter_for_A);
-<a title="nl_func_call_start"><strong><font color="red">              â–ˆ</font></strong></a><a title="nl_func_call_end"><strong><font color="red">               â–ˆ</font></strong></a>
-}
-<a title="nl_end_of_file"><strong><font color="red">â–ˆ</font></strong></a>
-<hr>
-class foo : public my_Class<a title="nl_class_brace"><strong><font color="red"> â–ˆ</font></strong></a>
-<a title="nl_class_colon"><strong><font color="red">         â–ˆ</font></strong></a>
-{
-    void bar_c(int t, int u)<a title="nl_constr_colon"><strong><font color="red"> â–ˆ</font></strong></a>
-<a title="nl_func_type_name_class, nl_func_proto_type_name"><strong><font color="red">        â–ˆ</a><a title="nl_func_decl_args">            â–ˆ</font></strong></a>
-        : t(222)
-        , u(88)
-<a title="nl_constr_init_args, pos_constr_comma"><strong><font color="red">        â–ˆ</font></strong></a>
-    {
-<a title="nl_typedef_blk_start"><strong><font color="red">        â–ˆ</font></strong></a>
-        typedef char CHAR;
-<a title="nl_typedef_blk_end"><strong><font color="red">        â–ˆ</a><a title="nl_var_def_blk_start"> â–ˆ</font></strong></a>
-        CHAR c;
-        int a;
-        int b;
-<a title="nl_var_def_blk_end"><strong><font color="red">        â–ˆ</font></strong></a>
-        c = 'a';
-<a title="nl_before_switch"><strong><font color="red">        â–ˆ</font></strong></a>
-        switch (a) {
-<a title="nl_switch_brace"><strong><font color="red">                  â–ˆ</font></strong></a>
-        case 0:
-            b = 1;
-            break;
-<a title="nl_before_case"><strong><font color="red">        â–ˆ</font></strong></a>
-        case 1: b = 5; break;
-<a title="nl_after_case"><strong><font color="red">               â–ˆ</font></strong></a>
-        case 13: {
-<a title="nl_case_colon_brace"><strong><font color="red">                â–ˆ</font></strong></a>
-            b = 15;
-            break;
-        }
-        }
-<a title="nl_after_switch"><strong><font color="red">        â–ˆ</a><a title="nl_before_do"> â–ˆ</font></strong></a>
-        do { <a title="nl_do_brace"><strong><font color="red">â–ˆ</font></strong></a>
-           do_something();
-        } while (!d.isEmpty());
-<a title="nl_brace_while"><strong><font color="red">        â–ˆ</a><a title="nl_after_do">â–ˆ</a><a title="nl_before_if"> â–ˆ</font></strong></a>
-        if (a) { <a title="nl_if_brace"><strong><font color="red">â–ˆ</font></strong></a>
-            b = 1;
-        } else if (c) {
-<a title="nl_brace_else"><strong><font color="red">         â–ˆ</a><a title="nl_else_if">    â–ˆ</a><a title="nl_elseif_brace">      â–ˆ</font></strong></a>
-            b ;
-        } else {
-<a title="nl_else_brace"><strong><font color="red">              â–ˆ</font></strong></a>
-            b = 3;
-        }
-<a title="nl_after_if"><strong><font color="red">        â–ˆ</a><a title="nl_before_for"> â–ˆ</font></strong></a>
-        for (a = 1; a < 5; a++) {
-<a title="nl_for_brace"><strong><font color="red">                              â–ˆ</font></strong></a>
-            b = b + a;
-        }
-<a title="nl_after_for"><strong><font color="red">        â–ˆ</font></strong></a>
-        for (int a = 1; a < 5;
-             a++) {
-<a title="nl_multi_line_cond"><strong><font color="red">                 â–ˆ</font></strong></a>
-            b = a + 4;
-        }
-        try {
-<a title="nl_try_brace"><strong><font color="red">        â–ˆ</font></strong></a>
-            b = 1;
-            if (err) {
-<a title="nl_before_throw"><strong><font color="red">                â–ˆ</font></strong></a>
-                throw std::runtime_error(std::string("nextKey: ") + err.asString());
-            }
-        } catch (const std::exception &exc) {
-<a title="nl_brace_catch"><strong><font color="red">         â–ˆ</a><a title="nl_catch_brace">                                 â–ˆ</font></strong></a>
-            b = 3;
-        }
-<a title="nl_before_while"><strong><font color="red">        â–ˆ</font></strong></a>
-        while (c) {
-<a title="nl_while_brace"><strong><font color="red">             â–ˆ</font></strong></a>
-            b ;
-        }
-<a title="nl_after_while"><strong><font color="red">        â–ˆ</font></strong></a>
-    }
-    enum CaseOfOne {
-<a title="nl_enum_brace"><strong><font color="red">                  â–ˆ</font></strong></a>
-        a1,
-        b1,
-<a title="nl_ds_struct_enum_cmt"><strong><font color="red">        â–ˆ</font></strong></a>
-        // comment
-        c1,
-<a title="nl_ds_struct_enum_close_brace"><strong><font color="red">        â–ˆ</font></strong></a>
-    };
-    struct indent_ptr_t <a title="nl_struct_brace"><strong><font color="red">â–ˆ</font></strong></a>
-   {
-        chunk_t *ref;
-<a title="nl_ds_struct_enum_cmt"><strong><font color="red">        â–ˆ</font></strong></a>
-        // comment
-        int delta;
-<a title="nl_ds_struct_enum_close_brace"><strong><font color="red">        â–ˆ</font></strong></a>
-    } ipt;
-<a title="nl_brace_struct_var"><strong><font color="red">     â–ˆ</font></strong></a>
-<a title="nl_after_struct"><strong><font color="red">    â–ˆ</font></strong></a>
-    union UnionOfOne {
-<a title="nl_union_brace"><strong><font color="red">                    â–ˆ</font></strong></a>
-        a1,
-        b1,
-<a title="nl_ds_struct_enum_cmt"><strong><font color="red">        â–ˆ</font></strong></a>
-        // comment
-        c1,
-<a title="nl_ds_struct_enum_close_brace"><strong><font color="red">        â–ˆ</font></strong></a>
-    };
-<a title="nl_before_access_spec"><strong><font color="red">    â–ˆ</a><a title="nl_after_func_body_class"> â–ˆ</font></strong></a>
-    private: // same for protected:, signal: or slots: label
-<a title="nl_after_access_spec"><strong><font color="red">    â–ˆ</font></strong></a>
-        int ap;
-};
-<a title="nl_after_class"><strong><font color="red">â–ˆ</font></strong></a>
-<hr>
-namespace foo {
-<a title="nl_namespace_brace"><strong><font color="red">             â–ˆ</font></strong></a>
-int foo()
-{
-    if (foo) a++; return;
-<a title="nl_after_vbrace_open"><strong><font color="red">        â–ˆ</a><a title="nl_after_vbrace_close">          â–ˆ</font></strong></a>
-    if (a)
-        return;
-<a title="nl_after_return"><strong><font color="red">    â–ˆ</font></strong></a>
-l123: <a title="nl_after_label_colon"><strong><font color="red">â–ˆ</font></strong></a>
-    int a = 5;
-<a title="nl_before_if"><strong><font color="red">    â–ˆ</font></strong></a>
-    if (a > b) {
-        c = 7;
-<a title="nl_before_return"><strong><font color="red">    â–ˆ</font></strong></a>
-        return a + b;
-    }
-    std::for_each(a, b, [] (int& b)->foo{ b+=3; return(b); });
-<a title="nl_brace_fparen"><strong><font color="red">                                                            â–ˆ</font></strong></a>
-    QUrl dxOffEagle("http://something/newpage.html?[{\"foo: bar\"}]", QUrl::TolerantMode);
-<a title="nl_brace_square"><strong><font color="red">                                                                  â–ˆ</font></strong></a>
-<a title="nl_before_return"><strong><font color="red">    â–ˆ</font></strong></a>
-    return 0;
-<a title="nl_return_expr"><strong><font color="red">    â–ˆ</font></strong></a>
-<hr>
-/* c1
- *
- */
-<a title="nl_comment_func_def"><strong><font color="red">â–ˆ</font></strong></a>
-void b();
-<a title="nl_after_func_proto"><strong><font color="red">â–ˆ</font></strong></a>
-void d();
-#define LOG_CONTTEXT() \
-<a title="nl_multi_line_define"><strong><font color="red">                      â–ˆ</font></strong></a>
-    LOG_FMT(LCONTTEXT  \
-            ,"%s:%d set cont_text to '%s'\n"  \
-            ,__func__, __LINE__, cmt.cont_text.c_str())
-template &lt;class T&gt;
-<a title="nl_template_class"><strong><font color="red">â–ˆ</font></strong></a>
-ItemJob<T>::ItemJob(PlatformDependent *internals, const QNetworkRequest &request)
-    : GetJob(internals, request)
-typedef int ia;
-typedef int ib;
-<a title="nl_typedef_blk_in"><strong><font color="red">â–ˆ</font></strong></a>
-typedef int ic;
-typedef int id;
-</pre>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Objectiv-C.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Objectiv-C.html
deleted file mode 100644
index 993a1b95..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Objectiv-C.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work-Objectiv-C</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work-Objectiv-C?</h1>
-
-<p>
-</p>
-<h2>Spaces-Objectiv-C</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-    @selector (methodNameWithArg:);
-    <a title="sp_after_oc_at_sel"><strong><font color="red">         â–ˆ</font></strong></a>
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Positioning.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Positioning.html
deleted file mode 100644
index 4e8a36cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Positioning.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Positioning options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Positioning</h2>
-<p> 
-</p>
-<table border="1">
-<tr>
-<td>
-<pre>
-void Mode( TDistMode dm )
-{<a name="pos_arith"></a>
-    a = b
-	+ c;
-	<a title="pos_arith"><strong><font color="red">â–ˆ</font></strong></a><a name="pos_assign"></a>
-    ms_DistMode
-        = dm;
-	<a title="pos_assign"><strong><font color="red">â–ˆ</font></strong></a>
-    if (   (count > 0)<a name="pos_bool"></a>
-        && (count < MAX_COUNT)) { ... }
-        <a title="pos_bool"><strong><font color="red">â–ˆ</font></strong></a>
-    b = ( GetDistanceMode()<a name="pos_compare"></a>
-	== dmKM ) ? "km" : "Miles";
-	<a title="pos_compare"><strong><font color="red">â–ˆ</font></strong></a>
-    b = ( GetDistanceMode() == dmKM ) <a name="pos_conditional"></a>
-        ? "km"
-        : "Miles";
-        <a title="pos_conditional"><strong><font color="red">â–ˆ</font></strong></a>
-}
-{<a name="pos_comma"></a>
-	a = B(1
-	      , 2
-	      , 3);
-	      <a title="pos_comma"><strong><font color="red">â–ˆ</font></strong></a>
-}
-<a name="pos_class_colon"></a><a name="nl_class_colon"></a><a name="pos_class_comma"></a>
-class GLOX_API ClientBase
-        : public Class
-        <a title="nl_class_colon"><strong><font color="red">     â–ˆ</a><a title="pos_class_colon">â–ˆ</font></strong></a><a name="nl_class_init_args"></strong></a>
-        , public OtherClass   // if many lines are wanted
-        <a title="nl_class_init_args"><strong><font color="red">â–ˆ</font></strong></a>
-        , public ThridClass
-        , public ForthClass
-        <a title="pos_class_comma"><strong><font color="red">           â–ˆ</font></strong></a>
-
-        // nl_class_colon=force
-        // pos_class_colon=lead_force
-        // nl_class_init_args=force
-        // pos_class_comma=lead_force
-{ }
-<a name="pos_constr_colon"></a><a name="pos_constr_comma"></a>
-class foo : public
-{
-    void bar_c(int t, int u)
-        : t(222)
-<a title="pos_constr_colon"><strong><font color="red">        â–ˆ</font></strong></font></strong></a>
-        , u(88)
-<a title="pos_constr_comma"><strong><font color="red">        â–ˆ</font></strong></a>
-    {}
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Preprocessor.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Preprocessor.html
deleted file mode 100644
index 1d99b69d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Preprocessor.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work-Preprocessor</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work-Preprocessor?</h1>
-
-<p>
-</p>
-<h2>Spaces-Preprocessor</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-    #define x(y) L #y
-    <a title="sp_before_pp_stringify"><strong><font color="red">              â–ˆ</font></strong></a>
-    #define msg0(x) printf("%c: %d\n", ??=@ x, x)
-    <a title="sp_pp_stringify"><strong><font color="red">                                       â–ˆ</font></strong></a>
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Assign.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Assign.html
deleted file mode 100644
index 10c8b6b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Assign.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for assign</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-int a = 5;
-<a title="sp_assign"><strong><font color="red">     â–ˆ â–ˆ</font></strong></a>
-<a title="sp_before_assign"><strong><font color="red">     â–ˆ </a><a title="sp_after_assign">â–ˆ</font></strong></a>
-int decimal<a title="sp_assign"><font color="red">â–ˆ</font></a>=<a title="sp_assign"><font color="red">â–ˆ</font></a>1;
-normal<a title="sp_assign"><font color="red">â–ˆ</font></a>+=<a title="sp_assign"><font color="red">â–ˆ</font></a>2;
-
-int find(size_t idx<a title="sp_assign_default"><font color="red">â–ˆ</font></a>=<a title="sp_assign_default"><font color="red">â–ˆ</font></a>0);
-
-enum FLAGS {
-    FLAGS_decimal<a title="sp_enum_assign, sp_enum_before_assign"><font color="red">â–ˆ</font></a>=<a title="sp_enum_assign, sp_enum_after_assign"><font color="red">â–ˆ</font></a>1,
-
-return [<a title="sp_cpp_lambda_assign"><font color="red">â–ˆ</font></a>=<a title="sp_cpp_lambda_assign"><font color="red">â–ˆ</font></a>](T* t) {  };
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Byref.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Byref.html
deleted file mode 100644
index 7ad47f72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Byref.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for byref</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-   bool<a title="sp_before_byref_func"><font color="red">â–ˆ</font>&amp;<a title="sp_after_byref_func"><font color="red">â–ˆ</font>foo(int<a title="sp_before_byref"><font color="red">â–ˆ</font>&amp;<a title="sp_after_byref"><font color="red">â–ˆ</font>idx);
-
-   MyType<a title="sp_before_unnamed_byref"><font color="red">â–ˆ</font>&amp;<a title="sp_after_byref_func"><font color="red">â–ˆ</font>MyClass::myMethode() {
-      const MyType&amp; t = getSomewhere();
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Case.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Case.html
deleted file mode 100644
index e40bfc5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Case.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for case</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-{
-   switch (a)
-   {
-   case<a title="sp_case_label"><font color="red">█████</font></a>1<a title="sp_before_case_colon"><font color="red">█</font></a>:
-      b = 5;
-   case 2<a title="sp_before_case_colon"><font color="red">â–ˆ</font></a>:
-      b = 7;
-   default<a title="sp_before_case_colon"><font color="red">â–ˆ</font></a>:
-      b = 0;
-   }
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Cast.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Cast.html
deleted file mode 100644
index 9e0b6e2d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Cast.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for cast</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-   b = int<a title="sp_cpp_cast_paren"><font color="red">â–ˆ</font>(<a title="sp_inside_paren_cast"><font color="red">â–ˆ</font>a<a title="sp_inside_paren_cast"><font color="red">â–ˆ</font>);
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Class.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Class.html
deleted file mode 100644
index 1bd1c4a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Class.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for class</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-{
-   class my_class<a title="sp_before_class_colon"><font color="red">â–ˆ</font></a>:<a title="sp_after_class_colon"><font color="red">â–ˆ</font></a>baseclass1, baseclass2
-{
-public:
-        my_class<a title="sp_func_class_paren"><font color="red">â–ˆ</font></a>(int b)<a title="sp_before_constr_colon"><font color="red">â–ˆ</font></a>:<a title="sp_after_constr_colon"><font color="red">â–ˆ</font></a>x(b);
-
-        my_class<a title="sp_func_class_paren_empty"><font color="red">â–ˆ</font></a>() : c(2)
-        {
-        }
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Comma.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Comma.html
deleted file mode 100644
index 3b3f0de1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Comma.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for comma</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-{
-   int A(bool a<a title="sp_before_comma"><font color="red">â–ˆ</font></a>,<a title="sp_after_comma"><font color="red">â–ˆ</font></a>bool b);
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Enum.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Enum.html
deleted file mode 100644
index f208c95f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Enum.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for enum</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-enum FLAGS {
-    FLAGS_decimal<a title="sp_enum_assign, sp_enum_before_assign"><font color="red">â–ˆ</font></a>=<a title="sp_enum_assign, sp_enum_after_assign"><font color="red">â–ˆ</font></a>1
-};
-
-enum Status {<a title="sp_inside_braces_enum"><font color="red">â–ˆ</font></a>Unknown, Success, Error<a title="sp_inside_braces_enum"><font color="red">â–ˆ</font></a>};
-
-enum class comment_align_e<a title="sp_enum_colon"><font color="red">â–ˆ</font></a>:<a title="sp_enum_colon"><font color="red">â–ˆ</font></a>unsigned int
-{
-   REGULAR, BRACE, ENDIF,
-};
-
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_For.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_For.html
deleted file mode 100644
index 3aa455f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_For.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for for loop</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-{
-        for (i = 0<a title="sp_before_semi_for"><font color="red">â–ˆ</font></a>;<a title="sp_after_semi_for"><font color="red">â–ˆ</font></a>i < 10<a title="sp_before_semi_for"><font color="red">â–ˆ</font></a>;<a title="sp_after_semi_for"><font color="red">â–ˆ</font></a>i++<a title="sp_after_semi"><font color="red">â–ˆ</font></a>)
-        {
-                b = i + 1;
-        }
-
-        for (<a title="sp_before_semi_for_empty"><font color="red">â–ˆ</font></a>;<a title="sp_before_semi_for_empty"><font color="red">â–ˆ</font></a>;<a title="sp_after_semi_for_empty"><font color="red">â–ˆ</font></a>)
-        {
-                b = b + 1;
-        }
-        for(auto x<a title="sp_before_for_colon"><font color="red">â–ˆ</font></a>:<a title="sp_after_for_colon"><font color="red">â–ˆ</font></a>std::as_const(str)) {}
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_New.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_New.html
deleted file mode 100644
index 587844ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_New.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for new/ delete</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-{
-    Foo* foo = new<a title="sp_after_new"><font color="red">â–ˆ</font></a>Foo(a,v);
-    // does'nt work at every place
-
-    delete[]<a title="sp_after_new"><font color="red">â–ˆ</font></a>m_used;
-
-    Foo* foo = new<a title="sp_between_new_paren"><font color="red">â–ˆ</font></a>(<a title="sp_inside_newop_paren, sp_inside_newop_paren_open"><font color="red">â–ˆ</font></a>ptr,std::nothrow<a title="sp_inside_newop_paren"><font color="red">â–ˆ</font></a>)<a title="sp_after_newop_paren, sp_inside_newop_paren_close"><font color="red">â–ˆ</font></a>Foo[];
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Operator.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Operator.html
deleted file mode 100644
index d73c964d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Operator.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for operator</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-{
-   bool operator<a title="sp_after_operator"><font color="red">â–ˆ</font></a>()<a title="sp_after_operator_sym"><font color="red">â–ˆ</font></a>(T1 const t1, T2 const t2)
-   {
-      ...
-   }
-   unc_text operator =<a title="sp_after_operator_sym, sp_after_operator_sym_empty"><font color="red">â–ˆ</font></a>()
-   {
-      ...
-   }
-   auto max(int a, int b)<a title="sp_trailing_return"><font color="red">â–ˆ</font></a>-&gt;<a title="sp_trailing_return"><font color="red">â–ˆ</font></a>int;
-   auto max(int a, int b) const<a title="sp_trailing_return"><font color="red">â–ˆ</font></a>-&gt;<a title="sp_trailing_return"><font color="red">â–ˆ</font></a>int;
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Paren.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Paren.html
deleted file mode 100644
index caa4a5a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Paren.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for Parenthesis</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-
-{
-    auto a =
-    [=] (<a title="sp_inside_fparen"><font color="red">â–ˆ</font></a>int *a, Something b<a title="sp_inside_fparen"><font color="red">â–ˆ</font></a>)<a title="sp_cpp_lambda_paren_brace"><font color="red">â–ˆ</font></a>{
-        // ...
-    };
-}
-void foo(<a title="sp_inside_fparen"><font color="red">â–ˆ</font></a>int key, int value<a title="sp_inside_fparen"><font color="red">â–ˆ</font></a>)
-{
-    a = (<a title="sp_inside_paren"><font color="red">â–ˆ</font></a>b + c<a title="sp_inside_paren"><font color="red">â–ˆ</font></a>);
-    a = B(<a title="sp_balance_nested_parens"><font color="red">â–ˆ</font></a>(c) + (d)<a title="sp_balance_nested_parens"><font color="red">â–ˆ</font></a>);
-    return A(<a title="sp_inside_fparen"><font color="red">â–ˆ</font></a>key, value<a title="sp_inside_fparen"><font color="red">â–ˆ</font></a>) + B(<a title="sp_inside_fparens"><font color="red">â–ˆ</font></a>);
-}
-}
-class STDMETHOD
-{
-   STDMETHOD(GetValues)<a title="sp_cparen_oparen"><font color="red">â–ˆ</font></a>(BSTR bsName, REFDATA** pData);
-};
-void (__attribute__(<a title="sp_paren_paren"><font color="red">â–ˆ</font></a>(noreturn)<a title="sp_paren_paren"><font color="red">â–ˆ</font></a>) ****f) (void);
-
-char *__attribute__(<a title="sp_paren_paren"><font color="red">â–ˆ</font></a>(aligned(8)<a title="sp_paren_paren"><font color="red">â–ˆ</font></a>)<a title="sp_paren_paren"><font color="red">â–ˆ</font></a>) *f;
-
-(struct foo)<a title="sp_paren_brace"><font color="red">â–ˆ</font></a>{...}
-
-typedef const char *<a title="sp_ptr_star_paren"><font color="red">â–ˆ</font></a>(*somefunc_t)(void *barstool);
-
-
-
-
-
-if<a title="sp_before_sparen"><font color="red">â–ˆ</font></a>(<a title="sp_inside_sparen, sp_inside_sparen_open"><font color="red">â–ˆ</font></a>a<a title="sp_inside_sparen, sp_inside_sparen_close"><font color="red">â–ˆ</font></a>)<a title="sp_after_sparen"><font color="red">â–ˆ</font></a>{ b = 13; }
-
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Template.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Template.html
deleted file mode 100644
index d8792888..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Template.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-<h2>Spaces for template</h2>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-{
-   template<a title="sp_template_angle, sp_before_angle"><font color="red">â–ˆ</font></a>&lt;<a title="sp_inside_angle"><font color="red">â–ˆ</font></a>bool a<a title="sp_inside_angle"><font color="red">â–ˆ</font></a>&gt;<a title="sp_after_angle"><font color="red">â–ˆ</font></a>void f();
-
-   new List<byte><a title="sp_angle_paren"><font color="red">â–ˆ</font></a>(foo);
-
-   new List<byte>(<a title="sp_angle_paren_empty"><font color="red">â–ˆ</font></a>);
-
-   List&lt;byte&gt;<a title="sp_angle_word"><font color="red">â–ˆ</font></a>m;
-   template &lt;typename T&gt;<a title="sp_angle_word"><font color="red">â–ˆ</font></a>static ...;
-
-   template&lt;typename T&gt; class Foo&lt;Bar&lt;T&gt;<a title="sp_angle_shift"><font color="red">â–ˆ</font></a>&gt; { };
-}
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Spaces.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Spaces.html
deleted file mode 100644
index a142b00f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Spaces.html
+++ /dev/null
@@ -1,432 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<h1><a href="https://github.com/uncrustify/uncrustify">Uncrustify</a>:
-Where do the options work?</h1>
-
-<p>
-</p>
-<h2>Spaces</h2>
-You want to "add/ force/ ignore/ remove" a
-<ul>
-  <li><a href="options_Space_Assign.html">space for assign</a></li>
-  <li><a href="options_Space_Byref.html">space for byref</a></li>
-  <li><a href="options_Space_Case.html">space for case</a></li>
-  <li><a href="options_Space_Cast.html">space for cast</a></li>
-  <li><a href="options_Space_Class.html">space for class</a></li>
-  <li><a href="options_Space_Comma.html">space for comma</a></li>
-  <li><a href="options_Space_D.html">space for D</a></li>
-  <li><a href="options_Space_Enum.html">space for enum</a></li>
-  <li><a href="options_Space_For.html">space for for loop</a></li>
-  <li><a href="options_Space_New.html">space for new/ delete</a></li>
-  <li><a href="options_Space_Operator.html">space for operator</a></li>
-  <li><a href="options_Space_Paren.html">space for parenthesis</a></li>
-  <li><a href="options_Preprocessor.html">space for preprocessor</a></li>
-  <li><a href="options_Space_Template.html">space for template</a></li>
-  <li><a href="options_Java.html">options_Java</a></li>
-  <li><a href="options_Objectiv-C.html">options_Objectiv-C</a></li>
-  <li><a href="options_C_sharp.html">options_C#</a></li>
-  <li><a href="options_CLI_NET.html">options_CLI .NET</a></li>
-  <li><a href="options_ASM.html">options_ASM</a></li>
-</ul>
-at some places.
-<p>
-</p>
-Some more options...
-<p>
-</p>
-<p> 
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-<pre>
-// Comments
-<a title="sp_cmt_cpp_start"><strong><font color="red">  â–ˆ</font></strong></a>
-int a;            /* emb cmt */ int b;            // trailing cmt
-<a title="sp_before_tr_emb_cmt"><strong><font color="red">      â–ˆ</a><a title="sp_num_before_tr_emb_cmt">..........â–ˆ                    â–ˆ..........â–ˆ</font></strong></a>
-
-    union {
-        uint maxChars;
-        uint maxBytes;
-    } mLength;
-    union { int m_size; int m_any; };
-    <a title="sp_inside_braces_struct"><strong><font color="red">       â–ˆ                      â–ˆ</font></strong></a>
-    return { -1, -1, -1 };
-    <a title="sp_inside_braces"><strong><font color="red">        â–ˆ          â–ˆ</font></strong></a>
-
-class Parser :: ParserPrivate { };
-<a title="sp_before_dc"><strong><font color="red">            â–ˆ</a><a title="sp_after_dc">  â–ˆ</a><a title="sp_inside_braces_empty">               â–ˆ</font></strong></a>
-template &lt;typename T&gt; class to { };
-<a title="sp_inside_braces_empty"><strong><font color="red">                                â–ˆ</font></strong></a>
-my $all = { };
-<a title="sp_inside_braces_empty"><strong><font color="red">           â–ˆ</font></strong></a>
-enum FocusEffect { };
-<a title="sp_inside_braces_empty"><strong><font color="red">                  â–ˆ</font></strong></a>
-struct error { };
-<a title="sp_inside_braces_empty"><strong><font color="red">              â–ˆ</font></strong></a>
-};
-
-#define LOG_FMT (sev, args ...) \
-<a title="sp_defined_paren"><strong><font color="red">               â–ˆ</a><a title="sp_before_ellipsis">          â–ˆ</font></strong></a>
-   do { if (log_sev_on(sev)) { log_fmt(sev, ## args); } } while (0)
-   <a title="sp_pp_concat"><strong><font color="red">                                        â–ˆ  </a><a title="sp_pp_concat">â–ˆ</font></strong></a>
-#endif
-#define FS_NOCOW_FL 0x00800000
-<a title="sp_macro"><strong><font color="red">                   â–ˆ</font></strong></a>
-#define STRHACK(x) HACKSTR(x)
-<a title="sp_macro_func"><strong><font color="red">             â–ˆ</font></strong></a>
-#define wakeUpCaller(cond) \
-<a title="sp_before_nl_cont"><strong><font color="red">                          â–ˆ</font></strong></a>
-    if (cond) { \
-    <a title="sp_before_nl_cont"><strong><font color="red">           â–ˆ</font></strong></a>
-        cond->release(); \
-        <a title="sp_before_nl_cont"><strong><font color="red">                â–ˆ</font></strong></a>
-     }
-typedef struct { int val; int sel; } DiceInfo;
-<a title="sp_brace_typedef"><strong><font color="red">                                    â–ˆ</font></strong></a>
-void * bar()
-<a title="sp_before_ptr_star_func"><strong><font color="red">    â–ˆ </a><a title="sp_after_ptr_star_func">â–ˆ</font></strong></a>
-{
-    int a = 5;
-    <a title="sp_assign"><strong><font color="red">     â–ˆ â–ˆ</font></strong></a>
-    <a title="sp_before_assign"><strong><font color="red">     â–ˆ </a><a title="sp_after_assign">â–ˆ</font></strong></a>
-    int * const i;
-    <a title="sp_after_ptr_star_qualifier"><strong><font color="red">     â–ˆ</font></strong></a>
-    c = a + b;
-    <a title="sp_arith, sp_arith_additive"><strong><font color="red">     â–ˆ â–ˆ</font></strong></a>
-    a = ~ b;
-    <a title="sp_inv"><strong><font color="red">     â–ˆ</font></strong></a>
-    x = - 5;
-    <a title="sp_sign"><strong><font color="red">     â–ˆ</font></strong></a>
-    y = + 7;
-    <a title="sp_sign"><strong><font color="red">     â–ˆ</font></strong></a>
-    (-- a);
-    <a title="sp_incdec"><strong><font color="red">   â–ˆ</font></strong></a>
-    i ++;
-    <a title="sp_incdec"><strong><font color="red"> â–ˆ</font></strong></a>
-    b = ( a == d ) ? 55 : 88;
-    <a title="sp_cond_question"><strong><font color="red">              â–ˆ â–ˆ</a><a title="sp_cond_colon">  â–ˆ â–ˆ</font></strong></a>
-    <a title="sp_cond_question_before"><strong><font color="red">              â–ˆ</a><a title="sp_cond_question_after"> â–ˆ</a><a title="sp_cond_colon_before">  â–ˆ</a><a title="sp_cond_colon_after"> â–ˆ</font></strong></a>
-    b = ( a == d ) ? : 88;
-    <a title="sp_cond_ternary_short"><strong><font color="red">                â–ˆ</font></strong></a>
-    if( ( a || b ) && c ) x = 1;
-    <a title="sp_bool"><strong><font color="red">       â–ˆ  â–ˆ   â–ˆ  â–ˆ</font></strong></a>
-    <a title="sp_inside_paren"><strong><font color="red">     â–ˆ      â–ˆ      â–ˆ</font></strong></a>
-    <a title="sp_paren_paren"><strong><font color="red">   â–ˆ</font></strong></a>
-    c = a > b;
-    <a title="sp_compare"><strong><font color="red">     â–ˆ â–ˆ</font></strong></a>
-    int * i;
-    <a title="sp_before_ptr_star"><strong><font color="red">   â–ˆ </a><a title="sp_after_ptr_star">â–ˆ</font></strong></a>
-    <a title="sp_before_unnamed_ptr_star"><strong><font color="red">   â–ˆ</font></strong></a>
-    int * * j;
-    <a title="sp_between_ptr_star"><strong><font color="red">     â–ˆ</font></strong></a>
-    throw (x);
-    <a title="sp_throw_paren"><strong><font color="red">     â–ˆ</font></strong></a>
-    try {
-    <a title="sp_try_brace"><strong><font color="red">   â–ˆ</font></strong></a>
-    } catch (const Exception &e) { }
-    <a title="sp_brace_catch"><strong><font color="red"> â–ˆ</a><a title="sp_catch_paren">     â–ˆ</font></strong></a>
-    } catch (...) { }
-    <a title="sp_brace_catch"><strong><font color="red"> â–ˆ</a><a title="sp_catch_paren">     â–ˆ</font></strong></a>
-    } catch { }
-    <a title="sp_brace_catch"><strong><font color="red"> â–ˆ</a><a title="sp_catch_brace">     â–ˆ</font></strong></a>
-    auto x1 = decltype(x) {0};
-    <a title="sp_after_decltype"><strong><font color="red">                     â–ˆ</font></strong></a>
-    Foo() noexcept () {}
-    <a title="sp_after_noexcept"><strong><font color="red">              â–ˆ</font></strong></a>
-    void operator ++ ( );
-    <a title="sp_after_operator"><strong><font color="red">             â–ˆ</font></strong></a><a title="sp_after_operator_sym"><strong><font color="red">  â–ˆ</font></strong></a><a title="sp_after_operator_sym_empty"><strong><font color="red"> â–ˆ</font></strong></a>
-    int a0[][] = { { 1 } };
-    <a title="sp_after_type_brace_init_lst_open"><strong><font color="red">              â–ˆ â–ˆ</font></strong></a><a title="sp_before_type_brace_init_lst_close"><strong><font color="red"> â–ˆ â–ˆ</font></strong></a>
-    char m_array [256];
-    <a title="sp_before_vardef_square"><strong><font color="red">            â–ˆ</font></strong></a>
-    return { {crypt(_Nums, inSeed)} };
-    <a title="sp_brace_brace"><strong><font color="red">        â–ˆ                      â–ˆ</font></strong></a>
-    do {
-    <a title="sp_do_brace_open"><strong><font color="red">  â–ˆ</font></strong></a>
-        xxx = _error;
-    } while(0)
-    <a title="sp_brace_close_while"><strong><font color="red"> â–ˆ</font></strong></a>
-    bool CompareGenomeByFeatureResults::clickOnLink(std::string const& inLink) {
-        auto const [sequence, type, firstPosition, lastPosition] = parseLink(inLink);
-    <a title="sp_cpp_before_struct_binding"><strong><font color="red">              â–ˆ</font></strong></a>
-    decltype (x)  y;
-    <a title="sp_decltype_paren"><strong><font color="red">        â–ˆ</font></strong></a>
-    using x_t = decltype (x);
-    <a title="sp_decltype_paren"><strong><font color="red">                    â–ˆ</font></strong></a>
-    foo( ABC );
-    <a title="sp_func_call_user_inside_fparen"><strong><font color="red">    â–ˆ   â–ˆ</font></strong></a>
-    foo( ( ABC ) )
-    <a title="sp_func_call_user_paren_paren"><strong><font color="red">    â–ˆ       â–ˆ</font></strong></a>
-    typedef void timer_cb (struct timer_node *n);
-    <a title="sp_func_type_paren"><strong><font color="red">                     â–ˆ</font></strong></a>
-    if (n) ;
-    <a title="sp_special_semi"><strong><font color="red">      â–ˆ</font></strong></a>
-    a( , 1);
-    <a title="sp_paren_comma"><strong><font color="red">  â–ˆ</font></strong></a>
-    foo() noexcept;
-    <a title="sp_paren_noexcept"><strong><font color="red">     â–ˆ</font></strong></a>
-    return {x};
-    <a title="sp_return_brace"><strong><font color="red">      â–ˆ</font></strong></a>
-    void funcName() const;
-    <a title="sp_paren_qualifier"><strong><font color="red">               â–ˆ</font></strong></a>
-    void ncName() override;
-    <a title="sp_paren_qualifier"><strong><font color="red">             â–ˆ</font></strong></a>
-    template < int ... X > int bar2()
-    <a title="sp_type_ellipsis"><strong><font color="red">              â–ˆ</font></strong></a>
-    {
-            auto s = sizeof ... (  X  );
-        <a title="sp_sizeof_ellipsis"><strong><font color="red">                   â–ˆ</font></strong></a><a title="sp_sizeof_ellipsis_paren"><strong><font color="red">   â–ˆ</font></strong></a>
-            chomp(  X  ) ...;
-        <a title="sp_paren_ellipsis"><strong><font color="red">                    â–ˆ</font></strong></a>
-            return X  +  ...;
-    }
-    do amime3(); while (false);
-    <a title="sp_while_paren_open"><strong><font color="red">                  â–ˆ</font></strong></a>
-    auto b0 = unknown_kw { 2 };
-    <a title="sp_word_brace_init_lst"><strong><font color="red">                    â–ˆ</font></strong></a>
-    if (data)   go = new ClassA();
-    <a title="sp_skip_vbrace_tokens"><strong><font color="red">          â–ˆ</font></strong></a>
-    else        go = new ClassB();
-    <a title="sp_skip_vbrace_tokens"><strong><font color="red">          â–ˆ</font></strong></a>
-
-    auto f0(int a, int b) -> int;
-    <a title="sp_trailing_return"><strong><font color="red">                     â–ˆ  â–ˆ</font></strong></a>
-</pre>
-</td>
-</tr>
-</table>
-<p></p>
-<table border="1", width="100%">
-<tr>
-<td>
-
-<pre>
-int main(int argc , char *argv [])
-<a title="sp_before_comma"><strong><font color="red">                 â–ˆ</a><a title="sp_after_comma"> â–ˆ</a><a title="sp_before_squares">          â–ˆ</font></strong></a>
-{
-	int a [2];
-	<a title="sp_before_square"><strong><font color="red">     â–ˆ</font></strong></a>
-	a[ n ] = 3;
-	<a title="sp_inside_square"><strong><font color="red">  â–ˆ â–ˆ</font></strong></a>
-	const char *names [] =
-	<a title="sp_before_squares"><strong><font color="red">                 â–ˆ</font></strong></a>
-	{
-		"{ False , True }",
-		<a title="sp_before_comma"><strong><font color="red">        â–ˆ</a><a title="sp_after_comma"> â–ˆ</font></strong></a>
-		"{ Ignore, Add, Remove, Force }",
-
-	return (-1);
-	<a title="sp_return_paren"><strong><font color="red">      â–ˆ</font></strong></a>
-
-
-    int a ( );
-    <a title="sp_func_proto_paren"><strong><font color="red">     â–ˆ</a><a title="sp_inside_fparens"> â–ˆ</font></strong></a>
-    int a (int b) {};
-    <a title="sp_func_def_paren"><strong><font color="red">     â–ˆ</a><a title="sp_fparen_brace">       â–ˆ</font></strong></a>
-    int foo () {};
-    <a title="sp_func_def_paren_empty"><strong><font color="red">       â–ˆ</font></strong></a>
-void ( int a ) ( int b );
-<a title="sp_inside_tparen"><strong><font color="red">      â–ˆ     â–ˆ</a><a title="sp_after_tparen_close"> â–ˆ</a><a title="sp_inside_fparen"> â–ˆ     â–ˆ</font></strong></a>
-static void sockaddr_unmapped(
-    struct sockaddr *sa __attribute__ ((unused)),
-    <a title="sp_attribute_paren"><strong><font color="red">                                 â–ˆ</font></strong></a>
-    socklen_t *len __attribute__ ((unused)))
-    <a title="sp_attribute_paren"><strong><font color="red">                            â–ˆ</font></strong></a>
-
-void (^ weak_recurseTreeNodes)(int a);
-<a title="sp_after_ptr_block_caret"><strong><font color="red">       â–ˆ</font></strong></a>
-template< >
-struct Bar< false > : Foo { };
-<a title="sp_angle_colon"><strong><font color="red">                   â–ˆ</font></strong></a>
-</pre>
-</td>
-</tr>
-</table>
-<p>
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-
-<pre>
-template &lt; typename T &gt; inline static bool remove(T column)
-<a title="sp_template_angle"><strong><font color="red">        â–ˆ<a title="sp_inside_angle"> â–ˆ<a title="sp_inside_angle">          â–ˆ</font></strong></a>
-<a title="sp_before_angle"><strong><font color="red">        â–ˆ</a><a title="sp_after_angle">              â–ˆ</font></strong></a>
-</pre>
-
-<pre>
-int & a(int & b);
-<a title="sp_before_byref_func"><strong><font color="red">   â–ˆ</a><a title="sp_after_byref_func"> â–ˆ</a><a title="sp_before_byref">     â–ˆ</a><a title="sp_after_byref"> â–ˆ</font></strong></a>
-int c(int &)
-<a title="sp_type_func"><strong><font color="red">   â–ˆ</a><a title="sp_before_unnamed_byref">     â–ˆ</font></strong></a>
-{
-	d = aa (& y,& d) ;
-	<a title="sp_func_call_paren"><strong><font color="red">      â–ˆ </a><a title="sp_addr"> â–ˆ   â–ˆ</a><a title="sp_before_semi">  â–ˆ</font></strong></a>
-        e = ee ();
-        <a title="sp_func_call_paren_empty"><strong><font color="red">      â–ˆ</font></strong></a>
-	if ( a == 5 ) ...
-	<a title="sp_before_sparen"><strong><font color="red">  â–ˆ</font></strong></a>
-        <a title="sp_inside_sparen"><strong><font color="red">    â–ˆ      â–ˆ</font></strong></a>
-        <a title="sp_inside_sparen_open"><strong><font color="red">    â–ˆ</a><a title="sp_inside_sparen_close">      â–ˆ</font></strong></a>
-            ...
-        if (b) ;
-        <a title="sp_special_semi"><strong><font color="red">      â–ˆ</font></strong></a>
-	if ( a == 6 ) b = 66;        
-        <a title="sp_after_sparen"><strong><font color="red">             â–ˆ</font></strong></a>
-	if ( a == 7 ) { b = 77; }        
-        <a title="sp_sparen_brace"><strong><font color="red">             â–ˆ</font></strong></a>
-        if (! a) {
-        <a title="sp_not"><strong><font color="red">     â–ˆ</font></strong></a>
-            b = 4;
-        } else {
-        <a title="sp_brace_else"><strong><font color="red"> â–ˆ</a><a title="sp_else_brace">    â–ˆ</font></strong></a>
-            b = 5;
-        }
-        for(a = 1 ; a < b ; a++) {
-        <a title="sp_before_semi_for"><strong><font color="red">         â–ˆ</a><a title="sp_before_semi_for_empty">       â–ˆ</font></strong></a>
-           ...
-	for( ; ; ) {
-        <a title="sp_before_semi_for_empty"><strong><font color="red">    â–ˆ â–ˆ</a><a title="sp_after_semi_for_empty"> â–ˆ</font></strong></a>
-           ...
-	switch (whatIsToDo) ...
-	<a title="sp_before_sparen"><strong><font color="red">      â–ˆ</font></strong></a>
-	while (start < end) ...
-	<a title="sp_before_sparen"><strong><font color="red">     â–ˆ</font></strong></a>
-
-</pre>
-</td>
-</tr>
-</table>
-<p>
-</p>
-<table border="1", width="100%">
-<tr>
-<td>
-
-<pre>
-namespace Server {
-<a title="sp_word_brace_ns"><strong><font color="red">                â–ˆ</font></strong></a>
-class Cache : public QObject
-<a title="sp_before_class_colon"><strong><font color="red">           â–ˆ</a><a title="sp_after_class_colon"> â–ˆ</font></strong></a>
-Cache::StorageDebugger ()
-<a title="sp_func_class_paren"><strong><font color="red">                      â–ˆ</font></strong></a>
-    : mFile(0)
-<a title="sp_before_constr_colon"><strong><font color="red">   â–ˆ</a><a title="sp_after_constr_colon"> â–ˆ</font></strong></a>
-{
-        new service;
-        <a title="sp_after_new"><strong><font color="red">   â–ˆ</font></strong></a>
-        delete service;
-        <a title="sp_after_new"><strong><font color="red">      â–ˆ</font></strong></a>
-        delete[] buffer;
-        <a title="sp_after_new"><strong><font color="red">        â–ˆ</font></strong></a>
-        if (this == & other) return * this;
-        <a title="sp_addr"><strong><font color="red">             â–ˆ</a><a title="sp_deref">               â–ˆ</font></strong></a>
-        switch (a) {
-        case 1 :
-        <a title="sp_before_case_colon"><strong><font color="red">      â–ˆ</font></strong></a>
-                b= 1;
-                break;
-        case 2 : {
-                b = 2;
-                break;
-        }
-        default :
-                break;
-        }
-        bool operator () (Entity::Id lhs, Entity::Id rhs) const
-        ...<a title="sp_after_operator"><strong><font color="red">          â–ˆ</a><a title="sp_after_operator_sym">  â–ˆ</font></strong></a>
-
-        a = ( int ) 5.6;
-        <a title="sp_inside_paren_cast"><strong><font color="red">     â–ˆ   â–ˆ</a><a title="sp_after_cast"> â–ˆ</font></strong></a>
-        cpp = int (7);
-        <a title="sp_cpp_cast_paren"><strong><font color="red">         â–ˆ</font></strong></a>
-        len = sizeof (int);
-        <a title="sp_sizeof_paren"><strong><font color="red">            â–ˆ</font></strong></a>
-        SomeStruct a = SomeStruct {1, 2, 3};
-        <a title="sp_word_brace_init_lst"><strong><font color="red">                         â–ˆ</font></strong></a>
-	someFuncCall(SomeStruct {4, 5, 6});
-	<a title="sp_word_brace_init_lst"><strong><font color="red">                       â–ˆ</font></strong></a>
-        log . foo . bar = 5;
-        <a title="sp_member"><strong><font color="red">   â–ˆ â–ˆ   â–ˆ â–ˆ</font></strong></a>
-	other -> foo -> bar = 123;
-	<a title="sp_member"><strong><font color="red">     â–ˆ  â–ˆ   â–ˆ  â–ˆ</font></strong></a>
-}
-/// doxygen sequence
-<a title="sp_cmt_cpp_doxygen"><strong><font color="red">   â–ˆ</font></strong></a>
-///< doxygen sequence
-<a title="sp_cmt_cpp_doxygen"><strong><font color="red">    â–ˆ</font></strong></a>
-//! doxygen sequence
-<a title="sp_cmt_cpp_doxygen"><strong><font color="red">   â–ˆ</font></strong></a>
-//!< doxygen sequence
-<a title="sp_cmt_cpp_doxygen"><strong><font color="red">    â–ˆ</font></strong></a>
-#if A
-#else /* Comment A */
-<a title="sp_endif_cmt"><strong><font color="red">     â–ˆ</font></strong></a>
-#endif /* Comment B */
-<a title="sp_endif_cmt"><strong><font color="red">      â–ˆ</font></strong></a>
-</pre>
-</td>
-</tr>
-</table>
-<table border="1", width="100%">
-<tr>
-<td>
-
-<pre>
-void Initialize( BYTE nDelay = 100 );
-<a title="sp_assign_default"><strong><font color="red">                            â–ˆ â–ˆ</font></strong></a>
-void f1()
-{
-      auto a = [<a title="sp_inside_square"><font color="red">â–ˆ</font></a>=<a title="sp_inside_square"><font color="red">â–ˆ</font></a>]<a title="sp_cpp_lambda_square_paren"><font color="red">â–ˆ</font></a>(<a title="sp_cpp_lambda_argument_list"><font color="red">â–ˆ</font></a>int *a, Something & b<a title="sp_cpp_lambda_argument_list"><font color="red">â–ˆ</font></a>);
-
-      parallel_for(0, 100, [<a title="sp_inside_square"><font color="red">â–ˆ</font></a>&<a title="sp_inside_square"><font color="red">â–ˆ</font></a>]<a title="sp_cpp_lambda_square_paren"><font color="red">â–ˆ</font></a>(<a title="sp_cpp_lambda_argument_list"><font color="red">â–ˆ</font></a>const int i<a title="sp_cpp_lambda_argument_list"><font color="red">â–ˆ</font></a>)<a title="sp_cpp_lambda_paren_brace"><font color="red">â–ˆ</font></a>{
-          const std::vector<int> values = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
-
-      list[idx] (param);
-      <a title="sp_square_fparen"><font color="red">         â–ˆ</font></a>
-
-double foo()
-{
-	return( foo(n) );
-	<a title="sp_balance_nested_parens"><strong><font color="red">       â–ˆ      â–ˆ</font></strong></a>
-
-
-Vector2&lt;double&gt; ()
-<a title="sp_angle_paren"><strong><font color="red">               â–ˆ</font></strong></a>
-
-{
-        List&lt;byte&gt; bob = new List&lt;byte&gt; ();
-        <a title="sp_angle_word"><strong><font color="red">          â–ˆ</font></strong></a>
-        QVector&lt;QPair&lt;Condition, QString&gt; &gt; mWhenThen;
-        <a title="sp_permit_cpp11_shift"><strong><font color="red">                                 â–ˆ</font></strong></a>
-
-template&lt;int i, int ... Indexes, typename IdxHolder, typename ... Elements&gt;
-<a title="sp_before_ellipsis"><strong><font color="red">                   â–ˆ                                         â–ˆ</font></strong></a>
-struct index_holder_impl&lt;i, index_holder&lt;Indexes ...&gt;, IdxHolder, Elements ...&gt;
-<a title="sp_before_ellipsis"><strong><font color="red">                                                â–ˆ                         â–ˆ</font></strong></a>
-{
-	typedef typename index_holder_impl&lt;i + 1, index_holder&lt;Indexes ... i&gt;,	Elements ...&gt;::type type;
-	<a title="sp_before_ellipsis"><strong><font color="red">                                                              â–ˆ                 â–ˆ</font></strong></a>
-</pre>
-</td>
-</tr>
-</table>
-<table border="1", width="100%">Java Sources
-<tr>
-<td>
-<pre>
-
-    for (Type var : expr)
-    <a title="sp_after_for_colon"><strong><font color="red">               â–ˆ</font></strong></a>
-
-</pre>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/project-support.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/project-support.jpg
deleted file mode 100644
index 5d15550f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/project-support.jpg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.css b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.css
deleted file mode 100644
index 240171e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.css
+++ /dev/null
@@ -1,63 +0,0 @@
-html, body {
-   background-color: #5a5f52;
-   color:            #ffffff;
-}
-
-div.node1 {
-   margin: 0em;
-	width:  70%;
-}
-div.node2 {
-   margin: 0em;
-	width:  90%;
-}
-
-h1, h2, h3, h4 {
-   font-family: Verdana, sans-serif;
-   color:       #d1c121;
-}
-h1 {
-   font-size:   18pt;
-}
-h2 {
-   font-size:   14pt;
-}
-h3 {
-   font-size:   11pt;
-}
-h4 {
-   font-size:   10pt;
-}
-
-pre {
-   font-family:      Verdana, sans-serif;
-   font-size:        11pt;
-   background-color: #6b6f63;
-}
-
-a {
-   font-family: Verdana, sans-serif;
-   font-size:   11pt;
-   color:       #d1c121;
-}
-
-p, small, li {
-   font-family: Verdana, sans-serif;
-   color:       #ffffff;
-}
-
-p {
-   font-size: 11pt;
-}
-
-small {
-   font-size: 7pt;
-}
-
-li {
-   list-style-type: disc;
-   font-size:       11pt;
-   font-style:      italic;
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.html
deleted file mode 100644
index 0528eb63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE></TITLE>
-</HEAD>
-<BODY LANG="en-US" DIR="LTR">
-<H1><A HREF="http://sourceforge.net/projects/uncrustify/">Uncrustify
-your C code</A></H1>
-<A HREF="http://sourceforge.net/projects/uncrustify/">Project
-web site</A>
-<P><A HREF="http://prdownloads.sourceforge.net/uncrustify/uncrustify-0.0.3.tgz?download">Download
-Uncrustify 0.0.3</A></P>
-<B>What it does:</B>
-<UL>
-	<LI>Indent code
-	<LI>Align code on '=' and variable definitions
-	<LI>Align #define stuff
-	<LI>Align backslash-newline stuff
-	<LI>Reformat comments (a little bit)
-	<LI>Fix inter-character spacing
-</UL>
-<B>What it doesn't do (yet):</B>
-<UL>
-	<LI>Split long lines
-	<LI>Handle format changing #if/#else stuff
-</UL>
-
-</BODY>
-</HTML>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/overview.odt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/overview.odt
deleted file mode 100644
index e14e3285..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/overview.odt
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/paren_stack.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/paren_stack.txt
deleted file mode 100644
index 109709dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/paren_stack.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-
-=-----------------------------------------------------------------------------=
-*                                                                             *
-*  Paren Stack                                                                *
-*                                                                             *
-=-----------------------------------------------------------------------------=
-
-At the heart of this algorithm are two stacks.
-There is the Paren Stack (PS) and the Frame stack.
-
-The PS (pse in the code) keeps track of braces, parens,
-if/else/switch/do/while/etc items -- anything that is nestable.
-
-Complex statements go through some of these BS_ stages:
-	BS_PAREN1   - paren on if/for/switch/while, etc
-	BS_PAREN2   - paren on do{}while()
-	BS_BRACE_DO - brace set on do{}
-	BS_BRACE2   - brace on if/else/for/switch/while
-	BS_ELSE     - expecting 'else' after 'if'
-	BS_ELSEIF   - expecting 'if' after 'else'
-	BS_WHILE    - expecting 'while' after 'do'
-	
-The file is processed one token at a time to support #if/#else/#endif
-preprocessors at any point.
-
-Take this simple if statement as an example:
-
-   if ( x )
-   {
-      x--;
-   }
-
-The stack would look like so:
-The format is first the token processed and then the PSE stack as it appears
-AFTER the token is processed.
-
-'if' [IF - PAREN1]
-'('  [IF - PAREN1] [SPAREN OPEN]
-'x'  [IF - PAREN1] [SPAREN OPEN]
-')'  [IF - BRACE2]               <- note that the stage was changed on SPAREN_CLOSE
-'{'  [IF - BRACE2] [BRACE OPEN]
-'x'  [IF - BRACE2] [BRACE OPEN]
-'--' [IF - BRACE2] [BRACE OPEN]
-';'  [IF - BRACE2] [BRACE OPEN]
-'}'  [IF - ELSE]
-                            <- lack of else kills the ELSE, closes statement
-
-Virtual brace example:
-   if ( x )
-      x--;
-   else if (y)
-      y--;
-   else
-      z++;
-
-'if'   [IF - PAREN1]
-'('    [IF - PAREN1] [SPAREN OPEN]
-'x'    [IF - PAREN1] [SPAREN OPEN]
-')'    [IF - BRACE2]
-'x'    [IF - BRACE2] [VBRACE OPEN]   <- VBrace open inserted before because
-                                        the token was not '{'
-'--'   [IF - BRACE2] [VBRACE OPEN]
-';'    [IF - ELSE]                   <- Semicolon causes a VBrace close to be
-                                        inserted after the semicolon
-'else' [ELSE - ELSEIF]               <- IF changed into ELSE, expect IF or BRACE
-'x'    [ELSE - BRACE2] [VBRACE OPEN] <- lack of '{' -> VBrace
-'++'   [ELSE - BRACE2] [VBRACE OPEN]
-';'                                  <- VBrace close inserted after semicolon
-                                        ELSE removed after statement close
-
-Nested virtual brace example: (EOF represents the end of the file)
-   if ( x )
-      if (y)
-         y--;
-      else
-         z++;
-   EOF
-
-'if'   [IF - PAREN1]
-'('    [IF - PAREN1] [PAREN OPEN]
-'x'    [IF - PAREN1] [PAREN OPEN]
-')'    [IF - BRACE2]
-'if'   [IF - BRACE2] [VBRACE OPEN] [IF - PAREN1] <- VBrace on BRACE2, IF opened
-'('    [IF - BRACE2] [VBRACE OPEN] [IF - PAREN1] [SPAREN OPEN]
-'y'    [IF - BRACE2] [VBRACE OPEN] [IF - PAREN1] [SPAREN OPEN]
-')'    [IF - BRACE2] [VBRACE OPEN] [IF - BRACE2]
-'y'    [IF - BRACE2] [VBRACE OPEN] [IF - BRACE2] [VBRACE OPEN]
-'--'   [IF - BRACE2] [VBRACE OPEN] [IF - BRACE2] [VBRACE OPEN]
-';'    [IF - BRACE2] [VBRACE OPEN] [IF - ELSE]
-'else' [IF - BRACE2] [VBRACE OPEN] [ELSE - ELSEIF]
-'z'    [IF - BRACE2] [VBRACE OPEN] [ELSE - BRACE2] [VBRACE OPEN]
-'++'   [IF - BRACE2] [VBRACE OPEN] [ELSE - BRACE2] [VBRACE OPEN]
-';'    [IF - BRACE2] [VBRACE OPEN] [ELSE - BRACE2]  - step1
-       [IF - BRACE2] [VBRACE OPEN]                  - step2
-       [IF - ELSE]                                  - step3
-EOF
-
--- this last semi is more complicated - first it terminates the VBRACE and then
-   the else, which then, since it is the end of a statement, terminates the
-   VBRACE. That bumps the IF stage to ELSE.
-   The EOF kills that off (since it is not an else)
-
-Order of operation:
-1) if TOS=VBRACE && PC=SEMI, insert VBRACE close, PC=>VBRACE close
-2) if PC=VBRACE close or PC=BRACE close, and TOS is complex (if/else/etc)
-   then advance complex stage. If statement ends, pop and advance
-
-
-Stages for each complex statement:
-if
-IF-PAREN1, IF-BRACE2, IF-ELSE
-
-if/else
-IF-PAREN1, IF-BRACE2, IF-ELSE, ELSE-ELSEIF, ELSE-BRACE2
-
-if/else if/else
-IF-PAREN1, IF-BRACE2, IF-ELSE, ELSE-ELSEIF, IF-PAREN1, IF-BRACE2, IF-ELSE, ELSE-ELSEIF, ELSE-BRACE2
-
-for
-FOR-PAREN1, FOR-BRACE2
-
-while
-WHILE-PAREN1, WHILE-BRACE2
-
-switch
-SWITCH-PAREN1, SWITCH-BRACE2
-
-synchronized
-SYNCHRONIZED-PAREN1
-
-do/while
-DO-BRACE_DO, DO-WHILE, WHILE-PAREN2
-
-
-Another less-interesting example:
-
-{
-    if (x)
-        volatile
-        {
-            y++;
-        }
-    return y;
-}
-
-'{'        [BRACE OPEN]
-'if'       [BRACE OPEN] [IF - PAREN1]
-'('        [BRACE OPEN] [IF - PAREN1] [PAREN OPEN]
-'x'        [BRACE OPEN] [IF - PAREN1] [PAREN OPEN]
-')'        [BRACE OPEN] [IF - BRACE2]
-'volatile' [BRACE OPEN] [IF - BRACE2] [VBRACE OPEN] [VOLATILE - BRACE2]
-'{'        [BRACE OPEN] [IF - BRACE2] [VBRACE OPEN] [VOLATILE - BRACE2] [BRACE OPEN]
-'y'        [BRACE OPEN] [IF - BRACE2] [VBRACE OPEN] [VOLATILE - BRACE2] [BRACE OPEN]
-'++'       [BRACE OPEN] [IF - BRACE2] [VBRACE OPEN] [VOLATILE - BRACE2] [BRACE OPEN]
-';'        [BRACE OPEN] [IF - BRACE2] [VBRACE OPEN] [VOLATILE - BRACE2] [BRACE OPEN]
-'}'        [BRACE OPEN] [IF - ELSE]  <- the brace close ends brace-open,
-                                        volatile-brace2 and vbrace-open
-'return'   [BRACE OPEN]              <- not else
-'y'        [BRACE OPEN]
-';'        [BRACE OPEN]
-'}'                                  <- empties the stack
-
-
-=-----------------------------------------------------------------------------=
-*                                                                             *
-*  Parse Frames                                                               *
-*                                                                             *
-=-----------------------------------------------------------------------------=
-
-The pse stack is kept on a frame stack.
-The frame stack is need for languages that support preprocessors (C, C++, C#)
-that can arbitrarily change code flow. It also isolates #define macros so
-that they are indented independently and do not affect the rest of the program.
-
-When an #if is hit, a copy of the current frame is push on the frame stack.
-When an #else/#elif is hit, a copy of the current stack is pushed under the
-#if frame and the original (pre-#if) frame is copied to the current frame.
-When #endif is hit, the top frame is popped.
-This has the following effects:
- - a simple #if / #endif does not affect program flow
- - #if / #else /#endif - continues from the #if clause
-
-When a #define is entered, the current frame is pushed and cleared.
-When a #define is exited, the frame is popped.
-
-
-Take this example, which isn't very exciting, as both the #if and #else parts
-end up with the same paren stack.  This is the usual case.
-
-{
-   foo(param1,
-#ifdef DEBUG
-       "debug");
-#else
-       "release");
-#endif
-}
-
-Right before the #ifdef, we have this for the paren stack:
-  Top>  [BRACE OPEN] [PAREN OPEN]
-
-The #ifdef pushes a copy of the current stack, so we have this:
-  Top>  [BRACE OPEN] [PAREN OPEN]
-        [BRACE OPEN] [PAREN OPEN]
-
-The close paren after "debug" closes out the PAREN-OPEN on the top of the stack.
-  Top>  [BRACE OPEN]
-        [BRACE OPEN] [PAREN OPEN]
-
-The #else swaps the top two frames.
-  Top>  [BRACE OPEN] [PAREN OPEN]
-        [BRACE OPEN]
-
-Right after the #else, we hit another close paren after the "release".
-  Top>  [BRACE OPEN]
-        [BRACE OPEN]
-
-At the #endif, the top of stack is thrown out, which restores us to the #if path.
-  Top>  [BRACE OPEN]
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/theory.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/theory.txt
deleted file mode 100644
index 99324855..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/theory.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-
--------------------------------------------------------------------------------
-This document is too incomplete to be of much use.
-Patches are welcome!
-
-
-Theory of operation
--------------------
-
-Uncrustify goes through several steps to reformat code.
-The first step, parsing, is the most complex and important.
-
-
-Step 1 - Tokenize
------------------
-C code must be understood to some degree to be able to be properly indented.
-The parsing step reads in a text buffer and breaks it into chunks and puts
-those chunks in a list.
-
-When a chunk is parsed, the original column and line are recorded.
-
-These are the chunks that are parsed:
- - punctuators
- - numbers
- - words (keywords, variables, etc)
- - comments
- - strings
- - whitespace
- - preprocessors
-
-See token_enum.h for a complete list.
-See punctuators.cpp and keywords.cpp for examples of how they are used.
-
-In the code, chunk types are prefixed with 'CT_'.
-The CT_WORD token is changed into a more specific token using the lookup table
-in keywords.cpp
-
-
-Step 2 - Tokenize Cleanup
--------------------------
-
-The second step is to change the token type for certain constructs that need
-to be adjusted early on.
-For example, the '<' token can be either a CT_COMPARE or CT_ANGLE_OPEN.
-Both are handled very differently.
-If a CT_WORD follows CT_ENUM/CT_STRUCT/CT_UNION, then it is marked as a CT_TYPE.
-Basically, anything that doesn't depend on the nesting level can be done at this
-stage.
-
-
-Step 3 - Brace Cleanup
--------------------------
-
-This is possibly the most difficult step.
-do/if/else/for/switch/while bodies are examined and virtual braces are added.
-Brace parent types are set.
-Statement start and expression starts are labeled.
-And #ifdef constructs are handled.
-
-This step determines the levels (brace_level, level, & pp_level).
-
-REVISIT:
-  The code in brace_cleanup.cpp needs to be reworked to take advantage of being
-  able to scan forward and backward.  The original code was going to be merged
-  into tokenize.cpp, but that was WAY too complex.
-
-
-Step 4 - Fix Symbols (combine.cpp)
-----------------------------------
-
-This step is no longer properly named.
-In the original design, neighboring chunks were to be combined into longer
-chunks.  This proved to be a silly idea.  But the name of the file stuck.
-
-This is where most of the interesting identification stuff goes on.
-Colons type are detected, variables are marked, functions are labeled, etc.
-Also, all the punctuators are classified. Ie, CT_MINUS become CT_NEG or CT_ARITH.
-
- - Types are marked.
- - Functions are marked.
- - Parenthesis and braces are marked where appropriate.
- - finds and marks casts
- - finds and marks variable definitions (for aligning)
- - finds and marks assignments that may be aligned
- - changes CT_INCDEC_AFTER to CT_INCDEC_BEFORE
- - changes CT_STAR to either CT_PTR_TYPE, CT_DEREF or CT_ARITH
- - changes CT_MINUS to either CT_NEG or CT_ARITH
- - changes CT_PLUS and CT_ADDR to CT_ARITH, if needed
- - other stuff?
-
-
-Casts
------
-Casts are detected as follows:
- - paren pair not part of if/for/etc nor part of a function
- - contains only CT_QUALIFIER, CT_TYPE, '*', and no more than one CT_WORD
- - is not followed by CT_ARITH
-
-Tough cases:
-(foo) * bar;
-
-If uncertain about a cast like this: (foo_t), some simple rules are applied.
-If the word ends in '_t', it is a cast, unless followed by '+'.
-If the word is all caps (FOO), it is a cast.
-If you use custom types (very likely) that aren't detected properly (unlikely),
-the add them to the config file like so: (example Using C-Sharp types)
-type UInt32 UInt16 UInt8 Byte
-type Int32 Int16 Int8
-
-
-Step 6+ Everything else
--------------------------
-
-From this point on, many filters are run on the chunk list to change the
-token columns.
-
-indent.cpp sets the left-most column.
-align.cpp set the column for individual chunks.
-space.cpp sets the spacing between chunks.
-Others insert newlines, change token position, etc.
-
-
-Last Step - Output
--------------------------
-
-At the final step the list is printed to the output.
-Everything except comments are printed as-is.
-Comments are reformatted in the output stage.
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/threads.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/threads.txt
deleted file mode 100644
index f6ed4edd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/threads.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-
-Notes on how to deal with the wicked corner case that is C/C++
-preprocessor #if magic.  None of this is actually implemented.
-
-Languages not affected:
- - D
- - Java
- - ECMA (Java Script)
-
-Langauges affected:
- - C
- - C++
- - C#
- - Vala
- - Pawn
- - Objective C/C++
-
-
-Threads of code are created for functions that navigate the tokens.
-There is the master list of the raw tokens parsed out.
-
-There is at least one thread, which, in the absense of any #if statements, is
-the same as the raw token list.
-
-In the threads, a BARRIER is placed where ever code cannot move past.
-This represents and #if or #else statement.
-Normally, the barriers are skipped when navigating code. Only when removing a
-newline does the code need to check for a barrier.
-
-For #if statements without an #else, there is an implicit #else added that contains
-nothing.
-
-// example 1
-a
-#if X
-b
-#endif
-c
-
-Thread
-       #if   #endif
-       V     V
-0 - a -+- b -+- c
-       |     |
-1      +-----+  <- empty else path (ie, for '#if 0')
-
-Max depth = 2
-
-
-// example 2
-a
-#if X
-b
-#else
-c
-#endif
-d
-       #if   #endif
-       V     V
-0 - a -+- b -+- d
-       |     |
-1      +- c -+   <- else path
-
-Max depth = 2
-
-
-// example 3
-a
-#if X
-b
-#elif Y
-c
-#elif Z
-d
-#else
-e
-#endif
-f
-#if A
-g
-#endif
-h
-       #if X #endif          #if A
-       V     V               V
-0 - a -+- b -+- f -----------+- g -+- h
-       |     |               |     |
-1      +- c -+   <- elif Y   +-----+   <- empty else
-       |     |
-2      +- d -+   <- elif Z
-       |     |
-3      +- e -+   <- else
-
-Max depth = 4
-
-The detection routines need to be executed once for each thread, up to the maximum
-thread depth.  Note that the typical maximum thread depth is going to be 2-3.
-
-0 - a - b - f - g - h
-1 - a - c - f ----- h
-2 - a - d - f - g - h
-3 - a - e - f - g - h
-
-The general rule is that if the current thread exceed the max, thread 0 is used.
-
-Identification is the primary use for the threads.
-The secondary use is indentation.  The indentation of each token at each thread
-level is recorded.
-The maximum indentation for the token is used, assuming the thread is without
-error. ('#if 0' commented out code that is bad may not be handled.)
-
-I won't know if this will work for sure until I try it.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/track.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/track.html
deleted file mode 100644
index e49e4370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/track.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<p>
-</p>
-<pre>
-{
-        a<a title="1,8,sp_assign"><font color="red">M</font></a>=<a title="2,9,16,sp_assign"><font color="red">M</font><
-/a>b<a title="3,10,17,22,sp_arith"><font color="red">M</font></a>+<a title="4,11,18,23,27,sp_arith"><font color="red">M<
-/font></a>111<a title="5,12,19,24,28,31,sp_arith"><font color="red">M</font></a>-<a title="6,13,20,25,29,32,34,sp_arith"
-><font color="red">M</font></a>55<a title="7,14,21,26,30,33,35,36,sp_before_semi"><font color="red">M</font></a>;
-}
-</pre>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMakeLists.txt
deleted file mode 100644
index 72b6efa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMakeLists.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-cmake_minimum_required(VERSION 3.0.0)
-
-# ------------------------------------------------------------------------------
-
-
-if(DEFINED ENV{EMSCRIPTEN})
-    SET(emscripten_root_path "$ENV{EMSCRIPTEN}")
-else()
-    find_file(EMCC_EXECUTABLE emcc HINTS "/usr/lib/emscripten")
-    if(EXISTS ${EMCC_EXECUTABLE})
-        get_filename_component(emscripten_root_path ${EMCC_EXECUTABLE} DIRECTORY)
-    endif()
-endif()
-
-# Abort if not found.
-if ("${emscripten_root_path}" STREQUAL "")
-  MESSAGE(FATAL_ERROR "Could not locate the Emscripten directory via the \
-                       EMSCRIPTEN environment variable! Set it up or pass \
-                       -Demscripten_root_path=xxx to CMake to specify the \
-                       directory.")
-endif()
-
-SET(CMAKE_TOOLCHAIN_FILE "${emscripten_root_path}/cmake/Modules/Platform/Emscripten.cmake")
-
-SET(project_name "libUncrustify")
-PROJECT(${project_name})
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-#get parent folder, add src
-GET_FILENAME_COMPONENT(unc_projdir ${CMAKE_CURRENT_LIST_DIR} DIRECTORY)
-
-# ------------------------------------------------------------------------------
-
-include(CheckCXXCompilerFlag)
-include(CheckIncludeFileCXX)
-include(CheckSymbolExists)
-include(CheckCXXSymbolExists)
-include(CheckTypeSize)
-
-find_package(PythonInterp REQUIRED)
-
-#
-# Determine config
-#
-if(WIN32)
-  # Windows builds use src/windows_compat.h instead of config.h
-else()
-  # Generate config.h
-  set(avail_headers "")
-
-  set(headers
-    inttypes.h
-    memory.h
-    stdint.h
-    stdlib.h
-    strings.h
-    string.h
-    sys/stat.h
-    sys/types.h
-    unistd.h
-    utime.h
-  )
-  foreach(header ${headers})
-    string(TOUPPER "${header}" header_uc)
-    string(REGEX REPLACE "[^A-Z0-9_]" "_" include_var "HAVE_${header_uc}")
-    check_include_file_cxx("${header}" ${include_var})
-    if(${include_var})
-      list(APPEND avail_headers ${header})
-    endif()
-    unset(include_var)
-    unset(header_uc)
-  endforeach()
-  unset(headers)
-
-  check_include_file("stdbool.h" HAVE_STDBOOL_H)
-
-  set(symbols
-    memset
-    strcasecmp
-    strchr
-    strdup
-    strerror
-    strtol
-    strtoul
-  )
-  foreach(symbol ${symbols})
-    string(TOUPPER "${symbol}" symbol_uc)
-    string(REGEX REPLACE "[^A-Z0-9_]" "_" symbol_var "HAVE_${symbol_uc}")
-    check_cxx_symbol_exists("${symbol}" "${avail_headers}" ${symbol_var})
-    unset(symbol_var)
-    unset(symbol_uc)
-  endforeach()
-  unset(symbols)
-
-  unset(avail_headers)
-
-  check_type_size(_Bool _BOOL LANGUAGE C)
-
-  configure_file("${unc_projdir}/src/config.h.in" config.h @ONLY)
-endif()
-
-#
-# Generate uncrustify_version.h
-#
-
-set(CURRENT_VERSION "Uncrustify-0.69.0_f")
-
-option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
-if(NoGitVersionString)
-  configure_file("${unc_projdir}/src/uncrustify_version.h.in" "${PROJECT_BINARY_DIR}/uncrustify_version.h" @ONLY)
-else()
-  # Add target to generate version header;
-  # do this every build to ensure git SHA is up to date
-  add_custom_target(generate_version_header
-    ${CMAKE_COMMAND}
-    -D PYTHON_EXECUTABLE:STRING=${PYTHON_EXECUTABLE}
-    -D SOURCE_DIR:PATH="${unc_projdir}"
-    -D INPUT:PATH="${unc_projdir}/src/uncrustify_version.h.in"
-    -D OUTPUT:PATH="${PROJECT_BINARY_DIR}/uncrustify_version.h"
-    -D CURRENT_VERSION:STRING="CURRENT_VERSION"
-    -P ${unc_projdir}/cmake/GenerateVersionHeader.cmake
-    COMMENT "Generating version header"
-  )
-  set_source_files_properties(
-    "${PROJECT_BINARY_DIR}/uncrustify_version.h"
-    PROPERTIES GENERATED TRUE
-  )
-endif()
-
-#
-# Generate token_names.h
-#
-add_custom_command(
-  OUTPUT "${PROJECT_BINARY_DIR}/token_names.h"
-  COMMAND ${CMAKE_COMMAND}
-    "-Dsrc_file=${unc_projdir}/src/token_enum.h"
-    "-Ddst_file=${PROJECT_BINARY_DIR}/token_names.h"
-    -P "${unc_projdir}/cmake/GenerateTokenNames.cmake"
-  MAIN_DEPENDENCY "${unc_projdir}/src/token_enum.h"
-  COMMENT "Generating token_names.h"
-)
-
-# Set up commands for generated source files
-function(py_gen OUTPUT SCRIPT INPUT)
-  set(out "${PROJECT_BINARY_DIR}/src/${OUTPUT}")
-  set(deps "${unc_projdir}/src/${INPUT}")
-  get_filename_component(outdir "${out}" DIRECTORY)
-  foreach(arg IN LISTS ARGN)
-    list(APPEND deps "${unc_projdir}/src/${arg}")
-  endforeach()
-
-  add_custom_command(
-    OUTPUT "${out}"
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${outdir}"
-    COMMAND ${PYTHON_EXECUTABLE}
-      "${unc_projdir}/scripts/${SCRIPT}"
-      "${out}"
-      ${deps}
-    DEPENDS ${deps} "${unc_projdir}/scripts/${SCRIPT}"
-    MAIN_DEPENDENCY ${unc_projdir}/src/${INPUT}
-    COMMENT "Generating ${OUTPUT}"
-  )
-endfunction()
-
-py_gen(punctuator_table.h
-  make_punctuator_table.py
-  symbols_table.h
-)
-
-py_gen(options.cpp
-  make_options.py
-  options.h
-  options.cpp.in
-)
-
-py_gen(option_enum.h
-  make_option_enum.py
-  option.h
-  option_enum.h.in
-)
-
-py_gen(option_enum.cpp
-  make_option_enum.py
-  option.h
-  option_enum.cpp.in
-)
-
-# ------------------------------------------------------------------------------
-
-FILE(GLOB unc_infiles "${unc_projdir}/src/*.cpp")
-
-ADD_EXECUTABLE(${project_name}
-  ${unc_infiles} 
-  ${unc_projdir}/src/token_enum.h 
-  ${unc_projdir}/src/symbols_table.h 
-  ${unc_projdir}/src/options.h
-  ${unc_projdir}/src/option.h
-  ${PROJECT_BINARY_DIR}/src/options.cpp
-  ${PROJECT_BINARY_DIR}/src/option_enum.cpp
-  ${PROJECT_BINARY_DIR}/src/option_enum.h
-  ${PROJECT_BINARY_DIR}/uncrustify_version.h
-  ${unc_projdir}/src/option_enum.cpp.in
-  ${unc_projdir}/src/option_enum.h.in
-  ${unc_projdir}/src/options.cpp.in
-)
-add_dependencies(${project_name} generate_version_header)
-
-include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${PROJECT_BINARY_DIR}/src
-  ${unc_projdir}/src
-)
-
-SET(unc_compile_flags "--bind -O3")
-SET_TARGET_PROPERTIES(${project_name}
-    PROPERTIES
-        CXX_STANDARD 11
-        CXX_STANDARD_REQUIRED YES
-        CXX_EXTENSIONS NO
-        COMPILE_FLAGS "${unc_compile_flags}"
-        LINK_FLAGS "${unc_compile_flags} \
-                    -s TOTAL_MEMORY=67108864 \
-                    -s ALLOW_MEMORY_GROWTH=1 \
-                    -s VERBOSE=1 \
-                    -s MODULARIZE=1 \
-                    -s EXPORT_NAME=\"'${project_name}'\" \
-                    -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
-                    -s 'EXTRA_EXPORTED_RUNTIME_METHODS=[\"UTF8ToString\",\"stringToUTF8\",\"lengthBytesUTF8\", \"writeAsciiToMemory\"]' \
-                    -s WASM=0\
-                    --memory-init-file 0\
-                    --pre-js ${CMAKE_CURRENT_LIST_DIR}/prefix_module.js \
-                    --post-js ${CMAKE_CURRENT_LIST_DIR}/postfix_module.js \
-                    ")
-
-EM_LINK_PRE_JS(${project_name} ${CMAKE_CURRENT_LIST_DIR}/prefix_module.js)
-EM_LINK_POST_JS(${project_name} ${CMAKE_CURRENT_LIST_DIR}/postfix_module.js)
-
-# ------------------------------------------------------------------------------
-
-# add file post/pre-fix
-add_custom_command(TARGET ${project_name}
-                   POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -Dunc_targetfile:FILEPATH=$<TARGET_FILE:${project_name}>
-                                            -P "${CMAKE_CURRENT_LIST_DIR}/CMake_catFiles.cmake"
-)
-
-add_custom_target(emscripten_test
-    COMMAND ${CMAKE_COMMAND} -Dunc_targetfile:FILEPATH=$<TARGET_FILE:${project_name}>
-                             -Dunc_projdir:FILEPATH=${unc_projdir}
-                             -P "${CMAKE_CURRENT_LIST_DIR}/CMake_emscripten_test.cmake"
-    COMMENT "Starting libUncrustify.js tests:"
-)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_catFiles.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_catFiles.cmake
deleted file mode 100644
index c637ea24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_catFiles.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-if(NOT unc_targetfile)
-    MESSAGE(FATAL_ERROR "unc_targetfile param not defined")
-endif()
-
-function(cat IN_FILE OUT_FILE)
-  file(READ ${IN_FILE} CONTENTS)
-  file(APPEND ${OUT_FILE} "${CONTENTS}")
-endfunction()
-
-
-SET(unc_tmpfile "${unc_targetfile}_.tmp")
-
-file(WRITE "${unc_tmpfile}" "")
-
-cat("${CMAKE_CURRENT_LIST_DIR}/prefix_file" "${unc_tmpfile}")
-cat("${unc_targetfile}" "${unc_tmpfile}")
-cat("${CMAKE_CURRENT_LIST_DIR}/postfix_file"  "${unc_tmpfile}")
-
-file(RENAME "${unc_tmpfile}" "${unc_targetfile}")
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_emscripten_test.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_emscripten_test.cmake
deleted file mode 100644
index a37ee945..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_emscripten_test.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-if(NOT unc_targetfile)
-    MESSAGE(FATAL_ERROR "unc_targetfile param not defined")
-endif()
-if(NOT unc_projdir )
-    MESSAGE(FATAL_ERROR "unc_projdir param not defined")
-endif()
-
-message(STATUS "unc_targetfile: ${unc_targetfile}")
-message(STATUS "test_dir:       ${unc_projdir}/emscripten/test/")
-message(STATUS "-----------------------------------------------------------------------------")
-
-
-find_package(PythonInterp REQUIRED)
-execute_process(
-  COMMAND ${PYTHON_EXECUTABLE} "${unc_projdir}/emscripten/test/run_tests.py" "${unc_targetfile}" "${unc_projdir}/emscripten/test/"
-  WORKING_DIRECTORY ${unc_projdir}
-  RESULT_VARIABLE make_version_error
-  OUTPUT_VARIABLE make_version_output
-)
-MESSAGE(STATUS ${make_version_output})
-
-if(NOT ${make_version_error} EQUAL 0)
-  message(FATAL_ERROR "errno: ${make_version_error}")
-endif()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/README.md
deleted file mode 100644
index 22012383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-building
---------------------------------------------------------------------------------
- **dependencies**: cmake, python, clang, emscripten, node
- 
- 1. create a `build` directory somewhere
- 2. inside this directory call `cmake <CMakeLists.txt directory>` and `make`<br>
-    (the CMakeLists.txt file is located in <uncrustify_root_dir>/emscripten)
-
-Optionally the generated libUncrustify.js can be tested via `make emscripten_test`
-
-_libUncrustify.js_ example usage
---------------------------------------------------------------------------------
-1. load module instance:
-    ```js
-    var uncrustify = libUncrustify();
-    ```
-
-2. set option settings either one at a time with:
-    ```js
-    uncrustify.set_option( "optionNameString", "newOptionValueString" );
-    ```
-
-    or a whole bunch via:
-
-    ```js
-    uncrustify.loadConfig( "configFileFormatString" )
-    ```
-
-3. set the language of the to be formated file string
-    ```js
-    uncrustify.set_language( languageInt );
-    ```
-
-4. format a file string:
-    ```js
-    var uncrustyFileString = uncrustify.uncrustify( "crustyFileString" );
-    ```
-
-5. delete initialized module instance:
-    ```js
-    uncrustify.destruct();
-    ```
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/build.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/build.sh
deleted file mode 100755
index df4b6fe3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/build.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# script to build without cmake,
-# manually generate header files usually created by CMake,
-# past those inside Uncrustifys 'src' dir
-# run this script in the 'emscripten' dir
-
-sh_dir="$(dirname "$(readlink -f "$0")")"
-outTmp="temp.bak"
-out="libUncrustify.js"
-
-#https://github.com/kripken/emscripten/blob/master/src/settings.js
-
-em++ -O3                                                                       \
-    ${COMMENT# initialy increase memory for big input files }                  \
-    -s TOTAL_MEMORY=67108864                                                   \
-    ${COMMENT# let the memory grow dynamically if even more is needed  }       \
-    -s ALLOW_MEMORY_GROWTH=1                                                   \
-    -s VERBOSE=1                                                               \
-    -s MODULARIZE=1                                                            \
-    -s EXPORT_NAME="'libUncrustify'"                                           \
-    -s ERROR_ON_UNDEFINED_SYMBOLS=1                                            \
-    -s ALLOW_MEMORY_GROWTH=1                                                   \
-    -s "EXTRA_EXPORTED_RUNTIME_METHODS=['UTF8ToString', 'stringToUTF8', 'lengthBytesUTF8', 'writeAsciiToMemory']" \
-    --bind                                                                     \
-    --pre-js prefix_module.js                                                  \
-    --post-js postfix_module.js                                                \
-    ${COMMENT# TODO: handle async ajax load to enable this }                   \
-    --memory-init-file 0                                                       \
-    -o $out                                                                    \
-    ../src/*.cpp                                                               \
-&& cat "./prefix_file" "$out" "./postfix_file" > "$outTmp"                     \
-&& mv "$outTmp" "$out"                                                         \
-&& ./test/run_tests.py "$sh_dir/libUncrustify.js" "$sh_dir/test"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/libUncrustify.d.ts b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/libUncrustify.d.ts
deleted file mode 100644
index 1e7b7fb6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/libUncrustify.d.ts
+++ /dev/null
@@ -1,674 +0,0 @@
-/**
-*  Emscriptens interface for bound std::vectors
-*/
-interface EmscriptenVector< T >
-{
-    get( i : number ) : T
-    push_back( elem : T );
-    resize( size : number, elem : T );
-    size() : number;
-    get() : T;
-    set( elem : T );
-//TODO:
-//    isAliasOf();
-//    clone();
-//    delete();
-//    isDeleted() : boolean;
-//    deleteLater();
-}
-
-/**
-*  Emscriptens interface for bound enum types
-*/
-interface EmscriptenEnumType
-{
-    //! returns list with value objects of an enum
-    values() : EmscriptenVector<EmscriptenEnumTypeObject>;
-}
-
-/**
-*  Emscriptens interface for bound enum type value objects
-*/
-interface EmscriptenEnumTypeObject
-{
-    //! return value of an enum value object
-    value : number;
-}
-
-declare namespace LibUncrustify
-{
-    // <editor-fold desc="enums">
-
-    // Example how to iterate below options : forin iterate Options,
-    // skip 'values' key, [ s : Options_STRING ] : EmscriptenEnumTypeObject;
-
-    // region enum bindings
-    export interface OptionTypeValue extends EmscriptenEnumTypeObject {}
-    export interface OptionType extends EmscriptenEnumType
-    {
-        BOOL : OptionTypeValue;
-        IARF : OptionTypeValue;
-        LINEEND : OptionTypeValue;
-        TOKENPOS : OptionTypeValue;
-        NUM : OptionTypeValue;
-        UNUM : OptionTypeValue;
-        STRING : OptionTypeValue;
-    }
-
-    export interface IARFValue extends EmscriptenEnumTypeObject {}
-    export interface IARF extends EmscriptenEnumType
-    {
-        IGNORE : IARFValue;
-        ADD : IARFValue;
-        REMOVE : IARFValue;
-        FORCE : IARFValue;
-    }
-
-    export interface LineEndValue extends EmscriptenEnumTypeObject {}
-    export interface LineEnd extends EmscriptenEnumType
-    {
-        LF : LineEndValue;
-        CRLF : LineEndValue;
-        CR : LineEndValue;
-        AUTO : LineEndValue;
-    }
-
-    export interface TokenPosValue extends EmscriptenEnumTypeObject {}
-    export interface TokenPos extends EmscriptenEnumType
-    {
-        IGNORE : TokenPosValue;
-        BREAK : TokenPosValue;
-        FORCE : TokenPosValue;
-        LEAD : TokenPosValue;
-        TRAIL : TokenPosValue;
-        JOIN : TokenPosValue;
-        LEAD_BREAK : TokenPosValue;
-        LEAD_FORCE : TokenPosValue;
-        TRAIL_BREAK : TokenPosValue;
-        TRAIL_FORCE : TokenPosValue;
-    }
-
-    export interface LogTypeValue extends EmscriptenEnumTypeObject {}
-    export interface LogType extends EmscriptenEnumType
-    {
-        SYS : LogTypeValue;
-        ERR : LogTypeValue;
-        WARN : LogTypeValue;
-        NOTE : LogTypeValue;
-        INFO : LogTypeValue;
-        DATA : LogTypeValue;
-        FILELIST : LogTypeValue;
-        LINEENDS : LogTypeValue;
-        CASTS : LogTypeValue;
-        ALBR : LogTypeValue;
-        ALTD : LogTypeValue;
-        ALPP : LogTypeValue;
-        ALPROTO : LogTypeValue;
-        ALNLC : LogTypeValue;
-        ALTC : LogTypeValue;
-        ALADD : LogTypeValue;
-        ALASS : LogTypeValue;
-        FVD : LogTypeValue;
-        FVD2 : LogTypeValue;
-        INDENT : LogTypeValue;
-        INDENT2 : LogTypeValue;
-        INDPSE : LogTypeValue;
-        INDPC : LogTypeValue;
-        NEWLINE : LogTypeValue;
-        PF : LogTypeValue;
-        STMT : LogTypeValue;
-        TOK : LogTypeValue;
-        ALRC : LogTypeValue;
-        CMTIND : LogTypeValue;
-        INDLINE : LogTypeValue;
-        SIB : LogTypeValue;
-        RETURN : LogTypeValue;
-        BRDEL : LogTypeValue;
-        FCN : LogTypeValue;
-        FCNP : LogTypeValue;
-        PCU : LogTypeValue;
-        DYNKW : LogTypeValue;
-        OUTIND : LogTypeValue;
-        BCSAFTER : LogTypeValue;
-        BCSPOP : LogTypeValue;
-        BCSPUSH : LogTypeValue;
-        BCSSWAP : LogTypeValue;
-        FTOR : LogTypeValue;
-        AS : LogTypeValue;
-        PPIS : LogTypeValue;
-        TYPEDEF : LogTypeValue;
-        VARDEF : LogTypeValue;
-        DEFVAL : LogTypeValue;
-        PVSEMI : LogTypeValue;
-        PFUNC : LogTypeValue;
-        SPLIT : LogTypeValue;
-        FTYPE : LogTypeValue;
-        TEMPL : LogTypeValue;
-        PARADD : LogTypeValue;
-        PARADD2 : LogTypeValue;
-        BLANKD : LogTypeValue;
-        TEMPFUNC : LogTypeValue;
-        SCANSEMI : LogTypeValue;
-        DELSEMI : LogTypeValue;
-        FPARAM : LogTypeValue;
-        NL1LINE : LogTypeValue;
-        PFCHK : LogTypeValue;
-        AVDB : LogTypeValue;
-        SORT : LogTypeValue;
-        SPACE : LogTypeValue;
-        ALIGN : LogTypeValue;
-        ALAGAIN : LogTypeValue;
-        OPERATOR : LogTypeValue;
-        ASFCP : LogTypeValue;
-        INDLINED : LogTypeValue;
-        BCTRL : LogTypeValue;
-        RMRETURN : LogTypeValue;
-        PPIF : LogTypeValue;
-        MCB : LogTypeValue;
-        BRCH : LogTypeValue;
-        FCNR : LogTypeValue;
-        OCCLASS : LogTypeValue;
-        OCMSG : LogTypeValue;
-        BLANK : LogTypeValue;
-        OBJCWORD : LogTypeValue;
-        CHANGE : LogTypeValue;
-        CONTTEXT : LogTypeValue;
-        ANNOT : LogTypeValue;
-        OCBLK : LogTypeValue;
-        FLPAREN : LogTypeValue;
-        OCMSGD : LogTypeValue;
-        INDENTAG : LogTypeValue;
-        NFD : LogTypeValue;
-        JDBI : LogTypeValue;
-        SETPAR : LogTypeValue;
-        SETTYP : LogTypeValue;
-        SETFLG : LogTypeValue;
-        NLFUNCT : LogTypeValue;
-        CHUNK : LogTypeValue;
-        GUY98 : LogTypeValue;
-        GUY : LogTypeValue;
-    }
-
-    export interface TokenTypeValue extends EmscriptenEnumTypeObject {}
-    export interface TokenType extends EmscriptenEnumType
-    {
-        NONE : TokenTypeValue;
-        EOF : TokenTypeValue;
-        UNKNOWN : TokenTypeValue;
-        JUNK : TokenTypeValue;
-        WHITESPACE : TokenTypeValue;
-        SPACE : TokenTypeValue;
-        NEWLINE : TokenTypeValue;
-        NL_CONT : TokenTypeValue;
-        COMMENT_CPP : TokenTypeValue;
-        COMMENT : TokenTypeValue;
-        COMMENT_MULTI : TokenTypeValue;
-        COMMENT_EMBED : TokenTypeValue;
-        COMMENT_START : TokenTypeValue;
-        COMMENT_END : TokenTypeValue;
-        COMMENT_WHOLE : TokenTypeValue;
-        COMMENT_ENDIF : TokenTypeValue;
-        IGNORED : TokenTypeValue;
-        WORD : TokenTypeValue;
-        NUMBER : TokenTypeValue;
-        NUMBER_FP : TokenTypeValue;
-        STRING : TokenTypeValue;
-        STRING_MULTI : TokenTypeValue;
-        IF : TokenTypeValue;
-        ELSE : TokenTypeValue;
-        ELSEIF : TokenTypeValue;
-        FOR : TokenTypeValue;
-        WHILE : TokenTypeValue;
-        WHILE_OF_DO : TokenTypeValue;
-        SWITCH : TokenTypeValue;
-        CASE : TokenTypeValue;
-        DO : TokenTypeValue;
-        SYNCHRONIZED : TokenTypeValue;
-        VOLATILE : TokenTypeValue;
-        TYPEDEF : TokenTypeValue;
-        STRUCT : TokenTypeValue;
-        ENUM : TokenTypeValue;
-        ENUM_CLASS : TokenTypeValue;
-        SIZEOF : TokenTypeValue;
-        DECLTYPE : TokenTypeValue;
-        RETURN : TokenTypeValue;
-        BREAK : TokenTypeValue;
-        UNION : TokenTypeValue;
-        GOTO : TokenTypeValue;
-        CONTINUE : TokenTypeValue;
-        C_CAST : TokenTypeValue;
-        CPP_CAST : TokenTypeValue;
-        D_CAST : TokenTypeValue;
-        TYPE_CAST : TokenTypeValue;
-        TYPENAME : TokenTypeValue;
-        TEMPLATE : TokenTypeValue;
-        WHERE_SPEC : TokenTypeValue;
-        ASSIGN : TokenTypeValue;
-        ASSIGN_NL : TokenTypeValue;
-        SASSIGN : TokenTypeValue;
-        ASSIGN_DEFAULT_ARG : TokenTypeValue;
-        ASSIGN_FUNC_PROTO : TokenTypeValue;
-        COMPARE : TokenTypeValue;
-        SCOMPARE : TokenTypeValue;
-        BOOL : TokenTypeValue;
-        SBOOL : TokenTypeValue;
-        ARITH : TokenTypeValue;
-        SARITH : TokenTypeValue;
-        CARET : TokenTypeValue;
-        DEREF : TokenTypeValue;
-        INCDEC_BEFORE : TokenTypeValue;
-        INCDEC_AFTER : TokenTypeValue;
-        MEMBER : TokenTypeValue;
-        DC_MEMBER : TokenTypeValue;
-        C99_MEMBER : TokenTypeValue;
-        INV : TokenTypeValue;
-        DESTRUCTOR : TokenTypeValue;
-        NOT : TokenTypeValue;
-        D_TEMPLATE : TokenTypeValue;
-        ADDR : TokenTypeValue;
-        NEG : TokenTypeValue;
-        POS : TokenTypeValue;
-        STAR : TokenTypeValue;
-        PLUS : TokenTypeValue;
-        MINUS : TokenTypeValue;
-        AMP : TokenTypeValue;
-        BYREF : TokenTypeValue;
-        POUND : TokenTypeValue;
-        PREPROC : TokenTypeValue;
-        PREPROC_INDENT : TokenTypeValue;
-        PREPROC_BODY : TokenTypeValue;
-        PP : TokenTypeValue;
-        ELLIPSIS : TokenTypeValue;
-        RANGE : TokenTypeValue;
-        NULLCOND : TokenTypeValue;
-        SEMICOLON : TokenTypeValue;
-        VSEMICOLON : TokenTypeValue;
-        COLON : TokenTypeValue;
-        ASM_COLON : TokenTypeValue;
-        CASE_COLON : TokenTypeValue;
-        CLASS_COLON : TokenTypeValue;
-        CONSTR_COLON : TokenTypeValue;
-        D_ARRAY_COLON : TokenTypeValue;
-        COND_COLON : TokenTypeValue;
-        WHERE_COLON : TokenTypeValue;
-        QUESTION : TokenTypeValue;
-        COMMA : TokenTypeValue;
-        ASM : TokenTypeValue;
-        ATTRIBUTE : TokenTypeValue;
-        AUTORELEASEPOOL : TokenTypeValue;
-        OC_AVAILABLE : TokenTypeValue;
-        OC_AVAILABLE_VALUE : TokenTypeValue;
-        CATCH : TokenTypeValue;
-        WHEN : TokenTypeValue;
-        WHERE : TokenTypeValue;
-        CLASS : TokenTypeValue;
-        DELETE : TokenTypeValue;
-        EXPORT : TokenTypeValue;
-        FRIEND : TokenTypeValue;
-        NAMESPACE : TokenTypeValue;
-        PACKAGE : TokenTypeValue;
-        NEW : TokenTypeValue;
-        OPERATOR : TokenTypeValue;
-        OPERATOR_VAL : TokenTypeValue;
-        ASSIGN_OPERATOR : TokenTypeValue;
-        ACCESS : TokenTypeValue;
-        ACCESS_COLON : TokenTypeValue;
-        THROW : TokenTypeValue;
-        NOEXCEPT : TokenTypeValue;
-        TRY : TokenTypeValue;
-        BRACED_INIT_LIST : TokenTypeValue;
-        USING : TokenTypeValue;
-        USING_STMT : TokenTypeValue;
-        USING_ALIAS : TokenTypeValue;
-        D_WITH : TokenTypeValue;
-        D_MODULE : TokenTypeValue;
-        SUPER : TokenTypeValue;
-        DELEGATE : TokenTypeValue;
-        BODY : TokenTypeValue;
-        DEBUG : TokenTypeValue;
-        DEBUGGER : TokenTypeValue;
-        INVARIANT : TokenTypeValue;
-        UNITTEST : TokenTypeValue;
-        UNSAFE : TokenTypeValue;
-        FINALLY : TokenTypeValue;
-        FIXED : TokenTypeValue;
-        IMPORT : TokenTypeValue;
-        D_SCOPE : TokenTypeValue;
-        D_SCOPE_IF : TokenTypeValue;
-        LAZY : TokenTypeValue;
-        D_MACRO : TokenTypeValue;
-        D_VERSION : TokenTypeValue;
-        D_VERSION_IF : TokenTypeValue;
-        PAREN_OPEN : TokenTypeValue;
-        PAREN_CLOSE : TokenTypeValue;
-        ANGLE_OPEN : TokenTypeValue;
-        ANGLE_CLOSE : TokenTypeValue;
-        SPAREN_OPEN : TokenTypeValue;
-        SPAREN_CLOSE : TokenTypeValue;
-        FPAREN_OPEN : TokenTypeValue;
-        FPAREN_CLOSE : TokenTypeValue;
-        TPAREN_OPEN : TokenTypeValue;
-        TPAREN_CLOSE : TokenTypeValue;
-        BRACE_OPEN : TokenTypeValue;
-        BRACE_CLOSE : TokenTypeValue;
-        VBRACE_OPEN : TokenTypeValue;
-        VBRACE_CLOSE : TokenTypeValue;
-        SQUARE_OPEN : TokenTypeValue;
-        SQUARE_CLOSE : TokenTypeValue;
-        TSQUARE : TokenTypeValue;
-        MACRO_OPEN : TokenTypeValue;
-        MACRO_CLOSE : TokenTypeValue;
-        MACRO_ELSE : TokenTypeValue;
-        LABEL : TokenTypeValue;
-        LABEL_COLON : TokenTypeValue;
-        FUNCTION : TokenTypeValue;
-        FUNC_CALL : TokenTypeValue;
-        FUNC_CALL_USER : TokenTypeValue;
-        FUNC_DEF : TokenTypeValue;
-        FUNC_TYPE : TokenTypeValue;
-        FUNC_VAR : TokenTypeValue;
-        FUNC_PROTO : TokenTypeValue;
-        FUNC_START : TokenTypeValue;
-        FUNC_CLASS_DEF : TokenTypeValue;
-        FUNC_CLASS_PROTO : TokenTypeValue;
-        FUNC_CTOR_VAR : TokenTypeValue;
-        FUNC_WRAP : TokenTypeValue;
-        PROTO_WRAP : TokenTypeValue;
-        MACRO_FUNC : TokenTypeValue;
-        MACRO : TokenTypeValue;
-        QUALIFIER : TokenTypeValue;
-        EXTERN : TokenTypeValue;
-        DECLSPEC : TokenTypeValue;
-        ALIGN : TokenTypeValue;
-        TYPE : TokenTypeValue;
-        PTR_TYPE : TokenTypeValue;
-        TYPE_WRAP : TokenTypeValue;
-        CPP_LAMBDA : TokenTypeValue;
-        CPP_LAMBDA_RET : TokenTypeValue;
-        TRAILING_RET : TokenTypeValue;
-        BIT_COLON : TokenTypeValue;
-        OC_DYNAMIC : TokenTypeValue;
-        OC_END : TokenTypeValue;
-        OC_IMPL : TokenTypeValue;
-        OC_INTF : TokenTypeValue;
-        OC_PROTOCOL : TokenTypeValue;
-        OC_PROTO_LIST : TokenTypeValue;
-        OC_GENERIC_SPEC : TokenTypeValue;
-        OC_PROPERTY : TokenTypeValue;
-        OC_CLASS : TokenTypeValue;
-        OC_CLASS_EXT : TokenTypeValue;
-        OC_CATEGORY : TokenTypeValue;
-        OC_SCOPE : TokenTypeValue;
-        OC_MSG : TokenTypeValue;
-        OC_MSG_CLASS : TokenTypeValue;
-        OC_MSG_FUNC : TokenTypeValue;
-        OC_MSG_NAME : TokenTypeValue;
-        OC_MSG_SPEC : TokenTypeValue;
-        OC_MSG_DECL : TokenTypeValue;
-        OC_RTYPE : TokenTypeValue;
-        OC_ATYPE : TokenTypeValue;
-        OC_COLON : TokenTypeValue;
-        OC_DICT_COLON : TokenTypeValue;
-        OC_SEL : TokenTypeValue;
-        OC_SEL_NAME : TokenTypeValue;
-        OC_BLOCK : TokenTypeValue;
-        OC_BLOCK_ARG : TokenTypeValue;
-        OC_BLOCK_TYPE : TokenTypeValue;
-        OC_BLOCK_EXPR : TokenTypeValue;
-        OC_BLOCK_CARET : TokenTypeValue;
-        OC_AT : TokenTypeValue;
-        OC_PROPERTY_ATTR : TokenTypeValue;
-        PP_DEFINE : TokenTypeValue;
-        PP_DEFINED : TokenTypeValue;
-        PP_INCLUDE : TokenTypeValue;
-        PP_IF : TokenTypeValue;
-        PP_ELSE : TokenTypeValue;
-        PP_ENDIF : TokenTypeValue;
-        PP_ASSERT : TokenTypeValue;
-        PP_EMIT : TokenTypeValue;
-        PP_ENDINPUT : TokenTypeValue;
-        PP_ERROR : TokenTypeValue;
-        PP_FILE : TokenTypeValue;
-        PP_LINE : TokenTypeValue;
-        PP_SECTION : TokenTypeValue;
-        PP_ASM : TokenTypeValue;
-        PP_UNDEF : TokenTypeValue;
-        PP_PROPERTY : TokenTypeValue;
-        PP_BODYCHUNK : TokenTypeValue;
-        PP_PRAGMA : TokenTypeValue;
-        PP_REGION : TokenTypeValue;
-        PP_ENDREGION : TokenTypeValue;
-        PP_REGION_INDENT : TokenTypeValue;
-        PP_IF_INDENT : TokenTypeValue;
-        PP_IGNORE : TokenTypeValue;
-        PP_OTHER : TokenTypeValue;
-        CHAR : TokenTypeValue;
-        DEFINED : TokenTypeValue;
-        FORWARD : TokenTypeValue;
-        NATIVE : TokenTypeValue;
-        STATE : TokenTypeValue;
-        STOCK : TokenTypeValue;
-        TAGOF : TokenTypeValue;
-        DOT : TokenTypeValue;
-        TAG : TokenTypeValue;
-        TAG_COLON : TokenTypeValue;
-        LOCK : TokenTypeValue;
-        AS : TokenTypeValue;
-        IN : TokenTypeValue;
-        BRACED : TokenTypeValue;
-        THIS : TokenTypeValue;
-        BASE : TokenTypeValue;
-        DEFAULT : TokenTypeValue;
-        GETSET : TokenTypeValue;
-        GETSET_EMPTY : TokenTypeValue;
-        CONCAT : TokenTypeValue;
-        CS_SQ_STMT : TokenTypeValue;
-        CS_SQ_COLON : TokenTypeValue;
-        CS_PROPERTY : TokenTypeValue;
-        SQL_EXEC : TokenTypeValue;
-        SQL_BEGIN : TokenTypeValue;
-        SQL_END : TokenTypeValue;
-        SQL_WORD : TokenTypeValue;
-        SQL_ASSIGN : TokenTypeValue;
-        CONSTRUCT : TokenTypeValue;
-        LAMBDA : TokenTypeValue;
-        ASSERT : TokenTypeValue;
-        ANNOTATION : TokenTypeValue;
-        FOR_COLON : TokenTypeValue;
-        DOUBLE_BRACE : TokenTypeValue;
-        CNG_HASINC : TokenTypeValue;
-        CNG_HASINCN : TokenTypeValue;
-        Q_EMIT : TokenTypeValue;
-        Q_FOREACH : TokenTypeValue;
-        Q_FOREVER : TokenTypeValue;
-        Q_GADGET : TokenTypeValue;
-        Q_OBJECT : TokenTypeValue;
-        MODE : TokenTypeValue;
-        DI : TokenTypeValue;
-        HI : TokenTypeValue;
-        QI : TokenTypeValue;
-        SI : TokenTypeValue;
-        NOTHROW : TokenTypeValue;
-        WORD_ : TokenTypeValue;
-    }
-
-    export interface LanguageValue extends EmscriptenEnumTypeObject {}
-    export interface Language extends EmscriptenEnumType
-    {
-        C : LanguageValue;
-        CPP : LanguageValue;
-        D : LanguageValue;
-        CS : LanguageValue;
-        JAVA : LanguageValue;
-        OC : LanguageValue;
-        VALA : LanguageValue;
-        PAWN : LanguageValue;
-        ECMA : LanguageValue;
-    }
-
-    // endregion enum bindings
-    // </editor-fold>
-
-    export interface GenericOptionPtr
-    {
-        type(): OptionTypeValue;
-        description(): string;
-        name(): string;
-        possibleValues(): EmscriptenVector<string>;
-        defaultStr(): string;
-        minStr(): string;
-        maxStr(): string;
-        isDefault: boolean;
-        reset(): void
-        set(value: string): boolean;
-        value(): string;
-    }
-
-    export interface OptionGroupPtr
-    {
-        description: string
-        options: EmscriptenVector<GenericOptionPtr>;
-    }
-
-    export interface Uncrustify
-    {
-        OptionType: OptionType;
-        IARF: IARF;
-        LineEnd: LineEnd;
-        TokenPos: TokenPos;
-        LogType: LogType;
-        TokenType: TokenType;
-        Language: Language;
-
-        //! get groups vector
-        get_groups() : EmscriptenVector <OptionGroupPtr>
-
-        //! get options vector
-        get_options() : EmscriptenVector <GenericOptionPtr>
-
-        //! destroys the current libUncrustify instance
-        destruct() : void;
-
-        //! returns the UNCRUSTIFY_VERSION string
-        get_version() : string;
-
-        //! adds a new keyword to Uncrustifys dynamic keyword map (dkwm, keywords.cpp)
-        add_keyword( tag : string, type : TokenType ) : void
-
-        //! removes a keyword from Uncrustifys dynamic keyword map (dkwm, keywords.cpp)
-        // remove_keyword( tag : string )
-
-        // clears Uncrustifys dynamic keyword map (dkwm, keywords.cpp)
-        clear_keywords() : void;
-
-        //! sets all option values to their default values
-        reset_options() : void;
-
-        /**
-        * resets value of an option to its default
-        *
-        * @param name:  name of the option
-        * @return options enum value of the found option or -1 if option was not found
-        */
-        option_reset_value( name : string ) : number;
-
-        /**
-        * sets value of an option
-        *
-        * @param name   name of the option
-        * @param value  value that is going to be set
-        * @return options enum value of the found option or -1 if option was not found
-        */
-        option_set_value( name : string, value : string ) : number;
-
-        /**
-        * returns value of an option
-        *
-        * @param name   name of the option
-        * @return currently set value of the option
-        */
-        option_get_value( name : string ) : string;
-
-        /**
-        * reads option file string, sets the defined options
-        *
-        * @return returns EXIT_SUCCESS on success
-        */
-        load_config( cfg : string ) : number;
-
-        /**
-        * returns the config file string based on the current configuration
-        *
-        * @param withDoc  false= without documentation true=with documentation text lines
-        * @param only_not_default  false=containing all options true=containing only options with non default values
-        * @return returns the config file string based on the current configuration
-        */
-        show_config( withDoc : boolean, only_not_default : boolean ) : string;
-
-        /**
-        * returns the config file string with all options based on the current configuration
-        *
-        * @param withDoc  false= without documentation true=with documentation text lines
-        * @return returns the config file string with all options based on the current configuration
-        */
-        show_config( withDoc : boolean ) : string;
-
-        /**
-        * returns the config file string with all options and without documentation based on the current configuration
-        *
-        * @return returns the config file string with all options without documentation based on the current configuration
-        */
-        show_config() : string;
-
-        //! enable or disable logging of a specific LogType
-        log_type_enable(type : LogType, value : bool) : void
-
-        /**
-        * Show or hide the severity prefix "<1>"
-        *
-        * @param b true=show  false=hide
-        */
-        log_type_show_name( b : boolean ) : void;
-
-        //! disables all logging messages
-        quiet() : void;
-
-        /**
-         * format text
-         *
-         * @param file file string that is going to be formated
-         * @param lang specifies in which language the input file is written (see LangFlag)
-         * @param frag [optional] true=fragmented code input
-         *                        false=unfragmented code input [default]
-         *
-         * @return formatted file string
-         */
-        uncrustify( file : string, lang : LanguageValue, frag : boolean ) : string;
-        uncrustify( file : string, lang : LanguageValue ) : string;
-
-        /**
-         * generate debug output
-         *
-         * @param file file string that is going to be formated
-         * @param lang specifies in which language the input file is written (see LangFlag)
-         * @param frag [optional] true=fragmented code input
-         *                        false=unfragmented code input [default]
-         *
-         * @return debug output string
-         */
-        debug( file : string, lang : LanguageValue, frag : boolean ) : string;
-        debug( file : string, lang : LanguageValue ) : string;
-    }
-
-    var Uncrustify : {
-        (module?: Object): Uncrustify;
-        new (module?: Object): Uncrustify;
-    };
-}
-
-declare var uncrustify : LibUncrustify.Uncrustify;
-
-declare module "libUncrustify"
-{
-    export = uncrustify;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_file
deleted file mode 100644
index 17315134..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_file
+++ /dev/null
@@ -1,2 +0,0 @@
-if (typeof module !== 'undefined') module.exports = libUncrustify;
-if (typeof define === 'function') define(libUncrustify);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_module.js
deleted file mode 100644
index cbf8f57b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_module.js
+++ /dev/null
@@ -1,141 +0,0 @@
-    //! auto initializes the module
-    Module["_initialize"](); //// execute this only one time,
-    Module["_initialize"] = Function.prototype; // and replace it with a noop
-
-    /**
-     * Takes in a JS string with other params, converts it to UTF8 and
-     * passes it to the actual _uncrustify function while also managing the
-     * memory on the emscripten heap.
-     */
-    Module["uncrustify"] = function(str, langIDX, frag, defer)
-    {
-        if( !str || typeof(str) !== "string" || str.length === 0 ) {return "";}
-
-        var nDataBytes = lengthBytesUTF8(str)+1; // +1 for \0
-        var stringInputPtr = Module._malloc(nDataBytes);
-        Module.stringToUTF8(str, stringInputPtr, nDataBytes);
-
-        var retStringPointer = 0;
-
-        switch(arguments.length)
-        {
-            // depending in the number of args the internal select_overload
-            // function resolves the appropriate internal _uncrustify function
-            case 2:
-            {
-                retStringPointer = Module["_uncrustify"](stringInputPtr, langIDX);
-                break;
-            }
-            case 3:
-            {
-                retStringPointer = Module["_uncrustify"](stringInputPtr, langIDX, frag);
-                break;
-            }
-//             case 4:
-//             {
-//                 retStringPointer = Module["_uncrustify"](stringInputPtr, langIDX, frag, defer);
-//                 break;
-//             }
-            default:
-            {
-                break;
-            }
-        }
-
-        Module._free(stringInputPtr);
-
-
-        var retString = "";
-
-        if(retStringPointer !== 0)
-        {
-            retString = Module.UTF8ToString(retStringPointer);
-            Module._free(retStringPointer);
-        }
-
-        return retString;
-    }
-
-    /**
-     * Takes in a JS string with other params, converts it to UTF8 and
-     * passes it to the actual _debug function while also managing the
-     * memory on the emscripten heap.
-     */
-    Module["debug"] = function(str, langIDX, frag)
-    {
-        if( !str || typeof(str) !== "string" || str.length === 0 ) {return "";}
-
-        var nDataBytes = lengthBytesUTF8(str)+1; // +1 for \0
-        var stringInputPtr = Module._malloc(nDataBytes);
-        Module.stringToUTF8(str, stringInputPtr, nDataBytes);
-
-        var retStringPointer = 0;
-
-        switch(arguments.length)
-        {
-            // depending in the number of args the internal select_overload
-            // function resolves the appropriate internal _uncrustify function
-            case 2:
-            {
-                retStringPointer = Module["_debug"](stringInputPtr, langIDX);
-                break;
-            }
-            case 3:
-            {
-                retStringPointer = Module["_debug"](stringInputPtr, langIDX, frag);
-                break;
-            }
-            default:
-            {
-                break;
-            }
-        }
-
-        Module._free(stringInputPtr);
-
-
-        var retString = "";
-
-        if(retStringPointer !== 0)
-        {
-            retString = Module.UTF8ToString(retStringPointer);
-            Module._free(retStringPointer);
-        }
-
-        return retString;
-    }
-
-    /**
-     * Takes in a JS string, removes non ascii chars (only those are needed
-     * in a config) and passes it to the actual _loadConfig function while
-     * also managing the memory on the emscripten heap.
-     */
-    Module.load_config = function(str)
-    {
-        // UTF8 functions return on empty string but they have to be accepted too
-        // to reset the current config
-        if( !str || typeof(str) !== "string" || str.length === 0) {str = " ";}
-
-        //remove unneeded non asci chars in the config
-        str.replace(/[^\x00-\x7F]/g, "");
-
-        var nDataBytes = str.length+1; // +1 for \0
-        var stringInputPtr = Module._malloc(nDataBytes);
-        Module.writeAsciiToMemory(str, stringInputPtr);
-
-
-        var retStringPointer = Module["_load_config"](stringInputPtr);
-        Module._free(stringInputPtr);
-
-
-        var retString = "";
-
-        if(retStringPointer !== 0)
-        {
-            retString = Module.Pointer_stringify(retStringPointer);
-            Module._free(retStringPointer);
-        }
-
-        return retString;
-    }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_file
deleted file mode 100644
index 6a6b5e98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_file
+++ /dev/null
@@ -1,8 +0,0 @@
-/* 
- * @file libUncrustify.js — JS port of Uncrustify
- *
- * @author  Ben Gardner, 
- *          ported by Daniel Chumak with the help of emscripten
- * @license GPLv2
- */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_module.js
deleted file mode 100644
index 05d09cd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_module.js
+++ /dev/null
@@ -1,28 +0,0 @@
-    if( !Module.hasOwnProperty('noInitialRun') ) { Module.noInitialRun = true; }
-    if( !Module.hasOwnProperty('noExitRuntime') ) { Module.noExitRuntime = true; }
-    if( !Module.hasOwnProperty('print') || typeof Module["print"] != 'function')
-    {
-        Module.print = (function()
-        {
-            return function(text) 
-            {
-                if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
-                console.log(text);
-            };
-        })();
-    }
-    if( !Module.hasOwnProperty('printErr') || typeof Module["printErr"] != 'function')
-    {
-        Module.printErr = function(text) 
-        {
-            if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
-            if (0) 
-            { // XXX disabled for safety typeof dump == 'function') {
-                dump(text + '\n'); // fast, straight to the real console
-            } 
-            else 
-            {
-                console.error(text);
-            }
-        };
-    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/run_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/run_tests.py
deleted file mode 100755
index c7a4fcae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/run_tests.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python
-#
-# Rebuilds the version using git describe
-#
-import sys
-from subprocess import Popen
-from os import listdir, EX_OK, EX_USAGE, EX_SOFTWARE
-from os.path import isfile, isdir, abspath, basename
-from tempfile import NamedTemporaryFile
-from glob import glob
-
-
-def main(args):
-    if len(args) < 2 or not isfile(args[0]) or not isdir(args[1]):
-        print("Usage:")
-        print("   arg 1: libUncrustify.js file path")
-        print("   arg 2: test directory path")
-        return EX_USAGE
-
-    c_red = '\033[31m'
-    c_green = '\033[32m'
-    c_end = '\033[0m'
-
-    js_file_path = args[0]
-    passed = 0
-    total = 0
-
-    test_files_dir = abspath(args[1])
-    test_files = glob(test_files_dir+"/test_*.js")
-    temp_file = NamedTemporaryFile(delete=True)
-
-    for test_file_path in test_files:
-        total += 1
-        pt_strg = "Testing %s: " % basename(test_file_path)
-        pt_strg_len = len(pt_strg)
-
-        sys.stdout.write(pt_strg)
-
-        with open(temp_file.name, 'r+') as t:
-            process = Popen(["node", test_file_path, js_file_path], stderr=t, stdout=t)
-            process.wait()
-
-            if process.returncode == 0:
-                print(("%spassed.%s" % (c_green, c_end)).rjust(86-pt_strg_len))
-                passed += 1
-            else:
-                print(("%sfailed!%s" % (c_red, c_end)).rjust(78-pt_strg_len))
-
-                t.seek(0)
-                text = t.read()
-                print(text)
-
-    if total == 0:
-        print("%sError%s: no test files found in %s" % (c_red, c_end, test_files_dir))
-        return EX_USAGE
-
-    print('-' * 80)
-
-    if passed == total:
-        print("%sAll %s tests passed%s" % (c_green, total, c_end))
-        return EX_OK
-    else:
-        print("%sWarning%s: %s/%s tests passed" % (c_red, c_end, passed, total))
-        return EX_SOFTWARE
-
-if __name__ == '__main__':
-    exit(main(sys.argv[1:]))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/test_run.js b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/test_run.js
deleted file mode 100644
index 27627094..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/test_run.js
+++ /dev/null
@@ -1,18 +0,0 @@
-exports.test = function(libUncrustify, assert){
-    var uncrustify = libUncrustify();
-
-    var input = '        string a = "aaaa";';
-    var expectedOutput = 'string a = "aaaa";';
-    var generatedOutput = uncrustify.uncrustify( input, uncrustify.Language.CPP );
-
-    assert.deepEqual(expectedOutput, generatedOutput, "comparing expectedOutput and generatedOutput");
-
-    uncrustify.destruct();
-};
-
-if (module == require.main) {
-    if(process.argv.length < 3) {throw "libUncrustify.js path missing";}
-	var uncrustify = require(process.argv[2]);
-	var assert = require("assert");
-	exports.test(uncrustify, assert);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/MS-calling_conventions.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/MS-calling_conventions.cfg
deleted file mode 100644
index 36e9e14f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/MS-calling_conventions.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# bug 633
-set COMMENT __stdcall
-set COMMENT __clrcall
-set COMMENT __fastcall
-set COMMENT __thiscall
-set COMMENT __vectorcall
-set COMMENT __cdecl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/amxmodx.cfg
deleted file mode 100644
index 7e435971..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/amxmodx.cfg
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-# AMX Mod X style for Pawn (or as close as possible)
-#
-
-#######################
-# Basic Indenting Stuff
-
-# (a/i/r) comment notation for add/ignore/remove which is the actual setting
-input_tab_size      = 1    # tab size on input file: usually 8
-output_tab_size     = 8    # tab size for output: usually 8
-indent_columns      = 8    # ie 3 or 8
-indent_with_tabs    = 2    # 1=only to the 'level' indent, 2=use tab indenting
-#indent_paren_nl     = 1    # indent-align under paren for open followed by nl
-
-pp_indent           = remove # indent preproc 1 space per level (a/i/r)
-pp_space            = remove # spaces between # and word (add/ignore/remove)
-
-#indent_switch_case  = 1    # spaces to indent case from switch
-#indent_case_brace   = 0    # spaces to indent '{' from case
-                            # (usually 0 or indent_columns)
-
-#indent_brace         = 0    # spaces to indent '{' from level (usually 0)
-indent_braces        = 0    # whether to indent the braces or not
-#indent_label         = 0    # 0=left >0=col from left (absolute column),
-                             # <0=sub from brace indent (relative column)
-
-indent_align_string    = false # True/False - indent align broken strings
-indent_col1_comment    = false # indent comments in column 1
-indent_func_call_param = false # indent continued function calls to indent_columns otherwise index_columns + spaces to align with open paren.
-
-indent_namespace    = true  # indent stuff inside namespace braces
-indent_class        = true  # indent stuff inside class braces
-
-
-############################
-# Misc Inter-element Spacing
-#  Force,Ignore,Add,Remove
-
-# ignored by nl_*_brace = true
-sp_paren_brace       = force  # space between ')' and '{'
-sp_fparen_brace      = force  # space between ')' and '{' of function
-sp_sparen_brace      = force  # space between ')' and '{' of if, while, etc
-
-sp_after_cast        = force  # space after cast - "(int) a" vs "(int)a"
-
-sp_before_byref      = force  # space before '&' of 'fcn(int& idx)'
-
-sp_inside_fparen     = force  # space inside 'foo( xxx )' vs 'foo(xxx)'
-sp_inside_fparens    = remove # space inside 'foo( )' vs 'foo()'
-sp_inside_paren      = remove # space inside '+ ( xxx )' vs '+ (xxx)'
-sp_inside_square     = remove # space inside 'byte[ 5 ]' vs 'byte[5]'
-sp_inside_sparen     = force  # space inside 'if( xxx )' vs 'if(xxx)'
-sp_inside_angle      = ignore # space inside '<>', as in '<class T>'
-
-sp_before_sparen     = force  # space before '(' of 'if/for/while/switch'
-sp_after_sparen      = force  # space after  ')' of 'if/for/while/switch'
-                              # the do-while does not get set here
-
-sp_before_angle      = ignore # space before '<>', as in '<class T>'
-sp_after_angle       = ignore # space after  '<>', as in '<class T>'
-
-sp_before_square     = ignore # space before single '['
-sp_before_squares    = remove # space before '[]', as in 'byte []'
-
-sp_paren_paren       = force  # space between nested parens - '( (' vs '(('
-
-sp_return_paren      = remove # space between 'return' and '('
-sp_sizeof_paren      = remove # space between 'sizeof' and '('
-
-sp_after_comma       = force  # space after ','
-
-sp_arith             = force  # space around + - / * etc
-sp_bool              = force  # space around || &&
-sp_compare           = force  # space around < > ==, etc
-sp_assign            = force  # space around =, +=, etc
-
-sp_func_def_paren    = remove # space between 'func' and '(' - "foo (" vs "foo("
-sp_func_call_paren   = remove # space between 'func' and '(' - "foo (" vs "foo("
-sp_func_proto_paren  = remove # space between 'func' and '(' - "foo (" vs "foo("
-sp_func_class_paren  = remove # space between ctor/dtor and '('
-
-#sp_type_func         = 1      # space between return type and 'func'
-                               # a minimum of 1 is forced except for '*'
-
-
-sp_special_semi         = remove # space empty stmt ';' on while, if, for
-                                 # example "while (*p++ = ' ') ;"
-sp_before_semi          = remove # space before all ';'
-sp_inside_braces        = force  # space inside '{' and '}' - "{ 1, 2, 3 }"
-sp_inside_braces_enum   = force  # space inside enum '{' and '}' - "{ a, b, c }"
-sp_inside_braces_struct = force  # space inside struct/union '{' and '}'
-
-sp_macro             = force  # space between macro and value, ie '#define a 6'
-sp_macro_func        = force  # space between macro and value, ie '#define a 6'
-
-sp_square_fparen     = remove # weird pawn stuff: native yark[rect](a[rect])
-sp_after_tag         = remove # pawn: space after a tag colon
-
-
-################################
-# Code Alignment
-# (not left column spaces/tabs)
-
-align_with_tabs       = true   # use tabs for aligning (0/1)
-align_keep_tabs       = false  # keep non-indenting tabs
-align_on_tabstop      = true   # always align on tabstops
-align_nl_cont         = false  # align the back-slash \n combo (macros)
-align_enum_equ_span   = 1      # align the '=' in enums
-align_assign_span     = 1      # align on '='. 0=don't align
-align_assign_thresh   = 0      # threshold for aligning on '='. 0=no limit
-align_right_cmt_span  = 8      # align comment that end lines. 0=don't align
-align_var_def_span    = 1      # align variable defs on variable (span for regular stuff)
-align_var_def_thresh  = 0      # align variable defs threshold
-align_var_def_inline  = true   # also align inline struct/enum/union var defs
-align_var_def_star_style = 1   # the star is part of the variable name
-align_var_def_colon   = false  # align the colon in struct bit fields
-align_var_struct_span = 1      # span for struct/union (0=don't align)
-align_pp_define_span  = 1      # align bodies in #define statements
-align_pp_define_gap   = 1      # min space between define label and value "#define a <---> 16"
-
-align_struct_init_span   = 1      # align structure initializer values
-align_func_proto_span    = 1      # align function prototypes
-align_number_right        = false  # right-align numbers (not fully supported, yet)
-align_typedef_span       = 1      # align single-line typedefs
-align_typedef_gap        = 1      # minimum spacing
-align_typedef_star_style = 1      # Start aligning style
-                                  # 0: '*' not part of type
-                                  # 1: '*' part of the type - no space
-                                  # 2: '*' part of type, dangling
-
-
-#####################################
-# Newline Adding and Removing Options
-#        Add/Remove/Ignore
-
-nl_fdef_brace        = add    # "int foo() {" vs "int foo()\n{"
-nl_func_decl_start   = ignore # newline after the '(' in a function decl
-nl_func_decl_args    = ignore # newline after each ',' in a function decl
-nl_func_decl_end     = ignore # newline before the ')' in a function decl
-nl_func_type_name    = ignore # newline between return type and func name in def
-nl_func_var_def_blk  = 0      # newline after a block of variable defs
-nl_before_case       = false  # newline before 'case' statement
-nl_after_return      = false  # newline after return statement
-nl_after_case        = false  # disallow nested "case 1: a=3;"
-nl_fcall_brace       = add    # newline between function call and open brace
-nl_squeeze_ifdef     = false  # no blanks after #ifxx, #elxx, or before #endif TRUE/F
-nl_enum_brace        = ignore # nl between enum and brace
-nl_struct_brace      = ignore # nl between struct and brace
-nl_union_brace       = ignore # nl between union and brace
-nl_assign_brace      = ignore # nl between '=' and brace
-nl_class_brace       = ignore # nl between class name and brace
-nl_namespace_brace   = ignore # nl between namespace name and brace
-
-nl_do_brace          = add    # nl between do and {
-nl_if_brace          = add    # nl between if and {
-nl_for_brace         = add    # nl between for and {
-nl_else_brace        = remove # nl between else and {
-nl_while_brace       = add    # nl between while and {
-nl_switch_brace      = add    # nl between switch and {
-nl_brace_else        = remove # nl between } and else
-nl_brace_while       = add    # nl between } and while of do stmt
-
-nl_elseif_brace      = add    # nl between close paren and open brace in 'else if () {'
-
-nl_define_macro      = 0      # alter newlines in #define macros
-nl_start_of_file     = ignore # alter newlines at the start of file
-nl_start_of_file_min = 0      # min number of newlines at the start of the file
-nl_end_of_file       = ignore # alter newlines at the end of file
-nl_end_of_file_min   = 0      # min number of newlines at the end of the file
-
-pos_bool             = start  # end=move &&/|| to EOL ignore=gnore, start=move to SOL
-
-#####################
-# Blank Line Options
-
-nl_before_block_comment   = 3   # before a block comment (stand-alone
-                                # comment-multi), except after brace open
-nl_after_func_body        = 3   # after the closing brace of a function body
-nl_after_func_proto       = 3   # after each prototype
-nl_after_func_proto_group = 3   # after a block of prototypes
-nl_max                    = 3   # maximum consecutive newlines (3=2 lines)
-
-eat_blanks_after_open_brace   = true  # remove blank lines after {
-eat_blanks_before_close_brace = true  # remove blank lines before }
-
-########################
-# Code Modifying Options
-# (non-whitespace)
-
-mod_paren_on_return     = force  # add or remove paren on return
-mod_full_brace_nl       = 1      # max number of newlines to span w/o braces
-mod_full_brace_if       = ignore # add or remove braces on if
-mod_full_brace_for      = ignore # add or remove braces on for
-mod_full_brace_do       = ignore # add or remove braces on do
-mod_full_brace_while    = ignore # add or remove braces on while
-mod_pawn_semicolon      = True   # add optional semicolons
-mod_full_brace_function = add    # add optional braces on Pawn functions
-
-
-#######################
-# Comment Modifications
-
-cmt_star_cont    = true   # put a star on subsequent comment lines
-cmt_cpp_to_c     = true   # convert CPP comments to C comments
-cmt_cpp_group    = true   # if UO_cmt_cpp_to_c, try to group in one big C comment
-cmt_cpp_nl_start = true   # put a blank /* at the start of a converted group
-cmt_cpp_nl_end   = true   # put a nl before the */ in a converted group
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben.cfg
deleted file mode 100644
index aeb4ba0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben.cfg
+++ /dev/null
@@ -1,1200 +0,0 @@
-#
-# General options
-#
-
-# The type of line endings
-newlines                                  = lf       # auto/lf/crlf/cr
-
-# The original size of tabs in the input
-input_tab_size                            = 8        # number
-
-# The size of tabs in the output (only used if align_with_tabs=true)
-output_tab_size                           = 3        # number
-
-# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn)
-string_escape_char                        = 92       # number
-
-# Alternate string escape char for Pawn. Only works right before the quote char.
-string_escape_char2                       = 0        # number
-
-# Replace tab characters found in string literals with the escape sequence \t instead.
-string_replace_tab_chars                  = false    # false/true
-
-# Allow interpreting '>=' and '>>=' as part of a template in 'void f(list<list<B>>=val);'.
-# If true (default), 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                             = false    # false/true
-
-# Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file.
-disable_processing_cmt                    = ""         # string
-
-# Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file.
-enable_processing_cmt                     = ""         # string
-
-# Enable parsing of digraphs. Default=false
-enable_digraphs                           = false    # false/true
-
-# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8
-utf8_byte                                 = false    # false/true
-
-# Force the output encoding to UTF-8
-utf8_force                                = false    # false/true
-
-#
-# Indenting
-#
-
-# The number of columns to indent per level.
-# Usually 2, 3, 4, or 8.
-indent_columns                            = 3        # number
-
-# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
-# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level
-indent_continue                           = 0        # number
-
-# How to use tabs when indenting code
-# 0=spaces only
-# 1=indent with tabs to brace level, align with spaces
-# 2=indent and align with tabs, using spaces when not on a tabstop
-indent_with_tabs                          = 0        # number
-
-# Comments that are not a brace level are indented with tabs on a tabstop.
-# Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs                      = false    # false/true
-
-# Whether to indent strings broken by '\' so that they line up
-indent_align_string                       = true     # false/true
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=True
-indent_xml_string                         = 0        # number
-
-# Spaces to indent '{' from level
-indent_brace                              = 0        # number
-
-# Whether braces are indented to the body level
-indent_braces                             = false    # false/true
-
-# Disabled indenting function braces if indent_braces is true
-indent_braces_no_func                     = false    # false/true
-
-# Disabled indenting class braces if indent_braces is true
-indent_braces_no_class                    = false    # false/true
-
-# Disabled indenting struct braces if indent_braces is true
-indent_braces_no_struct                   = false    # false/true
-
-# Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent                       = false    # false/true
-
-# Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace.
-indent_paren_open_brace                   = false    # false/true
-
-# Whether the 'namespace' body is indented
-indent_namespace                          = false    # false/true
-
-# Only indent one namespace and no sub-namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent            = false    # false/true
-
-# The number of spaces to indent a namespace block
-indent_namespace_level                    = 0        # number
-
-# If the body of the namespace is longer than this number, it won't be indented.
-# Requires indent_namespace=true. Default=0 (no limit)
-indent_namespace_limit                    = 0        # number
-
-# Whether the 'extern "C"' body is indented
-indent_extern                             = false    # false/true
-
-# Whether the 'class' body is indented
-indent_class                              = true     # false/true
-
-# Whether to indent the stuff after a leading base class colon
-indent_class_colon                        = true     # false/true
-
-# Indent based on a class colon instead of the stuff after the colon.
-# Requires indent_class_colon=true. Default=false
-indent_class_on_colon                     = false    # false/true
-
-# Whether to indent the stuff after a leading class initializer colon
-indent_constr_colon                       = false    # false/true
-
-# Virtual indent from the ':' for member initializers. Default is 2
-indent_ctor_init_leading                  = 2        # number
-
-# Additional indenting for constructor initializer list
-indent_ctor_init                          = 0        # number
-
-# False=treat 'else\nif' as 'else if' for indenting purposes
-# True=indent the 'if' one level
-indent_else_if                            = false    # false/true
-
-# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute
-indent_var_def_blk                        = 0        # number
-
-# Indent continued variable declarations instead of aligning.
-indent_var_def_cont                       = false    # false/true
-
-# Indent continued shift expressions ('<<' and '>>') instead of aligning.
-# Turn align_left_shift off when enabling this.
-indent_shift                              = false    # false/true
-
-# True:  force indentation of function definition to start in column 1
-# False: use the default behavior
-indent_func_def_force_col1                = false    # false/true
-
-# True:  indent continued function call parameters one indent level
-# False: align parameters under the open paren
-indent_func_call_param                    = false    # false/true
-
-# Same as indent_func_call_param, but for function defs
-indent_func_def_param                     = false    # false/true
-
-# Same as indent_func_call_param, but for function protos
-indent_func_proto_param                   = false    # false/true
-
-# Same as indent_func_call_param, but for class declarations
-indent_func_class_param                   = false    # false/true
-
-# Same as indent_func_call_param, but for class variable constructors
-indent_func_ctor_var_param                = false    # false/true
-
-# Same as indent_func_call_param, but for templates
-indent_template_param                     = false    # false/true
-
-# Double the indent for indent_func_xxx_param options
-indent_func_param_double                  = false    # false/true
-
-# Indentation column for standalone 'const' function decl/proto qualifier
-indent_func_const                         = 0        # number
-
-# Indentation column for standalone 'throw' function decl/proto qualifier
-indent_func_throw                         = 0        # number
-
-# The number of spaces to indent a continued '->' or '.'
-# Usually set to 0, 1, or indent_columns.
-indent_member                             = 3        # number
-
-# Spaces to indent single line ('//') comments on lines before code
-indent_sing_line_comments                 = 0        # number
-
-# If set, will indent trailing single line ('//') comments relative
-# to the code instead of trying to keep the same absolute column
-indent_relative_single_line_comments      = false    # false/true
-
-# Spaces to indent 'case' from 'switch'
-# Usually 0 or indent_columns.
-indent_switch_case                        = 0        # number
-
-# Spaces to shift the 'case' line, without affecting any other lines
-# Usually 0.
-indent_case_shift                         = 0        # number
-
-# Spaces to indent '{' from 'case'.
-# By default, the brace will appear under the 'c' in case.
-# Usually set to 0 or indent_columns.
-indent_case_brace                         = 3        # number
-
-# Whether to indent comments found in first column
-indent_col1_comment                       = false    # false/true
-
-# How to indent goto labels
-#  >0 : absolute column where 1 is the leftmost column
-#  <=0 : subtract from brace indent
-indent_label                              = 1        # number
-
-# Same as indent_label, but for access specifiers that are followed by a colon
-indent_access_spec                        = 1        # number
-
-# Indent the code after an access specifier by one level.
-# If set, this option forces 'indent_access_spec=0'
-indent_access_spec_body                   = false    # false/true
-
-# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)
-indent_paren_nl                           = false    # false/true
-
-# Controls the indent of a close paren after a newline.
-# 0: Indent to body level
-# 1: Align under the open paren
-# 2: Indent to the brace level
-indent_paren_close                        = 0        # number
-
-# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren
-indent_comma_paren                        = false    # false/true
-
-# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren
-indent_bool_paren                         = false    # false/true
-
-# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones
-indent_first_bool_expr                    = false    # false/true
-
-# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)
-indent_square_nl                          = false    # false/true
-
-# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies
-indent_preserve_sql                       = false    # false/true
-
-# Align continued statements at the '='. Default=True
-# If FALSE or the '=' is followed by a newline, the next line is indent one tab.
-indent_align_assign                       = true     # false/true
-
-# Indent OC blocks at brace level instead of usual rules.
-indent_oc_block                           = false    # false/true
-
-# Indent OC blocks in a message relative to the parameter name.
-# 0=use indent_oc_block rules, 1+=spaces to indent
-indent_oc_block_msg                       = 0        # number
-
-# Minimum indent for subsequent parameters
-indent_oc_msg_colon                       = 0        # number
-
-# If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).
-# Default is true.
-indent_oc_msg_prioritize_first_colon      = true     # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level).
-indent_oc_block_msg_xcode_style           = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword.
-indent_oc_block_msg_from_keyword          = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon.
-indent_oc_block_msg_from_colon            = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is.
-indent_oc_block_msg_from_caret            = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is.
-indent_oc_block_msg_from_brace            = false    # false/true
-
-# When identing after virtual brace open and newline add further spaces to reach this min. indent.
-indent_min_vbrace_open                    = 0        # number
-
-# TRUE: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop.
-indent_vbrace_open_on_tabstop             = false    # false/true
-
-#
-# Spacing options
-#
-
-# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
-# also '>>>' '<<' '>>' '%' '|'
-sp_arith                                  = force    # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=', '+=', etc
-sp_assign                                 = force    # ignore/add/remove/force
-
-# Add or remove space around preprocessor '##' concatenation operator. Default=Add
-sp_pp_concat                              = add      # ignore/add/remove/force
-
-# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator.
-sp_pp_stringify                           = add      # ignore/add/remove/force
-
-# Add or remove space around boolean operators '&&' and '||'
-sp_bool                                   = force    # ignore/add/remove/force
-
-# Add or remove space around compare operator '<', '>', '==', etc
-sp_compare                                = force    # ignore/add/remove/force
-
-# Add or remove space inside '(' and ')'
-sp_inside_paren                           = remove   # ignore/add/remove/force
-
-# Add or remove space between nested parens: '((' vs ') )'
-sp_paren_paren                            = remove   # ignore/add/remove/force
-
-# Whether to balance spaces inside nested parens
-sp_balance_nested_parens                  = false    # false/true
-
-# Add or remove space before pointer star '*'
-sp_before_ptr_star                        = force    # ignore/add/remove/force
-
-# Add or remove space between pointer stars '*'
-sp_between_ptr_star                       = remove   # ignore/add/remove/force
-
-# Add or remove space after pointer star '*', if followed by a word.
-sp_after_ptr_star                         = remove   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&'
-sp_before_byref                           = remove   # ignore/add/remove/force
-
-# Add or remove space after reference sign '&', if followed by a word.
-sp_after_byref                            = force    # ignore/add/remove/force
-
-# Add or remove space between type and word. Default=Force
-sp_after_type                             = force    # ignore/add/remove/force
-
-# Add or remove space before '<>'
-sp_before_angle                           = remove   # ignore/add/remove/force
-
-# Add or remove space inside '<' and '>'
-sp_inside_angle                           = remove   # ignore/add/remove/force
-
-# Add or remove space after '<>'
-sp_after_angle                            = force    # ignore/add/remove/force
-
-# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add
-sp_angle_shift                            = add      # ignore/add/remove/force
-
-# Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False
-# sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift                     = false    # false/true
-
-# Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc.
-sp_before_sparen                          = force    # ignore/add/remove/force
-
-# Add or remove space inside if-condition '(' and ')'
-sp_inside_sparen                          = remove   # ignore/add/remove/force
-
-# Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc.
-sp_after_sparen                           = force    # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc.
-sp_sparen_brace                           = add      # ignore/add/remove/force
-
-# Add or remove space before ';'. Default=Remove
-sp_before_semi                            = remove   # ignore/add/remove/force
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty                  = force    # ignore/add/remove/force
-
-# Add or remove space after ';', except when followed by a comment. Default=Add
-sp_after_semi                             = add      # ignore/add/remove/force
-
-# Add or remove space after ';' in non-empty 'for' statements. Default=Force
-sp_after_semi_for                         = force    # ignore/add/remove/force
-
-# Add or remove space inside a non-empty '[' and ']'
-sp_inside_square                          = remove   # ignore/add/remove/force
-
-# Add or remove space after ','
-sp_after_comma                            = force    # ignore/add/remove/force
-
-# Add or remove space before ','
-sp_before_comma                           = remove   # ignore/add/remove/force
-
-# Add or remove space between an open paren and comma: '(,' vs '( ,'
-sp_paren_comma                            = force    # ignore/add/remove/force
-
-# Add or remove space before case ':'. Default=Remove
-sp_before_case_colon                      = remove   # ignore/add/remove/force
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'
-sp_after_cast                             = remove   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof' and '('
-sp_sizeof_paren                           = remove   # ignore/add/remove/force
-
-# Add or remove space inside enum '{' and '}'
-sp_inside_braces_enum                     = force    # ignore/add/remove/force
-
-# Add or remove space inside struct/union '{' and '}'
-sp_inside_braces_struct                   = force    # ignore/add/remove/force
-
-# Add or remove space inside '{' and '}'
-sp_inside_braces                          = force    # ignore/add/remove/force
-
-# Add or remove space between return type and function name
-# A minimum of 1 is forced except for pointer return types.
-sp_type_func                              = force    # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function declaration
-sp_func_proto_paren                       = remove   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function definition
-sp_func_def_paren                         = remove   # ignore/add/remove/force
-
-# Add or remove space inside function '(' and ')'
-sp_inside_fparen                          = remove   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of function
-sp_fparen_brace                           = add      # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function calls
-sp_func_call_paren                        = remove   # ignore/add/remove/force
-
-# Add or remove space between a constructor/destructor and the open paren
-sp_func_class_paren                       = remove   # ignore/add/remove/force
-
-# Add or remove space between 'return' and '('
-sp_return_paren                           = remove   # ignore/add/remove/force
-
-# Add or remove space between '}' and the name of a typedef on the same line
-sp_brace_typedef                          = force    # ignore/add/remove/force
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst                    = add      # ignore/add/remove/force
-
-# Add or remove space between a variable and '{' for a namespace
-sp_word_brace_ns                          = add      # ignore/add/remove/force
-
-# Add or remove space before the '::' operator
-sp_before_dc                              = remove   # ignore/add/remove/force
-
-# Add or remove space after the '::' operator
-sp_after_dc                               = remove   # ignore/add/remove/force
-
-# Add or remove space after the '!' (not) operator. Default=Remove
-sp_not                                    = remove   # ignore/add/remove/force
-
-# Add or remove space after the '~' (invert) operator. Default=Remove
-sp_inv                                    = remove   # ignore/add/remove/force
-
-# Add or remove space after the '&' (address-of) operator. Default=Remove
-# This does not affect the spacing after a '&' that is part of a type.
-sp_addr                                   = remove   # ignore/add/remove/force
-
-# Add or remove space around the '.' or '->' operators. Default=Remove
-sp_member                                 = remove   # ignore/add/remove/force
-
-# Add or remove space after the '*' (dereference) operator. Default=Remove
-# This does not affect the spacing after a '*' that is part of a type.
-sp_deref                                  = remove   # ignore/add/remove/force
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove
-sp_sign                                   = remove   # ignore/add/remove/force
-
-# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove
-sp_incdec                                 = remove   # ignore/add/remove/force
-
-# Add or remove space before a backslash-newline at the end of a line. Default=Add
-sp_before_nl_cont                         = add      # ignore/add/remove/force
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
-sp_case_label                             = remove   # ignore/add/remove/force
-
-# TRUE: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen                        = false    # false/true
-
-# TRUE: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                           = false    # false/true
-
-# Number of spaces before a trailing or embedded comment
-sp_num_before_tr_emb_cmt                  = 0        # number
-
-#
-# Code alignment (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs
-align_keep_tabs                           = false    # false/true
-
-# Whether to use tabs for aligning
-align_with_tabs                           = false    # false/true
-
-# Whether to bump out to the next tab when aligning
-align_on_tabstop                          = false    # false/true
-
-# Whether to right-align numbers
-align_number_right                         = true     # false/true
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space                    = false    # false/true
-
-# Align variable definitions in prototypes and functions
-align_func_params                         = true     # false/true
-
-# Align parameters in single-line functions that have the same name.
-# The function names must already be aligned with each other.
-align_same_func_call_params               = false    # false/true
-
-# The span for aligning parameters in single line functions with the same name (0=don't align).
-align_same_func_call_params_span          = 0        # unsigned number
-
-# The thresh for aligning function call parameters (0=no limit).
-align_same_func_call_params_thresh        = 0        # unsigned number
-
-# The span for aligning variable definitions (0=don't align)
-align_var_def_span                        = 1        # number
-
-# How to align the star in variable definitions.
-#  0=Part of the type     'void *   foo;'
-#  1=Part of the variable 'void     *foo;'
-#  2=Dangling             'void    *foo;'
-align_var_def_star_style                  = 1        # number
-
-# How to align the '&' in variable definitions.
-#  0=Part of the type
-#  1=Part of the variable
-#  2=Dangling
-align_var_def_amp_style                   = 0        # number
-
-# The threshold for aligning variable definitions (0=no limit)
-align_var_def_thresh                      = 16       # number
-
-# The gap for aligning variable definitions
-align_var_def_gap                         = 0        # number
-
-# Whether to align the colon in struct bit fields
-align_var_def_colon                       = true     # false/true
-
-# Whether to align any attribute after the variable name
-align_var_def_attribute                   = false    # false/true
-
-# Whether to align inline struct/enum/union variable definitions
-align_var_def_inline                      = true     # false/true
-
-# The span for aligning on '=' in assignments (0=don't align)
-align_assign_span                         = 1        # number
-
-# The threshold for aligning on '=' in assignments (0=no limit)
-align_assign_thresh                       = 12       # number
-
-# The span for aligning on '=' in enums (0=don't align)
-align_enum_equ_span                       = 16       # number
-
-# The threshold for aligning on '=' in enums (0=no limit)
-align_enum_equ_thresh                     = 0        # number
-
-# The span for aligning struct/union (0=don't align)
-align_var_struct_span                     = 99       # number
-
-# The threshold for aligning struct/union member definitions (0=no limit)
-align_var_struct_thresh                   = 0        # number
-
-# The gap for aligning struct/union member definitions
-align_var_struct_gap                      = 0        # number
-
-# The span for aligning struct initializer values (0=don't align)
-align_struct_init_span                    = 3        # number
-
-# The minimum space between the type and the synonym of a typedef
-align_typedef_gap                         = 3        # number
-
-# The span for aligning single-line typedefs (0=don't align)
-align_typedef_span                        = 5        # number
-
-# How to align typedef'd functions with other typedefs
-# 0: Don't mix them at all
-# 1: align the open paren with the types
-# 2: align the function type name with the other type names
-align_typedef_func                        = 0        # number
-
-# Controls the positioning of the '*' in typedefs. Just try it.
-# 0: Align on typedef type, ignore '*'
-# 1: The '*' is part of type name: typedef int  *pint;
-# 2: The '*' is part of the type, but dangling: typedef int *pint;
-align_typedef_star_style                  = 0        # number
-
-# Controls the positioning of the '&' in typedefs. Just try it.
-# 0: Align on typedef type, ignore '&'
-# 1: The '&' is part of type name: typedef int  &pint;
-# 2: The '&' is part of the type, but dangling: typedef int &pint;
-align_typedef_amp_style                   = 0        # number
-
-# The span for aligning comments that end lines (0=don't align)
-align_right_cmt_span                      = 3        # number
-
-# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment
-align_right_cmt_mix                       = false    # false/true
-
-# If a trailing comment is more than this number of columns away from the text it follows,
-# it will qualify for being aligned. This has to be > 0 to do anything.
-align_right_cmt_gap                       = 0        # number
-
-# Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore)
-align_right_cmt_at_col                    = 0        # number
-
-# The span for aligning function prototypes (0=don't align)
-align_func_proto_span                     = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap                      = 0        # number
-
-# Align function protos on the 'operator' keyword instead of what follows
-align_on_operator                         = false    # false/true
-
-# Whether to mix aligning prototype and variable declarations.
-# If true, align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto                       = false    # false/true
-
-# Align single-line functions with function prototypes, uses align_func_proto_span
-align_single_line_func                    = false    # false/true
-
-# Aligning the open brace of single-line functions.
-# Requires align_single_line_func=true, uses align_func_proto_span
-align_single_line_brace                   = false    # false/true
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap               = 0        # number
-
-# The span for aligning ObjC msg spec (0=don't align)
-align_oc_msg_spec_span                    = 0        # number
-
-# Whether to align macros wrapped with a backslash and a newline.
-# This will not work right if the macro contains a multi-line comment.
-align_nl_cont                             = true     # false/true
-
-# # Align macro functions and variables together
-align_pp_define_together                  = false    # false/true
-
-# The minimum space between label and value of a preprocessor define
-align_pp_define_gap                       = 4        # number
-
-# The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks)
-align_pp_define_span                      = 3        # number
-
-# Align lines that start with '<<' with previous '<<'. Default=true
-align_left_shift                          = true     # false/true
-
-# Align text after asm volatile () colons.
-align_asm_colon                           = true     # false/true
-
-# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align)
-align_oc_msg_colon_span                   = 0        # number
-
-# If true, always align with the first parameter, even if it is too short.
-align_oc_msg_colon_first                  = false    # false/true
-
-# Aligning parameters in an Obj-C '+' or '-' declaration on the ':'
-align_oc_decl_colon                       = false    # false/true
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'
-nl_collapse_empty_body                    = false    # false/true
-
-# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'
-nl_assign_leave_one_liners                = true     # false/true
-
-# Don't split one-line braced statements inside a class xx { } body
-nl_class_leave_one_liners                 = true     # false/true
-
-# Don't split one-line enums: 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners                  = false    # false/true
-
-# Don't split one-line get or set functions
-nl_getset_leave_one_liners                = false    # false/true
-
-# Don't split one-line function definitions - 'int foo() { return 0; }'
-nl_func_leave_one_liners                  = false    # false/true
-
-# Don't split one-line C++11 lambdas - '[]() { return 0; }'
-nl_cpp_lambda_leave_one_liners            = false    # false/true
-
-# Don't split one-line if/else statements - 'if(a) b++;'
-nl_if_leave_one_liners                    = false    # false/true
-
-# Don't split one-line while statements - 'while(a) b++;'
-nl_while_leave_one_liners                 = false    # false/true
-
-# Don't split one-line OC messages
-nl_oc_msg_leave_one_liner                 = false    # false/true
-
-# Add or remove newlines at the start of the file
-nl_start_of_file                          = remove   # ignore/add/remove/force
-
-# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'
-nl_start_of_file_min                      = 0        # number
-
-# Add or remove newline at the end of the file
-nl_end_of_file                            = force    # ignore/add/remove/force
-
-# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')
-nl_end_of_file_min                        = 1        # number
-
-# Add or remove newline between '=' and '{'
-nl_assign_brace                           = add      # ignore/add/remove/force
-
-# The number of blank lines after a block of variable definitions at the top of a function body
-# 0 = No change (default)
-nl_func_var_def_blk                       = 1        # number
-
-# The number of newlines before a block of typedefs
-# 0 = No change (default)
-nl_typedef_blk_start                      = 0        # number
-
-# The number of newlines after a block of typedefs
-# 0 = No change (default)
-nl_typedef_blk_end                        = 0        # number
-
-# The maximum consecutive newlines within a block of typedefs
-# 0 = No change (default)
-nl_typedef_blk_in                         = 0        # number
-
-# The number of newlines before a block of variable definitions not at the top of a function body
-# 0 = No change (default)
-nl_var_def_blk_start                      = 0        # number
-
-# The number of newlines after a block of variable definitions not at the top of a function body
-# 0 = No change (default)
-nl_var_def_blk_end                        = 0        # number
-
-# The maximum consecutive newlines within a block of variable definitions
-# 0 = No change (default)
-nl_var_def_blk_in                         = 0        # number
-
-# Add or remove newline between a function call's ')' and '{', as in:
-# list_for_each(item, &list) { }
-nl_fcall_brace                            = add      # ignore/add/remove/force
-
-# Add or remove newline between 'enum' and '{'
-nl_enum_brace                             = force    # ignore/add/remove/force
-
-# Add or remove newline between 'struct and '{'
-nl_struct_brace                           = force    # ignore/add/remove/force
-
-# Add or remove newline between 'union' and '{'
-nl_union_brace                            = force    # ignore/add/remove/force
-
-# Add or remove newline between 'if' and '{'
-nl_if_brace                               = add      # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'else'
-nl_brace_else                             = add      # ignore/add/remove/force
-
-# Add or remove newline between 'else' and '{'
-nl_else_brace                             = add      # ignore/add/remove/force
-
-# Add or remove newline between get/set and '{'
-nl_getset_brace                           = force    # ignore/add/remove/force
-
-# Add or remove newline between 'for' and '{'
-nl_for_brace                              = add      # ignore/add/remove/force
-
-# Add or remove newline between 'while' and '{'
-nl_while_brace                            = add      # ignore/add/remove/force
-
-# Add or remove newline between 'do' and '{'
-nl_do_brace                               = add      # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'while' of 'do' statement
-nl_brace_while                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'switch' and '{'
-nl_switch_brace                           = add      # ignore/add/remove/force
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace.
-nl_multi_line_cond                        = false    # false/true
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define                      = true     # false/true
-
-# Whether to put a newline before 'case' statement
-nl_before_case                            = true     # false/true
-
-# Whether to put a newline after 'case' statement
-nl_after_case                             = true     # false/true
-
-# Add or remove newline between a function name and the opening '('
-nl_func_paren                             = remove   # ignore/add/remove/force
-
-# Whether to put each OC message parameter on a separate line
-# See nl_oc_msg_leave_one_liner
-nl_oc_msg_args                            = false    # false/true
-
-# Add or remove newline between function signature and '{'
-nl_fdef_brace                             = add      # ignore/add/remove/force
-
-# Whether to put a newline after semicolons, except in 'for' statements
-nl_after_semicolon                        = true     # false/true
-
-# Whether to put a newline after brace open.
-# This also adds a newline before the matching brace close.
-nl_after_brace_open                       = true     # false/true
-
-# If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is
-# placed between the open brace and a trailing single-line comment.
-nl_after_brace_open_cmt                   = false    # false/true
-
-# Whether to put a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open                      = false    # false/true
-
-# Whether to put a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty                = false    # false/true
-
-# Whether to put a newline after a brace close.
-# Does not apply if followed by a necessary ';'.
-nl_after_brace_close                      = true     # false/true
-
-# Whether to put a newline after a virtual brace close.
-# Would add a newline before return in: 'if (foo) a++; return;'
-nl_after_vbrace_close                     = false    # false/true
-
-# Whether to alter newlines in '#define' macros
-nl_define_macro                           = false    # false/true
-
-# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'. Does not affect the whole-file #ifdef.
-nl_squeeze_ifdef                          = true     # false/true
-
-# Whether to double-space commented-entries in struct/enum
-nl_ds_struct_enum_cmt                     = false    # false/true
-
-# Whether to double-space before the close brace of a struct/union/enum
-# (lower priority than 'eat_blanks_before_close_brace')
-nl_ds_struct_enum_close_brace             = false    # false/true
-
-# Change simple unbraced if statements into a one-liner
-# 'if(b)\n i++;' => 'if(b) i++;'
-nl_create_if_one_liner                    = false    # false/true
-
-# Change simple unbraced for statements into a one-liner
-# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'
-nl_create_for_one_liner                   = false    # false/true
-
-# Change simple unbraced while statements into a one-liner
-# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'
-nl_create_while_one_liner                 = false    # false/true
-
-#
-# Positioning options
-#
-
-# The position of boolean operators in wrapped expressions
-pos_bool                                  = trail    # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-#
-# Line Splitting options
-#
-
-# Try to limit code width to N number of columns
-code_width                                = 0        # number
-
-# Whether to fully split long 'for' statements at semi-colons
-ls_for_split_full                         = false    # false/true
-
-# Whether to fully split long function protos/calls at commas
-ls_func_split_full                        = false    # false/true
-
-# Whether to split lines as close to code_width as possible and ignore some groupings
-ls_code_width                             = false    # false/true
-
-#
-# Blank line options
-#
-
-# The maximum consecutive newlines
-nl_max                                    = 4        # number
-
-# The number of newlines after a function prototype, if followed by another function prototype
-nl_after_func_proto                       = 0        # number
-
-# The number of newlines after a function prototype, if not followed by another function prototype
-nl_after_func_proto_group                 = 2        # number
-
-# The number of newlines after '}' of a multi-line function body
-nl_after_func_body                        = 3        # number
-
-# The number of newlines after '}' of a multi-line function body in a class declaration
-nl_after_func_body_class                  = 2        # number
-
-# The number of newlines after '}' of a single line function body
-nl_after_func_body_one_liner              = 0        # number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment                   = 2        # number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment                       = 0        # number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment                     = 0        # number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment                = false    # false/true
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon                      = false    # false/true
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition
-nl_after_struct                           = 0        # number
-
-# The number of newlines after '}' or ';' of a class definition
-nl_after_class                            = 0        # number
-
-# The number of newlines after '}' of a namespace
-nl_after_namespace                        = 0        # number
-
-# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
-# Will not change the newline count if after a brace open.
-# 0 = No change.
-nl_before_access_spec                     = 0        # number
-
-# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
-# 0 = No change.
-nl_after_access_spec                      = 0        # number
-
-# The number of newlines between a function def and the function comment.
-# 0 = No change.
-nl_comment_func_def                       = 1        # number
-
-# The number of newlines after a try-catch-finally block that isn't followed by a brace close.
-# 0 = No change.
-nl_after_try_catch_finally                = 0        # number
-
-# The number of newlines before and after a property, indexer or event decl.
-# 0 = No change.
-nl_around_cs_property                     = 0        # number
-
-# The number of newlines between the get/set/add/remove handlers in C#.
-# 0 = No change.
-nl_between_get_set                        = 0        # number
-
-# Whether to remove blank lines after '{'
-eat_blanks_after_open_brace               = true     # false/true
-
-# Whether to remove blank lines before '}'
-eat_blanks_before_close_brace             = true     # false/true
-
-# How aggressively to remove extra newlines not in preproc.
-# 0: No change
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines                  = 0        # number
-
-# Whether to put a blank line before 'return' statements, unless after an open brace.
-nl_before_return                          = false    # false/true
-
-# Whether to put a blank line after 'return' statements, unless followed by a close brace.
-nl_after_return                           = true     # false/true
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on single-line 'do' statement
-mod_full_brace_do                         = add      # ignore/add/remove/force
-
-# Add or remove braces on single-line 'for' statement
-mod_full_brace_for                        = add      # ignore/add/remove/force
-
-# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
-mod_full_brace_if                         = add      # ignore/add/remove/force
-
-# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
-# If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
-mod_full_brace_if_chain                   = false    # false/true
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl                         = 0        # number
-
-# Add or remove braces on single-line 'while' statement
-mod_full_brace_while                      = add      # ignore/add/remove/force
-
-# Whether to change optional semicolons to real semicolons
-mod_pawn_semicolon                        = false    # false/true
-
-# Add parens on 'while' and 'if' statement around bools
-mod_full_paren_if_bool                    = true     # false/true
-
-# Whether to remove superfluous semicolons
-mod_remove_extra_semicolon                = true     # false/true
-
-# If a function body exceeds the specified number of newlines and doesn't have a comment after
-# the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment  = 0        # number
-
-# If a namespace body exceeds the specified number of newlines and doesn't have a comment after
-# the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a comment after
-# the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment    = 0        # number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after
-# the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment          = 0        # number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after
-# the #else, a comment will be added.
-mod_add_long_ifdef_else_comment           = 0        # number
-
-# If TRUE, will sort consecutive single-line 'import' statements [Java, D]
-mod_sort_import                           = false    # false/true
-
-# If TRUE, will sort consecutive single-line 'using' statements [C#]
-mod_sort_using                            = false    # false/true
-
-# If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]
-# This is generally a bad idea, as it may break your code.
-mod_sort_include                          = false    # false/true
-
-# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace.
-mod_move_case_break                       = false    # false/true
-
-# Will add or remove the braces around a fully braced case statement.
-# Will only remove the braces if there are no variable declarations in the block.
-mod_case_brace                            = remove   # ignore/add/remove/force
-
-# If TRUE, it will remove a void 'return;' that appears as the last statement in a function.
-mod_remove_empty_return                   = true     # false/true
-
-#
-# Comment modifications
-#
-
-# Try to wrap comments at cmt_width columns
-cmt_width                                 = 0        # number
-
-# Set the comment reflow mode (default: 0)
-# 0: no reflowing (apart from the line wrapping due to cmt_width)
-# 1: no touching at all
-# 2: full reflow
-cmt_reflow_mode                           = 0        # number
-
-# Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting.
-cmt_convert_tab_to_spaces                 = false    # false/true
-
-# If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars.
-# Default is true.
-cmt_indent_multi                          = true     # false/true
-
-# Whether to group c-comments that look like they are in a block
-cmt_c_group                               = false    # false/true
-
-# Whether to put an empty '/*' on the first line of the combined c-comment
-cmt_c_nl_start                            = false    # false/true
-
-# Whether to put a newline before the closing '*/' of the combined c-comment
-cmt_c_nl_end                              = false    # false/true
-
-# Whether to group cpp-comments that look like they are in a block
-cmt_cpp_group                             = false    # false/true
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-cmt_cpp_nl_start                          = false    # false/true
-
-# Whether to put a newline before the closing '*/' of the combined cpp-comment
-cmt_cpp_nl_end                            = false    # false/true
-
-# Whether to change cpp-comments into c-comments
-cmt_cpp_to_c                              = false    # false/true
-
-# Whether to put a star on subsequent comment lines
-cmt_star_cont                             = true     # false/true
-
-# The number of spaces to insert at the start of subsequent comment lines
-cmt_sp_before_star_cont                   = 0        # number
-
-# The number of spaces to insert after the star on subsequent comment lines
-cmt_sp_after_star_cont                    = 0        # number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
-# the comment are the same length. Default=True
-cmt_multi_check_last                      = true     # false/true
-
-# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.
-# Will substitute $(filename) with the current file's name.
-cmt_insert_file_header                    = ""         # string
-
-# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.
-# Will substitute $(filename) with the current file's name.
-cmt_insert_file_footer                    = ""         # string
-
-# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
-# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
-# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }
-cmt_insert_func_header                    = ""         # string
-
-# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.
-# Will substitute $(class) with the class name.
-cmt_insert_class_header                   = ""         # string
-
-# The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment.
-# Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.
-cmt_insert_oc_msg_header                  = ""         # string
-
-# If a preprocessor is encountered when stepping backwards from a function name, then
-# this option decides whether the comment should be inserted.
-# Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header.
-cmt_insert_before_preproc                 = false    # false/true
-
-#
-# Preprocessor options
-#
-
-# Control indent of preprocessors inside #if blocks at brace level 0 (file-level)
-pp_indent                                 = remove   # ignore/add/remove/force
-
-# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)
-pp_indent_at_level                        = false    # false/true
-
-# Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
-# If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
-# Default=1.
-pp_indent_count                           = 1        # number
-
-# Sets the number of spaces added with pp_space
-pp_space_count                            = 0        # number
-
-# The indent for #region and #endregion in C# and '#pragma region' in C/C++
-pp_indent_region                          = 0        # number
-
-# Whether to indent the code between #region and #endregion
-pp_region_indent_code                     = false    # false/true
-
-# If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level.
-# 0:  indent preprocessors using output_tab_size.
-# >0: column at which all preprocessors will be indented.
-pp_indent_if                              = 0        # number
-
-# Control whether to indent the code between #if, #else and #endif.
-pp_if_indent_code                         = false    # false/true
-
-# Whether to indent '#define' at the brace level (true) or from column 1 (false)
-pp_define_at_level                        = false    # false/true
-
-#
-# Use or Do not Use options
-#
-
-# True:  indent_func_call_param will be used
-# False: indent_func_call_param will NOT be used
-use_indent_func_call_param                = true     # false/true
-
-# True:  indent_continue will be used only once
-# False: indent_continue will be used every time (default)
-use_indent_continue_only_once             = false    # false/true
-
-# You can force a token to be a type with the 'type' option.
-# Example:
-# type myfoo1 myfoo2
-#
-# You can create custom macro-based indentation using macro-open,
-# macro-else and macro-close.
-# Example:
-# macro-open  BEGIN_TEMPLATE_MESSAGE_MAP
-# macro-open  BEGIN_MESSAGE_MAP
-# macro-close END_MESSAGE_MAP
-#
-# You can assign any keyword to any type with the set option.
-# set func_call_user _ N_
-#
-# The full syntax description of all custom definition config entries
-# is shown below:
-#
-# define custom tokens as:
-# - embed whitespace in token using '' escape character, or
-#   put token in quotes
-# - these: ' " and ` are recognized as quote delimiters
-#
-# type token1 token2 token3 ...
-#             ^ optionally specify multiple tokens on a single line
-# define def_token output_token
-#                  ^ output_token is optional, then NULL is assumed
-# macro-open token
-# macro-close token
-# macro-else token
-# set id token1 token2 ...
-#               ^ optionally specify multiple tokens on a single line
-#     ^ id is one of the names in token_enum.h sans the CT_ prefix,
-#       e.g. PP_PRAGMA
-#
-# all tokens are separated by any mix of ',' commas, '=' equal signs
-# and whitespace (space, tab)
-#
-# You can add support for other file extensions using the 'file_ext' command.
-# The first arg is the language name used with the '-l' option.
-# The remaining args are file extensions, matched with 'endswith'.
-#   file_ext CPP .ch .cxx .cpp.in
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben2.cfg
deleted file mode 100644
index 36831d5c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben2.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# My favorite format
-#
-
-indent_with_tabs		= 0		# 1=indent with tabs, 2=indent to level only
-input_tab_size			= 8		# original tab size
-output_tab_size			= 3		# new tab size
-indent_columns			= output_tab_size
-indent_label			= 2		# pos: absolute col, neg: relative column
-indent_align_string		= False		# align broken strings
-indent_brace			= 0
-
-nl_enum_brace			= add		# "enum {" vs "enum \n {"
-nl_union_brace			= add		# "union {" vs "union \n {"
-nl_struct_brace			= add		# "struct {" vs "struct \n {"
-nl_do_brace			= add		# "do {" vs "do \n {"
-nl_if_brace			= add		# "if () {" vs "if () \n {"
-nl_for_brace			= add		# "for () {" vs "for () \n {"
-nl_else_brace			= add		# "else {" vs "else \n {"
-nl_while_brace			= add		# "while () {" vs "while () \n {"
-nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
-nl_before_case			= 1
-nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
-nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-nl_after_return			= TRUE
-nl_brace_while			= remove
-nl_brace_else			= add
-nl_squeeze_ifdef		= TRUE
-
-# mod_paren_on_return		= add		# "return 1;" vs "return (1);"
-# mod_full_brace_if		= add		# "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for		= add		# "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do		= add		# "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while		= add		# "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_semi			= remove
-sp_paren_paren			= remove	# space between (( and ))
-sp_return_paren			= remove	# "return (1);" vs "return(1);"
-sp_sizeof_paren			= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen		= force		# "if (" vs "if("
-sp_after_sparen			= force		# "if () {" vs "if (){"
-sp_after_cast			= remove	# "(int) a" vs "(int)a"
-sp_inside_braces		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum		= force		# "{ 1 }" vs "{1}"
-sp_inside_paren			= remove
-sp_inside_fparen		= remove
-sp_inside_sparen		= remove
-#sp_type_func			= ignore
-sp_assign			= force
-sp_arith			= force
-sp_bool				= force
-sp_compare			= force
-sp_assign			= force
-sp_after_comma			= force
-sp_func_def_paren		= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren		= remove	# "foo (" vs "foo("
-sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
-
-align_with_tabs			= FALSE		# use tabs to align
-align_on_tabstop		= FALSE		# align on tabstops
-align_enum_equ_span		= 4
-align_nl_cont			= TRUE
-align_var_def_span		= 2
-align_var_def_inline		= TRUE
-align_var_def_star_style	= 1
-align_var_def_colon		= TRUE
-align_assign_span		= 1
-align_struct_init_span		= 3
-align_var_struct_span		= 3
-align_right_cmt_span		= 3
-align_pp_define_span		= 3
-align_pp_define_gap		= 4
-align_number_right		= TRUE
-align_typedef_span		= 5
-align_typedef_gap		= 3
-
-cmt_star_cont			= TRUE
-
-eat_blanks_before_close_brace	= TRUE
-eat_blanks_after_open_brace	= TRUE
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/d.cfg
deleted file mode 100644
index 22690c47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/d.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# My favorite format
-#
-
-indent_with_tabs		= 0		# 1=indent to level only, 2=indent with tabs
-input_tab_size			= 8		# original tab size
-output_tab_size			= 4		# new tab size
-indent_columns			= output_tab_size
-indent_label			= 2		# pos: absolute col, neg: relative column
-indent_align_string		= False		# align broken strings
-indent_brace			= 0
-
-nl_enum_brace			= add		# "enum {" vs "enum \n {"
-nl_union_brace			= add		# "union {" vs "union \n {"
-nl_struct_brace			= add		# "struct {" vs "struct \n {"
-nl_do_brace			= add		# "do {" vs "do \n {"
-nl_if_brace			= add		# "if () {" vs "if () \n {"
-nl_for_brace			= add		# "for () {" vs "for () \n {"
-nl_else_brace			= add		# "else {" vs "else \n {"
-nl_while_brace			= add		# "while () {" vs "while () \n {"
-nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-# nl_func_var_def_blk		= 1
-# nl_before_case			= 1
-nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
-nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return			= TRUE
-nl_brace_while			= remove
-nl_brace_else			= add
-nl_squeeze_ifdef		= TRUE
-
-# mod_paren_on_return		= add		# "return 1;" vs "return (1);"
-# mod_full_brace_if		= add		# "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for		= add		# "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do		= add		# "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while		= add		# "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_semi			= remove
-sp_paren_paren			= remove	# space between (( and ))
-sp_return_paren			= remove	# "return (1);" vs "return(1);"
-sp_sizeof_paren			= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen		= force		# "if (" vs "if("
-sp_after_sparen			= force		# "if () {" vs "if (){"
-sp_after_cast			= add		# "(int) a" vs "(int)a"
-sp_inside_braces		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum		= force		# "{ 1 }" vs "{1}"
-sp_inside_paren			= remove
-sp_inside_fparen		= remove
-sp_inside_sparen		= remove
-#sp_type_func			= ignore
-sp_assign			= force
-sp_arith			= force
-sp_bool				= force
-sp_compare			= force
-sp_assign			= force
-sp_after_comma			= force
-sp_func_def_paren		= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren		= remove	# "foo (" vs "foo("
-sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
-
-align_with_tabs			= FALSE		# use tabs to align
-align_on_tabstop		= FALSE		# align on tabstops
-align_enum_equ_span		= 4
-align_nl_cont			= TRUE
-align_var_def_span		= 2
-align_var_def_inline		= TRUE
-align_var_def_star_style	= 1
-align_var_def_colon		= TRUE
-align_assign_span		= 1
-align_struct_init_span		= 3
-align_var_struct_span		= 3
-align_right_cmt_span		= 3
-align_pp_define_span		= 3
-align_pp_define_gap		= 4
-align_number_right		= TRUE
-align_typedef_span		= 5
-align_typedef_gap		= 3
-
-# cmt_star_cont			= TRUE
-
-eat_blanks_before_close_brace	= TRUE
-eat_blanks_after_open_brace	= TRUE
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/defaults.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/defaults.cfg
deleted file mode 100644
index e87d42ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/defaults.cfg
+++ /dev/null
@@ -1,3214 +0,0 @@
-# Uncrustify-0.73.0
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
-
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
-
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
-
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Option to allow both disable_processing_cmt and enable_processing_cmt
-# strings, if specified, to be interpreted as ECMAScript regular expressions.
-# If true, a regex search will be performed within comments according to the
-# specified patterns in order to disable/enable processing.
-processing_cmt_as_regex         = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening parenthesis and before the closing
-# parenthesis of a argument list of a C++11 lambda, as in
-# '[]( <here> int x <here> ){ ... }'.
-sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype(...)' and word,
-# brace or function call.
-sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
-
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
-
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force/not_defined
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force/not_defined
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : <here> expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var <here> : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
-# A region marker is defined as a comment which is not preceded by other text
-# (i.e. the comment is the first non-whitespace on the line), and which starts
-# with either 'BEGIN' or 'END'.
-#
-# Overrides sp_cmt_cpp_start.
-sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
-
-# If true, space added with sp_cmt_cpp_start will be added after Doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space added with sp_cmt_cpp_start will be added after Qt translator
-# or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force/not_defined
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
-
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
-
-# Additional indent before the leading base class colon.
-# Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
-indent_before_class_colon       = 0        # number
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-# It might wise to choose the same value for the option indent_case_brace.
-indent_switch_case              = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-# It might wise to choose the same value for the option indent_switch_case.
-indent_case_brace               = 0        # number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = 1        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace
-#       (i.e. 2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only
-#        add the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statements inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = false    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line do statements, as in 'do { b++; } while(...);'.
-nl_do_leave_one_liners          = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option in case of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into three lines by
-# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option overrides eat_blanks_after_open_brace and
-# eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition. Where
-# applicable, this option is overridden with eat_blanks_after_open_brace=true
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Path to a file that contains regular expressions describing patterns for
-# which the end of one line and the beginning of the next will be folded into
-# the same sentence or paragraph during full comment reflow. The regular
-# expressions are described using ECMAScript syntax. The syntax for this
-# specification is as follows, where "..." indicates the custom regular
-# expression and "n" indicates the nth end_of_prev_line_regex and
-# beg_of_next_line_regex regular expression pair:
-#
-# end_of_prev_line_regex[1] = "...$"
-# beg_of_next_line_regex[1] = "^..."
-# end_of_prev_line_regex[2] = "...$"
-# beg_of_next_line_regex[2] = "^..."
-#             .
-#             .
-#             .
-# end_of_prev_line_regex[n] = "...$"
-# beg_of_next_line_regex[n] = "^..."
-#
-# Note that use of this option overrides the default reflow fold regular
-# expressions, which are internally defined as follows:
-#
-# end_of_prev_line_regex[1] = "[\w,\]\)]$"
-# beg_of_next_line_regex[1] = "^[\w,\[\(]"
-# end_of_prev_line_regex[2] = "\.$"
-# beg_of_next_line_regex[2] = "^[A-Z]"
-cmt_reflow_fold_regex_file      = ""         # string
-
-# Whether to indent wrapped lines to the start of the encompassing paragraph
-# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
-# specified by cmt_sp_after_star_cont.
-#
-# Note that cmt_align_doxygen_javadoc_tags overrides this option for
-# paragraphs associated with javadoc tags
-cmt_reflow_indent_to_paragraph_start = false    # true/false
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
-# and corresponding fields such that groups of consecutive block tags,
-# parameter names, and descriptions align with one another. Overrides that
-# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
-# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
-# in order to achieve the desired alignment for line-wrapping.
-cmt_align_doxygen_javadoc_tags  = false    # true/false
-
-# The number of spaces to insert after the star and before doxygen
-# javadoc-style tags (@param, @return, etc). Requires enabling
-# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
-# cmt_sp_after_star_cont.
-#
-# Default: 1
-cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list of whitespace
-# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Set the number of characters to be printed if the text is too long,
-# 0: do not truncate.
-debug_truncate                  = 0        # unsigned number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 0
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/dofiles.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/dofiles.sh
deleted file mode 100644
index e08fd6f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/dofiles.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-if [ -z "$1" ]; then
-   echo "specify the file that contains a list of files"
-   exit
-fi
-
-files=$(cat $1)
-
-mkdir -p out
-
-for item in $files ; do
-
-  dn=$(dirname $item)
-  mkdir -p out/$dn
-  src/uncrustify -f $item -c etc/ben.cfg > out/$item
-
-done
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/freebsd.cfg
deleted file mode 100644
index ec5e2c96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/freebsd.cfg
+++ /dev/null
@@ -1,382 +0,0 @@
-# Uncrustify 0.55
-newlines                                 = lf
-input_tab_size                           = 8
-output_tab_size                          = 8
-string_escape_char                       = 92
-string_escape_char2                      = 0
-indent_columns                           = 8
-indent_continue                          = 4
-indent_with_tabs                         = 2
-indent_align_string                      = false
-indent_xml_string                        = 0
-indent_brace                             = 0
-indent_braces                            = false
-indent_braces_no_func                    = false
-indent_brace_parent                      = false
-indent_namespace                         = false
-indent_namespace_level                   = 0
-indent_namespace_limit                   = 0
-indent_extern                            = false
-indent_class                             = true
-indent_class_colon                       = true
-indent_else_if                           = false
-indent_var_def_blk                       = 0
-indent_func_call_param                   = false
-indent_func_def_param                    = false
-indent_func_proto_param                  = false
-indent_func_class_param                  = false
-indent_func_ctor_var_param               = false
-indent_template_param                    = false
-indent_func_param_double                 = false
-indent_func_const                        = 0
-indent_func_throw                        = 0
-indent_member                            = 0
-indent_sing_line_comments                = 0
-indent_relative_single_line_comments     = false
-indent_switch_case                       = 0
-indent_case_shift                        = 0
-indent_case_brace                        = 0
-indent_col1_comment                      = false
-indent_label                             = 1
-indent_access_spec                       = 1
-indent_access_spec_body                  = false
-indent_paren_nl                          = false
-indent_paren_close                       = 0
-indent_comma_paren                       = false
-indent_bool_paren                        = false
-indent_square_nl                         = false
-indent_preserve_sql                      = false
-indent_align_assign                      = true
-indent_off_after_assign                  = false
-sp_arith                                 = ignore
-sp_assign                                = force
-sp_before_assign                         = ignore
-sp_after_assign                          = ignore
-sp_enum_assign                           = ignore
-sp_enum_before_assign                    = ignore
-sp_enum_after_assign                     = ignore
-sp_pp_concat                             = add
-sp_pp_stringify                          = add
-sp_bool                                  = force
-sp_compare                               = force
-sp_inside_paren                          = remove
-sp_paren_paren                           = remove
-sp_balance_nested_parens                 = false
-sp_paren_brace                           = ignore
-sp_before_ptr_star                       = force
-sp_before_unnamed_ptr_star               = ignore
-sp_between_ptr_star                      = remove
-sp_after_ptr_star                        = remove
-sp_after_ptr_star_func                   = ignore
-sp_before_ptr_star_func                  = ignore
-sp_before_byref                          = remove
-sp_before_unnamed_byref                  = ignore
-sp_after_byref                           = force
-sp_after_byref_func                      = ignore
-sp_before_byref_func                     = ignore
-sp_after_type                            = force
-sp_template_angle                        = ignore
-sp_before_angle                          = remove
-sp_inside_angle                          = remove
-sp_after_angle                           = force
-sp_angle_paren                           = ignore
-sp_angle_word                            = ignore
-sp_before_sparen                         = force
-sp_inside_sparen                         = remove
-sp_inside_sparen_close                   = ignore
-sp_after_sparen                          = force
-sp_sparen_brace                          = add
-sp_invariant_paren                       = ignore
-sp_after_invariant_paren                 = ignore
-sp_special_semi                          = ignore
-sp_before_semi                           = remove
-sp_before_semi_for                       = ignore
-sp_before_semi_for_empty                 = force
-sp_after_semi                            = add
-sp_after_semi_for                        = force
-sp_after_semi_for_empty                  = ignore
-sp_before_square                         = ignore
-sp_before_squares                        = ignore
-sp_inside_square                         = remove
-sp_after_comma                           = force
-sp_before_comma                          = remove
-sp_before_ellipsis                       = ignore
-sp_after_class_colon                     = ignore
-sp_before_class_colon                    = ignore
-sp_before_case_colon                     = remove
-sp_after_operator                        = ignore
-sp_after_operator_sym                    = ignore
-sp_after_cast                            = remove
-sp_inside_paren_cast                     = ignore
-sp_cpp_cast_paren                        = ignore
-sp_sizeof_paren                          = remove
-sp_after_tag                             = ignore
-sp_inside_braces_enum                    = force
-sp_inside_braces_struct                  = force
-sp_inside_braces                         = force
-sp_inside_braces_empty                   = ignore
-sp_type_func                             = force
-sp_func_proto_paren                      = remove
-sp_func_def_paren                        = remove
-sp_inside_fparens                        = ignore
-sp_inside_fparen                         = remove
-sp_square_fparen                         = ignore
-sp_fparen_brace                          = add
-sp_func_call_paren                       = remove
-sp_func_call_user_paren                  = ignore
-sp_func_class_paren                      = remove
-sp_return_paren                          = force
-sp_attribute_paren                       = ignore
-sp_defined_paren                         = ignore
-sp_throw_paren                           = ignore
-sp_macro                                 = ignore
-sp_macro_func                            = ignore
-sp_else_brace                            = ignore
-sp_brace_else                            = ignore
-sp_brace_typedef                         = force
-sp_catch_brace                           = ignore
-sp_brace_catch                           = ignore
-sp_finally_brace                         = ignore
-sp_brace_finally                         = ignore
-sp_try_brace                             = ignore
-sp_getset_brace                          = ignore
-sp_before_dc                             = remove
-sp_after_dc                              = remove
-sp_d_array_colon                         = ignore
-sp_not                                   = remove
-sp_inv                                   = remove
-sp_addr                                  = remove
-sp_member                                = remove
-sp_deref                                 = remove
-sp_sign                                  = remove
-sp_incdec                                = remove
-sp_before_nl_cont                        = add
-sp_after_oc_scope                        = ignore
-sp_after_oc_colon                        = ignore
-sp_before_oc_colon                       = ignore
-sp_after_send_oc_colon                   = ignore
-sp_before_send_oc_colon                  = ignore
-sp_after_oc_type                         = ignore
-sp_after_oc_return_type                  = ignore
-sp_after_oc_at_sel                       = ignore
-sp_before_oc_block_caret                 = ignore
-sp_after_oc_block_caret                  = ignore
-sp_cond_colon                            = ignore
-sp_cond_question                         = ignore
-sp_case_label                            = remove
-sp_range                                 = ignore
-sp_cmt_cpp_start                         = ignore
-sp_endif_cmt                             = ignore
-force_tab_after_define                   = true
-align_keep_tabs                          = false
-align_with_tabs                          = true
-align_on_tabstop                         = true
-align_number_right                       = true
-align_func_params                        = false
-align_same_func_call_params              = false
-align_same_func_call_params_span         = 0
-align_same_func_call_params_thresh       = 0
-align_var_def_span                       = 0
-align_var_def_star_style                 = 0
-align_var_def_amp_style                  = 0
-align_var_def_thresh                     = 0
-align_var_def_gap                        = 0
-align_var_def_colon                      = false
-align_var_def_attribute                  = false
-align_var_def_inline                     = false
-align_assign_span                        = 0
-align_assign_thresh                      = 12
-align_enum_equ_span                      = 16
-align_enum_equ_thresh                    = 0
-align_var_struct_span                    = 99
-align_var_struct_thresh                  = 0
-align_var_struct_gap                     = 0
-align_struct_init_span                   = 3
-align_typedef_gap                        = 3
-align_typedef_span                       = 5
-align_typedef_func                       = 0
-align_typedef_star_style                 = 0
-align_typedef_amp_style                  = 0
-align_right_cmt_span                     = 3
-align_right_cmt_mix                      = false
-align_right_cmt_gap                      = 0
-align_right_cmt_at_col                   = 0
-align_func_proto_span                    = 0
-align_func_proto_gap                     = 0
-align_on_operator                        = false
-align_mix_var_proto                      = false
-align_single_line_func                   = false
-align_single_line_brace                  = false
-align_single_line_brace_gap              = 0
-align_oc_msg_spec_span                   = 0
-align_nl_cont                            = true
-align_pp_define_gap                      = 4
-align_pp_define_span                     = 3
-align_left_shift                         = true
-align_oc_msg_colon_span                  = 0
-nl_collapse_empty_body                   = false
-nl_assign_leave_one_liners               = true
-nl_class_leave_one_liners                = true
-nl_enum_leave_one_liners                 = false
-nl_getset_leave_one_liners               = false
-nl_func_leave_one_liners                 = false
-nl_if_leave_one_liners                   = false
-nl_start_of_file                         = remove
-nl_start_of_file_min                     = 0
-nl_end_of_file                           = force
-nl_end_of_file_min                       = 1
-nl_assign_brace                          = add
-nl_assign_square                         = ignore
-nl_after_square_assign                   = ignore
-nl_func_var_def_blk                      = 1
-nl_fcall_brace                           = add
-nl_enum_brace                            = remove
-nl_struct_brace                          = remove
-nl_union_brace                           = remove
-nl_if_brace                              = remove
-nl_brace_else                            = remove
-nl_elseif_brace                          = ignore
-nl_else_brace                            = remove
-nl_else_if                               = remove
-nl_brace_finally                         = ignore
-nl_finally_brace                         = ignore
-nl_try_brace                             = ignore
-nl_getset_brace                          = force
-nl_for_brace                             = add
-nl_catch_brace                           = ignore
-nl_brace_catch                           = ignore
-nl_while_brace                           = add
-nl_brace_brace                           = ignore
-nl_do_brace                              = add
-nl_brace_while                           = remove
-nl_switch_brace                          = add
-nl_multi_line_cond                       = false
-nl_multi_line_define                     = true
-nl_before_case                           = true
-nl_before_throw                          = ignore
-nl_after_case                            = true
-nl_namespace_brace                       = ignore
-nl_template_class                        = ignore
-nl_class_brace                           = ignore
-nl_class_init_args                       = ignore
-nl_func_type_name                        = ignore
-nl_func_type_name_class                  = ignore
-nl_func_scope_name                       = ignore
-nl_func_proto_type_name                  = ignore
-nl_func_paren                            = remove
-nl_func_decl_start                       = ignore
-nl_func_decl_start_single                = ignore
-nl_func_decl_args                        = ignore
-nl_func_decl_end                         = ignore
-nl_func_decl_end_single                  = ignore
-nl_func_decl_empty                       = ignore
-nl_fdef_brace                            = add
-nl_after_return                          = true
-nl_return_expr                           = ignore
-nl_after_semicolon                       = true
-nl_after_brace_open                      = true
-nl_after_brace_open_cmt                  = false
-nl_after_vbrace_open                     = false
-nl_after_vbrace_open_empty               = false
-nl_after_brace_close                     = true
-nl_define_macro                          = false
-nl_squeeze_ifdef                         = true
-nl_before_if                             = ignore
-nl_after_if                              = ignore
-nl_before_for                            = ignore
-nl_after_for                             = ignore
-nl_before_while                          = ignore
-nl_after_while                           = ignore
-nl_before_switch                         = ignore
-nl_after_switch                          = ignore
-nl_before_do                             = ignore
-nl_after_do                              = ignore
-nl_ds_struct_enum_cmt                    = false
-nl_ds_struct_enum_close_brace            = false
-nl_class_colon                           = ignore
-nl_create_if_one_liner                   = false
-nl_create_for_one_liner                  = false
-nl_create_while_one_liner                = false
-pos_arith                                = ignore
-pos_assign                               = ignore
-pos_bool                                 = trail
-pos_compare                              = ignore
-pos_conditional                          = ignore
-pos_comma                                = ignore
-pos_class_comma                          = ignore
-pos_class_colon                          = ignore
-code_width                               = 80
-ls_for_split_full                        = false
-ls_func_split_full                       = false
-nl_max                                   = 4
-nl_after_func_proto                      = 0
-nl_after_func_proto_group                = 2
-nl_after_func_body                       = 3
-nl_after_func_body_one_liner             = 0
-nl_before_block_comment                  = 2
-nl_before_c_comment                      = 0
-nl_before_cpp_comment                    = 0
-nl_after_multiline_comment               = false
-nl_before_access_spec                    = 0
-nl_after_access_spec                     = 0
-nl_comment_func_def                      = 1
-nl_after_try_catch_finally               = 0
-nl_around_cs_property                    = 0
-nl_between_get_set                       = 0
-eat_blanks_after_open_brace              = true
-eat_blanks_before_close_brace            = true
-mod_full_brace_do                        = add
-mod_full_brace_for                       = add
-mod_full_brace_function                  = ignore
-mod_full_brace_if                        = add
-mod_full_brace_if_chain                  = false
-mod_full_brace_nl                        = 0
-mod_full_brace_while                     = add
-mod_paren_on_return                      = add
-mod_pawn_semicolon                       = false
-mod_full_paren_if_bool                   = true
-mod_remove_extra_semicolon               = true
-mod_add_long_function_closebrace_comment = 0
-mod_add_long_switch_closebrace_comment   = 0
-mod_add_long_ifdef_endif_comment         = 0
-mod_add_long_ifdef_else_comment          = 0
-mod_sort_import                          = false
-mod_sort_using                           = false
-mod_sort_include                         = false
-mod_sort_incl_import_prioritize_filename = false
-mod_sort_incl_import_prioritize_extensionless      = false
-mod_sort_incl_import_prioritize_angle_over_quotes  = false
-mod_sort_incl_import_ignore_extension    = false
-mod_sort_incl_import_grouping_enabled    = false
-mod_move_case_break                      = false
-mod_case_brace                           = remove
-mod_remove_empty_return                  = true
-cmt_width                                = 0
-cmt_reflow_mode                          = 0
-cmt_indent_multi                         = true
-cmt_c_group                              = false
-cmt_c_nl_start                           = false
-cmt_c_nl_end                             = false
-cmt_cpp_group                            = false
-cmt_cpp_nl_start                         = false
-cmt_cpp_nl_end                           = false
-cmt_cpp_to_c                             = false
-cmt_star_cont                            = true
-cmt_sp_before_star_cont                  = 0
-cmt_sp_after_star_cont                   = 0
-cmt_multi_check_last                     = true
-cmt_insert_file_header                   = ""
-cmt_insert_file_footer                   = ""
-cmt_insert_func_header                   = ""
-cmt_insert_class_header                  = ""
-cmt_insert_before_preproc                = false
-pp_indent                                = remove
-pp_indent_at_level                       = false
-pp_indent_count                          = 1
-pp_space                                 = ignore
-pp_space_count                           = 0
-pp_indent_region                         = 0
-pp_region_indent_code                    = false
-pp_indent_if                             = 0
-pp_if_indent_code                        = false
-pp_define_at_level                       = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/gnu-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/gnu-indent.cfg
deleted file mode 100644
index d4e8efea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/gnu-indent.cfg
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# GNU format (sorta)
-#
-
-indent_with_tabs		= 0		# 1=indent to level only, 2=indent with tabs
-input_tab_size			= 8		# original tab size
-output_tab_size			= 8		# new tab size
-indent_columns			= 2
-# indent_label			= 2		# pos: absolute col, neg: relative column
-indent_align_string		= False		# align broken strings
-indent_brace			= 2
-
-nl_enum_brace			= remove	# "enum {" vs "enum \n {"
-nl_union_brace			= remove	# "union {" vs "union \n {"
-nl_struct_brace			= remove	# "struct {" vs "struct \n {"
-nl_do_brace			= add		# "do {" vs "do \n {"
-nl_if_brace			= add		# "if () {" vs "if () \n {"
-nl_for_brace			= add		# "for () {" vs "for () \n {"
-nl_else_brace			= add		# "else {" vs "else \n {"
-nl_while_brace			= add		# "while () {" vs "while () \n {"
-nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
-nl_before_case			= 1
-nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
-nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return			= TRUE
-nl_brace_while			= remove
-nl_brace_else			= add
-nl_squeeze_ifdef		= TRUE
-
-# mod_paren_on_return		= ignore	# "return 1;" vs "return (1);"
-# mod_full_brace_if		= ignore	# "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for		= ignore	# "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do		= ignore	# "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while		= ignore	# "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_semi			= remove
-sp_paren_paren			= remove	# space between (( and ))
-sp_return_paren			= remove	# "return (1);" vs "return(1);"
-sp_sizeof_paren			= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen		= force		# "if (" vs "if("
-sp_after_sparen			= force		# "if () {" vs "if (){"
-sp_after_cast			= remove	# "(int) a" vs "(int)a"
-sp_inside_braces		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum		= force		# "{ 1 }" vs "{1}"
-sp_inside_paren			= remove
-sp_inside_fparen		= remove
-sp_inside_sparen		= remove
-#sp_type_func			= ignore
-sp_assign			= force
-sp_arith			= force
-sp_bool				= force
-sp_compare			= force
-sp_after_comma			= force
-sp_func_def_paren		= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren		= remove	# "foo (" vs "foo("
-sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
-
-# align_with_tabs			= FALSE		# use tabs to align
-# align_on_tabstop		= FALSE		# align on tabstops
-# align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
-# align_var_def_span		= 2
-# align_var_def_inline		= TRUE
-# align_var_def_star		= TRUE
-# align_var_def_colon		= TRUE
-# align_assign_span		= 1
-# align_struct_init_span		= 3
-# align_var_struct_span		= 3
-# align_right_cmt_span		= 3
-# align_pp_define_span		= 3
-# align_pp_define_gap		= 4
-# align_number_right		= TRUE
-# align_typedef_span		= 5
-# align_typedef_gap		= 3
-
-# cmt_star_cont			= TRUE
-
-eat_blanks_before_close_brace	= TRUE
-eat_blanks_after_open_brace	= TRUE
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/klaus.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/klaus.cfg
deleted file mode 100644
index 97857198..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/klaus.cfg
+++ /dev/null
@@ -1,501 +0,0 @@
-
-#
-# General options
-#
-
-# The type of line endings
-newlines                      = lf       # auto/lf/crlf/cr
-
-# The original size of tabs in the input
-input_tab_size                = 8        # number
-
-# The size of tabs in the output (only used if align_with_tabs=true)
-output_tab_size               = 3        # number
-
-# The ascii value of the string escape char, usually 92 (\). (Pawn)
-string_escape_char            = 92       # number
-
-#
-# Indenting
-#
-
-# The number of columns to indent per level (usually 2, 3, 4, or 8)
-indent_columns                = 3        # number
-
-# How to use tabs when indenting code
-# 0=spaces only
-# 1=indent with tabs, align with spaces
-# 2=indent and align with tabs
-indent_with_tabs              = 0        # number
-
-# Whether to indent strings broken by '\' so that they line up
-indent_align_string           = false    # false/true
-
-# Spaces to indent '{' from level
-indent_brace                  = 0        # number
-
-# Whether braces are indented to the body level
-indent_braces                 = false    # false/true
-
-# Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent           = true     # false/true
-
-# Whether the 'namespace' body is indented
-indent_namespace              = false    # false/true
-
-# Whether the 'class' body is indented
-indent_class                  = true     # false/true
-
-# Whether to indent the stuff after a leading class colon
-indent_class_colon            = false    # false/true
-
-# Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false)
-indent_func_call_param        = false    # false/true
-
-# The number of spaces to indent a continued '->' or '.'
-# Usually set to indent_columns.
-indent_member                 = 3        # number
-
-# Spaces to indent 'case' from 'switch'
-indent_switch_case            = 0        # number
-
-# Spaces to indent '{' from 'case'
-indent_case_brace             = 0        # number
-
-# Whether to indent comments found in first column
-indent_col1_comment           = false    # false/true
-
-# How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent)
-indent_label                  = 1        # number
-
-# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)
-indent_paren_nl               = false    # false/true
-
-# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)
-indent_square_nl              = false    # false/true
-
-#
-# Spacing options
-#
-
-# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
-sp_arith                      = force    # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=', '+=', etc
-sp_assign                     = force    # ignore/add/remove/force
-
-# Add or remove space around boolean operators '&&' and '||'
-sp_bool                       = force    # ignore/add/remove/force
-
-# Add or remove space around compare operator '<', '>', '==', etc
-sp_compare                    = force    # ignore/add/remove/force
-
-# Add or remove space inside '(' and ')'
-sp_inside_paren               = remove   # ignore/add/remove/force
-
-# Add or remove space between nested parens
-sp_paren_paren                = remove   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{'
-sp_paren_brace                = ignore   # ignore/add/remove/force
-
-# Add or remove space before pointer star '*'
-sp_before_ptr_star            = force    # ignore/add/remove/force
-
-# Add or remove space between pointer stars '*'
-sp_between_ptr_star           = remove   # ignore/add/remove/force
-
-# Add or remove space after pointer star '*'
-sp_after_ptr_star             = remove   # ignore/add/remove/force
-
-# Add or remove space before reference sign '&'
-sp_before_byref               = remove   # ignore/add/remove/force
-
-# Add or remove space after reference sign '&'
-sp_after_byref                = ignore   # ignore/add/remove/force
-
-# Add or remove space before '<>'
-sp_before_angle               = force    # ignore/add/remove/force
-
-# Add or remove space after '<>'
-sp_after_angle                = force    # ignore/add/remove/force
-
-# Add or remove space before '(' of 'if', 'for', 'switch', and 'while'
-sp_before_sparen              = remove   # ignore/add/remove/force
-
-# Add or remove space inside if-condition '(' and ')'
-sp_inside_sparen              = remove   # ignore/add/remove/force
-
-# Add or remove space after ')' of 'if', 'for', 'switch', and 'while'
-sp_after_sparen               = remove   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while'
-sp_sparen_brace               = remove   # ignore/add/remove/force
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'
-sp_special_semi               = ignore   # ignore/add/remove/force
-
-# Add or remove space before ';'
-sp_before_semi                = remove   # ignore/add/remove/force
-
-# Add or remove space before '[' (except '[]')
-sp_before_square              = ignore   # ignore/add/remove/force
-
-# Add or remove space before '[]'
-sp_before_squares             = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '[' and ']'
-sp_inside_square              = remove   # ignore/add/remove/force
-
-# Add or remove space after ','
-sp_after_comma                = force    # ignore/add/remove/force
-
-# Add or remove space between 'operator' and operator sign
-sp_after_operator             = ignore   # ignore/add/remove/force
-
-# Add or remove space after cast
-sp_after_cast                 = remove   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof' and '('
-sp_sizeof_paren               = remove   # ignore/add/remove/force
-
-# Add or remove space after the tag keyword (Pawn)
-sp_after_tag                  = ignore   # ignore/add/remove/force
-
-# Add or remove space inside enum '{' and '}'
-sp_inside_braces_enum         = force    # ignore/add/remove/force
-
-# Add or remove space inside struct/union '{' and '}'
-sp_inside_braces_struct       = force    # ignore/add/remove/force
-
-# Add or remove space inside '{' and '}'
-sp_inside_braces              = force    # ignore/add/remove/force
-
-# Add or remove space inside '<' and '>'
-sp_inside_angle               = remove   # ignore/add/remove/force
-
-# Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types)
-sp_type_func                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function declaration
-sp_func_proto_paren           = remove   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function definition
-sp_func_def_paren             = remove   # ignore/add/remove/force
-
-# Add or remove space inside empty function '()'
-sp_inside_fparens             = ignore   # ignore/add/remove/force
-
-# Add or remove space inside function '(' and ')'
-sp_inside_fparen              = remove   # ignore/add/remove/force
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen              = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of function
-sp_fparen_brace               = add      # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function calls
-sp_func_call_paren            = remove   # ignore/add/remove/force
-
-# Add or remove space between a constructor/destructor and the open paren
-sp_func_class_paren           = remove   # ignore/add/remove/force
-
-# Add or remove space between 'return' and '('
-sp_return_paren               = remove   # ignore/add/remove/force
-
-# Add or remove space between macro and value
-sp_macro                      = ignore   # ignore/add/remove/force
-
-# Add or remove space between macro function ')' and value
-sp_macro_func                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'else' and '{' if on the same line
-sp_else_brace                 = remove   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'else' if on the same line
-sp_brace_else                 = remove   # ignore/add/remove/force
-
-#
-# Code alignment (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs
-align_keep_tabs               = false    # false/true
-
-# Whether to use tabs for alinging
-align_with_tabs               = false    # false/true
-
-# Whether to bump out to the next tab when aligning
-align_on_tabstop              = false    # false/true
-
-# Whether to right-align numbers
-align_number_right             = true     # false/true
-
-# The span for aligning variable definitions (0=don't align)
-align_var_def_span            = 1        # number
-
-# Whether the pointer star is part of the variable name or not
-align_var_def_star_style      = 1
-
-# The threshold for aligning variable definitions (0=no limit)
-align_var_def_thresh          = 12       # number
-
-# Whether to align the colon in struct bit fields
-align_var_def_colon           = true     # false/true
-
-# Whether to align inline struct/enum/union variable definitions
-align_var_def_inline          = true     # false/true
-
-# The span for aligning on '=' in assignments (0=don't align)
-align_assign_span             = 1        # number
-
-# The threshold for aligning on '=' in assignments (0=no limit)
-align_assign_thresh           = 12       # number
-
-# The span for aligning on '=' in enums (0=don't align)
-align_enum_equ_span           = 16       # number
-
-# The threshold for aligning on '=' in enums (0=no limit)
-align_enum_equ_thresh         = 0        # number
-
-# The span for aligning struct/union (0=don't align)
-align_var_struct_span         = 99       # number
-
-# The span for aligning struct initializer values (0=don't align)
-align_struct_init_span        = 3        # number
-
-# The minimum space between the type and the synonym of a typedef
-align_typedef_gap             = 3        # number
-
-# The span for aligning single-line typedefs (0=don't align)
-align_typedef_span            = 5        # number
-
-# Controls the positioning of the '*' in typedefs. Just try it.
-# 0: Align on typdef type, ignore '*'
-# 1: The '*' is part of type name: typedef int  *pint;
-# 2: The '*' is part of the type: typedef int *  pint;
-align_typedef_star_style      = 0        # number
-
-# The span for aligning comments that end lines (0=don't align)
-align_right_cmt_span          = 3        # number
-
-# The span for aligning function prototypes (0=don't align)
-align_func_proto_span         = 0        # number
-
-# Whether to align macros wrapped with a backslash and a newline
-align_nl_cont                 = true     # false/true
-
-# The minimum space between label and value of a preprocessor define
-align_pp_define_gap           = 4        # number
-
-# The span for aligning on '#define' bodies (0=don't align)
-align_pp_define_span          = 3        # number
-
-#
-# Newline adding and removing options
-#
-
-# Try to limit code width to N number of columns
-code_width                    = 0        # number
-
-# Whether to collapse empty blocks between '{' and '}'
-nl_collapse_empty_body        = false    # false/true
-
-# Add or remove newlines at the start of the file
-nl_start_of_file              = remove   # ignore/add/remove/force
-
-# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'
-nl_start_of_file_min          = 0        # number
-
-# Add or remove newline at the end of the file
-nl_end_of_file                = force    # ignore/add/remove/force
-
-# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')
-nl_end_of_file_min            = 1        # number
-
-# Add or remove newline between '=' and '{'
-nl_assign_brace               = add      # ignore/add/remove/force
-
-# The number of newlines after a block of variable definitions
-nl_func_var_def_blk           = 1        # number
-
-# Add or remove newline between function call and '('
-nl_fcall_brace                = add      # ignore/add/remove/force
-
-# Add or remove newline between 'enum' and '{'
-nl_enum_brace                 = add      # ignore/add/remove/force
-
-# Add or remove newline between 'struct and '{'
-nl_struct_brace               = add      # ignore/add/remove/force
-
-# Add or remove newline between 'union' and '{'
-nl_union_brace                = add      # ignore/add/remove/force
-
-# Add or remove newline between 'if' and '{'
-nl_if_brace                   = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'else'
-nl_brace_else                 = force    # ignore/add/remove/force
-
-# Add or remove newline between 'else if' and '{'
-# If set to ignore, nl_if_brace is used instead
-nl_elseif_brace               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'else' and '{'
-nl_else_brace                 = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'for' and '{'
-nl_for_brace                  = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'while' and '{'
-nl_while_brace                = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'do' and '{'
-nl_do_brace                   = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'while' of 'do' statement
-nl_brace_while                = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'switch' and '{'
-nl_switch_brace               = remove   # ignore/add/remove/force
-
-# Whether to put a newline before 'case' statement
-nl_before_case                = true     # false/true
-
-# Whether to put a newline after 'case' statement
-nl_after_case                 = true     # false/true
-
-# Newline between namespace and {
-nl_namespace_brace            = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'template<>' and 'class'
-nl_template_class             = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'class' and '{'
-nl_class_brace                = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in the constructor member initialization
-nl_class_init_args            = ignore   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name in definition
-nl_func_type_name             = ignore   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function declaration
-nl_func_decl_start            = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function declaration
-nl_func_decl_args             = ignore   # ignore/add/remove/force
-
-# Add or remove newline before the ')' in a function declaration
-nl_func_decl_end              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between function signature and '{'
-nl_fdef_brace                 = add      # ignore/add/remove/force
-
-# Whether to put a newline after 'return' statement
-nl_after_return               = true     # false/true
-
-# Whether to put a newline after semicolons, except in 'for' statements
-nl_after_semicolon            = true     # false/true
-
-# Whether to put a newline after brace open
-nl_after_brace_open           = true     # false/true
-
-# Whether to alter newlines in '#define' macros
-nl_define_macro               = false    # false/true
-
-# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'
-nl_squeeze_ifdef              = true     # false/true
-
-#
-# Positioning options
-#
-
-# The position of boolean operators in wrapped expressions
-pos_bool                      = trail    # ignore/lead/trail
-
-# The position of colons between constructor and member initialization
-pos_class_colon               = ignore   # ignore/lead/trail
-
-#
-# Blank line options
-#
-
-# The maximum consecutive newlines
-nl_max                        = 4        # number
-
-# The number of newlines after a function prototype, if followed by another function prototype
-nl_after_func_proto           = 0        # number
-
-# The number of newlines after a function prototype, if not followed by another function prototype
-nl_after_func_proto_group     = 2        # number
-
-# The number of newlines after '}' of the function body
-nl_after_func_body            = 2        # number
-
-# The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open)
-nl_before_block_comment       = 2        # number
-
-# Whether to remove blank lines after '{'
-eat_blanks_after_open_brace   = true     # false/true
-
-# Whether to remove blank lines before '}'
-eat_blanks_before_close_brace = true     # false/true
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on single-line 'do' statement
-mod_full_brace_do             = add      # ignore/add/remove/force
-
-# Add or remove braces on single-line 'for' statement
-mod_full_brace_for            = add      # ignore/add/remove/force
-
-# Add or remove braces on single-line function defintions. (Pawn)
-mod_full_brace_function       = ignore   # ignore/add/remove/force
-
-# Add or remove braces on single-line 'if' statement
-mod_full_brace_if             = add      # ignore/add/remove/force
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl             = 0        # number
-
-# Add or remove braces on single-line 'while' statement
-mod_full_brace_while          = add      # ignore/add/remove/force
-
-# Add or remove unnecessary paren on 'return' statement
-mod_paren_on_return           = add      # ignore/add/remove/force
-
-# Whether to change optional semicolons to real semicolons
-mod_pawn_semicolon            = false    # false/true
-
-#
-# Comment modifications
-#
-
-# Whether to group cpp-comments that look like they are in a block
-cmt_cpp_group                 = false    # false/true
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-cmt_cpp_nl_start              = false    # false/true
-
-# Whether to put a newline before the closing '*/' of the combined cpp-comment
-cmt_cpp_nl_end                = false    # false/true
-
-# Whether to change cpp-comments into c-comments
-cmt_cpp_to_c                  = false    # false/true
-
-# Whether to put a star on subsequent comment lines
-cmt_star_cont                 = true     # false/true
-
-#
-# Preprocessor options
-#
-
-# Add or remove indent of preprocessor directives
-pp_indent                     = ignore   # ignore/add/remove/force
-
-# Add or remove space between # and, say, define
-pp_space                      = ignore   # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/kr-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/kr-indent.cfg
deleted file mode 100644
index 5eea56c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/kr-indent.cfg
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# K&R (sort-of)
-#
-
-indent_with_tabs		= 2		# 1=indent to level only, 2=indent with tabs
-input_tab_size			= 8		# original tab size
-output_tab_size			= 8		# new tab size
-indent_columns			= output_tab_size
-indent_label			= 2		# pos: absolute col, neg: relative column
-# indent_align_string		= False		# align broken strings
-# indent_brace			= 0
-
-nl_enum_brace			= remove	# "enum {" vs "enum \n {"
-nl_union_brace			= remove	# "union {" vs "union \n {"
-nl_struct_brace			= remove	# "struct {" vs "struct \n {"
-nl_do_brace			= remove	# "do {" vs "do \n {"
-nl_if_brace			= remove	# "if () {" vs "if () \n {"
-nl_for_brace			= remove	# "for () {" vs "for () \n {"
-nl_else_brace			= remove	# "else {" vs "else \n {"
-nl_while_brace			= remove	# "while () {" vs "while () \n {"
-nl_switch_brace			= remove	# "switch () {" vs "switch () \n {"
-# nl_func_var_def_blk		= 1
-# nl_before_case			= 1
-nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
-nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return			= TRUE
-nl_brace_while			= remove
-nl_brace_else			= remove
-nl_squeeze_ifdef		= TRUE
-
-# mod_paren_on_return		= add		# "return 1;" vs "return (1);"
-# mod_full_brace_if		= add		# "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for		= add		# "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do		= add		# "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while		= add		# "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_semi			= remove
-sp_paren_paren			= remove	# space between (( and ))
-sp_return_paren			= remove	# "return (1);" vs "return(1);"
-sp_sizeof_paren			= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen		= force		# "if (" vs "if("
-sp_after_sparen			= force		# "if () {" vs "if (){"
-sp_after_cast			= remove	# "(int) a" vs "(int)a"
-sp_inside_braces		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum		= force		# "{ 1 }" vs "{1}"
-sp_inside_paren			= remove	# "( 1 )" vs "(1)"
-sp_inside_fparen		= remove        # "( 1 )" vs "(1)" - functions
-sp_inside_sparen		= remove        # "( 1 )" vs "(1)" - if/for/etc
-# sp_type_func			= ignore
-sp_assign			= force
-sp_arith			= force
-sp_bool				= force
-sp_compare			= force
-sp_after_comma			= force
-sp_func_def_paren		= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren		= remove	# "foo (" vs "foo("
-sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
-
-# align_with_tabs			= FALSE		# use tabs to align
-# align_on_tabstop		= FALSE		# align on tabstops
-# align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
-# align_var_def_span		= 2
-# align_var_def_inline		= TRUE
-# align_var_def_star		= TRUE
-# align_var_def_colon		= TRUE
-# align_assign_span		= 1
-# align_struct_init_span		= 3
-# align_var_struct_span		= 3
-# align_right_cmt_span		= 3
-# align_pp_define_span		= 3
-# align_pp_define_gap		= 4
-# align_number_right		= TRUE
-# align_typedef_span		= 5
-# align_typedef_gap		= 3
-
-# cmt_star_cont			= TRUE
-
-eat_blanks_before_close_brace	= TRUE
-eat_blanks_after_open_brace	= TRUE
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux-indent.cfg
deleted file mode 100644
index d6baa165..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux-indent.cfg
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# uncrustify config file for the linux kernel
-#
-
-indent_with_tabs	= 2		# 1=indent to level only, 2=indent with tabs
-align_with_tabs		= TRUE		# use tabs to align
-align_on_tabstop	= TRUE 		# align on tabstops
-input_tab_size		= 8		# original tab size
-output_tab_size		= 8		# new tab size
-indent_columns		= output_tab_size
-
-indent_label		= 2		# pos: absolute col, neg: relative column
-
-
-#
-# inter-symbol newlines
-#
-
-nl_enum_brace		= remove	# "enum {" vs "enum \n {"
-nl_union_brace		= remove	# "union {" vs "union \n {"
-nl_struct_brace		= remove	# "struct {" vs "struct \n {"
-nl_do_brace 		= remove	# "do {" vs "do \n {"
-nl_if_brace 		= remove	# "if () {" vs "if () \n {"
-nl_for_brace 		= remove	# "for () {" vs "for () \n {"
-nl_else_brace 		= remove	# "else {" vs "else \n {"
-nl_while_brace 		= remove	# "while () {" vs "while () \n {"
-nl_switch_brace 	= remove	# "switch () {" vs "switch () \n {"
-nl_brace_while		= remove	# "} while" vs "} \n while" - cuddle while
-nl_brace_else		= remove	# "} else" vs "} \n else" - cuddle else
-nl_func_var_def_blk	= 1
-nl_fcall_brace		= remove	# "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace		= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return		= TRUE;
-# nl_before_case	= 1
-
-
-#
-# Source code modifications
-#
-
-# mod_paren_on_return	= remove	# "return 1;" vs "return (1);"
-# mod_full_brace_if	= remove	# "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for	= remove	# "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do	= remove	# "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while	= remove	# "while (a) a--;" vs "while (a) { a--; }"
-
-
-#
-# inter-character spacing options
-#
-
-# sp_return_paren	= force		# "return (1);" vs "return(1);"
-sp_sizeof_paren		= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen	= force		# "if (" vs "if("
-sp_after_sparen		= force		# "if () {" vs "if (){"
-sp_after_cast		= remove	# "(int) a" vs "(int)a"
-sp_inside_braces	= add		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct	= add		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum	= add		# "{ 1 }" vs "{1}"
-sp_assign		= add
-sp_arith		= add
-sp_bool			= add
-sp_compare		= add
-sp_assign		= add
-sp_after_comma		= add
-sp_func_def_paren	= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren	= remove	# "foo (" vs "foo("
-sp_func_proto_paren	= remove	# "int foo ();" vs "int foo();"
-
-
-#
-# Aligning stuff
-#
-
-align_enum_equ_span	= 4		# '=' in enum definition
-# align_nl_cont		= TRUE
-# align_var_def_span	= 2
-# align_var_def_inline	= TRUE
-# align_var_def_star	= FALSE
-# align_var_def_colon	= TRUE
-# align_assign_span	= 1
-align_struct_init_span	= 3		# align stuff in a structure init '= { }'
-align_right_cmt_span	= 3
-# align_pp_define_span	= 8;
-# align_pp_define_gap	= 4;
-
-# cmt_star_cont		= FALSE
-
-# indent_brace		= 0
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux.cfg
deleted file mode 100644
index c3fb724b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux.cfg
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# uncrustify config file for the linux kernel
-#
-
-indent_with_tabs	= 2		# 1=indent to level only, 2=indent with tabs
-input_tab_size		= 8		# original tab size
-output_tab_size		= 8		# new tab size
-indent_columns		= output_tab_size
-
-indent_label		= 1		# pos: absolute col, neg: relative column
-
-
-#
-# inter-symbol newlines
-#
-
-nl_enum_brace		= remove	# "enum {" vs "enum \n {"
-nl_union_brace		= remove	# "union {" vs "union \n {"
-nl_struct_brace		= remove	# "struct {" vs "struct \n {"
-nl_do_brace 		= remove	# "do {" vs "do \n {"
-nl_if_brace 		= remove	# "if () {" vs "if () \n {"
-nl_for_brace 		= remove	# "for () {" vs "for () \n {"
-nl_else_brace 		= remove	# "else {" vs "else \n {"
-nl_while_brace 		= remove	# "while () {" vs "while () \n {"
-nl_switch_brace 	= remove	# "switch () {" vs "switch () \n {"
-nl_brace_while		= remove	# "} while" vs "} \n while" - cuddle while
-nl_brace_else		= remove	# "} else" vs "} \n else" - cuddle else
-sp_brace_else		= force
-sp_else_brace		= force
-nl_func_var_def_blk	= 1
-nl_fcall_brace		= remove	# "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace		= add		# "int foo() {" vs "int foo()\n{"
-nl_after_label_colon	= true		# "fail:\nfree(foo);" vs "fail: free(foo);"
-# nl_after_return		= TRUE;
-# nl_before_case	= 1
-
-
-#
-# Source code modifications
-#
-
-mod_paren_on_return	= remove	# "return 1;" vs "return (1);"
-#mod_full_brace_if	= remove	# "if (a) a--;" vs "if (a) { a--; }"
-mod_full_brace_if_chain	= true
-mod_full_brace_for	= remove	# "for () a--;" vs "for () { a--; }"
-mod_full_brace_do	= remove	# "do a--; while ();" vs "do { a--; } while ();"
-mod_full_brace_while	= remove	# "while (a) a--;" vs "while (a) { a--; }"
-mod_full_brace_nl	= 3		# don't remove if more than 3 newlines
-
-
-#
-# inter-character spacing options
-#
-
-sp_return_paren		= force		# "return (1);" vs "return(1);"
-sp_sizeof_paren		= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen	= force		# "if (" vs "if("
-sp_after_sparen		= force		# "if () {" vs "if (){"
-sp_after_cast		= remove	# "(int) a" vs "(int)a"
-sp_inside_braces	= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct	= force	# "{ 1 }" vs "{1}"
-sp_inside_braces_enum	= force	# "{ 1 }" vs "{1}"
-sp_assign		= force
-sp_arith		= force
-sp_bool			= force
-sp_compare		= force
-sp_assign		= force
-sp_after_comma		= force
-sp_func_def_paren	= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren	= remove	# "foo (" vs "foo("
-sp_func_proto_paren	= remove	# "int foo ();" vs "int foo();"
-
-
-#
-# Aligning stuff
-#
-
-align_with_tabs		= TRUE		# use tabs to align
-align_on_tabstop	= TRUE 		# align on tabstops
-# align_keep_tabs		= true
-align_enum_equ_span	= 4		# '=' in enum definition
-# align_nl_cont		= TRUE
-# align_var_def_span	= 2
-# align_var_def_inline	= TRUE
-# align_var_def_star	= FALSE
-# align_var_def_colon	= TRUE
-# align_assign_span	= 1
-align_struct_init_span	= 3		# align stuff in a structure init '= { }'
-align_right_cmt_span	= 3
-# align_pp_define_span	= 8;
-# align_pp_define_gap	= 4;
-
-cmt_star_cont = true
-
-# indent_brace		= 0
-
-nl_func_paren = remove
-nl_func_decl_start = remove
-nl_func_decl_empty = remove
-nl_func_decl_args = remove
-nl_func_decl_end = remove
-sp_inside_paren = remove
-sp_inside_square = remove
-sp_inside_paren_cast = remove
-sp_inside_fparen = remove
-sp_inside_sparen = remove
-sp_paren_paren = remove
-sp_before_ptr_star = force
-sp_after_ptr_star = remove
-sp_between_ptr_star = remove
-align_func_params = true
-align_var_struct_span = 6
-
-eat_blanks_after_open_brace   = true
-eat_blanks_before_close_brace = true
-pp_indent = remove
-
-nl_start_of_file   = remove
-nl_end_of_file     = force
-nl_end_of_file_min = 1
-nl_comment_func_def = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/mono.cfg
deleted file mode 100644
index 9987e9d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/mono.cfg
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Mono library format
-#
-
-indent_with_tabs		= 0		# 1=indent to level only, 2=indent with tabs
-input_tab_size			= 8		# original tab size
-output_tab_size			= 8		# new tab size
-indent_columns			= output_tab_size
-indent_label			= 2		# pos: absolute col, neg: relative column
-# indent_align_string		= False		# align broken strings
-# indent_brace			= 0
-indent_func_call_param		= true		# use indent tabstop
-
-nl_enum_brace			= remove	# "enum {" vs "enum \n {"
-nl_union_brace			= remove	# "union {" vs "union \n {"
-nl_struct_brace			= remove	# "struct {" vs "struct \n {"
-nl_do_brace			= remove	# "do {" vs "do \n {"
-nl_if_brace			= remove	# "if () {" vs "if () \n {"
-nl_for_brace			= remove	# "for () {" vs "for () \n {"
-nl_else_brace			= remove	# "else {" vs "else \n {"
-nl_while_brace			= remove	# "while () {" vs "while () \n {"
-nl_switch_brace			= remove	# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
-nl_before_case			= 1
-nl_fcall_brace			= remove	# "foo() {" vs "foo()\n{"
-nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return			= TRUE
-nl_brace_while			= remove
-nl_brace_else			= add
-nl_squeeze_ifdef		= TRUE
-
-# mod_paren_on_return		= add		# "return 1;" vs "return (1);"
-# mod_full_brace_if		= add		# "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for		= add		# "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do		= add		# "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while		= add		# "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_semi			= remove
-sp_paren_paren			= remove	# space between (( and ))
-sp_return_paren			= remove	# "return (1);" vs "return(1);"
-sp_sizeof_paren			= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen		= force		# "if (" vs "if("
-sp_after_sparen			= force		# "if () {" vs "if (){"
-sp_after_cast			= remove	# "(int) a" vs "(int)a"
-sp_inside_braces		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum		= force		# "{ 1 }" vs "{1}"
-sp_inside_paren			= remove
-sp_inside_fparen		= remove
-sp_inside_sparen		= remove
-sp_inside_square		= remove
-sp_before_square		= add
-#sp_type_func			= ignore
-sp_assign			= force
-sp_arith			= force
-sp_bool				= force
-sp_compare			= force
-sp_assign			= force
-sp_after_comma			= force
-sp_func_def_paren		= force		# "int foo (){" vs "int foo(){"
-sp_func_call_paren		= force		# "foo (" vs "foo("
-sp_func_proto_paren		= force		# "int foo ();" vs "int foo();"
-
-# align_with_tabs			= FALSE		# use tabs to align
-# align_on_tabstop		= FALSE		# align on tabstops
-# align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
-# align_var_def_span		= 2
-# align_var_def_inline		= TRUE
-# align_var_def_star		= TRUE
-# align_var_def_colon		= TRUE
-# align_assign_span		= 1
-# align_struct_init_span		= 3
-# align_var_struct_span		= 3
-# align_right_cmt_span		= 3
-# align_pp_define_span		= 3
-# align_pp_define_gap		= 4
-# align_number_right		= TRUE
-# align_typedef_span		= 5
-# align_typedef_gap		= 3
-
-cmt_star_cont			= TRUE
-
-eat_blanks_before_close_brace	= TRUE
-eat_blanks_after_open_brace	= TRUE
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/msvc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/msvc.cfg
deleted file mode 100644
index 36e9e14f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/msvc.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# bug 633
-set COMMENT __stdcall
-set COMMENT __clrcall
-set COMMENT __fastcall
-set COMMENT __thiscall
-set COMMENT __vectorcall
-set COMMENT __cdecl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/objc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/objc.cfg
deleted file mode 100644
index d3321f09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/objc.cfg
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# uncrustify config file for objective-c and objective-c++
-#
-
-indent_with_tabs        = 0     # 1=indent to level only, 2=indent with tabs
-output_tab_size         = 4     # new tab size
-indent_columns          = output_tab_size
-indent_label            = 2     # pos: absolute col, neg: relative column
-indent_align_assign     = FALSE
-
-#
-# Indenting
-#
-
-# indent_brace          = 0
-indent_switch_case      = indent_columns
-
-#
-# Inter-symbol newlines
-#
-
-nl_enum_brace         = remove   # "enum {" vs "enum \n {"
-nl_union_brace        = remove   # "union {" vs "union \n {"
-nl_struct_brace       = remove   # "struct {" vs "struct \n {"
-nl_do_brace           = remove   # "do {" vs "do \n {"
-nl_if_brace           = remove   # "if () {" vs "if () \n {"
-nl_for_brace          = remove   # "for () {" vs "for () \n {"
-nl_else_brace         = remove   # "else {" vs "else \n {"
-nl_while_brace        = remove   # "while () {" vs "while () \n {"
-nl_switch_brace       = remove   # "switch () {" vs "switch () \n {"
-nl_brace_while        = remove   # "} while" vs "} \n while" - cuddle while
-nl_brace_else         = remove   # "} else" vs "} \n else" - cuddle else
-nl_func_var_def_blk   = 1
-nl_fcall_brace        = remove   # "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace         = remove   # "int foo() {" vs "int foo()\n{"
-# nl_after_return     = TRUE;
-# nl_before_case      = 1
-
-
-#
-# Source code modifications
-#
-
-mod_paren_on_return                       = ignore # "return 1;" vs "return (1);"
-mod_full_brace_if                         = ignore    # "if (a) a--;" vs "if (a) { a--; }"
-mod_full_brace_for                        = add       # "for () a--;" vs "for () { a--; }"
-mod_full_brace_do                         = ignore # "do a--; while ();" vs "do { a--; } while ();"
-mod_full_brace_while                      = remove # "while (a) a--;" vs "while (a) { a--; }"
-mod_full_brace_nl                         = 3          # don't remove if more than 3 newlines
-mod_add_long_ifdef_endif_comment          = 20
-mod_add_long_ifdef_else_comment           = mod_add_long_ifdef_endif_comment
-mod_add_long_switch_closebrace_comment    = mod_add_long_ifdef_endif_comment
-mod_add_long_function_closebrace_comment  = mod_add_long_ifdef_endif_comment
-
-#
-# Inter-character spacing options
-#
-
-# sp_return_paren         = force      # "return (1);" vs "return(1);"
-sp_sizeof_paren              = remove  # "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen             = force      # "if (" vs "if("
-sp_after_sparen              = force      # "if () {" vs "if (){"
-sp_after_cast                = remove  # "(int) a" vs "(int)a"
-sp_inside_braces             = add     # "{ 1 }" vs "{1}"
-sp_inside_braces_struct      = add     # "{ 1 }" vs "{1}"
-sp_inside_braces_enum        = add     # "{ 1 }" vs "{1}"
-sp_inside_fparen             = remove    # "func( param )" vs "func(param)"
-sp_paren_brace               = force
-sp_assign                    = add
-sp_arith                     = add
-sp_bool                      = add
-sp_compare                   = add
-sp_after_comma               = add
-sp_func_def_paren            = remove  # "int foo (){" vs "int foo(){"
-sp_func_call_paren           = remove  # "foo (" vs "foo("
-sp_func_proto_paren          = remove  # "int foo ();" vs "int foo();"
-sp_before_ptr_star           = force 
-sp_after_ptr_star            = force
-sp_before_unnamed_ptr_star   = ignore
-sp_between_ptr_star          = remove
-sp_after_ptr_star_func       = force
-sp_before_ptr_star_func      = force
-sp_cmt_cpp_start             = add
-sp_cond_question             = force
-sp_cond_colon                = force
-sp_else_brace                = force
-sp_brace_else                = force
-sp_after_class_colon         = force
-sp_before_class_colon        = force
-sp_before_case_colon         = remove
-# Objective-C specifics      
-sp_before_oc_colon           = remove
-sp_after_oc_colon            = remove
-sp_after_oc_scope            = force
-sp_after_oc_type             = remove
-sp_after_oc_return_type      = force
-sp_before_send_oc_colon      = remove
-sp_after_send_oc_colon       = remove
-sp_after_oc_at_sel           = remove
-sp_before_oc_block_caret     = ignore
-sp_after_oc_block_caret      = remove
-
-#
-# Aligning stuff
-#
-
-align_with_tabs               = False     # use tabs to align
-align_on_tabstop              = False     # align on tabstops
-# align_keep_tabs             = True
-align_enum_equ_span           = 4         # '=' in enum definition
-# align_nl_cont               = True
-# align_var_def_span          = 2
-# align_var_def_inline        = True
-# align_var_def_star          = False
-# align_var_def_colon         = True
-# align_assign_span           = 1
-align_struct_init_span        = 4         # align stuff in a structure init '= { }'
-align_right_cmt_span          = 8
-align_right_cmt_gap           = 8
-align_pp_define_span          = 8
-#align_pp_define_gap          = 8
-align_oc_msg_colon_span       = 1         # align parameters in an Obj-C message on the ':' but stop after this many lines (0=don't align)
-align_oc_msg_spec_span        = 0         # the span for aligning ObjC msg spec (0=don't align)
-
-#
-# Line Splitting options
-#
-
-# ls_func_split_full          = True     # Whether to fully split long function protos/calls at commas
-
-#
-# Comment modifications
-#
-
-cmt_star_cont                 = True     # Whether to put a star on subsequent comment lines
-
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/sun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/sun.cfg
deleted file mode 100644
index 42b780cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/sun.cfg
+++ /dev/null
@@ -1,1781 +0,0 @@
-#
-# Sun C/C++/Java
-# https://www.cis.upenn.edu/~lee/06cse480/data/cstyle.ms.pdf
-# http://www.oracle.com/technetwork/java/codeconventions-150003.pdf
-#
-
-# The type of line endings
-newlines                                  = auto     # auto/lf/crlf/cr
-
-# The original size of tabs in the input
-input_tab_size                            = 8        # number
-
-# The size of tabs in the output (only used if align_with_tabs=true)
-output_tab_size                           = 8        # number
-
-# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn)
-string_escape_char                        = 92       # number
-
-# Alternate string escape char for Pawn. Only works right before the quote char.
-string_escape_char2                       = 0        # number
-
-# Replace tab characters found in string literals with the escape sequence \t instead.
-string_replace_tab_chars                  = true     # false/true
-
-# Allow interpreting '>=' and '>>=' as part of a template in 'void f(list<list<B>>=val);'.
-# If true (default), 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                             = false    # false/true
-
-# Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file.
-disable_processing_cmt                    = ""         # string
-
-# Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file.
-enable_processing_cmt                     = ""         # string
-
-# Enable parsing of digraphs. Default=false
-enable_digraphs                           = false    # false/true
-
-# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8
-utf8_byte                                 = false    # false/true
-
-# Force the output encoding to UTF-8
-utf8_force                                = false    # false/true
-
-#
-# Indenting
-#
-
-# The number of columns to indent per level.
-# Usually 2, 3, 4, or 8.
-indent_columns                            = 4        # number
-
-# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
-# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level
-indent_continue                           = -4       # number
-
-# How to use tabs when indenting code
-# 0=spaces only
-# 1=indent with tabs to brace level, align with spaces
-# 2=indent and align with tabs, using spaces when not on a tabstop
-indent_with_tabs                          = 2        # number
-
-# Comments that are not a brace level are indented with tabs on a tabstop.
-# Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs                      = false    # false/true
-
-# Whether to indent strings broken by '\' so that they line up
-indent_align_string                       = false    # false/true
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=True
-indent_xml_string                         = 2        # number
-
-# Spaces to indent '{' from level
-indent_brace                              = 0        # number
-
-# Whether braces are indented to the body level
-indent_braces                             = false    # false/true
-
-# Disabled indenting function braces if indent_braces is true
-indent_braces_no_func                     = false    # false/true
-
-# Disabled indenting class braces if indent_braces is true
-indent_braces_no_class                    = false    # false/true
-
-# Disabled indenting struct braces if indent_braces is true
-indent_braces_no_struct                   = false    # false/true
-
-# Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent                       = false    # false/true
-
-# Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace.
-indent_paren_open_brace                   = false    # false/true
-
-# Whether the 'namespace' body is indented
-indent_namespace                          = false    # false/true
-
-# Only indent one namespace and no sub-namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent            = false    # false/true
-
-# The number of spaces to indent a namespace block
-indent_namespace_level                    = 0        # number
-
-# If the body of the namespace is longer than this number, it won't be indented.
-# Requires indent_namespace=true. Default=0 (no limit)
-indent_namespace_limit                    = 0        # number
-
-# Whether the 'extern "C"' body is indented
-indent_extern                             = false    # false/true
-
-# Whether the 'class' body is indented
-indent_class                              = true     # false/true
-
-# Whether to indent the stuff after a leading base class colon
-indent_class_colon                        = false    # false/true
-
-# Indent based on a class colon instead of the stuff after the colon.
-# Requires indent_class_colon=true. Default=false
-indent_class_on_colon                     = false    # false/true
-
-# Whether to indent the stuff after a leading class initializer colon
-indent_constr_colon                       = false    # false/true
-
-# Virtual indent from the ':' for member initializers. Default is 2
-indent_ctor_init_leading                  = 0        # number
-
-# Additional indenting for constructor initializer list
-indent_ctor_init                          = 0        # number
-
-# False=treat 'else\nif' as 'else if' for indenting purposes
-# True=indent the 'if' one level
-indent_else_if                            = false    # false/true
-
-# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute
-indent_var_def_blk                        = 0        # number
-
-# Indent continued variable declarations instead of aligning.
-indent_var_def_cont                       = true     # false/true
-
-# Indent continued shift expressions ('<<' and '>>') instead of aligning.
-# Turn align_left_shift off when enabling this.
-indent_shift                              = true     # false/true
-
-# True:  force indentation of function definition to start in column 1
-# False: use the default behavior
-indent_func_def_force_col1                = false    # false/true
-
-# True:  indent continued function call parameters one indent level
-# False: align parameters under the open paren
-indent_func_call_param                    = true     # false/true
-
-# Same as indent_func_call_param, but for function defs
-indent_func_def_param                     = true     # false/true
-
-# Same as indent_func_call_param, but for function protos
-indent_func_proto_param                   = true     # false/true
-
-# Same as indent_func_call_param, but for class declarations
-indent_func_class_param                   = true     # false/true
-
-# Same as indent_func_call_param, but for class variable constructors
-indent_func_ctor_var_param                = true     # false/true
-
-# Same as indent_func_call_param, but for templates
-indent_template_param                     = true     # false/true
-
-# Double the indent for indent_func_xxx_param options
-indent_func_param_double                  = false    # false/true
-
-# Indentation column for standalone 'const' function decl/proto qualifier
-indent_func_const                         = 0        # number
-
-# Indentation column for standalone 'throw' function decl/proto qualifier
-indent_func_throw                         = 0        # number
-
-# The number of spaces to indent a continued '->' or '.'
-# Usually set to 0, 1, or indent_columns.
-indent_member                             = 4        # number
-
-# Spaces to indent single line ('//') comments on lines before code
-indent_sing_line_comments                 = 0        # number
-
-# If set, will indent trailing single line ('//') comments relative
-# to the code instead of trying to keep the same absolute column
-indent_relative_single_line_comments      = false    # false/true
-
-# Spaces to indent 'case' from 'switch'
-# Usually 0 or indent_columns.
-indent_switch_case                        = 0        # number
-
-# Spaces to shift the 'case' line, without affecting any other lines
-# Usually 0.
-indent_case_shift                         = 0        # number
-
-# Spaces to indent '{' from 'case'.
-# By default, the brace will appear under the 'c' in case.
-# Usually set to 0 or indent_columns.
-indent_case_brace                         = 0        # number
-
-# Whether to indent comments found in first column
-indent_col1_comment                       = false    # false/true
-
-# How to indent goto labels
-#   >0: absolute column where 1 is the leftmost column
-#  <=0: subtract from brace indent
-indent_label                              = -4       # number
-
-# Same as indent_label, but for access specifiers that are followed by a colon
-indent_access_spec                        = -4       # number
-
-# Indent the code after an access specifier by one level.
-# If set, this option forces 'indent_access_spec=0'
-indent_access_spec_body                   = false    # false/true
-
-# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)
-indent_paren_nl                           = false    # false/true
-
-# Controls the indent of a close paren after a newline.
-# 0: Indent to body level
-# 1: Align under the open paren
-# 2: Indent to the brace level
-indent_paren_close                        = 0        # number
-
-# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren
-indent_comma_paren                        = false    # false/true
-
-# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren
-indent_bool_paren                         = false    # false/true
-
-# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones
-indent_first_bool_expr                    = false    # false/true
-
-# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)
-indent_square_nl                          = false    # false/true
-
-# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies
-indent_preserve_sql                       = false    # false/true
-
-# Align continued statements at the '='. Default=True
-# If FALSE or the '=' is followed by a newline, the next line is indent one tab.
-indent_align_assign                       = false    # false/true
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign                   = false    # true/false
-
-# Indent OC blocks at brace level instead of usual rules.
-indent_oc_block                           = false    # false/true
-
-# Indent OC blocks in a message relative to the parameter name.
-# 0=use indent_oc_block rules, 1+=spaces to indent
-indent_oc_block_msg                       = 0        # number
-
-# Minimum indent for subsequent parameters
-indent_oc_msg_colon                       = 0        # number
-
-# If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).
-# Default is true.
-indent_oc_msg_prioritize_first_colon      = true     # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level).
-indent_oc_block_msg_xcode_style           = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword.
-indent_oc_block_msg_from_keyword          = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon.
-indent_oc_block_msg_from_colon            = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is.
-indent_oc_block_msg_from_caret            = false    # false/true
-
-# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is.
-indent_oc_block_msg_from_brace            = false    # false/true
-
-# When identing after virtual brace open and newline add further spaces to reach this min. indent.
-indent_min_vbrace_open                    = 0        # number
-
-# TRUE: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop.
-indent_vbrace_open_on_tabstop             = false    # false/true
-
-#
-# Spacing options
-#
-
-# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
-# also '>>>' '<<' '>>' '%' '|'
-sp_arith                                  = force    # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=', '+=', etc
-sp_assign                                 = force    # ignore/add/remove/force
-
-# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign
-sp_cpp_lambda_assign                      = force    # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=' in a prototype
-sp_assign_default                         = force    # ignore/add/remove/force
-
-# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.
-sp_before_assign                          = force    # ignore/add/remove/force
-
-# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.
-sp_after_assign                           = force    # ignore/add/remove/force
-
-# Add or remove space in 'NS_ENUM ('
-sp_enum_paren                             = force    # ignore/add/remove/force
-
-# Add or remove space around assignment '=' in enum
-sp_enum_assign                            = force    # ignore/add/remove/force
-
-# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.
-sp_enum_before_assign                     = force    # ignore/add/remove/force
-
-# Add or remove space after assignment '=' in enum. Overrides sp_enum_assign.
-sp_enum_after_assign                      = force    # ignore/add/remove/force
-
-# Add or remove space around preprocessor '##' concatenation operator. Default=Add
-sp_pp_concat                              = force    # ignore/add/remove/force
-
-# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator.
-sp_pp_stringify                           = force    # ignore/add/remove/force
-
-# Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'.
-sp_before_pp_stringify                    = force    # ignore/add/remove/force
-
-# Add or remove space around boolean operators '&&' and '||'
-sp_bool                                   = force    # ignore/add/remove/force
-
-# Add or remove space around compare operator '<', '>', '==', etc
-sp_compare                                = force    # ignore/add/remove/force
-
-# Add or remove space inside '(' and ')'
-sp_inside_paren                           = remove   # ignore/add/remove/force
-
-# Add or remove space between nested parens: '((' vs ') )'
-sp_paren_paren                            = remove   # ignore/add/remove/force
-
-# Add or remove space between back-to-back parens: ')(' vs ') ('
-sp_cparen_oparen                          = remove   # ignore/add/remove/force
-
-# Whether to balance spaces inside nested parens
-sp_balance_nested_parens                  = false    # false/true
-
-# Add or remove space between ')' and '{'
-sp_paren_brace                            = force    # ignore/add/remove/force
-
-# Add or remove space before pointer star '*'
-sp_before_ptr_star                        = force    # ignore/add/remove/force
-
-# Add or remove space before pointer star '*' that isn't followed by a variable name
-# If set to 'ignore', sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star                = force    # ignore/add/remove/force
-
-# Add or remove space between pointer stars '*'
-sp_between_ptr_star                       = remove   # ignore/add/remove/force
-
-# Add or remove space after pointer star '*', if followed by a word.
-sp_after_ptr_star                         = remove   # ignore/add/remove/force
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier               = force    # ignore/add/remove/force
-
-# Add or remove space after a pointer star '*', if followed by a func proto/def.
-sp_after_ptr_star_func                    = remove   # ignore/add/remove/force
-
-# Add or remove space after a pointer star '*', if followed by an open paren (function types).
-sp_ptr_star_paren                         = remove   # ignore/add/remove/force
-
-# Add or remove space before a pointer star '*', if followed by a func proto/def.
-sp_before_ptr_star_func                   = force    # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&'
-sp_before_byref                           = force    # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&' that isn't followed by a variable name
-# If set to 'ignore', sp_before_byref is used instead.
-sp_before_unnamed_byref                   = force    # ignore/add/remove/force
-
-# Add or remove space after reference sign '&', if followed by a word.
-sp_after_byref                            = remove   # ignore/add/remove/force
-
-# Add or remove space after a reference sign '&', if followed by a func proto/def.
-sp_after_byref_func                       = remove   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&', if followed by a func proto/def.
-sp_before_byref_func                      = force    # ignore/add/remove/force
-
-# Add or remove space between type and word. Default=Force
-sp_after_type                             = force    # ignore/add/remove/force
-
-# Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('.
-sp_before_template_paren                  = remove   # ignore/add/remove/force
-
-# Add or remove space in 'template <' vs 'template<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle                         = remove   # ignore/add/remove/force
-
-# Add or remove space before '<>'
-sp_before_angle                           = remove   # ignore/add/remove/force
-
-# Add or remove space inside '<' and '>'
-sp_inside_angle                           = remove   # ignore/add/remove/force
-
-# Add or remove space after '<>'
-sp_after_angle                            = force    # ignore/add/remove/force
-
-# Add or remove space between '<>' and '(' as found in 'new List<byte>();'
-sp_angle_paren                            = remove   # ignore/add/remove/force
-
-# Add or remove space between '<>' and a word as in 'List<byte> m;' or 'template <typename T> static ...'
-sp_angle_word                             = force    # ignore/add/remove/force
-
-# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add
-sp_angle_shift                            = force    # ignore/add/remove/force
-
-# Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False
-# sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift                     = false    # false/true
-
-# Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc.
-sp_before_sparen                          = force    # ignore/add/remove/force
-
-# Add or remove space inside if-condition '(' and ')'
-sp_inside_sparen                          = remove   # ignore/add/remove/force
-
-# Add or remove space before if-condition ')'. Overrides sp_inside_sparen.
-sp_inside_sparen_close                    = remove   # ignore/add/remove/force
-
-# Add or remove space after if-condition '('. Overrides sp_inside_sparen.
-sp_inside_sparen_open                     = remove   # ignore/add/remove/force
-
-# Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc.
-sp_after_sparen                           = force    # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc.
-sp_sparen_brace                           = force    # ignore/add/remove/force
-
-# Add or remove space between 'invariant' and '(' in the D language.
-sp_invariant_paren                        = remove   # ignore/add/remove/force
-
-# Add or remove space after the ')' in 'invariant (C) c' in the D language.
-sp_after_invariant_paren                  = force    # ignore/add/remove/force
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'
-sp_special_semi                           = remove   # ignore/add/remove/force
-
-# Add or remove space before ';'. Default=Remove
-sp_before_semi                            = remove   # ignore/add/remove/force
-
-# Add or remove space before ';' in non-empty 'for' statements
-sp_before_semi_for                        = remove   # ignore/add/remove/force
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty                  = remove   # ignore/add/remove/force
-
-# Add or remove space after ';', except when followed by a comment. Default=Add
-sp_after_semi                             = force    # ignore/add/remove/force
-
-# Add or remove space after ';' in non-empty 'for' statements. Default=Force
-sp_after_semi_for                         = force    # ignore/add/remove/force
-
-# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; <here> ).
-sp_after_semi_for_empty                   = remove   # ignore/add/remove/force
-
-# Add or remove space before '[' (except '[]')
-sp_before_square                          = remove   # ignore/add/remove/force
-
-# Add or remove space before '[]'
-sp_before_squares                         = remove   # ignore/add/remove/force
-
-# Add or remove space inside a non-empty '[' and ']'
-sp_inside_square                          = remove   # ignore/add/remove/force
-
-# Add or remove space after ','
-sp_after_comma                            = force    # ignore/add/remove/force
-
-# Add or remove space before ','
-sp_before_comma                           = remove   # ignore/add/remove/force
-
-# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'
-sp_after_mdatype_commas                   = remove   # ignore/add/remove/force
-
-# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'
-sp_before_mdatype_commas                  = remove   # ignore/add/remove/force
-
-# Add or remove space between ',' in multidimensional array type 'int[,,]'
-sp_between_mdatype_commas                 = remove   # ignore/add/remove/force
-
-# Add or remove space between an open paren and comma: '(,' vs '( ,'
-sp_paren_comma                            = force    # ignore/add/remove/force
-
-# Add or remove space before the variadic '...' when preceded by a non-punctuator
-sp_before_ellipsis                        = force    # ignore/add/remove/force
-
-# Add or remove space after class ':'
-sp_after_class_colon                      = force    # ignore/add/remove/force
-
-# Add or remove space before class ':'
-sp_before_class_colon                     = remove   # ignore/add/remove/force
-
-# Add or remove space after class constructor ':'
-sp_after_constr_colon                     = force    # ignore/add/remove/force
-
-# Add or remove space before class constructor ':'
-sp_before_constr_colon                    = remove   # ignore/add/remove/force
-
-# Add or remove space before case ':'. Default=Remove
-sp_before_case_colon                      = remove   # ignore/add/remove/force
-
-# Add or remove space between 'operator' and operator sign
-sp_after_operator                         = force    # ignore/add/remove/force
-
-# Add or remove space between the operator symbol and the open paren, as in 'operator ++('
-sp_after_operator_sym                     = remove   # ignore/add/remove/force
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'
-sp_after_cast                             = remove   # ignore/add/remove/force
-
-# Add or remove spaces inside cast parens
-sp_inside_paren_cast                      = remove   # ignore/add/remove/force
-
-# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'
-sp_cpp_cast_paren                         = remove   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof' and '('
-sp_sizeof_paren                           = force    # ignore/add/remove/force
-
-# Add or remove space after the tag keyword (Pawn)
-sp_after_tag                              = force    # ignore/add/remove/force
-
-# Add or remove space inside enum '{' and '}'
-sp_inside_braces_enum                     = force    # ignore/add/remove/force
-
-# Add or remove space inside struct/union '{' and '}'
-sp_inside_braces_struct                   = force    # ignore/add/remove/force
-
-# Add or remove space inside '{' and '}'
-sp_inside_braces                          = force    # ignore/add/remove/force
-
-# Add or remove space inside '{}'
-sp_inside_braces_empty                    = remove   # ignore/add/remove/force
-
-# Add or remove space between return type and function name
-# A minimum of 1 is forced except for pointer return types.
-sp_type_func                              = remove   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function declaration
-sp_func_proto_paren                       = remove   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function definition
-sp_func_def_paren                         = remove   # ignore/add/remove/force
-
-# Add or remove space inside empty function '()'
-sp_inside_fparens                         = remove   # ignore/add/remove/force
-
-# Add or remove space inside function '(' and ')'
-sp_inside_fparen                          = remove   # ignore/add/remove/force
-
-# Add or remove space inside the first parens in the function type: 'void (*x)(...)'
-sp_inside_tparen                          = remove   # ignore/add/remove/force
-
-# Add or remove between the parens in the function type: 'void (*x)(...)'
-sp_after_tparen_close                     = remove   # ignore/add/remove/force
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                          = remove   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of function
-sp_fparen_brace                           = force    # ignore/add/remove/force
-
-# Java: Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                          = force    # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function calls
-sp_func_call_paren                        = remove   # ignore/add/remove/force
-
-# Add or remove space between function name and '()' on function calls without parameters.
-# If set to 'ignore' (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty                  = remove   # ignore/add/remove/force
-
-# Add or remove space between the user function name and '(' on function calls
-# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
-sp_func_call_user_paren                   = remove   # ignore/add/remove/force
-
-# Add or remove space between a constructor/destructor and the open paren
-sp_func_class_paren                       = remove   # ignore/add/remove/force
-
-# Add or remove space between 'return' and '('
-sp_return_paren                           = force    # ignore/add/remove/force
-
-# Add or remove space between '__attribute__' and '('
-sp_attribute_paren                        = force    # ignore/add/remove/force
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'
-sp_defined_paren                          = remove   # ignore/add/remove/force
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'
-sp_throw_paren                            = force    # ignore/add/remove/force
-
-# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'
-sp_after_throw                            = force    # ignore/add/remove/force
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                            = force    # ignore/add/remove/force
-
-# Add or remove space between 'version' and '(' in 'version (something) { }' (D language)
-# If set to ignore, sp_before_sparen is used.
-sp_version_paren                          = force    # ignore/add/remove/force
-
-# Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language)
-# If set to ignore, sp_before_sparen is used.
-sp_scope_paren                            = force    # ignore/add/remove/force
-
-# Add or remove space between macro and value
-sp_macro                                  = force    # ignore/add/remove/force
-
-# Add or remove space between macro function ')' and value
-sp_macro_func                             = force    # ignore/add/remove/force
-
-# Add or remove space between 'else' and '{' if on the same line
-sp_else_brace                             = force    # ignore/add/remove/force
-
-# Add or remove space between '}' and 'else' if on the same line
-sp_brace_else                             = force    # ignore/add/remove/force
-
-# Add or remove space between '}' and the name of a typedef on the same line
-sp_brace_typedef                          = force    # ignore/add/remove/force
-
-# Add or remove space between 'catch' and '{' if on the same line
-sp_catch_brace                            = force    # ignore/add/remove/force
-
-# Add or remove space between '}' and 'catch' if on the same line
-sp_brace_catch                            = force    # ignore/add/remove/force
-
-# Add or remove space between 'finally' and '{' if on the same line
-sp_finally_brace                          = force    # ignore/add/remove/force
-
-# Add or remove space between '}' and 'finally' if on the same line
-sp_brace_finally                          = force    # ignore/add/remove/force
-
-# Add or remove space between 'try' and '{' if on the same line
-sp_try_brace                              = force    # ignore/add/remove/force
-
-# Add or remove space between get/set and '{' if on the same line
-sp_getset_brace                           = force    # ignore/add/remove/force
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst                    = add      # ignore/add/remove/force
-
-# Add or remove space between a variable and '{' for a namespace
-sp_word_brace_ns                          = force    # ignore/add/remove/force
-
-# Add or remove space before the '::' operator
-sp_before_dc                              = remove   # ignore/add/remove/force
-
-# Add or remove space after the '::' operator
-sp_after_dc                               = remove   # ignore/add/remove/force
-
-# Add or remove around the D named array initializer ':' operator
-sp_d_array_colon                          = force    # ignore/add/remove/force
-
-# Add or remove space after the '!' (not) operator. Default=Remove
-sp_not                                    = remove   # ignore/add/remove/force
-
-# Add or remove space after the '~' (invert) operator. Default=Remove
-sp_inv                                    = remove   # ignore/add/remove/force
-
-# Add or remove space after the '&' (address-of) operator. Default=Remove
-# This does not affect the spacing after a '&' that is part of a type.
-sp_addr                                   = remove   # ignore/add/remove/force
-
-# Add or remove space around the '.' or '->' operators. Default=Remove
-sp_member                                 = remove   # ignore/add/remove/force
-
-# Add or remove space after the '*' (dereference) operator. Default=Remove
-# This does not affect the spacing after a '*' that is part of a type.
-sp_deref                                  = remove   # ignore/add/remove/force
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove
-sp_sign                                   = remove   # ignore/add/remove/force
-
-# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove
-sp_incdec                                 = remove   # ignore/add/remove/force
-
-# Add or remove space before a backslash-newline at the end of a line. Default=Add
-sp_before_nl_cont                         = force    # ignore/add/remove/force
-
-# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'
-sp_after_oc_scope                         = remove   # ignore/add/remove/force
-
-# Add or remove space after the colon in message specs
-# '-(int) f:(int) x;' vs '-(int) f: (int) x;'
-sp_after_oc_colon                         = force    # ignore/add/remove/force
-
-# Add or remove space before the colon in message specs
-# '-(int) f: (int) x;' vs '-(int) f : (int) x;'
-sp_before_oc_colon                        = force    # ignore/add/remove/force
-
-# Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'
-sp_after_oc_dict_colon                    = force    # ignore/add/remove/force
-
-# Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'
-sp_before_oc_dict_colon                   = force    # ignore/add/remove/force
-
-# Add or remove space after the colon in message specs
-# '[object setValue:1];' vs '[object setValue: 1];'
-sp_after_send_oc_colon                    = force    # ignore/add/remove/force
-
-# Add or remove space before the colon in message specs
-# '[object setValue:1];' vs '[object setValue :1];'
-sp_before_send_oc_colon                   = remove   # ignore/add/remove/force
-
-# Add or remove space after the (type) in message specs
-# '-(int)f: (int) x;' vs '-(int)f: (int)x;'
-sp_after_oc_type                          = remove   # ignore/add/remove/force
-
-# Add or remove space after the first (type) in message specs
-# '-(int) f:(int)x;' vs '-(int)f:(int)x;'
-sp_after_oc_return_type                   = remove   # ignore/add/remove/force
-
-# Add or remove space between '@selector' and '('
-# '@selector(msgName)' vs '@selector (msgName)'
-# Also applies to @protocol() constructs
-sp_after_oc_at_sel                        = remove   # ignore/add/remove/force
-
-# Add or remove space between '@selector(x)' and the following word
-# '@selector(foo) a:' vs '@selector(foo)a:'
-sp_after_oc_at_sel_parens                 = force    # ignore/add/remove/force
-
-# Add or remove space inside '@selector' parens
-# '@selector(foo)' vs '@selector( foo )'
-# Also applies to @protocol() constructs
-sp_inside_oc_at_sel_parens                = remove   # ignore/add/remove/force
-
-# Add or remove space before a block pointer caret
-# '^int (int arg){...}' vs. ' ^int (int arg){...}'
-sp_before_oc_block_caret                  = remove   # ignore/add/remove/force
-
-# Add or remove space after a block pointer caret
-# '^int (int arg){...}' vs. '^ int (int arg){...}'
-sp_after_oc_block_caret                   = remove   # ignore/add/remove/force
-
-# Add or remove space between the receiver and selector in a message.
-# '[receiver selector ...]'
-sp_after_oc_msg_receiver                  = remove   # ignore/add/remove/force
-
-# Add or remove space after @property.
-sp_after_oc_property                      = force    # ignore/add/remove/force
-
-# Add or remove space around the ':' in 'b ? t : f'
-sp_cond_colon                             = force    # ignore/add/remove/force
-
-# Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon.
-sp_cond_colon_before                      = force    # ignore/add/remove/force
-
-# Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon.
-sp_cond_colon_after                       = force    # ignore/add/remove/force
-
-# Add or remove space around the '?' in 'b ? t : f'
-sp_cond_question                          = force    # ignore/add/remove/force
-
-# Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question.
-sp_cond_question_before                   = force    # ignore/add/remove/force
-
-# Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question.
-sp_cond_question_after                    = force    # ignore/add/remove/force
-
-# In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options.
-sp_cond_ternary_short                     = force    # ignore/add/remove/force
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
-sp_case_label                             = force    # ignore/add/remove/force
-
-# Control the space around the D '..' operator.
-sp_range                                  = force    # ignore/add/remove/force
-
-# Control the spacing after ':' in 'for (TYPE VAR : EXPR)'
-sp_after_for_colon                        = force    # ignore/add/remove/force
-
-# Control the spacing before ':' in 'for (TYPE VAR : EXPR)'
-sp_before_for_colon                       = force    # ignore/add/remove/force
-
-# Control the spacing in 'extern (C)' (D)
-sp_extern_paren                           = force    # ignore/add/remove/force
-
-# Control the space after the opening of a C++ comment '// A' vs '//A'
-sp_cmt_cpp_start                          = force    # ignore/add/remove/force
-
-# TRUE: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen                        = false    # false/true
-
-# TRUE: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                           = false    # false/true
-
-# Controls the spaces between #else or #endif and a trailing comment
-sp_endif_cmt                              = force    # ignore/add/remove/force
-
-# Controls the spaces after 'new', 'delete' and 'delete[]'
-sp_after_new                              = force    # ignore/add/remove/force
-
-# Controls the spaces between new and '(' in 'new()'
-sp_between_new_paren                      = remove   # ignore/add/remove/force
-
-# Controls the spaces before a trailing or embedded comment
-sp_before_tr_emb_cmt                      = force    # ignore/add/remove/force
-
-# Number of spaces before a trailing or embedded comment
-sp_num_before_tr_emb_cmt                  = 0        # number
-
-# Control space between a Java annotation and the open paren.
-sp_annotation_paren                       = remove   # ignore/add/remove/force
-
-#
-# Code alignment (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs
-align_keep_tabs                           = false    # false/true
-
-# Whether to use tabs for aligning
-align_with_tabs                           = true     # false/true
-
-# Whether to bump out to the next tab when aligning
-align_on_tabstop                          = true     # false/true
-
-# Whether to right-align numbers
-align_number_right                         = true     # false/true
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space                    = false    # false/true
-
-# Align variable definitions in prototypes and functions
-align_func_params                         = false    # false/true
-
-# Align parameters in single-line functions that have the same name.
-# The function names must already be aligned with each other.
-align_same_func_call_params               = false    # false/true
-
-# The span for aligning parameters in single line functions with the same name (0=don't align).
-align_same_func_call_params_span          = 0        # unsigned number
-
-# The thresh for aligning function call parameters (0=no limit).
-align_same_func_call_params_thresh        = 0        # unsigned number
-
-# The span for aligning variable definitions (0=don't align)
-align_var_def_span                        = 0        # number
-
-# How to align the star in variable definitions.
-#  0=Part of the type     'void *   foo;'
-#  1=Part of the variable 'void     *foo;'
-#  2=Dangling             'void    *foo;'
-align_var_def_star_style                  = 1        # number
-
-# How to align the '&' in variable definitions.
-#  0=Part of the type
-#  1=Part of the variable
-#  2=Dangling
-align_var_def_amp_style                   = 1        # number
-
-# The threshold for aligning variable definitions (0=no limit)
-align_var_def_thresh                      = 10       # number
-
-# The gap for aligning variable definitions
-align_var_def_gap                         = 0        # number
-
-# Whether to align the colon in struct bit fields
-align_var_def_colon                       = false    # false/true
-
-# Whether to align any attribute after the variable name
-align_var_def_attribute                   = false    # false/true
-
-# Whether to align inline struct/enum/union variable definitions
-align_var_def_inline                      = false    # false/true
-
-# The span for aligning on '=' in assignments (0=don't align)
-align_assign_span                         = 0        # number
-
-# The threshold for aligning on '=' in assignments (0=no limit)
-align_assign_thresh                       = 0        # number
-
-# The span for aligning on '=' in enums (0=don't align)
-align_enum_equ_span                       = 0        # number
-
-# The threshold for aligning on '=' in enums (0=no limit)
-align_enum_equ_thresh                     = 0        # number
-
-# The span for aligning struct/union (0=don't align)
-align_var_struct_span                     = 0        # number
-
-# The threshold for aligning struct/union member definitions (0=no limit)
-align_var_struct_thresh                   = 0        # number
-
-# The gap for aligning struct/union member definitions
-align_var_struct_gap                      = 0        # number
-
-# The span for aligning struct initializer values (0=don't align)
-align_struct_init_span                    = 0        # number
-
-# The minimum space between the type and the synonym of a typedef
-align_typedef_gap                         = 1        # number
-
-# The span for aligning single-line typedefs (0=don't align)
-align_typedef_span                        = 0        # number
-
-# How to align typedef'd functions with other typedefs
-# 0: Don't mix them at all
-# 1: align the open paren with the types
-# 2: align the function type name with the other type names
-align_typedef_func                        = 0        # number
-
-# Controls the positioning of the '*' in typedefs. Just try it.
-# 0: Align on typedef type, ignore '*'
-# 1: The '*' is part of type name: typedef int  *pint;
-# 2: The '*' is part of the type, but dangling: typedef int *pint;
-align_typedef_star_style                  = 1        # number
-
-# Controls the positioning of the '&' in typedefs. Just try it.
-# 0: Align on typedef type, ignore '&'
-# 1: The '&' is part of type name: typedef int  &pint;
-# 2: The '&' is part of the type, but dangling: typedef int &pint;
-align_typedef_amp_style                   = 1        # number
-
-# The span for aligning comments that end lines (0=don't align)
-align_right_cmt_span                      = 4        # number
-
-# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment
-align_right_cmt_mix                       = false    # false/true
-
-# If a trailing comment is more than this number of columns away from the text it follows,
-# it will qualify for being aligned. This has to be > 0 to do anything.
-align_right_cmt_gap                       = 1        # number
-
-# Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore)
-align_right_cmt_at_col                    = 41       # number
-
-# The span for aligning function prototypes (0=don't align)
-align_func_proto_span                     = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap                      = 0        # number
-
-# Align function protos on the 'operator' keyword instead of what follows
-align_on_operator                         = false    # false/true
-
-# Whether to mix aligning prototype and variable declarations.
-# If true, align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto                       = false    # false/true
-
-# Align single-line functions with function prototypes, uses align_func_proto_span
-align_single_line_func                    = true     # false/true
-
-# Aligning the open brace of single-line functions.
-# Requires align_single_line_func=true, uses align_func_proto_span
-align_single_line_brace                   = false    # false/true
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap               = 0        # number
-
-# The span for aligning ObjC msg spec (0=don't align)
-align_oc_msg_spec_span                    = 1        # number
-
-# Whether to align macros wrapped with a backslash and a newline.
-# This will not work right if the macro contains a multi-line comment.
-align_nl_cont                             = false    # false/true
-
-# # Align macro functions and variables together
-align_pp_define_together                  = true     # false/true
-
-# The minimum space between label and value of a preprocessor define
-align_pp_define_gap                       = 1        # number
-
-# The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks)
-align_pp_define_span                      = 8        # number
-
-# Align lines that start with '<<' with previous '<<'. Default=true
-align_left_shift                          = false    # false/true
-
-# Align text after asm volatile () colons.
-align_asm_colon                           = true     # false/true
-
-# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align)
-align_oc_msg_colon_span                   = 0        # number
-
-# If true, always align with the first parameter, even if it is too short.
-align_oc_msg_colon_first                  = false    # false/true
-
-# Aligning parameters in an Obj-C '+' or '-' declaration on the ':'
-align_oc_decl_colon                       = false    # false/true
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'
-nl_collapse_empty_body                    = true     # false/true
-
-# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'
-nl_assign_leave_one_liners                = true     # false/true
-
-# Don't split one-line braced statements inside a class xx { } body
-nl_class_leave_one_liners                 = true     # false/true
-
-# Don't split one-line enums: 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners                  = true     # false/true
-
-# Don't split one-line get or set functions
-nl_getset_leave_one_liners                = true     # false/true
-
-# Don't split one-line function definitions - 'int foo() { return 0; }'
-nl_func_leave_one_liners                  = true     # false/true
-
-# Don't split one-line C++11 lambdas - '[]() { return 0; }'
-nl_cpp_lambda_leave_one_liners            = true     # false/true
-
-# Don't split one-line if/else statements - 'if(a) b++;'
-nl_if_leave_one_liners                    = false    # false/true
-
-# Don't split one-line while statements - 'while(a) b++;'
-nl_while_leave_one_liners                 = false    # false/true
-
-# Don't split one-line OC messages
-nl_oc_msg_leave_one_liner                 = true     # false/true
-
-# Add or remove newlines at the start of the file
-nl_start_of_file                          = remove   # ignore/add/remove/force
-
-# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'
-nl_start_of_file_min                      = 0        # number
-
-# Add or remove newline at the end of the file
-nl_end_of_file                            = force    # ignore/add/remove/force
-
-# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')
-nl_end_of_file_min                        = 1        # number
-
-# Add or remove newline between '=' and '{'
-nl_assign_brace                           = remove   # ignore/add/remove/force
-
-# Add or remove newline between '=' and '[' (D only)
-nl_assign_square                          = remove   # ignore/add/remove/force
-
-# Add or remove newline after '= [' (D only). Will also affect the newline before the ']'
-nl_after_square_assign                    = remove   # ignore/add/remove/force
-
-# The number of blank lines after a block of variable definitions at the top of a function body
-# 0 = No change (default)
-nl_func_var_def_blk                       = 1        # number
-
-# The number of newlines before a block of typedefs
-# 0 = No change (default)
-# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start'
-nl_typedef_blk_start                      = 2        # number
-
-# The number of newlines after a block of typedefs
-# 0 = No change (default)
-nl_typedef_blk_end                        = 2        # number
-
-# The maximum consecutive newlines within a block of typedefs
-# 0 = No change (default)
-nl_typedef_blk_in                         = 1        # number
-
-# The number of newlines before a block of variable definitions not at the top of a function body
-# 0 = No change (default)
-# the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start'
-nl_var_def_blk_start                      = 2        # number
-
-# The number of newlines after a block of variable definitions not at the top of a function body
-# 0 = No change (default)
-nl_var_def_blk_end                        = 2        # number
-
-# The maximum consecutive newlines within a block of variable definitions
-# 0 = No change (default)
-nl_var_def_blk_in                         = 1        # number
-
-# Add or remove newline between a function call's ')' and '{', as in:
-# list_for_each(item, &list) { }
-nl_fcall_brace                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'enum' and '{'
-nl_enum_brace                             = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'struct and '{'
-nl_struct_brace                           = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'union' and '{'
-nl_union_brace                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'if' and '{'
-nl_if_brace                               = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'else'
-nl_brace_else                             = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'else if' and '{'
-# If set to ignore, nl_if_brace is used instead
-nl_elseif_brace                           = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'else' and '{'
-nl_else_brace                             = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'else' and 'if'
-nl_else_if                                = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'finally'
-nl_brace_finally                          = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'finally' and '{'
-nl_finally_brace                          = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'try' and '{'
-nl_try_brace                              = remove   # ignore/add/remove/force
-
-# Add or remove newline between get/set and '{'
-nl_getset_brace                           = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'for' and '{'
-nl_for_brace                              = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'catch' and '{'
-nl_catch_brace                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'catch'
-nl_brace_catch                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ']'
-nl_brace_square                           = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ')' in a function invocation
-nl_brace_fparen                           = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'while' and '{'
-nl_while_brace                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'scope (x)' and '{' (D)
-nl_scope_brace                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'unittest' and '{' (D)
-nl_unittest_brace                         = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'version (x)' and '{' (D)
-nl_version_brace                          = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'using' and '{'
-nl_using_brace                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between two open or close braces.
-# Due to general newline/brace handling, REMOVE may not work.
-nl_brace_brace                            = force    # ignore/add/remove/force
-
-# Add or remove newline between 'do' and '{'
-nl_do_brace                               = remove   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'while' of 'do' statement
-nl_brace_while                            = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'switch' and '{'
-nl_switch_brace                           = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'synchronized' and '{'
-nl_synchronized_brace                     = remove   # ignore/add/remove/force
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace.
-nl_multi_line_cond                        = false    # false/true
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define                      = false    # false/true
-
-# Whether to put a newline before 'case' statement, not after the first 'case'
-nl_before_case                            = false    # false/true
-
-# Add or remove newline between ')' and 'throw'
-nl_before_throw                           = force    # ignore/add/remove/force
-
-# Whether to put a newline after 'case' statement
-nl_after_case                             = true     # false/true
-
-# Add or remove a newline between a case ':' and '{'. Overrides nl_after_case.
-nl_case_colon_brace                       = remove   # ignore/add/remove/force
-
-# Newline between namespace and {
-nl_namespace_brace                        = remove   # ignore/add/remove/force
-
-# Add or remove newline between 'template<>' and whatever follows.
-nl_template_class                         = force    # ignore/add/remove/force
-
-# Add or remove newline between 'class' and '{'
-nl_class_brace                            = remove   # ignore/add/remove/force
-
-# Add or remove newline before/after each ',' in the base class list,
-#   (tied to pos_class_comma).
-nl_class_init_args                        = remove   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in the constructor member initialization.
-# Related to nl_constr_colon, pos_constr_colon and pos_constr_comma.
-nl_constr_init_args                       = remove   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name in a function definition
-nl_func_type_name                         = remove   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name inside a class {}
-# Uses nl_func_type_name or nl_func_proto_type_name if set to ignore.
-nl_func_type_name_class                   = remove   # ignore/add/remove/force
-
-# Add or remove newline between function scope and name
-# Controls the newline after '::' in 'void A::f() { }'
-nl_func_scope_name                        = remove   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name in a prototype
-nl_func_proto_type_name                   = remove   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the declaration
-nl_func_paren                             = remove   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the definition
-nl_func_def_paren                         = remove   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function declaration
-nl_func_decl_start                        = remove   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function definition
-nl_func_def_start                         = remove   # ignore/add/remove/force
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single                 = remove   # ignore/add/remove/force
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single                  = remove   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function declaration
-nl_func_decl_args                         = remove   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function definition
-nl_func_def_args                          = remove   # ignore/add/remove/force
-
-# Add or remove newline before the ')' in a function declaration
-nl_func_decl_end                          = remove   # ignore/add/remove/force
-
-# Add or remove newline before the ')' in a function definition
-nl_func_def_end                           = remove   # ignore/add/remove/force
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single                   = remove   # ignore/add/remove/force
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single                    = remove   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty                        = remove   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty                         = remove   # ignore/add/remove/force
-
-# Whether to put each OC message parameter on a separate line
-# See nl_oc_msg_leave_one_liner
-nl_oc_msg_args                            = false    # false/true
-
-# Add or remove newline between function signature and '{'
-nl_fdef_brace                             = remove   # ignore/add/remove/force
-
-# Add or remove newline between C++11 lambda signature and '{'
-nl_cpp_ldef_brace                         = remove   # ignore/add/remove/force
-
-# Add or remove a newline between the return keyword and return expression.
-nl_return_expr                            = remove   # ignore/add/remove/force
-
-# Whether to put a newline after semicolons, except in 'for' statements
-nl_after_semicolon                        = true     # false/true
-
-# Java: Control the newline between the ')' and '{{' of the double brace initializer.
-nl_paren_dbrace_open                      = remove   # ignore/add/remove/force
-
-# Whether to put a newline after brace open.
-# This also adds a newline before the matching brace close.
-nl_after_brace_open                       = true     # false/true
-
-# If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is
-# placed between the open brace and a trailing single-line comment.
-nl_after_brace_open_cmt                   = false    # false/true
-
-# Whether to put a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open                      = true     # false/true
-
-# Whether to put a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty                = true     # false/true
-
-# Whether to put a newline after a brace close.
-# Does not apply if followed by a necessary ';'.
-nl_after_brace_close                      = true     # false/true
-
-# Whether to put a newline after a virtual brace close.
-# Would add a newline before return in: 'if (foo) a++; return;'
-nl_after_vbrace_close                     = true     # false/true
-
-# Control the newline between the close brace and 'b' in: 'struct { int a; } b;'
-# Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close
-nl_brace_struct_var                       = remove   # ignore/add/remove/force
-
-# Whether to alter newlines in '#define' macros
-nl_define_macro                           = false    # false/true
-
-# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'. Does not affect the whole-file #ifdef.
-nl_squeeze_ifdef                          = true     # false/true
-
-# Add or remove blank line before 'if'
-nl_before_if                              = remove   # ignore/add/remove/force
-
-# Add or remove blank line after 'if' statement
-nl_after_if                               = remove   # ignore/add/remove/force
-
-# Add or remove blank line before 'for'
-nl_before_for                             = remove   # ignore/add/remove/force
-
-# Add or remove blank line after 'for' statement
-nl_after_for                              = remove   # ignore/add/remove/force
-
-# Add or remove blank line before 'while'
-nl_before_while                           = remove   # ignore/add/remove/force
-
-# Add or remove blank line after 'while' statement
-nl_after_while                            = remove   # ignore/add/remove/force
-
-# Add or remove blank line before 'switch'
-nl_before_switch                          = remove   # ignore/add/remove/force
-
-# Add or remove blank line after 'switch' statement
-nl_after_switch                           = remove   # ignore/add/remove/force
-
-# Add or remove blank line before 'synchronized'
-nl_before_synchronized                    = remove   # ignore/add/remove/force
-
-# Add or remove blank line after 'synchronized' statement
-nl_after_synchronized                     = remove   # ignore/add/remove/force
-
-# Add or remove blank line before 'do'
-nl_before_do                              = remove   # ignore/add/remove/force
-
-# Add or remove blank line after 'do/while' statement
-nl_after_do                               = remove   # ignore/add/remove/force
-
-# Whether to double-space commented-entries in struct/union/enum
-nl_ds_struct_enum_cmt                     = false    # false/true
-
-# force nl before } of a struct/union/enum
-# (lower priority than 'eat_blanks_before_close_brace')
-nl_ds_struct_enum_close_brace             = false    # false/true
-
-# Add or remove a newline before/after a class colon,
-#   (tied to pos_class_colon).
-nl_class_colon                            = remove   # ignore/add/remove/force
-
-# Add or remove a newline around a class constructor colon.
-# Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                           = remove   # ignore/add/remove/force
-
-# Change simple unbraced if statements into a one-liner
-# 'if(b)\n i++;' => 'if(b) i++;'
-nl_create_if_one_liner                    = false    # false/true
-
-# Change simple unbraced for statements into a one-liner
-# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'
-nl_create_for_one_liner                   = false    # false/true
-
-# Change simple unbraced while statements into a one-liner
-# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'
-nl_create_while_one_liner                 = false    # false/true
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions
-pos_arith                                 = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of assignment in wrapped expressions.
-# Do not affect '=' followed by '{'
-pos_assign                                = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of boolean operators in wrapped expressions
-pos_bool                                  = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions
-pos_compare                               = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of conditional (b ? t : f) operators in wrapped expressions
-pos_conditional                           = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of the comma in wrapped expressions
-pos_comma                                 = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of the comma in the base class list if there are more than one line,
-#   (tied to nl_class_init_args).
-pos_class_comma                           = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                          = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class list
-#   (tied to nl_class_colon).
-pos_class_colon                           = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of colons between constructor and member initialization,
-# (tied to UO_nl_constr_colon).
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                          = join     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-#
-# Line Splitting options
-#
-
-# Try to limit code width to N number of columns
-code_width                                = 80       # number
-
-# Whether to fully split long 'for' statements at semi-colons
-ls_for_split_full                         = false    # false/true
-
-# Whether to fully split long function protos/calls at commas
-ls_func_split_full                        = false    # false/true
-
-# Whether to split lines as close to code_width as possible and ignore some groupings
-ls_code_width                             = true     # false/true
-
-#
-# Blank line options
-#
-
-# The maximum consecutive newlines (3 = 2 blank lines)
-nl_max                                    = 2        # number
-
-# The number of newlines after a function prototype, if followed by another function prototype
-nl_after_func_proto                       = 1        # number
-
-# The number of newlines after a function prototype, if not followed by another function prototype
-nl_after_func_proto_group                 = 2        # number
-
-# The number of newlines after '}' of a multi-line function body
-nl_after_func_body                        = 2        # number
-
-# The number of newlines after '}' of a multi-line function body in a class declaration
-nl_after_func_body_class                  = 1        # number
-
-# The number of newlines after '}' of a single line function body
-nl_after_func_body_one_liner              = 1        # number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment                   = 2        # number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment                       = 1        # number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment                     = 1        # number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment                = true     # false/true
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon                      = false    # false/true
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition
-nl_after_struct                           = 2        # number
-
-# The number of newlines after '}' or ';' of a class definition
-nl_after_class                            = 2        # number
-
-# The number of newlines after '}' of a namespace
-nl_after_namespace                        = 2        # number
-
-# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
-# Will not change the newline count if after a brace open.
-# 0 = No change.
-nl_before_access_spec                     = 2        # number
-
-# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.
-# 0 = No change.
-# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start'
-nl_after_access_spec                      = 1        # number
-
-# The number of newlines between a function def and the function comment.
-# 0 = No change.
-nl_comment_func_def                       = 1        # number
-
-# The number of newlines after a try-catch-finally block that isn't followed by a brace close.
-# 0 = No change.
-nl_after_try_catch_finally                = 1        # number
-
-# The number of newlines before and after a property, indexer or event decl.
-# 0 = No change.
-nl_around_cs_property                     = 1        # number
-
-# The number of newlines between the get/set/add/remove handlers in C#.
-# 0 = No change.
-nl_between_get_set                        = 1        # number
-
-# Add or remove newline between C# property and the '{'
-nl_property_brace                         = remove   # ignore/add/remove/force
-
-# Whether to remove blank lines after '{'
-eat_blanks_after_open_brace               = true     # false/true
-
-# Whether to remove blank lines before '}'
-eat_blanks_before_close_brace             = true     # false/true
-
-# How aggressively to remove extra newlines not in preproc.
-# 0: No change
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines                  = 1        # number
-
-# Whether to put a blank line before 'return' statements, unless after an open brace.
-nl_before_return                          = false    # false/true
-
-# Whether to put a blank line after 'return' statements, unless followed by a close brace.
-nl_after_return                           = false    # false/true
-
-# Whether to put a newline after a Java annotation statement.
-# Only affects annotations that are after a newline.
-nl_after_annotation                       = force    # ignore/add/remove/force
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on single-line 'do' statement
-mod_full_brace_do                         = force    # ignore/add/remove/force
-
-# Add or remove braces on single-line 'for' statement
-mod_full_brace_for                        = remove   # ignore/add/remove/force
-
-# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
-mod_full_brace_if                         = remove   # ignore/add/remove/force
-
-# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
-# If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
-mod_full_brace_if_chain                   = true     # false/true
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl                         = 2        # number
-
-# Add or remove braces on single-line 'while' statement
-mod_full_brace_while                      = remove   # ignore/add/remove/force
-
-# Add or remove braces on single-line 'using ()' statement
-mod_full_brace_using                      = remove   # ignore/add/remove/force
-
-# Add or remove unnecessary paren on 'return' statement
-mod_paren_on_return                       = remove   # ignore/add/remove/force
-
-# Whether to change optional semicolons to real semicolons
-mod_pawn_semicolon                        = false    # false/true
-
-# Add parens on 'while' and 'if' statement around bools
-mod_full_paren_if_bool                    = false    # false/true
-
-# Whether to remove superfluous semicolons
-mod_remove_extra_semicolon                = true     # false/true
-
-# If a function body exceeds the specified number of newlines and doesn't have a comment after
-# the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment  = 0        # number
-
-# If a namespace body exceeds the specified number of newlines and doesn't have a comment after
-# the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a comment after
-# the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment    = 0        # number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after
-# the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment          = 0        # number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after
-# the #else, a comment will be added.
-mod_add_long_ifdef_else_comment           = 0        # number
-
-# If TRUE, will sort consecutive single-line 'import' statements [Java, D]
-mod_sort_import                           = true     # false/true
-
-# If TRUE, will sort consecutive single-line 'using' statements [C#]
-mod_sort_using                            = true     # false/true
-
-# If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]
-# This is generally a bad idea, as it may break your code.
-mod_sort_include                          = false    # false/true
-
-# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace.
-mod_move_case_break                       = false    # false/true
-
-# If TRUE, it will remove a void 'return;' that appears as the last statement in a function.
-mod_remove_empty_return                   = true     # false/true
-
-#
-# Comment modifications
-#
-
-# Try to wrap comments at cmt_width columns
-cmt_width                                 = 80       # number
-
-# Set the comment reflow mode (default: 0)
-# 0: no reflowing (apart from the line wrapping due to cmt_width)
-# 1: no touching at all
-# 2: full reflow
-cmt_reflow_mode                           = 1        # number
-
-# Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting.
-cmt_convert_tab_to_spaces                 = false    # false/true
-
-# If false, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars.
-# Default is true.
-cmt_indent_multi                          = true     # false/true
-
-# Whether to group c-comments that look like they are in a block
-cmt_c_group                               = true     # false/true
-
-# Whether to put an empty '/*' on the first line of the combined c-comment
-cmt_c_nl_start                            = true     # false/true
-
-# Whether to put a newline before the closing '*/' of the combined c-comment
-cmt_c_nl_end                              = true     # false/true
-
-# Whether to group cpp-comments that look like they are in a block
-cmt_cpp_group                             = true     # false/true
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-cmt_cpp_nl_start                          = true     # false/true
-
-# Whether to put a newline before the closing '*/' of the combined cpp-comment
-cmt_cpp_nl_end                            = true     # false/true
-
-# Whether to change cpp-comments into c-comments
-cmt_cpp_to_c                              = false    # false/true
-
-# Whether to put a star on subsequent comment lines
-cmt_star_cont                             = true     # false/true
-
-# The number of spaces to insert at the start of subsequent comment lines
-cmt_sp_before_star_cont                   = 0        # number
-
-# The number of spaces to insert after the star on subsequent comment lines
-cmt_sp_after_star_cont                    = 0        # number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
-# the comment are the same length. Default=True
-cmt_multi_check_last                      = false    # false/true
-
-# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.
-# Will substitute $(filename) with the current file's name.
-cmt_insert_file_header                    = ""       # string
-
-# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.
-# Will substitute $(filename) with the current file's name.
-cmt_insert_file_footer                    = ""       # string
-
-# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
-# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
-# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }
-cmt_insert_func_header                    = ""       # string
-
-# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.
-# Will substitute $(class) with the class name.
-cmt_insert_class_header                   = ""       # string
-
-# The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment.
-# Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.
-cmt_insert_oc_msg_header                  = ""       # string
-
-# If a preprocessor is encountered when stepping backwards from a function name, then
-# this option decides whether the comment should be inserted.
-# Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header.
-cmt_insert_before_preproc                 = false    # false/true
-
-#
-# Preprocessor options
-#
-
-# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)
-pp_indent_at_level                        = false    # false/true
-
-# Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
-# If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
-# Default=1.
-pp_indent_count                           = 1        # number
-
-# Add or remove space after # based on pp_level of #if blocks
-pp_space                                  = remove   # ignore/add/remove/force
-
-# Sets the number of spaces added with pp_space
-pp_space_count                            = 1        # number
-
-# The indent for #region and #endregion in C# and '#pragma region' in C/C++
-pp_indent_region                          = 0        # number
-
-# Whether to indent the code between #region and #endregion
-pp_region_indent_code                     = false    # false/true
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when not at file-level.
-# 0:  indent preprocessors using output_tab_size.
-# >0: column at which all preprocessors will be indented.
-pp_indent_if                              = 0        # number
-
-# Control whether to indent the code between #if, #else and #endif.
-pp_if_indent_code                         = false    # false/true
-
-# Whether to indent '#define' at the brace level (true) or from column 1 (false)
-pp_define_at_level                        = false    # false/true
-
-# Use or Do not Use options
-#
-
-# True:  indent_func_call_param will be used
-# False: indent_func_call_param will NOT be used
-use_indent_func_call_param                = true     # false/true
-
-# True:  indent_continue will be used only once
-# False: indent_continue will be used every time (default)
-use_indent_continue_only_once             = false    # false/true
-
-# You can force a token to be a type with the 'type' option.
-# Example:
-# type myfoo1 myfoo2
-#
-# You can create custom macro-based indentation using macro-open,
-# macro-else and macro-close.
-# Example:
-# macro-open  BEGIN_TEMPLATE_MESSAGE_MAP
-# macro-open  BEGIN_MESSAGE_MAP
-# macro-close END_MESSAGE_MAP
-#
-# You can assign any keyword to any type with the set option.
-# set func_call_user _ N_
-#
-# The full syntax description of all custom definition config entries
-# is shown below:
-#
-# define custom tokens as:
-# - embed whitespace in token using '' escape character, or
-#   put token in quotes
-# - these: ' " and ` are recognized as quote delimiters
-#
-# type token1 token2 token3 ...
-#             ^ optionally specify multiple tokens on a single line
-# define def_token output_token
-#                  ^ output_token is optional, then NULL is assumed
-# macro-open token
-# macro-close token
-# macro-else token
-# set id token1 token2 ...
-#               ^ optionally specify multiple tokens on a single line
-#     ^ id is one of the names in token_enum.h sans the CT_ prefix,
-#       e.g. PP_PRAGMA
-#
-# all tokens are separated by any mix of ',' commas, '=' equal signs
-# and whitespace (space, tab)
-#
-# You can add support for other file extensions using the 'file_ext' command.
-# The first arg is the language name used with the '-l' option.
-# The remaining args are file extensions, matched with 'endswith'.
-#   file_ext CPP .ch .cxx .cpp.in
-#
-type byte cchar uchar ushort word uint ulong llong ullong
-type int8 uint8 int16 uint16 int32 uint32 int64 uint64
-type FILE size_t ssize_t va_list wchar_t
-type BOOL BSTR BYTE CHAR DOUBLE DWORD DWORD64 DWORD_PTR FALSE FLOAT
-type HANDLE HKEY HRESULT HWND INT INT8 INT16 INT32 INT64 LONG LONG64 LONG_PTR 
-type LPARAM LPSTR LPCSTR LPCWSTR LPTSTR LPVOID LPWSTR PSZ SHORT TRUE
-type UCHAR UINT UINT8 UINT16 UINT32 UINT64 UINT_PTR ULONG ULONG64 ULONG_PTR
-type USHORT WCHAR WORD WORD_PTR WPARAM
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/types.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/types.txt
deleted file mode 100644
index 0df27c78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/types.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# a simple list of stuff that should be detected as a CT_TYPE
-# this usually isn't necessary because types are detected from the context.
-#
-# In the future, I may allow arbitrary CT_xxx stuff to be specified, as
-# well as a language
-#
-
-INT8
-UINT8
-INT16
-UINT16
-INT32
-UINT32
-INT64
-UINT64
-FLOAT
-CHAR
-DOUBLE
-TRUE
-FALSE
-BOOL
-FILE
-DIR
-bat
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uigui_uncrustify.ini b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uigui_uncrustify.ini
deleted file mode 100644
index d52c0288..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uigui_uncrustify.ini
+++ /dev/null
@@ -1,6712 +0,0 @@
-[header]
-categories=General options|Spacing options|Indenting options|Newline adding and removing options|Blank line options|Positioning options|Line splitting options|Code alignment options (not left column spaces/tabs)|Comment modification options|Code modifying options (non-whitespace)|Preprocessor options|Sort includes options|Use or Do not Use options|Warn levels - 1: error, 2: warning (default), 3: note
-cfgFileParameterEnding=cr
-configFilename=uncrustify.cfg
-fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.cp|*.C|*.CPP|*.c++|*.di|*.m|*.mm|*.sqc|*.es
-indenterFileName=uncrustify
-indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
-inputFileName=indentinput
-inputFileParameter="-f "
-manual=http://uncrustify.sourceforge.net/config.txt
-outputFileName=indentoutput
-outputFileParameter="-o "
-stringparaminquotes=false
-parameterOrder=ipo
-showHelpParameter=-h
-stringparaminquotes=false
-useCfgFileParameter="-c "
-version=Uncrustify-0.73.0
-
-[Newlines]
-Category=0
-Description="<html>The type of line endings.<br/><br/>Default: auto</html>"
-Enabled=false
-EditorType=multiple
-Choices=newlines=lf|newlines=crlf|newlines=cr|newlines=auto
-ChoicesReadable="Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto"
-ValueDefault=auto
-
-[Input Tab Size]
-Category=0
-Description="<html>The original size of tabs in the input.<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="input_tab_size="
-MinVal=1
-MaxVal=32
-ValueDefault=8
-
-[Output Tab Size]
-Category=0
-Description="<html>The size of tabs in the output (only used if align_with_tabs=true).<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="output_tab_size="
-MinVal=1
-MaxVal=32
-ValueDefault=8
-
-[String Escape Char]
-Category=0
-Description="<html>The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).<br/><br/>Default: 92</html>"
-Enabled=false
-EditorType=numeric
-CallName="string_escape_char="
-MinVal=0
-MaxVal=255
-ValueDefault=92
-
-[String Escape Char2]
-Category=0
-Description="<html>Alternate string escape char (usually only used for Pawn).<br/>Only works right before the quote char.</html>"
-Enabled=false
-EditorType=numeric
-CallName="string_escape_char2="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[String Replace Tab Chars]
-Category=0
-Description="<html>Replace tab characters found in string literals with the escape sequence \t<br/>instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=string_replace_tab_chars=true|string_replace_tab_chars=false
-ValueDefault=false
-
-[Tok Split Gte]
-Category=0
-Description="<html>Allow interpreting '&gt;=' and '&gt;&gt;=' as part of a template in code like<br/>'void f(list&lt;list&lt;B&gt;&gt;=val);'. If true, 'assert(x&lt;0 &amp;&amp; y&gt;=3)' will be broken.<br/>Improvements to template detection may make this option obsolete.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=tok_split_gte=true|tok_split_gte=false
-ValueDefault=false
-
-[Disable Processing Nl Cont]
-Category=0
-Description="<html>Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=disable_processing_nl_cont=true|disable_processing_nl_cont=false
-ValueDefault=false
-
-[Disable Processing Cmt]
-Category=0
-Description="<html>Specify the marker used in comments to disable processing of part of the<br/>file.<br/><br/>Default:  *INDENT-OFF*</html>"
-Enabled=false
-CallName=disable_processing_cmt=
-EditorType=string
-ValueDefault= *INDENT-OFF*
-
-[Enable Processing Cmt]
-Category=0
-Description="<html>Specify the marker used in comments to (re)enable processing in a file.<br/><br/>Default:  *INDENT-ON*</html>"
-Enabled=false
-CallName=enable_processing_cmt=
-EditorType=string
-ValueDefault= *INDENT-ON*
-
-[Enable Digraphs]
-Category=0
-Description="<html>Enable parsing of digraphs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=enable_digraphs=true|enable_digraphs=false
-ValueDefault=false
-
-[Processing Cmt As Regex]
-Category=0
-Description="<html>Option to allow both disable_processing_cmt and enable_processing_cmt<br/>strings, if specified, to be interpreted as ECMAScript regular expressions.<br/>If true, a regex search will be performed within comments according to the<br/>specified patterns in order to disable/enable processing.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=processing_cmt_as_regex=true|processing_cmt_as_regex=false
-ValueDefault=false
-
-[Utf8 Bom]
-Category=0
-Description="<html>Add or remove the UTF-8 BOM (recommend 'remove').</html>"
-Enabled=false
-EditorType=multiple
-Choices=utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force|utf8_bom=not_defined
-ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
-ValueDefault=ignore
-
-[Utf8 Byte]
-Category=0
-Description="<html>If the file contains bytes with values between 128 and 255, but is not<br/>UTF-8, then output as UTF-8.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=utf8_byte=true|utf8_byte=false
-ValueDefault=false
-
-[Utf8 Force]
-Category=0
-Description="<html>Force the output encoding to UTF-8.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=utf8_force=true|utf8_force=false
-ValueDefault=false
-
-[Sp Arith]
-Category=1
-Description="<html>Add or remove space around non-assignment symbolic operators ('+', '/', '%',<br/>'&lt;&lt;', and so forth).</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_arith=ignore|sp_arith=add|sp_arith=remove|sp_arith=force|sp_arith=not_defined
-ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith"
-ValueDefault=ignore
-
-[Sp Arith Additive]
-Category=1
-Description="<html>Add or remove space around arithmetic operators '+' and '-'.<br/><br/>Overrides sp_arith.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_arith_additive=ignore|sp_arith_additive=add|sp_arith_additive=remove|sp_arith_additive=force|sp_arith_additive=not_defined
-ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive"
-ValueDefault=ignore
-
-[Sp Assign]
-Category=1
-Description="<html>Add or remove space around assignment operator '=', '+=', etc.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_assign=ignore|sp_assign=add|sp_assign=remove|sp_assign=force|sp_assign=not_defined
-ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Assign]
-Category=1
-Description="<html>Add or remove space around '=' in C++11 lambda capture specifications.<br/><br/>Overrides sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_assign=ignore|sp_cpp_lambda_assign=add|sp_cpp_lambda_assign=remove|sp_cpp_lambda_assign=force|sp_cpp_lambda_assign=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Assign|Add Sp Cpp Lambda Assign|Remove Sp Cpp Lambda Assign|Force Sp Cpp Lambda Assign"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Square Paren]
-Category=1
-Description="<html>Add or remove space after the capture specification of a C++11 lambda when<br/>an argument list is present, as in '[] &lt;here&gt; (int x){ ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_square_paren=ignore|sp_cpp_lambda_square_paren=add|sp_cpp_lambda_square_paren=remove|sp_cpp_lambda_square_paren=force|sp_cpp_lambda_square_paren=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Square Paren|Add Sp Cpp Lambda Square Paren|Remove Sp Cpp Lambda Square Paren|Force Sp Cpp Lambda Square Paren"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Square Brace]
-Category=1
-Description="<html>Add or remove space after the capture specification of a C++11 lambda with<br/>no argument list is present, as in '[] &lt;here&gt; { ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_square_brace=ignore|sp_cpp_lambda_square_brace=add|sp_cpp_lambda_square_brace=remove|sp_cpp_lambda_square_brace=force|sp_cpp_lambda_square_brace=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Square Brace|Add Sp Cpp Lambda Square Brace|Remove Sp Cpp Lambda Square Brace|Force Sp Cpp Lambda Square Brace"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Argument List]
-Category=1
-Description="<html>Add or remove space after the opening parenthesis and before the closing<br/>parenthesis of a argument list of a C++11 lambda, as in<br/>'[]( &lt;here&gt; int x &lt;here&gt; ){ ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_argument_list=ignore|sp_cpp_lambda_argument_list=add|sp_cpp_lambda_argument_list=remove|sp_cpp_lambda_argument_list=force|sp_cpp_lambda_argument_list=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Argument List|Add Sp Cpp Lambda Argument List|Remove Sp Cpp Lambda Argument List|Force Sp Cpp Lambda Argument List"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Paren Brace]
-Category=1
-Description="<html>Add or remove space after the argument list of a C++11 lambda, as in<br/>'[](int x) &lt;here&gt; { ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_paren_brace=ignore|sp_cpp_lambda_paren_brace=add|sp_cpp_lambda_paren_brace=remove|sp_cpp_lambda_paren_brace=force|sp_cpp_lambda_paren_brace=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Paren Brace|Add Sp Cpp Lambda Paren Brace|Remove Sp Cpp Lambda Paren Brace|Force Sp Cpp Lambda Paren Brace"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Fparen]
-Category=1
-Description="<html>Add or remove space between a lambda body and its call operator of an<br/>immediately invoked lambda, as in '[]( ... ){ ... } &lt;here&gt; ( ... )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_fparen=ignore|sp_cpp_lambda_fparen=add|sp_cpp_lambda_fparen=remove|sp_cpp_lambda_fparen=force|sp_cpp_lambda_fparen=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Fparen|Add Sp Cpp Lambda Fparen|Remove Sp Cpp Lambda Fparen|Force Sp Cpp Lambda Fparen"
-ValueDefault=ignore
-
-[Sp Assign Default]
-Category=1
-Description="<html>Add or remove space around assignment operator '=' in a prototype.<br/><br/>If set to ignore, use sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force|sp_assign_default=not_defined
-ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
-ValueDefault=ignore
-
-[Sp Before Assign]
-Category=1
-Description="<html>Add or remove space before assignment operator '=', '+=', etc.<br/><br/>Overrides sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_assign=ignore|sp_before_assign=add|sp_before_assign=remove|sp_before_assign=force|sp_before_assign=not_defined
-ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign"
-ValueDefault=ignore
-
-[Sp After Assign]
-Category=1
-Description="<html>Add or remove space after assignment operator '=', '+=', etc.<br/><br/>Overrides sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_assign=ignore|sp_after_assign=add|sp_after_assign=remove|sp_after_assign=force|sp_after_assign=not_defined
-ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
-ValueDefault=ignore
-
-[Sp Enum Paren]
-Category=1
-Description="<html>Add or remove space in 'NS_ENUM ('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_paren=ignore|sp_enum_paren=add|sp_enum_paren=remove|sp_enum_paren=force|sp_enum_paren=not_defined
-ChoicesReadable="Ignore Sp Enum Paren|Add Sp Enum Paren|Remove Sp Enum Paren|Force Sp Enum Paren"
-ValueDefault=ignore
-
-[Sp Enum Assign]
-Category=1
-Description="<html>Add or remove space around assignment '=' in enum.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_assign=ignore|sp_enum_assign=add|sp_enum_assign=remove|sp_enum_assign=force|sp_enum_assign=not_defined
-ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign"
-ValueDefault=ignore
-
-[Sp Enum Before Assign]
-Category=1
-Description="<html>Add or remove space before assignment '=' in enum.<br/><br/>Overrides sp_enum_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_before_assign=ignore|sp_enum_before_assign=add|sp_enum_before_assign=remove|sp_enum_before_assign=force|sp_enum_before_assign=not_defined
-ChoicesReadable="Ignore Sp Enum Before Assign|Add Sp Enum Before Assign|Remove Sp Enum Before Assign|Force Sp Enum Before Assign"
-ValueDefault=ignore
-
-[Sp Enum After Assign]
-Category=1
-Description="<html>Add or remove space after assignment '=' in enum.<br/><br/>Overrides sp_enum_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_after_assign=ignore|sp_enum_after_assign=add|sp_enum_after_assign=remove|sp_enum_after_assign=force|sp_enum_after_assign=not_defined
-ChoicesReadable="Ignore Sp Enum After Assign|Add Sp Enum After Assign|Remove Sp Enum After Assign|Force Sp Enum After Assign"
-ValueDefault=ignore
-
-[Sp Enum Colon]
-Category=1
-Description="<html>Add or remove space around assignment ':' in enum.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_colon=ignore|sp_enum_colon=add|sp_enum_colon=remove|sp_enum_colon=force|sp_enum_colon=not_defined
-ChoicesReadable="Ignore Sp Enum Colon|Add Sp Enum Colon|Remove Sp Enum Colon|Force Sp Enum Colon"
-ValueDefault=ignore
-
-[Sp Pp Concat]
-Category=1
-Description="<html>Add or remove space around preprocessor '##' concatenation operator.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force|sp_pp_concat=not_defined
-ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat"
-ValueDefault=add
-
-[Sp Pp Stringify]
-Category=1
-Description="<html>Add or remove space after preprocessor '#' stringify operator.<br/>Also affects the '#@' charizing operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_pp_stringify=ignore|sp_pp_stringify=add|sp_pp_stringify=remove|sp_pp_stringify=force|sp_pp_stringify=not_defined
-ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify"
-ValueDefault=ignore
-
-[Sp Before Pp Stringify]
-Category=1
-Description="<html>Add or remove space before preprocessor '#' stringify operator<br/>as in '#define x(y) L#y'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_pp_stringify=ignore|sp_before_pp_stringify=add|sp_before_pp_stringify=remove|sp_before_pp_stringify=force|sp_before_pp_stringify=not_defined
-ChoicesReadable="Ignore Sp Before Pp Stringify|Add Sp Before Pp Stringify|Remove Sp Before Pp Stringify|Force Sp Before Pp Stringify"
-ValueDefault=ignore
-
-[Sp Bool]
-Category=1
-Description="<html>Add or remove space around boolean operators '&amp;&amp;' and '||'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_bool=ignore|sp_bool=add|sp_bool=remove|sp_bool=force|sp_bool=not_defined
-ChoicesReadable="Ignore Sp Bool|Add Sp Bool|Remove Sp Bool|Force Sp Bool"
-ValueDefault=ignore
-
-[Sp Compare]
-Category=1
-Description="<html>Add or remove space around compare operator '&lt;', '&gt;', '==', etc.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_compare=ignore|sp_compare=add|sp_compare=remove|sp_compare=force|sp_compare=not_defined
-ChoicesReadable="Ignore Sp Compare|Add Sp Compare|Remove Sp Compare|Force Sp Compare"
-ValueDefault=ignore
-
-[Sp Inside Paren]
-Category=1
-Description="<html>Add or remove space inside '(' and ')'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_paren=ignore|sp_inside_paren=add|sp_inside_paren=remove|sp_inside_paren=force|sp_inside_paren=not_defined
-ChoicesReadable="Ignore Sp Inside Paren|Add Sp Inside Paren|Remove Sp Inside Paren|Force Sp Inside Paren"
-ValueDefault=ignore
-
-[Sp Paren Paren]
-Category=1
-Description="<html>Add or remove space between nested parentheses, i.e. '((' vs. ') )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_paren=ignore|sp_paren_paren=add|sp_paren_paren=remove|sp_paren_paren=force|sp_paren_paren=not_defined
-ChoicesReadable="Ignore Sp Paren Paren|Add Sp Paren Paren|Remove Sp Paren Paren|Force Sp Paren Paren"
-ValueDefault=ignore
-
-[Sp Cparen Oparen]
-Category=1
-Description="<html>Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cparen_oparen=ignore|sp_cparen_oparen=add|sp_cparen_oparen=remove|sp_cparen_oparen=force|sp_cparen_oparen=not_defined
-ChoicesReadable="Ignore Sp Cparen Oparen|Add Sp Cparen Oparen|Remove Sp Cparen Oparen|Force Sp Cparen Oparen"
-ValueDefault=ignore
-
-[Sp Balance Nested Parens]
-Category=1
-Description="<html>Whether to balance spaces inside nested parentheses.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_balance_nested_parens=true|sp_balance_nested_parens=false
-ValueDefault=false
-
-[Sp Paren Brace]
-Category=1
-Description="<html>Add or remove space between ')' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_brace=ignore|sp_paren_brace=add|sp_paren_brace=remove|sp_paren_brace=force|sp_paren_brace=not_defined
-ChoicesReadable="Ignore Sp Paren Brace|Add Sp Paren Brace|Remove Sp Paren Brace|Force Sp Paren Brace"
-ValueDefault=ignore
-
-[Sp Brace Brace]
-Category=1
-Description="<html>Add or remove space between nested braces, i.e. '{{' vs. '{ {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_brace=ignore|sp_brace_brace=add|sp_brace_brace=remove|sp_brace_brace=force|sp_brace_brace=not_defined
-ChoicesReadable="Ignore Sp Brace Brace|Add Sp Brace Brace|Remove Sp Brace Brace|Force Sp Brace Brace"
-ValueDefault=ignore
-
-[Sp Before Ptr Star]
-Category=1
-Description="<html>Add or remove space before pointer star '*'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ptr_star=ignore|sp_before_ptr_star=add|sp_before_ptr_star=remove|sp_before_ptr_star=force|sp_before_ptr_star=not_defined
-ChoicesReadable="Ignore Sp Before Ptr Star|Add Sp Before Ptr Star|Remove Sp Before Ptr Star|Force Sp Before Ptr Star"
-ValueDefault=ignore
-
-[Sp Before Unnamed Ptr Star]
-Category=1
-Description="<html>Add or remove space before pointer star '*' that isn't followed by a<br/>variable name. If set to ignore, sp_before_ptr_star is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_unnamed_ptr_star=ignore|sp_before_unnamed_ptr_star=add|sp_before_unnamed_ptr_star=remove|sp_before_unnamed_ptr_star=force|sp_before_unnamed_ptr_star=not_defined
-ChoicesReadable="Ignore Sp Before Unnamed Ptr Star|Add Sp Before Unnamed Ptr Star|Remove Sp Before Unnamed Ptr Star|Force Sp Before Unnamed Ptr Star"
-ValueDefault=ignore
-
-[Sp Between Ptr Star]
-Category=1
-Description="<html>Add or remove space between pointer stars '*'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_between_ptr_star=ignore|sp_between_ptr_star=add|sp_between_ptr_star=remove|sp_between_ptr_star=force|sp_between_ptr_star=not_defined
-ChoicesReadable="Ignore Sp Between Ptr Star|Add Sp Between Ptr Star|Remove Sp Between Ptr Star|Force Sp Between Ptr Star"
-ValueDefault=ignore
-
-[Sp After Ptr Star]
-Category=1
-Description="<html>Add or remove space after pointer star '*', if followed by a word.<br/><br/>Overrides sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_star=ignore|sp_after_ptr_star=add|sp_after_ptr_star=remove|sp_after_ptr_star=force|sp_after_ptr_star=not_defined
-ChoicesReadable="Ignore Sp After Ptr Star|Add Sp After Ptr Star|Remove Sp After Ptr Star|Force Sp After Ptr Star"
-ValueDefault=ignore
-
-[Sp After Ptr Block Caret]
-Category=1
-Description="<html>Add or remove space after pointer caret '^', if followed by a word.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_block_caret=ignore|sp_after_ptr_block_caret=add|sp_after_ptr_block_caret=remove|sp_after_ptr_block_caret=force|sp_after_ptr_block_caret=not_defined
-ChoicesReadable="Ignore Sp After Ptr Block Caret|Add Sp After Ptr Block Caret|Remove Sp After Ptr Block Caret|Force Sp After Ptr Block Caret"
-ValueDefault=ignore
-
-[Sp After Ptr Star Qualifier]
-Category=1
-Description="<html>Add or remove space after pointer star '*', if followed by a qualifier.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_star_qualifier=ignore|sp_after_ptr_star_qualifier=add|sp_after_ptr_star_qualifier=remove|sp_after_ptr_star_qualifier=force|sp_after_ptr_star_qualifier=not_defined
-ChoicesReadable="Ignore Sp After Ptr Star Qualifier|Add Sp After Ptr Star Qualifier|Remove Sp After Ptr Star Qualifier|Force Sp After Ptr Star Qualifier"
-ValueDefault=ignore
-
-[Sp After Ptr Star Func]
-Category=1
-Description="<html>Add or remove space after a pointer star '*', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_ptr_star and sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_star_func=ignore|sp_after_ptr_star_func=add|sp_after_ptr_star_func=remove|sp_after_ptr_star_func=force|sp_after_ptr_star_func=not_defined
-ChoicesReadable="Ignore Sp After Ptr Star Func|Add Sp After Ptr Star Func|Remove Sp After Ptr Star Func|Force Sp After Ptr Star Func"
-ValueDefault=ignore
-
-[Sp Ptr Star Paren]
-Category=1
-Description="<html>Add or remove space after a pointer star '*', if followed by an open<br/>parenthesis, as in 'void* (*)().</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_ptr_star_paren=ignore|sp_ptr_star_paren=add|sp_ptr_star_paren=remove|sp_ptr_star_paren=force|sp_ptr_star_paren=not_defined
-ChoicesReadable="Ignore Sp Ptr Star Paren|Add Sp Ptr Star Paren|Remove Sp Ptr Star Paren|Force Sp Ptr Star Paren"
-ValueDefault=ignore
-
-[Sp Before Ptr Star Func]
-Category=1
-Description="<html>Add or remove space before a pointer star '*', if followed by a function<br/>prototype or function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ptr_star_func=ignore|sp_before_ptr_star_func=add|sp_before_ptr_star_func=remove|sp_before_ptr_star_func=force|sp_before_ptr_star_func=not_defined
-ChoicesReadable="Ignore Sp Before Ptr Star Func|Add Sp Before Ptr Star Func|Remove Sp Before Ptr Star Func|Force Sp Before Ptr Star Func"
-ValueDefault=ignore
-
-[Sp Before Byref]
-Category=1
-Description="<html>Add or remove space before a reference sign '&amp;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_byref=ignore|sp_before_byref=add|sp_before_byref=remove|sp_before_byref=force|sp_before_byref=not_defined
-ChoicesReadable="Ignore Sp Before Byref|Add Sp Before Byref|Remove Sp Before Byref|Force Sp Before Byref"
-ValueDefault=ignore
-
-[Sp Before Unnamed Byref]
-Category=1
-Description="<html>Add or remove space before a reference sign '&amp;' that isn't followed by a<br/>variable name. If set to ignore, sp_before_byref is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_unnamed_byref=ignore|sp_before_unnamed_byref=add|sp_before_unnamed_byref=remove|sp_before_unnamed_byref=force|sp_before_unnamed_byref=not_defined
-ChoicesReadable="Ignore Sp Before Unnamed Byref|Add Sp Before Unnamed Byref|Remove Sp Before Unnamed Byref|Force Sp Before Unnamed Byref"
-ValueDefault=ignore
-
-[Sp After Byref]
-Category=1
-Description="<html>Add or remove space after reference sign '&amp;', if followed by a word.<br/><br/>Overrides sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force|sp_after_byref=not_defined
-ChoicesReadable="Ignore Sp After Byref|Add Sp After Byref|Remove Sp After Byref|Force Sp After Byref"
-ValueDefault=ignore
-
-[Sp After Byref Func]
-Category=1
-Description="<html>Add or remove space after a reference sign '&amp;', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_byref and sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_byref_func=ignore|sp_after_byref_func=add|sp_after_byref_func=remove|sp_after_byref_func=force|sp_after_byref_func=not_defined
-ChoicesReadable="Ignore Sp After Byref Func|Add Sp After Byref Func|Remove Sp After Byref Func|Force Sp After Byref Func"
-ValueDefault=ignore
-
-[Sp Before Byref Func]
-Category=1
-Description="<html>Add or remove space before a reference sign '&amp;', if followed by a function<br/>prototype or function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_byref_func=ignore|sp_before_byref_func=add|sp_before_byref_func=remove|sp_before_byref_func=force|sp_before_byref_func=not_defined
-ChoicesReadable="Ignore Sp Before Byref Func|Add Sp Before Byref Func|Remove Sp Before Byref Func|Force Sp Before Byref Func"
-ValueDefault=ignore
-
-[Sp After Type]
-Category=1
-Description="<html>Add or remove space between type and word. In cases where total removal of<br/>whitespace would be a syntax error, a value of 'remove' is treated the same<br/>as 'force'.<br/><br/>This also affects some other instances of space following a type that are<br/>not covered by other options; for example, between the return type and<br/>parenthesis of a function type template argument, between the type and<br/>parenthesis of an array parameter, or between 'decltype(...)' and the<br/>following word.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force|sp_after_type=not_defined
-ChoicesReadable="Ignore Sp After Type|Add Sp After Type|Remove Sp After Type|Force Sp After Type"
-ValueDefault=force
-
-[Sp After Decltype]
-Category=1
-Description="<html>Add or remove space between 'decltype(...)' and word,<br/>brace or function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_decltype=ignore|sp_after_decltype=add|sp_after_decltype=remove|sp_after_decltype=force|sp_after_decltype=not_defined
-ChoicesReadable="Ignore Sp After Decltype|Add Sp After Decltype|Remove Sp After Decltype|Force Sp After Decltype"
-ValueDefault=ignore
-
-[Sp Before Template Paren]
-Category=1
-Description="<html>(D) Add or remove space before the parenthesis in the D constructs<br/>'template Foo(' and 'class Foo('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_template_paren=ignore|sp_before_template_paren=add|sp_before_template_paren=remove|sp_before_template_paren=force|sp_before_template_paren=not_defined
-ChoicesReadable="Ignore Sp Before Template Paren|Add Sp Before Template Paren|Remove Sp Before Template Paren|Force Sp Before Template Paren"
-ValueDefault=ignore
-
-[Sp Template Angle]
-Category=1
-Description="<html>Add or remove space between 'template' and '&lt;'.<br/>If set to ignore, sp_before_angle is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_template_angle=ignore|sp_template_angle=add|sp_template_angle=remove|sp_template_angle=force|sp_template_angle=not_defined
-ChoicesReadable="Ignore Sp Template Angle|Add Sp Template Angle|Remove Sp Template Angle|Force Sp Template Angle"
-ValueDefault=ignore
-
-[Sp Before Angle]
-Category=1
-Description="<html>Add or remove space before '&lt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force|sp_before_angle=not_defined
-ChoicesReadable="Ignore Sp Before Angle|Add Sp Before Angle|Remove Sp Before Angle|Force Sp Before Angle"
-ValueDefault=ignore
-
-[Sp Inside Angle]
-Category=1
-Description="<html>Add or remove space inside '&lt;' and '&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_angle=ignore|sp_inside_angle=add|sp_inside_angle=remove|sp_inside_angle=force|sp_inside_angle=not_defined
-ChoicesReadable="Ignore Sp Inside Angle|Add Sp Inside Angle|Remove Sp Inside Angle|Force Sp Inside Angle"
-ValueDefault=ignore
-
-[Sp Inside Angle Empty]
-Category=1
-Description="<html>Add or remove space inside '&lt;&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_angle_empty=ignore|sp_inside_angle_empty=add|sp_inside_angle_empty=remove|sp_inside_angle_empty=force|sp_inside_angle_empty=not_defined
-ChoicesReadable="Ignore Sp Inside Angle Empty|Add Sp Inside Angle Empty|Remove Sp Inside Angle Empty|Force Sp Inside Angle Empty"
-ValueDefault=ignore
-
-[Sp Angle Colon]
-Category=1
-Description="<html>Add or remove space between '&gt;' and ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_colon=ignore|sp_angle_colon=add|sp_angle_colon=remove|sp_angle_colon=force|sp_angle_colon=not_defined
-ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon"
-ValueDefault=ignore
-
-[Sp After Angle]
-Category=1
-Description="<html>Add or remove space after '&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force|sp_after_angle=not_defined
-ChoicesReadable="Ignore Sp After Angle|Add Sp After Angle|Remove Sp After Angle|Force Sp After Angle"
-ValueDefault=ignore
-
-[Sp Angle Paren]
-Category=1
-Description="<html>Add or remove space between '&gt;' and '(' as found in 'new List&lt;byte&gt;(foo);'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_paren=ignore|sp_angle_paren=add|sp_angle_paren=remove|sp_angle_paren=force|sp_angle_paren=not_defined
-ChoicesReadable="Ignore Sp Angle Paren|Add Sp Angle Paren|Remove Sp Angle Paren|Force Sp Angle Paren"
-ValueDefault=ignore
-
-[Sp Angle Paren Empty]
-Category=1
-Description="<html>Add or remove space between '&gt;' and '()' as found in 'new List&lt;byte&gt;();'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_paren_empty=ignore|sp_angle_paren_empty=add|sp_angle_paren_empty=remove|sp_angle_paren_empty=force|sp_angle_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Angle Paren Empty|Add Sp Angle Paren Empty|Remove Sp Angle Paren Empty|Force Sp Angle Paren Empty"
-ValueDefault=ignore
-
-[Sp Angle Word]
-Category=1
-Description="<html>Add or remove space between '&gt;' and a word as in 'List&lt;byte&gt; m;' or<br/>'template &lt;typename T&gt; static ...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force|sp_angle_word=not_defined
-ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word"
-ValueDefault=ignore
-
-[Sp Angle Shift]
-Category=1
-Description="<html>Add or remove space between '&gt;' and '&gt;' in '&gt;&gt;' (template stuff).<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force|sp_angle_shift=not_defined
-ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift"
-ValueDefault=add
-
-[Sp Permit Cpp11 Shift]
-Category=1
-Description="<html>(C++11) Permit removal of the space between '&gt;&gt;' in 'foo&lt;bar&lt;int&gt; &gt;'. Note<br/>that sp_angle_shift cannot remove the space without this option.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_permit_cpp11_shift=true|sp_permit_cpp11_shift=false
-ValueDefault=false
-
-[Sp Before Sparen]
-Category=1
-Description="<html>Add or remove space before '(' of control statements ('if', 'for', 'switch',<br/>'while', etc.).</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_sparen=ignore|sp_before_sparen=add|sp_before_sparen=remove|sp_before_sparen=force|sp_before_sparen=not_defined
-ChoicesReadable="Ignore Sp Before Sparen|Add Sp Before Sparen|Remove Sp Before Sparen|Force Sp Before Sparen"
-ValueDefault=ignore
-
-[Sp Inside Sparen]
-Category=1
-Description="<html>Add or remove space inside '(' and ')' of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_sparen=ignore|sp_inside_sparen=add|sp_inside_sparen=remove|sp_inside_sparen=force|sp_inside_sparen=not_defined
-ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen"
-ValueDefault=ignore
-
-[Sp Inside Sparen Open]
-Category=1
-Description="<html>Add or remove space after '(' of control statements.<br/><br/>Overrides sp_inside_sparen.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_sparen_open=ignore|sp_inside_sparen_open=add|sp_inside_sparen_open=remove|sp_inside_sparen_open=force|sp_inside_sparen_open=not_defined
-ChoicesReadable="Ignore Sp Inside Sparen Open|Add Sp Inside Sparen Open|Remove Sp Inside Sparen Open|Force Sp Inside Sparen Open"
-ValueDefault=ignore
-
-[Sp Inside Sparen Close]
-Category=1
-Description="<html>Add or remove space before ')' of control statements.<br/><br/>Overrides sp_inside_sparen.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_sparen_close=ignore|sp_inside_sparen_close=add|sp_inside_sparen_close=remove|sp_inside_sparen_close=force|sp_inside_sparen_close=not_defined
-ChoicesReadable="Ignore Sp Inside Sparen Close|Add Sp Inside Sparen Close|Remove Sp Inside Sparen Close|Force Sp Inside Sparen Close"
-ValueDefault=ignore
-
-[Sp After Sparen]
-Category=1
-Description="<html>Add or remove space after ')' of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_sparen=ignore|sp_after_sparen=add|sp_after_sparen=remove|sp_after_sparen=force|sp_after_sparen=not_defined
-ChoicesReadable="Ignore Sp After Sparen|Add Sp After Sparen|Remove Sp After Sparen|Force Sp After Sparen"
-ValueDefault=ignore
-
-[Sp Sparen Brace]
-Category=1
-Description="<html>Add or remove space between ')' and '{' of of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sparen_brace=ignore|sp_sparen_brace=add|sp_sparen_brace=remove|sp_sparen_brace=force|sp_sparen_brace=not_defined
-ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace"
-ValueDefault=ignore
-
-[Sp Do Brace Open]
-Category=1
-Description="<html>Add or remove space between 'do' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_do_brace_open=ignore|sp_do_brace_open=add|sp_do_brace_open=remove|sp_do_brace_open=force|sp_do_brace_open=not_defined
-ChoicesReadable="Ignore Sp Do Brace Open|Add Sp Do Brace Open|Remove Sp Do Brace Open|Force Sp Do Brace Open"
-ValueDefault=ignore
-
-[Sp Brace Close While]
-Category=1
-Description="<html>Add or remove space between '}' and 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_close_while=ignore|sp_brace_close_while=add|sp_brace_close_while=remove|sp_brace_close_while=force|sp_brace_close_while=not_defined
-ChoicesReadable="Ignore Sp Brace Close While|Add Sp Brace Close While|Remove Sp Brace Close While|Force Sp Brace Close While"
-ValueDefault=ignore
-
-[Sp While Paren Open]
-Category=1
-Description="<html>Add or remove space between 'while' and '('. Overrides sp_before_sparen.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_while_paren_open=ignore|sp_while_paren_open=add|sp_while_paren_open=remove|sp_while_paren_open=force|sp_while_paren_open=not_defined
-ChoicesReadable="Ignore Sp While Paren Open|Add Sp While Paren Open|Remove Sp While Paren Open|Force Sp While Paren Open"
-ValueDefault=ignore
-
-[Sp Invariant Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'invariant' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_invariant_paren=ignore|sp_invariant_paren=add|sp_invariant_paren=remove|sp_invariant_paren=force|sp_invariant_paren=not_defined
-ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren"
-ValueDefault=ignore
-
-[Sp After Invariant Paren]
-Category=1
-Description="<html>(D) Add or remove space after the ')' in 'invariant (C) c'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_invariant_paren=ignore|sp_after_invariant_paren=add|sp_after_invariant_paren=remove|sp_after_invariant_paren=force|sp_after_invariant_paren=not_defined
-ChoicesReadable="Ignore Sp After Invariant Paren|Add Sp After Invariant Paren|Remove Sp After Invariant Paren|Force Sp After Invariant Paren"
-ValueDefault=ignore
-
-[Sp Special Semi]
-Category=1
-Description="<html>Add or remove space before empty statement ';' on 'if', 'for' and 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_special_semi=ignore|sp_special_semi=add|sp_special_semi=remove|sp_special_semi=force|sp_special_semi=not_defined
-ChoicesReadable="Ignore Sp Special Semi|Add Sp Special Semi|Remove Sp Special Semi|Force Sp Special Semi"
-ValueDefault=ignore
-
-[Sp Before Semi]
-Category=1
-Description="<html>Add or remove space before ';'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force|sp_before_semi=not_defined
-ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
-ValueDefault=remove
-
-[Sp Before Semi For]
-Category=1
-Description="<html>Add or remove space before ';' in non-empty 'for' statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi_for=ignore|sp_before_semi_for=add|sp_before_semi_for=remove|sp_before_semi_for=force|sp_before_semi_for=not_defined
-ChoicesReadable="Ignore Sp Before Semi For|Add Sp Before Semi For|Remove Sp Before Semi For|Force Sp Before Semi For"
-ValueDefault=ignore
-
-[Sp Before Semi For Empty]
-Category=1
-Description="<html>Add or remove space before a semicolon of an empty part of a for statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi_for_empty=ignore|sp_before_semi_for_empty=add|sp_before_semi_for_empty=remove|sp_before_semi_for_empty=force|sp_before_semi_for_empty=not_defined
-ChoicesReadable="Ignore Sp Before Semi For Empty|Add Sp Before Semi For Empty|Remove Sp Before Semi For Empty|Force Sp Before Semi For Empty"
-ValueDefault=ignore
-
-[Sp After Semi]
-Category=1
-Description="<html>Add or remove space after ';', except when followed by a comment.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force|sp_after_semi=not_defined
-ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
-ValueDefault=add
-
-[Sp After Semi For]
-Category=1
-Description="<html>Add or remove space after ';' in non-empty 'for' statements.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi_for=ignore|sp_after_semi_for=add|sp_after_semi_for=remove|sp_after_semi_for=force|sp_after_semi_for=not_defined
-ChoicesReadable="Ignore Sp After Semi For|Add Sp After Semi For|Remove Sp After Semi For|Force Sp After Semi For"
-ValueDefault=force
-
-[Sp After Semi For Empty]
-Category=1
-Description="<html>Add or remove space after the final semicolon of an empty part of a for<br/>statement, as in 'for ( ; ; &lt;here&gt; )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi_for_empty=ignore|sp_after_semi_for_empty=add|sp_after_semi_for_empty=remove|sp_after_semi_for_empty=force|sp_after_semi_for_empty=not_defined
-ChoicesReadable="Ignore Sp After Semi For Empty|Add Sp After Semi For Empty|Remove Sp After Semi For Empty|Force Sp After Semi For Empty"
-ValueDefault=ignore
-
-[Sp Before Square]
-Category=1
-Description="<html>Add or remove space before '[' (except '[]').</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_square=ignore|sp_before_square=add|sp_before_square=remove|sp_before_square=force|sp_before_square=not_defined
-ChoicesReadable="Ignore Sp Before Square|Add Sp Before Square|Remove Sp Before Square|Force Sp Before Square"
-ValueDefault=ignore
-
-[Sp Before Vardef Square]
-Category=1
-Description="<html>Add or remove space before '[' for a variable definition.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_vardef_square=ignore|sp_before_vardef_square=add|sp_before_vardef_square=remove|sp_before_vardef_square=force|sp_before_vardef_square=not_defined
-ChoicesReadable="Ignore Sp Before Vardef Square|Add Sp Before Vardef Square|Remove Sp Before Vardef Square|Force Sp Before Vardef Square"
-ValueDefault=remove
-
-[Sp Before Square Asm Block]
-Category=1
-Description="<html>Add or remove space before '[' for asm block.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_square_asm_block=ignore|sp_before_square_asm_block=add|sp_before_square_asm_block=remove|sp_before_square_asm_block=force|sp_before_square_asm_block=not_defined
-ChoicesReadable="Ignore Sp Before Square Asm Block|Add Sp Before Square Asm Block|Remove Sp Before Square Asm Block|Force Sp Before Square Asm Block"
-ValueDefault=ignore
-
-[Sp Before Squares]
-Category=1
-Description="<html>Add or remove space before '[]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_squares=ignore|sp_before_squares=add|sp_before_squares=remove|sp_before_squares=force|sp_before_squares=not_defined
-ChoicesReadable="Ignore Sp Before Squares|Add Sp Before Squares|Remove Sp Before Squares|Force Sp Before Squares"
-ValueDefault=ignore
-
-[Sp Cpp Before Struct Binding]
-Category=1
-Description="<html>Add or remove space before C++17 structured bindings.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_before_struct_binding=ignore|sp_cpp_before_struct_binding=add|sp_cpp_before_struct_binding=remove|sp_cpp_before_struct_binding=force|sp_cpp_before_struct_binding=not_defined
-ChoicesReadable="Ignore Sp Cpp Before Struct Binding|Add Sp Cpp Before Struct Binding|Remove Sp Cpp Before Struct Binding|Force Sp Cpp Before Struct Binding"
-ValueDefault=ignore
-
-[Sp Inside Square]
-Category=1
-Description="<html>Add or remove space inside a non-empty '[' and ']'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_square=ignore|sp_inside_square=add|sp_inside_square=remove|sp_inside_square=force|sp_inside_square=not_defined
-ChoicesReadable="Ignore Sp Inside Square|Add Sp Inside Square|Remove Sp Inside Square|Force Sp Inside Square"
-ValueDefault=ignore
-
-[Sp Inside Square Empty]
-Category=1
-Description="<html>Add or remove space inside '[]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_square_empty=ignore|sp_inside_square_empty=add|sp_inside_square_empty=remove|sp_inside_square_empty=force|sp_inside_square_empty=not_defined
-ChoicesReadable="Ignore Sp Inside Square Empty|Add Sp Inside Square Empty|Remove Sp Inside Square Empty|Force Sp Inside Square Empty"
-ValueDefault=ignore
-
-[Sp Inside Square Oc Array]
-Category=1
-Description="<html>(OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and<br/>']'. If set to ignore, sp_inside_square is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_square_oc_array=ignore|sp_inside_square_oc_array=add|sp_inside_square_oc_array=remove|sp_inside_square_oc_array=force|sp_inside_square_oc_array=not_defined
-ChoicesReadable="Ignore Sp Inside Square Oc Array|Add Sp Inside Square Oc Array|Remove Sp Inside Square Oc Array|Force Sp Inside Square Oc Array"
-ValueDefault=ignore
-
-[Sp After Comma]
-Category=1
-Description="<html>Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_comma=ignore|sp_after_comma=add|sp_after_comma=remove|sp_after_comma=force|sp_after_comma=not_defined
-ChoicesReadable="Ignore Sp After Comma|Add Sp After Comma|Remove Sp After Comma|Force Sp After Comma"
-ValueDefault=ignore
-
-[Sp Before Comma]
-Category=1
-Description="<html>Add or remove space before ','.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force|sp_before_comma=not_defined
-ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
-ValueDefault=remove
-
-[Sp After Mdatype Commas]
-Category=1
-Description="<html>(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_mdatype_commas=ignore|sp_after_mdatype_commas=add|sp_after_mdatype_commas=remove|sp_after_mdatype_commas=force|sp_after_mdatype_commas=not_defined
-ChoicesReadable="Ignore Sp After Mdatype Commas|Add Sp After Mdatype Commas|Remove Sp After Mdatype Commas|Force Sp After Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Before Mdatype Commas]
-Category=1
-Description="<html>(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_mdatype_commas=ignore|sp_before_mdatype_commas=add|sp_before_mdatype_commas=remove|sp_before_mdatype_commas=force|sp_before_mdatype_commas=not_defined
-ChoicesReadable="Ignore Sp Before Mdatype Commas|Add Sp Before Mdatype Commas|Remove Sp Before Mdatype Commas|Force Sp Before Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Between Mdatype Commas]
-Category=1
-Description="<html>(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_between_mdatype_commas=ignore|sp_between_mdatype_commas=add|sp_between_mdatype_commas=remove|sp_between_mdatype_commas=force|sp_between_mdatype_commas=not_defined
-ChoicesReadable="Ignore Sp Between Mdatype Commas|Add Sp Between Mdatype Commas|Remove Sp Between Mdatype Commas|Force Sp Between Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Paren Comma]
-Category=1
-Description="<html>Add or remove space between an open parenthesis and comma,<br/>i.e. '(,' vs. '( ,'.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force|sp_paren_comma=not_defined
-ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
-ValueDefault=force
-
-[Sp Before Ellipsis]
-Category=1
-Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force|sp_before_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Before Ellipsis|Add Sp Before Ellipsis|Remove Sp Before Ellipsis|Force Sp Before Ellipsis"
-ValueDefault=ignore
-
-[Sp Type Ellipsis]
-Category=1
-Description="<html>Add or remove space between a type and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_ellipsis=ignore|sp_type_ellipsis=add|sp_type_ellipsis=remove|sp_type_ellipsis=force|sp_type_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Type Ellipsis|Add Sp Type Ellipsis|Remove Sp Type Ellipsis|Force Sp Type Ellipsis"
-ValueDefault=ignore
-
-[Sp Type Question]
-Category=1
-Description="<html>(D) Add or remove space between a type and '?'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force|sp_type_question=not_defined
-ChoicesReadable="Ignore Sp Type Question|Add Sp Type Question|Remove Sp Type Question|Force Sp Type Question"
-ValueDefault=ignore
-
-[Sp Paren Ellipsis]
-Category=1
-Description="<html>Add or remove space between ')' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_ellipsis=ignore|sp_paren_ellipsis=add|sp_paren_ellipsis=remove|sp_paren_ellipsis=force|sp_paren_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Paren Ellipsis|Add Sp Paren Ellipsis|Remove Sp Paren Ellipsis|Force Sp Paren Ellipsis"
-ValueDefault=ignore
-
-[Sp Paren Qualifier]
-Category=1
-Description="<html>Add or remove space between ')' and a qualifier such as 'const'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_qualifier=ignore|sp_paren_qualifier=add|sp_paren_qualifier=remove|sp_paren_qualifier=force|sp_paren_qualifier=not_defined
-ChoicesReadable="Ignore Sp Paren Qualifier|Add Sp Paren Qualifier|Remove Sp Paren Qualifier|Force Sp Paren Qualifier"
-ValueDefault=ignore
-
-[Sp Paren Noexcept]
-Category=1
-Description="<html>Add or remove space between ')' and 'noexcept'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_noexcept=ignore|sp_paren_noexcept=add|sp_paren_noexcept=remove|sp_paren_noexcept=force|sp_paren_noexcept=not_defined
-ChoicesReadable="Ignore Sp Paren Noexcept|Add Sp Paren Noexcept|Remove Sp Paren Noexcept|Force Sp Paren Noexcept"
-ValueDefault=ignore
-
-[Sp After Class Colon]
-Category=1
-Description="<html>Add or remove space after class ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_class_colon=ignore|sp_after_class_colon=add|sp_after_class_colon=remove|sp_after_class_colon=force|sp_after_class_colon=not_defined
-ChoicesReadable="Ignore Sp After Class Colon|Add Sp After Class Colon|Remove Sp After Class Colon|Force Sp After Class Colon"
-ValueDefault=ignore
-
-[Sp Before Class Colon]
-Category=1
-Description="<html>Add or remove space before class ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_class_colon=ignore|sp_before_class_colon=add|sp_before_class_colon=remove|sp_before_class_colon=force|sp_before_class_colon=not_defined
-ChoicesReadable="Ignore Sp Before Class Colon|Add Sp Before Class Colon|Remove Sp Before Class Colon|Force Sp Before Class Colon"
-ValueDefault=ignore
-
-[Sp After Constr Colon]
-Category=1
-Description="<html>Add or remove space after class constructor ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_constr_colon=ignore|sp_after_constr_colon=add|sp_after_constr_colon=remove|sp_after_constr_colon=force|sp_after_constr_colon=not_defined
-ChoicesReadable="Ignore Sp After Constr Colon|Add Sp After Constr Colon|Remove Sp After Constr Colon|Force Sp After Constr Colon"
-ValueDefault=ignore
-
-[Sp Before Constr Colon]
-Category=1
-Description="<html>Add or remove space before class constructor ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_constr_colon=ignore|sp_before_constr_colon=add|sp_before_constr_colon=remove|sp_before_constr_colon=force|sp_before_constr_colon=not_defined
-ChoicesReadable="Ignore Sp Before Constr Colon|Add Sp Before Constr Colon|Remove Sp Before Constr Colon|Force Sp Before Constr Colon"
-ValueDefault=ignore
-
-[Sp Before Case Colon]
-Category=1
-Description="<html>Add or remove space before case ':'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_case_colon=ignore|sp_before_case_colon=add|sp_before_case_colon=remove|sp_before_case_colon=force|sp_before_case_colon=not_defined
-ChoicesReadable="Ignore Sp Before Case Colon|Add Sp Before Case Colon|Remove Sp Before Case Colon|Force Sp Before Case Colon"
-ValueDefault=remove
-
-[Sp After Operator]
-Category=1
-Description="<html>Add or remove space between 'operator' and operator sign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_operator=ignore|sp_after_operator=add|sp_after_operator=remove|sp_after_operator=force|sp_after_operator=not_defined
-ChoicesReadable="Ignore Sp After Operator|Add Sp After Operator|Remove Sp After Operator|Force Sp After Operator"
-ValueDefault=ignore
-
-[Sp After Operator Sym]
-Category=1
-Description="<html>Add or remove space between the operator symbol and the open parenthesis, as<br/>in 'operator ++('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_operator_sym=ignore|sp_after_operator_sym=add|sp_after_operator_sym=remove|sp_after_operator_sym=force|sp_after_operator_sym=not_defined
-ChoicesReadable="Ignore Sp After Operator Sym|Add Sp After Operator Sym|Remove Sp After Operator Sym|Force Sp After Operator Sym"
-ValueDefault=ignore
-
-[Sp After Operator Sym Empty]
-Category=1
-Description="<html>Overrides sp_after_operator_sym when the operator has no arguments, as in<br/>'operator *()'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_operator_sym_empty=ignore|sp_after_operator_sym_empty=add|sp_after_operator_sym_empty=remove|sp_after_operator_sym_empty=force|sp_after_operator_sym_empty=not_defined
-ChoicesReadable="Ignore Sp After Operator Sym Empty|Add Sp After Operator Sym Empty|Remove Sp After Operator Sym Empty|Force Sp After Operator Sym Empty"
-ValueDefault=ignore
-
-[Sp After Cast]
-Category=1
-Description="<html>Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or<br/>'(int)a' vs. '(int) a'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force|sp_after_cast=not_defined
-ChoicesReadable="Ignore Sp After Cast|Add Sp After Cast|Remove Sp After Cast|Force Sp After Cast"
-ValueDefault=ignore
-
-[Sp Inside Paren Cast]
-Category=1
-Description="<html>Add or remove spaces inside cast parentheses.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_paren_cast=ignore|sp_inside_paren_cast=add|sp_inside_paren_cast=remove|sp_inside_paren_cast=force|sp_inside_paren_cast=not_defined
-ChoicesReadable="Ignore Sp Inside Paren Cast|Add Sp Inside Paren Cast|Remove Sp Inside Paren Cast|Force Sp Inside Paren Cast"
-ValueDefault=ignore
-
-[Sp Cpp Cast Paren]
-Category=1
-Description="<html>Add or remove space between the type and open parenthesis in a C++ cast,<br/>i.e. 'int(exp)' vs. 'int (exp)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_cast_paren=ignore|sp_cpp_cast_paren=add|sp_cpp_cast_paren=remove|sp_cpp_cast_paren=force|sp_cpp_cast_paren=not_defined
-ChoicesReadable="Ignore Sp Cpp Cast Paren|Add Sp Cpp Cast Paren|Remove Sp Cpp Cast Paren|Force Sp Cpp Cast Paren"
-ValueDefault=ignore
-
-[Sp Sizeof Paren]
-Category=1
-Description="<html>Add or remove space between 'sizeof' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_paren=ignore|sp_sizeof_paren=add|sp_sizeof_paren=remove|sp_sizeof_paren=force|sp_sizeof_paren=not_defined
-ChoicesReadable="Ignore Sp Sizeof Paren|Add Sp Sizeof Paren|Remove Sp Sizeof Paren|Force Sp Sizeof Paren"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis]
-Category=1
-Description="<html>Add or remove space between 'sizeof' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_ellipsis=ignore|sp_sizeof_ellipsis=add|sp_sizeof_ellipsis=remove|sp_sizeof_ellipsis=force|sp_sizeof_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Sizeof Ellipsis|Add Sp Sizeof Ellipsis|Remove Sp Sizeof Ellipsis|Force Sp Sizeof Ellipsis"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis Paren]
-Category=1
-Description="<html>Add or remove space between 'sizeof...' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_ellipsis_paren=ignore|sp_sizeof_ellipsis_paren=add|sp_sizeof_ellipsis_paren=remove|sp_sizeof_ellipsis_paren=force|sp_sizeof_ellipsis_paren=not_defined
-ChoicesReadable="Ignore Sp Sizeof Ellipsis Paren|Add Sp Sizeof Ellipsis Paren|Remove Sp Sizeof Ellipsis Paren|Force Sp Sizeof Ellipsis Paren"
-ValueDefault=ignore
-
-[Sp Decltype Paren]
-Category=1
-Description="<html>Add or remove space between 'decltype' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_decltype_paren=ignore|sp_decltype_paren=add|sp_decltype_paren=remove|sp_decltype_paren=force|sp_decltype_paren=not_defined
-ChoicesReadable="Ignore Sp Decltype Paren|Add Sp Decltype Paren|Remove Sp Decltype Paren|Force Sp Decltype Paren"
-ValueDefault=ignore
-
-[Sp After Tag]
-Category=1
-Description="<html>(Pawn) Add or remove space after the tag keyword.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_tag=ignore|sp_after_tag=add|sp_after_tag=remove|sp_after_tag=force|sp_after_tag=not_defined
-ChoicesReadable="Ignore Sp After Tag|Add Sp After Tag|Remove Sp After Tag|Force Sp After Tag"
-ValueDefault=ignore
-
-[Sp Inside Braces Enum]
-Category=1
-Description="<html>Add or remove space inside enum '{' and '}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_enum=ignore|sp_inside_braces_enum=add|sp_inside_braces_enum=remove|sp_inside_braces_enum=force|sp_inside_braces_enum=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Enum|Add Sp Inside Braces Enum|Remove Sp Inside Braces Enum|Force Sp Inside Braces Enum"
-ValueDefault=ignore
-
-[Sp Inside Braces Struct]
-Category=1
-Description="<html>Add or remove space inside struct/union '{' and '}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_struct=ignore|sp_inside_braces_struct=add|sp_inside_braces_struct=remove|sp_inside_braces_struct=force|sp_inside_braces_struct=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Struct|Add Sp Inside Braces Struct|Remove Sp Inside Braces Struct|Force Sp Inside Braces Struct"
-ValueDefault=ignore
-
-[Sp Inside Braces Oc Dict]
-Category=1
-Description="<html>(OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_oc_dict=ignore|sp_inside_braces_oc_dict=add|sp_inside_braces_oc_dict=remove|sp_inside_braces_oc_dict=force|sp_inside_braces_oc_dict=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Oc Dict|Add Sp Inside Braces Oc Dict|Remove Sp Inside Braces Oc Dict|Force Sp Inside Braces Oc Dict"
-ValueDefault=ignore
-
-[Sp After Type Brace Init Lst Open]
-Category=1
-Description="<html>Add or remove space after open brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_type_brace_init_lst_open=ignore|sp_after_type_brace_init_lst_open=add|sp_after_type_brace_init_lst_open=remove|sp_after_type_brace_init_lst_open=force|sp_after_type_brace_init_lst_open=not_defined
-ChoicesReadable="Ignore Sp After Type Brace Init Lst Open|Add Sp After Type Brace Init Lst Open|Remove Sp After Type Brace Init Lst Open|Force Sp After Type Brace Init Lst Open"
-ValueDefault=ignore
-
-[Sp Before Type Brace Init Lst Close]
-Category=1
-Description="<html>Add or remove space before close brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_type_brace_init_lst_close=ignore|sp_before_type_brace_init_lst_close=add|sp_before_type_brace_init_lst_close=remove|sp_before_type_brace_init_lst_close=force|sp_before_type_brace_init_lst_close=not_defined
-ChoicesReadable="Ignore Sp Before Type Brace Init Lst Close|Add Sp Before Type Brace Init Lst Close|Remove Sp Before Type Brace Init Lst Close|Force Sp Before Type Brace Init Lst Close"
-ValueDefault=ignore
-
-[Sp Inside Type Brace Init Lst]
-Category=1
-Description="<html>Add or remove space inside an unnamed temporary direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_type_brace_init_lst=ignore|sp_inside_type_brace_init_lst=add|sp_inside_type_brace_init_lst=remove|sp_inside_type_brace_init_lst=force|sp_inside_type_brace_init_lst=not_defined
-ChoicesReadable="Ignore Sp Inside Type Brace Init Lst|Add Sp Inside Type Brace Init Lst|Remove Sp Inside Type Brace Init Lst|Force Sp Inside Type Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Inside Braces]
-Category=1
-Description="<html>Add or remove space inside '{' and '}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces=ignore|sp_inside_braces=add|sp_inside_braces=remove|sp_inside_braces=force|sp_inside_braces=not_defined
-ChoicesReadable="Ignore Sp Inside Braces|Add Sp Inside Braces|Remove Sp Inside Braces|Force Sp Inside Braces"
-ValueDefault=ignore
-
-[Sp Inside Braces Empty]
-Category=1
-Description="<html>Add or remove space inside '{}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_empty=ignore|sp_inside_braces_empty=add|sp_inside_braces_empty=remove|sp_inside_braces_empty=force|sp_inside_braces_empty=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Empty|Add Sp Inside Braces Empty|Remove Sp Inside Braces Empty|Force Sp Inside Braces Empty"
-ValueDefault=ignore
-
-[Sp Trailing Return]
-Category=1
-Description="<html>Add or remove space around trailing return operator '-&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_trailing_return=ignore|sp_trailing_return=add|sp_trailing_return=remove|sp_trailing_return=force|sp_trailing_return=not_defined
-ChoicesReadable="Ignore Sp Trailing Return|Add Sp Trailing Return|Remove Sp Trailing Return|Force Sp Trailing Return"
-ValueDefault=ignore
-
-[Sp Type Func]
-Category=1
-Description="<html>Add or remove space between return type and function name. A minimum of 1<br/>is forced except for pointer return types.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force|sp_type_func=not_defined
-ChoicesReadable="Ignore Sp Type Func|Add Sp Type Func|Remove Sp Type Func|Force Sp Type Func"
-ValueDefault=ignore
-
-[Sp Type Brace Init Lst]
-Category=1
-Description="<html>Add or remove space between type and open brace of an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_brace_init_lst=ignore|sp_type_brace_init_lst=add|sp_type_brace_init_lst=remove|sp_type_brace_init_lst=force|sp_type_brace_init_lst=not_defined
-ChoicesReadable="Ignore Sp Type Brace Init Lst|Add Sp Type Brace Init Lst|Remove Sp Type Brace Init Lst|Force Sp Type Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Func Proto Paren]
-Category=1
-Description="<html>Add or remove space between function name and '(' on function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_proto_paren=ignore|sp_func_proto_paren=add|sp_func_proto_paren=remove|sp_func_proto_paren=force|sp_func_proto_paren=not_defined
-ChoicesReadable="Ignore Sp Func Proto Paren|Add Sp Func Proto Paren|Remove Sp Func Proto Paren|Force Sp Func Proto Paren"
-ValueDefault=ignore
-
-[Sp Func Proto Paren Empty]
-Category=1
-Description="<html>Add or remove space between function name and '()' on function declaration<br/>without parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_proto_paren_empty=ignore|sp_func_proto_paren_empty=add|sp_func_proto_paren_empty=remove|sp_func_proto_paren_empty=force|sp_func_proto_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Proto Paren Empty|Add Sp Func Proto Paren Empty|Remove Sp Func Proto Paren Empty|Force Sp Func Proto Paren Empty"
-ValueDefault=ignore
-
-[Sp Func Type Paren]
-Category=1
-Description="<html>Add or remove space between function name and '(' with a typedef specifier.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_type_paren=ignore|sp_func_type_paren=add|sp_func_type_paren=remove|sp_func_type_paren=force|sp_func_type_paren=not_defined
-ChoicesReadable="Ignore Sp Func Type Paren|Add Sp Func Type Paren|Remove Sp Func Type Paren|Force Sp Func Type Paren"
-ValueDefault=ignore
-
-[Sp Func Def Paren]
-Category=1
-Description="<html>Add or remove space between alias name and '(' of a non-pointer function type typedef.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_def_paren=ignore|sp_func_def_paren=add|sp_func_def_paren=remove|sp_func_def_paren=force|sp_func_def_paren=not_defined
-ChoicesReadable="Ignore Sp Func Def Paren|Add Sp Func Def Paren|Remove Sp Func Def Paren|Force Sp Func Def Paren"
-ValueDefault=ignore
-
-[Sp Func Def Paren Empty]
-Category=1
-Description="<html>Add or remove space between function name and '()' on function definition<br/>without parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_def_paren_empty=ignore|sp_func_def_paren_empty=add|sp_func_def_paren_empty=remove|sp_func_def_paren_empty=force|sp_func_def_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Def Paren Empty|Add Sp Func Def Paren Empty|Remove Sp Func Def Paren Empty|Force Sp Func Def Paren Empty"
-ValueDefault=ignore
-
-[Sp Inside Fparens]
-Category=1
-Description="<html>Add or remove space inside empty function '()'.<br/>Overrides sp_after_angle unless use_sp_after_angle_always is set to true.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_fparens=ignore|sp_inside_fparens=add|sp_inside_fparens=remove|sp_inside_fparens=force|sp_inside_fparens=not_defined
-ChoicesReadable="Ignore Sp Inside Fparens|Add Sp Inside Fparens|Remove Sp Inside Fparens|Force Sp Inside Fparens"
-ValueDefault=ignore
-
-[Sp Inside Fparen]
-Category=1
-Description="<html>Add or remove space inside function '(' and ')'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_fparen=ignore|sp_inside_fparen=add|sp_inside_fparen=remove|sp_inside_fparen=force|sp_inside_fparen=not_defined
-ChoicesReadable="Ignore Sp Inside Fparen|Add Sp Inside Fparen|Remove Sp Inside Fparen|Force Sp Inside Fparen"
-ValueDefault=ignore
-
-[Sp Inside Tparen]
-Category=1
-Description="<html>Add or remove space inside the first parentheses in a function type, as in<br/>'void (*x)(...)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_tparen=ignore|sp_inside_tparen=add|sp_inside_tparen=remove|sp_inside_tparen=force|sp_inside_tparen=not_defined
-ChoicesReadable="Ignore Sp Inside Tparen|Add Sp Inside Tparen|Remove Sp Inside Tparen|Force Sp Inside Tparen"
-ValueDefault=ignore
-
-[Sp After Tparen Close]
-Category=1
-Description="<html>Add or remove space between the ')' and '(' in a function type, as in<br/>'void (*x)(...)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_tparen_close=ignore|sp_after_tparen_close=add|sp_after_tparen_close=remove|sp_after_tparen_close=force|sp_after_tparen_close=not_defined
-ChoicesReadable="Ignore Sp After Tparen Close|Add Sp After Tparen Close|Remove Sp After Tparen Close|Force Sp After Tparen Close"
-ValueDefault=ignore
-
-[Sp Square Fparen]
-Category=1
-Description="<html>Add or remove space between ']' and '(' when part of a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_square_fparen=ignore|sp_square_fparen=add|sp_square_fparen=remove|sp_square_fparen=force|sp_square_fparen=not_defined
-ChoicesReadable="Ignore Sp Square Fparen|Add Sp Square Fparen|Remove Sp Square Fparen|Force Sp Square Fparen"
-ValueDefault=ignore
-
-[Sp Fparen Brace]
-Category=1
-Description="<html>Add or remove space between ')' and '{' of function.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_fparen_brace=ignore|sp_fparen_brace=add|sp_fparen_brace=remove|sp_fparen_brace=force|sp_fparen_brace=not_defined
-ChoicesReadable="Ignore Sp Fparen Brace|Add Sp Fparen Brace|Remove Sp Fparen Brace|Force Sp Fparen Brace"
-ValueDefault=ignore
-
-[Sp Fparen Brace Initializer]
-Category=1
-Description="<html>Add or remove space between ')' and '{' of a function call in object<br/>initialization.<br/><br/>Overrides sp_fparen_brace.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_fparen_brace_initializer=ignore|sp_fparen_brace_initializer=add|sp_fparen_brace_initializer=remove|sp_fparen_brace_initializer=force|sp_fparen_brace_initializer=not_defined
-ChoicesReadable="Ignore Sp Fparen Brace Initializer|Add Sp Fparen Brace Initializer|Remove Sp Fparen Brace Initializer|Force Sp Fparen Brace Initializer"
-ValueDefault=ignore
-
-[Sp Fparen Dbrace]
-Category=1
-Description="<html>(Java) Add or remove space between ')' and '{{' of double brace initializer.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_fparen_dbrace=ignore|sp_fparen_dbrace=add|sp_fparen_dbrace=remove|sp_fparen_dbrace=force|sp_fparen_dbrace=not_defined
-ChoicesReadable="Ignore Sp Fparen Dbrace|Add Sp Fparen Dbrace|Remove Sp Fparen Dbrace|Force Sp Fparen Dbrace"
-ValueDefault=ignore
-
-[Sp Func Call Paren]
-Category=1
-Description="<html>Add or remove space between function name and '(' on function calls.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_paren=ignore|sp_func_call_paren=add|sp_func_call_paren=remove|sp_func_call_paren=force|sp_func_call_paren=not_defined
-ChoicesReadable="Ignore Sp Func Call Paren|Add Sp Func Call Paren|Remove Sp Func Call Paren|Force Sp Func Call Paren"
-ValueDefault=ignore
-
-[Sp Func Call Paren Empty]
-Category=1
-Description="<html>Add or remove space between function name and '()' on function calls without<br/>parameters. If set to ignore (the default), sp_func_call_paren is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_paren_empty=ignore|sp_func_call_paren_empty=add|sp_func_call_paren_empty=remove|sp_func_call_paren_empty=force|sp_func_call_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Call Paren Empty|Add Sp Func Call Paren Empty|Remove Sp Func Call Paren Empty|Force Sp Func Call Paren Empty"
-ValueDefault=ignore
-
-[Sp Func Call User Paren]
-Category=1
-Description="<html>Add or remove space between the user function name and '(' on function<br/>calls. You need to set a keyword to be a user function in the config file,<br/>like:<br/>  set func_call_user tr _ i18n</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_user_paren=ignore|sp_func_call_user_paren=add|sp_func_call_user_paren=remove|sp_func_call_user_paren=force|sp_func_call_user_paren=not_defined
-ChoicesReadable="Ignore Sp Func Call User Paren|Add Sp Func Call User Paren|Remove Sp Func Call User Paren|Force Sp Func Call User Paren"
-ValueDefault=ignore
-
-[Sp Func Call User Inside Fparen]
-Category=1
-Description="<html>Add or remove space inside user function '(' and ')'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_user_inside_fparen=ignore|sp_func_call_user_inside_fparen=add|sp_func_call_user_inside_fparen=remove|sp_func_call_user_inside_fparen=force|sp_func_call_user_inside_fparen=not_defined
-ChoicesReadable="Ignore Sp Func Call User Inside Fparen|Add Sp Func Call User Inside Fparen|Remove Sp Func Call User Inside Fparen|Force Sp Func Call User Inside Fparen"
-ValueDefault=ignore
-
-[Sp Func Call User Paren Paren]
-Category=1
-Description="<html>Add or remove space between nested parentheses with user functions,<br/>i.e. '((' vs. '( ('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_user_paren_paren=ignore|sp_func_call_user_paren_paren=add|sp_func_call_user_paren_paren=remove|sp_func_call_user_paren_paren=force|sp_func_call_user_paren_paren=not_defined
-ChoicesReadable="Ignore Sp Func Call User Paren Paren|Add Sp Func Call User Paren Paren|Remove Sp Func Call User Paren Paren|Force Sp Func Call User Paren Paren"
-ValueDefault=ignore
-
-[Sp Func Class Paren]
-Category=1
-Description="<html>Add or remove space between a constructor/destructor and the open<br/>parenthesis.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_class_paren=ignore|sp_func_class_paren=add|sp_func_class_paren=remove|sp_func_class_paren=force|sp_func_class_paren=not_defined
-ChoicesReadable="Ignore Sp Func Class Paren|Add Sp Func Class Paren|Remove Sp Func Class Paren|Force Sp Func Class Paren"
-ValueDefault=ignore
-
-[Sp Func Class Paren Empty]
-Category=1
-Description="<html>Add or remove space between a constructor without parameters or destructor<br/>and '()'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_class_paren_empty=ignore|sp_func_class_paren_empty=add|sp_func_class_paren_empty=remove|sp_func_class_paren_empty=force|sp_func_class_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Class Paren Empty|Add Sp Func Class Paren Empty|Remove Sp Func Class Paren Empty|Force Sp Func Class Paren Empty"
-ValueDefault=ignore
-
-[Sp Return Paren]
-Category=1
-Description="<html>Add or remove space between 'return' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_return_paren=ignore|sp_return_paren=add|sp_return_paren=remove|sp_return_paren=force|sp_return_paren=not_defined
-ChoicesReadable="Ignore Sp Return Paren|Add Sp Return Paren|Remove Sp Return Paren|Force Sp Return Paren"
-ValueDefault=ignore
-
-[Sp Return Brace]
-Category=1
-Description="<html>Add or remove space between 'return' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_return_brace=ignore|sp_return_brace=add|sp_return_brace=remove|sp_return_brace=force|sp_return_brace=not_defined
-ChoicesReadable="Ignore Sp Return Brace|Add Sp Return Brace|Remove Sp Return Brace|Force Sp Return Brace"
-ValueDefault=ignore
-
-[Sp Attribute Paren]
-Category=1
-Description="<html>Add or remove space between '__attribute__' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_attribute_paren=ignore|sp_attribute_paren=add|sp_attribute_paren=remove|sp_attribute_paren=force|sp_attribute_paren=not_defined
-ChoicesReadable="Ignore Sp Attribute Paren|Add Sp Attribute Paren|Remove Sp Attribute Paren|Force Sp Attribute Paren"
-ValueDefault=ignore
-
-[Sp Defined Paren]
-Category=1
-Description="<html>Add or remove space between 'defined' and '(' in '#if defined (FOO)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_defined_paren=ignore|sp_defined_paren=add|sp_defined_paren=remove|sp_defined_paren=force|sp_defined_paren=not_defined
-ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren"
-ValueDefault=ignore
-
-[Sp Throw Paren]
-Category=1
-Description="<html>Add or remove space between 'throw' and '(' in 'throw (something)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_throw_paren=ignore|sp_throw_paren=add|sp_throw_paren=remove|sp_throw_paren=force|sp_throw_paren=not_defined
-ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
-ValueDefault=ignore
-
-[Sp After Throw]
-Category=1
-Description="<html>Add or remove space between 'throw' and anything other than '(' as in<br/>'@throw [...];'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_throw=ignore|sp_after_throw=add|sp_after_throw=remove|sp_after_throw=force|sp_after_throw=not_defined
-ChoicesReadable="Ignore Sp After Throw|Add Sp After Throw|Remove Sp After Throw|Force Sp After Throw"
-ValueDefault=ignore
-
-[Sp Catch Paren]
-Category=1
-Description="<html>Add or remove space between 'catch' and '(' in 'catch (something) { }'.<br/>If set to ignore, sp_before_sparen is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_catch_paren=ignore|sp_catch_paren=add|sp_catch_paren=remove|sp_catch_paren=force|sp_catch_paren=not_defined
-ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
-ValueDefault=ignore
-
-[Sp Oc Catch Paren]
-Category=1
-Description="<html>(OC) Add or remove space between '@catch' and '('<br/>in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_catch_paren=ignore|sp_oc_catch_paren=add|sp_oc_catch_paren=remove|sp_oc_catch_paren=force|sp_oc_catch_paren=not_defined
-ChoicesReadable="Ignore Sp Oc Catch Paren|Add Sp Oc Catch Paren|Remove Sp Oc Catch Paren|Force Sp Oc Catch Paren"
-ValueDefault=ignore
-
-[Sp Before Oc Proto List]
-Category=1
-Description="<html>(OC) Add or remove space before Objective-C protocol list<br/>as in '@protocol Protocol&lt;here&gt;&lt;Protocol_A&gt;' or '@interface MyClass : NSObject&lt;here&gt;&lt;MyProtocol&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_proto_list=ignore|sp_before_oc_proto_list=add|sp_before_oc_proto_list=remove|sp_before_oc_proto_list=force|sp_before_oc_proto_list=not_defined
-ChoicesReadable="Ignore Sp Before Oc Proto List|Add Sp Before Oc Proto List|Remove Sp Before Oc Proto List|Force Sp Before Oc Proto List"
-ValueDefault=ignore
-
-[Sp Oc Classname Paren]
-Category=1
-Description="<html>(OC) Add or remove space between class name and '('<br/>in '@interface className(categoryName)&lt;ProtocolName&gt;:BaseClass'</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_classname_paren=ignore|sp_oc_classname_paren=add|sp_oc_classname_paren=remove|sp_oc_classname_paren=force|sp_oc_classname_paren=not_defined
-ChoicesReadable="Ignore Sp Oc Classname Paren|Add Sp Oc Classname Paren|Remove Sp Oc Classname Paren|Force Sp Oc Classname Paren"
-ValueDefault=ignore
-
-[Sp Version Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'version' and '('<br/>in 'version (something) { }'. If set to ignore, sp_before_sparen is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_version_paren=ignore|sp_version_paren=add|sp_version_paren=remove|sp_version_paren=force|sp_version_paren=not_defined
-ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
-ValueDefault=ignore
-
-[Sp Scope Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'scope' and '('<br/>in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_scope_paren=ignore|sp_scope_paren=add|sp_scope_paren=remove|sp_scope_paren=force|sp_scope_paren=not_defined
-ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
-ValueDefault=ignore
-
-[Sp Super Paren]
-Category=1
-Description="<html>Add or remove space between 'super' and '(' in 'super (something)'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_super_paren=ignore|sp_super_paren=add|sp_super_paren=remove|sp_super_paren=force|sp_super_paren=not_defined
-ChoicesReadable="Ignore Sp Super Paren|Add Sp Super Paren|Remove Sp Super Paren|Force Sp Super Paren"
-ValueDefault=remove
-
-[Sp This Paren]
-Category=1
-Description="<html>Add or remove space between 'this' and '(' in 'this (something)'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_this_paren=ignore|sp_this_paren=add|sp_this_paren=remove|sp_this_paren=force|sp_this_paren=not_defined
-ChoicesReadable="Ignore Sp This Paren|Add Sp This Paren|Remove Sp This Paren|Force Sp This Paren"
-ValueDefault=remove
-
-[Sp Macro]
-Category=1
-Description="<html>Add or remove space between a macro name and its definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force|sp_macro=not_defined
-ChoicesReadable="Ignore Sp Macro|Add Sp Macro|Remove Sp Macro|Force Sp Macro"
-ValueDefault=ignore
-
-[Sp Macro Func]
-Category=1
-Description="<html>Add or remove space between a macro function ')' and its definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_macro_func=ignore|sp_macro_func=add|sp_macro_func=remove|sp_macro_func=force|sp_macro_func=not_defined
-ChoicesReadable="Ignore Sp Macro Func|Add Sp Macro Func|Remove Sp Macro Func|Force Sp Macro Func"
-ValueDefault=ignore
-
-[Sp Else Brace]
-Category=1
-Description="<html>Add or remove space between 'else' and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_else_brace=ignore|sp_else_brace=add|sp_else_brace=remove|sp_else_brace=force|sp_else_brace=not_defined
-ChoicesReadable="Ignore Sp Else Brace|Add Sp Else Brace|Remove Sp Else Brace|Force Sp Else Brace"
-ValueDefault=ignore
-
-[Sp Brace Else]
-Category=1
-Description="<html>Add or remove space between '}' and 'else' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_else=ignore|sp_brace_else=add|sp_brace_else=remove|sp_brace_else=force|sp_brace_else=not_defined
-ChoicesReadable="Ignore Sp Brace Else|Add Sp Brace Else|Remove Sp Brace Else|Force Sp Brace Else"
-ValueDefault=ignore
-
-[Sp Brace Typedef]
-Category=1
-Description="<html>Add or remove space between '}' and the name of a typedef on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_typedef=ignore|sp_brace_typedef=add|sp_brace_typedef=remove|sp_brace_typedef=force|sp_brace_typedef=not_defined
-ChoicesReadable="Ignore Sp Brace Typedef|Add Sp Brace Typedef|Remove Sp Brace Typedef|Force Sp Brace Typedef"
-ValueDefault=ignore
-
-[Sp Catch Brace]
-Category=1
-Description="<html>Add or remove space before the '{' of a 'catch' statement, if the '{' and<br/>'catch' are on the same line, as in 'catch (decl) &lt;here&gt; {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force|sp_catch_brace=not_defined
-ChoicesReadable="Ignore Sp Catch Brace|Add Sp Catch Brace|Remove Sp Catch Brace|Force Sp Catch Brace"
-ValueDefault=ignore
-
-[Sp Oc Catch Brace]
-Category=1
-Description="<html>(OC) Add or remove space before the '{' of a '@catch' statement, if the '{'<br/>and '@catch' are on the same line, as in '@catch (decl) &lt;here&gt; {'.<br/>If set to ignore, sp_catch_brace is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_catch_brace=ignore|sp_oc_catch_brace=add|sp_oc_catch_brace=remove|sp_oc_catch_brace=force|sp_oc_catch_brace=not_defined
-ChoicesReadable="Ignore Sp Oc Catch Brace|Add Sp Oc Catch Brace|Remove Sp Oc Catch Brace|Force Sp Oc Catch Brace"
-ValueDefault=ignore
-
-[Sp Brace Catch]
-Category=1
-Description="<html>Add or remove space between '}' and 'catch' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_catch=ignore|sp_brace_catch=add|sp_brace_catch=remove|sp_brace_catch=force|sp_brace_catch=not_defined
-ChoicesReadable="Ignore Sp Brace Catch|Add Sp Brace Catch|Remove Sp Brace Catch|Force Sp Brace Catch"
-ValueDefault=ignore
-
-[Sp Oc Brace Catch]
-Category=1
-Description="<html>(OC) Add or remove space between '}' and '@catch' if on the same line.<br/>If set to ignore, sp_brace_catch is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_brace_catch=ignore|sp_oc_brace_catch=add|sp_oc_brace_catch=remove|sp_oc_brace_catch=force|sp_oc_brace_catch=not_defined
-ChoicesReadable="Ignore Sp Oc Brace Catch|Add Sp Oc Brace Catch|Remove Sp Oc Brace Catch|Force Sp Oc Brace Catch"
-ValueDefault=ignore
-
-[Sp Finally Brace]
-Category=1
-Description="<html>Add or remove space between 'finally' and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_finally_brace=ignore|sp_finally_brace=add|sp_finally_brace=remove|sp_finally_brace=force|sp_finally_brace=not_defined
-ChoicesReadable="Ignore Sp Finally Brace|Add Sp Finally Brace|Remove Sp Finally Brace|Force Sp Finally Brace"
-ValueDefault=ignore
-
-[Sp Brace Finally]
-Category=1
-Description="<html>Add or remove space between '}' and 'finally' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_finally=ignore|sp_brace_finally=add|sp_brace_finally=remove|sp_brace_finally=force|sp_brace_finally=not_defined
-ChoicesReadable="Ignore Sp Brace Finally|Add Sp Brace Finally|Remove Sp Brace Finally|Force Sp Brace Finally"
-ValueDefault=ignore
-
-[Sp Try Brace]
-Category=1
-Description="<html>Add or remove space between 'try' and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_try_brace=ignore|sp_try_brace=add|sp_try_brace=remove|sp_try_brace=force|sp_try_brace=not_defined
-ChoicesReadable="Ignore Sp Try Brace|Add Sp Try Brace|Remove Sp Try Brace|Force Sp Try Brace"
-ValueDefault=ignore
-
-[Sp Getset Brace]
-Category=1
-Description="<html>Add or remove space between get/set and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_getset_brace=ignore|sp_getset_brace=add|sp_getset_brace=remove|sp_getset_brace=force|sp_getset_brace=not_defined
-ChoicesReadable="Ignore Sp Getset Brace|Add Sp Getset Brace|Remove Sp Getset Brace|Force Sp Getset Brace"
-ValueDefault=ignore
-
-[Sp Word Brace Init Lst]
-Category=1
-Description="<html>Add or remove space between a variable and '{' for C++ uniform<br/>initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_word_brace_init_lst=ignore|sp_word_brace_init_lst=add|sp_word_brace_init_lst=remove|sp_word_brace_init_lst=force|sp_word_brace_init_lst=not_defined
-ChoicesReadable="Ignore Sp Word Brace Init Lst|Add Sp Word Brace Init Lst|Remove Sp Word Brace Init Lst|Force Sp Word Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Word Brace Ns]
-Category=1
-Description="<html>Add or remove space between a variable and '{' for a namespace.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_word_brace_ns=ignore|sp_word_brace_ns=add|sp_word_brace_ns=remove|sp_word_brace_ns=force|sp_word_brace_ns=not_defined
-ChoicesReadable="Ignore Sp Word Brace Ns|Add Sp Word Brace Ns|Remove Sp Word Brace Ns|Force Sp Word Brace Ns"
-ValueDefault=add
-
-[Sp Before Dc]
-Category=1
-Description="<html>Add or remove space before the '::' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_dc=ignore|sp_before_dc=add|sp_before_dc=remove|sp_before_dc=force|sp_before_dc=not_defined
-ChoicesReadable="Ignore Sp Before Dc|Add Sp Before Dc|Remove Sp Before Dc|Force Sp Before Dc"
-ValueDefault=ignore
-
-[Sp After Dc]
-Category=1
-Description="<html>Add or remove space after the '::' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_dc=ignore|sp_after_dc=add|sp_after_dc=remove|sp_after_dc=force|sp_after_dc=not_defined
-ChoicesReadable="Ignore Sp After Dc|Add Sp After Dc|Remove Sp After Dc|Force Sp After Dc"
-ValueDefault=ignore
-
-[Sp D Array Colon]
-Category=1
-Description="<html>(D) Add or remove around the D named array initializer ':' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_d_array_colon=ignore|sp_d_array_colon=add|sp_d_array_colon=remove|sp_d_array_colon=force|sp_d_array_colon=not_defined
-ChoicesReadable="Ignore Sp D Array Colon|Add Sp D Array Colon|Remove Sp D Array Colon|Force Sp D Array Colon"
-ValueDefault=ignore
-
-[Sp Not]
-Category=1
-Description="<html>Add or remove space after the '!' (not) unary operator.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force|sp_not=not_defined
-ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
-ValueDefault=remove
-
-[Sp Inv]
-Category=1
-Description="<html>Add or remove space after the '~' (invert) unary operator.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force|sp_inv=not_defined
-ChoicesReadable="Ignore Sp Inv|Add Sp Inv|Remove Sp Inv|Force Sp Inv"
-ValueDefault=remove
-
-[Sp Addr]
-Category=1
-Description="<html>Add or remove space after the '&amp;' (address-of) unary operator. This does not<br/>affect the spacing after a '&amp;' that is part of a type.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force|sp_addr=not_defined
-ChoicesReadable="Ignore Sp Addr|Add Sp Addr|Remove Sp Addr|Force Sp Addr"
-ValueDefault=remove
-
-[Sp Member]
-Category=1
-Description="<html>Add or remove space around the '.' or '-&gt;' operators.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force|sp_member=not_defined
-ChoicesReadable="Ignore Sp Member|Add Sp Member|Remove Sp Member|Force Sp Member"
-ValueDefault=remove
-
-[Sp Deref]
-Category=1
-Description="<html>Add or remove space after the '*' (dereference) unary operator. This does<br/>not affect the spacing after a '*' that is part of a type.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force|sp_deref=not_defined
-ChoicesReadable="Ignore Sp Deref|Add Sp Deref|Remove Sp Deref|Force Sp Deref"
-ValueDefault=remove
-
-[Sp Sign]
-Category=1
-Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force|sp_sign=not_defined
-ChoicesReadable="Ignore Sp Sign|Add Sp Sign|Remove Sp Sign|Force Sp Sign"
-ValueDefault=remove
-
-[Sp Incdec]
-Category=1
-Description="<html>Add or remove space between '++' and '--' the word to which it is being<br/>applied, as in '(--x)' or 'y++;'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force|sp_incdec=not_defined
-ChoicesReadable="Ignore Sp Incdec|Add Sp Incdec|Remove Sp Incdec|Force Sp Incdec"
-ValueDefault=remove
-
-[Sp Before Nl Cont]
-Category=1
-Description="<html>Add or remove space before a backslash-newline at the end of a line.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_nl_cont=ignore|sp_before_nl_cont=add|sp_before_nl_cont=remove|sp_before_nl_cont=force|sp_before_nl_cont=not_defined
-ChoicesReadable="Ignore Sp Before Nl Cont|Add Sp Before Nl Cont|Remove Sp Before Nl Cont|Force Sp Before Nl Cont"
-ValueDefault=add
-
-[Sp After Oc Scope]
-Category=1
-Description="<html>(OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'<br/>or '+(int) bar;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_scope=ignore|sp_after_oc_scope=add|sp_after_oc_scope=remove|sp_after_oc_scope=force|sp_after_oc_scope=not_defined
-ChoicesReadable="Ignore Sp After Oc Scope|Add Sp After Oc Scope|Remove Sp After Oc Scope|Force Sp After Oc Scope"
-ValueDefault=ignore
-
-[Sp After Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space after the colon in message specs,<br/>i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_colon=ignore|sp_after_oc_colon=add|sp_after_oc_colon=remove|sp_after_oc_colon=force|sp_after_oc_colon=not_defined
-ChoicesReadable="Ignore Sp After Oc Colon|Add Sp After Oc Colon|Remove Sp After Oc Colon|Force Sp After Oc Colon"
-ValueDefault=ignore
-
-[Sp Before Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space before the colon in message specs,<br/>i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_colon=ignore|sp_before_oc_colon=add|sp_before_oc_colon=remove|sp_before_oc_colon=force|sp_before_oc_colon=not_defined
-ChoicesReadable="Ignore Sp Before Oc Colon|Add Sp Before Oc Colon|Remove Sp Before Oc Colon|Force Sp Before Oc Colon"
-ValueDefault=ignore
-
-[Sp After Oc Dict Colon]
-Category=1
-Description="<html>(OC) Add or remove space after the colon in immutable dictionary expression<br/>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_dict_colon=ignore|sp_after_oc_dict_colon=add|sp_after_oc_dict_colon=remove|sp_after_oc_dict_colon=force|sp_after_oc_dict_colon=not_defined
-ChoicesReadable="Ignore Sp After Oc Dict Colon|Add Sp After Oc Dict Colon|Remove Sp After Oc Dict Colon|Force Sp After Oc Dict Colon"
-ValueDefault=ignore
-
-[Sp Before Oc Dict Colon]
-Category=1
-Description="<html>(OC) Add or remove space before the colon in immutable dictionary expression<br/>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_dict_colon=ignore|sp_before_oc_dict_colon=add|sp_before_oc_dict_colon=remove|sp_before_oc_dict_colon=force|sp_before_oc_dict_colon=not_defined
-ChoicesReadable="Ignore Sp Before Oc Dict Colon|Add Sp Before Oc Dict Colon|Remove Sp Before Oc Dict Colon|Force Sp Before Oc Dict Colon"
-ValueDefault=ignore
-
-[Sp After Send Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space after the colon in message specs,<br/>i.e. '[object setValue:1];' vs. '[object setValue: 1];'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_send_oc_colon=ignore|sp_after_send_oc_colon=add|sp_after_send_oc_colon=remove|sp_after_send_oc_colon=force|sp_after_send_oc_colon=not_defined
-ChoicesReadable="Ignore Sp After Send Oc Colon|Add Sp After Send Oc Colon|Remove Sp After Send Oc Colon|Force Sp After Send Oc Colon"
-ValueDefault=ignore
-
-[Sp Before Send Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space before the colon in message specs,<br/>i.e. '[object setValue:1];' vs. '[object setValue :1];'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_send_oc_colon=ignore|sp_before_send_oc_colon=add|sp_before_send_oc_colon=remove|sp_before_send_oc_colon=force|sp_before_send_oc_colon=not_defined
-ChoicesReadable="Ignore Sp Before Send Oc Colon|Add Sp Before Send Oc Colon|Remove Sp Before Send Oc Colon|Force Sp Before Send Oc Colon"
-ValueDefault=ignore
-
-[Sp After Oc Type]
-Category=1
-Description="<html>(OC) Add or remove space after the (type) in message specs,<br/>i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force|sp_after_oc_type=not_defined
-ChoicesReadable="Ignore Sp After Oc Type|Add Sp After Oc Type|Remove Sp After Oc Type|Force Sp After Oc Type"
-ValueDefault=ignore
-
-[Sp After Oc Return Type]
-Category=1
-Description="<html>(OC) Add or remove space after the first (type) in message specs,<br/>i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_return_type=ignore|sp_after_oc_return_type=add|sp_after_oc_return_type=remove|sp_after_oc_return_type=force|sp_after_oc_return_type=not_defined
-ChoicesReadable="Ignore Sp After Oc Return Type|Add Sp After Oc Return Type|Remove Sp After Oc Return Type|Force Sp After Oc Return Type"
-ValueDefault=ignore
-
-[Sp After Oc At Sel]
-Category=1
-Description="<html>(OC) Add or remove space between '@selector' and '(',<br/>i.e. '@selector(msgName)' vs. '@selector (msgName)'.<br/>Also applies to '@protocol()' constructs.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_at_sel=ignore|sp_after_oc_at_sel=add|sp_after_oc_at_sel=remove|sp_after_oc_at_sel=force|sp_after_oc_at_sel=not_defined
-ChoicesReadable="Ignore Sp After Oc At Sel|Add Sp After Oc At Sel|Remove Sp After Oc At Sel|Force Sp After Oc At Sel"
-ValueDefault=ignore
-
-[Sp After Oc At Sel Parens]
-Category=1
-Description="<html>(OC) Add or remove space between '@selector(x)' and the following word,<br/>i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_at_sel_parens=ignore|sp_after_oc_at_sel_parens=add|sp_after_oc_at_sel_parens=remove|sp_after_oc_at_sel_parens=force|sp_after_oc_at_sel_parens=not_defined
-ChoicesReadable="Ignore Sp After Oc At Sel Parens|Add Sp After Oc At Sel Parens|Remove Sp After Oc At Sel Parens|Force Sp After Oc At Sel Parens"
-ValueDefault=ignore
-
-[Sp Inside Oc At Sel Parens]
-Category=1
-Description="<html>(OC) Add or remove space inside '@selector' parentheses,<br/>i.e. '@selector(foo)' vs. '@selector( foo )'.<br/>Also applies to '@protocol()' constructs.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_oc_at_sel_parens=ignore|sp_inside_oc_at_sel_parens=add|sp_inside_oc_at_sel_parens=remove|sp_inside_oc_at_sel_parens=force|sp_inside_oc_at_sel_parens=not_defined
-ChoicesReadable="Ignore Sp Inside Oc At Sel Parens|Add Sp Inside Oc At Sel Parens|Remove Sp Inside Oc At Sel Parens|Force Sp Inside Oc At Sel Parens"
-ValueDefault=ignore
-
-[Sp Before Oc Block Caret]
-Category=1
-Description="<html>(OC) Add or remove space before a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_block_caret=ignore|sp_before_oc_block_caret=add|sp_before_oc_block_caret=remove|sp_before_oc_block_caret=force|sp_before_oc_block_caret=not_defined
-ChoicesReadable="Ignore Sp Before Oc Block Caret|Add Sp Before Oc Block Caret|Remove Sp Before Oc Block Caret|Force Sp Before Oc Block Caret"
-ValueDefault=ignore
-
-[Sp After Oc Block Caret]
-Category=1
-Description="<html>(OC) Add or remove space after a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_block_caret=ignore|sp_after_oc_block_caret=add|sp_after_oc_block_caret=remove|sp_after_oc_block_caret=force|sp_after_oc_block_caret=not_defined
-ChoicesReadable="Ignore Sp After Oc Block Caret|Add Sp After Oc Block Caret|Remove Sp After Oc Block Caret|Force Sp After Oc Block Caret"
-ValueDefault=ignore
-
-[Sp After Oc Msg Receiver]
-Category=1
-Description="<html>(OC) Add or remove space between the receiver and selector in a message,<br/>as in '[receiver selector ...]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_msg_receiver=ignore|sp_after_oc_msg_receiver=add|sp_after_oc_msg_receiver=remove|sp_after_oc_msg_receiver=force|sp_after_oc_msg_receiver=not_defined
-ChoicesReadable="Ignore Sp After Oc Msg Receiver|Add Sp After Oc Msg Receiver|Remove Sp After Oc Msg Receiver|Force Sp After Oc Msg Receiver"
-ValueDefault=ignore
-
-[Sp After Oc Property]
-Category=1
-Description="<html>(OC) Add or remove space after '@property'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_property=ignore|sp_after_oc_property=add|sp_after_oc_property=remove|sp_after_oc_property=force|sp_after_oc_property=not_defined
-ChoicesReadable="Ignore Sp After Oc Property|Add Sp After Oc Property|Remove Sp After Oc Property|Force Sp After Oc Property"
-ValueDefault=ignore
-
-[Sp After Oc Synchronized]
-Category=1
-Description="<html>(OC) Add or remove space between '@synchronized' and the open parenthesis,<br/>i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_synchronized=ignore|sp_after_oc_synchronized=add|sp_after_oc_synchronized=remove|sp_after_oc_synchronized=force|sp_after_oc_synchronized=not_defined
-ChoicesReadable="Ignore Sp After Oc Synchronized|Add Sp After Oc Synchronized|Remove Sp After Oc Synchronized|Force Sp After Oc Synchronized"
-ValueDefault=ignore
-
-[Sp Cond Colon]
-Category=1
-Description="<html>Add or remove space around the ':' in 'b ? t : f'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_colon=ignore|sp_cond_colon=add|sp_cond_colon=remove|sp_cond_colon=force|sp_cond_colon=not_defined
-ChoicesReadable="Ignore Sp Cond Colon|Add Sp Cond Colon|Remove Sp Cond Colon|Force Sp Cond Colon"
-ValueDefault=ignore
-
-[Sp Cond Colon Before]
-Category=1
-Description="<html>Add or remove space before the ':' in 'b ? t : f'.<br/><br/>Overrides sp_cond_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_colon_before=ignore|sp_cond_colon_before=add|sp_cond_colon_before=remove|sp_cond_colon_before=force|sp_cond_colon_before=not_defined
-ChoicesReadable="Ignore Sp Cond Colon Before|Add Sp Cond Colon Before|Remove Sp Cond Colon Before|Force Sp Cond Colon Before"
-ValueDefault=ignore
-
-[Sp Cond Colon After]
-Category=1
-Description="<html>Add or remove space after the ':' in 'b ? t : f'.<br/><br/>Overrides sp_cond_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_colon_after=ignore|sp_cond_colon_after=add|sp_cond_colon_after=remove|sp_cond_colon_after=force|sp_cond_colon_after=not_defined
-ChoicesReadable="Ignore Sp Cond Colon After|Add Sp Cond Colon After|Remove Sp Cond Colon After|Force Sp Cond Colon After"
-ValueDefault=ignore
-
-[Sp Cond Question]
-Category=1
-Description="<html>Add or remove space around the '?' in 'b ? t : f'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_question=ignore|sp_cond_question=add|sp_cond_question=remove|sp_cond_question=force|sp_cond_question=not_defined
-ChoicesReadable="Ignore Sp Cond Question|Add Sp Cond Question|Remove Sp Cond Question|Force Sp Cond Question"
-ValueDefault=ignore
-
-[Sp Cond Question Before]
-Category=1
-Description="<html>Add or remove space before the '?' in 'b ? t : f'.<br/><br/>Overrides sp_cond_question.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_question_before=ignore|sp_cond_question_before=add|sp_cond_question_before=remove|sp_cond_question_before=force|sp_cond_question_before=not_defined
-ChoicesReadable="Ignore Sp Cond Question Before|Add Sp Cond Question Before|Remove Sp Cond Question Before|Force Sp Cond Question Before"
-ValueDefault=ignore
-
-[Sp Cond Question After]
-Category=1
-Description="<html>Add or remove space after the '?' in 'b ? t : f'.<br/><br/>Overrides sp_cond_question.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_question_after=ignore|sp_cond_question_after=add|sp_cond_question_after=remove|sp_cond_question_after=force|sp_cond_question_after=not_defined
-ChoicesReadable="Ignore Sp Cond Question After|Add Sp Cond Question After|Remove Sp Cond Question After|Force Sp Cond Question After"
-ValueDefault=ignore
-
-[Sp Cond Ternary Short]
-Category=1
-Description="<html>In the abbreviated ternary form '(a ?: b)', add or remove space between '?'<br/>and ':'.<br/><br/>Overrides all other sp_cond_* options.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_ternary_short=ignore|sp_cond_ternary_short=add|sp_cond_ternary_short=remove|sp_cond_ternary_short=force|sp_cond_ternary_short=not_defined
-ChoicesReadable="Ignore Sp Cond Ternary Short|Add Sp Cond Ternary Short|Remove Sp Cond Ternary Short|Force Sp Cond Ternary Short"
-ValueDefault=ignore
-
-[Sp Case Label]
-Category=1
-Description="<html>Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make<br/>sense here.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_case_label=ignore|sp_case_label=add|sp_case_label=remove|sp_case_label=force|sp_case_label=not_defined
-ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label"
-ValueDefault=ignore
-
-[Sp Range]
-Category=1
-Description="<html>(D) Add or remove space around the D '..' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_range=ignore|sp_range=add|sp_range=remove|sp_range=force|sp_range=not_defined
-ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range"
-ValueDefault=ignore
-
-[Sp After For Colon]
-Category=1
-Description="<html>Add or remove space after ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var : &lt;here&gt; expr)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_for_colon=ignore|sp_after_for_colon=add|sp_after_for_colon=remove|sp_after_for_colon=force|sp_after_for_colon=not_defined
-ChoicesReadable="Ignore Sp After For Colon|Add Sp After For Colon|Remove Sp After For Colon|Force Sp After For Colon"
-ValueDefault=ignore
-
-[Sp Before For Colon]
-Category=1
-Description="<html>Add or remove space before ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var &lt;here&gt; : expr)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_for_colon=ignore|sp_before_for_colon=add|sp_before_for_colon=remove|sp_before_for_colon=force|sp_before_for_colon=not_defined
-ChoicesReadable="Ignore Sp Before For Colon|Add Sp Before For Colon|Remove Sp Before For Colon|Force Sp Before For Colon"
-ValueDefault=ignore
-
-[Sp Extern Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'extern' and '(' as in 'extern &lt;here&gt; (C)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_extern_paren=ignore|sp_extern_paren=add|sp_extern_paren=remove|sp_extern_paren=force|sp_extern_paren=not_defined
-ChoicesReadable="Ignore Sp Extern Paren|Add Sp Extern Paren|Remove Sp Extern Paren|Force Sp Extern Paren"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Start]
-Category=1
-Description="<html>Add or remove space after the opening of a C++ comment, as in '// &lt;here&gt; A'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cmt_cpp_start=ignore|sp_cmt_cpp_start=add|sp_cmt_cpp_start=remove|sp_cmt_cpp_start=force|sp_cmt_cpp_start=not_defined
-ChoicesReadable="Ignore Sp Cmt Cpp Start|Add Sp Cmt Cpp Start|Remove Sp Cmt Cpp Start|Force Sp Cmt Cpp Start"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Region]
-Category=1
-Description="<html>Add or remove space in a C++ region marker comment, as in '// &lt;here&gt; BEGIN'.<br/>A region marker is defined as a comment which is not preceded by other text<br/>(i.e. the comment is the first non-whitespace on the line), and which starts<br/>with either 'BEGIN' or 'END'.<br/><br/>Overrides sp_cmt_cpp_start.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cmt_cpp_region=ignore|sp_cmt_cpp_region=add|sp_cmt_cpp_region=remove|sp_cmt_cpp_region=force|sp_cmt_cpp_region=not_defined
-ChoicesReadable="Ignore Sp Cmt Cpp Region|Add Sp Cmt Cpp Region|Remove Sp Cmt Cpp Region|Force Sp Cmt Cpp Region"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Doxygen]
-Category=1
-Description="<html>If true, space added with sp_cmt_cpp_start will be added after Doxygen<br/>sequences like '///', '///&lt;', '//!' and '//!&lt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_cmt_cpp_doxygen=true|sp_cmt_cpp_doxygen=false
-ValueDefault=false
-
-[Sp Cmt Cpp Qttr]
-Category=1
-Description="<html>If true, space added with sp_cmt_cpp_start will be added after Qt translator<br/>or meta-data comments like '//:', '//=', and '//~'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_cmt_cpp_qttr=true|sp_cmt_cpp_qttr=false
-ValueDefault=false
-
-[Sp Endif Cmt]
-Category=1
-Description="<html>Add or remove space between #else or #endif and a trailing comment.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_endif_cmt=ignore|sp_endif_cmt=add|sp_endif_cmt=remove|sp_endif_cmt=force|sp_endif_cmt=not_defined
-ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
-ValueDefault=ignore
-
-[Sp After New]
-Category=1
-Description="<html>Add or remove space after 'new', 'delete' and 'delete[]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_new=ignore|sp_after_new=add|sp_after_new=remove|sp_after_new=force|sp_after_new=not_defined
-ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
-ValueDefault=ignore
-
-[Sp Between New Paren]
-Category=1
-Description="<html>Add or remove space between 'new' and '(' in 'new()'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_between_new_paren=ignore|sp_between_new_paren=add|sp_between_new_paren=remove|sp_between_new_paren=force|sp_between_new_paren=not_defined
-ChoicesReadable="Ignore Sp Between New Paren|Add Sp Between New Paren|Remove Sp Between New Paren|Force Sp Between New Paren"
-ValueDefault=ignore
-
-[Sp After Newop Paren]
-Category=1
-Description="<html>Add or remove space between ')' and type in 'new(foo) BAR'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_newop_paren=ignore|sp_after_newop_paren=add|sp_after_newop_paren=remove|sp_after_newop_paren=force|sp_after_newop_paren=not_defined
-ChoicesReadable="Ignore Sp After Newop Paren|Add Sp After Newop Paren|Remove Sp After Newop Paren|Force Sp After Newop Paren"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren]
-Category=1
-Description="<html>Add or remove space inside parenthesis of the new operator<br/>as in 'new(foo) BAR'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_newop_paren=ignore|sp_inside_newop_paren=add|sp_inside_newop_paren=remove|sp_inside_newop_paren=force|sp_inside_newop_paren=not_defined
-ChoicesReadable="Ignore Sp Inside Newop Paren|Add Sp Inside Newop Paren|Remove Sp Inside Newop Paren|Force Sp Inside Newop Paren"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren Open]
-Category=1
-Description="<html>Add or remove space after the open parenthesis of the new operator,<br/>as in 'new(foo) BAR'.<br/><br/>Overrides sp_inside_newop_paren.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_newop_paren_open=ignore|sp_inside_newop_paren_open=add|sp_inside_newop_paren_open=remove|sp_inside_newop_paren_open=force|sp_inside_newop_paren_open=not_defined
-ChoicesReadable="Ignore Sp Inside Newop Paren Open|Add Sp Inside Newop Paren Open|Remove Sp Inside Newop Paren Open|Force Sp Inside Newop Paren Open"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren Close]
-Category=1
-Description="<html>Add or remove space before the close parenthesis of the new operator,<br/>as in 'new(foo) BAR'.<br/><br/>Overrides sp_inside_newop_paren.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_newop_paren_close=ignore|sp_inside_newop_paren_close=add|sp_inside_newop_paren_close=remove|sp_inside_newop_paren_close=force|sp_inside_newop_paren_close=not_defined
-ChoicesReadable="Ignore Sp Inside Newop Paren Close|Add Sp Inside Newop Paren Close|Remove Sp Inside Newop Paren Close|Force Sp Inside Newop Paren Close"
-ValueDefault=ignore
-
-[Sp Before Tr Emb Cmt]
-Category=1
-Description="<html>Add or remove space before a trailing or embedded comment.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_tr_emb_cmt=ignore|sp_before_tr_emb_cmt=add|sp_before_tr_emb_cmt=remove|sp_before_tr_emb_cmt=force|sp_before_tr_emb_cmt=not_defined
-ChoicesReadable="Ignore Sp Before Tr Emb Cmt|Add Sp Before Tr Emb Cmt|Remove Sp Before Tr Emb Cmt|Force Sp Before Tr Emb Cmt"
-ValueDefault=ignore
-
-[Sp Num Before Tr Emb Cmt]
-Category=1
-Description="<html>Number of spaces before a trailing or embedded comment.</html>"
-Enabled=false
-EditorType=numeric
-CallName="sp_num_before_tr_emb_cmt="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Sp Annotation Paren]
-Category=1
-Description="<html>(Java) Add or remove space between an annotation and the open parenthesis.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_annotation_paren=ignore|sp_annotation_paren=add|sp_annotation_paren=remove|sp_annotation_paren=force|sp_annotation_paren=not_defined
-ChoicesReadable="Ignore Sp Annotation Paren|Add Sp Annotation Paren|Remove Sp Annotation Paren|Force Sp Annotation Paren"
-ValueDefault=ignore
-
-[Sp Skip Vbrace Tokens]
-Category=1
-Description="<html>If true, vbrace tokens are dropped to the previous token and skipped.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_skip_vbrace_tokens=true|sp_skip_vbrace_tokens=false
-ValueDefault=false
-
-[Sp After Noexcept]
-Category=1
-Description="<html>Add or remove space after 'noexcept'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_noexcept=ignore|sp_after_noexcept=add|sp_after_noexcept=remove|sp_after_noexcept=force|sp_after_noexcept=not_defined
-ChoicesReadable="Ignore Sp After Noexcept|Add Sp After Noexcept|Remove Sp After Noexcept|Force Sp After Noexcept"
-ValueDefault=ignore
-
-[Sp Vala After Translation]
-Category=1
-Description="<html>Add or remove space after '_'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_vala_after_translation=ignore|sp_vala_after_translation=add|sp_vala_after_translation=remove|sp_vala_after_translation=force|sp_vala_after_translation=not_defined
-ChoicesReadable="Ignore Sp Vala After Translation|Add Sp Vala After Translation|Remove Sp Vala After Translation|Force Sp Vala After Translation"
-ValueDefault=ignore
-
-[Force Tab After Define]
-Category=1
-Description="<html>If true, a &lt;TAB&gt; is inserted after #define.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=force_tab_after_define=true|force_tab_after_define=false
-ValueDefault=false
-
-[Indent Columns]
-Category=2
-Description="<html>The number of columns to indent per level. Usually 2, 3, 4, or 8.<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_columns="
-MinVal=0
-MaxVal=16
-ValueDefault=8
-
-[Indent Continue]
-Category=2
-Description="<html>The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_continue="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Continue Class Head]
-Category=2
-Description="<html>The continuation indent, only for class header line(s). If non-zero, this<br/>overrides the indent of 'class' continuation indents.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_continue_class_head="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Single Newlines]
-Category=2
-Description="<html>Whether to indent empty lines (i.e. lines which contain only spaces before<br/>the newline character).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_single_newlines=true|indent_single_newlines=false
-ValueDefault=false
-
-[Indent Param]
-Category=2
-Description="<html>The continuation indent for func_*_param if they are true. If non-zero, this<br/>overrides the indent.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_param="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent With Tabs]
-Category=2
-Description="<html>How to use tabs when indenting code.<br/><br/>0: Spaces only<br/>1: Indent with tabs to brace level, align with spaces (default)<br/>2: Indent and align with tabs, using spaces when not on a tabstop<br/><br/>Default: 1</html>"
-Enabled=true
-EditorType=multiple
-Choices="indent_with_tabs=0|indent_with_tabs=1|indent_with_tabs=2"
-ChoicesReadable="Spaces only|Indent with tabs, align with spaces|Indent and align with tabs"
-ValueDefault=1
-
-[Indent Cmt With Tabs]
-Category=2
-Description="<html>Whether to indent comments that are not at a brace level with tabs on a<br/>tabstop. Requires indent_with_tabs=2. If false, will use spaces.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cmt_with_tabs=true|indent_cmt_with_tabs=false
-ValueDefault=false
-
-[Indent Align String]
-Category=2
-Description="<html>Whether to indent strings broken by '\' so that they line up.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_string=true|indent_align_string=false
-ValueDefault=false
-
-[Indent Xml String]
-Category=2
-Description="<html>The number of spaces to indent multi-line XML strings.<br/>Requires indent_align_string=true.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_xml_string="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Brace]
-Category=2
-Description="<html>Spaces to indent '{' from level.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_brace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Braces]
-Category=2
-Description="<html>Whether braces are indented to the body level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces=true|indent_braces=false
-ValueDefault=false
-
-[Indent Braces No Func]
-Category=2
-Description="<html>Whether to disable indenting function braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_func=true|indent_braces_no_func=false
-ValueDefault=false
-
-[Indent Braces No Class]
-Category=2
-Description="<html>Whether to disable indenting class braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_class=true|indent_braces_no_class=false
-ValueDefault=false
-
-[Indent Braces No Struct]
-Category=2
-Description="<html>Whether to disable indenting struct braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_struct=true|indent_braces_no_struct=false
-ValueDefault=false
-
-[Indent Brace Parent]
-Category=2
-Description="<html>Whether to indent based on the size of the brace parent,<br/>i.e. 'if' =&gt; 3 spaces, 'for' =&gt; 4 spaces, etc.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_brace_parent=true|indent_brace_parent=false
-ValueDefault=false
-
-[Indent Paren Open Brace]
-Category=2
-Description="<html>Whether to indent based on the open parenthesis instead of the open brace<br/>in '({\n'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_open_brace=true|indent_paren_open_brace=false
-ValueDefault=false
-
-[Indent Cs Delegate Brace]
-Category=2
-Description="<html>(C#) Whether to indent the brace of a C# delegate by another level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cs_delegate_brace=true|indent_cs_delegate_brace=false
-ValueDefault=false
-
-[Indent Cs Delegate Body]
-Category=2
-Description="<html>(C#) Whether to indent a C# delegate (to handle delegates with no brace) by<br/>another level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cs_delegate_body=true|indent_cs_delegate_body=false
-ValueDefault=false
-
-[Indent Namespace]
-Category=2
-Description="<html>Whether to indent the body of a 'namespace'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_namespace=true|indent_namespace=false
-ValueDefault=false
-
-[Indent Namespace Single Indent]
-Category=2
-Description="<html>Whether to indent only the first namespace, and not any nested namespaces.<br/>Requires indent_namespace=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_namespace_single_indent=true|indent_namespace_single_indent=false
-ValueDefault=false
-
-[Indent Namespace Level]
-Category=2
-Description="<html>The number of spaces to indent a namespace block.<br/>If set to zero, use the value indent_columns</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_namespace_level="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Namespace Limit]
-Category=2
-Description="<html>If the body of the namespace is longer than this number, it won't be<br/>indented. Requires indent_namespace=true. 0 means no limit.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_namespace_limit="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Indent Extern]
-Category=2
-Description="<html>Whether the 'extern "C"' body is indented.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_extern=true|indent_extern=false
-ValueDefault=false
-
-[Indent Class]
-Category=2
-Description="<html>Whether the 'class' body is indented.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class=true|indent_class=false
-ValueDefault=false
-
-[Indent Before Class Colon]
-Category=2
-Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires a newline break before colon (see pos_class_colon<br/>and nl_class_colon)</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_before_class_colon="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Class Colon]
-Category=2
-Description="<html>Whether to indent the stuff after a leading base class colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class_colon=true|indent_class_colon=false
-ValueDefault=false
-
-[Indent Class On Colon]
-Category=2
-Description="<html>Whether to indent based on a class colon instead of the stuff after the<br/>colon. Requires indent_class_colon=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false
-ValueDefault=false
-
-[Indent Constr Colon]
-Category=2
-Description="<html>Whether to indent the stuff after a leading class initializer colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_constr_colon=true|indent_constr_colon=false
-ValueDefault=false
-
-[Indent Ctor Init Leading]
-Category=2
-Description="<html>Virtual indent from the ':' for member initializers.<br/><br/>Default: 2</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ctor_init_leading="
-MinVal=0
-MaxVal=16
-ValueDefault=2
-
-[Indent Ctor Init]
-Category=2
-Description="<html>Additional indent for constructor initializer list.<br/>Negative values decrease indent down to the first column.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ctor_init="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Else If]
-Category=2
-Description="<html>Whether to indent 'if' following 'else' as a new block under the 'else'.<br/>If false, 'else\nif' is treated as 'else if' for indenting purposes.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_else_if=true|indent_else_if=false
-ValueDefault=false
-
-[Indent Var Def Blk]
-Category=2
-Description="<html>Amount to indent variable declarations after a open brace.<br/><br/> &lt;0: Relative<br/>&gt;=0: Absolute</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_var_def_blk="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Var Def Cont]
-Category=2
-Description="<html>Whether to indent continued variable declarations instead of aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_var_def_cont=true|indent_var_def_cont=false
-ValueDefault=false
-
-[Indent Shift]
-Category=2
-Description="<html>Whether to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;') instead of<br/>aligning. Set align_left_shift=false when enabling this.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_shift=true|indent_shift=false
-ValueDefault=false
-
-[Indent Func Def Force Col1]
-Category=2
-Description="<html>Whether to force indentation of function definitions to start in column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_def_force_col1=true|indent_func_def_force_col1=false
-ValueDefault=false
-
-[Indent Func Call Param]
-Category=2
-Description="<html>Whether to indent continued function call parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_call_param=true|indent_func_call_param=false
-ValueDefault=false
-
-[Indent Func Def Param]
-Category=2
-Description="<html>Whether to indent continued function definition parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_def_param=true|indent_func_def_param=false
-ValueDefault=false
-
-[Indent Func Def Param Paren Pos Threshold]
-Category=2
-Description="<html>for function definitions, only if indent_func_def_param is false<br/>Allows to align params when appropriate and indent them when not<br/>behave as if it was true if paren position is more than this value<br/>if paren position is more than the option value</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_def_param_paren_pos_threshold="
-MinVal=0
-MaxVal=160
-ValueDefault=0
-
-[Indent Func Proto Param]
-Category=2
-Description="<html>Whether to indent continued function call prototype one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_proto_param=true|indent_func_proto_param=false
-ValueDefault=false
-
-[Indent Func Class Param]
-Category=2
-Description="<html>Whether to indent continued function call declaration one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_class_param=true|indent_func_class_param=false
-ValueDefault=false
-
-[Indent Func Ctor Var Param]
-Category=2
-Description="<html>Whether to indent continued class variable constructors one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_ctor_var_param=true|indent_func_ctor_var_param=false
-ValueDefault=false
-
-[Indent Template Param]
-Category=2
-Description="<html>Whether to indent continued template parameter list one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_template_param=true|indent_template_param=false
-ValueDefault=false
-
-[Indent Func Param Double]
-Category=2
-Description="<html>Double the indent for indent_func_xxx_param options.<br/>Use both values of the options indent_columns and indent_param.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_param_double=true|indent_func_param_double=false
-ValueDefault=false
-
-[Indent Func Const]
-Category=2
-Description="<html>Indentation column for standalone 'const' qualifier on a function<br/>prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_const="
-MinVal=0
-MaxVal=69
-ValueDefault=0
-
-[Indent Func Throw]
-Category=2
-Description="<html>Indentation column for standalone 'throw' qualifier on a function<br/>prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_throw="
-MinVal=0
-MaxVal=41
-ValueDefault=0
-
-[Indent Macro Brace]
-Category=2
-Description="<html>How to indent within a macro followed by a brace on the same line<br/>This allows reducing the indent in macros that have (for example)<br/>`do { ... } while (0)` blocks bracketing them.<br/><br/>true:  add an indent for the brace on the same line as the macro<br/>false: do not add an indent for the brace on the same line as the macro<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_macro_brace=true|indent_macro_brace=false
-ValueDefault=true
-
-[Indent Member]
-Category=2
-Description="<html>The number of spaces to indent a continued '-&gt;' or '.'.<br/>Usually set to 0, 1, or indent_columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_member="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Member Single]
-Category=2
-Description="<html>Whether lines broken at '.' or '-&gt;' should be indented by a single indent.<br/>The indent_member option will not be effective if this is set to true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_member_single=true|indent_member_single=false
-ValueDefault=false
-
-[Indent Sing Line Comments]
-Category=2
-Description="<html>Spaces to indent single line ('//') comments on lines before code.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_sing_line_comments="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Sparen Extra]
-Category=2
-Description="<html>When opening a paren for a control statement (if, for, while, etc), increase<br/>the indent level by this value. Negative values decrease the indent level.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_sparen_extra="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Relative Single Line Comments]
-Category=2
-Description="<html>Whether to indent trailing single line ('//') comments relative to the code<br/>instead of trying to keep the same absolute column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_relative_single_line_comments=true|indent_relative_single_line_comments=false
-ValueDefault=false
-
-[Indent Switch Case]
-Category=2
-Description="<html>Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.<br/>It might wise to choose the same value for the option indent_case_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_switch_case="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Case Brace]
-Category=2
-Description="<html>Spaces to indent '{' from 'case'. By default, the brace will appear under<br/>the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.<br/>It might wise to choose the same value for the option indent_switch_case.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_case_brace="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Switch Break With Case]
-Category=2
-Description="<html>indent 'break' with 'case' from 'switch'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_switch_break_with_case=true|indent_switch_break_with_case=false
-ValueDefault=false
-
-[Indent Switch Pp]
-Category=2
-Description="<html>Whether to indent preprocessor statements inside of switch statements.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_switch_pp=true|indent_switch_pp=false
-ValueDefault=true
-
-[Indent Case Shift]
-Category=2
-Description="<html>Spaces to shift the 'case' line, without affecting any other lines.<br/>Usually 0.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_case_shift="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Col1 Comment]
-Category=2
-Description="<html>Whether to indent comments found in first column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_col1_comment=true|indent_col1_comment=false
-ValueDefault=false
-
-[Indent Col1 Multi String Literal]
-Category=2
-Description="<html>Whether to indent multi string literal in first column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_col1_multi_string_literal=true|indent_col1_multi_string_literal=false
-ValueDefault=false
-
-[Indent Label]
-Category=2
-Description="<html>How to indent goto labels.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_label="
-MinVal=-16
-MaxVal=16
-ValueDefault=1
-
-[Indent Access Spec]
-Category=2
-Description="<html>How to indent access specifiers that are followed by a<br/>colon.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_access_spec="
-MinVal=-16
-MaxVal=16
-ValueDefault=1
-
-[Indent Access Spec Body]
-Category=2
-Description="<html>Whether to indent the code after an access specifier by one level.<br/>If true, this option forces 'indent_access_spec=0'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_access_spec_body=true|indent_access_spec_body=false
-ValueDefault=false
-
-[Indent Paren Nl]
-Category=2
-Description="<html>If an open parenthesis is followed by a newline, whether to indent the next<br/>line so that it lines up after the open parenthesis (not recommended).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_nl=true|indent_paren_nl=false
-ValueDefault=false
-
-[Indent Paren Close]
-Category=2
-Description="<html>How to indent a close parenthesis after a newline.<br/><br/>0: Indent to body level (default)<br/>1: Align under the open parenthesis<br/>2: Indent to the brace level</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_paren_close="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Indent Paren After Func Def]
-Category=2
-Description="<html>Whether to indent the open parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_def=true|indent_paren_after_func_def=false
-ValueDefault=false
-
-[Indent Paren After Func Decl]
-Category=2
-Description="<html>Whether to indent the open parenthesis of a function declaration,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_decl=true|indent_paren_after_func_decl=false
-ValueDefault=false
-
-[Indent Paren After Func Call]
-Category=2
-Description="<html>Whether to indent the open parenthesis of a function call,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_call=true|indent_paren_after_func_call=false
-ValueDefault=false
-
-[Indent Comma Brace]
-Category=2
-Description="<html>Whether to indent a comma when inside a brace.<br/>If true, aligns under the open brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_comma_brace=true|indent_comma_brace=false
-ValueDefault=false
-
-[Indent Comma Paren]
-Category=2
-Description="<html>Whether to indent a comma when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_comma_paren=true|indent_comma_paren=false
-ValueDefault=false
-
-[Indent Bool Paren]
-Category=2
-Description="<html>Whether to indent a Boolean operator when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_bool_paren=true|indent_bool_paren=false
-ValueDefault=false
-
-[Indent Semicolon For Paren]
-Category=2
-Description="<html>Whether to indent a semicolon when inside a for parenthesis.<br/>If true, aligns under the open for parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_semicolon_for_paren=true|indent_semicolon_for_paren=false
-ValueDefault=false
-
-[Indent First Bool Expr]
-Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
-ValueDefault=false
-
-[Indent First For Expr]
-Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_semicolon_for_paren=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_first_for_expr=true|indent_first_for_expr=false
-ValueDefault=false
-
-[Indent Square Nl]
-Category=2
-Description="<html>If an open square is followed by a newline, whether to indent the next line<br/>so that it lines up after the open square (not recommended).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_square_nl=true|indent_square_nl=false
-ValueDefault=false
-
-[Indent Preserve Sql]
-Category=2
-Description="<html>(ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false
-ValueDefault=false
-
-[Indent Align Assign]
-Category=2
-Description="<html>Whether to align continued statements at the '='. If false or if the '=' is<br/>followed by a newline, the next line is indent one tab.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_assign=true|indent_align_assign=false
-ValueDefault=true
-
-[Indent Off After Assign]
-Category=2
-Description="<html>If true, the indentation of the chunks after a '=' sequence will be set at<br/>LHS token indentation column before '='.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_assign=true|indent_off_after_assign=false
-ValueDefault=false
-
-[Indent Align Paren]
-Category=2
-Description="<html>Whether to align continued statements at the '('. If false or the '(' is<br/>followed by a newline, the next line indent is one tab.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_paren=true|indent_align_paren=false
-ValueDefault=true
-
-[Indent Oc Inside Msg Sel]
-Category=2
-Description="<html>(OC) Whether to indent Objective-C code inside message selectors.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_inside_msg_sel=true|indent_oc_inside_msg_sel=false
-ValueDefault=false
-
-[Indent Oc Block]
-Category=2
-Description="<html>(OC) Whether to indent Objective-C blocks at brace level instead of usual<br/>rules.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block=true|indent_oc_block=false
-ValueDefault=false
-
-[Indent Oc Block Msg]
-Category=2
-Description="<html>(OC) Indent for Objective-C blocks in a message relative to the parameter<br/>name.<br/><br/>=0: Use indent_oc_block rules<br/>&gt;0: Use specified number of spaces to indent</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_oc_block_msg="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Oc Msg Colon]
-Category=2
-Description="<html>(OC) Minimum indent for subsequent parameters</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_oc_msg_colon="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Indent Oc Msg Prioritize First Colon]
-Category=2
-Description="<html>(OC) Whether to prioritize aligning with initial colon (and stripping spaces<br/>from lines, if necessary).<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_msg_prioritize_first_colon=true|indent_oc_msg_prioritize_first_colon=false
-ValueDefault=true
-
-[Indent Oc Block Msg Xcode Style]
-Category=2
-Description="<html>(OC) Whether to indent blocks the way that Xcode does by default<br/>(from the keyword if the parameter is on its own line; otherwise, from the<br/>previous indentation level). Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_xcode_style=true|indent_oc_block_msg_xcode_style=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Keyword]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace is, relative to a<br/>message keyword. Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_keyword=true|indent_oc_block_msg_from_keyword=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Colon]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace is, relative to a message<br/>colon. Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_colon=true|indent_oc_block_msg_from_colon=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Caret]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the block caret is.<br/>Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_caret=true|indent_oc_block_msg_from_caret=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Brace]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace caret is.<br/>Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_brace=true|indent_oc_block_msg_from_brace=false
-ValueDefault=false
-
-[Indent Min Vbrace Open]
-Category=2
-Description="<html>When indenting after virtual brace open and newline add further spaces to<br/>reach this minimum indent.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_min_vbrace_open="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Vbrace Open On Tabstop]
-Category=2
-Description="<html>Whether to add further spaces after regular indent to reach next tabstop<br/>when indenting after virtual brace open and newline.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_vbrace_open_on_tabstop=true|indent_vbrace_open_on_tabstop=false
-ValueDefault=false
-
-[Indent Token After Brace]
-Category=2
-Description="<html>How to indent after a brace followed by another token (not a newline).<br/>true:  indent all contained lines to match the token<br/>false: indent all contained lines to match the brace<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_token_after_brace=true|indent_token_after_brace=false
-ValueDefault=true
-
-[Indent Cpp Lambda Body]
-Category=2
-Description="<html>Whether to indent the body of a C++11 lambda.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cpp_lambda_body=true|indent_cpp_lambda_body=false
-ValueDefault=false
-
-[Indent Compound Literal Return]
-Category=2
-Description="<html>How to indent compound literals that are being returned.<br/>true: add both the indent from return &amp; the compound literal open brace<br/>      (i.e. 2 indent levels)<br/>false: only indent 1 level, don't add the indent for the open brace, only<br/>       add the indent for the return.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_compound_literal_return=true|indent_compound_literal_return=false
-ValueDefault=true
-
-[Indent Using Block]
-Category=2
-Description="<html>(C#) Whether to indent a 'using' block if no braces are used.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_using_block=true|indent_using_block=false
-ValueDefault=true
-
-[Indent Ternary Operator]
-Category=2
-Description="<html>How to indent the continuation of ternary operator.<br/><br/>0: Off (default)<br/>1: When the `if_false` is a continuation, indent it under `if_false`<br/>2: When the `:` is a continuation, indent it under `?`</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ternary_operator="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Indent Inside Ternary Operator]
-Category=2
-Description="<html>Whether to indent the statements inside ternary operator.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_inside_ternary_operator=true|indent_inside_ternary_operator=false
-ValueDefault=false
-
-[Indent Off After Return]
-Category=2
-Description="<html>If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_return=true|indent_off_after_return=false
-ValueDefault=false
-
-[Indent Off After Return New]
-Category=2
-Description="<html>If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_return_new=true|indent_off_after_return_new=false
-ValueDefault=false
-
-[Indent Single After Return]
-Category=2
-Description="<html>If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_single_after_return=true|indent_single_after_return=false
-ValueDefault=false
-
-[Indent Ignore Asm Block]
-Category=2
-Description="<html>Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they<br/>have their own indentation).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_ignore_asm_block=true|indent_ignore_asm_block=false
-ValueDefault=false
-
-[Donot Indent Func Def Close Paren]
-Category=2
-Description="<html>Don't indent the close parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=donot_indent_func_def_close_paren=true|donot_indent_func_def_close_paren=false
-ValueDefault=false
-
-[Nl Collapse Empty Body]
-Category=3
-Description="<html>Whether to collapse empty blocks between '{' and '}'.<br/>If true, overrides nl_inside_empty_func</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false
-ValueDefault=false
-
-[Nl Assign Leave One Liners]
-Category=3
-Description="<html>Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_assign_leave_one_liners=true|nl_assign_leave_one_liners=false
-ValueDefault=false
-
-[Nl Class Leave One Liners]
-Category=3
-Description="<html>Don't split one-line braced statements inside a 'class xx { }' body.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_class_leave_one_liners=true|nl_class_leave_one_liners=false
-ValueDefault=false
-
-[Nl Enum Leave One Liners]
-Category=3
-Description="<html>Don't split one-line enums, as in 'enum foo { BAR = 15 };'</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_enum_leave_one_liners=true|nl_enum_leave_one_liners=false
-ValueDefault=false
-
-[Nl Getset Leave One Liners]
-Category=3
-Description="<html>Don't split one-line get or set functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_getset_leave_one_liners=true|nl_getset_leave_one_liners=false
-ValueDefault=false
-
-[Nl Cs Property Leave One Liners]
-Category=3
-Description="<html>(C#) Don't split one-line property get or set functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_cs_property_leave_one_liners=true|nl_cs_property_leave_one_liners=false
-ValueDefault=false
-
-[Nl Func Leave One Liners]
-Category=3
-Description="<html>Don't split one-line function definitions, as in 'int foo() { return 0; }'.<br/>might modify nl_func_type_name</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_leave_one_liners=true|nl_func_leave_one_liners=false
-ValueDefault=false
-
-[Nl Cpp Lambda Leave One Liners]
-Category=3
-Description="<html>Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_cpp_lambda_leave_one_liners=true|nl_cpp_lambda_leave_one_liners=false
-ValueDefault=false
-
-[Nl If Leave One Liners]
-Category=3
-Description="<html>Don't split one-line if/else statements, as in 'if(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_if_leave_one_liners=true|nl_if_leave_one_liners=false
-ValueDefault=false
-
-[Nl While Leave One Liners]
-Category=3
-Description="<html>Don't split one-line while statements, as in 'while(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_while_leave_one_liners=true|nl_while_leave_one_liners=false
-ValueDefault=false
-
-[Nl Do Leave One Liners]
-Category=3
-Description="<html>Don't split one-line do statements, as in 'do { b++; } while(...);'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_do_leave_one_liners=true|nl_do_leave_one_liners=false
-ValueDefault=false
-
-[Nl For Leave One Liners]
-Category=3
-Description="<html>Don't split one-line for statements, as in 'for(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_for_leave_one_liners=true|nl_for_leave_one_liners=false
-ValueDefault=false
-
-[Nl Oc Msg Leave One Liner]
-Category=3
-Description="<html>(OC) Don't split one-line Objective-C messages.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_oc_msg_leave_one_liner=true|nl_oc_msg_leave_one_liner=false
-ValueDefault=false
-
-[Nl Oc Mdef Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between method declaration and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_mdef_brace=ignore|nl_oc_mdef_brace=add|nl_oc_mdef_brace=remove|nl_oc_mdef_brace=force|nl_oc_mdef_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Mdef Brace|Add Nl Oc Mdef Brace|Remove Nl Oc Mdef Brace|Force Nl Oc Mdef Brace"
-ValueDefault=ignore
-
-[Nl Oc Block Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between Objective-C block signature and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_block_brace=ignore|nl_oc_block_brace=add|nl_oc_block_brace=remove|nl_oc_block_brace=force|nl_oc_block_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Block Brace|Add Nl Oc Block Brace|Remove Nl Oc Block Brace|Force Nl Oc Block Brace"
-ValueDefault=ignore
-
-[Nl Oc Before Interface]
-Category=3
-Description="<html>(OC) Add or remove blank line before '@interface' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_interface=ignore|nl_oc_before_interface=add|nl_oc_before_interface=remove|nl_oc_before_interface=force|nl_oc_before_interface=not_defined
-ChoicesReadable="Ignore Nl Oc Before Interface|Add Nl Oc Before Interface|Remove Nl Oc Before Interface|Force Nl Oc Before Interface"
-ValueDefault=ignore
-
-[Nl Oc Before Implementation]
-Category=3
-Description="<html>(OC) Add or remove blank line before '@implementation' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_implementation=ignore|nl_oc_before_implementation=add|nl_oc_before_implementation=remove|nl_oc_before_implementation=force|nl_oc_before_implementation=not_defined
-ChoicesReadable="Ignore Nl Oc Before Implementation|Add Nl Oc Before Implementation|Remove Nl Oc Before Implementation|Force Nl Oc Before Implementation"
-ValueDefault=ignore
-
-[Nl Oc Before End]
-Category=3
-Description="<html>(OC) Add or remove blank line before '@end' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_end=ignore|nl_oc_before_end=add|nl_oc_before_end=remove|nl_oc_before_end=force|nl_oc_before_end=not_defined
-ChoicesReadable="Ignore Nl Oc Before End|Add Nl Oc Before End|Remove Nl Oc Before End|Force Nl Oc Before End"
-ValueDefault=ignore
-
-[Nl Oc Interface Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between '@interface' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_interface_brace=ignore|nl_oc_interface_brace=add|nl_oc_interface_brace=remove|nl_oc_interface_brace=force|nl_oc_interface_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Interface Brace|Add Nl Oc Interface Brace|Remove Nl Oc Interface Brace|Force Nl Oc Interface Brace"
-ValueDefault=ignore
-
-[Nl Oc Implementation Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between '@implementation' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_implementation_brace=ignore|nl_oc_implementation_brace=add|nl_oc_implementation_brace=remove|nl_oc_implementation_brace=force|nl_oc_implementation_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Implementation Brace|Add Nl Oc Implementation Brace|Remove Nl Oc Implementation Brace|Force Nl Oc Implementation Brace"
-ValueDefault=ignore
-
-[Nl Start Of File]
-Category=3
-Description="<html>Add or remove newlines at the start of the file.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_start_of_file=ignore|nl_start_of_file=add|nl_start_of_file=remove|nl_start_of_file=force|nl_start_of_file=not_defined
-ChoicesReadable="Ignore Nl Start Of File|Add Nl Start Of File|Remove Nl Start Of File|Force Nl Start Of File"
-ValueDefault=ignore
-
-[Nl Start Of File Min]
-Category=3
-Description="<html>The minimum number of newlines at the start of the file (only used if<br/>nl_start_of_file is 'add' or 'force').</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_start_of_file_min="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl End Of File]
-Category=3
-Description="<html>Add or remove newline at the end of the file.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_end_of_file=ignore|nl_end_of_file=add|nl_end_of_file=remove|nl_end_of_file=force|nl_end_of_file=not_defined
-ChoicesReadable="Ignore Nl End Of File|Add Nl End Of File|Remove Nl End Of File|Force Nl End Of File"
-ValueDefault=ignore
-
-[Nl End Of File Min]
-Category=3
-Description="<html>The minimum number of newlines at the end of the file (only used if<br/>nl_end_of_file is 'add' or 'force').</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_end_of_file_min="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Assign Brace]
-Category=3
-Description="<html>Add or remove newline between '=' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_assign_brace=ignore|nl_assign_brace=add|nl_assign_brace=remove|nl_assign_brace=force|nl_assign_brace=not_defined
-ChoicesReadable="Ignore Nl Assign Brace|Add Nl Assign Brace|Remove Nl Assign Brace|Force Nl Assign Brace"
-ValueDefault=ignore
-
-[Nl Assign Square]
-Category=3
-Description="<html>(D) Add or remove newline between '=' and '['.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force|nl_assign_square=not_defined
-ChoicesReadable="Ignore Nl Assign Square|Add Nl Assign Square|Remove Nl Assign Square|Force Nl Assign Square"
-ValueDefault=ignore
-
-[Nl Tsquare Brace]
-Category=3
-Description="<html>Add or remove newline between '[]' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_tsquare_brace=ignore|nl_tsquare_brace=add|nl_tsquare_brace=remove|nl_tsquare_brace=force|nl_tsquare_brace=not_defined
-ChoicesReadable="Ignore Nl Tsquare Brace|Add Nl Tsquare Brace|Remove Nl Tsquare Brace|Force Nl Tsquare Brace"
-ValueDefault=ignore
-
-[Nl After Square Assign]
-Category=3
-Description="<html>(D) Add or remove newline after '= ['. Will also affect the newline before<br/>the ']'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_square_assign=ignore|nl_after_square_assign=add|nl_after_square_assign=remove|nl_after_square_assign=force|nl_after_square_assign=not_defined
-ChoicesReadable="Ignore Nl After Square Assign|Add Nl After Square Assign|Remove Nl After Square Assign|Force Nl After Square Assign"
-ValueDefault=ignore
-
-[Nl Fcall Brace]
-Category=3
-Description="<html>Add or remove newline between a function call's ')' and '{', as in<br/>'list_for_each(item, &amp;list) { }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_fcall_brace=ignore|nl_fcall_brace=add|nl_fcall_brace=remove|nl_fcall_brace=force|nl_fcall_brace=not_defined
-ChoicesReadable="Ignore Nl Fcall Brace|Add Nl Fcall Brace|Remove Nl Fcall Brace|Force Nl Fcall Brace"
-ValueDefault=ignore
-
-[Nl Enum Brace]
-Category=3
-Description="<html>Add or remove newline between 'enum' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_brace=ignore|nl_enum_brace=add|nl_enum_brace=remove|nl_enum_brace=force|nl_enum_brace=not_defined
-ChoicesReadable="Ignore Nl Enum Brace|Add Nl Enum Brace|Remove Nl Enum Brace|Force Nl Enum Brace"
-ValueDefault=ignore
-
-[Nl Enum Class]
-Category=3
-Description="<html>Add or remove newline between 'enum' and 'class'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_class=ignore|nl_enum_class=add|nl_enum_class=remove|nl_enum_class=force|nl_enum_class=not_defined
-ChoicesReadable="Ignore Nl Enum Class|Add Nl Enum Class|Remove Nl Enum Class|Force Nl Enum Class"
-ValueDefault=ignore
-
-[Nl Enum Class Identifier]
-Category=3
-Description="<html>Add or remove newline between 'enum class' and the identifier.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_class_identifier=ignore|nl_enum_class_identifier=add|nl_enum_class_identifier=remove|nl_enum_class_identifier=force|nl_enum_class_identifier=not_defined
-ChoicesReadable="Ignore Nl Enum Class Identifier|Add Nl Enum Class Identifier|Remove Nl Enum Class Identifier|Force Nl Enum Class Identifier"
-ValueDefault=ignore
-
-[Nl Enum Identifier Colon]
-Category=3
-Description="<html>Add or remove newline between 'enum class' type and ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_identifier_colon=ignore|nl_enum_identifier_colon=add|nl_enum_identifier_colon=remove|nl_enum_identifier_colon=force|nl_enum_identifier_colon=not_defined
-ChoicesReadable="Ignore Nl Enum Identifier Colon|Add Nl Enum Identifier Colon|Remove Nl Enum Identifier Colon|Force Nl Enum Identifier Colon"
-ValueDefault=ignore
-
-[Nl Enum Colon Type]
-Category=3
-Description="<html>Add or remove newline between 'enum class identifier :' and type.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_colon_type=ignore|nl_enum_colon_type=add|nl_enum_colon_type=remove|nl_enum_colon_type=force|nl_enum_colon_type=not_defined
-ChoicesReadable="Ignore Nl Enum Colon Type|Add Nl Enum Colon Type|Remove Nl Enum Colon Type|Force Nl Enum Colon Type"
-ValueDefault=ignore
-
-[Nl Struct Brace]
-Category=3
-Description="<html>Add or remove newline between 'struct and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_struct_brace=ignore|nl_struct_brace=add|nl_struct_brace=remove|nl_struct_brace=force|nl_struct_brace=not_defined
-ChoicesReadable="Ignore Nl Struct Brace|Add Nl Struct Brace|Remove Nl Struct Brace|Force Nl Struct Brace"
-ValueDefault=ignore
-
-[Nl Union Brace]
-Category=3
-Description="<html>Add or remove newline between 'union' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_union_brace=ignore|nl_union_brace=add|nl_union_brace=remove|nl_union_brace=force|nl_union_brace=not_defined
-ChoicesReadable="Ignore Nl Union Brace|Add Nl Union Brace|Remove Nl Union Brace|Force Nl Union Brace"
-ValueDefault=ignore
-
-[Nl If Brace]
-Category=3
-Description="<html>Add or remove newline between 'if' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_if_brace=ignore|nl_if_brace=add|nl_if_brace=remove|nl_if_brace=force|nl_if_brace=not_defined
-ChoicesReadable="Ignore Nl If Brace|Add Nl If Brace|Remove Nl If Brace|Force Nl If Brace"
-ValueDefault=ignore
-
-[Nl Brace Else]
-Category=3
-Description="<html>Add or remove newline between '}' and 'else'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_else=ignore|nl_brace_else=add|nl_brace_else=remove|nl_brace_else=force|nl_brace_else=not_defined
-ChoicesReadable="Ignore Nl Brace Else|Add Nl Brace Else|Remove Nl Brace Else|Force Nl Brace Else"
-ValueDefault=ignore
-
-[Nl Elseif Brace]
-Category=3
-Description="<html>Add or remove newline between 'else if' and '{'. If set to ignore,<br/>nl_if_brace is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_elseif_brace=ignore|nl_elseif_brace=add|nl_elseif_brace=remove|nl_elseif_brace=force|nl_elseif_brace=not_defined
-ChoicesReadable="Ignore Nl Elseif Brace|Add Nl Elseif Brace|Remove Nl Elseif Brace|Force Nl Elseif Brace"
-ValueDefault=ignore
-
-[Nl Else Brace]
-Category=3
-Description="<html>Add or remove newline between 'else' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_else_brace=ignore|nl_else_brace=add|nl_else_brace=remove|nl_else_brace=force|nl_else_brace=not_defined
-ChoicesReadable="Ignore Nl Else Brace|Add Nl Else Brace|Remove Nl Else Brace|Force Nl Else Brace"
-ValueDefault=ignore
-
-[Nl Else If]
-Category=3
-Description="<html>Add or remove newline between 'else' and 'if'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_else_if=ignore|nl_else_if=add|nl_else_if=remove|nl_else_if=force|nl_else_if=not_defined
-ChoicesReadable="Ignore Nl Else If|Add Nl Else If|Remove Nl Else If|Force Nl Else If"
-ValueDefault=ignore
-
-[Nl Before Opening Brace Func Class Def]
-Category=3
-Description="<html>Add or remove newline before '{' opening brace</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_opening_brace_func_class_def=ignore|nl_before_opening_brace_func_class_def=add|nl_before_opening_brace_func_class_def=remove|nl_before_opening_brace_func_class_def=force|nl_before_opening_brace_func_class_def=not_defined
-ChoicesReadable="Ignore Nl Before Opening Brace Func Class Def|Add Nl Before Opening Brace Func Class Def|Remove Nl Before Opening Brace Func Class Def|Force Nl Before Opening Brace Func Class Def"
-ValueDefault=ignore
-
-[Nl Before If Closing Paren]
-Category=3
-Description="<html>Add or remove newline before 'if'/'else if' closing parenthesis.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_if_closing_paren=ignore|nl_before_if_closing_paren=add|nl_before_if_closing_paren=remove|nl_before_if_closing_paren=force|nl_before_if_closing_paren=not_defined
-ChoicesReadable="Ignore Nl Before If Closing Paren|Add Nl Before If Closing Paren|Remove Nl Before If Closing Paren|Force Nl Before If Closing Paren"
-ValueDefault=ignore
-
-[Nl Brace Finally]
-Category=3
-Description="<html>Add or remove newline between '}' and 'finally'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_finally=ignore|nl_brace_finally=add|nl_brace_finally=remove|nl_brace_finally=force|nl_brace_finally=not_defined
-ChoicesReadable="Ignore Nl Brace Finally|Add Nl Brace Finally|Remove Nl Brace Finally|Force Nl Brace Finally"
-ValueDefault=ignore
-
-[Nl Finally Brace]
-Category=3
-Description="<html>Add or remove newline between 'finally' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_finally_brace=ignore|nl_finally_brace=add|nl_finally_brace=remove|nl_finally_brace=force|nl_finally_brace=not_defined
-ChoicesReadable="Ignore Nl Finally Brace|Add Nl Finally Brace|Remove Nl Finally Brace|Force Nl Finally Brace"
-ValueDefault=ignore
-
-[Nl Try Brace]
-Category=3
-Description="<html>Add or remove newline between 'try' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_try_brace=ignore|nl_try_brace=add|nl_try_brace=remove|nl_try_brace=force|nl_try_brace=not_defined
-ChoicesReadable="Ignore Nl Try Brace|Add Nl Try Brace|Remove Nl Try Brace|Force Nl Try Brace"
-ValueDefault=ignore
-
-[Nl Getset Brace]
-Category=3
-Description="<html>Add or remove newline between get/set and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_getset_brace=ignore|nl_getset_brace=add|nl_getset_brace=remove|nl_getset_brace=force|nl_getset_brace=not_defined
-ChoicesReadable="Ignore Nl Getset Brace|Add Nl Getset Brace|Remove Nl Getset Brace|Force Nl Getset Brace"
-ValueDefault=ignore
-
-[Nl For Brace]
-Category=3
-Description="<html>Add or remove newline between 'for' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_for_brace=ignore|nl_for_brace=add|nl_for_brace=remove|nl_for_brace=force|nl_for_brace=not_defined
-ChoicesReadable="Ignore Nl For Brace|Add Nl For Brace|Remove Nl For Brace|Force Nl For Brace"
-ValueDefault=ignore
-
-[Nl Catch Brace]
-Category=3
-Description="<html>Add or remove newline before the '{' of a 'catch' statement, as in<br/>'catch (decl) &lt;here&gt; {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force|nl_catch_brace=not_defined
-ChoicesReadable="Ignore Nl Catch Brace|Add Nl Catch Brace|Remove Nl Catch Brace|Force Nl Catch Brace"
-ValueDefault=ignore
-
-[Nl Oc Catch Brace]
-Category=3
-Description="<html>(OC) Add or remove newline before the '{' of a '@catch' statement, as in<br/>'@catch (decl) &lt;here&gt; {'. If set to ignore, nl_catch_brace is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_catch_brace=ignore|nl_oc_catch_brace=add|nl_oc_catch_brace=remove|nl_oc_catch_brace=force|nl_oc_catch_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Catch Brace|Add Nl Oc Catch Brace|Remove Nl Oc Catch Brace|Force Nl Oc Catch Brace"
-ValueDefault=ignore
-
-[Nl Brace Catch]
-Category=3
-Description="<html>Add or remove newline between '}' and 'catch'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_catch=ignore|nl_brace_catch=add|nl_brace_catch=remove|nl_brace_catch=force|nl_brace_catch=not_defined
-ChoicesReadable="Ignore Nl Brace Catch|Add Nl Brace Catch|Remove Nl Brace Catch|Force Nl Brace Catch"
-ValueDefault=ignore
-
-[Nl Oc Brace Catch]
-Category=3
-Description="<html>(OC) Add or remove newline between '}' and '@catch'. If set to ignore,<br/>nl_brace_catch is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_brace_catch=ignore|nl_oc_brace_catch=add|nl_oc_brace_catch=remove|nl_oc_brace_catch=force|nl_oc_brace_catch=not_defined
-ChoicesReadable="Ignore Nl Oc Brace Catch|Add Nl Oc Brace Catch|Remove Nl Oc Brace Catch|Force Nl Oc Brace Catch"
-ValueDefault=ignore
-
-[Nl Brace Square]
-Category=3
-Description="<html>Add or remove newline between '}' and ']'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_square=ignore|nl_brace_square=add|nl_brace_square=remove|nl_brace_square=force|nl_brace_square=not_defined
-ChoicesReadable="Ignore Nl Brace Square|Add Nl Brace Square|Remove Nl Brace Square|Force Nl Brace Square"
-ValueDefault=ignore
-
-[Nl Brace Fparen]
-Category=3
-Description="<html>Add or remove newline between '}' and ')' in a function invocation.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_fparen=ignore|nl_brace_fparen=add|nl_brace_fparen=remove|nl_brace_fparen=force|nl_brace_fparen=not_defined
-ChoicesReadable="Ignore Nl Brace Fparen|Add Nl Brace Fparen|Remove Nl Brace Fparen|Force Nl Brace Fparen"
-ValueDefault=ignore
-
-[Nl While Brace]
-Category=3
-Description="<html>Add or remove newline between 'while' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_while_brace=ignore|nl_while_brace=add|nl_while_brace=remove|nl_while_brace=force|nl_while_brace=not_defined
-ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
-ValueDefault=ignore
-
-[Nl Scope Brace]
-Category=3
-Description="<html>(D) Add or remove newline between 'scope (x)' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_scope_brace=ignore|nl_scope_brace=add|nl_scope_brace=remove|nl_scope_brace=force|nl_scope_brace=not_defined
-ChoicesReadable="Ignore Nl Scope Brace|Add Nl Scope Brace|Remove Nl Scope Brace|Force Nl Scope Brace"
-ValueDefault=ignore
-
-[Nl Unittest Brace]
-Category=3
-Description="<html>(D) Add or remove newline between 'unittest' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_unittest_brace=ignore|nl_unittest_brace=add|nl_unittest_brace=remove|nl_unittest_brace=force|nl_unittest_brace=not_defined
-ChoicesReadable="Ignore Nl Unittest Brace|Add Nl Unittest Brace|Remove Nl Unittest Brace|Force Nl Unittest Brace"
-ValueDefault=ignore
-
-[Nl Version Brace]
-Category=3
-Description="<html>(D) Add or remove newline between 'version (x)' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_version_brace=ignore|nl_version_brace=add|nl_version_brace=remove|nl_version_brace=force|nl_version_brace=not_defined
-ChoicesReadable="Ignore Nl Version Brace|Add Nl Version Brace|Remove Nl Version Brace|Force Nl Version Brace"
-ValueDefault=ignore
-
-[Nl Using Brace]
-Category=3
-Description="<html>(C#) Add or remove newline between 'using' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_using_brace=ignore|nl_using_brace=add|nl_using_brace=remove|nl_using_brace=force|nl_using_brace=not_defined
-ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
-ValueDefault=ignore
-
-[Nl Brace Brace]
-Category=3
-Description="<html>Add or remove newline between two open or close braces. Due to general<br/>newline/brace handling, REMOVE may not work.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_brace=ignore|nl_brace_brace=add|nl_brace_brace=remove|nl_brace_brace=force|nl_brace_brace=not_defined
-ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
-ValueDefault=ignore
-
-[Nl Do Brace]
-Category=3
-Description="<html>Add or remove newline between 'do' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_do_brace=ignore|nl_do_brace=add|nl_do_brace=remove|nl_do_brace=force|nl_do_brace=not_defined
-ChoicesReadable="Ignore Nl Do Brace|Add Nl Do Brace|Remove Nl Do Brace|Force Nl Do Brace"
-ValueDefault=ignore
-
-[Nl Brace While]
-Category=3
-Description="<html>Add or remove newline between '}' and 'while' of 'do' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_while=ignore|nl_brace_while=add|nl_brace_while=remove|nl_brace_while=force|nl_brace_while=not_defined
-ChoicesReadable="Ignore Nl Brace While|Add Nl Brace While|Remove Nl Brace While|Force Nl Brace While"
-ValueDefault=ignore
-
-[Nl Switch Brace]
-Category=3
-Description="<html>Add or remove newline between 'switch' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_switch_brace=ignore|nl_switch_brace=add|nl_switch_brace=remove|nl_switch_brace=force|nl_switch_brace=not_defined
-ChoicesReadable="Ignore Nl Switch Brace|Add Nl Switch Brace|Remove Nl Switch Brace|Force Nl Switch Brace"
-ValueDefault=ignore
-
-[Nl Synchronized Brace]
-Category=3
-Description="<html>Add or remove newline between 'synchronized' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_synchronized_brace=ignore|nl_synchronized_brace=add|nl_synchronized_brace=remove|nl_synchronized_brace=force|nl_synchronized_brace=not_defined
-ChoicesReadable="Ignore Nl Synchronized Brace|Add Nl Synchronized Brace|Remove Nl Synchronized Brace|Force Nl Synchronized Brace"
-ValueDefault=ignore
-
-[Nl Multi Line Cond]
-Category=3
-Description="<html>Add a newline between ')' and '{' if the ')' is on a different line than the<br/>if/for/etc.<br/><br/>Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and<br/>nl_catch_brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_multi_line_cond=true|nl_multi_line_cond=false
-ValueDefault=false
-
-[Nl Multi Line Sparen Open]
-Category=3
-Description="<html>Add a newline after '(' if an if/for/while/switch condition spans multiple<br/>lines</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_multi_line_sparen_open=ignore|nl_multi_line_sparen_open=add|nl_multi_line_sparen_open=remove|nl_multi_line_sparen_open=force|nl_multi_line_sparen_open=not_defined
-ChoicesReadable="Ignore Nl Multi Line Sparen Open|Add Nl Multi Line Sparen Open|Remove Nl Multi Line Sparen Open|Force Nl Multi Line Sparen Open"
-ValueDefault=ignore
-
-[Nl Multi Line Sparen Close]
-Category=3
-Description="<html>Add a newline before ')' if an if/for/while/switch condition spans multiple<br/>lines. Overrides nl_before_if_closing_paren if both are specified.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_multi_line_sparen_close=ignore|nl_multi_line_sparen_close=add|nl_multi_line_sparen_close=remove|nl_multi_line_sparen_close=force|nl_multi_line_sparen_close=not_defined
-ChoicesReadable="Ignore Nl Multi Line Sparen Close|Add Nl Multi Line Sparen Close|Remove Nl Multi Line Sparen Close|Force Nl Multi Line Sparen Close"
-ValueDefault=ignore
-
-[Nl Multi Line Define]
-Category=3
-Description="<html>Force a newline in a define after the macro name for multi-line defines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_multi_line_define=true|nl_multi_line_define=false
-ValueDefault=false
-
-[Nl Before Case]
-Category=3
-Description="<html>Whether to add a newline before 'case', and a blank line before a 'case'<br/>statement that follows a ';' or '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_case=true|nl_before_case=false
-ValueDefault=false
-
-[Nl After Case]
-Category=3
-Description="<html>Whether to add a newline after a 'case' statement.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_case=true|nl_after_case=false
-ValueDefault=false
-
-[Nl Case Colon Brace]
-Category=3
-Description="<html>Add or remove newline between a case ':' and '{'.<br/><br/>Overrides nl_after_case.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_case_colon_brace=ignore|nl_case_colon_brace=add|nl_case_colon_brace=remove|nl_case_colon_brace=force|nl_case_colon_brace=not_defined
-ChoicesReadable="Ignore Nl Case Colon Brace|Add Nl Case Colon Brace|Remove Nl Case Colon Brace|Force Nl Case Colon Brace"
-ValueDefault=ignore
-
-[Nl Before Throw]
-Category=3
-Description="<html>Add or remove newline between ')' and 'throw'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_throw=ignore|nl_before_throw=add|nl_before_throw=remove|nl_before_throw=force|nl_before_throw=not_defined
-ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
-ValueDefault=ignore
-
-[Nl Namespace Brace]
-Category=3
-Description="<html>Add or remove newline between 'namespace' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_namespace_brace=ignore|nl_namespace_brace=add|nl_namespace_brace=remove|nl_namespace_brace=force|nl_namespace_brace=not_defined
-ChoicesReadable="Ignore Nl Namespace Brace|Add Nl Namespace Brace|Remove Nl Namespace Brace|Force Nl Namespace Brace"
-ValueDefault=ignore
-
-[Nl Template Class]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class=ignore|nl_template_class=add|nl_template_class=remove|nl_template_class=force|nl_template_class=not_defined
-ChoicesReadable="Ignore Nl Template Class|Add Nl Template Class|Remove Nl Template Class|Force Nl Template Class"
-ValueDefault=ignore
-
-[Nl Template Class Decl]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class declaration.<br/><br/>Overrides nl_template_class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_decl=ignore|nl_template_class_decl=add|nl_template_class_decl=remove|nl_template_class_decl=force|nl_template_class_decl=not_defined
-ChoicesReadable="Ignore Nl Template Class Decl|Add Nl Template Class Decl|Remove Nl Template Class Decl|Force Nl Template Class Decl"
-ValueDefault=ignore
-
-[Nl Template Class Decl Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class declaration.<br/><br/>Overrides nl_template_class_decl.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_decl_special=ignore|nl_template_class_decl_special=add|nl_template_class_decl_special=remove|nl_template_class_decl_special=force|nl_template_class_decl_special=not_defined
-ChoicesReadable="Ignore Nl Template Class Decl Special|Add Nl Template Class Decl Special|Remove Nl Template Class Decl Special|Force Nl Template Class Decl Special"
-ValueDefault=ignore
-
-[Nl Template Class Def]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class definition.<br/><br/>Overrides nl_template_class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_def=ignore|nl_template_class_def=add|nl_template_class_def=remove|nl_template_class_def=force|nl_template_class_def=not_defined
-ChoicesReadable="Ignore Nl Template Class Def|Add Nl Template Class Def|Remove Nl Template Class Def|Force Nl Template Class Def"
-ValueDefault=ignore
-
-[Nl Template Class Def Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class definition.<br/><br/>Overrides nl_template_class_def.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_def_special=ignore|nl_template_class_def_special=add|nl_template_class_def_special=remove|nl_template_class_def_special=force|nl_template_class_def_special=not_defined
-ChoicesReadable="Ignore Nl Template Class Def Special|Add Nl Template Class Def Special|Remove Nl Template Class Def Special|Force Nl Template Class Def Special"
-ValueDefault=ignore
-
-[Nl Template Func]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func=ignore|nl_template_func=add|nl_template_func=remove|nl_template_func=force|nl_template_func=not_defined
-ChoicesReadable="Ignore Nl Template Func|Add Nl Template Func|Remove Nl Template Func|Force Nl Template Func"
-ValueDefault=ignore
-
-[Nl Template Func Decl]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>declaration.<br/><br/>Overrides nl_template_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_decl=ignore|nl_template_func_decl=add|nl_template_func_decl=remove|nl_template_func_decl=force|nl_template_func_decl=not_defined
-ChoicesReadable="Ignore Nl Template Func Decl|Add Nl Template Func Decl|Remove Nl Template Func Decl|Force Nl Template Func Decl"
-ValueDefault=ignore
-
-[Nl Template Func Decl Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>declaration.<br/><br/>Overrides nl_template_func_decl.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_decl_special=ignore|nl_template_func_decl_special=add|nl_template_func_decl_special=remove|nl_template_func_decl_special=force|nl_template_func_decl_special=not_defined
-ChoicesReadable="Ignore Nl Template Func Decl Special|Add Nl Template Func Decl Special|Remove Nl Template Func Decl Special|Force Nl Template Func Decl Special"
-ValueDefault=ignore
-
-[Nl Template Func Def]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>definition.<br/><br/>Overrides nl_template_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_def=ignore|nl_template_func_def=add|nl_template_func_def=remove|nl_template_func_def=force|nl_template_func_def=not_defined
-ChoicesReadable="Ignore Nl Template Func Def|Add Nl Template Func Def|Remove Nl Template Func Def|Force Nl Template Func Def"
-ValueDefault=ignore
-
-[Nl Template Func Def Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>definition.<br/><br/>Overrides nl_template_func_def.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_def_special=ignore|nl_template_func_def_special=add|nl_template_func_def_special=remove|nl_template_func_def_special=force|nl_template_func_def_special=not_defined
-ChoicesReadable="Ignore Nl Template Func Def Special|Add Nl Template Func Def Special|Remove Nl Template Func Def Special|Force Nl Template Func Def Special"
-ValueDefault=ignore
-
-[Nl Template Var]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template variable.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_var=ignore|nl_template_var=add|nl_template_var=remove|nl_template_var=force|nl_template_var=not_defined
-ChoicesReadable="Ignore Nl Template Var|Add Nl Template Var|Remove Nl Template Var|Force Nl Template Var"
-ValueDefault=ignore
-
-[Nl Template Using]
-Category=3
-Description="<html>Add or remove newline between 'template&lt;...&gt;' and 'using' of a templated<br/>type alias.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_using=ignore|nl_template_using=add|nl_template_using=remove|nl_template_using=force|nl_template_using=not_defined
-ChoicesReadable="Ignore Nl Template Using|Add Nl Template Using|Remove Nl Template Using|Force Nl Template Using"
-ValueDefault=ignore
-
-[Nl Class Brace]
-Category=3
-Description="<html>Add or remove newline between 'class' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_class_brace=ignore|nl_class_brace=add|nl_class_brace=remove|nl_class_brace=force|nl_class_brace=not_defined
-ChoicesReadable="Ignore Nl Class Brace|Add Nl Class Brace|Remove Nl Class Brace|Force Nl Class Brace"
-ValueDefault=ignore
-
-[Nl Class Init Args]
-Category=3
-Description="<html>Add or remove newline before or after (depending on pos_class_comma,<br/>may not be IGNORE) each',' in the base class list.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_class_init_args=ignore|nl_class_init_args=add|nl_class_init_args=remove|nl_class_init_args=force|nl_class_init_args=not_defined
-ChoicesReadable="Ignore Nl Class Init Args|Add Nl Class Init Args|Remove Nl Class Init Args|Force Nl Class Init Args"
-ValueDefault=ignore
-
-[Nl Constr Init Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in the constructor member<br/>initialization. Related to nl_constr_colon, pos_constr_colon and<br/>pos_constr_comma.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_constr_init_args=ignore|nl_constr_init_args=add|nl_constr_init_args=remove|nl_constr_init_args=force|nl_constr_init_args=not_defined
-ChoicesReadable="Ignore Nl Constr Init Args|Add Nl Constr Init Args|Remove Nl Constr Init Args|Force Nl Constr Init Args"
-ValueDefault=ignore
-
-[Nl Enum Own Lines]
-Category=3
-Description="<html>Add or remove newline before first element, after comma, and after last<br/>element, in 'enum'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_own_lines=ignore|nl_enum_own_lines=add|nl_enum_own_lines=remove|nl_enum_own_lines=force|nl_enum_own_lines=not_defined
-ChoicesReadable="Ignore Nl Enum Own Lines|Add Nl Enum Own Lines|Remove Nl Enum Own Lines|Force Nl Enum Own Lines"
-ValueDefault=ignore
-
-[Nl Func Type Name]
-Category=3
-Description="<html>Add or remove newline between return type and function name in a function<br/>definition.<br/>might be modified by nl_func_leave_one_liners</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force|nl_func_type_name=not_defined
-ChoicesReadable="Ignore Nl Func Type Name|Add Nl Func Type Name|Remove Nl Func Type Name|Force Nl Func Type Name"
-ValueDefault=ignore
-
-[Nl Func Type Name Class]
-Category=3
-Description="<html>Add or remove newline between return type and function name inside a class<br/>definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name<br/>is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_type_name_class=ignore|nl_func_type_name_class=add|nl_func_type_name_class=remove|nl_func_type_name_class=force|nl_func_type_name_class=not_defined
-ChoicesReadable="Ignore Nl Func Type Name Class|Add Nl Func Type Name Class|Remove Nl Func Type Name Class|Force Nl Func Type Name Class"
-ValueDefault=ignore
-
-[Nl Func Class Scope]
-Category=3
-Description="<html>Add or remove newline between class specification and '::'<br/>in 'void A::f() { }'. Only appears in separate member implementation (does<br/>not appear with in-line implementation).</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_class_scope=ignore|nl_func_class_scope=add|nl_func_class_scope=remove|nl_func_class_scope=force|nl_func_class_scope=not_defined
-ChoicesReadable="Ignore Nl Func Class Scope|Add Nl Func Class Scope|Remove Nl Func Class Scope|Force Nl Func Class Scope"
-ValueDefault=ignore
-
-[Nl Func Scope Name]
-Category=3
-Description="<html>Add or remove newline between function scope and name, as in<br/>'void A :: &lt;here&gt; f() { }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_scope_name=ignore|nl_func_scope_name=add|nl_func_scope_name=remove|nl_func_scope_name=force|nl_func_scope_name=not_defined
-ChoicesReadable="Ignore Nl Func Scope Name|Add Nl Func Scope Name|Remove Nl Func Scope Name|Force Nl Func Scope Name"
-ValueDefault=ignore
-
-[Nl Func Proto Type Name]
-Category=3
-Description="<html>Add or remove newline between return type and function name in a prototype.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_proto_type_name=ignore|nl_func_proto_type_name=add|nl_func_proto_type_name=remove|nl_func_proto_type_name=force|nl_func_proto_type_name=not_defined
-ChoicesReadable="Ignore Nl Func Proto Type Name|Add Nl Func Proto Type Name|Remove Nl Func Proto Type Name|Force Nl Func Proto Type Name"
-ValueDefault=ignore
-
-[Nl Func Paren]
-Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force|nl_func_paren=not_defined
-ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren"
-ValueDefault=ignore
-
-[Nl Func Paren Empty]
-Category=3
-Description="<html>Overrides nl_func_paren for functions with no parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_paren_empty=ignore|nl_func_paren_empty=add|nl_func_paren_empty=remove|nl_func_paren_empty=force|nl_func_paren_empty=not_defined
-ChoicesReadable="Ignore Nl Func Paren Empty|Add Nl Func Paren Empty|Remove Nl Func Paren Empty|Force Nl Func Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Def Paren]
-Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_paren=ignore|nl_func_def_paren=add|nl_func_def_paren=remove|nl_func_def_paren=force|nl_func_def_paren=not_defined
-ChoicesReadable="Ignore Nl Func Def Paren|Add Nl Func Def Paren|Remove Nl Func Def Paren|Force Nl Func Def Paren"
-ValueDefault=ignore
-
-[Nl Func Def Paren Empty]
-Category=3
-Description="<html>Overrides nl_func_def_paren for functions with no parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_paren_empty=ignore|nl_func_def_paren_empty=add|nl_func_def_paren_empty=remove|nl_func_def_paren_empty=force|nl_func_def_paren_empty=not_defined
-ChoicesReadable="Ignore Nl Func Def Paren Empty|Add Nl Func Def Paren Empty|Remove Nl Func Def Paren Empty|Force Nl Func Def Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Call Paren]
-Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_paren=ignore|nl_func_call_paren=add|nl_func_call_paren=remove|nl_func_call_paren=force|nl_func_call_paren=not_defined
-ChoicesReadable="Ignore Nl Func Call Paren|Add Nl Func Call Paren|Remove Nl Func Call Paren|Force Nl Func Call Paren"
-ValueDefault=ignore
-
-[Nl Func Call Paren Empty]
-Category=3
-Description="<html>Overrides nl_func_call_paren for functions with no parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_paren_empty=ignore|nl_func_call_paren_empty=add|nl_func_call_paren_empty=remove|nl_func_call_paren_empty=force|nl_func_call_paren_empty=not_defined
-ChoicesReadable="Ignore Nl Func Call Paren Empty|Add Nl Func Call Paren Empty|Remove Nl Func Call Paren Empty|Force Nl Func Call Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Decl Start]
-Category=3
-Description="<html>Add or remove newline after '(' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_start=ignore|nl_func_decl_start=add|nl_func_decl_start=remove|nl_func_decl_start=force|nl_func_decl_start=not_defined
-ChoicesReadable="Ignore Nl Func Decl Start|Add Nl Func Decl Start|Remove Nl Func Decl Start|Force Nl Func Decl Start"
-ValueDefault=ignore
-
-[Nl Func Def Start]
-Category=3
-Description="<html>Add or remove newline after '(' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_start=ignore|nl_func_def_start=add|nl_func_def_start=remove|nl_func_def_start=force|nl_func_def_start=not_defined
-ChoicesReadable="Ignore Nl Func Def Start|Add Nl Func Def Start|Remove Nl Func Def Start|Force Nl Func Def Start"
-ValueDefault=ignore
-
-[Nl Func Decl Start Single]
-Category=3
-Description="<html>Overrides nl_func_decl_start when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_start_single=ignore|nl_func_decl_start_single=add|nl_func_decl_start_single=remove|nl_func_decl_start_single=force|nl_func_decl_start_single=not_defined
-ChoicesReadable="Ignore Nl Func Decl Start Single|Add Nl Func Decl Start Single|Remove Nl Func Decl Start Single|Force Nl Func Decl Start Single"
-ValueDefault=ignore
-
-[Nl Func Def Start Single]
-Category=3
-Description="<html>Overrides nl_func_def_start when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_start_single=ignore|nl_func_def_start_single=add|nl_func_def_start_single=remove|nl_func_def_start_single=force|nl_func_def_start_single=not_defined
-ChoicesReadable="Ignore Nl Func Def Start Single|Add Nl Func Def Start Single|Remove Nl Func Def Start Single|Force Nl Func Def Start Single"
-ValueDefault=ignore
-
-[Nl Func Decl Start Multi Line]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function declaration if '(' and ')'<br/>are in different lines. If false, nl_func_decl_start is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_start_multi_line=true|nl_func_decl_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Def Start Multi Line]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function definition if '(' and ')'<br/>are in different lines. If false, nl_func_def_start is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_start_multi_line=true|nl_func_def_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_args=ignore|nl_func_decl_args=add|nl_func_decl_args=remove|nl_func_decl_args=force|nl_func_decl_args=not_defined
-ChoicesReadable="Ignore Nl Func Decl Args|Add Nl Func Decl Args|Remove Nl Func Decl Args|Force Nl Func Decl Args"
-ValueDefault=ignore
-
-[Nl Func Def Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_args=ignore|nl_func_def_args=add|nl_func_def_args=remove|nl_func_def_args=force|nl_func_def_args=not_defined
-ChoicesReadable="Ignore Nl Func Def Args|Add Nl Func Def Args|Remove Nl Func Def Args|Force Nl Func Def Args"
-ValueDefault=ignore
-
-[Nl Func Call Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_args=ignore|nl_func_call_args=add|nl_func_call_args=remove|nl_func_call_args=force|nl_func_call_args=not_defined
-ChoicesReadable="Ignore Nl Func Call Args|Add Nl Func Call Args|Remove Nl Func Call Args|Force Nl Func Call Args"
-ValueDefault=ignore
-
-[Nl Func Decl Args Multi Line]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a function declaration if '('<br/>and ')' are in different lines. If false, nl_func_decl_args is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_args_multi_line=true|nl_func_decl_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Def Args Multi Line]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a function definition if '('<br/>and ')' are in different lines. If false, nl_func_def_args is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_args_multi_line=true|nl_func_def_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl End]
-Category=3
-Description="<html>Add or remove newline before the ')' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_end=ignore|nl_func_decl_end=add|nl_func_decl_end=remove|nl_func_decl_end=force|nl_func_decl_end=not_defined
-ChoicesReadable="Ignore Nl Func Decl End|Add Nl Func Decl End|Remove Nl Func Decl End|Force Nl Func Decl End"
-ValueDefault=ignore
-
-[Nl Func Def End]
-Category=3
-Description="<html>Add or remove newline before the ')' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_end=ignore|nl_func_def_end=add|nl_func_def_end=remove|nl_func_def_end=force|nl_func_def_end=not_defined
-ChoicesReadable="Ignore Nl Func Def End|Add Nl Func Def End|Remove Nl Func Def End|Force Nl Func Def End"
-ValueDefault=ignore
-
-[Nl Func Decl End Single]
-Category=3
-Description="<html>Overrides nl_func_decl_end when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_end_single=ignore|nl_func_decl_end_single=add|nl_func_decl_end_single=remove|nl_func_decl_end_single=force|nl_func_decl_end_single=not_defined
-ChoicesReadable="Ignore Nl Func Decl End Single|Add Nl Func Decl End Single|Remove Nl Func Decl End Single|Force Nl Func Decl End Single"
-ValueDefault=ignore
-
-[Nl Func Def End Single]
-Category=3
-Description="<html>Overrides nl_func_def_end when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_end_single=ignore|nl_func_def_end_single=add|nl_func_def_end_single=remove|nl_func_def_end_single=force|nl_func_def_end_single=not_defined
-ChoicesReadable="Ignore Nl Func Def End Single|Add Nl Func Def End Single|Remove Nl Func Def End Single|Force Nl Func Def End Single"
-ValueDefault=ignore
-
-[Nl Func Decl End Multi Line]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function declaration if '(' and ')'<br/>are in different lines. If false, nl_func_decl_end is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_end_multi_line=true|nl_func_decl_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Def End Multi Line]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function definition if '(' and ')'<br/>are in different lines. If false, nl_func_def_end is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_end_multi_line=true|nl_func_def_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl Empty]
-Category=3
-Description="<html>Add or remove newline between '()' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_empty=ignore|nl_func_decl_empty=add|nl_func_decl_empty=remove|nl_func_decl_empty=force|nl_func_decl_empty=not_defined
-ChoicesReadable="Ignore Nl Func Decl Empty|Add Nl Func Decl Empty|Remove Nl Func Decl Empty|Force Nl Func Decl Empty"
-ValueDefault=ignore
-
-[Nl Func Def Empty]
-Category=3
-Description="<html>Add or remove newline between '()' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_empty=ignore|nl_func_def_empty=add|nl_func_def_empty=remove|nl_func_def_empty=force|nl_func_def_empty=not_defined
-ChoicesReadable="Ignore Nl Func Def Empty|Add Nl Func Def Empty|Remove Nl Func Def Empty|Force Nl Func Def Empty"
-ValueDefault=ignore
-
-[Nl Func Call Empty]
-Category=3
-Description="<html>Add or remove newline between '()' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_empty=ignore|nl_func_call_empty=add|nl_func_call_empty=remove|nl_func_call_empty=force|nl_func_call_empty=not_defined
-ChoicesReadable="Ignore Nl Func Call Empty|Add Nl Func Call Empty|Remove Nl Func Call Empty|Force Nl Func Call Empty"
-ValueDefault=ignore
-
-[Nl Func Call Start]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function call,<br/>has preference over nl_func_call_start_multi_line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_start=ignore|nl_func_call_start=add|nl_func_call_start=remove|nl_func_call_start=force|nl_func_call_start=not_defined
-ChoicesReadable="Ignore Nl Func Call Start|Add Nl Func Call Start|Remove Nl Func Call Start|Force Nl Func Call Start"
-ValueDefault=ignore
-
-[Nl Func Call End]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_end=ignore|nl_func_call_end=add|nl_func_call_end=remove|nl_func_call_end=force|nl_func_call_end=not_defined
-ChoicesReadable="Ignore Nl Func Call End|Add Nl Func Call End|Remove Nl Func Call End|Force Nl Func Call End"
-ValueDefault=ignore
-
-[Nl Func Call Start Multi Line]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function call if '(' and ')' are in<br/>different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_start_multi_line=true|nl_func_call_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Call Args Multi Line]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a function call if '(' and ')'<br/>are in different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_args_multi_line=true|nl_func_call_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Call End Multi Line]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function call if '(' and ')' are in<br/>different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_end_multi_line=true|nl_func_call_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Call Args Multi Line Ignore Closures]
-Category=3
-Description="<html>Whether to respect nl_func_call_XXX option in case of closure args.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_args_multi_line_ignore_closures=true|nl_func_call_args_multi_line_ignore_closures=false
-ValueDefault=false
-
-[Nl Template Start]
-Category=3
-Description="<html>Whether to add a newline after '&lt;' of a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_start=true|nl_template_start=false
-ValueDefault=false
-
-[Nl Template Args]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_args=true|nl_template_args=false
-ValueDefault=false
-
-[Nl Template End]
-Category=3
-Description="<html>Whether to add a newline before '&gt;' of a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_end=true|nl_template_end=false
-ValueDefault=false
-
-[Nl Oc Msg Args]
-Category=3
-Description="<html>(OC) Whether to put each Objective-C message parameter on a separate line.<br/>See nl_oc_msg_leave_one_liner.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_oc_msg_args=true|nl_oc_msg_args=false
-ValueDefault=false
-
-[Nl Fdef Brace]
-Category=3
-Description="<html>Add or remove newline between function signature and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_fdef_brace=ignore|nl_fdef_brace=add|nl_fdef_brace=remove|nl_fdef_brace=force|nl_fdef_brace=not_defined
-ChoicesReadable="Ignore Nl Fdef Brace|Add Nl Fdef Brace|Remove Nl Fdef Brace|Force Nl Fdef Brace"
-ValueDefault=ignore
-
-[Nl Fdef Brace Cond]
-Category=3
-Description="<html>Add or remove newline between function signature and '{',<br/>if signature ends with ')'. Overrides nl_fdef_brace.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_fdef_brace_cond=ignore|nl_fdef_brace_cond=add|nl_fdef_brace_cond=remove|nl_fdef_brace_cond=force|nl_fdef_brace_cond=not_defined
-ChoicesReadable="Ignore Nl Fdef Brace Cond|Add Nl Fdef Brace Cond|Remove Nl Fdef Brace Cond|Force Nl Fdef Brace Cond"
-ValueDefault=ignore
-
-[Nl Cpp Ldef Brace]
-Category=3
-Description="<html>Add or remove newline between C++11 lambda signature and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_cpp_ldef_brace=ignore|nl_cpp_ldef_brace=add|nl_cpp_ldef_brace=remove|nl_cpp_ldef_brace=force|nl_cpp_ldef_brace=not_defined
-ChoicesReadable="Ignore Nl Cpp Ldef Brace|Add Nl Cpp Ldef Brace|Remove Nl Cpp Ldef Brace|Force Nl Cpp Ldef Brace"
-ValueDefault=ignore
-
-[Nl Return Expr]
-Category=3
-Description="<html>Add or remove newline between 'return' and the return expression.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return_expr=force|nl_return_expr=not_defined
-ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
-ValueDefault=ignore
-
-[Nl After Semicolon]
-Category=3
-Description="<html>Whether to add a newline after semicolons, except in 'for' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_semicolon=true|nl_after_semicolon=false
-ValueDefault=false
-
-[Nl Paren Dbrace Open]
-Category=3
-Description="<html>(Java) Add or remove newline between the ')' and '{{' of the double brace<br/>initializer.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_paren_dbrace_open=ignore|nl_paren_dbrace_open=add|nl_paren_dbrace_open=remove|nl_paren_dbrace_open=force|nl_paren_dbrace_open=not_defined
-ChoicesReadable="Ignore Nl Paren Dbrace Open|Add Nl Paren Dbrace Open|Remove Nl Paren Dbrace Open|Force Nl Paren Dbrace Open"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst]
-Category=3
-Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_type_brace_init_lst=ignore|nl_type_brace_init_lst=add|nl_type_brace_init_lst=remove|nl_type_brace_init_lst=force|nl_type_brace_init_lst=not_defined
-ChoicesReadable="Ignore Nl Type Brace Init Lst|Add Nl Type Brace Init Lst|Remove Nl Type Brace Init Lst|Force Nl Type Brace Init Lst"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst Open]
-Category=3
-Description="<html>Whether to add a newline after the open brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_type_brace_init_lst_open=ignore|nl_type_brace_init_lst_open=add|nl_type_brace_init_lst_open=remove|nl_type_brace_init_lst_open=force|nl_type_brace_init_lst_open=not_defined
-ChoicesReadable="Ignore Nl Type Brace Init Lst Open|Add Nl Type Brace Init Lst Open|Remove Nl Type Brace Init Lst Open|Force Nl Type Brace Init Lst Open"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst Close]
-Category=3
-Description="<html>Whether to add a newline before the close brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_type_brace_init_lst_close=ignore|nl_type_brace_init_lst_close=add|nl_type_brace_init_lst_close=remove|nl_type_brace_init_lst_close=force|nl_type_brace_init_lst_close=not_defined
-ChoicesReadable="Ignore Nl Type Brace Init Lst Close|Add Nl Type Brace Init Lst Close|Remove Nl Type Brace Init Lst Close|Force Nl Type Brace Init Lst Close"
-ValueDefault=ignore
-
-[Nl After Brace Open]
-Category=3
-Description="<html>Whether to add a newline after '{'. This also adds a newline before the<br/>matching '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_open=true|nl_after_brace_open=false
-ValueDefault=false
-
-[Nl After Brace Open Cmt]
-Category=3
-Description="<html>Whether to add a newline between the open brace and a trailing single-line<br/>comment. Requires nl_after_brace_open=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_open_cmt=true|nl_after_brace_open_cmt=false
-ValueDefault=false
-
-[Nl After Vbrace Open]
-Category=3
-Description="<html>Whether to add a newline after a virtual brace open with a non-empty body.<br/>These occur in un-braced if/while/do/for statement bodies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_open=true|nl_after_vbrace_open=false
-ValueDefault=false
-
-[Nl After Vbrace Open Empty]
-Category=3
-Description="<html>Whether to add a newline after a virtual brace open with an empty body.<br/>These occur in un-braced if/while/do/for statement bodies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_open_empty=true|nl_after_vbrace_open_empty=false
-ValueDefault=false
-
-[Nl After Brace Close]
-Category=3
-Description="<html>Whether to add a newline after '}'. Does not apply if followed by a<br/>necessary ';'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_close=true|nl_after_brace_close=false
-ValueDefault=false
-
-[Nl After Vbrace Close]
-Category=3
-Description="<html>Whether to add a newline after a virtual brace close,<br/>as in 'if (foo) a++; &lt;here&gt; return;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_close=true|nl_after_vbrace_close=false
-ValueDefault=false
-
-[Nl Brace Struct Var]
-Category=3
-Description="<html>Add or remove newline between the close brace and identifier,<br/>as in 'struct { int a; } &lt;here&gt; b;'. Affects enumerations, unions and<br/>structures. If set to ignore, uses nl_after_brace_close.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_struct_var=ignore|nl_brace_struct_var=add|nl_brace_struct_var=remove|nl_brace_struct_var=force|nl_brace_struct_var=not_defined
-ChoicesReadable="Ignore Nl Brace Struct Var|Add Nl Brace Struct Var|Remove Nl Brace Struct Var|Force Nl Brace Struct Var"
-ValueDefault=ignore
-
-[Nl Define Macro]
-Category=3
-Description="<html>Whether to alter newlines in '#define' macros.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_define_macro=true|nl_define_macro=false
-ValueDefault=false
-
-[Nl Squeeze Paren Close]
-Category=3
-Description="<html>Whether to alter newlines between consecutive parenthesis closes. The number<br/>of closing parentheses in a line will depend on respective open parenthesis<br/>lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_paren_close=true|nl_squeeze_paren_close=false
-ValueDefault=false
-
-[Nl Squeeze Ifdef]
-Category=3
-Description="<html>Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and<br/>'#endif'. Does not affect top-level #ifdefs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_ifdef=true|nl_squeeze_ifdef=false
-ValueDefault=false
-
-[Nl Squeeze Ifdef Top Level]
-Category=3
-Description="<html>Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_ifdef_top_level=true|nl_squeeze_ifdef_top_level=false
-ValueDefault=false
-
-[Nl Before If]
-Category=3
-Description="<html>Add or remove blank line before 'if'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force|nl_before_if=not_defined
-ChoicesReadable="Ignore Nl Before If|Add Nl Before If|Remove Nl Before If|Force Nl Before If"
-ValueDefault=ignore
-
-[Nl After If]
-Category=3
-Description="<html>Add or remove blank line after 'if' statement. Add/Force work only if the<br/>next token is not a closing brace.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force|nl_after_if=not_defined
-ChoicesReadable="Ignore Nl After If|Add Nl After If|Remove Nl After If|Force Nl After If"
-ValueDefault=ignore
-
-[Nl Before For]
-Category=3
-Description="<html>Add or remove blank line before 'for'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force|nl_before_for=not_defined
-ChoicesReadable="Ignore Nl Before For|Add Nl Before For|Remove Nl Before For|Force Nl Before For"
-ValueDefault=ignore
-
-[Nl After For]
-Category=3
-Description="<html>Add or remove blank line after 'for' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force|nl_after_for=not_defined
-ChoicesReadable="Ignore Nl After For|Add Nl After For|Remove Nl After For|Force Nl After For"
-ValueDefault=ignore
-
-[Nl Before While]
-Category=3
-Description="<html>Add or remove blank line before 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force|nl_before_while=not_defined
-ChoicesReadable="Ignore Nl Before While|Add Nl Before While|Remove Nl Before While|Force Nl Before While"
-ValueDefault=ignore
-
-[Nl After While]
-Category=3
-Description="<html>Add or remove blank line after 'while' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force|nl_after_while=not_defined
-ChoicesReadable="Ignore Nl After While|Add Nl After While|Remove Nl After While|Force Nl After While"
-ValueDefault=ignore
-
-[Nl Before Switch]
-Category=3
-Description="<html>Add or remove blank line before 'switch'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force|nl_before_switch=not_defined
-ChoicesReadable="Ignore Nl Before Switch|Add Nl Before Switch|Remove Nl Before Switch|Force Nl Before Switch"
-ValueDefault=ignore
-
-[Nl After Switch]
-Category=3
-Description="<html>Add or remove blank line after 'switch' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force|nl_after_switch=not_defined
-ChoicesReadable="Ignore Nl After Switch|Add Nl After Switch|Remove Nl After Switch|Force Nl After Switch"
-ValueDefault=ignore
-
-[Nl Before Synchronized]
-Category=3
-Description="<html>Add or remove blank line before 'synchronized'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_synchronized=ignore|nl_before_synchronized=add|nl_before_synchronized=remove|nl_before_synchronized=force|nl_before_synchronized=not_defined
-ChoicesReadable="Ignore Nl Before Synchronized|Add Nl Before Synchronized|Remove Nl Before Synchronized|Force Nl Before Synchronized"
-ValueDefault=ignore
-
-[Nl After Synchronized]
-Category=3
-Description="<html>Add or remove blank line after 'synchronized' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_synchronized=ignore|nl_after_synchronized=add|nl_after_synchronized=remove|nl_after_synchronized=force|nl_after_synchronized=not_defined
-ChoicesReadable="Ignore Nl After Synchronized|Add Nl After Synchronized|Remove Nl After Synchronized|Force Nl After Synchronized"
-ValueDefault=ignore
-
-[Nl Before Do]
-Category=3
-Description="<html>Add or remove blank line before 'do'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force|nl_before_do=not_defined
-ChoicesReadable="Ignore Nl Before Do|Add Nl Before Do|Remove Nl Before Do|Force Nl Before Do"
-ValueDefault=ignore
-
-[Nl After Do]
-Category=3
-Description="<html>Add or remove blank line after 'do/while' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force|nl_after_do=not_defined
-ChoicesReadable="Ignore Nl After Do|Add Nl After Do|Remove Nl After Do|Force Nl After Do"
-ValueDefault=ignore
-
-[Nl Before Return]
-Category=3
-Description="<html>Whether to put a blank line before 'return' statements, unless after an open<br/>brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_return=true|nl_before_return=false
-ValueDefault=false
-
-[Nl After Return]
-Category=3
-Description="<html>Whether to put a blank line after 'return' statements, unless followed by a<br/>close brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_return=true|nl_after_return=false
-ValueDefault=false
-
-[Nl Before Member]
-Category=3
-Description="<html>Whether to put a blank line before a member '.' or '-&gt;' operators.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_member=ignore|nl_before_member=add|nl_before_member=remove|nl_before_member=force|nl_before_member=not_defined
-ChoicesReadable="Ignore Nl Before Member|Add Nl Before Member|Remove Nl Before Member|Force Nl Before Member"
-ValueDefault=ignore
-
-[Nl After Member]
-Category=3
-Description="<html>(Java) Whether to put a blank line after a member '.' or '-&gt;' operators.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_member=ignore|nl_after_member=add|nl_after_member=remove|nl_after_member=force|nl_after_member=not_defined
-ChoicesReadable="Ignore Nl After Member|Add Nl After Member|Remove Nl After Member|Force Nl After Member"
-ValueDefault=ignore
-
-[Nl Ds Struct Enum Cmt]
-Category=3
-Description="<html>Whether to double-space commented-entries in 'struct'/'union'/'enum'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_ds_struct_enum_cmt=true|nl_ds_struct_enum_cmt=false
-ValueDefault=false
-
-[Nl Ds Struct Enum Close Brace]
-Category=3
-Description="<html>Whether to force a newline before '}' of a 'struct'/'union'/'enum'.<br/>(Lower priority than eat_blanks_before_close_brace.)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_ds_struct_enum_close_brace=true|nl_ds_struct_enum_close_brace=false
-ValueDefault=false
-
-[Nl Class Colon]
-Category=3
-Description="<html>Add or remove newline before or after (depending on pos_class_colon) a class<br/>colon, as in 'class Foo &lt;here&gt; : &lt;or here&gt; public Bar'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force|nl_class_colon=not_defined
-ChoicesReadable="Ignore Nl Class Colon|Add Nl Class Colon|Remove Nl Class Colon|Force Nl Class Colon"
-ValueDefault=ignore
-
-[Nl Constr Colon]
-Category=3
-Description="<html>Add or remove newline around a class constructor colon. The exact position<br/>depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_constr_colon=ignore|nl_constr_colon=add|nl_constr_colon=remove|nl_constr_colon=force|nl_constr_colon=not_defined
-ChoicesReadable="Ignore Nl Constr Colon|Add Nl Constr Colon|Remove Nl Constr Colon|Force Nl Constr Colon"
-ValueDefault=ignore
-
-[Nl Namespace Two To One Liner]
-Category=3
-Description="<html>Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'<br/>into a single line. If true, prevents other brace newline rules from turning<br/>such code into four lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_namespace_two_to_one_liner=true|nl_namespace_two_to_one_liner=false
-ValueDefault=false
-
-[Nl Create If One Liner]
-Category=3
-Description="<html>Whether to remove a newline in simple unbraced if statements, turning them<br/>into one-liners, as in 'if(b)\n i++;' =&gt; 'if(b) i++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_if_one_liner=true|nl_create_if_one_liner=false
-ValueDefault=false
-
-[Nl Create For One Liner]
-Category=3
-Description="<html>Whether to remove a newline in simple unbraced for statements, turning them<br/>into one-liners, as in 'for (...)\n stmt;' =&gt; 'for (...) stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_for_one_liner=true|nl_create_for_one_liner=false
-ValueDefault=false
-
-[Nl Create While One Liner]
-Category=3
-Description="<html>Whether to remove a newline in simple unbraced while statements, turning<br/>them into one-liners, as in 'while (expr)\n stmt;' =&gt; 'while (expr) stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_while_one_liner=true|nl_create_while_one_liner=false
-ValueDefault=false
-
-[Nl Create Func Def One Liner]
-Category=3
-Description="<html>Whether to collapse a function definition whose body (not counting braces)<br/>is only one line so that the entire definition (prototype, braces, body) is<br/>a single line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_func_def_one_liner=true|nl_create_func_def_one_liner=false
-ValueDefault=false
-
-[Nl Create List One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced if statements into three lines by<br/>adding newlines, as in 'int a[12] = { &lt;here&gt; 0 &lt;here&gt; };'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_list_one_liner=true|nl_create_list_one_liner=false
-ValueDefault=false
-
-[Nl Split If One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced if statements into two lines by<br/>adding a newline, as in 'if(b) &lt;here&gt; i++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_if_one_liner=true|nl_split_if_one_liner=false
-ValueDefault=false
-
-[Nl Split For One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced for statements into two lines by<br/>adding a newline, as in 'for (...) &lt;here&gt; stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_for_one_liner=true|nl_split_for_one_liner=false
-ValueDefault=false
-
-[Nl Split While One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced while statements into two lines by<br/>adding a newline, as in 'while (expr) &lt;here&gt; stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_while_one_liner=true|nl_split_while_one_liner=false
-ValueDefault=false
-
-[Donot Add Nl Before Cpp Comment]
-Category=3
-Description="<html>Don't add a newline before a cpp-comment in a parameter list of a function<br/>call.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=donot_add_nl_before_cpp_comment=true|donot_add_nl_before_cpp_comment=false
-ValueDefault=false
-
-[Nl Max]
-Category=4
-Description="<html>The maximum number of consecutive newlines (3 = 2 blank lines).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_max="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Max Blank In Func]
-Category=4
-Description="<html>The maximum number of consecutive newlines in a function.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_max_blank_in_func="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Inside Empty Func]
-Category=4
-Description="<html>The number of newlines inside an empty function body.<br/>This option overrides eat_blanks_after_open_brace and<br/>eat_blanks_before_close_brace, but is ignored when<br/>nl_collapse_empty_body=true</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_inside_empty_func="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Body Proto]
-Category=4
-Description="<html>The number of newlines before a function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_body_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Body Def]
-Category=4
-Description="<html>The number of newlines before a multi-line function definition. Where<br/>applicable, this option is overridden with eat_blanks_after_open_brace=true</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_body_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Class Proto]
-Category=4
-Description="<html>The number of newlines before a class constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_class_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Class Def]
-Category=4
-Description="<html>The number of newlines before a class constructor/destructor definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_class_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Proto]
-Category=4
-Description="<html>The number of newlines after a function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Proto Group]
-Category=4
-Description="<html>The number of newlines after a function prototype, if not followed by<br/>another function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_proto_group="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Class Proto]
-Category=4
-Description="<html>The number of newlines after a class constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_class_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Class Proto Group]
-Category=4
-Description="<html>The number of newlines after a class constructor/destructor prototype,<br/>if not followed by another constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_class_proto_group="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Class Leave One Liner Groups]
-Category=4
-Description="<html>Whether one-line method definitions inside a class body should be treated<br/>as if they were prototypes for the purposes of adding newlines.<br/><br/>Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def<br/>and nl_before_func_class_def for one-liners.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_class_leave_one_liner_groups=true|nl_class_leave_one_liner_groups=false
-ValueDefault=false
-
-[Nl After Func Body]
-Category=4
-Description="<html>The number of newlines after '}' of a multi-line function body.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Body Class]
-Category=4
-Description="<html>The number of newlines after '}' of a multi-line function body in a class<br/>declaration. Also affects class constructors/destructors.<br/><br/>Overrides nl_after_func_body.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Body One Liner]
-Category=4
-Description="<html>The number of newlines after '}' of a single line function body. Also<br/>affects class constructors/destructors.<br/><br/>Overrides nl_after_func_body and nl_after_func_body_class.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body_one_liner="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Func Var Def Blk]
-Category=4
-Description="<html>The number of blank lines after a block of variable definitions at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_func_var_def_blk="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk Start]
-Category=4
-Description="<html>The number of newlines before a block of typedefs. If nl_after_access_spec<br/>is non-zero, that option takes precedence.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_start="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk End]
-Category=4
-Description="<html>The number of newlines after a block of typedefs.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_end="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk In]
-Category=4
-Description="<html>The maximum number of consecutive newlines within a block of typedefs.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_in="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk Start]
-Category=4
-Description="<html>The number of newlines before a block of variable definitions not at the top<br/>of a function body. If nl_after_access_spec is non-zero, that option takes<br/>precedence.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_start="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk End]
-Category=4
-Description="<html>The number of newlines after a block of variable definitions not at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_end="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk In]
-Category=4
-Description="<html>The maximum number of consecutive newlines within a block of variable<br/>definitions.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_in="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Block Comment]
-Category=4
-Description="<html>The minimum number of newlines before a multi-line comment.<br/>Doesn't apply if after a brace open or another multi-line comment.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_block_comment="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before C Comment]
-Category=4
-Description="<html>The minimum number of newlines before a single-line C comment.<br/>Doesn't apply if after a brace open or other single-line C comments.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_c_comment="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Cpp Comment]
-Category=4
-Description="<html>The minimum number of newlines before a CPP comment.<br/>Doesn't apply if after a brace open or other CPP comments.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_cpp_comment="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Multiline Comment]
-Category=4
-Description="<html>Whether to force a newline after a multi-line comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_multiline_comment=true|nl_after_multiline_comment=false
-ValueDefault=false
-
-[Nl After Label Colon]
-Category=4
-Description="<html>Whether to force a newline after a label's colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_label_colon=true|nl_after_label_colon=false
-ValueDefault=false
-
-[Nl After Struct]
-Category=4
-Description="<html>The number of newlines after '}' or ';' of a struct/enum/union definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_struct="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Class]
-Category=4
-Description="<html>The number of newlines before a class definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Class]
-Category=4
-Description="<html>The number of newlines after '}' or ';' of a class definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Namespace]
-Category=4
-Description="<html>The number of newlines before a namespace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Inside Namespace]
-Category=4
-Description="<html>The number of newlines after '{' of a namespace. This also adds newlines<br/>before the matching '}'.<br/><br/>0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if<br/>    applicable, otherwise no change.<br/><br/>Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_inside_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Namespace]
-Category=4
-Description="<html>The number of newlines after '}' of a namespace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Access Spec]
-Category=4
-Description="<html>The number of newlines before an access specifier label. This also includes<br/>the Qt-specific 'signals:' and 'slots:'. Will not change the newline count<br/>if after a brace open.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_access_spec="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Access Spec]
-Category=4
-Description="<html>The number of newlines after an access specifier label. This also includes<br/>the Qt-specific 'signals:' and 'slots:'. Will not change the newline count<br/>if after a brace open.<br/><br/>0: No change (default).<br/><br/>Overrides nl_typedef_blk_start and nl_var_def_blk_start.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_access_spec="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Comment Func Def]
-Category=4
-Description="<html>The number of newlines between a function definition and the function<br/>comment, as in '// comment\n &lt;here&gt; void foo() {...}'.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_comment_func_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Try Catch Finally]
-Category=4
-Description="<html>The number of newlines after a try-catch-finally block that isn't followed<br/>by a brace close.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_try_catch_finally="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Around Cs Property]
-Category=4
-Description="<html>(C#) The number of newlines before and after a property, indexer or event<br/>declaration.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_around_cs_property="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Between Get Set]
-Category=4
-Description="<html>(C#) The number of newlines between the get/set/add/remove handlers.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_between_get_set="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Property Brace]
-Category=4
-Description="<html>(C#) Add or remove newline between property and the '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_property_brace=ignore|nl_property_brace=add|nl_property_brace=remove|nl_property_brace=force|nl_property_brace=not_defined
-ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
-ValueDefault=ignore
-
-[Eat Blanks After Open Brace]
-Category=4
-Description="<html>Whether to remove blank lines after '{'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=eat_blanks_after_open_brace=true|eat_blanks_after_open_brace=false
-ValueDefault=false
-
-[Eat Blanks Before Close Brace]
-Category=4
-Description="<html>Whether to remove blank lines before '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=eat_blanks_before_close_brace=true|eat_blanks_before_close_brace=false
-ValueDefault=false
-
-[Nl Remove Extra Newlines]
-Category=4
-Description="<html>How aggressively to remove extra newlines not in preprocessor.<br/><br/>0: No change (default)<br/>1: Remove most newlines not handled by other config<br/>2: Remove all newlines and reformat completely by config</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_remove_extra_newlines="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Nl After Annotation]
-Category=4
-Description="<html>(Java) Add or remove newline after an annotation statement. Only affects<br/>annotations that are after a newline.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_annotation=ignore|nl_after_annotation=add|nl_after_annotation=remove|nl_after_annotation=force|nl_after_annotation=not_defined
-ChoicesReadable="Ignore Nl After Annotation|Add Nl After Annotation|Remove Nl After Annotation|Force Nl After Annotation"
-ValueDefault=ignore
-
-[Nl Between Annotation]
-Category=4
-Description="<html>(Java) Add or remove newline between two annotations.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_between_annotation=ignore|nl_between_annotation=add|nl_between_annotation=remove|nl_between_annotation=force|nl_between_annotation=not_defined
-ChoicesReadable="Ignore Nl Between Annotation|Add Nl Between Annotation|Remove Nl Between Annotation|Force Nl Between Annotation"
-ValueDefault=ignore
-
-[Nl Before Whole File Ifdef]
-Category=4
-Description="<html>The number of newlines before a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_whole_file_ifdef="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Whole File Ifdef]
-Category=4
-Description="<html>The number of newlines after a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_whole_file_ifdef="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Whole File Endif]
-Category=4
-Description="<html>The number of newlines before a whole-file #endif.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_whole_file_endif="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Whole File Endif]
-Category=4
-Description="<html>The number of newlines after a whole-file #endif.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_whole_file_endif="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Pos Arith]
-Category=5
-Description="<html>The position of arithmetic operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_arith=ignore|pos_arith=break|pos_arith=force|pos_arith=lead|pos_arith=trail|pos_arith=join|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail_break|pos_arith=trail_force
-ChoicesReadable="Ignore Pos Arith|Break Pos Arith|Force Pos Arith|Lead Pos Arith|Trail Pos Arith|Join Pos Arith|Lead Break Pos Arith|Lead Force Pos Arith|Trail Break Pos Arith|Trail Force Pos Arith"
-ValueDefault=ignore
-
-[Pos Assign]
-Category=5
-Description="<html>The position of assignment in wrapped expressions. Do not affect '='<br/>followed by '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_assign=ignore|pos_assign=break|pos_assign=force|pos_assign=lead|pos_assign=trail|pos_assign=join|pos_assign=lead_break|pos_assign=lead_force|pos_assign=trail_break|pos_assign=trail_force
-ChoicesReadable="Ignore Pos Assign|Break Pos Assign|Force Pos Assign|Lead Pos Assign|Trail Pos Assign|Join Pos Assign|Lead Break Pos Assign|Lead Force Pos Assign|Trail Break Pos Assign|Trail Force Pos Assign"
-ValueDefault=ignore
-
-[Pos Bool]
-Category=5
-Description="<html>The position of Boolean operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_bool=ignore|pos_bool=break|pos_bool=force|pos_bool=lead|pos_bool=trail|pos_bool=join|pos_bool=lead_break|pos_bool=lead_force|pos_bool=trail_break|pos_bool=trail_force
-ChoicesReadable="Ignore Pos Bool|Break Pos Bool|Force Pos Bool|Lead Pos Bool|Trail Pos Bool|Join Pos Bool|Lead Break Pos Bool|Lead Force Pos Bool|Trail Break Pos Bool|Trail Force Pos Bool"
-ValueDefault=ignore
-
-[Pos Compare]
-Category=5
-Description="<html>The position of comparison operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_compare=ignore|pos_compare=break|pos_compare=force|pos_compare=lead|pos_compare=trail|pos_compare=join|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail_break|pos_compare=trail_force
-ChoicesReadable="Ignore Pos Compare|Break Pos Compare|Force Pos Compare|Lead Pos Compare|Trail Pos Compare|Join Pos Compare|Lead Break Pos Compare|Lead Force Pos Compare|Trail Break Pos Compare|Trail Force Pos Compare"
-ValueDefault=ignore
-
-[Pos Conditional]
-Category=5
-Description="<html>The position of conditional operators, as in the '?' and ':' of<br/>'expr ? stmt : stmt', in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_conditional=ignore|pos_conditional=break|pos_conditional=force|pos_conditional=lead|pos_conditional=trail|pos_conditional=join|pos_conditional=lead_break|pos_conditional=lead_force|pos_conditional=trail_break|pos_conditional=trail_force
-ChoicesReadable="Ignore Pos Conditional|Break Pos Conditional|Force Pos Conditional|Lead Pos Conditional|Trail Pos Conditional|Join Pos Conditional|Lead Break Pos Conditional|Lead Force Pos Conditional|Trail Break Pos Conditional|Trail Force Pos Conditional"
-ValueDefault=ignore
-
-[Pos Comma]
-Category=5
-Description="<html>The position of the comma in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_comma=ignore|pos_comma=break|pos_comma=force|pos_comma=lead|pos_comma=trail|pos_comma=join|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail_break|pos_comma=trail_force
-ChoicesReadable="Ignore Pos Comma|Break Pos Comma|Force Pos Comma|Lead Pos Comma|Trail Pos Comma|Join Pos Comma|Lead Break Pos Comma|Lead Force Pos Comma|Trail Break Pos Comma|Trail Force Pos Comma"
-ValueDefault=ignore
-
-[Pos Enum Comma]
-Category=5
-Description="<html>The position of the comma in enum entries.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_enum_comma=ignore|pos_enum_comma=break|pos_enum_comma=force|pos_enum_comma=lead|pos_enum_comma=trail|pos_enum_comma=join|pos_enum_comma=lead_break|pos_enum_comma=lead_force|pos_enum_comma=trail_break|pos_enum_comma=trail_force
-ChoicesReadable="Ignore Pos Enum Comma|Break Pos Enum Comma|Force Pos Enum Comma|Lead Pos Enum Comma|Trail Pos Enum Comma|Join Pos Enum Comma|Lead Break Pos Enum Comma|Lead Force Pos Enum Comma|Trail Break Pos Enum Comma|Trail Force Pos Enum Comma"
-ValueDefault=ignore
-
-[Pos Class Comma]
-Category=5
-Description="<html>The position of the comma in the base class list if there is more than one<br/>line. Affects nl_class_init_args.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_class_comma=ignore|pos_class_comma=break|pos_class_comma=force|pos_class_comma=lead|pos_class_comma=trail|pos_class_comma=join|pos_class_comma=lead_break|pos_class_comma=lead_force|pos_class_comma=trail_break|pos_class_comma=trail_force
-ChoicesReadable="Ignore Pos Class Comma|Break Pos Class Comma|Force Pos Class Comma|Lead Pos Class Comma|Trail Pos Class Comma|Join Pos Class Comma|Lead Break Pos Class Comma|Lead Force Pos Class Comma|Trail Break Pos Class Comma|Trail Force Pos Class Comma"
-ValueDefault=ignore
-
-[Pos Constr Comma]
-Category=5
-Description="<html>The position of the comma in the constructor initialization list.<br/>Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_constr_comma=ignore|pos_constr_comma=break|pos_constr_comma=force|pos_constr_comma=lead|pos_constr_comma=trail|pos_constr_comma=join|pos_constr_comma=lead_break|pos_constr_comma=lead_force|pos_constr_comma=trail_break|pos_constr_comma=trail_force
-ChoicesReadable="Ignore Pos Constr Comma|Break Pos Constr Comma|Force Pos Constr Comma|Lead Pos Constr Comma|Trail Pos Constr Comma|Join Pos Constr Comma|Lead Break Pos Constr Comma|Lead Force Pos Constr Comma|Trail Break Pos Constr Comma|Trail Force Pos Constr Comma"
-ValueDefault=ignore
-
-[Pos Class Colon]
-Category=5
-Description="<html>The position of trailing/leading class colon, between class and base class<br/>list. Affects nl_class_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_class_colon=ignore|pos_class_colon=break|pos_class_colon=force|pos_class_colon=lead|pos_class_colon=trail|pos_class_colon=join|pos_class_colon=lead_break|pos_class_colon=lead_force|pos_class_colon=trail_break|pos_class_colon=trail_force
-ChoicesReadable="Ignore Pos Class Colon|Break Pos Class Colon|Force Pos Class Colon|Lead Pos Class Colon|Trail Pos Class Colon|Join Pos Class Colon|Lead Break Pos Class Colon|Lead Force Pos Class Colon|Trail Break Pos Class Colon|Trail Force Pos Class Colon"
-ValueDefault=ignore
-
-[Pos Constr Colon]
-Category=5
-Description="<html>The position of colons between constructor and member initialization.<br/>Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_constr_colon=ignore|pos_constr_colon=break|pos_constr_colon=force|pos_constr_colon=lead|pos_constr_colon=trail|pos_constr_colon=join|pos_constr_colon=lead_break|pos_constr_colon=lead_force|pos_constr_colon=trail_break|pos_constr_colon=trail_force
-ChoicesReadable="Ignore Pos Constr Colon|Break Pos Constr Colon|Force Pos Constr Colon|Lead Pos Constr Colon|Trail Pos Constr Colon|Join Pos Constr Colon|Lead Break Pos Constr Colon|Lead Force Pos Constr Colon|Trail Break Pos Constr Colon|Trail Force Pos Constr Colon"
-ValueDefault=ignore
-
-[Pos Shift]
-Category=5
-Description="<html>The position of shift operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_shift=ignore|pos_shift=break|pos_shift=force|pos_shift=lead|pos_shift=trail|pos_shift=join|pos_shift=lead_break|pos_shift=lead_force|pos_shift=trail_break|pos_shift=trail_force
-ChoicesReadable="Ignore Pos Shift|Break Pos Shift|Force Pos Shift|Lead Pos Shift|Trail Pos Shift|Join Pos Shift|Lead Break Pos Shift|Lead Force Pos Shift|Trail Break Pos Shift|Trail Force Pos Shift"
-ValueDefault=ignore
-
-[Code Width]
-Category=6
-Description="<html>Try to limit code width to N columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="code_width="
-MinVal=0
-MaxVal=10000
-ValueDefault=0
-
-[Ls For Split Full]
-Category=6
-Description="<html>Whether to fully split long 'for' statements at semi-colons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_for_split_full=true|ls_for_split_full=false
-ValueDefault=false
-
-[Ls Func Split Full]
-Category=6
-Description="<html>Whether to fully split long function prototypes/calls at commas.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_func_split_full=true|ls_func_split_full=false
-ValueDefault=false
-
-[Ls Code Width]
-Category=6
-Description="<html>Whether to split lines as close to code_width as possible and ignore some<br/>groupings.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_code_width=true|ls_code_width=false
-ValueDefault=false
-
-[Align Keep Tabs]
-Category=7
-Description="<html>Whether to keep non-indenting tabs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_keep_tabs=true|align_keep_tabs=false
-ValueDefault=false
-
-[Align With Tabs]
-Category=7
-Description="<html>Whether to use tabs for aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_with_tabs=true|align_with_tabs=false
-ValueDefault=false
-
-[Align On Tabstop]
-Category=7
-Description="<html>Whether to bump out to the next tab when aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_on_tabstop=true|align_on_tabstop=false
-ValueDefault=false
-
-[Align Number Right]
-Category=7
-Description="<html>Whether to right-align numbers.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_number_right=true|align_number_right=false
-ValueDefault=false
-
-[Align Keep Extra Space]
-Category=7
-Description="<html>Whether to keep whitespace not required for alignment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_keep_extra_space=true|align_keep_extra_space=false
-ValueDefault=false
-
-[Align Func Params]
-Category=7
-Description="<html>Whether to align variable definitions in prototypes and functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_func_params=true|align_func_params=false
-ValueDefault=false
-
-[Align Func Params Span]
-Category=7
-Description="<html>The span for aligning parameter definitions in function on parameter name.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Func Params Thresh]
-Category=7
-Description="<html>The threshold for aligning function parameter definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Params Gap]
-Category=7
-Description="<html>The gap for aligning function parameter definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Constr Value Span]
-Category=7
-Description="<html>The span for aligning constructor value.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Constr Value Thresh]
-Category=7
-Description="<html>The threshold for aligning constructor value.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Constr Value Gap]
-Category=7
-Description="<html>The gap for aligning constructor value.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Same Func Call Params]
-Category=7
-Description="<html>Whether to align parameters in single-line functions that have the same<br/>name. The function names must already be aligned with each other.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_same_func_call_params=true|align_same_func_call_params=false
-ValueDefault=false
-
-[Align Same Func Call Params Span]
-Category=7
-Description="<html>The span for aligning function-call parameters for single line functions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_same_func_call_params_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Same Func Call Params Thresh]
-Category=7
-Description="<html>The threshold for aligning function-call parameters for single line<br/>functions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_same_func_call_params_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Span]
-Category=7
-Description="<html>The span for aligning variable definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Star Style]
-Category=7
-Description="<html>How to consider (or treat) the '*' in the alignment of variable definitions.<br/><br/>0: Part of the type     'void *   foo;' (default)<br/>1: Part of the variable 'void     *foo;'<br/>2: Dangling             'void    *foo;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_star_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Var Def Amp Style]
-Category=7
-Description="<html>How to consider (or treat) the '&amp;' in the alignment of variable definitions.<br/><br/>0: Part of the type     'long &amp;   foo;' (default)<br/>1: Part of the variable 'long     &amp;foo;'<br/>2: Dangling             'long    &amp;foo;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_amp_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Var Def Thresh]
-Category=7
-Description="<html>The threshold for aligning variable definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Gap]
-Category=7
-Description="<html>The gap for aligning variable definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Def Colon]
-Category=7
-Description="<html>Whether to align the colon in struct bit fields.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_colon=true|align_var_def_colon=false
-ValueDefault=false
-
-[Align Var Def Colon Gap]
-Category=7
-Description="<html>The gap for aligning the colon in struct bit fields.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_colon_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Def Attribute]
-Category=7
-Description="<html>Whether to align any attribute after the variable name.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_attribute=true|align_var_def_attribute=false
-ValueDefault=false
-
-[Align Var Def Inline]
-Category=7
-Description="<html>Whether to align inline struct/enum/union variable definitions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_inline=true|align_var_def_inline=false
-ValueDefault=false
-
-[Align Assign Span]
-Category=7
-Description="<html>The span for aligning on '=' in assignments.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Func Proto Span]
-Category=7
-Description="<html>The span for aligning on '=' in function prototype modifier.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_func_proto_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Thresh]
-Category=7
-Description="<html>The threshold for aligning on '=' in assignments.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Decl Func]
-Category=7
-Description="<html>How to apply align_assign_span to function declaration "assignments", i.e.<br/>'virtual void foo() = 0' or '~foo() = {default|delete}'.<br/><br/>0: Align with other assignments (default)<br/>1: Align with each other, ignoring regular assignments<br/>2: Don't align</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_decl_func="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Enum Equ Span]
-Category=7
-Description="<html>The span for aligning on '=' in enums.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_enum_equ_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Enum Equ Thresh]
-Category=7
-Description="<html>The threshold for aligning on '=' in enums.<br/>Use a negative number for absolute thresholds.<br/><br/>0: no limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_enum_equ_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Span]
-Category=7
-Description="<html>The span for aligning class member definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Thresh]
-Category=7
-Description="<html>The threshold for aligning class member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Gap]
-Category=7
-Description="<html>The gap for aligning class member definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Struct Span]
-Category=7
-Description="<html>The span for aligning struct/union member definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Struct Thresh]
-Category=7
-Description="<html>The threshold for aligning struct/union member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Struct Gap]
-Category=7
-Description="<html>The gap for aligning struct/union member definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Struct Init Span]
-Category=7
-Description="<html>The span for aligning struct initializer values.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_struct_init_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Typedef Span]
-Category=7
-Description="<html>The span for aligning single-line typedefs.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Typedef Gap]
-Category=7
-Description="<html>The minimum space between the type and the synonym of a typedef.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Typedef Func]
-Category=7
-Description="<html>How to align typedef'd functions with other typedefs.<br/><br/>0: Don't mix them at all (default)<br/>1: Align the open parenthesis with the types<br/>2: Align the function type name with the other type names</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_func="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Typedef Star Style]
-Category=7
-Description="<html>How to consider (or treat) the '*' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int * pint;' (default)<br/>1: Part of type name:        'typedef int   *pint;'<br/>2: Dangling:                 'typedef int  *pint;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_star_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Typedef Amp Style]
-Category=7
-Description="<html>How to consider (or treat) the '&amp;' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int &amp; intref;' (default)<br/>1: Part of type name:        'typedef int   &amp;intref;'<br/>2: Dangling:                 'typedef int  &amp;intref;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_amp_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Right Cmt Span]
-Category=7
-Description="<html>The span for aligning comments that end lines.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Right Cmt Gap]
-Category=7
-Description="<html>Minimum number of columns between preceding text and a trailing comment in<br/>order for the comment to qualify for being aligned. Must be non-zero to have<br/>an effect.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Right Cmt Mix]
-Category=7
-Description="<html>If aligning comments, whether to mix with comments after '}' and #endif with<br/>less than three spaces before the comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_right_cmt_mix=true|align_right_cmt_mix=false
-ValueDefault=false
-
-[Align Right Cmt Same Level]
-Category=7
-Description="<html>Whether to only align trailing comments that are at the same brace level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_right_cmt_same_level=true|align_right_cmt_same_level=false
-ValueDefault=false
-
-[Align Right Cmt At Col]
-Category=7
-Description="<html>Minimum column at which to align trailing comments. Comments which are<br/>aligned beyond this column, but which can be aligned in a lesser column,<br/>may be "pulled in".<br/><br/>0: Ignore (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_at_col="
-MinVal=0
-MaxVal=200
-ValueDefault=0
-
-[Align Func Proto Span]
-Category=7
-Description="<html>The span for aligning function prototypes.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Proto Thresh]
-Category=7
-Description="<html>The threshold for aligning function prototypes.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Proto Gap]
-Category=7
-Description="<html>Minimum gap between the return type and the function name.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align On Operator]
-Category=7
-Description="<html>Whether to align function prototypes on the 'operator' keyword instead of<br/>what follows.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_on_operator=true|align_on_operator=false
-ValueDefault=false
-
-[Align Mix Var Proto]
-Category=7
-Description="<html>Whether to mix aligning prototype and variable declarations. If true,<br/>align_var_def_XXX options are used instead of align_func_proto_XXX options.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_mix_var_proto=true|align_mix_var_proto=false
-ValueDefault=false
-
-[Align Single Line Func]
-Category=7
-Description="<html>Whether to align single-line functions with function prototypes.<br/>Uses align_func_proto_span.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_single_line_func=true|align_single_line_func=false
-ValueDefault=false
-
-[Align Single Line Brace]
-Category=7
-Description="<html>Whether to align the open brace of single-line functions.<br/>Requires align_single_line_func=true. Uses align_func_proto_span.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_single_line_brace=true|align_single_line_brace=false
-ValueDefault=false
-
-[Align Single Line Brace Gap]
-Category=7
-Description="<html>Gap for align_single_line_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_single_line_brace_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Oc Msg Spec Span]
-Category=7
-Description="<html>(OC) The span for aligning Objective-C message specifications.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_oc_msg_spec_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Nl Cont]
-Category=7
-Description="<html>Whether to align macros wrapped with a backslash and a newline. This will<br/>not work right if the macro contains a multi-line comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_nl_cont=true|align_nl_cont=false
-ValueDefault=false
-
-[Align Pp Define Together]
-Category=7
-Description="<html>Whether to align macro functions and variables together.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_pp_define_together=true|align_pp_define_together=false
-ValueDefault=false
-
-[Align Pp Define Span]
-Category=7
-Description="<html>The span for aligning on '#define' bodies.<br/><br/>=0: Don't align (default)<br/>&gt;0: Number of lines (including comments) between blocks</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_pp_define_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Pp Define Gap]
-Category=7
-Description="<html>The minimum space between label and value of a preprocessor define.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_pp_define_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Left Shift]
-Category=7
-Description="<html>Whether to align lines that start with '&lt;&lt;' with previous '&lt;&lt;'.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_left_shift=true|align_left_shift=false
-ValueDefault=true
-
-[Align Eigen Comma Init]
-Category=7
-Description="<html>Whether to align comma-separated statements following '&lt;&lt;' (as used to<br/>initialize Eigen matrices).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_eigen_comma_init=true|align_eigen_comma_init=false
-ValueDefault=false
-
-[Align Asm Colon]
-Category=7
-Description="<html>Whether to align text after 'asm volatile ()' colons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_asm_colon=true|align_asm_colon=false
-ValueDefault=false
-
-[Align Oc Msg Colon Span]
-Category=7
-Description="<html>(OC) Span for aligning parameters in an Objective-C message call<br/>on the ':'.<br/><br/>0: Don't align.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_oc_msg_colon_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Oc Msg Colon First]
-Category=7
-Description="<html>(OC) Whether to always align with the first parameter, even if it is too<br/>short.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_msg_colon_first=true|align_oc_msg_colon_first=false
-ValueDefault=false
-
-[Align Oc Decl Colon]
-Category=7
-Description="<html>(OC) Whether to align parameters in an Objective-C '+' or '-' declaration<br/>on the ':'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_decl_colon=true|align_oc_decl_colon=false
-ValueDefault=false
-
-[Align Oc Msg Colon Xcode Like]
-Category=7
-Description="<html>(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>aligment)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
-ValueDefault=false
-
-[Cmt Width]
-Category=8
-Description="<html>Try to wrap comments at N columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_width="
-MinVal=0
-MaxVal=256
-ValueDefault=0
-
-[Cmt Reflow Mode]
-Category=8
-Description="<html>How to reflow comments.<br/><br/>0: No reflowing (apart from the line wrapping due to cmt_width) (default)<br/>1: No touching at all<br/>2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_reflow_mode="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Cmt Reflow Fold Regex File]
-Category=8
-Description="<html>Path to a file that contains regular expressions describing patterns for<br/>which the end of one line and the beginning of the next will be folded into<br/>the same sentence or paragraph during full comment reflow. The regular<br/>expressions are described using ECMAScript syntax. The syntax for this<br/>specification is as follows, where "..." indicates the custom regular<br/>expression and "n" indicates the nth end_of_prev_line_regex and<br/>beg_of_next_line_regex regular expression pair:<br/><br/>end_of_prev_line_regex[1] = "...$"<br/>beg_of_next_line_regex[1] = "^..."<br/>end_of_prev_line_regex[2] = "...$"<br/>beg_of_next_line_regex[2] = "^..."<br/>            .<br/>            .<br/>            .<br/>end_of_prev_line_regex[n] = "...$"<br/>beg_of_next_line_regex[n] = "^..."<br/><br/>Note that use of this option overrides the default reflow fold regular<br/>expressions, which are internally defined as follows:<br/><br/>end_of_prev_line_regex[1] = "[\w,\]\)]$"<br/>beg_of_next_line_regex[1] = "^[\w,\[\(]"<br/>end_of_prev_line_regex[2] = "\.$"<br/>beg_of_next_line_regex[2] = "^[A-Z]"</html>"
-Enabled=false
-CallName=cmt_reflow_fold_regex_file=
-EditorType=string
-ValueDefault=
-
-[Cmt Reflow Indent To Paragraph Start]
-Category=8
-Description="<html>Whether to indent wrapped lines to the start of the encompassing paragraph<br/>during full comment reflow (cmt_reflow_mode = 2). Overrides the value<br/>specified by cmt_sp_after_star_cont.<br/><br/>Note that cmt_align_doxygen_javadoc_tags overrides this option for<br/>paragraphs associated with javadoc tags</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_reflow_indent_to_paragraph_start=true|cmt_reflow_indent_to_paragraph_start=false
-ValueDefault=false
-
-[Cmt Convert Tab To Spaces]
-Category=8
-Description="<html>Whether to convert all tabs to spaces in comments. If false, tabs in<br/>comments are left alone, unless used for indenting.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_convert_tab_to_spaces=true|cmt_convert_tab_to_spaces=false
-ValueDefault=false
-
-[Cmt Indent Multi]
-Category=8
-Description="<html>Whether to apply changes to multi-line comments, including cmt_width,<br/>keyword substitution and leading chars.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false
-ValueDefault=true
-
-[Cmt Align Doxygen Javadoc Tags]
-Category=8
-Description="<html>Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)<br/>and corresponding fields such that groups of consecutive block tags,<br/>parameter names, and descriptions align with one another. Overrides that<br/>which is specified by the cmt_sp_after_star_cont. If cmt_width &gt; 0, it may<br/>be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2<br/>in order to achieve the desired alignment for line-wrapping.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_align_doxygen_javadoc_tags=true|cmt_align_doxygen_javadoc_tags=false
-ValueDefault=false
-
-[Cmt Sp Before Doxygen Javadoc Tags]
-Category=8
-Description="<html>The number of spaces to insert after the star and before doxygen<br/>javadoc-style tags (@param, @return, etc). Requires enabling<br/>cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the<br/>cmt_sp_after_star_cont.<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_before_doxygen_javadoc_tags="
-MinVal=0
-MaxVal=16
-ValueDefault=1
-
-[Cmt C Group]
-Category=8
-Description="<html>Whether to group c-comments that look like they are in a block.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_group=true|cmt_c_group=false
-ValueDefault=false
-
-[Cmt C Nl Start]
-Category=8
-Description="<html>Whether to put an empty '/*' on the first line of the combined c-comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_nl_start=true|cmt_c_nl_start=false
-ValueDefault=false
-
-[Cmt C Nl End]
-Category=8
-Description="<html>Whether to add a newline before the closing '*/' of the combined c-comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_nl_end=true|cmt_c_nl_end=false
-ValueDefault=false
-
-[Cmt Cpp To C]
-Category=8
-Description="<html>Whether to change cpp-comments into c-comments.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_to_c=true|cmt_cpp_to_c=false
-ValueDefault=false
-
-[Cmt Cpp Group]
-Category=8
-Description="<html>Whether to group cpp-comments that look like they are in a block. Only<br/>meaningful if cmt_cpp_to_c=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_group=true|cmt_cpp_group=false
-ValueDefault=false
-
-[Cmt Cpp Nl Start]
-Category=8
-Description="<html>Whether to put an empty '/*' on the first line of the combined cpp-comment<br/>when converting to a c-comment.<br/><br/>Requires cmt_cpp_to_c=true and cmt_cpp_group=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_nl_start=true|cmt_cpp_nl_start=false
-ValueDefault=false
-
-[Cmt Cpp Nl End]
-Category=8
-Description="<html>Whether to add a newline before the closing '*/' of the combined cpp-comment<br/>when converting to a c-comment.<br/><br/>Requires cmt_cpp_to_c=true and cmt_cpp_group=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_nl_end=true|cmt_cpp_nl_end=false
-ValueDefault=false
-
-[Cmt Star Cont]
-Category=8
-Description="<html>Whether to put a star on subsequent comment lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_star_cont=true|cmt_star_cont=false
-ValueDefault=false
-
-[Cmt Sp Before Star Cont]
-Category=8
-Description="<html>The number of spaces to insert at the start of subsequent comment lines.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_before_star_cont="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Cmt Sp After Star Cont]
-Category=8
-Description="<html>The number of spaces to insert after the star on subsequent comment lines.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_after_star_cont="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Cmt Multi Check Last]
-Category=8
-Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first<br/>and last lines of the comment are the same length.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_multi_check_last=true|cmt_multi_check_last=false
-ValueDefault=true
-
-[Cmt Multi First Len Minimum]
-Category=8
-Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first<br/>and last lines of the comment are the same length AND if the length is<br/>bigger as the first_len minimum.<br/><br/>Default: 4</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_multi_first_len_minimum="
-MinVal=1
-MaxVal=20
-ValueDefault=4
-
-[Cmt Insert File Header]
-Category=8
-Description="<html>Path to a file that contains text to insert at the beginning of a file if<br/>the file doesn't start with a C/C++ comment. If the inserted text contains<br/>'$(filename)', that will be replaced with the current file's name.</html>"
-Enabled=false
-CallName=cmt_insert_file_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert File Footer]
-Category=8
-Description="<html>Path to a file that contains text to insert at the end of a file if the<br/>file doesn't end with a C/C++ comment. If the inserted text contains<br/>'$(filename)', that will be replaced with the current file's name.</html>"
-Enabled=false
-CallName=cmt_insert_file_footer=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Func Header]
-Category=8
-Description="<html>Path to a file that contains text to insert before a function definition if<br/>the function isn't preceded by a C/C++ comment. If the inserted text<br/>contains '$(function)', '$(javaparam)' or '$(fclass)', these will be<br/>replaced with, respectively, the name of the function, the javadoc '@param'<br/>and '@return' stuff, or the name of the class to which the member function<br/>belongs.</html>"
-Enabled=false
-CallName=cmt_insert_func_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Class Header]
-Category=8
-Description="<html>Path to a file that contains text to insert before a class if the class<br/>isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',<br/>that will be replaced with the class name.</html>"
-Enabled=false
-CallName=cmt_insert_class_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Oc Msg Header]
-Category=8
-Description="<html>Path to a file that contains text to insert before an Objective-C message<br/>specification, if the method isn't preceded by a C/C++ comment. If the<br/>inserted text contains '$(message)' or '$(javaparam)', these will be<br/>replaced with, respectively, the name of the function, or the javadoc<br/>'@param' and '@return' stuff.</html>"
-Enabled=false
-CallName=cmt_insert_oc_msg_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Before Preproc]
-Category=8
-Description="<html>Whether a comment should be inserted if a preprocessor is encountered when<br/>stepping backwards from a function name.<br/><br/>Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and<br/>cmt_insert_class_header.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_preproc=true|cmt_insert_before_preproc=false
-ValueDefault=false
-
-[Cmt Insert Before Inlines]
-Category=8
-Description="<html>Whether a comment should be inserted if a function is declared inline to a<br/>class definition.<br/><br/>Applies to cmt_insert_func_header.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_inlines=true|cmt_insert_before_inlines=false
-ValueDefault=true
-
-[Cmt Insert Before Ctor Dtor]
-Category=8
-Description="<html>Whether a comment should be inserted if the function is a class constructor<br/>or destructor.<br/><br/>Applies to cmt_insert_func_header.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_ctor_dtor=true|cmt_insert_before_ctor_dtor=false
-ValueDefault=false
-
-[Mod Full Brace Do]
-Category=9
-Description="<html>Add or remove braces on a single-line 'do' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_do=ignore|mod_full_brace_do=add|mod_full_brace_do=remove|mod_full_brace_do=force|mod_full_brace_do=not_defined
-ChoicesReadable="Ignore Mod Full Brace Do|Add Mod Full Brace Do|Remove Mod Full Brace Do|Force Mod Full Brace Do"
-ValueDefault=ignore
-
-[Mod Full Brace For]
-Category=9
-Description="<html>Add or remove braces on a single-line 'for' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_for=ignore|mod_full_brace_for=add|mod_full_brace_for=remove|mod_full_brace_for=force|mod_full_brace_for=not_defined
-ChoicesReadable="Ignore Mod Full Brace For|Add Mod Full Brace For|Remove Mod Full Brace For|Force Mod Full Brace For"
-ValueDefault=ignore
-
-[Mod Full Brace Function]
-Category=9
-Description="<html>(Pawn) Add or remove braces on a single-line function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force|mod_full_brace_function=not_defined
-ChoicesReadable="Ignore Mod Full Brace Function|Add Mod Full Brace Function|Remove Mod Full Brace Function|Force Mod Full Brace Function"
-ValueDefault=ignore
-
-[Mod Full Brace If]
-Category=9
-Description="<html>Add or remove braces on a single-line 'if' statement. Braces will not be<br/>removed if the braced statement contains an 'else'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_if=ignore|mod_full_brace_if=add|mod_full_brace_if=remove|mod_full_brace_if=force|mod_full_brace_if=not_defined
-ChoicesReadable="Ignore Mod Full Brace If|Add Mod Full Brace If|Remove Mod Full Brace If|Force Mod Full Brace If"
-ValueDefault=ignore
-
-[Mod Full Brace If Chain]
-Category=9
-Description="<html>Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either<br/>have, or do not have, braces. If true, braces will be added if any block<br/>needs braces, and will only be removed if they can be removed from all<br/>blocks.<br/><br/>Overrides mod_full_brace_if.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
-ValueDefault=false
-
-[Mod Full Brace If Chain Only]
-Category=9
-Description="<html>Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.<br/>If true, mod_full_brace_if_chain will only remove braces from an 'if' that<br/>does not have an 'else if' or 'else'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_if_chain_only=true|mod_full_brace_if_chain_only=false
-ValueDefault=false
-
-[Mod Full Brace While]
-Category=9
-Description="<html>Add or remove braces on single-line 'while' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_while=ignore|mod_full_brace_while=add|mod_full_brace_while=remove|mod_full_brace_while=force|mod_full_brace_while=not_defined
-ChoicesReadable="Ignore Mod Full Brace While|Add Mod Full Brace While|Remove Mod Full Brace While|Force Mod Full Brace While"
-ValueDefault=ignore
-
-[Mod Full Brace Using]
-Category=9
-Description="<html>Add or remove braces on single-line 'using ()' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_using=ignore|mod_full_brace_using=add|mod_full_brace_using=remove|mod_full_brace_using=force|mod_full_brace_using=not_defined
-ChoicesReadable="Ignore Mod Full Brace Using|Add Mod Full Brace Using|Remove Mod Full Brace Using|Force Mod Full Brace Using"
-ValueDefault=ignore
-
-[Mod Full Brace Nl]
-Category=9
-Description="<html>Don't remove braces around statements that span N newlines</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_full_brace_nl="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Mod Full Brace Nl Block Rem Mlcond]
-Category=9
-Description="<html>Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks<br/>which span multiple lines.<br/><br/>Affects:<br/>  mod_full_brace_for<br/>  mod_full_brace_if<br/>  mod_full_brace_if_chain<br/>  mod_full_brace_if_chain_only<br/>  mod_full_brace_while<br/>  mod_full_brace_using<br/><br/>Does not affect:<br/>  mod_full_brace_do<br/>  mod_full_brace_function</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_nl_block_rem_mlcond=true|mod_full_brace_nl_block_rem_mlcond=false
-ValueDefault=false
-
-[Mod Paren On Return]
-Category=9
-Description="<html>Add or remove unnecessary parenthesis on 'return' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_paren_on_return=ignore|mod_paren_on_return=add|mod_paren_on_return=remove|mod_paren_on_return=force|mod_paren_on_return=not_defined
-ChoicesReadable="Ignore Mod Paren On Return|Add Mod Paren On Return|Remove Mod Paren On Return|Force Mod Paren On Return"
-ValueDefault=ignore
-
-[Mod Pawn Semicolon]
-Category=9
-Description="<html>(Pawn) Whether to change optional semicolons to real semicolons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_pawn_semicolon=true|mod_pawn_semicolon=false
-ValueDefault=false
-
-[Mod Full Paren If Bool]
-Category=9
-Description="<html>Whether to fully parenthesize Boolean expressions in 'while' and 'if'<br/>statement, as in 'if (a &amp;&amp; b &gt; c)' =&gt; 'if (a &amp;&amp; (b &gt; c))'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false
-ValueDefault=false
-
-[Mod Remove Extra Semicolon]
-Category=9
-Description="<html>Whether to remove superfluous semicolons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_remove_extra_semicolon=true|mod_remove_extra_semicolon=false
-ValueDefault=false
-
-[Mod Add Long Function Closebrace Comment]
-Category=9
-Description="<html>If a function body exceeds the specified number of newlines and doesn't have<br/>a comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_function_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Namespace Closebrace Comment]
-Category=9
-Description="<html>If a namespace body exceeds the specified number of newlines and doesn't<br/>have a comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_namespace_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Class Closebrace Comment]
-Category=9
-Description="<html>If a class body exceeds the specified number of newlines and doesn't have a<br/>comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_class_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Switch Closebrace Comment]
-Category=9
-Description="<html>If a switch body exceeds the specified number of newlines and doesn't have a<br/>comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_switch_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Ifdef Endif Comment]
-Category=9
-Description="<html>If an #ifdef body exceeds the specified number of newlines and doesn't have<br/>a comment after the #endif, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_ifdef_endif_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Ifdef Else Comment]
-Category=9
-Description="<html>If an #ifdef or #else body exceeds the specified number of newlines and<br/>doesn't have a comment after the #else, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_ifdef_else_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Sort Case Sensitive]
-Category=9
-Description="<html>Whether to take care of the case by the mod_sort_xx options.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_case_sensitive=true|mod_sort_case_sensitive=false
-ValueDefault=false
-
-[Mod Sort Import]
-Category=9
-Description="<html>Whether to sort consecutive single-line 'import' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_import=true|mod_sort_import=false
-ValueDefault=false
-
-[Mod Sort Using]
-Category=9
-Description="<html>(C#) Whether to sort consecutive single-line 'using' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_using=true|mod_sort_using=false
-ValueDefault=false
-
-[Mod Sort Include]
-Category=9
-Description="<html>Whether to sort consecutive single-line '#include' statements (C/C++) and<br/>'#import' statements (Objective-C). Be aware that this has the potential to<br/>break your code if your includes/imports have ordering dependencies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_include=true|mod_sort_include=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Filename]
-Category=9
-Description="<html>Whether to prioritize '#include' and '#import' statements that contain<br/>filename without extension when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_filename=true|mod_sort_incl_import_prioritize_filename=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Extensionless]
-Category=9
-Description="<html>Whether to prioritize '#include' and '#import' statements that does not<br/>contain extensions when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_extensionless=true|mod_sort_incl_import_prioritize_extensionless=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Angle Over Quotes]
-Category=9
-Description="<html>Whether to prioritize '#include' and '#import' statements that contain<br/>angle over quotes when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_angle_over_quotes=true|mod_sort_incl_import_prioritize_angle_over_quotes=false
-ValueDefault=false
-
-[Mod Sort Incl Import Ignore Extension]
-Category=9
-Description="<html>Whether to ignore file extension in '#include' and '#import' statements<br/>for sorting comparison.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_ignore_extension=true|mod_sort_incl_import_ignore_extension=false
-ValueDefault=false
-
-[Mod Sort Incl Import Grouping Enabled]
-Category=9
-Description="<html>Whether to group '#include' and '#import' statements when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_grouping_enabled=true|mod_sort_incl_import_grouping_enabled=false
-ValueDefault=false
-
-[Mod Move Case Break]
-Category=9
-Description="<html>Whether to move a 'break' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } break;' =&gt; 'case X: { ... break; }'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_move_case_break=true|mod_move_case_break=false
-ValueDefault=false
-
-[Mod Case Brace]
-Category=9
-Description="<html>Add or remove braces around a fully braced case statement. Will only remove<br/>braces if there are no variable declarations in the block.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_case_brace=ignore|mod_case_brace=add|mod_case_brace=remove|mod_case_brace=force|mod_case_brace=not_defined
-ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
-ValueDefault=ignore
-
-[Mod Remove Empty Return]
-Category=9
-Description="<html>Whether to remove a void 'return;' that appears as the last statement in a<br/>function.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_remove_empty_return=true|mod_remove_empty_return=false
-ValueDefault=false
-
-[Mod Enum Last Comma]
-Category=9
-Description="<html>Add or remove the comma after the last value of an enumeration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_enum_last_comma=ignore|mod_enum_last_comma=add|mod_enum_last_comma=remove|mod_enum_last_comma=force|mod_enum_last_comma=not_defined
-ChoicesReadable="Ignore Mod Enum Last Comma|Add Mod Enum Last Comma|Remove Mod Enum Last Comma|Force Mod Enum Last Comma"
-ValueDefault=ignore
-
-[Mod Sort Oc Properties]
-Category=9
-Description="<html>(OC) Whether to organize the properties. If true, properties will be<br/>rearranged according to the mod_sort_oc_property_*_weight factors.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_oc_properties=true|mod_sort_oc_properties=false
-ValueDefault=false
-
-[Mod Sort Oc Property Class Weight]
-Category=9
-Description="<html>(OC) Weight of a class property modifier.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_class_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Thread Safe Weight]
-Category=9
-Description="<html>(OC) Weight of 'atomic' and 'nonatomic'.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_thread_safe_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Readwrite Weight]
-Category=9
-Description="<html>(OC) Weight of 'readwrite' when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_readwrite_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Reference Weight]
-Category=9
-Description="<html>(OC) Weight of a reference type specifier ('retain', 'copy', 'assign',<br/>'weak', 'strong') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_reference_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Getter Weight]
-Category=9
-Description="<html>(OC) Weight of getter type ('getter=') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_getter_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Setter Weight]
-Category=9
-Description="<html>(OC) Weight of setter type ('setter=') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_setter_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Nullability Weight]
-Category=9
-Description="<html>(OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',<br/>'null_resettable') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_nullability_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Pp Indent]
-Category=10
-Description="<html>Add or remove indentation of preprocessor directives inside #if blocks<br/>at brace level 0 (file-level).</html>"
-Enabled=false
-EditorType=multiple
-Choices=pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force|pp_indent=not_defined
-ChoicesReadable="Ignore Pp Indent|Add Pp Indent|Remove Pp Indent|Force Pp Indent"
-ValueDefault=ignore
-
-[Pp Indent At Level]
-Category=10
-Description="<html>Whether to indent #if/#else/#endif at the brace level. If false, these are<br/>indented from column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false
-ValueDefault=false
-
-[Pp Indent Count]
-Category=10
-Description="<html>Specifies the number of columns to indent preprocessors per level<br/>at brace level 0 (file-level). If pp_indent_at_level=false, also specifies<br/>the number of columns to indent preprocessors per level<br/>at brace level &gt; 0 (function-level).<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_count="
-MinVal=0
-MaxVal=16
-ValueDefault=1
-
-[Pp Space]
-Category=10
-Description="<html>Add or remove space after # based on pp_level of #if blocks.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force|pp_space=not_defined
-ChoicesReadable="Ignore Pp Space|Add Pp Space|Remove Pp Space|Force Pp Space"
-ValueDefault=ignore
-
-[Pp Space Count]
-Category=10
-Description="<html>Sets the number of spaces per level added with pp_space.</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_space_count="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Pp Indent Region]
-Category=10
-Description="<html>The indent for '#region' and '#endregion' in C# and '#pragma region' in<br/>C/C++. Negative values decrease indent down to the first column.</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_region="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Pp Region Indent Code]
-Category=10
-Description="<html>Whether to indent the code between #region and #endregion.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_region_indent_code=true|pp_region_indent_code=false
-ValueDefault=false
-
-[Pp Indent If]
-Category=10
-Description="<html>If pp_indent_at_level=true, sets the indent for #if, #else and #endif when<br/>not at file-level. Negative values decrease indent down to the first column.<br/><br/>=0: Indent preprocessors using output_tab_size<br/>&gt;0: Column at which all preprocessors will be indented</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_if="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Pp If Indent Code]
-Category=10
-Description="<html>Whether to indent the code between #if, #else and #endif.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_if_indent_code=true|pp_if_indent_code=false
-ValueDefault=false
-
-[Pp Define At Level]
-Category=10
-Description="<html>Whether to indent '#define' at the brace level. If false, these are<br/>indented from column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_define_at_level=true|pp_define_at_level=false
-ValueDefault=false
-
-[Pp Ignore Define Body]
-Category=10
-Description="<html>Whether to ignore the '#define' body while formatting.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_ignore_define_body=true|pp_ignore_define_body=false
-ValueDefault=false
-
-[Pp Indent Case]
-Category=10
-Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the case statements<br/>directly inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_case=true|pp_indent_case=false
-ValueDefault=true
-
-[Pp Indent Func Def]
-Category=10
-Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the function definition<br/>is directly inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_func_def=true|pp_indent_func_def=false
-ValueDefault=true
-
-[Pp Indent Extern]
-Category=10
-Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the extern block is<br/>directly inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_extern=true|pp_indent_extern=false
-ValueDefault=true
-
-[Pp Indent Brace]
-Category=10
-Description="<html>Whether to indent braces directly inside #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the braces are directly<br/>inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_brace=true|pp_indent_brace=false
-ValueDefault=true
-
-[Include Category 0]
-Category=11
-Description="<html>The regex for include category with priority 0.</html>"
-Enabled=false
-CallName=include_category_0=
-EditorType=string
-ValueDefault=
-
-[Include Category 1]
-Category=11
-Description="<html>The regex for include category with priority 1.</html>"
-Enabled=false
-CallName=include_category_1=
-EditorType=string
-ValueDefault=
-
-[Include Category 2]
-Category=11
-Description="<html>The regex for include category with priority 2.</html>"
-Enabled=false
-CallName=include_category_2=
-EditorType=string
-ValueDefault=
-
-[Use Indent Func Call Param]
-Category=12
-Description="<html>true:  indent_func_call_param will be used (default)<br/>false: indent_func_call_param will NOT be used<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_indent_func_call_param=true|use_indent_func_call_param=false
-ValueDefault=true
-
-[Use Indent Continue Only Once]
-Category=12
-Description="<html>The value of the indentation for a continuation line is calculated<br/>differently if the statement is:<br/>- a declaration: your case with QString fileName ...<br/>- an assignment: your case with pSettings = new QSettings( ...<br/><br/>At the second case the indentation value might be used twice:<br/>- at the assignment<br/>- at the function call (if present)<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indent_continue will be used only once<br/>false: indent_continue will be used every time (default)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
-ValueDefault=false
-
-[Indent Cpp Lambda Only Once]
-Category=12
-Description="<html>The value might be used twice:<br/>- at the assignment<br/>- at the opening brace<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indentation will be used only once<br/>false: indentation will be used every time (default)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
-ValueDefault=false
-
-[Use Sp After Angle Always]
-Category=12
-Description="<html>Whether sp_after_angle takes precedence over sp_inside_fparen. This was the<br/>historic behavior, but is probably not the desired behavior, so this is off<br/>by default.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_sp_after_angle_always=true|use_sp_after_angle_always=false
-ValueDefault=false
-
-[Use Options Overriding For Qt Macros]
-Category=12
-Description="<html>Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,<br/>this tries to format these so that they match Qt's normalized form (i.e. the<br/>result of QMetaObject::normalizedSignature), which can slightly improve the<br/>performance of the QObject::connect call, rather than how they would<br/>otherwise be formatted.<br/><br/>See options_for_QT.cpp for details.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_options_overriding_for_qt_macros=true|use_options_overriding_for_qt_macros=false
-ValueDefault=true
-
-[Use Form Feed No More As Whitespace Character]
-Category=12
-Description="<html>If true: the form feed character is removed from the list of whitespace<br/>characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_form_feed_no_more_as_whitespace_character=true|use_form_feed_no_more_as_whitespace_character=false
-ValueDefault=false
-
-[Warn Level Tabs Found In Verbatim String Literals]
-Category=13
-Description="<html>(C#) Warning is given if doing tab-to-\t replacement and we have found one<br/>in a C# verbatim string literal.<br/><br/>Default: 2</html>"
-Enabled=false
-EditorType=numeric
-CallName="warn_level_tabs_found_in_verbatim_string_literals="
-MinVal=1
-MaxVal=3
-ValueDefault=2
-
-[Debug Max Number Of Loops]
-Category=13
-Description="<html>Limit the number of loops.<br/>Used by uncrustify.cpp to exit from infinite loop.<br/>0: no limit.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_max_number_of_loops="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Line Number To Protocol]
-Category=13
-Description="<html>Set the number of the line to protocol;<br/>Used in the function prot_the_line if the 2. parameter is zero.<br/>0: nothing protocol.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_line_number_to_protocol="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Timeout]
-Category=13
-Description="<html>Set the number of second(s) before terminating formatting the current file,<br/>0: no timeout.<br/>only for linux</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_timeout="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Truncate]
-Category=13
-Description="<html>Set the number of characters to be printed if the text is too long,<br/>0: do not truncate.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_truncate="
-MinVal=0
-MaxVal=960
-ValueDefault=0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrust-files.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrust-files.sh
deleted file mode 100644
index 3e1d09b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrust-files.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-if [ -z "$1" ]; then
-   echo "specify the file that contains a list of files"
-   exit
-fi
-
-files=$(cat $1)
-
-mkdir -p out
-
-for item in $files ; do
-
-  dn=$(dirname $item)
-  mkdir -p out/$dn
-  ~/bin/uncrustify -f $item -c ~/.uncrustify/xsupplicant.cfg > out/$item
-
-done
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrustify.xml.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrustify.xml.in
deleted file mode 100644
index 33f6c6a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrustify.xml.in
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language name="Uncrustify Configuration"
-          section="Configuration"
-          extensions="uncrustify.cfg;uncrustify.conf;.uncrustify.cfg;.uncrustify.conf"
-          mimetype=""
-          version="##VERSION##"
-          kateversion="2.0"
-          author="Matthew Woehlke (mwoehlke.floss@gmail.com)"
-          license="LGPL"
-          priority="5">
-
-  <highlighting>
-    <list name="options">
-      ##OPTION_KEYWORDS##
-    </list>
-    <list name="values">
-      ##VALUE_KEYWORDS##
-    </list>
-    <list name="tokens">
-      ##TOKEN_TYPE_KEYWORDS##
-    </list>
-    <list name="directives">
-      <item>file_ext</item>
-      <item>include</item>
-      <item>macro-close</item>
-      <item>macro-else</item>
-      <item>macro-open</item>
-      <item>type</item>
-      <item>using</item>
-    </list>
-
-    <contexts>
-      <context name="Root" attribute="Normal Text" lineEndContext="#stay">
-        <WordDetect context="SetDirective" attribute="Directive" String="set" />
-        <keyword context="Values" attribute="Directive" String="directives" />
-        <keyword context="Values" attribute="Option" String="options" />
-        <DetectChar context="Comment" attribute="Comment" char="#" />
-      </context>
-
-      <context name="Values" attribute="String" lineEndContext="#pop" >
-        <DetectSpaces attribute="Normal Text" />
-        <RegExpr contex="#stay" attribute="Number" String="-?[0-9]+" />
-        <keyword contex="#stay" attribute="Value" String="values" />
-        <DetectChar context="#stay" attribute="Assignment" char="=" />
-        <DetectChar context="StringSQ" attribute="String" char="'" />
-        <DetectChar context="StringDQ" attribute="String" char="&quot;" />
-        <DetectChar context="Comment" attribute="Comment" char="#" />
-      </context>
-
-      <context name="StringSQ" attribute="String" lineEndContext="Error" >
-        <RegExpr context="#stay" attribute="String" String="\\." />
-        <DetectChar context="#pop" attribute="String" char="'" />
-      </context>
-
-      <context name="StringDQ" attribute="String" lineEndContext="Error" >
-        <RegExpr context="#stay" attribute="String" String="\\." />
-        <DetectChar context="#pop" attribute="String" char="&quot;" />
-      </context>
-
-      <context name="SetDirective" attribute="Error" lineEndContext="#pop" >
-        <DetectSpaces attribute="Normal Text" />
-        <keyword context="Values" attribute="Token" String="tokens" />
-      </context>
-
-      <context name="Error" attribute="Error" lineEndContext="#stay" />
-
-      <context name="Comment" attribute="Comment" lineEndContext="#pop">
-        <DetectSpaces />
-        <IncludeRules context="##Alerts" />
-        <DetectIdentifier />
-      </context>
-    </contexts>
-
-    <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal" />
-      <itemData name="Directive" defStyleNum="dsFunction" />
-      <itemData name="Option" defStyleNum="dsDataType" />
-      <itemData name="Token" defStyleNum="dsChar" />
-      <itemData name="Value" defStyleNum="dsKeyword" />
-      <itemData name="String" defStyleNum="dsString" />
-      <itemData name="Number" defStyleNum="dsDecVal" />
-      <itemData name="Assignment" defStyleNum="dsOthers" />
-      <itemData name="Comment" defStyleNum="dsComment" />
-      <itemData name="Error" defStyleNum="dsError" />
-    </itemDatas>
-  </highlighting>
-
-  <general>
-    <comments>
-      <comment name="singleLine" start="#" />
-    </comments>
-    <keywords casesensitive="0" />
-  </general>
-</language>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/xsupplicant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/xsupplicant.cfg
deleted file mode 100644
index 45d16fa6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/xsupplicant.cfg
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# GNU-like format
-#
-
-indent_with_tabs		= 0		# 1=indent to level only, 2=indent with tabs
-input_tab_size			= 8		# original tab size
-output_tab_size			= 2		# new tab size
-indent_columns			= 2		# should usually match output_tab_size
-indent_label			= 2		# pos: absolute col, neg: relative column
-indent_align_string		= False		# align broken strings
-indent_brace			= 2
-
-nl_enum_brace			= remove	# "enum {" vs "enum \n {"
-nl_union_brace			= remove	# "union {" vs "union \n {"
-nl_struct_brace			= remove	# "struct {" vs "struct \n {"
-nl_do_brace			= add		# "do {" vs "do \n {"
-nl_if_brace			= add		# "if () {" vs "if () \n {"
-nl_for_brace			= add		# "for () {" vs "for () \n {"
-nl_else_brace			= add		# "else {" vs "else \n {"
-nl_while_brace			= add		# "while () {" vs "while () \n {"
-nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
-nl_before_case			= 1
-nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
-nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return			= TRUE
-nl_brace_while			= remove
-nl_brace_else			= add
-nl_squeeze_ifdef		= TRUE
-
-# mod_paren_on_return		= ignore	# "return 1;" vs "return (1);"
-# mod_full_brace_if		= ignore	# "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for		= ignore	# "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do		= ignore	# "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while		= ignore	# "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_semi			= remove
-sp_paren_paren			= remove	# space between (( and ))
-sp_return_paren			= remove	# "return (1);" vs "return(1);"
-sp_sizeof_paren			= remove	# "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen		= force		# "if (" vs "if("
-sp_after_sparen			= force		# "if () {" vs "if (){"
-sp_after_cast			= remove	# "(int) a" vs "(int)a"
-sp_inside_braces		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_struct		= force		# "{ 1 }" vs "{1}"
-sp_inside_braces_enum		= force		# "{ 1 }" vs "{1}"
-sp_inside_paren			= remove
-sp_inside_fparen		= remove
-sp_inside_sparen		= remove
-#sp_type_func			= ignore
-sp_assign			= force
-sp_arith			= force
-sp_bool				= force
-sp_compare			= force
-sp_after_comma			= force
-sp_func_def_paren		= remove	# "int foo (){" vs "int foo(){"
-sp_func_call_paren		= remove	# "foo (" vs "foo("
-sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
-
-# align_with_tabs			= FALSE		# use tabs to align
-# align_on_tabstop		= FALSE		# align on tabstops
-# align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
-# align_var_def_span		= 2
-# align_var_def_inline		= TRUE
-# align_var_def_star		= TRUE
-# align_var_def_colon		= TRUE
-# align_assign_span		= 1
-# align_struct_init_span		= 3
-# align_var_struct_span		= 3
-# align_right_cmt_span		= 3
-# align_pp_define_span		= 3
-# align_pp_define_gap		= 4
-# align_number_right		= TRUE
-# align_typedef_span		= 5
-# align_typedef_gap		= 3
-
-# cmt_star_cont			= TRUE
-
-eat_blanks_before_close_brace	= TRUE
-eat_blanks_after_open_brace	= TRUE
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/extras.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/extras.vpj
deleted file mode 100644
index 4b57772a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/extras.vpj
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-   Version="10.0"
-   VendorName="SlickEdit"
-   WorkingDir=".">
-   <Config
-      Name="Release"
-      OutputFile=""
-      CompilerConfigName="">
-      <Menu>
-         <Target
-            Name="Compile"
-            MenuCaption="&amp;Compile"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveCurrent"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Build"
-            MenuCaption="&amp;Build"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveWorkspaceFiles"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Rebuild"
-            MenuCaption="&amp;Rebuild"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveWorkspaceFiles"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Debug"
-            MenuCaption="&amp;Debug"
-            SaveOption="SaveNone"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Execute"
-            MenuCaption="E&amp;xecute"
-            SaveOption="SaveNone"
-            RunFromDir="%rw">
-            <Exec CmdLine='"extras.exe"'/>
-         </Target>
-      </Menu>
-   </Config>
-   <CustomFolders>
-      <Folder
-         Name="Source Files"
-         Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
-      </Folder>
-      <Folder
-         Name="Header Files"
-         Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-      </Folder>
-      <Folder
-         Name="Resource Files"
-         Filters="*.ico;*.cur;*.dlg"/>
-      <Folder
-         Name="Bitmaps"
-         Filters="*.bmp"/>
-      <Folder
-         Name="Other Files"
-         Filters="">
-      </Folder>
-   </CustomFolders>
-   <CompatibleVersions>
-      <PrevVersion VersionNumber="9.0"/>
-      <PrevVersion VersionNumber="9.1"/>
-   </CompatibleVersions>
-   <Files AutoFolders="DirectoryView">
-      <Folder Name="documentation">
-         <Folder Name="htdocs">
-            <Folder Name="examples">
-               <F N="documentation/htdocs/examples/c-1.in.c"/>
-               <F N="documentation/htdocs/examples/c-1.out.c"/>
-               <F N="documentation/htdocs/examples/example.c"/>
-            </Folder>
-            <F N="documentation/htdocs/ben.cfg.txt"/>
-            <F N="documentation/htdocs/config.txt"/>
-            <F N="documentation/htdocs/configuration.txt"/>
-            <F N="documentation/htdocs/default.cfg"/>
-            <F N="documentation/htdocs/index.html"/>
-            <F N="documentation/htdocs/linux.cfg.txt"/>
-            <F N="documentation/htdocs/uncrustify.html"/>
-         </Folder>
-         <F N="documentation/align-thresholds.txt"/>
-         <F N="documentation/example.c"/>
-         <F N="documentation/goals.txt"/>
-         <F N="documentation/paren_stack.txt"/>
-         <F N="documentation/theory.txt"/>
-      </Folder>
-      <Folder Name="etc">
-         <F N="etc/amxmodx.cfg"/>
-         <F N="etc/ben.cfg"/>
-         <F N="etc/ben2.cfg"/>
-         <F N="etc/d.cfg"/>
-         <F N="etc/defaults.cfg"/>
-         <F N="etc/dofiles.sh"/>
-         <F N="etc/gnu-indent.cfg"/>
-         <F N="etc/klaus.cfg"/>
-         <F N="etc/kr-indent.cfg"/>
-         <F N="etc/linux-indent.cfg"/>
-         <F N="etc/linux.cfg"/>
-         <F N="etc/mono.cfg"/>
-         <F N="etc/types.txt"/>
-         <F N="etc/uncrust-files.sh"/>
-         <F N="etc/xsupplicant.cfg"/>
-      </Folder>
-      <Folder Name="man">
-         <F N="man/Makefile.am"/>
-         <F N="man/uncrustify.1.in"/>
-      </Folder>
-      <Folder Name="scripts">
-         <F N="scripts/check_options.py"/>
-         <F N="scripts/cmpcfg.pl"/>
-         <F N="scripts/punc.py"/>
-         <F N="scripts/tokenize.py"/>
-         <F N="scripts/update-defaults.sh"/>
-      </Folder>
-      <F N="AUTHORS"/>
-      <F N="autogen.sh"/>
-      <F N="BUGS"/>
-      <F N="ChangeLog"/>
-      <F N="commit.log"/>
-      <F N="configure"/>
-      <F N="configure.in"/>
-      <F N="COPYING"/>
-      <F N="HELP"/>
-      <F N="INSTALL"/>
-      <F N="make_token_names.sh"/>
-      <F N="make_win32.sh"/>
-      <F N="Makefile.am"/>
-      <F N="NEWS"/>
-      <F N="README"/>
-      <F N="release-steps.txt"/>
-      <F N="run_tests.sh"/>
-   </Files>
-</Project>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.cfg
deleted file mode 100644
index 9389f055..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.cfg
+++ /dev/null
@@ -1,467 +0,0 @@
-# The uncrustify sources are uncrustified with this config file.
-using 0.70.0
-
-# General options
-output_tab_size                           = 3
-tok_split_gte                             = true
-
-# Code alignment options
-align_asm_colon                           = true
-align_assign_decl_func                    = 2
-align_assign_func_proto_span              = 4
-align_assign_span                         = 1
-align_enum_equ_span                       = 4
-align_enum_equ_thresh                     = 8
-align_func_params                         = true
-align_nl_cont                             = true
-align_number_right                        = true
-align_pp_define_gap                       = 4
-align_pp_define_span                      = 3
-align_right_cmt_same_level                = true
-align_right_cmt_span                      = 3
-align_struct_init_span                    = 3
-align_typedef_gap                         = 3
-align_typedef_span                        = 5
-align_typedef_star_style                  = 1
-align_var_class_span                      = 2
-align_var_def_amp_style                   = 1
-align_var_def_colon                       = true
-align_var_def_inline                      = true
-align_var_def_span                        = 2
-align_var_def_star_style                  = 1
-align_var_struct_span                     = 3
-
-# Indenting options
-indent_bool_paren                         = true
-indent_class                              = true
-indent_columns                            = 3
-indent_compound_literal_return            = false
-indent_cpp_lambda_only_once               = true
-indent_first_bool_expr                    = true
-indent_macro_brace                        = true
-indent_member                             = 3
-indent_sparen_extra                       = 0
-indent_with_tabs                          = 0
-indent_oc_inside_msg_sel                  = false
-indent_off_after_assign                   = false
-indent_inside_ternary_operator            = false
-
-# Newline adding and removing options
-nl_after_access_spec                      = 1
-nl_after_brace_close                      = true
-nl_after_brace_open                       = true
-nl_after_case                             = true
-nl_after_do                               = force
-nl_after_for                              = force
-nl_after_func_proto                       = 1
-nl_after_func_proto_group                 = 2
-nl_after_if                               = remove
-nl_after_member                           = remove
-nl_after_namespace                        = 2
-nl_after_return                           = true
-nl_after_semicolon                        = true
-nl_after_switch                           = remove
-nl_after_vbrace_open                      = true
-nl_after_while                            = remove
-nl_assign_brace                           = add
-nl_assign_leave_one_liners                = true
-nl_before_case                            = true
-nl_before_do                              = force
-nl_before_for                             = force
-nl_before_func_body_def                   = 3
-nl_before_if                              = force
-nl_before_if_closing_paren                = remove
-nl_before_namespace                       = 2
-nl_before_opening_brace_func_class_def    = force
-nl_before_switch                          = force
-nl_before_while                           = force
-nl_brace_catch                            = force
-nl_brace_else                             = add
-nl_brace_fparen                           = remove
-nl_brace_while                            = remove
-nl_case_colon_brace                       = force
-nl_catch_brace                            = add
-nl_class_brace                            = force
-nl_class_colon                            = remove
-nl_class_leave_one_liner_groups           = true
-nl_class_leave_one_liners                 = true
-nl_template_args                          = false
-nl_template_class_decl                    = remove
-nl_template_class_def                     = force
-nl_template_end                           = false
-nl_template_func_decl                     = remove
-nl_template_func_def                      = force
-nl_template_start                         = false
-nl_template_var                           = remove
-nl_template_using                         = remove
-nl_comment_func_def                       = 1
-nl_constr_colon                           = force
-nl_constr_init_args                       = force
-nl_do_brace                               = add
-nl_else_brace                             = add
-nl_else_if                                = remove
-nl_elseif_brace                           = add
-nl_end_of_file                            = force
-nl_end_of_file_min                        = 1
-nl_enum_brace                             = force
-nl_enum_class_identifier                  = remove
-nl_enum_class                             = remove
-nl_enum_colon_type                        = remove
-nl_enum_identifier_colon                  = remove
-nl_enum_leave_one_liners                  = true
-nl_fcall_brace                            = add
-nl_fdef_brace                             = force
-nl_fdef_brace_cond                        = force
-nl_finally_brace                          = add
-nl_for_brace                              = add
-nl_func_call_empty                        = remove
-nl_func_call_paren                        = remove
-nl_func_call_paren_empty                  = remove
-nl_func_class_scope                       = remove
-nl_func_decl_args                         = remove
-nl_func_decl_empty                        = remove
-nl_func_decl_end                          = remove
-nl_func_decl_end_single                   = remove
-nl_func_decl_start                        = remove
-nl_func_decl_start_single                 = remove
-nl_func_def_empty                         = remove
-nl_func_def_end                           = remove
-nl_func_def_end_single                    = remove
-nl_func_def_paren                         = remove
-nl_func_def_paren_empty                   = remove
-nl_func_def_start                         = remove
-nl_func_def_start_single                  = remove
-nl_func_paren                             = remove
-nl_func_paren_empty                       = remove
-nl_func_proto_type_name                   = remove
-nl_func_scope_name                        = remove
-nl_func_type_name                         = remove
-nl_func_type_name_class                   = remove
-nl_func_var_def_blk                       = 1
-nl_getset_leave_one_liners                = true
-nl_if_brace                               = add
-nl_inside_empty_func                      = 1
-nl_inside_namespace                       = 2
-nl_max                                    = 3
-nl_namespace_brace                        = force
-nl_return_expr                            = remove
-nl_squeeze_ifdef                          = true
-nl_start_of_file                          = remove
-nl_struct_brace                           = add
-nl_switch_brace                           = add
-nl_try_brace                              = add
-nl_type_brace_init_lst                    = force
-nl_type_brace_init_lst_close              = force
-nl_type_brace_init_lst_open               = force
-nl_union_brace                            = add
-nl_while_brace                            = add
-
-# Positioning options
-pos_bool                                  = lead
-pos_constr_colon                          = lead_break
-pos_constr_comma                          = lead_force
-pos_enum_comma                            = trail_force
-
-# Preprocessor options
-pp_indent                                 = remove
-pp_space                                  = remove
-
-# Spacing options
-sp_addr                                   = remove
-sp_after_angle                            = force
-sp_after_byref_func                       = remove
-sp_after_byref                            = remove
-sp_after_cast                             = remove
-sp_after_class_colon                      = force
-sp_after_comma                            = force
-sp_after_constr_colon                     = force
-sp_after_dc                               = remove
-sp_after_for_colon                        = force
-sp_after_new                              = force
-sp_after_operator                         = remove
-sp_after_operator_sym                     = remove
-sp_after_ptr_star_func                    = remove
-sp_after_ptr_star_qualifier               = remove
-sp_after_ptr_star                         = remove
-sp_after_semi                             = force
-sp_after_semi_for                         = force
-sp_after_semi_for_empty                   = remove
-sp_after_sparen                           = force
-sp_after_tparen_close                     = remove
-sp_after_type                             = force
-sp_after_type_brace_init_lst_open         = force
-sp_angle_paren_empty                      = remove
-sp_angle_paren                            = remove
-sp_angle_word                             = force
-sp_arith_additive                         = force
-sp_arith                                  = force
-sp_assign_default                         = force
-sp_assign                                 = force
-sp_attribute_paren                        = remove
-sp_balance_nested_parens                  = false
-sp_before_angle                           = remove
-sp_before_byref                           = force
-sp_before_byref_func                      = force
-sp_before_case_colon                      = remove
-sp_before_class_colon                     = force
-sp_before_comma                           = remove
-sp_before_dc                              = remove
-sp_before_ellipsis                        = remove
-sp_before_for_colon                       = force
-sp_before_ptr_star                        = force
-sp_before_ptr_star_func                   = force
-sp_before_semi                            = remove
-sp_before_semi_for_empty                  = force
-sp_before_semi_for                        = remove
-sp_before_sparen                          = force
-sp_before_square                          = remove
-sp_before_squares                         = remove
-sp_before_type_brace_init_lst_close       = force
-sp_before_unnamed_byref                   = force
-sp_before_unnamed_ptr_star                = force
-sp_before_vardef_square                   = remove
-sp_between_ptr_star                       = remove
-sp_bool                                   = force
-sp_brace_brace                            = force
-sp_brace_close_while                      = force
-sp_brace_typedef                          = force
-sp_catch_paren                            = force
-sp_compare                                = force
-sp_cond_colon_after                       = force
-sp_cond_colon_before                      = force
-sp_cond_question_after                    = force
-sp_cond_question_before                   = force
-sp_cpp_before_struct_binding              = remove
-sp_cpp_cast_paren                         = remove
-sp_cpp_lambda_fparen                      = remove
-sp_cpp_lambda_paren_brace                 = force
-sp_cpp_lambda_square_brace                = force
-sp_cpp_lambda_square_paren                = remove
-sp_decltype_paren                         = remove
-sp_defined_paren                          = force
-sp_deref                                  = remove
-sp_do_brace_open                          = force
-sp_endif_cmt                              = force
-sp_enum_after_assign                      = force
-sp_enum_assign                            = force
-sp_enum_before_assign                     = force
-sp_enum_colon                             = force
-sp_fparen_brace                           = force
-sp_fparen_brace_initializer               = force
-sp_func_call_paren_empty                  = remove
-sp_func_call_paren                        = remove
-sp_func_class_paren                       = remove
-sp_func_class_paren_empty                 = remove
-sp_func_def_paren_empty                   = remove
-sp_func_def_paren                         = remove
-sp_func_proto_paren_empty                 = remove
-sp_func_proto_paren                       = remove
-sp_func_type_paren                        = remove
-sp_incdec                                 = remove
-sp_inside_angle_empty                     = remove
-sp_inside_angle                           = remove
-sp_inside_braces_empty                    = remove
-sp_inside_braces_enum                     = force
-sp_inside_braces                          = force
-sp_inside_braces_struct                   = force
-sp_inside_fparen                          = remove
-sp_inside_fparens                         = remove
-sp_inside_paren                           = remove
-sp_inside_paren_cast                      = remove
-sp_inside_sparen                          = remove
-sp_inside_sparen_close                    = remove
-sp_inside_sparen_open                     = remove
-sp_inside_square                          = remove
-sp_inside_square_empty                    = remove
-sp_inside_tparen                          = remove
-sp_inv                                    = remove
-sp_member                                 = remove
-sp_not                                    = remove
-sp_paren_paren                            = remove
-sp_paren_qualifier                        = force
-sp_pp_concat                              = force
-sp_pp_stringify                           = force
-sp_ptr_star_paren                         = force
-sp_return_brace                           = remove
-sp_return_paren                           = remove
-sp_sign                                   = remove
-sp_sizeof_paren                           = remove
-sp_sparen_brace                           = force
-sp_template_angle                         = remove
-sp_trailing_return                        = force
-sp_type_brace_init_lst                    = remove
-sp_type_func                              = force
-sp_while_paren_open                       = force
-sp_word_brace_init_lst                    = remove
-
-# Comment modification options
-cmt_star_cont                             = true
-
-# eat
-eat_blanks_after_open_brace               = true
-eat_blanks_before_close_brace             = true
-
-# Code modifying options
-mod_add_long_function_closebrace_comment  = 40
-mod_add_long_namespace_closebrace_comment = 5
-mod_add_long_switch_closebrace_comment    = 40
-mod_full_brace_do                         = add
-mod_full_brace_for                        = add
-mod_full_brace_if                         = add
-mod_full_brace_while                      = add
-mod_paren_on_return                       = add
-#mod_remove_empty_return                   = true
-mod_remove_empty_return                   = false
-mod_remove_extra_semicolon                = true
-mod_sort_include                          = true
-mod_sort_incl_import_prioritize_filename  = false
-mod_sort_incl_import_prioritize_extensionless       = false
-mod_sort_incl_import_prioritize_angle_over_quotes   = false
-mod_sort_incl_import_ignore_extension     = false
-mod_sort_incl_import_grouping_enabled     = false
-debug_timeout                             = 0
-
-# the build of uncrustify needs the options to be set to ignore
-sp_after_assign                           = ignore
-sp_before_assign                          = ignore
-sp_before_tr_emb_cmt                      = ignore
-sp_cmt_cpp_start                          = ignore
-nl_before_member                          = ignore
-nl_brace_brace                            = ignore
-nl_cpp_ldef_brace                         = ignore   // TODO
-nl_enum_own_lines                         = ignore
-nl_func_call_args                         = ignore
-nl_func_call_start                        = ignore   // remove
-nl_func_call_end                          = ignore   // remove
-nl_func_def_args                          = ignore
-
-use_form_feed_no_more_as_whitespace_character = false
-
-# NOT yet used sp_xx options
-# sp_after_decltype
-# sp_after_invariant_paren
-# sp_after_mdatype_commas
-# sp_after_newop_paren
-# sp_after_noexcept
-# sp_after_oc_at_sel
-# sp_after_oc_at_sel_parens
-# sp_after_oc_block_caret
-# sp_after_oc_colon
-# sp_after_oc_dict_colon
-# sp_after_oc_msg_receiver
-# sp_after_oc_property
-# sp_after_oc_return_type
-# sp_after_oc_scope
-# sp_after_oc_synchronized
-# sp_after_oc_type
-# sp_after_operator_sym_empty
-# sp_after_ptr_block_caret
-# sp_after_send_oc_colon
-# sp_after_tag
-# sp_after_throw
-# sp_angle_colon
-# sp_angle_shift
-# sp_annotation_paren
-# sp_before_constr_colon
-# sp_before_mdatype_commas
-# sp_before_nl_cont
-# sp_before_oc_block_caret
-# sp_before_oc_colon
-# sp_before_oc_dict_colon
-# sp_before_oc_proto_list
-# sp_before_pp_stringify
-# sp_before_send_oc_colon
-# sp_before_square_asm_block
-# sp_before_template_paren
-# sp_between_mdatype_commas
-# sp_between_new_paren
-# sp_brace_catch
-# sp_brace_else
-# sp_brace_finally
-# sp_case_label
-# sp_catch_brace
-# sp_cond_question
-# sp_cond_ternary_short
-# sp_cparen_oparen
-# sp_cpp_lambda_assign
-# sp_d_array_colon
-# sp_else_brace
-# sp_enum_paren
-# sp_extern_paren
-# sp_finally_brace
-# sp_fparen_dbrace
-# sp_func_call_user_inside_fparen
-# sp_func_call_user_paren
-# sp_func_call_user_paren_paren
-# sp_getset_brace
-# sp_inside_braces_oc_dict
-# sp_inside_newop_paren
-# sp_inside_newop_paren_close
-# sp_inside_newop_paren_open
-# sp_inside_oc_at_sel_parens
-# sp_inside_square_oc_array
-# sp_inside_type_brace_init_lst
-# sp_invariant_paren
-# sp_macro
-# sp_macro_func
-# sp_oc_brace_catch
-# sp_oc_catch_brace
-# sp_oc_catch_paren
-# sp_oc_classname_paren
-# sp_paren_brace
-# sp_paren_comma
-# sp_paren_ellipsis
-# sp_paren_noexcept
-# sp_range
-# sp_scope_paren
-# sp_sizeof_ellipsis
-# sp_sizeof_ellipsis_paren
-# sp_special_semi
-# sp_square_fparen
-# sp_super_paren
-# sp_this_paren
-# sp_throw_paren
-# sp_trailing_ret_t
-# sp_try_brace
-# sp_type_ellipsis
-# sp_type_question
-# sp_vala_after_translation
-# sp_version_paren
-# sp_word_brace
-# sp_word_brace_ns
-
-# NOT yet used nl_xx options
-# nl_after_annotation
-# nl_after_square_assign
-# nl_after_synchronized
-# nl_assign_square
-# nl_before_synchronized
-# nl_before_throw
-# nl_between_annotation
-# nl_brace_finally
-# nl_brace_square
-# nl_brace_struct_var
-# nl_class_init_args
-# nl_getset_brace
-# nl_oc_before_end
-# nl_oc_before_implementation
-# nl_oc_before_interface
-# nl_oc_block_brace
-# nl_oc_brace_catch
-# nl_oc_catch_brace
-# nl_oc_implementation_brace
-# nl_oc_interface_brace
-# nl_oc_mdef_brace
-# nl_paren_dbrace_open
-# nl_property_brace
-# nl_scope_brace
-# nl_synchronized_brace
-# nl_template_class
-# nl_tsquare_brace
-# nl_unittest_brace
-# nl_using_brace
-# nl_version_brace
-# nl_func_call_args_multi_line_ignore_closures
-
-# NOT yet used indent_xx options
-# indent_off_after_return
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.txt
deleted file mode 100644
index 5beb747f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-2016-04-27
-
-The configuration file forUncrustifySources.cfg is the file to uncrustify the sources of uncrustify.
-
-It should be "stable". This means that if one changes (allmost) anything in a file, a new run of
-uncrustify with that configuration file, should produce the same output as the original input. 
-This cannot work for really anything, but one should try this approach.
-
-About the comments:
-While a line is indented, the comment at the end of the line stays at the original column.
-
-If we have:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))
-      {                  // guy 2016-04-16
-
-where the brace { is at new line with a comment.
-The option nl_elseif_brace = remove
-gives:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-                 (pc->type == CT_FUNC_DEF) ||
-                 (pc->type == CT_FUNC_CLASS_PROTO) ||
-                 (pc->type == CT_FUNC_PROTO)) { // guy 2016-04-16
-If using at new the same option again with a new value
-nl_elseif_brace = add
-is not able to reconstruct the original source. The comment has changed the line:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))       // guy 2016-04-16
-      {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/ChunkStack.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/ChunkStack.lnt
deleted file mode 100644
index cea5860f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/ChunkStack.lnt
+++ /dev/null
@@ -1,5 +0,0 @@
--esym(526, clear, empty, size)
--esym(628, clear, empty, size)
--esym(746, clear, empty, size, pop_back, pop_front)
--esym(1013, empty)
--esym(1055, clear, empty, size)
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/align.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/align.lnt
deleted file mode 100644
index 32e388c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/align.lnt
+++ /dev/null
@@ -1,9 +0,0 @@
--esym(526, End, resize, text)
--esym(526, Add, Flush, NewLines, push_back, Start)
--esym(628, Add, Flush, NewLines, push_back, Start)
--esym(628, push_back, flush, End, text, resize)
--esym(746, End, text, resize, Start)
--esym(746, Add, Flush, NewLines, push_back)
--esym(1013, size, End, text, resize, Start, type, m_right_align, clear)
--esym(1013, Add, Flush, NewLines, push_back)
--esym(1055, Add, Flush, NewLines, push_back, End, text, resize, Start)
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/chunk_list.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/chunk_list.lnt
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/chunk_list.lnt
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/logger.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/logger.lnt
deleted file mode 100644
index e41a1282..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/logger.lnt
+++ /dev/null
@@ -1 +0,0 @@
--esym(530, args)
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/readme.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/readme.txt
deleted file mode 100644
index f2534349..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The *.lnt files in the /lnt directory hold exclusion patterns
-for pclint. If you find pclint errors/warnings that you are 
-sure to be of no interest they should be suppressed here.
-Don't add suppression messages directly into the source files 
-as this clutters the code and disturbs users that do not use pclint.
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/unc_text.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/unc_text.lnt
deleted file mode 100644
index 89cb4fdb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/unc_text.lnt
+++ /dev/null
@@ -1,2 +0,0 @@
--esym(550, di)
--esym(746, end)
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/uncrustify_types.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/uncrustify_types.lnt
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/uncrustify_types.lnt
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/man/uncrustify.1.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/man/uncrustify.1.in
deleted file mode 100644
index eea3ca37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/man/uncrustify.1.in
+++ /dev/null
@@ -1,170 +0,0 @@
-.TH UNCRUSTIFY "1" "Oct 2014" "uncrustify @PACKAGE_VERSION@" "User Commands"
-.SH NAME
-uncrustify \- C, C++, C#, D, Java and Pawn source code beautifier
-
-.SH SYNOPSIS
-.B uncrustify \fR[\fIOPTIONS\fR] [\fIFILES\fR]
-
-.SH DESCRIPTION
-
-If no input files are specified, the input is read from stdin.
-.br
-If reading from stdin, you should specify the language using \-l.
-
-If \-F is used or files are specified on the command line, the output filename is
-\fIPFX\fR + "/" + filename + \fISFX\fR.
-.br
-Unless, of course, the options \fB\-\-replace\fR or \fB\-\-no\-backup\fR are used.
-
-When reading from stdin or doing a single file via the '\-f' option,
-the output is dumped to stdout, unless redirected with \-o FILE.
-
-Errors are always dumped to stderr
-
-.SH OPTIONS
-.SS "Basic Options:"
-.TP
-\fB\-c\fI CFG\fR
-Use the config file \fICFG\fR, or defaults if \fICFG\fR is set to '-'.
-.br
-If not specified, uncrustify will use \fB$UNCRUSTIFY_CONFIG\fR or \fB$HOME/.uncrustify.cfg\fR.
-.TP
-\fB\-f\fI FILE\fR
-Process the single file \fIFILE\fR, sending output to stdout or the file specified with \fB\-o\fR.
-.TP
-\fB\-o\fI FILE\fR
-Redirect output to \fIFILE\fR.
-.br
-Use with \fB\-f\fR, \fB\-\-update\-config\fR, \fB\-\-update\-config\-with\-doc\fR,
-\fB\-\-universalindent\fR.
-.TP
-\fB\-\-check\fR
-Do not output the new text, instead verify that nothing changes when
-the file(s) are processed. The status of every file is printed to
-stderr. The exit code is EXIT_SUCCESS if there were no changes, EXIT_FAILURE otherwise.
-.TP
-\fB\-F\fI FILE\fR
-Read files to process from \fIFILE\fR, one filename per line.  If \fIFILE\fR
-is \'\-\' then read filenames from standard input instead of a file.
-.br
-You can create this file using something like \'\fBfind . \-name "*.c" > list.txt\fR\'.
-.br
-This cannot be combined with \fB\-f\fR.
-.TP
-\fB\-\-prefix\fI PFX\fR
-Prepend \fIPFX\fR to the output filename path.
-.br
-This cannot be combined with \fB\-f\fR, \fB\-\-replace\fR, or \fB\-\-no\-backup\fR.
-.TP
-\fB\-\-suffix\fI SFX\fR
-Append \fISFX\fR to the output filename.
-.br
-The default is '.uncrustify' if neither \fISFX\fR or \fIPFX\fR are specified.
-.br
-This cannot be combined with \fB\-f\fR, \fB\-\-replace\fR, or \fB\-\-no\-backup\fR.
-.TP
-\fB\-\-frag\fR
-Assume the input is a code fragment and the first line is properly indented.
-.TP
-\fB\-\-replace\fR
-Replace source files (creates a backup).
-.br
-This cannot be combined with \fB\-f\fR, \fB\-\-prefix\fR, or \fB\-\-suffix\fR.
-.TP
-\fB\-\-no\-backup\fR
-Replace files, no backup. Useful if files are under source control
-.br
-This cannot be combined with \fB\-f\fR, \fB\-\-prefix\fR, or \fB\-\-suffix\fR.
-.TP
-\fB\-\-mtime\fR
-Preserve mtime on replaced files.
-.TP
-\fB\-l\fR
-Language override: C, CPP, D, CS, JAVA, PAWN, VALA, OC, OC+
-.TP
-\fB\-t\fR
-Load a file with types (usually not needed)
-.TP
-\fB\-q\fR
-Quiet mode \- no output on stderr (\fB\-L\fR will override)
-.SS "Config/Help Options:"
-.TP
-\fB\-h\fR \-? \fB\-\-help\fR \fB\-\-usage\fR
-Print this message and exit
-.TP
-\fB\-\-version\fR
-Print the version and exit
-.TP
-\fB\-\-count\-options\fR
-Print the number of available options and exit
-.TP
-\fB\-\-show\-config\fR
-Print out option documentation and exit
-.TP
-\fB\-\-update\-config\fR
-Output a new config file.
-.TP
-\fB\-\-update\-config\-with\-doc\fR
-Output a new config file with embedded usage comments.
-.TP
-\fB\-\-universalindent\fR
-Output a config file for Universal Indent GUI.
-.TP
-\fB\-\-detect\fR
-Detects the config from a source file. Use with '\-f \fIFILE\fR'.
-Detection is currently fairly limited.
-
-.SS "Debug Options:"
-.TP
-\fB\-p \fIFILE\fR
-Dump debug info into \fIFILE\fR, or to stdout if \fIFILE\fR is set to '-'."
-.br
-Must be used in combination with '-f \fIFILE\fR'."
-.TP
-\fB\-L\fI SEV\fR
-Set the log severity (see log_levels.h)
-.TP
-\fB\-s\fR
-Show the log severity in the logs
-.TP
-\fB\-\-decode\fI FLAG\fR
-Print \fIFLAG\fR as text and exit
-
-.SH EXAMPLES
-.TP
-Read a D file from stdin, output to stdout.
-cat foo.d | uncrustify \-q \-c my.cfg \-l d
-.TP
-Process a file, output to stdout.
-uncrustify \-c my.cfg \-d foo.d
-.TP
-Process a source tree, output to a different tree.
-find src \-name "*.[ch]" > files.txt
-.br
-uncrustify \-c my.cfg \-F files.txt \-\-prefix out
-.TP
-Process a source tree in\(hyplace.
-uncrustify \-c my.cfg \-\-no\-backup $(find src \-name "*.[ch]")
-
-.SH NOTES
-Use comments containing ' *INDENT\-OFF*' and ' *INDENT\-ON*' to disable
-processing of parts of the source file.
-
-.SH AUTHOR
-Written by Ben Gardner
-
-.SH REPORTING BUGS
-Use the issue tracker at <http://sourceforge.net/projects/uncrustify>
-
-.SH COPYRIGHT
-Copyright (C) 2006\(hy2014 Ben Gardner
-.br
-Copyright (C) 2015, 2016 Guy Maurel
-
-.SH LICENSE
-GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
-
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/osx/Xcode Organizer Actions.xccommands b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/osx/Xcode Organizer Actions.xccommands
deleted file mode 100644
index be727021..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/osx/Xcode Organizer Actions.xccommands
+++ /dev/null
@@ -1,120 +0,0 @@
-// !$*UTF8*$!
-{
-	commands = (
-		{
-			directory = .;
-			name = make;
-			script = "#!/bin/sh\n./configure\nmake\n";
-			type = other;
-		},
-		{
-			directory = .;
-			name = "Build uncrustify with configuration Debug";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration Debug build\n";
-			type = build;
-		},
-		{
-			directory = .;
-			name = "Build uncrustify with configuration Release";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration Release build\n";
-			type = build;
-		},
-		{
-			directory = .;
-			name = "Build uncrustify with configuration Install (xcodebuild only!)";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration \"Install (xcodebuild only!)\" build\n";
-			type = build;
-		},
-		{
-			directory = .;
-			name = "Clean uncrustify with configuration Debug";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration Debug clean\n";
-			type = clean;
-		},
-		{
-			directory = .;
-			name = "Clean uncrustify with configuration Release";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration Release clean\n";
-			type = clean;
-		},
-		{
-			directory = .;
-			name = "Clean uncrustify with configuration Install (xcodebuild only!)";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration \"Install (xcodebuild only!)\" clean\n";
-			type = clean;
-		},
-		{
-			directory = selection;
-			name = "----";
-			type = clean;
-		},
-		{
-			directory = .;
-			name = "Clean All in uncrustify with configuration Debug";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration Debug -alltargets clean\n";
-			type = clean;
-		},
-		{
-			directory = .;
-			name = "Clean All in uncrustify with configuration Release";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration Release -alltargets clean\n";
-			type = clean;
-		},
-		{
-			directory = .;
-			name = "Clean All in uncrustify with configuration Install (xcodebuild only!)";
-			script = "#!/bin/sh\n\nxcodebuild -project uncrustify.xcodeproj -configuration \"Install (xcodebuild only!)\" -alltargets clean\n";
-			type = clean;
-		},
-		{
-			arguments = "-l oc+ -c $SOURCE_ROOT/etc/objc.cfg -q -f $SOURCE_ROOT/tests/input/oc/Fraction.m";
-			directory = .;
-			name = "Run uncrustify from uncrustify with configuration Debug";
-			script = "/Users/andre/Documents/Xcode/CommandLineUtility/C++Tool/uncrustify/build/Debug/uncrustify";
-			type = run;
-		},
-		{
-			arguments = "-l oc+ -c $SOURCE_ROOT/etc/objc.cfg -q -f $SOURCE_ROOT/tests/input/oc/Fraction.m";
-			directory = .;
-			name = "Run uncrustify from uncrustify with configuration Release";
-			script = "/Users/andre/Documents/Xcode/CommandLineUtility/C++Tool/uncrustify/build/Release/uncrustify";
-			type = run;
-		},
-		{
-			arguments = "-l oc+ -c $SOURCE_ROOT/etc/objc.cfg -q -f $SOURCE_ROOT/tests/input/oc/Fraction.m";
-			directory = .;
-			name = "Run uncrustify from uncrustify with configuration Install (xcodebuild only!)";
-			script = "/Users/andre/Documents/Xcode/CommandLineUtility/C++Tool/uncrustify/build/Install (xcodebuild only!)/uncrustify";
-			type = run;
-		},
-		{
-			directory = selection;
-			name = "----";
-			type = run;
-		},
-		{
-			arguments = "-l oc+ -c $SOURCE_ROOT/etc/objc.cfg -q -f $SOURCE_ROOT/tests/input/oc/Fraction.m";
-			debugger = gdb;
-			directory = .;
-			name = "Debug uncrustify from uncrustify with configuration Debug";
-			script = "/Users/andre/Documents/Xcode/CommandLineUtility/C++Tool/uncrustify/build/Debug/uncrustify";
-			type = run;
-		},
-		{
-			arguments = "-l oc+ -c $SOURCE_ROOT/etc/objc.cfg -q -f $SOURCE_ROOT/tests/input/oc/Fraction.m";
-			debugger = gdb;
-			directory = .;
-			name = "Debug uncrustify from uncrustify with configuration Release";
-			script = "/Users/andre/Documents/Xcode/CommandLineUtility/C++Tool/uncrustify/build/Release/uncrustify";
-			type = run;
-		},
-		{
-			arguments = "-l oc+ -c $SOURCE_ROOT/etc/objc.cfg -q -f $SOURCE_ROOT/tests/input/oc/Fraction.m";
-			debugger = gdb;
-			directory = .;
-			name = "Debug uncrustify from uncrustify with configuration Install (xcodebuild only!)";
-			script = "/Users/andre/Documents/Xcode/CommandLineUtility/C++Tool/uncrustify/build/Install (xcodebuild only!)/uncrustify";
-			type = run;
-		},
-	);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/package.json b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/package.json
deleted file mode 100644
index 39d108a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "uncrustify",
-  "version": "0.73.0",
-  "description": "A highly configurable, easily modifiable source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA",
-  "main": "uncrustify",
-  "scripts": {
-    "preinstall": "mkdir -p build && cd build && cmake .. && make"
-  },
-  "bin": "src/uncrustify",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/uncrustify/uncrustify"
-  },
-  "keywords": [
-    "uncrustify",
-    "source code beautifier"
-  ],
-  "author": "Ben Gardner",
-  "author": "Guy Maurel",
-  "license": "GPL-2.0-or-later"
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/release-process.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/release-process.rst
deleted file mode 100644
index 4fa9e043..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/release-process.rst
+++ /dev/null
@@ -1,324 +0,0 @@
-============================
- Uncrustify Release Process
-============================
-
-.. Update the date in the next line when editing this document!
-
-*This document was last updated on 2021-05-12, for Uncrustify 0.73.0.*
-
-This document uses "0.1.2" throughout as an example version number.
-Whenever you see this, you should substitute the version number
-of the new release being prepared.
-
-Paths are specified in git syntax, i.e. ``:/`` is the repository root.
-
-Requirements
-============
-
-This document assumes you are using a Linux-based OS.
-While it should be possible to cut a release on Windows,
-using e.g. the `Git for Windows SDK <https://gitforwindows.org/>`_
-or a MinGW_ environment, the names and/or arguments to some commands
-may be different.
-
-
-In addition to the build and test requirements for Uncrustify itself
-(CMake, a C++ compiler, Python, git), you will also need:
-
-- GitPython_
-- mingw32-gcc-c++
-- mingw64-gcc-c++
-- tar
-- zip
-- wget (optional)
-- scp (to update documentation on the SourceForge page)
-
-Using packages provided by your OS distribution is *strongly* recommended.
-(Exact package names may vary depending on your distribution.)
-Examples use ``wget`` to download files via command line,
-but any mechanism of obtaining files over HTTPS may be employed.
-
-Preparing a Candidate
-=====================
-
-The first step, obviously, is deciding to make a release.
-Prior to making a release, verify that the repository is in a stable state
-and that all CI (continuous integration - Travis and AppVeyor) has passed.
-This should ensure all tests pass and building
-(including cross-compiling) for Windows is working.
-
-Once the release process is started,
-only pull requests needed to fix critical bugs,
-or related to the release process, should be accepted.
-(This will minimize the need to redo or repeat work
-such as updating the documentation, especially the change log.)
-
-To start the release process, first check that:
-
-- You are on the ``master`` branch
-- Your local clone is up to date
-- ``CMAKE_BUILD_TYPE`` is set to ``Release`` (or ``RelWithDebInfo``)
-- Your build is up to date
-- check the list of authors with scripts/prepare_list_of_authors.sh
-
-Then, run::
-
-   $ scripts/release_tool.py init
-   $ scripts/release_tool.py update path/to/uncrustify
-
-(Replace ``path/to/uncrustify`` with the path to the Uncrustify executable
-you just built, e.g. ``build/uncrustify``.)
-
-This will create a branch for the release candidate
-and perform some automated updates to various files.
-With no arguments, ``init`` will prompt you for the new version number,
-defaulting to ``x.(y+1).0``, where ``x.y.z`` is the previous release.
-The ``--version`` argument may also be used to specify the version
-(e.g. if the script will not be able to prompt for input).
-
-After, you should check that the following files
-show the correct version number and option count:
-
-- ``:/CMakeLists.txt`` (version number only; look for ``UNCRUSTIFY_VERSION``)
-- ``:/package.json`` (version number only; you'll see it, the file is tiny)
-- ``:/README.md`` (look for "options as of version")
-- ``:/documentation/htdocs/index.html`` (look for "options as of version")
-
-(Note that ``uncrustify`` itself will not show the new version number
-until the final release has been tagged.)
-
-Update Documentation
-====================
-
-Update ``:/ChangeLog``.
-There is a helper script, ``:/scripts/gen_changelog.py``,
-that can help extract new options since the previous release:
-
-.. code::
-
-   $ scripts/gen_changelog.py uncrustify-0.0.0
-
-Replace ``0.0.0`` with the version of the *previous* release.
-This will generate a bunch of output like::
-
-   0123456789abcdef0123456789abcdef01234567
-     Added   : better_name                          Jan 13 1970
-     Removed : poor_name                            Jan 13 1970
-   fedcba9876543210fedcba9876543210fedcba98
-     Added   : new_option_1                         Jan 18 1970
-     Added   : new_option_2                         Jan 18 1970
-
-Your goal is to turn the "raw" output into something like this::
-
-   Deprecated options:
-     - poor_name                             Jan 13 1970
-       Renamed to better_name
-
-   New options:
-     - new_option_1                         Jan 18 1970
-     - new_option_1                         Jan 18 1970
-
-To accomplish this, you will need to inspect any removed options,
-possibly consulting the commits in which they were removed,
-to determine the reason for deprecation and what replacement is recommended.
-(Note that it may not be as simple as "use X instead".)
-Also watch for options that were added and subsequently renamed
-since the last release. (This has happened a few times.
-In such cases, the new name should show up as an ordinary "new" option,
-and the old name should be entirely omitted from the change log.)
-
-It helps to copy the output to a scratch file for editing.
-Move deprecated options to the top and add a "Deprecated options:" header,
-then add a "New options:" header in front of what's left,
-and remove the commit SHAs (``sed -r '/^[[:xdigit:]]{40}/d``
-if you don't want to do it by hand).
-Then, check that the options are in order by date;
-date of authorship vs. date of merge may cause discrepancies.
-Finally, replace occurrences of ``\w+ +:`` with ``-``
-(if your editor supports regular expressions;
-otherwise you can individually replace ``Added   :`` and ``Removed :``).
-
-Add a new release header (don't forget to add the date!) to the change log
-and insert the list of option changes as created above.
-Also fill in the list of resolved issues, new keywords (if any),
-as well as any other changes that need to be mentioned.
-
-If any command line arguments have been added or changed,
-including descriptions for the same, check to see if
-``:/man/uncrustify.1.in`` needs to be updated.
-(Hopefully this happened when the source was changed!)
-
-Finalize the Code Changes
-=========================
-
-Inspect your working tree.
-Use ``git add -p`` to stage the changes made to the documentation
-and other artifacts that contain version-dependent information.
-Verify that only desired changes are staged,
-and that your working tree is otherwise clean.
-
-Now is a good time to recheck
-that everything builds, and that all the tests pass.
-This is also a good time to manually test 32- and 64-bit builds.
-
-When you are ready, commit the changes using:
-
-.. code::
-
-   $ scripts/release_tool.py commit
-
-(If you prefer, you can also commit the changes manually;
-the script just fills in the commit message for you.)
-
-Submit and Tag the Release
-==========================
-
-Push the release candidate branch to GitHub, and create a pull request.
-Once the pull request is merged, tag the release using:
-Make sure, the file .git/config has the right value:
-[remote "origin"]
-        url = https://github.com/uncrustify/uncrustify.git
-
-.. code::
-
-   $ scripts/release_tool.py tag
-
-Note that this will only work if the merge of the release candidate
-is the most recent commit upstream.
-Otherwise, the merge commit must be specified by using the ``-c`` option.
-
-(Tagging the release does not need to be done on any particular branch.
-The command will not affect or look at your work tree at all.)
-
-Create Binaries
-===============
-
-Now that the release is published, grab a copy of the sources from GitHub:
-
-.. code::
-
-   $ wget https://github.com/uncrustify/uncrustify/archive/uncrustify-0.1.2.zip
-   $ unzip -e uncrustify-0.1.2.zip
-
-Next, build the 32- and 64-bit Windows binaries:
-
-.. code::
-
-   $ cd /path/to/uncrustify-uncrustify-0.1.2
-   $ mkdir buildwin-32
-   $ cd buildwin-32
-   $ cmake -G Ninja \
-           -DCMAKE_BUILD_TYPE=Release \
-           -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw32.cmake \
-           -DCMAKE_EXE_LINKER_FLAGS="-static -s" \
-           ..
-   $ ninja
-   $ cpack
-
-.. code::
-
-   $ cd /path/to/uncrustify-uncrustify-0.1.2
-   $ mkdir buildwin-64
-   $ cd buildwin-64
-   $ cmake -G Ninja \
-           -DCMAKE_BUILD_TYPE=Release \
-           -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw64.cmake \
-           -DCMAKE_EXE_LINKER_FLAGS="-static -s" \
-           ..
-   $ ninja
-   $ cpack
-
-Create a tarball:
-
-.. code::
-
-   $ cd /path/to/uncrustify
-   $ git archive -o uncrustify-0.1.2.tar.gz uncrustify-0.1.2
-TODO: find the best strategie...
-
-(If you don't have Ninja_, or just don't want to use it for whatever reason,
-omit ``-G Ninja`` and run ``make`` instead of ``ninja``.)
-
-This is also a good time to test the tagged build on Linux:
-
-.. code::
-
-   $ wget https://github.com/uncrustify/uncrustify/archive/uncrustify-0.1.2.tar.gz
-   $ tar xzf uncrustify-0.1.2.tar.gz
-   $ cd uncrustify-uncrustify-0.1.2
-   $ mkdir build
-   $ cd build
-   $ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
-   $ ninja
-   $ ctest
-   $ ./uncrustify --version
-
-Upload to SourceForge
-=====================
-
-- Login as admin under https://sourceforge.net/projects/uncrustify/
-- Change to https://sourceforge.net/projects/uncrustify/files/
-- "Add Folder"; the name should be e.g. "uncrustify-0.1.2"
-- Navigate to the new folder
-  (e.g. https://sourceforge.net/projects/uncrustify/files/uncrustify-0.1.2/)
-- "Add File"; upload the following files
-  (adjusting for the actual version number):
-
-  - README.md
-  - uncrustify-0.1.2.tar.gz
-  - buildwin-32/uncrustify-0.1.2_f-win32.zip
-  - buildwin-64/uncrustify-0.1.2_f-win64.zip
-
-- "Done"
-- Upload the documentation:
-
-  .. code::
-
-     $ scp -r documentation/htdocs/* ChangeLog \
-       USER,uncrustify@web.sourceforge.net:htdocs/
-
-- Use the web interface (file manager) to create the release folder
-  and upload the files to SourceForge.
-
-Announce the Release (Optional)
-===============================
-
-The new release is live! Spread the word! Consider these ideas:
-
-- Create a news item.
-- Update freshmeat.net project.
-
-Release Checklist
-=================
-
-The following list serves as a quick reference for making a release.
-These items are explained in greater detail above.
-
-#. Verify that CI passes
-
-#. Use ``release_tool.py`` to initialize the release
-   and perform automated updates. Check:
-
-   #. ``:/CMakeLists.txt``
-   #. ``:/package.json``
-   #. ``:/README.md``
-   #. ``:/documentation/htdocs/index.html``
-
-#. Update documentation as needed:
-
-   #. ``:/ChangeLog``
-   #. ``:/man/uncrustify.1.in``
-
-#. Stage changes.
-#. Test everything again.
-#. Finalize the code changes.
-#. Push to GitHub and create a merge request.
-#. Tag the merged release branch.
-#. Create Windows (32- and 64-bit) binaries.
-#. Run a test build on Linux.
-#. Upload the release and documentation to SourceForge.
-#. Announce the release!
-
-.. _MinGW: http://www.mingw.org/
-.. _GitPython: https://github.com/gitpython-developers/GitPython
-.. _Ninja: https://ninja-build.org/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Gcov_test.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Gcov_test.sh
deleted file mode 100755
index a3853773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Gcov_test.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/bash
-#
-# @author  Guy Maurel
-# @license GPL v2+
-#
-# 30. 4. 2018
-#
-# The script prepare a new version of uncrustify with the compile options:
-#  CMAKE_CXX_FLAGS                  -fprofile-arcs -ftest-coverage
-#  CMAKE_C_FLAGS                    -fprofile-arcs -ftest-coverage
-# to use the facilities from gcov.
-# Running uncrustify with all the test data will mark all parts of the sources
-# which are used.
-# The "not marked" portions, if any, should give the opportunity to prepare new
-# test data to complete the whole tests.
-# The results are stored in the directory ${TOTALS_DIR}
-# The name of the file is ${source_file}.total
-# The line(s) of code which are still not used by any of the tests cases are
-# marked which the token "#####" at the beginning of the line.
-# As the testing part (unc_tools.cpp, backup.cpp) are only used by a developper,
-# all the lines are marked.
-# Also the detect.cpp part of uncrustify is completly marked.
-#
-# TAKE ATTENTION:
-# ===============
-#
-# Running the test is long. I need about 20 minutes.
-# This is about 40 times so much as the ctest.
-# The disk space necessary is also very big, about 3 Gbytes
-# This is about 1500 times bigger as the sources.
-#
-SCRIPT_NAME=$0
-#echo "SCRIPT_NAME="${SCRIPT_NAME}
-BASE_NAME=`basename ${SCRIPT_NAME}`
-DIR_NAME=`dirname ${SCRIPT_NAME}`
-if [ ${DIR_NAME} != "." ] ;
-then
-  echo "you must use the script at the directory <uncrustify_directory>/scripts"
-  exit
-fi
-cd ..
-SOURCES_LIST_H=`ls -1 src/*.h | cut -b 5-`
-SOURCES_LIST_CPP=`ls -1 src/*.cpp | cut -b 5-`
-#
-rm -rf gcov_test
-mkdir gcov_test
-#
-cd gcov_test
-# build a new uncrustify binary
-cmake -D CMAKE_BUILD_TYPE=Release \
-      -D CMAKE_C_FLAGS="-fprofile-arcs -ftest-coverage" \
-      -D CMAKE_CXX_FLAGS="-fprofile-arcs -ftest-coverage" ..
-make
-# use uncrustify without parameter
-./uncrustify
-#
-GCNO_LIST=`ls -1 ./CMakeFiles/uncrustify.dir/src/*.gcno`
-for gcno_file in ${GCNO_LIST}
-do
-  echo "gcno_file=${gcno_file}"
-  gcno_base_name=`basename ${gcno_file} .gcno`
-  echo ${gcno_base_name}
-  gcov ${gcno_file} -m
-done
-#
-ADD_TEST_LIST="add_test_list.txt"
-ADD_TEST_LIST_10="add_test_list_10.txt"
-ADD_TEST_LIST_NUMBER="add_test_list_number.txt"
-ADD_TEST_LIST_AWK="../scripts/add_test_list.awk"
-ADD_TEST_LIST_CMD="add_test_list.sh"
-#
-# prepare a list of all tests
-grep add_test ../build/tests/CTestTestfile.cmake > ${ADD_TEST_LIST}
-cut -b 10- < ${ADD_TEST_LIST} > ${ADD_TEST_LIST_10}
-cut --delimiter=" " --fields=1 < ${ADD_TEST_LIST_10} > ${ADD_TEST_LIST_NUMBER}
-#
-NUMBER_LIST=`cat ${ADD_TEST_LIST_NUMBER}`
-#
-# prepare a new script file to use uncrustify with all the tests cases
-gawk --file ${ADD_TEST_LIST_AWK} \
-     --assign sources_cpp="${SOURCES_LIST_CPP}" \
-     --assign sources_h="${SOURCES_LIST_H}" < ${ADD_TEST_LIST} > ${ADD_TEST_LIST_CMD}
-chmod +x ${ADD_TEST_LIST_CMD}
-#
-# ATTENTION: this takes about 10 minutes
-# use the new script file ADD_TEST_LIST_CMD to build the information
-./${ADD_TEST_LIST_CMD}
-#
-# compare, add the counts of each lines of generated gcov-tests
-COMPARE_AND_ADD="../scripts/compare_the_gcov.awk"
-TOTALS_DIR="Totals"
-mkdir -p Totals
-#
-# choose
-DO_IT_WITH_TEST="yes"
-#DO_IT_WITH_TEST="no"
-#
-# and apply
-if [ ${DO_IT_WITH_TEST} == "yes" ]
-then
-  # do it with intermediate files
-  # to save the last file of each test
-  for test_number in ${NUMBER_LIST}
-  do
-    last_test_number=${test_number}
-  done
-  #
-  for source_file in ${SOURCES_LIST_CPP}
-  do
-    echo "source_file is ${source_file}"
-    I_file="blabla"
-    # this file doesn' exists
-    for test_number in ${NUMBER_LIST}
-    do
-      echo "source_file is ${source_file}: test_number=${test_number}"
-      H_DIR="${source_file}_Dir"
-      mkdir -p ${TOTALS_DIR}/${H_DIR}
-      TEST_FILE=${test_number}/${source_file}.gcov
-      if [ -s ${TEST_FILE} ] ;
-      then
-        O_file="${TOTALS_DIR}/${H_DIR}/${test_number}"
-        gawk --file ${COMPARE_AND_ADD} \
-             --assign  in_file="${I_file}" \
-             --assign out_file="${O_file}" < ${TEST_FILE}
-        I_file=${O_file}
-      fi
-      # to brake before the end
-      #if [ "${test_number}" == "c-sharp_10010" ]
-      #if [ "${test_number}" == "c_10005" ]
-      #if [ "${test_number}" == "cpp_60042" ]
-      #then
-      #  exit
-      #fi
-    done
-    # save the last file of each test
-    cp ${O_file} ${TOTALS_DIR}/${source_file}.total
-  done
-else
-  # do it directly, without intermediate files
-  for source_file in ${SOURCES_LIST_CPP}
-  do
-    for test_number in ${NUMBER_LIST}
-    do
-      echo "source_file is ${source_file}: test_number=${test_number}"
-      TEST_FILE=${test_number}/${source_file}.gcov
-      TOTALS_FILE=${source_file}
-      if [ -s ${TEST_FILE} ] ;
-      then
-        gawk --file ${COMPARE_AND_ADD} \
-             --assign  in_file="${TOTALS_DIR}/${TOTALS_FILE}" \
-             --assign out_file="${TOTALS_DIR}/${TOTALS_FILE}" < ${TEST_FILE}
-      fi
-      # to brake before the end
-      #if [ "${test_number}" == "c-sharp_10010" ]
-      #if [ "${test_number}" == "c_10005" ]
-      #if [ "${test_number}" == "cpp_60042" ]
-      #then
-      #  exit
-      #fi
-    done
-  done
-fi
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Run_clang-tidy.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Run_clang-tidy.sh
deleted file mode 100755
index c2f1c150..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Run_clang-tidy.sh
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/bin/bash
-#
-# 2017-02-27
-#
-script_dir="$(dirname "$(readlink -f "$0")")"
-#
-SRC="${script_dir}/../src"
-BUILD="${script_dir}/../build"
-#
-where=`pwd`
-#
-# build the lists
-cd ${SRC}
-list_of_C=`ls *.cpp`
-list_of_H=`ls *.h`
-list_of_files="${list_of_C} ${list_of_H}" 
-cd ${where}
-#
-RESULTS="${script_dir}/../results"
-#
-rm -rf ${RESULTS}
-mkdir ${RESULTS}
-#
-COMPILE_COMMANDS="compile_commands.json"
-cp ${BUILD}/${COMPILE_COMMANDS} ${SRC}
-#
-# choise one of list of checks
-list_of_Check="\
-   boost-use-to-string\
-   cert-dcl21-cpp\
-   cert-dcl50-cpp\
-   cert-dcl58-cpp\
-   cert-env33-c\
-   cert-err34-c\
-   cert-err52-cpp\
-   cert-err58-cpp\
-   cert-err60-cpp\
-   cert-flp30-c\
-   cert-msc50-cpp\
-   cppcoreguidelines-interfaces-global-init\
-   cppcoreguidelines-no-malloc\
-   cppcoreguidelines-pro-bounds-array-to-pointer-decay\
-   cppcoreguidelines-pro-bounds-constant-array-index\
-   cppcoreguidelines-pro-bounds-pointer-arithmetic\
-   cppcoreguidelines-pro-type-const-cast\
-   cppcoreguidelines-pro-type-cstyle-cast\
-   cppcoreguidelines-pro-type-member-init\
-   cppcoreguidelines-pro-type-reinterpret-cast\
-   cppcoreguidelines-pro-type-static-cast-downcast\
-   cppcoreguidelines-pro-type-union-access\
-   cppcoreguidelines-pro-type-vararg\
-   cppcoreguidelines-slicing\
-   cppcoreguidelines-special-member-functions\
-   google-build-explicit-make-pair\
-   google-build-namespaces\
-   google-build-using-namespace\
-   google-default-arguments\
-   google-explicit-constructor\
-   google-global-names-in-headers\
-   google-readability-casting\
-   google-readability-todo\
-   google-runtime-int\
-   google-runtime-member-string-references\
-   google-runtime-memset\
-   google-runtime-operator\
-   google-runtime-references\
-   hicpp-explicit-conversions\
-   hicpp-function-size\
-   hicpp-invalid-access-moved\
-   hicpp-member-init\
-   hicpp-named-parameter\
-   hicpp-new-delete-operators\
-   hicpp-no-assembler\
-   hicpp-noexcept-move\
-   hicpp-special-member-functions\
-   hicpp-undelegated-constructor\
-   hicpp-use-equals-default\
-   hicpp-use-equals-delete\
-   hicpp-use-override\
-   llvm-header-guard\
-   llvm-include-order\
-   llvm-namespace-comment\
-   llvm-twine-local"
-#list_of_Check="misc-argument-comment\
-#   misc-assert-side-effect\
-#   misc-bool-pointer-implicit-conversion\
-#   misc-dangling-handle\
-#   misc-definitions-in-headers\
-#   misc-fold-init-type\
-#   misc-forward-declaration-namespace\
-#   misc-forwarding-reference-overload\
-#   misc-inaccurate-erase\
-#   misc-incorrect-roundings\
-#   misc-inefficient-algorithm\
-#   misc-macro-parentheses\
-#   misc-macro-repeated-side-effects\
-#   misc-misplaced-const\
-#   misc-misplaced-widening-cast\
-#   misc-move-const-arg\
-#   misc-move-constructor-init\
-#   misc-move-forwarding-reference\
-#   misc-multiple-statement-macro\
-#   misc-new-delete-overloads\
-#   misc-noexcept-move-constructor\
-#   misc-non-copyable-objects\
-#   misc-redundant-expression\
-#   misc-sizeof-container\
-#   misc-sizeof-expression\
-#   misc-static-assert\
-#   misc-string-compare\
-#   misc-string-constructor\
-#   misc-string-integer-assignment\
-#   misc-string-literal-with-embedded-nul\
-#   misc-suspicious-enum-usage\
-#   misc-suspicious-missing-comma\
-#   misc-suspicious-semicolon\
-#   misc-suspicious-string-compare\
-#   misc-swapped-arguments\
-#   misc-throw-by-value-catch-by-reference\
-#   misc-unconventional-assign-operator\
-#   misc-undelegated-constructor\
-#   misc-uniqueptr-reset-release\
-#   misc-unused-alias-decls\
-#   misc-unused-parameters\
-#   misc-unused-raii\
-#   misc-unused-using-decls\
-#   misc-use-after-move\
-#   misc-virtual-near-miss"
-#list_of_Check="modernize-avoid-bind\
-#   modernize-deprecated-headers\
-#   modernize-loop-convert\
-#   modernize-make-shared\
-#   modernize-make-unique\
-#   modernize-pass-by-value\
-#   modernize-raw-string-literal\
-#   modernize-redundant-void-arg\
-#   modernize-replace-auto-ptr\
-#   modernize-replace-random-shuffle\
-#   modernize-return-braced-init-list\
-#   modernize-shrink-to-fit\
-#   modernize-use-auto\
-#   modernize-use-bool-literals\
-#   modernize-use-default-member-init\
-#   modernize-use-emplace\
-#   modernize-use-equals-default\
-#   modernize-use-equals-delete\
-#   modernize-use-nullptr\
-#   modernize-use-override\
-#   modernize-use-transparent-functors\
-#   modernize-use-using\
-#   mpi-buffer-deref\
-#   mpi-type-mismatch\
-#   performance-faster-string-find\
-#   performance-for-range-copy\
-#   performance-implicit-cast-in-loop\
-#   performance-inefficient-string-concatenation\
-#   performance-inefficient-vector-operation\
-#   performance-type-promotion-in-math-fn\
-#   performance-unnecessary-copy-initialization\
-#   performance-unnecessary-value-param"
-#list_of_Check="readability-avoid-const-params-in-decls\
-#   readability-braces-around-statements\
-#   readability-container-size-empty\
-#   readability-delete-null-pointer\
-#   readability-deleted-default\
-#   readability-else-after-return\
-#   readability-function-size\
-#   readability-identifier-naming\
-#   readability-implicit-bool-cast\
-#   readability-inconsistent-declaration-parameter-name\
-#   readability-misleading-indentation\
-#   readability-misplaced-array-index\
-#   readability-named-parameter\
-#   readability-non-const-parameter\
-#   readability-redundant-control-flow\
-#   readability-redundant-declaration\
-#   readability-redundant-function-ptr-dereference\
-#   readability-redundant-member-init\
-#   readability-redundant-smartptr-get\
-#   readability-redundant-string-cstr\
-#   readability-redundant-string-init\
-#   readability-simplify-boolean-expr\
-#   readability-static-definition-in-anonymous-namespace\
-#   readability-uniqueptr-delete-release"
-#
-for file in ${list_of_files}
-do
-  echo "test for "${file}
-  OUTPUT="${RESULTS}/${file}.txt"
-  for check in ${list_of_Check}
-  do
-    echo "  test for "${check}
-    clang-tidy -checks="-*, ${check}" -header-filter="./${SRC}/*" ${SRC}/${file} \
-      > ${OUTPUT} 2>/dev/null
-    if [[ -s ${OUTPUT} ]]
-    then
-      head ${OUTPUT}
-      break
-    else
-      rm -f ${OUTPUT}
-    fi
-  done
-done
-#
-rm ${SRC}/${COMPILE_COMMANDS}
-rmdir --ignore-fail-on-non-empty ${RESULTS}
-if [[ -d ${RESULTS} ]]
-then
-  echo "some problem(s) are still present"
-  exit 1
-else
-  echo "all clang-tidy are OK"
-  exit 0
-fi
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/add_test_list.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/add_test_list.awk
deleted file mode 100644
index 1fbe2840..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/add_test_list.awk
+++ /dev/null
@@ -1,56 +0,0 @@
-BEGIN {
-  Test_Count = 0;
-  count_cpp = split(sources_cpp, source_list_cpp, " ");
-  printf("#count_cpp= %d\n", count_cpp);
-  count_h = split(sources_h, source_list_h, " ");
-  printf("#count_h= %d\n", count_h);
-}
-{
-  theLine = $0;
-  command = substr(theLine, 10);
-  split(command, parts, " ");
-  number = parts[1];
-  lang = substr(parts[4], 14);
-  l_lang = length(lang);
-  lang_2 = substr(lang, 1, l_lang - 1);
-  config = substr(parts[5], 16);
-  input_file = substr(parts[7], 15);
-
-  printf("echo \"Run uncrustify: The TESTNUMBER is %s\"\n", number);
-  printf("rm -rf %s\n", number);
-  printf("mkdir %s\n", number);
-  printf("cd %s\n", number);
-  printf("mkdir save\n");
-  printf("../uncrustify -q -c \"../../tests/%s -f \"../../tests/%s -l %s -o /dev/null\n",
-         config, input_file, lang_2);
-  for (i = 1; i <= count_cpp; i++) {
-    source_file = source_list_cpp[i];
-    function_file = sprintf("../CMakeFiles/uncrustify.dir/src/%s.gcno", source_file);
-    printf("if [ -s %s ] ;\n", function_file);
-    printf("then\n");
-    printf("  gcov %s 2> /dev/null 1> /dev/null\n", function_file, source_file);
-    printf("fi\n");
-    printf("if [ -s %s.* ] ;\n", source_file);
-    printf("then\n");
-    printf("   mv -f %s.* ./save/\n", source_file);
-    printf("fi\n");
-  }
-  for (i = 1; i <= count_h; i++) {
-    source_file = source_list_h[i];
-    printf("if [ -s %s.* ] ;\n", source_file);
-    printf("then\n");
-    printf("   mv -f %s.* ./save/\n", source_file);
-    printf("fi\n");
-  }
-  printf("  rm *.gcov\n");
-  printf("  mv save/* .\n");
-  printf("rmdir save\n");
-  printf("cd ..\n\n");
-  # to brake before the end
-  #Test_Count = Test_Count + 1;
-  #if ( Test_Count == 1000) {
-  #if ( Test_Count == 109) {
-  #if ( Test_Count == 2) {
-  #  printf("exit\n");
-  #}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/check_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/check_options.py
deleted file mode 100644
index 1d32224b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/check_options.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /usr/bin/env python
-#
-# Check the option usage.
-# Make sure the union member matches the option type.
-#
-from os.path import dirname, join, abspath
-from os import listdir, EX_OK, EX_DATAERR
-from fnmatch import filter
-
-# just use the first letter of the member name - should be unique
-map_access_type = {
-    'b': 'AT_BOOL',
-    'a': 'AT_IARF',
-    'n': 'AT_NUM',
-    'u': 'AT_UNUM',
-    'l': 'AT_LINE',
-    't': 'AT_POS',
-}
-map_option_type = {}
-
-
-# checks if while accessing the cpd.settings the right union accessor is used in the file
-def check_file(file_path):
-    problems = 0
-    line_no = 0
-
-    fd = open(file_path, 'r')
-    for line in fd:
-        line_no += 1
-
-        pos_cpd_s = line.find('cpd.settings[UO_')
-        pos_cpd_e = line[pos_cpd_s:].find(']')
-        if pos_cpd_s > 0 and pos_cpd_e > 0:
-            pos_option_s = pos_cpd_s + 13
-            pos_option_e = pos_cpd_s + pos_cpd_e
-
-            option = line[pos_option_s : pos_option_e]
-            union_access = line[pos_option_e + 2]
-
-            if option in map_option_type and union_access in map_access_type:
-                if map_option_type[option] != map_access_type[union_access]:
-                    print("%s [%d] %s should use %s not %s" % (file_path, line_no, option,
-                                                               map_option_type[option], map_access_type[union_access]))
-                    problems += 1
-    return problems
-
-
-def fill_map_option_type(file_path):
-    # Read in all the options
-    fd = open(file_path, 'r')
-    for line in fd:
-        if line.find('unc_add_option') > 0 and line.find('UO_') > 0:
-            splits = line.split(',')
-            if len(splits) >= 3:
-                map_option_type[splits[1].strip()] = splits[2].strip()
-    fd.close()
-
-
-def main():
-    src_dir = join(dirname(dirname(abspath(__file__))), 'src')
-    fill_map_option_type(join(src_dir, 'options.cpp'))
-
-    # Get a list of all the source files
-    ld = listdir(src_dir)
-    src_files = filter(ld, '*.cpp')
-    src_files.extend(filter(ld, '*.h'))
-
-    # Check each source file
-    problems = 0
-    for fn in src_files:
-        problems += check_file(join(src_dir, fn))
-    if problems == 0:
-        print("No problems found")
-        return EX_OK
-    else:
-        return EX_DATAERR
-
-if __name__ == '__main__':
-    exit(main())
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/cmpcfg.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/cmpcfg.pl
deleted file mode 100755
index df119dc1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/cmpcfg.pl
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (c) 2006 David Thompson
-# da.thompson@yahoo.com
-# Fri Nov 17 20:41:23 PST 2006
-# License: GPL
-
-# Purpose of this script is to process config files and
-# produce a comparision chart of values.  The input files
-# are simple series of parameter definitions, of the form
-# 'name=value' pairs, whitespace and comments are correctly
-# ignored.  Invoke on multiple config files to compare
-# parameter values for all files, try this,
-#   cd /usr/local/share/uncrustify
-#   cmpcfg.pl *.cfg
-
-# first build hashes from all input files
-# 1. %name is a master hash of all parameter names found
-#    across all files, we use a hash to remember the keys,
-#    we don't compare about the values stored for each key
-# 2. %table is a per file 2 dimensional hash array indexed
-#    by the current filename and parameter; ie, this hash
-#    stores the 'name=value' pairs on per file basis
-foreach my $file (@ARGV) {
-    open FH, "<$file"
-        or die "Can't open file: $file";
-    while (<FH>) {
-        chomp;
-        next if (/^[ \t]*$/);            # ignore blank lines
-        next if (/^[ \t]*#/);            # ignore comment lines
-        s/#.*$//;                        # strip trailing comments
-        s/^[ \t]*//;                     # strip leading whitespace
-        s/[ \t]*$//;                     # strip trailing whitespace
-        s/[ \t]*=[ \t]*/=/;              # remove whitespace around '='
-        $_ = lc;                         # lowercase everything
-        ($name, $value) = split /=/;     # extract name and value
-        $names{$name} = $name;           # master hash of all names
-        $table{$file}{$name} = $value;   # per file hash of names
-    }
-    close FH;
-}
-
-# find longest parameter name
-# we'll use this later for report printing
-foreach $name (sort keys %names) {
-    if (length($name) > $maxlen) {
-        $maxlen = length($name);
-    }
-}
-$maxlen += 4;  # add extra padding
-
-# return string centered in specified width
-sub center {
-    ($wid, $str) = @_;
-    $flg = 0;
-    while (length($str) < $wid) {
-        if ($flg) {
-            $flg = 0;
-            $str = " " . $str;
-        } else {
-            $flg = 1;
-            $str = $str . " ";
-        }
-    }
-    return $str;
-}
-
-# print legend for filenames
-$cnt = 0;
-foreach $file (@ARGV) {
-    $cnt++;
-    print " <$cnt>  $file\n";
-}
-
-# blank line separates legend & header
-print "\n";
-
-# print header line
-print " " x $maxlen . " ";
-$cnt = 0;
-foreach (@ARGV) {
-    $cnt++;
-    $fmt = "<$cnt>";
-    print "     ".&center(6, $fmt);
-}
-print "\n";
-
-# print body of report, one line per parameter name
-foreach $name (sort keys %names) {
-    printf "%-*s ", $maxlen, $name;
-    foreach $file (@ARGV) {
-        if (defined($table{$file}{$name})) {
-            print "     ".&center(6, $table{$file}{$name});
-        } else {
-            # parameter not defined for this file
-            print "     ".&center(6, "*");
-        }
-    }
-    print "\n";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/compare_the_gcov.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/compare_the_gcov.awk
deleted file mode 100644
index 30dba1ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/compare_the_gcov.awk
+++ /dev/null
@@ -1,136 +0,0 @@
-BEGIN {
-  number_of_lines    = 0;
-  number_of_header   = 0;
-  T_number_of_lines  = 0;
-  T_number_of_header = 0;
-  input_file  = in_file;
-  output_file = out_file;
-  #
-  # get the first line, if any.
-  getline aaa <input_file;
-  if (ERRNO != "") {
-    #printf("ERRNO is %s\n", ERRNO);
-    #printf("a new file will be created at %s\n", output_file);
-    # totals-file not found, this is the first run.
-    first_run = "yes";
-  } else {
-    # totals-file is found. Read it into the arrays
-    first_run = "no";
-    for ( i = 1; i < 20000; i++) {
-      theLine = aaa;
-      where_is_colon_1 = index(theLine, ":");
-      part_1 = substr(theLine, 1, where_is_colon_1 - 1);
-      rest_1 = substr(theLine, where_is_colon_1 + 1);
-      where_is_colon_2 = index(rest_1, ":");
-      part_2 = substr(rest_1, 1, where_is_colon_2 - 1) + 0;
-      rest_2 = substr(rest_1, where_is_colon_2 + 1);
-      if (part_2 == 0) {
-        # header part
-        T_number_of_header = T_number_of_header + 1;
-        T_header_part1[T_number_of_header] = part_1;
-        T_header_part2[T_number_of_header] = part_2;
-        T_header_part3[T_number_of_header] = rest_2;
-      } else {
-        # source lines
-        # a new line
-        T_number_of_lines = part_2;
-        T_source_part1[T_number_of_lines] = part_1;
-        T_source_part2[T_number_of_lines] = part_2;
-        T_source_part3[T_number_of_lines] = rest_2;
-      }
-
-      aaa = "";
-      # get the next line
-      getline aaa <input_file;
-      if (aaa == "") {
-        # EOF
-        break;
-      }
-    }
-    close(input_file);
-    # Test it
-    #printf("Test it\n");
-    #for (i = 1; i <= T_number_of_header; i++) {
-    #  printf("%8s:%5d:%s\n", T_header_part1[i], T_header_part2[i], T_header_part3[i]);
-    #}
-    #for (i = 1; i <= T_number_of_lines; i++) {
-    #  printf("%8s:%5d:%s\n", T_source_part1[i], T_source_part2[i], T_source_part3[i]);
-    #}
-  }
-}
-
-{
-  theLine = $0;
-  where_is_colon_1 = index(theLine, ":");
-  part_1 = substr(theLine, 1, where_is_colon_1 - 1);
-  rest_1 = substr(theLine, where_is_colon_1 + 1);
-  where_is_colon_2 = index(rest_1, ":");
-  part_2 = substr(rest_1, 1, where_is_colon_2 - 1) + 0;
-  rest_2 = substr(rest_1, where_is_colon_2 + 1);
-  if (part_2 == 0) {
-    # header part
-    number_of_header = number_of_header + 1;
-    header_part1[number_of_header] = part_1;
-    header_part2[number_of_header] = part_2;
-    header_part3[number_of_header] = rest_2;
-  } else {
-    # source lines
-    # a new line
-    number_of_lines = part_2;
-    source_part1[number_of_lines] = part_1;
-    source_part2[number_of_lines] = part_2;
-    source_part3[number_of_lines] = rest_2;
-    where_ = index(part_1, "-");
-    if (where_ > 0) {
-      # don't take care
-    } else {
-      where_2 = index(part_1, "#####");
-      if (where_2 > 0) {
-        # don't take care
-      } else {
-        d_part_1 = part_1 + 0;
-        # look at T_source_part1[part_2]
-        where_3 = index(T_source_part1[part_2], "#####");
-        if (where_3 > 0) {
-          sum = d_part_1;
-          # write the sum to T_source_part1
-          T_source_part1[part_2] = d_part_1; 
-        } else {
-          d_T = T_source_part1[part_2] + 0;
-          sum = d_part_1 + d_T;
-          # write the sum back to T_source_part1
-          T_source_part1[part_2] = sum; 
-        }
-      }
-    }
-  }
-}
-END {
-  if (first_run == "yes") {
-    # copy to T_
-    T_number_of_header = number_of_header;
-    T_number_of_lines  = number_of_lines;
-    for(i = 1; i <= T_number_of_header; i++) {
-      T_header_part1[i] = header_part1[i]; 
-      T_header_part2[i] = header_part2[i]; 
-      T_header_part3[i] = header_part3[i]; 
-    }
-    for (i = 1; i <= T_number_of_lines; i++) {
-      T_source_part1[i] = source_part1[i]; 
-      T_source_part2[i] = source_part2[i]; 
-      T_source_part3[i] = source_part3[i]; 
-    }
-  }
-  #printf("T_number_of_header is %d\n", T_number_of_header);
-  #printf("T_number_of_lines  is %d\n", T_number_of_lines);
-
-  # delete the previous version
-  printf("") > output_file;
-  for(i = 1; i <= T_number_of_header; i++) {
-    printf("%9s:%5d:%s\n", T_header_part1[i], T_header_part2[i], T_header_part3[i]) >> output_file;
-  }
-  for (i = 1; i <= T_number_of_lines; i++) {
-    printf("%9s:%5d:%s\n", T_source_part1[i], T_source_part2[i], T_source_part3[i]) >> output_file;
-  }
-  close(output_file);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_changelog.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_changelog.py
deleted file mode 100755
index 8e042385..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_changelog.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-
-'''
-This script attempts to extract what options have been added since the
-specified revision (usually a tag, but any revision that git recognizes may be
-provided). It accepts an optional second revision to use as the cut-off. The
-default is your LOCAL "master". Thus, you should ensure that this is up to date
-before running this script.
-
-This script works by extracting the set of options before and after every
-commit that affected ':src/options.h' and computing the differences. It should,
-therefore, be fairly robust (for example, options that moved around won't show
-up). However, if an option is removed and subsequently re-added, or if an
-option was added and subsequently removed, the resulting records will need to
-be reconciled manually.
-'''
-
-import argparse
-import git
-import os
-import re
-import sys
-import time
-
-re_option = re.compile(r'extern (Bounded)?Option<[^>]+>')
-
-
-# -----------------------------------------------------------------------------
-def extract_options(repo, blob_id):
-    from git.util import hex_to_bin
-
-    blob = git.Blob(repo, hex_to_bin(blob_id))
-    content = blob.data_stream.stream
-    options = set()
-
-    for line in iter(content.readline, b''):
-        line = line.decode('utf-8').strip()
-
-        if re_option.match(line):
-            line = content.readline().decode('utf-8').strip()
-            options.add(line.split(';')[0])
-
-    return options
-
-
-# =============================================================================
-class Changeset(object):
-    # -------------------------------------------------------------------------
-    def __init__(self, repo, sha):
-        self.sha = sha
-        self.added_options = set()
-        self.removed_options = set()
-
-        commit = repo.commit(sha)
-        ad = time.gmtime(commit.authored_date)
-        self.date = time.strftime('%b %d %Y', ad).replace(' 0', '  ')
-
-        info = repo.git.log('-1', '--raw', '--abbrev=40', '--pretty=',
-                            sha, '--', ':src/options.h').split(' ')
-        if len(info) < 5:
-            return
-
-        old_options = extract_options(repo, info[2])
-        new_options = extract_options(repo, info[3])
-        self.added_options = new_options.difference(old_options)
-        self.removed_options = old_options.difference(new_options)
-
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(
-        description='Generate changelog for new options')
-
-    root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-    parser.add_argument('--repo', type=str, default=root,
-                        help='Path to uncrustify git repository')
-    parser.add_argument('since', type=str,
-                        help='Revision (tag) of previous uncrustify version')
-    parser.add_argument('until', type=str, default='master', nargs='?',
-                        help='Revision (tag) of next uncrustify version')
-
-    args = parser.parse_args()
-    repo = git.Repo(args.repo)
-    revs = repo.git.log('--pretty=%H', '--reverse',
-                        '{}..{}'.format(args.since, args.until),
-                        '--', ':src/options.h').split('\n')
-
-    if revs == ['']:
-        print('No changes were found')
-        return 1
-
-    changes = []
-    for r in revs:
-        c = Changeset(repo, r)
-        if len(c.added_options) or len(c.removed_options):
-            changes.append(c)
-
-    for c in changes:
-        print(c.sha)
-        for o in c.added_options:
-            print('  Added   : {:36} {}'.format(o, c.date))
-        for o in c.removed_options:
-            print('  Removed : {:36} {}'.format(o, c.date))
-
-    return 0
-
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output.py
deleted file mode 100644
index 2fa4fb0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output.py
+++ /dev/null
@@ -1,493 +0,0 @@
-from __future__ import print_function  # python >= 2.6
-from os import makedirs, path, listdir, rename, remove
-from subprocess import Popen
-from filecmp import cmp
-from glob import iglob
-from shutil import rmtree
-from json import loads as json_loads, dump as json_dump
-from sys import stderr, argv, path as sys_path
-
-"""
-gen_config_combinations_uniq_output.py
-
-Creates from a given set of options all possible option settings
-combinations, formats files with those and displays how much non equal
-formatted outputs have been created.
-
-Expects arg1 to be a filepath to a json config file
-  (see config example below)
-
-:author:  Daniel Chumak
-:license: GPL v2+
-"""
-
-
-# config = {
-#     "option_settings": {
-#         "AT_BOOL": ["False", "True"],
-#         "AT_IARF": ["ignore", "add", "remove", "force"],
-#         "AT_POS": ["ignore", "join", "lead", "lead_break", "lead_force",
-#                    "trail", "trail_break", "trail_force"],
-#         "AT_LINE": ["auto", "lf", "crlf", "cr"],
-#         "AT_NUM": [-2, -1, 0, 1, 2, 3],
-#         "AT_UNUM": [0, 1, 2, 3]
-#     },
-#     "options": [{
-#         "name": "nl_func_type_name",
-#         "type": "AT_IARF"
-#     }, {
-#         "name": "nl_template_class",
-#         "type": "AT_IARF"
-#     }],
-#     "out_dir": "./Out",
-#     "in_files": ["./t.cpp", "./t2.cpp"],
-#     "unc_bin": "../build/uncrustify",
-#     "cleanup_lvl": 2,
-#     "force_cleanup": false,
-#     "json_output": false
-# }
-#
-
-
-def len_index_combinations(max_indices):
-    """generator function that yields a list starting from
-       n_0 = 0,       ... n_m-1 = 0,         n_m = 0
-       ...
-       n_0 = 0,       ... n_m-1 = 0,         n_m = n_m_max
-       ...
-       n_0 = 0,       ... n_m-1 = 1,         n_m = 0
-       n_0 = 0,       ... n_m-1 = 1,         n_m = 1
-       ...
-       n_0 = 0,       ... n_m-1 = n_m-1_max, n_m = n_m_max
-       ...
-       n_0 = n_0_max, ... n_m-1 = n_m-1_max, n_m = n_m_max
-
-
-    :param max_indices: list of max values every position is going to reach
-
-    :yield: list of values at the current step
-    """
-
-    fields = len(max_indices)
-    accu = [0] * fields
-
-    # increment last position n, on max val move pos by one (n-1) and increment
-    # if (n-1) is max move again (n-2) and increment, ...
-    pos = fields
-    while pos >= 0:
-        yield (accu)
-
-        pos = fields - 1
-        accu[pos] += 1
-
-        # on reaching max reset value, move pos and increment at pos
-        while pos >= 0 and accu[pos] >= max_indices[pos]:
-            accu[pos] = 0
-            pos -= 1
-
-            if pos >= 0:
-                accu[pos] += 1
-
-
-def write_config_files(config):
-    """Writes a configuration file for each possible combination of 'option'
-       settings
-
-    :param config: configuration object, expects that it was processed by
-                   check_config
-    """
-
-    options_len = len(config["options"])
-
-    # populate len_options with amount of settings for the types of each option
-    len_options = [0] * options_len
-    for i in range(options_len):
-        option_setting = config["options"][i]["type"]
-        len_options[i] = len(config["option_settings"][option_setting])
-
-    # write configuration files, one per possible combination
-    for combination in len_index_combinations(len_options):
-        len_indices = len(combination)
-
-        # generate output filepath
-        file_path = config['out_dir'] + "/"
-        for i in range(len_indices):
-            option_name = config["options"][i]["name"]
-            file_path += ("%s__" % option_name)
-        for i in range(len_indices):
-            option_type = config["options"][i]["type"]
-            option_setting = combination[i]
-            file_path += ("%d__" % option_setting)
-        file_path += "unc.cfg"
-
-        # write configuration file
-        with open(file_path, 'w') as f:
-            for i in range(len_indices):
-                option_name = config["options"][i]["name"]
-                option_type = config["options"][i]["type"]
-                option_setting = config["option_settings"][option_type][
-                    combination[i]]
-
-                f.write("%s = %s\n" % (option_name, option_setting))
-
-
-def gen_equal_output_map(config):
-    """Formats 'in_files' with configs inside the 'out_dir' with Uncrustify and
-       groups formatted files with equal content together.
-       Expects config filename format generated by write_config_files
-
-    :param config: configuration object, expects that it was processed by
-                   check_config
-    :return: dict of files with equal content
-                     key   -- group index
-                     value -- filepath list
-    """
-
-    # maps that will hold configurations that produce the same formatted files
-    equal_output_map = {}
-    # map len counter
-    map_val_idx = 0
-
-    # iterate through all generated config file names
-
-    for cfg_path in sorted(iglob('%s/*.cfg' % config["out_dir"])):
-        for in_file_idx in range(len(config["in_files"])):
-            # extract substring form config gile name (removes __unc.cfg)
-            splits_file = cfg_path.split("__unc")
-            if len(splits_file) < 1:
-                raise Exception('split with "__unc" | Wrong split len: %d'
-                                % len(splits_file))
-
-            out_path = ("%s__%d" % (splits_file[0], in_file_idx))
-
-            # gen formatted files with uncrustify binary
-            proc = Popen([config["unc_bin"],
-                          "-c", cfg_path,
-                          "-f", config["in_files"][in_file_idx],
-                          "-o", out_path,
-                          ])
-            proc.wait()
-            if proc.returncode != 0:
-                continue
-
-            # populate 'equal_output_map' map
-            if len(equal_output_map) == 0:
-                equal_output_map[0] = [out_path]
-                map_val_idx += 1
-            else:
-                found_flag = False
-                for i in range(map_val_idx):
-                    # compare first file of group i with the generated file
-                    if cmp(equal_output_map[i][0], out_path):
-                        equal_output_map[i].append(out_path)
-                        found_flag = True
-                        break
-                # create new group if files do not match
-                if not found_flag:
-                    equal_output_map[map_val_idx] = [out_path]
-                    map_val_idx += 1
-
-    return equal_output_map
-
-
-def gen_output_dict(config, equal_output_map):
-    """Makes an output dict with the generated results.
-
-    :param config: configuration object, expects that it was processed by
-                   check_config
-
-    :param equal_output_map: dict of files with equal content,
-                             expects format generated by gen_equal_output_map
-    :return: output dict, format:
-             copies objects option_settings, options and in_files (renamed as
-             files) from the config object. Additionally has the object groups
-             that holds gourp - file - settings combination data
-             format:
-                groups = [ [fileIdx0[
-                               [settingIdx0, settingIdx1, ...],
-                               [settingIdx0, settingIdx1, ...] ] ]
-                           [fileIdx1[
-                               [settingIdx0, settingIdx1, ...],
-                               [settingIdx0, settingIdx1, ...] ] ]
-                         ]
-    """
-
-    output_dict = {"option_settings": config["option_settings"],
-                   "options": config["options"],
-                   "files": config["in_files"],
-                   "groups": []}
-
-    options_len = len(output_dict["options"])
-    files_len = len(output_dict["files"])
-
-    for key in equal_output_map:
-        group_dict = []
-        for file_arr_idx in range(files_len):
-            group_dict.append([])
-
-        for list_value in equal_output_map[key]:
-            split = list_value.rsplit("/", 1)
-            split = split[len(split) - 1].split("__")
-            split_len = len(split)
-
-            # n option names + n option values + file idx
-            if split_len < options_len * 2 + 1:
-                print(" wrong split len on  %s\n" % list_value, file=stderr)
-                continue
-
-            file_idx = int(split[split_len - 1])
-            file_combinations = [int(i) for i in split[options_len:split_len-1]]
-
-            group_dict[file_idx].append(file_combinations)
-
-        output_dict["groups"].append(group_dict)
-
-    return output_dict
-
-
-def write_output_dict_pretty(out_dict, out_path):
-    """pretty prints the output dict into a file
-
-    :param out_dict: dict that will be printed, expects format generated by
-                     gen_output_dict
-
-    :param out_path: output filepath
-    """
-
-    group_id = 0
-    options_len = len(out_dict["options"])
-
-    with open(out_path, 'w') as f:
-
-        f.write("Files:\n")
-        for in_file_idx in range(len(out_dict["files"])):
-            f.write("    %d: %s\n" % (in_file_idx,
-                                      out_dict["files"][in_file_idx]))
-
-        f.write("\nOptions:\n")
-        for option_idx in range(options_len):
-            f.write("    %d: %s\n" % (option_idx,
-                                      out_dict["options"][option_idx]["name"]))
-        f.write("\n\n")
-
-        for group in out_dict["groups"]:
-            f.write("Group: %d\n" % group_id)
-            group_id += 1
-
-            for file_idx in range(len(group)):
-                file = group[file_idx]
-
-                for combinations in file:
-                    combination_strings = []
-                    for combination_idx in range(len(combinations)):
-
-                        combination_id = combinations[combination_idx]
-                        combination_string = out_dict["option_settings"][
-                                out_dict["options"][combination_idx]["type"]][
-                                            combination_id]
-                        combination_strings.append(str(combination_string))
-                    f.write("    (%s: %s)\n" % (file_idx,
-                                                " - ".join(combination_strings)))
-            f.write("\n")
-
-
-def load_config(file_path):
-    """reads a file and parses it as json
-
-    :param file_path: path to the json file
-
-    :return: json object
-    """
-
-    with open(file_path, 'r') as f:
-        string = f.read()
-        json = json_loads(string)
-
-    return json
-
-
-def make_abs_path(basis_abs_path, rel_path):
-    return path.normpath(path.join(basis_abs_path, rel_path))
-
-
-def check_config(config, cfg_path=""):
-    """checks if the provided config has all needed options, sets default
-       settings for optional options and transform relative paths into absolute
-       paths.
-
-    :param config: config dict that will be checked
-
-    :param cfg_path: if not empty transforms relative to absolute paths,
-                     paths will be based upon the cfg_path.
-    """
-
-    extend_relative_paths = True if len(cfg_path) > 0 else False
-    cfg_path = path.abspath(path.dirname(cfg_path))
-
-    # --------------------------------------------------------------------------
-
-    if "option_settings" not in config:
-        raise Exception("config file: 'option_settings' missing")
-
-    if len(config["option_settings"]) == 0:
-        raise Exception("config file: 'option_settings' values missing")
-
-    # --------------------------------------------------------------------------
-
-    if "options" not in config:
-        raise Exception("config file: 'options' missing")
-
-    if len(config["options"]) < 2:
-        raise Exception("config file: 'options' min. two options needed")
-
-    for option_obj in config["options"]:
-        if "name" not in option_obj:
-            raise Exception("config file: 'options[{}]' name missing")
-        if "type" not in option_obj:
-            raise Exception("config file: 'options[{}]' type missing")
-        if option_obj["type"] not in config["option_settings"]:
-            raise Exception("config file: 'options[{type='%s'}]' not in option_"
-                            "settings" % option_obj["type"])
-
-    # --------------------------------------------------------------------------
-
-    if "out_dir" not in config:
-        raise Exception("config file: 'out_dir' missing")
-
-    if len(config['out_dir']) == 0:
-        raise Exception("config file: 'out_dir' value missing")
-
-    if extend_relative_paths and not path.isabs(config['out_dir']):
-        config['out_dir'] = make_abs_path(cfg_path, config['out_dir'])
-
-    # --------------------------------------------------------------------------
-
-    if "in_files" not in config:
-        raise Exception("config file: 'in_files' missing")
-
-    if len(config['in_files']) == 0:
-        raise Exception("config file: 'in_files' values missing")
-
-    for file_idx in range(len(config['in_files'])):
-        if extend_relative_paths and not path.isabs(
-                config['in_files'][file_idx]):
-            config['in_files'][file_idx] = make_abs_path(cfg_path,
-                                                         config['in_files'][
-                                                             file_idx])
-
-        if not path.isfile(config['in_files'][file_idx]):
-            raise Exception("config file: '%s' is not a file"
-                            % config['in_files'][file_idx])
-
-    # --------------------------------------------------------------------------
-
-    if "unc_bin" not in config:
-        raise Exception("config file: 'in_files' missing")
-
-    if extend_relative_paths and not path.isabs(config['unc_bin']):
-        config['unc_bin'] = make_abs_path(cfg_path, config['unc_bin'])
-
-    if not path.isfile(config['unc_bin']):
-        raise Exception("config file: '%s' is not a file" % config['unc_bin'])
-
-    # Optional -----------------------------------------------------------------
-
-    if "cleanup_lvl" not in config:
-        config["cleanup_lvl"] = 1
-
-    if "force_cleanup" not in config:
-        config["force_cleanup"] = False
-
-    if "json_output" not in config:
-        config["json_output"] = False
-
-
-def cleanup(level, eq_map, clean_target_dir, keep_files=()):
-    """cleans up output_dir
-
-    :param level: 0 - do nothing,
-                  1 - keep `keep_files` and 1 file for each group,
-                  2 - remove everything
-
-    :param equal_output_map: dict of files with equal content,
-                             expects format generated by gen_equal_output_map
-
-    :param clean_target_dir: directory which content will be cleaned
-
-    :param keep_files: list of files should not be removed
-    """
-
-    if level == 0:
-        return
-
-    if level == 2:
-        rmtree(clean_target_dir)
-
-    if level == 1:
-        rm_files = [clean_target_dir + "/" + f for f in
-                    listdir(clean_target_dir)]
-
-        for f in keep_files:
-            rm_files.remove(f)
-
-        for idx in eq_map:
-            old_path = eq_map[idx][0]
-            new_path = ("%s/g_%d" % (path.dirname(path.abspath(old_path)), idx))
-            rename(old_path, new_path)
-
-            try:
-                rm_files.remove(old_path)
-            except ValueError:
-                pass  # ignore that it is missing
-
-            try:
-                rm_files.remove(new_path)
-            except ValueError:
-                pass  # ignore that it is missing
-
-        for f in rm_files:
-            remove(f)
-
-
-def main(args):
-    config = load_config(args[0])
-    check_config(config, args[0])
-
-    # gen output directory
-    if path.isfile(config["out_dir"]):
-        raise Exception("%s is a file" % config["out_dir"])
-
-    if not path.isdir(config["out_dir"]):
-        makedirs(config["out_dir"])
-    elif not config["force_cleanup"] and config["cleanup_lvl"] > 0:
-        raise Exception("cleanup_lvl > 0 on an existing directory: %s"
-                        % config["out_dir"])
-
-    write_config_files(config)
-    eq_map = gen_equal_output_map(config)
-    output_dict = gen_output_dict(config, eq_map)
-
-    # write output as txt file
-    output_dict_path = path.join(config["out_dir"], "out.txt")
-    write_output_dict_pretty(output_dict, output_dict_path)
-
-    # read ouput txt file to print it
-    with open(output_dict_path, 'r') as f:
-        print()
-        print(f.read())
-
-    keep_files = [output_dict_path]
-
-    # write output as json file
-    if config["json_output"]:
-        output_dict_json_path = path.join(config["out_dir"], "out.json")
-        with open(output_dict_json_path, 'w') as f:
-            json_dump(output_dict, f)
-        keep_files.append(output_dict_json_path)
-
-    # clean output directory
-    cleanup(config["cleanup_lvl"], eq_map, config["out_dir"], keep_files)
-
-
-if __name__ == "__main__":
-    main(argv[1:])
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output_example.json b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output_example.json
deleted file mode 100644
index 315fdfef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output_example.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "option_settings": {
-        "AT_BOOL": ["False", "True"],
-        "AT_IARF": ["ignore", "add", "remove", "force"],
-        "AT_POS": ["ignore", "join", "lead", "lead_break", "lead_force",
-                   "trail", "trail_break", "trail_force"
-                   ],
-        "AT_LINE": ["auto", "lf", "crlf", "cr"],
-        "AT_NUM": [-2, -1, 0, 1, 2, 3],
-        "AT_UNUM": [0, 1, 2, 3]
-    },
-    "options": [{
-        "name": "nl_func_type_name",
-        "type": "AT_IARF"
-    }, {
-        "name": "nl_template_class",
-        "type": "AT_IARF"
-    }],
-    "out_dir": "./out_uniq_outputs",
-    "in_files": ["../src/uncrustify.cpp", "../src/width.h"],
-    "unc_bin": "../build/uncrustify",
-    "cleanup_lvl" : 0,
-    "force_cleanup": false,
-    "json_output": false
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/grammar_permutator.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/grammar_permutator.py
deleted file mode 100755
index cd42bd9f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/grammar_permutator.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/python
-import argparse
-
-from nltk.parse.generate import generate
-from nltk import CFG
-from os.path import exists
-from sys import exit as sys_exit
-
-DEMO_GRAMMAR = """
-    S -> 'import ' ImportList ';' | 'static import ' ImportList ';'
-    ImportList -> Import | ImportBindings | Import ', ' ImportList
-    Import -> ModuleFullyQualifiedName | ModuleAliasIdentifier ' = ' ModuleFullyQualifiedName
-    ImportBindings -> Import ' : ' ImportBindList
-    ImportBindList -> ImportBind | ImportBind ', ' ImportBindList
-    ImportBind -> Identifier | Identifier ' = ' Identifier
-    
-    ModuleAliasIdentifier -> Identifier
-    
-    Packages -> PackageName | Packages '.' PackageName
-    ModuleFullyQualifiedName -> ModuleName | Packages '.' ModuleName
-    PackageName -> Identifier
-    ModuleName -> Identifier
-    
-    Identifier -> 'x'
-"""
-
-
-def valid_file(arg_parser, *args):
-    """
-    checks if on of the provided paths is a file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param arg_parser:
-        argument parser object that is called if no file is found
-
-    :param args: list< str >
-        a list of file path that is going to be checked
-
-
-    :return: str
-    ----------------------------------------------------------------------------
-        path to an existing file
-    """
-    arg = None
-    found_flag = False
-    for arg in args:
-        if exists(arg):
-            found_flag = True
-            break
-    if not found_flag:
-        arg_parser.error("file(s) do not exist: %s" % args)
-
-    return arg
-
-
-def main(args):
-    grammar_string = DEMO_GRAMMAR
-
-    if args.input_file_path:
-        with open(args.input_file_path, 'r') as f:
-            grammar_string = f.read()
-
-    grammar = CFG.fromstring(grammar_string)
-
-    for sentence in generate(grammar, depth=args.depth):
-        print(''.join(sentence))
-
-    return 0
-
-
-if __name__ == "__main__":
-    arg_parser = argparse.ArgumentParser()
-
-    arg_parser.add_argument(
-        '-i', '--input_file_path',
-        metavar='<path>',
-        type=lambda x: valid_file(arg_parser, x),
-        help="Path to the grammar file",
-        required=False
-    )
-    arg_parser.add_argument(
-        '-d', '--depth',
-        metavar='<nr>',
-        type=int,
-        default=9,
-        help='Max depth of grammar tree.'
-    )
-
-    FLAGS, unparsed = arg_parser.parse_known_args()
-
-    sys_exit(main(FLAGS))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_katehl.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_katehl.py
deleted file mode 100755
index e241986a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_katehl.py
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import io
-import os
-import re
-
-re_token = re.compile(r'^CT_(\w+),')
-re_version = re.compile(r'.*UNCRUSTIFY_VERSION\s*"Uncrustify-([^"]+)"')
-re_option = re.compile(r'extern (Bounded)?Option<[^>]+>')
-re_enum_decl = re.compile(r'enum class (\w+)( *// *<(\w+)>)?')
-re_enum_value = re.compile(r'(\w+)(?= *([,=]|//|$))')
-re_aliases = re.compile(r'UNC_OPTVAL_ALIAS\(([^)]+)\)')
-
-version = '0.0'
-options = set()
-values = set()
-tokens = set()
-
-root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-script = os.path.relpath(__file__, root)
-
-
-# -----------------------------------------------------------------------------
-def read_enum(f):
-    global values
-
-    for line in iter(f.readline, ''):
-        line = line.strip()
-
-        if line.startswith('{'):
-            for line in iter(f.readline, ''):
-                line = line.strip()
-
-                if line.startswith('};'):
-                    return
-
-                if 'UNC_INTERNAL' in line:
-                    return
-
-                if 'UNC_CONVERT_INTERNAL' in line:
-                    return
-
-                mv = re_enum_value.match(line)
-                if mv is not None:
-                    values.add(mv.group(1).lower())
-
-
-# -----------------------------------------------------------------------------
-def write_items(out, items):
-    for i in sorted(items):
-        out.write(u'      <item>{}</item>\n'.format(i))
-
-
-# -----------------------------------------------------------------------------
-def write_options(out, args):
-    write_items(out, options)
-
-
-# -----------------------------------------------------------------------------
-def write_values(out, args):
-    write_items(out, values)
-
-
-# -----------------------------------------------------------------------------
-def write_tokens(out, args):
-    write_items(out, tokens)
-
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(description='Generate uncrustify.xml')
-    parser.add_argument('output', type=str,
-                        help='location of uncrustify.xml to write')
-    parser.add_argument('template', type=str,
-                        help='location of uncrustify.xml.in ' +
-                             'to use as template')
-    parser.add_argument('version', type=str,
-                        help='location of uncrustify_version.h to read')
-    parser.add_argument('options', type=str,
-                        help='location of options.h to read')
-    parser.add_argument('optvals', type=str,
-                        help='location of option.h to read')
-    parser.add_argument('tokens', type=str,
-                        help='location of token_enum.h to read')
-    args = parser.parse_args()
-
-    # Read version
-    with io.open(args.version, 'rt', encoding='utf-8') as f:
-        global version
-        for line in iter(f.readline, ''):
-            line = line.strip()
-
-            mv = re_version.match(line)
-            if mv:
-                version = mv.group(1)
-
-    # Read options
-    with io.open(args.options, 'rt', encoding='utf-8') as f:
-        global options
-        for line in iter(f.readline, ''):
-            line = line.strip()
-
-            if re_option.match(line):
-                n, d = f.readline().split(';')
-                options.add(n)
-
-    # Read option values
-    with io.open(args.optvals, 'rt', encoding='utf-8') as f:
-        global values
-        for line in iter(f.readline, ''):
-            line = line.strip()
-
-            if re_enum_decl.match(line):
-                read_enum(f)
-                continue
-
-            ma = re_aliases.match(line)
-            if ma:
-                for v in ma.group(1).split(',')[2:]:
-                    v = v.strip()[1:-1]
-                    values.add(v)
-
-    # Read tokens
-    with io.open(args.tokens, 'rt', encoding='utf-8') as f:
-        global tokens
-        for line in iter(f.readline, ''):
-            line = line.strip()
-
-            m = re_token.match(line)
-            if m and not m.group(1).endswith(u'_'):
-                tokens.add(m.group(1).lower())
-
-    # Declare replacements
-    replacements = {
-        u'##OPTION_KEYWORDS##': write_options,
-        u'##VALUE_KEYWORDS##': write_values,
-        u'##TOKEN_TYPE_KEYWORDS##': write_tokens,
-    }
-
-    # Write output file
-    with io.open(args.output, 'wt', encoding='utf-8') as out:
-        with io.open(args.template, 'rt', encoding='utf-8') as t:
-            for line in t:
-                directive = line.strip()
-                if directive in replacements:
-                    replacements[directive](out, args)
-                else:
-                    if '##VERSION##' in line:
-                        line = line.replace('##VERSION##', version)
-                    out.write(line)
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-if __name__ == '__main__':
-    main()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_option_enum.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_option_enum.py
deleted file mode 100644
index c141bb04..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_option_enum.py
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import io
-import os
-import re
-
-re_enum_decl = re.compile(r'enum class (\w+)( *// *<(\w+)>)?')
-re_enum_value = re.compile(r'(\w+)(?= *([,=]|//|$))')
-re_values = re.compile(r'UNC_OPTVALS\((\w+)\)')
-re_aliases = re.compile(r'UNC_OPTVAL_ALIAS\(([^)]+)\)')
-enums = {}
-values = {}
-
-root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-script = os.path.relpath(__file__, root)
-
-
-# =============================================================================
-class Enumeration(object):
-    # -------------------------------------------------------------------------
-    def __init__(self, name, prefix, f):
-        self.name = name
-        self.prefix = prefix
-
-        self.values = []
-        self.value_aliases = {}
-
-        self.convert_internal = False
-
-        for line in iter(f.readline, ''):
-            line = line.strip()
-
-            if line.startswith('{'):
-                for line in iter(f.readline, ''):
-                    line = line.strip()
-                    if line.startswith('};'):
-                        return
-
-                    if 'UNC_INTERNAL' in line:
-                        return
-
-                    if 'UNC_CONVERT_INTERNAL' in line:
-                        self.convert_internal = True
-                        continue
-
-                    mv = re_enum_value.match(line)
-                    if mv is not None:
-                        v = mv.group(1)
-                        self.values.append(v)
-                        self.value_aliases[v] = [v.lower()]
-
-    # -------------------------------------------------------------------------
-    def add_aliases(self, value, *args):
-        aliases = [x[1:-1] for x in args]  # strip quotes
-        self.value_aliases[value] += aliases
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-# -----------------------------------------------------------------------------
-def enum_value(enum, value):
-    if enum.prefix is not None:
-        return u'{}_{}'.format(enum.prefix, value)
-    return value
-
-# -----------------------------------------------------------------------------
-def write_banner(out, args):
-    out.write(
-        u'/**\n'
-        u' * @file {out_name}\n'
-        u' * Helpers for option enumerators.\n'
-        u' * Automatically generated by <code>{script}</code>\n'
-        u' * from {in_name}.\n'
-        u' */\n'
-        u'\n'.format(
-            in_name=os.path.basename(args.header),
-            out_name=os.path.basename(args.output),
-            script=script))
-
-
-# -----------------------------------------------------------------------------
-def write_value_strings(out, args):
-    for vn, vs in values.items():
-        out.write(u'const char *const {}_values[] = {{\n'.format(vn))
-        out.write(u'{}\n   nullptr\n}};\n\n'.format(
-            u'\n'.join([u'   "{}",'.format(x.lower()) for x in vs])))
-
-
-# -----------------------------------------------------------------------------
-def write_aliases(out, args):
-    for enum in enums.values():
-        if enum.prefix is None:
-            continue
-
-        for v in enum.values:
-            out.write(u'constexpr auto {p}_{v} = {n}::{v};\n'.format(
-                p=enum.prefix, n=enum.name, v=v))
-
-        out.write(u'\n')
-
-
-# -----------------------------------------------------------------------------
-def write_conversions(out, args):
-    header = u'\n//{}\n'.format('-' * 77)
-
-    for enum in enums.values():
-        if enum.convert_internal:
-            continue
-
-        out.write(header)
-        out.write(
-            u'bool convert_string(const char *in, {} &out)\n'.format(
-                enum.name))
-        out.write(
-            u'{\n'
-            u'   if (false)\n'
-            u'   {\n'
-            u'   }\n')
-
-        for v in enum.values:
-            for a in enum.value_aliases[v]:
-                out.write(
-                    u'   else if (strcasecmp(in, "{}") == 0)\n'
-                    u'   {{\n'
-                    u'      out = {};\n'
-                    u'      return(true);\n'
-                    u'   }}\n'.format(a, enum_value(enum, v)))
-
-        out.write(
-            u'   else\n'
-            u'   {\n'
-            u'      return(false);\n'
-            u'   }\n'
-            u'}\n\n')
-
-    for enum in enums.values():
-        out.write(header)
-        out.write(u'const char *to_string({} val)\n'.format(enum.name))
-        out.write(u'{\n'
-                  u'   switch (val)\n'
-                  u'   {\n')
-
-        for v in enum.values:
-            vs = v if enum.convert_internal else v.lower()
-            out.write(
-                u'   case {}:\n'
-                u'      return "{}";\n\n'.format(
-                    enum_value(enum, v), vs))
-
-        out.write(
-            u'   default:\n'
-            u'      fprintf(stderr, "%s: Unknown {} \'%d\'\\n",\n'
-            u'              __func__, static_cast<int>(val));\n'
-            u'      log_flush(true);\n'
-            u'      exit(EX_SOFTWARE);\n'
-            u'   }}\n'
-            u'}}\n\n'.format(enum.name))
-
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(description='Generate options.cpp')
-    parser.add_argument('output', type=str,
-                        help='location of options.cpp to write')
-    parser.add_argument('header', type=str,
-                        help='location of options.h to read')
-    parser.add_argument('template', type=str,
-                        help='location of option_enum.cpp.in '
-                             'to use as template')
-    args = parser.parse_args()
-
-    with io.open(args.header, 'rt', encoding='utf-8') as f:
-        for line in iter(f.readline, ''):
-            line = line.strip()
-
-            me = re_enum_decl.match(line)
-            if me is not None:
-                e = Enumeration(me.group(1), me.group(3), f)
-                enums[e.name] = e
-                continue
-
-            mv = re_values.match(line)
-            if mv is not None:
-                enum_name = mv.group(1)
-                enum = enums['{}_e'.format(enum_name)]
-                values[enum_name] = enum.values
-
-            ma = re_aliases.match(line)
-            if ma is not None:
-                alias_args = [x.strip() for x in ma.group(1).split(',')]
-                enum = enums[alias_args[0]]
-                enum.add_aliases(*alias_args[1:])
-
-    replacements = {
-        u'##BANNER##': write_banner,
-        u'##VALUE_STRINGS##': write_value_strings,
-        u'##ALIASES##': write_aliases,
-        u'##CONVERSIONS##': write_conversions,
-    }
-
-    with io.open(args.output, 'wt', encoding='utf-8') as out:
-        with io.open(args.template, 'rt', encoding='utf-8') as t:
-            for line in t:
-                directive = line.strip()
-                if directive in replacements:
-                    replacements[directive](out, args)
-                else:
-                    out.write(line)
-
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-if __name__ == '__main__':
-    main()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_options.py
deleted file mode 100755
index 71e97115..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_options.py
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import io
-import os
-import re
-
-max_name_len = 60
-
-re_name = re.compile(r'^[a-z][a-z0-9_]*$')
-re_group = re.compile(r'//BEGIN')
-re_option = re.compile(r'extern (Bounded)?Option<[^>]+>')
-re_default = re.compile(r' *// *= *(.*)')
-groups = []
-
-root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-script = os.path.relpath(__file__, root)
-
-
-# =============================================================================
-class Group(object):
-    # -------------------------------------------------------------------------
-    def __init__(self, desc):
-        self.desc = desc
-        self.options = []
-
-    # -------------------------------------------------------------------------
-    def append(self, option):
-        self.options.append(option)
-
-
-# =============================================================================
-class Option(object):
-    # -------------------------------------------------------------------------
-    def __init__(self, name, dval, decl, desc):
-        if re_name.match(name) is None:
-            raise ValueError('{!r} is not a valid option name'.format(name))
-        if len(name) > max_name_len:
-            raise ValueError(
-                '{!r} (length={:d}) exceeds the maximum length {:d}'.format(
-                    name, len(name), max_name_len))
-
-        self.desc = u'\n'.join(desc)
-        self.decl = decl[7:]
-        self.name = name
-        self.dval = dval
-
-    # -------------------------------------------------------------------------
-    def write_declaration(self, out):
-        out.write(u'{} {} = {{\n'.format(self.decl, self.name))
-        out.write(u'  "{}",\n'.format(self.name))
-        out.write(u'  u8R"__(\n{}\n)__"'.format(self.desc))
-        if self.dval is not None:
-            out.write(u',\n  {}'.format(self.dval))
-        out.write(u'\n};\n\n')
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-# -----------------------------------------------------------------------------
-def extract_default(decl):
-    m = re_default.match(decl)
-    if m:
-        return m.group(1)
-    return None
-
-
-# -----------------------------------------------------------------------------
-def write_banner(out, args):
-    out.write(
-        u'/**\n'
-        u' * @file {out_name}\n'
-        u' * Declaration and initializers for all options.\n'
-        u' * Automatically generated by <code>{script}</code>\n'
-        u' * from {in_name}.\n'
-        u' */\n'
-        u'\n'.format(
-            in_name=os.path.basename(args.header),
-            out_name=os.path.basename(args.output),
-            script=script))
-
-
-# -----------------------------------------------------------------------------
-def write_declarations(out, args):
-    for group in groups:
-        for option in group.options:
-            option.write_declaration(out)
-
-
-# -----------------------------------------------------------------------------
-def write_registrations(out, args):
-    for group in groups:
-        out.write(u'\n  begin_option_group(u8R"__(\n{}\n)__");\n\n'.format(
-            group.desc))
-
-        for option in group.options:
-            out.write(u'  register_option(&options::{});\n'.format(
-                option.name))
-
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(description='Generate options.cpp')
-    parser.add_argument('output', type=str,
-                        help='location of options.cpp to write')
-    parser.add_argument('header', type=str,
-                        help='location of options.h to read')
-    parser.add_argument('template', type=str,
-                        help='location of options.cpp.in to use as template')
-    args = parser.parse_args()
-
-    with io.open(args.header, 'rt', encoding='utf-8') as f:
-        desc = []
-        for line in iter(f.readline, ''):
-            line = line.strip()
-
-            if re_group.match(line):
-                groups.append(Group(line[8:]))
-
-            elif not len(line):
-                desc = []
-
-            elif line == '//':
-                desc.append('')
-
-            elif line.startswith('// '):
-                desc.append(line[3:])
-
-            elif re_option.match(line):
-                n, d = f.readline().split(';')
-                o = Option(n, extract_default(d.strip()), line, desc)
-                groups[-1].append(o)
-
-    replacements = {
-        u'##BANNER##': write_banner,
-        u'##DECLARATIONS##': write_declarations,
-        u'##REGISTRATIONS##': write_registrations,
-    }
-
-    with io.open(args.output, 'wt', encoding='utf-8') as out:
-        with io.open(args.template, 'rt', encoding='utf-8') as t:
-            for line in t:
-                directive = line.strip()
-                if directive in replacements:
-                    replacements[directive](out, args)
-                else:
-                    out.write(line)
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-if __name__ == '__main__':
-    main()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_punctuator_table.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_punctuator_table.py
deleted file mode 100755
index f3d90081..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_punctuator_table.py
+++ /dev/null
@@ -1,189 +0,0 @@
-#! /usr/bin/env python
-#
-#  Creates a possibly faster lookup table for tokens, etc.
-#
-# @author  Ben Gardner
-# @author  Matthew Woehlke
-# @license GPL v2+
-#
-import argparse
-import os
-import sys
-
-
-# -----------------------------------------------------------------------------
-def scan_file(file_path):
-    cur_token = ''
-    token_idx = 0
-    args = []
-
-    fd = open(file_path, 'r')
-    for line in fd:
-        line = line.strip()
-        if line.startswith('static const chunk_tag_t'):
-            idx = line.find('[')
-            if idx > 0:
-                cur_token = line[25:idx].strip()
-                token_idx = 0
-        else:
-            if len(cur_token) > 0:
-                idx1 = line.find('{')
-                idx2 = line.find('CT_')
-                if idx1 >= 0 and idx2 > idx1:
-                    tok = line[idx1 + 1:idx2].strip()
-                    if tok.startswith('R"'):
-                        pos_paren_open = tok.find('(')
-                        pos_paren_close = tok.rfind(')')
-
-                        if pos_paren_open == -1 or pos_paren_close == -1:
-                            sys.stderr.write(
-                                'raw string parenthesis not found\n')
-                            sys.exit(-1)
-
-                        tok = tok[pos_paren_open+1:pos_paren_close]
-                    else:
-                        tok = tok[1:-2]  # strip off open quotes and commas
-                    args.append([tok, '%s[%d]' % (cur_token, token_idx)])
-                    token_idx += 1
-    return args
-
-
-# -----------------------------------------------------------------------------
-def build_table(db, prev, arr):
-    # do the current level first
-    k = sorted(db)
-    if len(k) <= 0:
-        return
-    k.sort()
-
-    start_idx = len(arr)
-    num_left = len(k)
-
-    for i in k:
-        en = db[i]
-        # [ char, full-string, left-in-group, next_index, table-entry ]
-        num_left -= 1
-        arr.append([en[0], prev + en[0], num_left, 0, en[2]])
-
-    # update the one-up level index
-    if len(prev) > 0:
-        for idx in range(0, len(arr)):
-            if arr[idx][1] == prev:
-                arr[idx][3] = start_idx
-                break
-
-    # Now do each sub level
-    for i in k:
-        en = db[i]
-        build_table(en[3], prev + en[0], arr)
-
-
-# -----------------------------------------------------------------------------
-def add_to_db(entry, db_top):
-    """
-    find or create the entry for the first char
-    """
-    strng = entry[0]
-    db_cur = db_top
-    for idx in range(0, len(strng)):
-        if not strng[idx] in db_cur:
-            db_cur[strng[idx]] = [strng[idx], 0, None, {}]
-
-        dbe = db_cur[strng[idx]]
-
-        if idx == len(strng) - 1:
-            dbe[2] = entry
-        else:
-            db_cur = dbe[3]
-
-
-# -----------------------------------------------------------------------------
-def quote(s):
-    return '\'{}\''.format(s)
-
-
-# -----------------------------------------------------------------------------
-def escape(s):
-    return quote(s.replace('\'', '\\\''))
-
-
-# -----------------------------------------------------------------------------
-def write_entry(out, max_len, ch, left_in_group, next_idx, tag, idx, tok):
-    out.write(
-        '   {{ {:>4}, {:>3d}, {:>3d}, {:{}} }},  // {:3d}: {}'.format(
-            ch, left_in_group, next_idx, tag, max_len, idx, tok).rstrip())
-    out.write('\n')
-
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(description='Generate punctuator_table.h')
-    parser.add_argument('output', type=str,
-                        help='location of punctuator_table.h to write')
-    parser.add_argument('header', type=str,
-                        help='location of symbols_table.h to read')
-    args = parser.parse_args()
-
-    root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    pl = scan_file(args.header)
-    pl.sort()
-
-    db = {}
-    for a in pl:
-        add_to_db(a, db)
-
-    arr = []
-    build_table(db, '', arr)
-
-    max_len = len('nullptr')
-    for i in arr:
-        rec = i[4]
-        if rec is not None and (len(rec[1]) + 1) > max_len:
-            max_len = len(rec[1]) + 1
-
-    in_name = os.path.basename(args.header)
-    out_name = os.path.basename(args.output)
-    guard = out_name.replace('.', '_').upper()
-
-    with open(args.output, 'wt') as out:
-        out.write(
-            '/**\n'
-            ' * @file {out_name}\n'
-            ' * Automatically generated by <code>{script}</code>\n'
-            ' * from {in_name}.\n'
-            ' */\n'
-            '\n'
-            '#ifndef SRC_{guard}_\n'
-            '#define SRC_{guard}_\n'
-            '\n'
-            '// *INDENT-OFF*\n'
-            'static const lookup_entry_t punc_table[] =\n'
-            '{{\n'.format(
-                in_name=in_name, out_name=out_name, guard=guard,
-                script=os.path.relpath(__file__, root)))
-
-        idx = 0
-
-        for i in arr:
-            rec = i[4]
-            if len(i[0]) == 0:
-                write_entry(out, max_len, '0', '0', '0', 'nullptr', idx, '')
-            elif rec is None:
-                write_entry(out, max_len, escape(i[0]), i[2], i[3],
-                            'nullptr', idx, quote(i[1]))
-            else:
-                write_entry(out, max_len, escape(i[0]), i[2], i[3],
-                            '&' + rec[1], idx, quote(i[1]))
-            idx += 1
-
-        out.write(
-            '}};\n'
-            '// *INDENT-ON*\n'
-            '\n'
-            '#endif /* SRC_{guard}_ */\n'.format(guard=guard))
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-if __name__ == '__main__':
-    main()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_version.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_version.py
deleted file mode 100755
index 14e20018..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_version.py
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env python
-#
-# Rebuilds the version using git describe
-#
-from sys import exit
-from subprocess import Popen, check_call, PIPE
-from os.path import join, dirname, abspath, exists
-from os import name as os_name
-from sys import argv, exit
-import re
-
-if os_name == 'nt':
-    EX_OK = 0
-    EX_USAGE = 64
-    EX_IOERR = 74
-else:
-    from os import EX_IOERR, EX_OK, EX_USAGE
-
-def main(args):
-    root = dirname(dirname(abspath(__file__)))
-    git_path = join(root, '.git')
-    hg_path = join(root, '.hg')
-
-    txt = ""
-    error_txt= ""
-
-    if exists(git_path):
-        try:
-            proc = Popen(['git', 'describe', '--always', '--dirty'], stdout=PIPE, stderr=PIPE, cwd=root)
-            txt_b, error_txt_b = proc.communicate()
-            txt = txt_b.decode("UTF-8").strip().lower()
-            error_txt = "%d: %s" % (proc.returncode, error_txt_b.decode("UTF-8").strip().lower())
-        except:
-            print("Failed to retrieve version from git")
-            exit(EX_IOERR)
-    elif exists(hg_path):
-        try:
-            check_call(['hg', 'gexport'])
-            proc0 = Popen(['hg', '--config', 'defaults.log=', 'log', '-r', '.', '--template', '{gitnode}'], stdout=PIPE, stderr=PIPE, cwd=root)
-            node_b, error_txt_b = proc0.communicate()
-            node = node_b.decode("UTF-8")
-            error_txt = "%d: %s" % (proc0.returncode, error_txt_b.decode("UTF-8").strip().lower())
-
-            proc1 = Popen(['git', '--git-dir=.hg/git', 'describe', '--long', '--tags', '--always', node], stdout=PIPE, stderr=PIPE, cwd=root)
-            txt_b, error_txt_b = proc1.communicate()
-            txt = txt_b.decode("UTF-8").lower()
-            error_txt += ", %d: %s" % (proc1.returncode, error_txt_b.decode("UTF-8").strip().lower())
-        except:
-            print("Failed to retrieve version from hg")
-            exit(EX_IOERR)
-    else:
-        print("Unknown version control system in '%s'." % root)
-        exit(EX_USAGE)
-
-    version_pattern = re.compile(r"""
-        ^
-        (                      #1: full match
-            uncrustify-
-            (\d+\.\d+(\.\d+)?) #2: version 0.64.2 (,#3 optional 3rd nr)
-            (                  #4: additional version info (long string format)
-                -(\d+)         #5: tag commit distance
-                -g(\w{7,})     #g-prefix + #6: commithash
-            )?
-        |
-            (\w{7,})           #7: commithash only format (last N commits pulled and no tag available)
-        )
-        (-(dirty))?            #9: optional dirty specifier (#8,)
-        $
-    """, re.X)
-    r_match = version_pattern.match(txt)
-
-    if r_match is None:
-        print("Regex version match failed on: '%s' (%s)" % (txt, error_txt))
-        exit(EX_IOERR)
-
-    if r_match.group(2) is not None:
-        string_groups = [r_match.group(2)]
-        if r_match.group(5) is not None and r_match.group(6) is not None:
-            string_groups.append(r_match.group(5))
-            string_groups.append(r_match.group(6))
-    else:
-        string_groups = [r_match.group(7)]
-
-    if r_match.group(9) is not None:
-        string_groups.append(r_match.group(9))
-
-
-    for g in string_groups:
-        if g is None:
-            print("Unexpected empty regex group")
-            exit(EX_IOERR)
-
-    print("%s" % "-".join(string_groups))
-    return EX_OK
-
-
-if __name__ == "__main__":
-    main(argv[1:])
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/option_reducer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/option_reducer.py
deleted file mode 100755
index 403ff92b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/option_reducer.py
+++ /dev/null
@@ -1,1125 +0,0 @@
-#!/usr/bin/python
-"""
-option_reducer.py
-
-reduces options in a given config file to the minimum while still maintaining
-desired formatting
-
-:author:  Daniel Chumak
-:license: GPL v2+
-"""
-
-# Possible improvements:
-# - parallelize add_back()
-# - (maybe) reduce amount of written config file, see Uncrustify --set
-
-from __future__ import print_function  # python >= 2.6
-import argparse
-
-from os import name as os_name, sep as os_path_sep, fdopen as os_fdopen, \
-    remove as os_remove
-from os.path import exists, join as path_join
-from subprocess import Popen, PIPE
-from sys import exit as sys_exit, stderr, stdout
-from shutil import rmtree
-from multiprocessing import cpu_count
-from tempfile import mkdtemp, mkstemp
-from contextlib import contextmanager
-from collections import OrderedDict
-from threading import Timer
-from multiprocessing.pool import Pool
-from itertools import combinations
-
-FLAGS = None
-NULL_DEV = "/dev/null" if os_name != "nt" else "nul"
-
-
-def enum(**enums):
-    return type('Enum', (), enums)
-
-
-RESTULTSFLAG = enum(NONE=0, REMOVE=1, KEEP=2)
-ERROR_CODE = enum(NONE=0, FLAGS=200, SANITY0=201, SANITY1=202)
-MODES = ("reduce", "no-default")
-
-
-@contextmanager
-def make_temp_directory():
-    """
-    Wraps tempfile.mkdtemp to use it inside a with statement that auto deletes
-    the temporary directory with its content after the with block closes
-
-
-    :return: str
-    ----------------------------------------------------------------------------
-        path to the generated directory
-    """
-    temp_dir = mkdtemp()
-    try:
-        yield temp_dir
-    finally:
-        rmtree(temp_dir)
-
-
-@contextmanager
-def make_raw_temp_file(*args, **kwargs):
-    """
-    Wraps tempfile.mkstemp to use it inside a with statement that auto deletes
-    the file after the with block closes
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param args, kwargs:
-        arguments passed to mkstemp
-
-
-    :return: int, str
-    ----------------------------------------------------------------------------
-        the file descriptor and the file path of the created temporary file
-    """
-    fd, tmp_file_name = mkstemp(*args, **kwargs)
-    try:
-        yield (fd, tmp_file_name)
-    finally:
-        os_remove(tmp_file_name)
-
-
-@contextmanager
-def open_fd(*args, **kwargs):
-    """
-    Wraps os.fdopen to use it inside a with statement that auto closes the
-    generated file descriptor after the with block closes
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param args, kwargs:
-        arguments passed to os.fdopen
-
-
-    :return: TextIOWrapper
-    ----------------------------------------------------------------------------
-        open file object connected to the file descriptor
-    """
-    fp = os_fdopen(*args, **kwargs)
-    try:
-        yield fp
-    finally:
-        fp.close()
-
-
-def term_proc(proc, timeout):
-    """
-    helper function to terminate a process
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param proc: process object
-        the process object that is going to be terminated
-
-    :param timeout: dictionary
-        a dictionary (used as object reference) to set a flag that indicates
-        that the process is going to be terminated
-    """
-    timeout["value"] = True
-    proc.terminate()
-
-
-def uncrustify(unc_bin_path, cfg_file_path, unformatted_file_path,
-               lang=None, debug_file=None, check=False):
-    """
-    executes Uncrustify and captures its stdout
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param unc_bin_path: str
-        path to the Uncrustify binary
-
-    :param cfg_file_path: str
-        path to a config file for Uncrustify
-
-    :param unformatted_file_path: str
-        path to a file that is going to be formatted
-
-    :param lang: str / None
-        Uncrustifys -l argument
-
-    :param debug_file: str / None
-        Uncrustifys -p argument
-
-    :param check: bool
-        Used to control whether Uncrustifys --check is going to be used
-
-
-    :return: str / None
-    ----------------------------------------------------------------------------
-        returns the stdout from Uncrustify or None if the process takes to much
-        time (set to 5 sec)
-    """
-
-    args = [unc_bin_path, "-q", "-c", cfg_file_path, '-f',
-            unformatted_file_path]
-    if lang:
-        args.extend(("-l", lang))
-    if debug_file:
-        args.extend(('-p', debug_file))
-    if check:
-        args.append('--check')
-
-    proc = Popen(args, stdout=PIPE, stderr=PIPE)
-
-    timeout = {"value": False}
-    timer = Timer(5, term_proc, [proc, timeout])
-    timer.start()
-
-    output_b, error_txt_b = proc.communicate()
-
-    timer.cancel()
-
-    if timeout["value"]:
-        print("uncrustify proc timeout: %s" % ' '.join(args), file=stderr)
-        return None
-
-    error = error_txt_b.decode("UTF-8")
-    if error:
-        print("Uncrustify %s stderr:\n %s" % (unformatted_file_path, error),
-              file=stderr)
-
-    return output_b
-
-
-def same_expected_generated(formatted_path, unc_bin_path, cfg_file_path,
-                            input_path, lang=None):
-    """
-    Calls uncrustify and compares its generated output with the content of a
-    file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param formatted_path: str
-        path to a file containing the expected content
-
-    :params unc_bin_path, cfg_file_path, input_path, lang: str, str, str,
-                                                           str / None
-        see uncrustify()
-
-
-    :return: bool
-    ----------------------------------------------------------------------------
-        True if the strings match, False otherwise
-    """
-
-    expected_string = ''
-    with open(formatted_path, 'rb') as f:
-        expected_string = f.read()
-
-    formatted_string = uncrustify(unc_bin_path, cfg_file_path, input_path, lang)
-
-    return True if formatted_string == expected_string else False
-
-
-def process_uncrustify(args):
-    """
-    special wrapper for same_expected_generated()
-
-    accesses global var(s): RESTULTSFLAG
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param args: list / tuple< int, ... >
-        this function is intended to be called by multiprocessing.pool.map()
-        therefore all arguments are inside a list / tuple:
-            id: int
-                an index number needed by the caller to differentiate runs
-
-            other parameters:
-                see same_expected_generated()
-
-
-    :return: tuple< int, RESTULTSFLAG >
-    ----------------------------------------------------------------------------
-        returns a tuple containing the id and a RESTULTSFLAG, REMOVE if both
-        strings are equal, KEEP if not
-    """
-
-    id = args[0]
-    res = same_expected_generated(*args[1:])
-
-    return id, RESTULTSFLAG.REMOVE if res else RESTULTSFLAG.KEEP
-
-
-def write_config_file(args):
-    """
-    Writes all but one excluded option into a config file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param args: list / tuple< list< tuple< str, str > >, str, int >
-        this function is intended to be called by multiprocessing.pool.map()
-        therefore all arguments are inside a list / tuple:
-
-            config_list: list< tuple< str, str > >
-                a list of tuples containing option names and values
-
-            tmp_dir: str
-                path to a directory in which the config file is going to be
-                written
-
-            exclude_idx: int
-                index for an option that is not going to be written into the
-                config file
-    """
-
-    config_list, tmp_dir, exclude_idx = args
-
-    with open("%s%suncr-%d.cfg" % (tmp_dir, os_path_sep, exclude_idx),
-              'w') as f:
-        print_config(config_list, target_file_obj=f, exclude_idx=exclude_idx)
-
-
-def write_config_file2(args):
-    """
-    Writes two option lists into a config file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param args: list< tuple< str, str > >,
-                 list< tuple< str, str > >, str, int
-        this function is intended to be called by multiprocessing.pool.map()
-        therefore all arguments are inside a list / tuple:
-
-            config_list: list< tuple< str, str > >
-                the first list of tuples containing option names and values
-
-            test_list: list< tuple< str, str > >
-                the second list of tuples containing option names and values
-
-            tmp_dir: str
-                path to a directory in which the config file is going to be
-                written
-
-            idx: int
-                index that is going to be used for the filename
-    """
-
-    config_list0, config_list1, tmp_dir, idx = args
-
-    with open("%s%suncr-r-%d.cfg" % (tmp_dir, os_path_sep, idx), 'w') as f:
-        print_config(config_list0, target_file_obj=f)
-        print("", end='\n', file=f)
-        print_config(config_list1, target_file_obj=f)
-
-
-def gen_multi_combinations(elements, N):
-    """
-    generator function that generates, based on a set of elements, all
-    combinations of 1..N elements
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param elements: list / tuple
-        a list of elements from which the combinations will be generated
-
-    :param N:
-        the max number of element in a combination
-
-
-    :return: list
-    ----------------------------------------------------------------------------
-        yields a single combination of the elements
-
-    >>> gen_multi_combinations(["a", "b", "c"], 3)
-    (a); (b); (c); (a,b); (a,c); (b,c); (a,b,c)
-    """
-
-    fields = len(elements)
-    if N > fields:
-        raise Exception("Error: N > len(options)")
-    if N <= 0:
-        raise Exception("Error: N <= 0")
-
-    for n in range(1, N + 1):
-        yield combinations(elements, n)
-
-
-def add_back(unc_bin_path, input_files, formatted_files, langs, options_r,
-             options_k, tmp_dir):
-    """
-    lets Uncrustify format files with generated configs files until all
-    formatted files match their according expected files.
-
-    Multiple config files are generated based on a (base) list of Uncrustify
-    options combined with additional (new) options derived from combinations of
-    another list of options.
-
-
-    accesses global var(s): RESTULTSFLAG
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param unc_bin_path: str
-        path to the Uncrustify binary
-
-    :param input_files: list / tuple< str >
-        a list containing paths to a files that are going to be formatted
-
-    :param formatted_files: list / tuple< str >
-        a list containing paths to files containing the expected contents
-
-    :param langs: list / tuple< str > / None
-        a list of languages the files, used as Uncrustifys -l argument
-        can be None or shorter than the amount of provided files
-
-    :param options_r: list< tuple< str, str > >
-        the list of options from which combinations will be derived
-
-    :param options_k: list< tuple< str, str > >
-        the (base) list of Uncrustify options
-
-    :param tmp_dir: str
-        the directory in which the config files will be written to
-
-
-    :return: list< tuple< str, str > > / None
-    ----------------------------------------------------------------------------
-        list of additional option that were needed to generate matching file
-        contents
-    """
-
-    lang_max_idx = -1 if langs is None else len(langs) - 1
-    file_len = len(input_files)
-
-    if len(formatted_files) != file_len:
-        raise Exception("len(input_files) != len(formatted_files)")
-
-    for m_combination in gen_multi_combinations(options_r, len(options_r)):
-        for idx, (r_combination) in enumerate(m_combination):
-            write_config_file2((options_k, r_combination, tmp_dir, idx))
-
-            cfg_file_path = "%s%suncr-r-%d.cfg" % (tmp_dir, os_path_sep, idx)
-            res = []
-
-            for file_idx in range(file_len):
-                lang = None if idx > lang_max_idx else langs[file_idx]
-
-                r = process_uncrustify(
-                    (0, formatted_files[file_idx], unc_bin_path, cfg_file_path,
-                     input_files[file_idx], lang))
-                res.append(r[1])
-
-            # all files, flag = remove -> option can be removed -> equal output
-            if res.count(RESTULTSFLAG.REMOVE) == len(res):
-                return r_combination
-    return None
-
-
-def sanity_raw_run(args):
-    """
-    wrapper for same_expected_generated(), prints error message if the config
-    file does not generate the expected result
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param args:
-        see same_expected_generated
-
-
-    :return:
-    ----------------------------------------------------------------------------
-        see same_expected_generated
-    """
-    res = same_expected_generated(*args)
-
-    if not res:
-        formatted_file_path = args[0]
-        config_file_path = args[2]
-        input_file_path = args[3]
-
-        print("\nprovided config does not create formatted source file:\n"
-              "    %s\n    %s\n->| %s"
-              % (input_file_path, config_file_path, formatted_file_path),
-              file=stderr)
-    return res
-
-
-def sanity_run(args):
-    """
-    wrapper for same_expected_generated(), prints error message if the config
-    file does not generate the expected result
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param args:
-        see same_expected_generated
-
-
-    :return:
-    ----------------------------------------------------------------------------
-        see same_expected_generated
-    """
-    res = same_expected_generated(*args)
-
-    if not res:
-        formatted_file_path = args[0]
-        input_file_path = args[3]
-
-        print("\ngenerated config does not create formatted source file:\n"
-              "    %s\n    %s"
-              % (input_file_path, formatted_file_path), file=stderr)
-    return res
-
-
-def sanity_run_splitter(uncr_bin, config_list, input_files, formatted_files,
-                        langs, tmp_dir, jobs):
-    """
-    writes config option into a file and tests if every input file is formatted
-    so that is matches the content of the according expected file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param uncr_bin: str
-        path to the Uncrustify binary
-
-    :param config_list: list< tuple< str, str > >
-        a list of tuples containing option names and values
-
-    :param input_files: list / tuple< str >
-        a list containing paths to a files that are going to be formatted
-
-    :param formatted_files: list / tuple< str >
-        a list containing paths to files containing the expected contents
-
-    :param langs: list / tuple< str > / None
-        a list of languages the files, used as Uncrustifys -l argument
-        can be None or shorter than the amount of provided files
-
-    :param tmp_dir: str
-        the directory in which the config files will be written to
-
-    :param jobs: int
-        number of processes to use
-
-
-    :return: bool
-    ----------------------------------------------------------------------------
-        True if all files generate correct results, False oterhwise
-    """
-
-    file_len = len(input_files)
-    if len(formatted_files) != file_len:
-        raise Exception("len(input_files) != len(formatted_files)")
-
-    gen_cfg_path = path_join(tmp_dir, "gen.cfg")
-    with open(gen_cfg_path, 'w') as f:
-        print_config(config_list, target_file_obj=f)
-
-    lang_max_idx = -1 if langs is None else len(langs) - 1
-    args = []
-
-    for idx in range(file_len):
-        lang = None if idx > lang_max_idx else langs[idx]
-
-        args.append((formatted_files[idx], uncr_bin, gen_cfg_path,
-                     input_files[idx], lang))
-
-    pool = Pool(processes=jobs)
-    sr = pool.map(sanity_run, args)
-
-    return False not in sr
-
-
-def print_config(config_list, target_file_obj=stdout, exclude_idx=()):
-    """
-    prints config options into a config file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param config_list: list< tuple< str, str > >
-        a list containing pairs of option names and option values
-
-    :param target_file_obj: file object
-        see file param of print()
-
-    :param exclude_idx: int / list< int >
-        index of option(s) that are not going to be printed
-    """
-
-    if not config_list:
-        return
-    config_list_len = len(config_list)
-
-    # check if exclude_idx list is empty -> assign len
-    if type(exclude_idx) in (list, tuple) and not exclude_idx:
-        exclude_idx = [config_list_len]
-    else:
-        # sort it, unless it is an int -> transform into a list
-        try:
-            exclude_idx = sorted(exclude_idx)
-        except TypeError:
-            exclude_idx = [exclude_idx]
-
-    # extracted first loop round:
-    # do not print '\n' for the ( here non-existing) previous line
-    if exclude_idx[0] != 0:
-        print("%s = %s" % (config_list[0][0].ljust(31, ' '), config_list[0][1]),
-              end='', file=target_file_obj)
-    # also print space if a single option was provided and it is going to be
-    # excluded. This is done in order to be able to differentiate between
-    # --empty-nochange and the case where all options can be removed
-    elif config_list_len == 1:
-        print(' ', end='', file=target_file_obj)
-        return
-
-    start_idx = 1
-    for end in exclude_idx:
-        end = min(end, config_list_len)
-
-        for idx in range(start_idx, end):
-            print("\n%s = %s"
-                  % (config_list[idx][0].ljust(31, ' '), config_list[idx][1]),
-                  end='', file=target_file_obj)
-
-        start_idx = min(end + 1, config_list_len)
-
-    # after
-    for idx in range(start_idx, config_list_len):
-        print("\n%s = %s"
-              % (config_list[idx][0].ljust(31, ' '), config_list[idx][1]),
-              end='', file=target_file_obj)
-
-
-def get_non_default_options(unc_bin_path, cfg_file_path):
-    """
-    calls Uncrustify to generate a debug file from which a config only with
-    non default valued options are extracted
-
-    accesses global var(s): NULL_DEV
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param unc_bin_path: str
-        path to the Uncrustify binary
-
-    :param cfg_file_path: str
-        path to a config file for Uncrustify
-
-
-    :return: list< str >
-    ----------------------------------------------------------------------------
-        amount of lines in the provided and shortened config
-    """
-    lines = []
-
-    with make_raw_temp_file(suffix='.unc') as (fd, file_path):
-        # make debug file
-        uncrustify(unc_bin_path, cfg_file_path, NULL_DEV, debug_file=file_path,
-                   check=True)
-
-        # extract non comment lines -> non default config lines
-        with open_fd(fd, 'r') as fp:
-            lines = fp.read().splitlines()
-            lines = [line for line in lines if not line[:1] == '#']
-
-    return lines
-
-
-def parse_config_file(file_obj):
-    """
-    Reads in a Uncrustify config file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param file_obj:
-        the file object of an opened config file
-
-
-    :return: list< tuple< str, str > >
-    ----------------------------------------------------------------------------
-        a list containing pairs of option names and option values
-    """
-    # dict used to only save the last option setting if the same option occurs
-    # multiple times, without this:
-    #   optionA0 can be removed because optionA1 = s0, and
-    #   optionA1 can be removed because optionA0 = s0
-    # -> optionA0, optionA1 are both removed
-    config_map = OrderedDict()
-
-    # special keys may not have this limitation, as for example
-    # 'set x y' and 'set x z' do not overwrite each other
-    special_keys = {'macro-open', 'macro-else', 'macro-close', 'set', 'type',
-                    'file_ext', 'define'}
-    special_list = []
-
-    for line in file_obj:
-        # cut comments
-        pound_pos = line.find('#')
-        if pound_pos != -1:
-            line = line[:pound_pos]
-
-        split_pos = line.find('=')
-        if split_pos == -1:
-            split_pos = line.find(' ')
-        if split_pos == -1:
-            continue
-
-        key = line[:split_pos].strip()
-        value = line[split_pos + 1:].strip()
-
-        if key in special_keys:
-            special_list.append((key, value))
-        else:
-            config_map[key] = value
-
-    config_list = list(config_map.items())
-    config_list += special_list
-
-    return config_list
-
-
-def count_lines(file_path):
-    """
-    returns the count of lines in a file by counting '\n' chars
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param file_path: str
-        file in which the lines will be counted
-
-
-    :return: int
-    ----------------------------------------------------------------------------
-        number a lines
-    """
-    in_count = 0
-    with open(file_path, 'r') as f:
-        in_count = f.read().count('\n') + 1
-    return in_count
-
-
-def reduce(options_list):
-    """
-    Reduces the given options to a minimum
-
-    accesses global var(s): FLAGS, RESTULTSFLAG, ERROR_CODE
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param options_list: list< tuple< str, str > >
-        the list of options that are going to be reduced
-
-    :return: int, list< tuple< str, str > >
-        status return code, reduced options
-    """
-    config_list_len = len(options_list)
-    ret_flag = ERROR_CODE.NONE
-
-    file_count = len(FLAGS.input_file_path)
-    lang_max_idx = -1 if FLAGS.lang is None else len(FLAGS.lang) - 1
-
-    pool = Pool(processes=FLAGS.jobs)
-    with make_temp_directory() as tmp_dir:
-        # region sanity run ----------------------------------------------------
-        args = []
-        for idx in range(file_count):
-            lang = None if idx > lang_max_idx else FLAGS.lang[idx]
-
-            args.append((FLAGS.formatted_file_path[idx],
-                         FLAGS.uncrustify_binary_path, FLAGS.config_file_path,
-                         FLAGS.input_file_path[idx], lang))
-        sr = pool.map(sanity_raw_run, args)
-        del args[:]
-
-        if False in sr:
-            return ERROR_CODE.SANITY0, []
-        del sr[:]
-
-        # endregion
-        # region config generator loop -----------------------------------------
-        args = []
-
-        for e_idx in range(config_list_len):
-            args.append((options_list, tmp_dir, e_idx))
-        pool.map(write_config_file, args)
-
-        del args[:]
-
-        # endregion
-        # region main loop -----------------------------------------------------
-        args = []
-        jobs = config_list_len * file_count
-
-        for idx in range(jobs):
-            file_idx = idx // config_list_len
-            option_idx = idx % config_list_len
-
-            cfg_file_path = "%s%suncr-%d.cfg" \
-                            % (tmp_dir, os_path_sep, option_idx)
-            lang = None if idx > lang_max_idx else FLAGS.lang[file_idx]
-
-            args.append((idx, FLAGS.formatted_file_path[file_idx],
-                         FLAGS.uncrustify_binary_path, cfg_file_path,
-                         FLAGS.input_file_path[file_idx], lang))
-
-        results = pool.map(process_uncrustify, args)
-        del args[:]
-        # endregion
-        # region clean results -------------------------------------------------
-        option_flags = [RESTULTSFLAG.NONE] * config_list_len
-
-        for r in results:
-            idx = r[0]
-            flag = r[1]
-
-            option_idx = idx % config_list_len
-
-            if option_flags[option_idx] == RESTULTSFLAG.KEEP:
-                continue
-
-            option_flags[option_idx] = flag
-        del results[:]
-        # endregion
-
-        options_r = [options_list[idx] for idx, x in enumerate(option_flags)
-                     if x == RESTULTSFLAG.REMOVE]
-        options_list = [options_list[idx] for idx, x in enumerate(option_flags)
-                        if x == RESTULTSFLAG.KEEP]
-
-        del option_flags[:]
-
-        # region sanity run ----------------------------------------------------
-        # options can be removed one at a time generating appropriate results,
-        # oddly enough sometimes a config generated this way can fail when a
-        # combination of multiple options is missing
-        s_flag = True
-        if options_r:
-            s_flag = sanity_run_splitter(
-                FLAGS.uncrustify_binary_path, options_list,
-                FLAGS.input_file_path, FLAGS.formatted_file_path, FLAGS.lang,
-                tmp_dir, FLAGS.jobs)
-
-        if not s_flag:
-            ret_flag = ERROR_CODE.SANITY1
-            print("\n\nstumbled upon complex option dependencies in \n"
-                  "    %s\n"
-                  "trying to add back minimal amount of removed options\n"
-                  % FLAGS.config_file_path, file=stderr)
-
-            ret_options = add_back(
-                FLAGS.uncrustify_binary_path, FLAGS.input_file_path,
-                FLAGS.formatted_file_path, FLAGS.lang, options_r,
-                options_list, tmp_dir)
-
-            if ret_options:
-                options_list.extend(ret_options)
-
-                s_flag = sanity_run_splitter(
-                    FLAGS.uncrustify_binary_path, options_list,
-                    FLAGS.input_file_path, FLAGS.formatted_file_path,
-                    FLAGS.lang, tmp_dir, FLAGS.jobs)
-
-                if s_flag:
-                    print("Success!", file=stderr)
-                    ret_flag = ERROR_CODE.NONE
-                    # endregion
-    return ret_flag, options_list if ret_flag == ERROR_CODE.NONE else []
-
-
-def reduce_mode():
-    """
-    the mode that minimizes a config file as much as possible
-
-    accesses global var(s): FLAGS, ERROR_CODE
-    """
-    ret_flag = ERROR_CODE.NONE
-    option_list = {}
-
-    # gen & parse non default config
-    lines = get_non_default_options(FLAGS.uncrustify_binary_path,
-                                    FLAGS.config_file_path)
-    option_list = parse_config_file(lines)
-    config_list_len = len(option_list)
-
-    config_lines_init = count_lines(FLAGS.config_file_path)
-    config_lines_ndef = len(lines)
-    del lines[:]
-
-    # early return if all options are already removed at this point
-    if config_list_len == 0:
-        if not FLAGS.empty_nochange \
-                or (config_lines_init - config_lines_ndef) > 0:
-            if not FLAGS.quiet:
-                print("\n%s" % '# '.ljust(78, '-'))
-
-            print(" ")
-
-            if not FLAGS.quiet:
-                print("%s" % '# '.ljust(78, '-'))
-                print("# initial config lines: %d,\n"
-                      "# default options and unneeded lines: %d,\n"
-                      "# unneeded options: 0,\n"
-                      "# kept options: 0"
-                      % (config_lines_init, config_lines_init))
-        print("ret_flag: 0", file=stderr)
-        return ERROR_CODE.NONE
-
-    # gen reduced options
-    config_lines_redu = -1
-    for i in range(FLAGS.passes):
-        old_config_lines_redu = config_lines_redu
-
-        ret_flag, option_list = reduce(option_list)
-        config_lines_redu = len(option_list)
-
-        if ret_flag != ERROR_CODE.NONE \
-                or config_lines_redu == old_config_lines_redu:
-            break
-
-    if ret_flag == ERROR_CODE.NONE:
-        # use the debug file trick again to get correctly sorted options
-        with make_raw_temp_file(suffix='.unc') as (fd, file_path):
-            with open_fd(fd, 'w') as f:
-                print_config(option_list, target_file_obj=f)
-
-            lines = get_non_default_options(FLAGS.uncrustify_binary_path,
-                                            file_path)
-            option_list = parse_config_file(lines)
-
-        # print output + stats
-        if not FLAGS.empty_nochange or config_lines_ndef != config_lines_redu:
-            if not FLAGS.quiet:
-                print("\n%s" % '# '.ljust(78, '-'))
-
-            print_config(option_list)
-
-            if not FLAGS.quiet:
-                print("\n%s" % '# '.ljust(78, '-'))
-                print("# initial config lines: %d,\n"
-                      "# default options and unneeded lines: %d,\n"
-                      "# unneeded options: %d,\n"
-                      "# kept options: %d"
-                      % (config_lines_init,
-                         config_lines_init - config_lines_ndef,
-                         config_lines_ndef - config_lines_redu,
-                         config_lines_redu))
-
-    print("ret_flag: %d" % ret_flag, file=stderr)
-    return ret_flag
-
-
-def no_default_mode():
-    """
-    the mode removes all unnecessary lines and options with default values
-
-    accesses global var(s): FLAGS, ERROR_CODE
-    """
-
-    lines = get_non_default_options(FLAGS.uncrustify_binary_path,
-                                    FLAGS.config_file_path, )
-    config_lines_ndef = len(lines)
-    config_lines_init = count_lines(FLAGS.config_file_path)
-
-    if not FLAGS.empty_nochange or (config_lines_ndef != config_lines_init):
-        if not FLAGS.quiet:
-            print("%s" % '# '.ljust(78, '-'))
-
-        options_str = '\n'.join(lines)
-        if not options_str:
-            print(" ")
-        else:
-            print(options_str, file=stdout)
-
-        if not FLAGS.quiet:
-            print("%s" % '# '.ljust(78, '-'))
-            print("# initial config lines: %d,\n"
-                  "# default options and unneeded lines: %d,\n"
-                  % (config_lines_init, config_lines_init - config_lines_ndef))
-
-    return ERROR_CODE.NONE
-
-
-def main():
-    """
-    calls the mode that was specified by the -m script argument,
-    defaults to reduce_mode if not provided or unknown mode
-
-    accesses global var(s): MODES, FLAGS
-
-
-    :return: int
-    ----------------------------------------------------------------------------
-        return code
-    """
-    if FLAGS.mode == MODES[1]:
-        return no_default_mode()
-
-    return reduce_mode()
-
-
-def valid_file(arg_parser, *args):
-    """
-    checks if on of the provided paths is a file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param arg_parser:
-        argument parser object that is called if no file is found
-
-    :param args: list< str >
-        a list of file path that is going to be checked
-
-
-    :return: str
-    ----------------------------------------------------------------------------
-        path to an existing file
-    """
-    arg = None
-    found_flag = False
-    for arg in args:
-        if exists(arg):
-            found_flag = True
-            break
-    if not found_flag:
-        arg_parser.error("file(s) do not exist: %s" % args)
-
-    return arg
-
-
-if __name__ == "__main__":
-    """
-    parses all script arguments and calls main()
-
-    accesses global var(s): FLAGS, ERROR_CODE, MODES
-    """
-    arg_parser = argparse.ArgumentParser()
-
-    group_general = arg_parser.add_argument_group(
-        'general options', 'Options used by both modes')
-
-    group_general.add_argument(
-        '-q', '--quiet',
-        default=False,
-        action='store_true',
-        help='Whether or not messages, other than the actual config output, '
-             'should be printed to stdout.'
-    )
-    group_general.add_argument(
-        '--empty-nochange',
-        default=False,
-        action='store_true',
-        help='Do not print anything to stdout if no options could be removed'
-    )
-    group_general.add_argument(
-        '-m', '--mode',
-        type=str,
-        choices=MODES,
-        default=MODES[0],
-        help="The script operation mode. Defaults to '%s'" % MODES[0]
-    )
-    group_general.add_argument(
-        '-b', '--uncrustify_binary_path',
-        metavar='<path>',
-        type=lambda x: valid_file(
-            arg_parser, x,
-            "../build/uncrustify.exe",
-            "../build/Debug/uncrustify",
-            "../build/Debug/uncrustify.exe",
-            "../build/Release/uncrustify",
-            "../build/Release/uncrustify.exe"),
-        default="../build/uncrustify",
-        help="The Uncrustify binary file path. Is searched in known locations "
-             "in the 'Uncrustify/build/' directory if no <path> is provided."
-    )
-    group_general.add_argument(
-        '-c', '--config_file_path',
-        metavar='<path>',
-        type=lambda x: valid_file(arg_parser, x),
-        required=True,
-        help='Path to the config file.'
-    )
-
-    group_reduce = arg_parser.add_argument_group(
-        'reduce mode', 'Options to reduce configuration file options')
-
-    group_reduce.add_argument(
-        '-i', '--input_file_path',
-        metavar='<path>',
-        type=lambda x: valid_file(arg_parser, x),
-        nargs='+',
-        action='append',
-        help="Path to the unformatted source file. "
-             "Required if mode '%s' is used" % MODES[0]
-    )
-    group_reduce.add_argument(
-        '-f', '--formatted_file_path',
-        metavar='<path>',
-        type=lambda x: valid_file(arg_parser, x),
-        nargs='+',
-        action='append',
-        help="Path to the formatted source file. "
-             "Required if mode '%s' is used" % MODES[0]
-    )
-    group_reduce.add_argument(
-        '-l', '--lang',
-        metavar='<str>',
-        nargs='+',
-        required=False,
-        action='append',
-        help='Uncrustify processing language for each input file'
-    )
-    group_reduce.add_argument(
-        '-j', '--jobs',
-        metavar='<nr>',
-        type=int,
-        default=cpu_count(),
-        help='Number of concurrent jobs.'
-    )
-    group_reduce.add_argument(
-        '-p', '--passes',
-        metavar='<nr>',
-        type=int,
-        default=5,
-        help='Max. number of cleaning passes.'
-    )
-
-    group_no_default = arg_parser.add_argument_group(
-        'no-default mode', 'Options to remove configuration file option with '
-                           'default values: ~~_Currently only the general'
-                           ' options are used for this mode_~~')
-    FLAGS, unparsed = arg_parser.parse_known_args()
-
-    if FLAGS.lang is not None:
-        FLAGS.lang = [j for i in FLAGS.lang for j in i]
-
-    if FLAGS.mode == MODES[0]:
-        if not FLAGS.input_file_path or not FLAGS.formatted_file_path:
-            arg_parser.error("Flags -f and -i are required in Mode '%s'!"
-                             % MODES[0])
-            sys_exit(ERROR_CODE.FLAGS)
-
-        # flatten 2 dimensional args: -f p -f p -f p -f p0 p1 p2 -> [[],[], ...]
-        FLAGS.input_file_path = [j for i in FLAGS.input_file_path for j in i]
-
-        FLAGS.formatted_file_path = [j for i in
-                                     FLAGS.formatted_file_path for j in i]
-
-        if len(FLAGS.input_file_path) != len(FLAGS.formatted_file_path):
-            print("Unequal amount of input and formatted file paths.",
-                  file=stderr)
-            sys_exit(ERROR_CODE.FLAGS)
-
-    sys_exit(main())
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/au-sm123.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/au-sm123.lnt
deleted file mode 100644
index 6eaf9a6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/au-sm123.lnt
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Date Stamp */ -d"_lint_au_sm123_lnt=au-sm123.lnt modified 5-Jan-2006"
-/* To document usage use: -message( "Using " _lint_au_sm123_lnt ) */
-// ---------------------------------------------------------------------
-// This file is provided by Gimpel Software (www.gimpel.com) for use with
-// its products PC-lint and FlexeLint.
-//
-// Redistribution and use of this file, with or without modification, is
-// permitted provided that any such redistribution retains this notice.
-// ---------------------------------------------------------------------
-// au-sm123.lnt -- Author options - Scott Meyers
-
-/*
-    This options file can be used to explicitly activate those
-    checks advocated in the publications:
-
-    [12] Meyers, Scott, Effective C++, Addison-Wesley, Reading Mass., 1992
-    [23] Meyers, Scott, More Effective C++, Addison-Wesley, 1996
-    [30] Meyers, Scott, Effective C++ Third Edition, Addison-Wesley, 2005
-
-    You can use this file directly when linting your programs as in:
-
-    lin  au-sm123  files
-
-    Most of the Scott Meyers checks are on by default.  The
-    Elective Notes (19??), however, are not and so this file
-    is necessary to get the full impact of the Scott Meyers
-    multi-volume set of recommendations.
-
-    Also, this file explicitly activates those Warnings and
-    Informationals advocated by Scott Meyers just in case they were
-    suppressed previously.  For example,
-
-    lin -w2 au-sm123  files
-
-    has the effect of removing all Informational messages
-    other than those reactivated in this file.
-
-    If you do not want code to adhere to all of the Scott Meyers'
-    checks we recommend that, rather than editing this file, you
-    include it within a file of your own.  For example: let
-    my-sm.lnt contain
-
-    au-sm123.lnt
-	-e1932   // allow concrete base classes
-
-    In this way you inherit the checks specified in this file
-    except for the ones that you wish to specifically exclude.
-
-    Then you can use my-sm.lnt in place of au-sm123.lnt
-
-    You might consider placing this file (au-sm123.lnt) or your own
-    derivation of it (as shown above) in your global options
-    file.
-
- */
-
-+e424   // Inappropriate deallocation -- [12, Item 5], [30, Item 16]
--append(424, -- Effective C++ #5 & Eff. C++ 3rd Ed. item 16)
-+e530   //  Symbol not initialized -- [30, Item 4]
--append( 530, --- Eff. C++ 3rd Ed. item 4 )
-+e603   //  Symbol not initialized -- [30, Item 4]
--append( 603, --- Eff. C++ 3rd Ed. item 4 )
-+e605   // Increase in pointer capability -- [12, Item 29]
--append(605, -- Effective C++ #29 )
-+e644   //  Variable may not have been initialized -- [30, Item 4]
--append( 644, --- Eff. C++ 3rd Ed. item 4 )
-+e645   //  Symbol may not have been initialized -- [30, Item 4]
--append( 645, --- Eff. C++ 3rd Ed. item 4 )
-+e673   //  Possibly inappropriate deallocation (Name1) for 'Name2' data. -- [30, Item 16]
--append( 673, --- Eff. C++ 3rd Ed. item 16 )
-+e727   //  Symbol not explicitly initialized -- [30, Item 4]
--append( 727, --- Eff. C++ 3rd Ed. item 4 )
-+e728   //  Symbol not explicitly initialized -- [30, Item 4]
--append( 728, --- Eff. C++ 3rd Ed. item 4 )
-+e729   //  Symbol not explicitly initialized -- [30, Item 4]
--append( 729, --- Eff. C++ 3rd Ed. item 4 )
-+e738   //  Symbol not explicitly initialized -- [30, Item 4]
--append( 738, --- Eff. C++ 3rd Ed. item 4 )
-+e771   //  Symbol conceivably not initialized -- [30, Item 4]
--append( 771, --- Eff. C++ 3rd Ed. item 4 )
-+e772   //  Symbol conceivably not initialized -- [30, Item 4]
--append( 772, --- Eff. C++ 3rd Ed. item 4 )
-+e794   // Conceivable use of null pointer -- [12, Item 7]
--append(794, -- Effective C++ #7 )
-+e802   // Conceivably passing a null pointer to function -- [12, Item 7]
--append(802, -- Effective C++ #7 )
-+e818   //  Pointer parameter could be declared ptr to const -- [30, Item 3]
--append( 818, --- Eff. C++ 3rd Ed. item 3 )
-+e952   //  Parameter could be declared const -- [30, Item 3]
--append( 952, --- Eff. C++ 3rd Ed. item 3 )
-+e953   //  Variable could be declared as const -- [30, Item 3]
--append( 953, --- Eff. C++ 3rd Ed. item 3 )
-+e954   //  Pointer variable could be declared as pointing to a const -- [30, Item 3]
--append( 954, --- Eff. C++ 3rd Ed. item 3 )
-+e1072  //  Reference variable must be initialized -- [30, Item 4]
--append( 1072, --- Eff. C++ 3rd Ed. item 4 )
-+e1401  //  member symbol not initialized by constructor -- [30, Item 4], [30, Item 13]
--append( 1401, --- Eff. C++ 3rd Ed. item 4 & Eff. C++ 3rd Ed. item 13)
-+e1402  //  member not initialized -- [30, Item 4]
--append( 1402, --- Eff. C++ 3rd Ed. item 4 )
-+e1403  //  member not initialized -- [30, Item 4]
--append( 1403, --- Eff. C++ 3rd Ed. item 4 )
-+e1411  //  Member with different signature hides virtual member -- [30, Item 33]
--append( 1411, --- Eff. C++ 3rd Ed. item 33 )
-+e1412  //  Reference member is not initialized -- [30, Item 4]
--append( 1412, --- Eff. C++ 3rd Ed. item 4 )
-+e1413  //  function is returning a temporary via a reference -- [30, Item 21]
--append( 1413, --- Eff. C++ 3rd Ed. item 21 )
-+e1506  //  Call to virtual function within a constructor or destructor -- [30, Item 9]
--append( 1506, --- Eff. C++ 3rd Ed. item 9 )
-+e1509  // base class destructor for class is not virtual -- [12, Item 14], [30, Item 7]
--append(1509, -- Effective C++ #14 & Eff. C++ 3rd Ed. item 7)
-+e1510  // base class has no destructor -- [12, Item 14]
--append(1510, -- Effective C++ #14 )
-+e1511  // Member hides non-virtual member -- [12, Item 37], [30, Item 33], [30, Item 36]
--append(1511, -- Effective C++ #37 & Eff. C++ 3rd Ed. item 33& Eff. C++ 3rd Ed. item 36)
-+e1516  //  Data member hides inherited member -- [30, Item 33]
--append( 1516, --- Eff. C++ 3rd Ed. item 33 )
-+e1529  // not first checking for assignment to this -- [12, Item 17], [30, Item 11]
--append(1529, -- Effective C++ #17 & Eff. C++ 3rd Ed. item 11)
-+e1531  //  Symbol should have compared argument against sizeof(class) -- [30, Item 51]
--append( 1531, --- Eff. C++ 3rd Ed. item 51 )
-+e1534  // static variable found within inline function -- [23, Item 26], [30, Item 30]
--append(1534, -- More Effective C++ #26 & Eff. C++ 3rd Ed. item 30)
-+e1536  // Exposing low access member -- [12, Item 30]
--append(1536, -- Effective C++ #30 )
-+e1537  // const function returns pointer data member -- [12, Item 29 ], [30, Item 28]
--append(1537, -- Effective C++ #29 & Eff. C++ 3rd Ed. item 28)
-+e1539  // member not assigned by assignment operator -- [12, Item 16], [30, Item 12]
--append(1539, -- Effective C++ #16 & Eff. C++ 3rd Ed. item 12)
-+e1540  // pointer member freed nor zero'ed by destructor -- [12, Item 6]
--append(1540, -- Effective C++ #6 )
-+e1541  //  member possibly not initialized by constructor -- [30, Item 4], [30, Item 13]
--append( 1541, --- Eff. C++ 3rd Ed. item 4 & Eff. C++ 3rd Ed. item 13)
-+e1542  //  member possibly not initialized -- [30, Item 4]
--append( 1542, --- Eff. C++ 3rd Ed. item 4 )
-+e1543  //  member possibly not initialized -- [30, Item 4]
--append( 1543, --- Eff. C++ 3rd Ed. item 4 )
-+e1544  // value indeterminate (order of initialization) -- [12, Item 47]
--append(1544, -- Effective C++ #47 )
-+e1546  // throw() called within destuctor -- [23, Item 11], [30, Item 8]
--append(1546, -- Effective C++ #11 & Eff. C++ 3rd Ed. item 8)
-+e1547  // Assignment of array to pointer to base -- [23, Item 3]
--append(1547, -- More Effective C++ #3 )
-+e1549  // Exception thrown for function not declared to throw -- [23, Item 11]
--append(1549, -- More Effective C++ #11 )
-+e1551  // function may throw an exception in destructor -- [23, Item 11], [30, Item 8]
--append(1551, -- More Effective C++ #11 & Eff. C++ 3rd Ed. item 8)
-+e1557  //  const member is not initialized -- [30, Item 4]
--append( 1557, --- Eff. C++ 3rd Ed. item 4 )
-+e1559  //  Uncaught exception 'Name' may be thrown in destructor -- [30, Item 8]
--append( 1559, --- Eff. C++ 3rd Ed. item 8 )
-+e1722  // assignment operator does not return a reference -- [12, Item 15], [30, Item 10]
--append(1722, -- Effective C++ #15 & Eff. C++ 3rd Ed. item 10)
-+e1724  //  Argument to copy constructor for class should be a const reference -- [30, Item 3], [30, Item 20]
--append( 1724, --- Eff. C++ 3rd Ed. item 3 & Eff. C++ 3rd Ed. item 20)
-+e1727  //  inline not previously defined inline at -- [30, Item 30]
--append( 1727, --- Eff. C++ 3rd Ed. item 30 )
-+e1729  // Initializer inversion detected for member -- [12, Item 13]
--append(1729, -- Effective C++ #13 )
-+e1732  // new in constructor for class which has no assignment operator -- [12, Item 11]
--append(1732, -- Effective C++ #11 )
-+e1733  // new in constructor for class which has no copy constructor -- [12, Item 11]
--append(1733, -- Effective C++ #11 )
-+e1735  // Virtual function has default parameter -- [12, Item 38]
--append(1735, -- Effective C++ #38 )
-+e1737  // 'Symbol' hides global operator new -- [12, Item 9]
--append(1737, -- Effective C++ #9 )
-+e1739  // Binary operator should be non-member function -- [12, Item 19], [30, Item 24]
--append(1739, -- Effective C++ #19 & Eff. C++ 3rd Ed. item 24)
-+e1740  // pointer member not directly freed or zero'ed by destructor -- [12, Item 6]
--append(1740, -- Effective C++ #6 )
-+e1741  //  member conceivably not initialized by constructor -- [30, Item 4], [30, Item 13]
--append( 1741, --- Eff. C++ 3rd Ed. item 4 & Eff. C++ 3rd Ed. item 13)
-+e1742  //  member conceivably not initialized -- [30, Item 4]
--append( 1742, --- Eff. C++ 3rd Ed. item 4 )
-+e1743  //  member conceivably not initialized -- [30, Item 4]
--append( 1743, --- Eff. C++ 3rd Ed. item 4 )
-+e1744  //  member possibly not initialized by private constructor -- [30, Item 4]
--append( 1744, --- Eff. C++ 3rd Ed. item 4 )
-+e1745  // member not assigned by private assignment operator -- [12, Item 16], [30, Item 12]
--append(1745, -- Effective C++ #16 & Eff. C++ 3rd Ed. item 12)
-+e1746  // parameter of function could be made const ref -- [12, Item 22], [30, Item 3], [30, Item 20]
--append(1746, -- Effective C++ #22 & Eff. C++ 3rd Ed. item 3& Eff. C++ 3rd Ed. item 20)
-+e1747  // binary operator returning a reference -- [12, Item 23]
--append(1747, -- Effective C++ #23 )
-+e1749  // base class of class need not be virtual -- [23, Item 24]
--append(1749, -- More Effective C++ #24 )
-+e1752  // catch parameter Integer is not a reference -- [23, Item 13]
--append(1752, -- More Effective C++ #13 )
-+e1753  // Overloading special operator -- [23, Item 7]
--append(1753, -- More Effective C++ #7 )
-+e1754  // Expected 'Symbol' to be declared for class 'Symbol' -- [23, Item 22]
--append(1754, -- More Effective C++ #22 )
-+e1757  // Discarded instance of post decrement/increment -- [23, Item 6]
--append(1757, -- More Effective C++ #6 )
-+e1758  // Prefix increment/decrement operator returns a non-reference. -- [23, Item 6]
--append(1758, -- More Effective C++ #6 )
-+e1759  // Postfix increment/decrement operator returns a reference. -- [23, Item 6]
--append(1759, -- More Effective C++ #6 )
-+e1762  //  Member function could be made const -- [30, Item 3]
--append( 1762, --- Eff. C++ 3rd Ed. item 3 )
-+e1764  //  Reference parameter could be declared const reference -- [30, Item 3]
--append( 1764, --- Eff. C++ 3rd Ed. item 3 )
-+e1770  //  function defined without function 'String' -- [30, Item 52]
--append( 1770, --- Eff. C++ 3rd Ed. item 52 )
-+e1772  //  Assignment operator is not returning *this -- [30, Item 10]
--append( 1772, --- Eff. C++ 3rd Ed. item 10 )
-+e1904  // Old-style C comment -- [12, Item 4]
--append(1904, -- Effective C++ #4 )
-+e1921  //  Symbol not checking argument against sizeof(class) -- [30, Item 51]
--append( 1921, --- Eff. C++ 3rd Ed. item 51 )
-+e1923  // macro could become const variable -- [12, Item 1], [30, Item 2]
--append(1923, -- Effective C++ #1 & Eff. C++ 3rd Ed. item 2)
-+e1924  // C-style cast -- [23, Item 2]
--append(1924, -- More Effective C++ #2 )
-+e1925  // public data member -- [12, Item 20], [30, Item 22]
--append(1925, -- Effective C++ #20 & Eff. C++ 3rd Ed. item 22)
-+e1926  // 'Symbol's default constructor implicitly called -- [12, Item 12]
--append(1926, -- Effective C++ #12 )
-+e1927  // 'Symbol' was not initialized in the constructor init list -- [12, Item 12]
--append(1927, -- Effective C++ #12 )
-+e1928  // 'Symbol' did not appear in the ctor initializer list -- [12, Item 12]
--append(1928, -- Effective C++ #12 )
-+e1929  // function returning a reference -- [12, Item 23], [30, Item 21]
--append(1929, -- Effective C++ #23 & Eff. C++ 3rd Ed. item 21)
--esym( 1929, operator<<, operator>> )  // but these op's are OK
-+e1930  // Conversion operator found -- [23, Item 5]
--append(1930, -- More Effective C++ #5 )
-+e1931  // Constructor can be used for implicit conversions -- [23, Item 5]
--append(1931, -- More Effective C++ #5 )
-+e1932  // Base class is not abstract. -- [23, Item 33]
--append(1932, -- More Effective C++ #33 )
-+e1934  // flags member functions operator<< and operator>>
--append(1934, -- Effective C++ #19 )
-+e1961  //  virtual member function could be made const -- [30, Item 3]
--append( 1961, --- Eff. C++ 3rd Ed. item 3 )
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.h
deleted file mode 100644
index e948a20f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef CO_GCC_H_
-#define CO_GCC_H_
-
-#ifdef _lint /* Make sure no compiler comes this way */
-
-/*
-   The headers included below must be generated; For C++, generate
-   with:
-
-   g++ [usual build options] -E -dM t.cpp >lint_cppmac.h
-
-   For C, generate with:
-
-   gcc [usual build options] -E -dM t.c >lint_cmac.h
-
-   ...where "t.cpp" and "t.c" are empty source files.
-
-   It's important to use the same compiler options used when compiling
-   project code because they can affect the existence and precise
-   definitions of certain predefined macros.  See the preamble to
-   co-gcc.lnt for details and a tutorial.
- */
-#if defined(__cplusplus)
-//#       include "lint_cppmac.h"
-#else
-#       include "lint_cmac.h"
-#endif
-
-
-/* If the macros given by the generated macro files must be adjusted
-   in order for Lint to cope, then you can do so here.  */
-
-
-#endif /* _lint      */
-#endif /* CO_GCC_H_ */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.lnt
deleted file mode 100644
index f7bd38dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.lnt
+++ /dev/null
@@ -1,188 +0,0 @@
-/*  co-gcc.lnt: This is the seed file for configuring Lint for use with
-    GCC versions 2.95.3 and later.
-
-    Like all compiler options files this file is intended to be used
-    as follows:
-
-         lint co-gcc.lnt source-files-to-be-linted
-
-    Some of the information that co-gcc.lnt requires needs to be
-    furnished with the help of the gcc system itself.
-
-    If any of these directions are unclear, you may gain a better insight
-    into what is happening by checking the file gcc-readme.txt
-
-    For C, first create an empty file named empty.c and then
-    run the command (options are case sensitive):
-
-         gcc -E -dM empty.c >lint_cmac.h
-
-    This will capture macro definitions in a file that will be included
-    automatically at the beginning of each module by use of the -header
-    option within co-gcc.lnt.  The macros may change as you change
-    compiler options so that ultimately you may want to incorporate
-    this step into a make facility.
-
-    Next we need to determine the search directories.  If you run
-
-         gcc -c -v empty.c
-
-    you will see among other things this coveted list.  For example you
-    might get:
-
-         ...
-         #include "..." search starts here
-         #include <...> search starts here
-         /usr/local/include
-         /usr/lib/gcc/i686-apple-darwin8/4.0.1/include
-         /usr/include
-         /System/Library/Frameworks
-         /Library/Frameworks
-         End of search list.
-         ...
-
-    For each directory shown (there are five in the list above) prefix
-    the directory name by a "--i" and place it in a file whose name is,
-    say, include.lnt.  You may then begin linting programs by using the
-    command
-
-         lint co-gcc.lnt include.lnt  source-files
-
-    Note: it is conventional to place both .lnt files into a single .lnt
-    file called std.lnt
-
-    For C++, run the command (options are again case sensitive):
-
-         g++ -E -dM empty.c >lint_cppmac.h
-
-    This will capture C++ macro definitions in a file that will be
-    included automatically at the beginning of each C++ module
-    at the request of co-gcc.lnt.
-
-    Next we need to determine C++ search directories.  If you run
-
-         g++ -c -v empty.c
-
-    As in the case of C you should prepend a --i onto each directory
-    displayed and place these options into a file such as include.lnt.
-    Again, there is nothing sacred about the name and if you intend to
-    do mixed C and C++ programming it will be necessary for you to use
-    a differently named file.  The rest proceeds as before.
-
-    Note, some options in this file (such as the size options, i.e. -sp4
-    indicating that pointers are four bytes wide) may need to be changed.
-    See "System Dependent Options" below.
-*/
-
--cgnu             // Notifies FlexeLint that gcc is being used.
-
-// Begin: System Dependent Options
-// -------------------------------
--a#machine(i386)  // #assert's machine(i386)  (SVR4 facility).
-+fdi              // Use the directory of the including file
--si4              // size of int
--sp4              // size of pointer
-
-// -----------------------------
-// End: System Dependent Options
-
-+cpp(.cc,.c)      // extensions for C++ that are commonly used in addition
-                  // to the default extensions of .cpp and .cxx
--header(scripts/pclint/co-gcc.h) // Includes header generated by GCC.
-+libh(co-gcc.h)   // Marks that header as library code.
-
-// =========================================================
-// +rw and -d options to cope with GNU syntax:
-+ppw(ident)                 // Tolerate #ident keyword definitions for SCCS/RCS
-+ppw(warning)
-
-// GCC provides alternative spellings of certain keywords:
--rw_asgn(__inline,inline)
--rw_asgn(__inline__,inline)
--rw_asgn(__signed__,signed)
--rw_asgn( __volatile__, volatile )
--rw_asgn( __volatile, volatile )
-++d__const=const        // gconv.h uses __const rather than const
-++dconst=const          // ensure const expands to const.
-
--rw_asgn( asm,      _up_to_brackets )
--rw_asgn( __asm,    _up_to_brackets )
--rw_asgn( __asm__,  _up_to_brackets )
-// This re-definition of the various spellings of the asm keyword enables
-// Lint to pass gracefully over expression-statements like:
-// __asm __volatile ("fsqrt" : "=t" (__result) : "0" (__x));
-
-++d__attribute__()=   // ignore this keyword and following parenthetical
-++d__attribute()=     // variant spelling of "__attribute__"
-
-// "__extension__" is GCC's way of allowing the use of non-standard
-// constructs in a strict Standard-conforming mode.  We don't currently
-// have explicit support for it, but we can use local suppressions.  For
-// example, we can use -e(160) so that we will not see any Errors about
-// GNU statement-expressions wrapped in __extension__().
-++d"__extension__=/*lint -e(160) */"
-
-++d__builtin_va_list=void*            // used by stdarg.h
-++d__builtin_stdarg_start()=_to_semi  // ditto
-++d__builtin_va_end()=_to_semi        // ditto
-++d"__builtin_va_arg(a,b)=(*( (b *) ( ((a) += sizeof(b)) - sizeof(b) )))"
-++d__null=0
-+rw(_to_semi)           // needed for the two macros above.
-+rw(__typeof__)         // activate __typeof__ keyword
--d__typeof=__typeof__   // an alternative to using __typeof__
-
-+rw( __restrict )
-+rw( __restrict__ )
--rw(__except)           // This MS reserved word is used as an identifier
-+rw( __complex__, __real__, __imag__ )  // reserved words that can be ignored.
-++d__builtin_strchr=(char*)     // permits the inline definition ...
-++d__builtin_strpbrk=(char*)    // of these functions to be linted ...
-++d__builtin_strrchr=(char*)    // without drawing a complaint
-++d__builtin_strstr=(char*)     // about the use of a non-standard name
-++d__PRETTY_FUNCTION__=___function___ // lint defines ___function___ internally
-++d__FUNCTION__=___function___        // lint defines ___function___ internally
-
-
-// =========================================================
-// Other options supporting GNU C/C++ syntax:
-+fld // enables the processing of _L_abel _D_esignators E.g.:
-     // union { double d; int i; } u = { d: 3.141  };
-
-// +fwc // wchar_t might be builtin; if so, uncomment
-        // this option.
-
-// =========================================================
-// Generally useful suppressions:
--wlib(1)      // sets the warning level within library headers to 1
-              // (no warnings, just syntax errors).  Comment out if you
-              // are actually linting library headers.
--elib(123)    // 123 is really a warning, but it's in the "Error" range.
--elib(93)     // allow newlines within quoted string arguments to macros
--elibsym(628) // Suppress 628 for __builtin symbols.
-
--esym(528,__huge_val,__nan,__qnan,__qnanf,__snan,__snanf)
-                       // We don't care if we don't reference some GNU functions
--esym(528,__gnu_malloc,__gnu_calloc)
-
-//  The following functions exhibit variable return modes.
-//  That is, they may equally-usefully be called for a value
-//  as called just for their effects.  Accordingly we inhibit
-//  Warning 534 for these functions.
-//  Feel free to add to or subtract from this list.
-
--esym(534,close,creat,fclose,fprintf,fputc, nanosleep, time)
--esym(534,fputs,fscanf,fseek,fwrite,lseek,memcpy,memmove,memset)
--esym(534,printf,puts,scanf,sprintf,sscanf,strcat,strcpy)
--esym(534,strncat,strncpy,unlink,write, snprintf, dprintf)
-
-// For non-ANSI compilers we suppress messages 515 and 516
-// for functions known to have variable argument lists.
-// For ANSI compilers, header files should take care of this.
-
--esym(515,fprintf,printf,sprintf,fscanf,scanf,sscanf)
--esym(516,fprintf,printf,sprintf,fscanf,scanf,sscanf)
--esym(1702,*operator<<,*operator>>)
--esym(534,*operator<<,*operator>>)
--esym(1055,*__builtin*)
--esym(718,*__builtin*)   // The compiler does not need these ...
--esym(746,*__builtin*)   // declared and it knows their prototypes.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/lint_cfg.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/lint_cfg.lnt
deleted file mode 100644
index 72530d53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/lint_cfg.lnt
+++ /dev/null
@@ -1,55 +0,0 @@
-// These settings are used to adjust the pcLint checking for
-// the operating unit source code
-
-// show pclint where to find Header files
--i".\include"
--i".\lib"
--i".\src"
-
--iC:\mingw\include
--iC:\mingw\lib\gcc\mingw32\4.8.1\include\
--iC:\mingw\lib\gcc\mingw32\4.8.1\include\-fixed
--iC:\mingw\lib\gcc\mingw32\4.8.1\include\c++\
--iC:\mingw\lib\gcc\mingw32\4.8.1\include\c++\mingw32
-//+libdir(D:\Programme\linaro\gcc-linaro-arm-linux-gnueabihf-4.9-2014.08\*)	// define a directory as holding only headers, may be used with * or ?
-//+libdir(D:\Programme\linaro\gcc-linaro-arm-linux-gnueabihf-4.9-2014.08\libc\usr\include\*)
-
-//+libclass(ansi)	// use this if only ANSI headers are seen as unchecked libraries
-+libclass(foreign)	// ignore all headers comeing from a foreign directory using -i or the INCLUDE environment variable
-//+libclass(angle)	// ingore all headers specified with angle brackets
-//+libclass(all)	// ignore all header files
-+libh(co-ggc.lnt)	// ignore this file
-//+libdir(uncrustify/scripts/*)
-//-wlib(1)
-
-// Compiler specific configuration for Visual DSP
-
-// co-tiger.lnt use this file for tiger sharc as reference
-scripts\pclint\co-gcc.lnt 	// Compiler Options for GCC
-
-// Configuration for checking the operating unit source code
-
-//-d__ARM_PCS_VFP
--d__cplusplus
--d_GNU_SOURCE
-//-d__GNUC__
--d__STDC__
-//-d__GLIBCXX__=20130531
-//-d__SIZE_TYPE__=int
-//-d__PTRDIFF_TYPE__=int
-//-d__CHAR_BIT__=8
--dWIN32
--d__i386__
--dDEFINE_CHAR_TABLE
--dDEFINE_PCF_NAMES 
-
-// define compiler specific keywords
-
-//+rw(__inline)				// activate the __inline keyword
-//+ppw(import)				// activate #import
-//-d"_exit=_up_to_brackets"
-//-d"extern 'C'=gobble"
-//+fkp        				// complain about non-KR extensions
-
-// To print a stack usage report pclint has to know how much space is required by some functions
-// define an upper limit of stack space usage for recursion and function pointers
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/pclint_cfg_eclipse.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/pclint_cfg_eclipse.lnt
deleted file mode 100644
index d1945c5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/pclint_cfg_eclipse.lnt
+++ /dev/null
@@ -1,58 +0,0 @@
-// These are generale configuration options used for pcLint
-// throughout all kind of projects. 
-// This was adjusted to nuinno policy.
-// See  manual (chapter LIVING WITH LINT) for further details.
-// 
-// Project specific settings shall be included from a separate file
-// at the end of this file
-
-//-i"%PCLINT_HOME%"		// add pclint home directory to include path
-
-//-p					// only run preprocessor (use this for debugging pclint test)
-//+source				// print source code  (use this for debugging pclint test)
--v  					// be not verbose (standard setting for normal operation)
-//-voif					// show the options that pclint uses (only for debugging pclint)
-//+v					// be verbose  (use this for debugging pclint test)
-//-v*					// be more verbose (use this for debugging pclint)
-//-vf					// print included files (useful for debugging pclint test)
--summary				// prints a summary of all pclint results (useful for debugging pclint test)
-//-format_summary=.
-//-format_template=
-//-format_verbosity=.
-
-+fan					// allow anonymous unions
-++fim					// use multiple include directories
-+fus					// automatically recognize std namespace 
-+fbo					// activate keyword bool, true, false
--fkp					// allow ANSI/ISO standard do not insist on Kernighan Richy style  
--fdh					// do not append a .h to header names                                   
--ffb					// do not establish a separate scope for declares within for clauses
-+fsv					// track static variables
-+fll					// enable long long types
-+fqb					// expect const and volatile before type
-+e900					// print total number of errors/warnings
-
--d__USE_GNU=1
-scripts\pclint\lint_cfg.lnt	// include project specific settings
-scripts\pclint\policy.lnt	// pclint rules from nuinno
-
--esym(123,min,max)  		// allows users to use min, max as variables
-
-// Disable unwanted warnings
-//-strong(AB,bool)
-//-strong(AB,boolean)
-//-strong(AJX)			// all typedef must match exactly
-
-// create output that is understood from Jenkins
-+ffn 					// force full path names
--width(0) 				// don't insert line breaks (unlimited output width).
--hF1 					// set message height one
-+program_info(output_prefix = "tests\pclint\pclint_")  
-
-// make error format same as GCC to display it in Eclipse
--"format=%(%f:%l:%C:%) %t %n: %m"
--frl	// Enable warning 831
-+flm	// make sure no foreign includes change the format
-// env-xml.lnt 			// create output in xml format 
-// -"format_stack=%-20f %5a %-20t %5n %c %e"
-// +stack( &file=test\pclint\pclint-stack-report.txt )
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/policy.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/policy.lnt
deleted file mode 100644
index 911e74b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/policy.lnt
+++ /dev/null
@@ -1,396 +0,0 @@
-// uncrustify policy
--passes(2)              // number of analysis passes (higher values give better detection but slower)                                           
--static_depth(2)        // number of analyzed redirection for static variables 
-//-w2                   // suppress informational messages  
-// -strong(AJX)    		// All typedefs must match exactly
--w3						// display informational messages  
-//-w4      				// use the maximum warning level
-//+fpn     				// warns about the use of pointer parameters without first checking for NULL
-//+fsc       			// assumes string constants are const char*
-
-// all checks from 0 to 599 are enabled by +w2 
--e10					// Expecting identifier or other declarator
--e18					// symbol redefined
--e19					// useless declaration
--e14					// symbol previously defined
--e26					// expected an expression found const/return
--e30					// expected an integer constant
--e31					// redefinition of symbol
--e32					// field size should not be zero
--e36					// redefining the storage class of symbol
--e40					// undeclared identifier
--e46					// field type should be an integral or enumeration type
--e48					// bad type
--e49					// expected a typed
--e50					// attempted to take the address of a non-lvalue
--e52					// expected an lvalue
--e55					// bad type
--e56					// bad type
--e63					// expected an lvalue
--e64					// type mismatch
--e78					// typedef'd symbol used in expression
--e85 					// array has dimension 0
--e96					// unmatched left brace for linkage specification
--e114					// inconsistent
--e119					// too many arguments 
--e123					// macro defined with arguments
--e129					// declaration expected
--e200					// internal error
--e438					// last value assignd to variable not used
--e451					// header without include guard
--e457					// enable for checking multithreading
--e458					// enable for checking multithreading
--e459					// enable for checking multithreading
--e506					// allow constant value booleans
--e514					// unusual use of boolean expression
--e516					// symbol has arg type conflict
--e520					// highest operation lacks side effects
--e522					// highest operation lacks side effects
--e526					// symbol not defined
--e528					// symbol not referenced
--e534					// ignoring return value of function
--e537					// do not warn about repeated inclusion
--e574					// signed / unsigned mix with relational
--e578					// Declaration of symbol hides symbol
--e585					// not a valid Trigraph sequence
-
-+e601 					// Expected a type for symbol Symbol
-+e602 					// Comment within comment
-+e603 					// Symbol not initialized
-+e604 					// Returning address of auto variable
-+e605 					// Increase in pointer capability
-+e606 					// Non-ANSI escape sequence:
-+e607 					// Parameter of macro found within string
-+e608 					// Assigning to an array parameter
-+e609 					// Suspicious pointer conversion
-+e610 					// Suspicious pointer combination
-+e611 					// Suspicious cast
-+e612 					// Expected a declarator
--e613 					// Possible use of null pointer
-+e614 					// auto aggregate initializer not constant
-+e615 					// auto aggregate initializer has side effects
-+e616 					// control flows into case/default
-+e617 					// String is both a module and an include file
-+e618 					// Storage class specified after a type
-+e619 					// Loss of precision (Context) (Pointer to Pointer)
-+e620 					// Suspicious constant (small L or one?)
-+e621 					// Identifier clash
-+e622 					// Size of argument no. Integer inconsistent with format
-+e623 					// redefining the storage class of symbol
-+e624 					// typedef redeclared
-+e625 					// auto symbol has unusual type modifier
-+e626 					// Integer inconsistent with format
-+e627 					// indirect object inconsistent with format
--e628 					// no argument information provided for function
-+e629 					// static class for function is non standard
-+e630 					// ambiguous reference to symbol
-+e631 					// tag 'Symbol' defined differently at Location
-+e632 					// Assignment to strong type
-+e633 					// Assignment from a strong type
-+e634 					// Strong type mismatch in equality or conditional
-+e635 					// resetting strong parent of type
-+e636 					// ptr to strong type versus another type
-+e637 					// Expected index type for strong type
-+e638 					// Strong type mismatch for type in relational
-+e639 					// Strong type mismatch for type in binary operation
-+e640 					// Expected strong type 'Name' in Boolean context
--e641 					// Converting enum to int
-+e642 					// Format char 'Char' not supported by wsprintf
-+e643 					// Loss of precision in pointer cast
-+e644 					// Variable may not have been initialized
-+e645 					// Symbol may not have been initialized
-+e646 					// case/default within Kind loop; may have been misplaced
-+e647 					// Suspicious truncation
-+e648 					// Overflow in computing constant for operation:
-+e649 					// Sign fill during constant shift
-+e650 					// Constant out of range for operator
-+e651 					// Potentially confusing initializer
--e652 					// #define of symbol 'Symbol' declared previously
-+e653 					// Possible loss of fraction
-+e654 					// Option String obsolete; use -width(W,I)
--e655 					// bit-wise operation uses (compatible) enum's
-+e656 					// Arithmetic operation uses (compatible) enum's
-+e657 					// Unusual (nonportable) anonymous struct or union
-+e658 					// Anonymous union assumed
-+e659 					// Nothing follows '}'
-+e660 					// Option requests removing an extent that is not on the list
-+e661 					// possible access of out-of-bounds pointer
-+e662 					// possible creation of out-of-bounds pointer
-+e663 					// Suspicious array to pointer conversion
-+e664 					// Left side of logical OR (||) or logical AND (&&) does not return
-+e665 					// Unparenthesized parameter Integer in macro is passed an expression
-+e666 					// Expression with side effects passed to repeated parameter
-+e667 					// Inconsistent use of qualifiers for symbol
-+e668 					// Possibly passing a null pointer to function
-+e669 					// Possible data overrun for function
-+e670 					// Possible access beyond array for function
-+e671 					// Possibly passing to function a negative value
-+e672 					// Possible memory leak in assignment to pointer
-+e673 					// Possibly inappropriate deallocation
-+e674 					// Returning address of auto through variable
-+e675 					// No prior semantics associated with symbol
-+e676 					// Possibly negative subscript
-+e677 					// sizeof used within preprocessor statement
-+e678					// Member field length (Integer) too small for enum precision
-+e679 					// Suspicious Truncation in arithmetic expression combining with pointer
-+e680 					// Suspicious Truncation in arithmetic expression converted to pointer
-+e681 					// Loop is not entered
-+e682 					// sizeof applied to a parameter whose type is a sized array
-+e683 					// function 'Symbol' #define'd
-+e684 					// Passing address of auto variable into caller space
-+e685 					// Relational operator always evaluates to same result
-+e686 					// Option is suspicious
-+e687 					// Suspicious use of comma operator
-+e688 					// Cast used within preprocessor conditional statement
-+e689 					// Apparent end of comment ignored
-+e690 					// Possible access of pointer pointing Integer bytes past null character by operator
-+e691 					// Suspicious use of backslash
-+e692 					// Decimal character follows octal escape sequence
-+e693 					// Hexadecimal digit immediately after is suspicious in string literal.
-+e694 					// The type of constant (precision Integer) is dialect dependent
-+e695 					// Inline function defined without a storage-class specifier ('static' recommended)
-+e696 					// Variable has value that is out of range for operator
-+e697 					// Quasi-boolean values should be equality-compared only with 0
-+e698 					// Casual use of realloc can create a memory leak
-
-+e701					// Shift left of signed int variable
--e702					// Shift right of signed int variable
-+e703 					// Shift left of signed long variable
-+e704 					// Shift right of signed long variable
-+e705 					// Integer nominally inconsistent with format
-+e706 					// indirect object inconsistent with format
-+e707 					// Mixing narrow and wide string literals in concatenation
-+e708 					// union initialization
--e712 					// Loss of precision
--e713 					// Loss of precision
--e714 					// external variable not referenced
--e715 					// Symbol not referenced
--e716					// while(1) found, allow endless loops
--e717					// do ... while(0) found
-+e718 					// Symbol undeclared, assumed to return int
-+e719 					// Too many arguments for format
-+e720 					// Boolean test of assignment
-+e721 					// Suspicious use of ;
-+e722 					// Suspicious use of ;
-+e723 					// Suspicious use of = -- A preprocessor definition began with an = sign.
-+e725 					// Expected positive indentation from Location
--e726 					// Extraneous comma ignored
-+e727 					// local static variable not explicitly initialized
-+e728 					// global static variable not explicitly initialized
-+e729 					// exteral variable not explicitly initialized
--e730 					// Boolean argument to function
--e731					// Boolean argument to equal/not equal
--e732 					// Loss of sign
-+e733 					// Assigning address of auto variable to outer scope symbol
-+e734 					// Loss of precision int
-+e735 					// Loss of precision double
-+e736 					// Loss of precision float
--e737 					// Loss of sign in promotion from Type1 to Type2
-+e738 					// Symbol not explicitly initialized
-+e739 					// Trigraph Sequence in literal (Quiet Change)
-+e740 					// Unusual pointer cast (incompatible indirect types)
-+e741 					// Unusual pointer cast (function qualification)
-+e742 					// Multiple character constant
-+e743 					// Negative character constant
-+e744 					// switch statement has no default
-+e745 					// function has no explicit type or class, int assumed
-+e746 					// call to function not made in the presence of a prototype
--e747	 				// (noisy when using bool) Significant prototype coercion Type1 to Type2
-+e748 					// Symbol is a register variable used with setjmp
--e749					// check for unused enum values
--e750					// ignore    unused local macros
--e751					// check for unused local typedefs
--e752 					// check for unused local declarations
--e753					// check for unused local struct, union or enum tag
--e754					// check for unused local structure member
--e755					// ignore    unused global macros
--e756					// check for unused global typedefs
--e757 					// check for unused global declarations
--e758					// check for unused global struct, union or enum tag
--e759					// check if symbol can be moved from header to module
-+e760 					// check for redundant macros
--e761 					// check for redundant typedefs
-+e762 					// check for redundantly declared symbol
-+e763 					// check for redundant declaration for symbol
-+e764 					// check for switch statement without a case
--e765 					// check for external symbols that could be made static
-+e766					// check for unused headers
-+e767 					// check for differing macros
--e768 					// check for global struct member that is never referenced
--e769 					// check for global enumeration constant that is never referenced
-+e770 					// tag is defined identically at several locations
-+e771 					// check for uninitialized symbols
-+e772 					// check for uninitialized symbols
-+e773 					// Expression-like macro not parenthesized
--e774 					// Boolean within 'String' always evaluates to [True/False]
-+e775					// non-negative quantity cannot be less than zero
-+e776 					// Possible truncation of addition
-+e777 					// Testing float's for equality
--e778 					// Constant expression evaluates to 0
-+e779 					// String constant in comparison operator
-+e780 					// Vacuous array element
-+e782 					// Line exceeds Integer characters
-+e783 					// Line does not end with new-line
-+e784 					// Nul character truncated from string
-+e785 					// Too few initializers for aggregate
-+e786 					// String concatenation within initializer
-+e787 					// enum constant should not be used within switch
--e788 					// enum constant not used within defaulted switch
-+e789 					// Assigning address of auto variable to static
-+e790 					// Suspicious truncation, integral to float
-+e791 					// unusual option sequence
-+e792 					// void cast of void expression
-+e793 					// ANSI/ISO limit of String 'Name' exceeded
-+e794 					// Conceivable use of null pointer
-+e795					// Conceivable division by 0
-+e796 					// Conceivable access of out-of-bounds pointer
-+e797 					// Conceivable creation of out-of-bounds pointer
-+e798 					// Redundant character
-+e799 					// numerical constant 'Integer' larger than unsigned long
-
--e801 					// Use of goto is deprecated
-+e802 					// Conceivably passing a null pointer to function
-+e803 					// Conceivable data overrun for function
-+e804 					// Conceivable access beyond array for function
-+e805 					// Expected L"..." to initialize wide char string
-+e806 					// Small bit field is signed rather than unsigned
-+e807 					// Conceivably passing to function a negative value
-+e808 					// No explicit type given to symbol
-+e809 					// Possible return of address of auto through variable
-+e810 					// Arithmetic modification of custodial variable
-+e811 					// Possible deallocation of pointer alias
-+e812 					// static variable 'Symbol' has size 'Integer'
-+e813 					// auto variable 'Symbol' in function 'Symbol' has size 'Integer'
-+e814 					// useless declaration
-+e815 					// Arithmetic modification of unsaved pointer
-+e816					// Non-ANSI format specification
-+e817 					// Conceivably negative subscript
--e818 					// Pointer parameter could be declared ptr to const
-+e820 					// Boolean test of a parenthesized assignment
-+e821 					// Right hand side of assignment not parenthesized
-+e825 					// control flows into case/default without -fallthrough comment
-+e826 					// Suspicious pointer-to-pointer conversion
-+e827 					// Loop not reachable
-+e828 					// redefinition of functions
-+e829 					// dangerous header was used
-+e830					// print error location indicator
-+e831					// print error location indicator
-+e832 					// Parameter 'Symbol' not explicitly declared
-+e833 					// Symbol is typed differently in another module
--e834 					// missing parentheses between operators
--e835 					// A zero has been given as [left/right] argument to operator
-+e836 					// Conceivable access of pointer pointing Integer bytes past nul
-+e838 					// Previously assigned value to variable has not been used
-+e839 					// Storage class of symbol 'Symbol' assumed static
-+e840 					// Use of null character in a string literal
--e843 					// Variable 'Symbol' (Location) could be declared as const
-+e844 					// Pointer variable could be declared as pointing to const
--e845					// The [left/right] argument to operator is certain to be 0
-+e846 					// Signedness of bit-field is implementation defined
-+e847 					// Thread has unprotected call to thread unsafe function
-+e849 					// Two enumerators have the same value
--e850 					// loop index variable is modified in body of the for loop
--e864 					// Expression possibly depends on order of evaluation
-+e866 					// Unusual use of 'String' in argument to sizeof
-
-+e900					// print total number of errors/warnings
--e904 					// Return statement before end of function 'Symbol'
-+e905 					// Non-literal format specifier used (with arguments)
--e909 					// Implicit conversion from Type to bool
--e910 					// Implicit conversion (Context) from 0 to pointer
--e911 					// (noisy) Implicit expression promotion from Type to Type
--e912					// (noisy) Implicit binary conversion from Type1 to Type2
-+e913 					// Implicit adjustment of expected argument type from Type1 to Type2
-+e914 					// Implicit adjustment of function return value from Type1 to Type2
--e915					// (noisy) Implicit conversion (Context) Type1 to Type2
--e916 					// Implicit pointer assignment conversion
--e917 					// (noisy) Prototype coercion Type1 to Type2
--e918 					// Prototype coercion (Context) of pointers
--e919 					// (noisy) Implicit conversion (Context) Type to Type
--e920 					// Cast from Type to void
--e931 					// Both sides have side effects
-+e932 					// Passing near pointer to library function 'Symbol'
-+e933 					// Passing near pointer to far function (Context)
-+e934 					// taking address of near auto variable 'Symbol'
--e935 					// (noisy) int within struct
-+e936 					// type is missing for function arguments
-+e937 					// type is missing for function arguments
-+e939 					// return type is missing for function
-+e940 					// omitted braces within an initialize
-+e943 					// Too few initializers for aggregate
-+e945 					// Undefined struct used with extern
--e946 					// Relational or subtract operator applied to pointers
-+e947 					// Subtract operator applied to pointers
--e950 					// Non-ISO/ANSI reserved word or construct:
-+e951 					// Pointer to incomplete type employed in operation
--e952 					// Parameter could be declared const
--e953 					// Variable could be declared as const
--e954 					// Pointer variable could be declared as pointing to a const
-+e955 					// Parameter name missing from prototype for function
--e956 					// (use for multithreaded SW) Non const, non volatile static or external variable
-+e957 					// Function defined without a prototype in scope
--e958	 				// (can help to save some bytes of memory) Padding of Integer byte(s) is required to align string on Integer byte boundary
-+e962 					// Macro defined identically at another location
-+e963       			// expect modifier (const, volatile) before type
--e964					// Header file not directly used in module
--e966 					// Indirectly included header file 'FileName' not used in module
-+e967 					// Header file 'FileName' does not have a standard include guard
--e970					// (noisy) Use of modifier or type outside of a typedef
--e971					// (noisy) Use of 'char' without 'signed' or 'unsigned'
-+e974 					// print Worst case function for stack usage:
--e1013					// symbol is not a member of class
--e1015					// symbol not found in class
--e1025					// no function or template matches invocation
--e1039					// symbol is not a member of class
--e1040					// symbol is not a legal declaration within class
--e1042					// a least one class like operand is required with operator
--e1048					// expected a constant expression
--e1051					// symbol is both a function and a variable
--e1052					// a type was expected, class assumed
--e1054					// template variable declaration expects a type
--e1055					// symbol undeclared, assumed to return int
--e1057					// member cannot be used without an object				
--e1058					// initializing a non-const reference
--e1065					// symbol not declared as "C"
--e1062					// template must be either a class or a function
--e1066					// symbol declared as "C" 
--e1075					// Ambiguous reference to symbol
--e1077					// could not evaluate default template parameter			
--e1086					// do not warn about compount literals
--e1087					// previous declaration is incompatible
--e1401					// member not initialized by constructor
--e1502					// object has no nonstatic data member
--e1526					// Member function not defined
--e1529					// symbol not first checking for assignment to this
--e1536					// exposing low access member
--e1540					// pointer member neither freed nor zeroed by destructor
--e1551					// function may throw exception in destructor 			
--e1554					// direct pointer copy of member within copy constructor
--e1561					// reference initialization causes loss of const/volatile
--e1566					// member might have been initialized by a separate function
--e1702					// operator is both an ordinary function and a member function
--e1704					// constructor has private access specification
--e1711					// function needs not to be virtual
--e1712					// default constructor not defined for class			
--e1714					// Member function not referenced
--e1725					// class member is a reference
--e1732					// constructor for class has no assignment operator
--e1733					// constructor for class has no copy constructor
--e1736					// redundant access specifier
--e1740					// pointer member not directly freed or zeroed by destructor
--e1746					// parameter could be made const reference
--e1757					// discarded instance of post decrement/increment
--e1762					// member could be made const
--e1764					// reference parameter could be declared const 
--e1776					// converting a string literal to char*
--e1786					// implicit conversion to bool
--e1788					// variable is referenced only by its constructor or destructor
--e1795					// Template was defined but not instantiated
--e1904					// allow old style comments
--e1923					// ignore defines that could be const variables
--e1924					// C-style cast
-
-//scripts/pclint/au-sm123.lnt 	// also check Scott Meyers rules of all three books
-//scripts/pclint/au-misra3.lnt	// Misra 2012 rules
-//scripts/pclint/au-barr10.lnt	// Top 10 Bug-Killing Rules
-//scripts/pclint/au-ds.lnt 		// Dan Saks
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/run-pclint-eclipse.bat b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/run-pclint-eclipse.bat
deleted file mode 100644
index 1a778bfa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/run-pclint-eclipse.bat
+++ /dev/null
@@ -1,104 +0,0 @@
-rem set to on for debugging
-@echo off
-setlocal
-
-rem Run this script from the project root directory
-
-echo ------------------------------------------------------
-echo Start pcLint analysis to check code quality ...
-
-set SRC_DIR=src
-set EXC_DIR=lnt
-set OUT_DIR=tests\pclint
-set LNT_DIR=scripts\pclint
-
-rem Check if pcLint program is available
-set prog=lint-nt.exe
-for %%i in ("%path:;=";"%") do (
-rem echo %%~i
-    if exist %%~i\%prog% (
-		set found=%%i
-		echo found %prog% in %%i
-	)
-)
-if %found%=="" goto PROG_MISSING
-
-if NOT EXIST tests        md tests
-if NOT EXIST tests\pclint md tests\pclint
-
-rem create list of all C source files to analyze
-rem FIXME: works only if there are no spaces in the paths 
-
-dir /s/b %EXC_DIR%\*.lnt		> .\%OUT_DIR%\exceptions.lnt
-
-rem to check single files activate one of the lines below
-rem dir /s/b %SRC_DIR%\align_stack.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\align.cpp		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\args.cpp			> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\backup.cpp		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\brace_cleanup.cpp> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\braces.cpp		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\chunk_list.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\ChunkStack.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\combine.cpp		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\compat_posix.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\compat_win32.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\defines.cpp		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\detect.cpp		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\indent.cpp 		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\keywords.cpp 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\lang_pawn.cpp 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\logger.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\logmask.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\md5.cpp		 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\newlines.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\options_for_QT.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\options.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\output.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\parens.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\parse_frame.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\punctuators.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\semicolons.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\sorting.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\space.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\tokenize_cleanup.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\tokenize.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\unc_text.cpp	 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\unc_tools.cpp	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\uncrustify_emscripten.cpp 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\uncrustify.cpp 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\unicode.cpp 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\universalindentgui.cpp 	> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\width.cpp 	> .\%OUT_DIR%\files.lnt
-
-rem to check all source files use the line below
-dir /s/b %SRC_DIR%\*.cpp 	> .\%OUT_DIR%\files.lnt
-
-rem use this to save the pclint errors to a file for later review
-rem lint-nt .\%LNT_DIR%\pclint_cfg_eclipse.lnt .\%OUT_DIR%\exceptions.lnt .\%OUT_DIR%\files.lnt > .\%OUT_DIR%\pclint-results.xml
-
-rem to make eclipse parse the pclint errors it has to be output to the console
-lint-nt .\%LNT_DIR%\pclint_cfg_eclipse.lnt .\%OUT_DIR%\exceptions.lnt .\%OUT_DIR%\files.lnt
-
-rem type %OUT_DIR%\pclint-results.xml | more
-rem type %OUT_DIR%\pclint-results.xml
-rem echo pcLint output placed in %OUT_DIR%\pclint-results.xml
-
-goto END
-
-:PROG_MISSING
-echo.
-echo ------------------------------------------------------
-echo pcLint Error: %prog% not found.
-echo Verify that PCLINT is correctly installed, the 
-echo installation was added to the PATH and the
-echo environment variable PCLINT_HOME was set to its path. 
-echo ------------------------------------------------------ 
-echo.
-goto END
-
-:END 
-echo pcLint finished
-echo ------------------------------------------------------
-endlocal
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/usage.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/usage.txt
deleted file mode 100644
index fff1c305..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/usage.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-"pclint" is a static source code checker.
-It helps detecting programming errors during development.
-
-To run the check you need a license for pclint. The results can either be saved to a text file or be displayed on top of the source code when using Eclipse.
-The present configuration is ment for Windows using Mingw as toolchain. To run the check with another toolchain the paths in run-pclint-eclipse.bat need to be change. To run the check under Linux another tool called "flexelint" is required.
-
-Run the check from the top level directory of uncrustify by calling
-run-pclint-eclipse.bat
-
-To run the check from Eclipse create a new target and use the script
-as build command like that:
-${workspace_loc:/uncrustify}/scripts/pclint/run-pclint-eclipse.bat 
-
-The file policy.lnt determines which tests are performed.
-The more tests are used the longer it takes but the more 
-precise will be the results. 
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/prepare_list_of_authors.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/prepare_list_of_authors.sh
deleted file mode 100755
index 6485d377..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/prepare_list_of_authors.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-#
-# Prepare the list of authors
-# guy maurel
-# 2020-11-05
-#
-LIST_1="TheListOfAuthors.txt"
-echo "Author:"                    > ${LIST_1}
-echo "2005 - 2016 : Ben Gardner" >> ${LIST_1}
-echo ""                          >> ${LIST_1}
-echo "Maintenance:"              >> ${LIST_1}
-echo "Guy Maurel"                >> ${LIST_1}
-echo "Matthew Woehlke"           >> ${LIST_1}
-echo ""                          >> ${LIST_1}
-echo "until 2020-11-05:"         >> ${LIST_1}
-echo "Other collaborators:"      >> ${LIST_1}
-git log --format='%aN' \
-   | sort -u \
-   | grep -v "^ben$" \
-   | grep -v "^bengardner$" \
-   | grep -v "^Ben Gardner$" \
-   | grep -v "^CDanU$" \
-   | grep -v "^DVE2000$" \
-   | grep -v "^Gilles$" \
-   | grep -v "^Guy Maurel$" \
-   | grep -v "^brmqk3$" \
-   | grep -v "^csobeski$" \
-   | grep -v "^dbeard$" \
-   | grep -v "^gmaurel$" \
-   | grep -v "^hdwobben$" \
-   | grep -v "^ipaterson$" \
-   | grep -v "^jlee975$" \
-   | grep -v "^logan.gauthier@metova.com$" \
-   | grep -v "^nivekkagicom$" \
-   | grep -v "^popipo$" \
-   | grep -v "^raefaldhia$" \
-   | grep -v "^rdan$" \
-   | grep -v "^tpltnt$" \
-   | grep -v "^versusvoid$" \
-   | grep -v "^void$" \
-      >> ${LIST_1}
-#
-mv ${LIST_1} AUTHORS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/release_tool.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/release_tool.py
deleted file mode 100755
index 2dd71676..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/release_tool.py
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import git
-import os
-import re
-import sys
-
-if sys.version_info[0] < 3:
-    input = raw_input
-
-re_desc = re.compile(r'^uncrustify-([0-9]+[.][0-9]+[.][0-9]+)')
-re_branch = re.compile(r'^uncrustify-RC-([0-9]+[.][0-9]+[.][0-9]+)')
-re_merge = re.compile(r'^Merge pull request #[0-9]+ from [^/]+/(.*)')
-re_version = re.compile(r'^[0-9]+[.][0-9]+[.][0-9]+$')
-re_option_count = re.compile(r'There are currently ([0-9]+) options')
-
-
-# -----------------------------------------------------------------------------
-def fatal(msg):
-    raise Exception(msg)
-
-
-# -----------------------------------------------------------------------------
-def get_version_str(repo, candidate=True, required=True):
-    if candidate:
-        b = repo.git.symbolic_ref('-q', '--short', 'HEAD')
-        m = re_branch.match(b)
-        if m:
-            return m.group(1)
-
-    d = repo.git.describe('HEAD')
-    m = re_desc.match(d)
-    if m:
-        return m.group(1)
-
-    if required:
-        fatal('Unable to determine current version')
-
-    return None
-
-
-# -----------------------------------------------------------------------------
-def get_version_info(repo, candidate=True, required=True):
-    s = get_version_str(repo, candidate, required)
-    return tuple(map(int, s.split('.')))
-
-
-# -----------------------------------------------------------------------------
-def get_option_count(executable):
-    import subprocess
-
-    out = subprocess.check_output([executable, '--count-options'])
-    m = re_option_count.match(out.decode('utf-8'))
-    if m is None:
-        fatal('Failed to get option count from \'{}\''.format(executable))
-
-    return int(m.group(1))
-
-
-# -----------------------------------------------------------------------------
-def alter(repo, path, old, new):
-    p = os.path.join(repo.working_tree_dir, path)
-    with open(p, 'r') as f:
-        content = f.read()
-        content = re.sub(old, new, content)
-    with open(p, 'w') as f:
-        f.write(content)
-    print('Updated: {}'.format(path))
-
-
-# -----------------------------------------------------------------------------
-def generate(repo, version, path, *args):
-    import subprocess
-
-    p = os.path.join(repo.working_tree_dir, path)
-    with open(p, 'w') as f:
-        c = subprocess.check_call(args, stdout=f)
-    print('Created: {}'.format(path))
-
-    alter(repo, path,
-          r'Uncrustify-[0-9.]+(-[0-9]+-[0-9a-f]+(-dirty)?)?',
-          r'Uncrustify-{}'.format(version))
-
-
-# -----------------------------------------------------------------------------
-def cmd_init(repo, args):
-    v = args.version
-    if v is None:
-        c = get_version_info(repo, candidate=False, required=False)
-        if c:
-            n = '.'.join(map(str, (c[0], c[1] + 1, 0)))
-            v = input('Version to be created? [{}] '.format(n))
-            if len(v) == 0:
-                v = n
-
-        else:
-            v = input('Version to be created? ')
-
-    if not re_version.match(v):
-        fatal('Bad version number, \'{}\''.format(v))
-
-    repo.git.checkout('-b', 'uncrustify-RC-{}'.format(v))
-
-
-# -----------------------------------------------------------------------------
-def cmd_update(repo, args):
-    v = get_version_str(repo)
-    c = get_option_count(args.executable)
-
-    alter(repo, 'CMakeLists.txt',
-          r'(set *[(] *UNCRUSTIFY_VERSION +")[0-9.]+',
-          r'\g<1>{}'.format(v))
-    alter(repo, 'package.json',
-          r'("version" *): *"[0-9.]+"',
-          r'\g<1>: "{}"'.format(v))
-    alter(repo, 'README.md',
-          r'[0-9]+ configurable options as of version [0-9.]+',
-          r'{} configurable options as of version {}'.format(c, v))
-    alter(repo, 'documentation/htdocs/index.html',
-          r'[0-9]+ configurable options as of version [0-9.]+',
-          r'{} configurable options as of version {}'.format(c, v))
-
-    generate(repo, v, 'etc/defaults.cfg',
-             args.executable, '--show-config')
-    generate(repo, v, 'documentation/htdocs/default.cfg',
-             args.executable, '--show-config')
-    generate(repo, v, 'documentation/htdocs/config.txt',
-             args.executable, '--show-config')
-    generate(repo, v, 'etc/uigui_uncrustify.ini',
-             args.executable, '--universalindent')
-
-
-# -----------------------------------------------------------------------------
-def cmd_commit(repo, args):
-    v = get_version_str(repo)
-    message = 'Prepare Uncrustify v{} release'.format(v)
-
-    extra_args = []
-    if args.amend:
-        extra_args += ['--amend', '--date=now']
-
-    repo.git.commit('-m', message, *extra_args)
-
-
-# -----------------------------------------------------------------------------
-def cmd_tag(repo, args):
-    import uuid
-
-    # Determine location of remote repository
-    if args.ssh:
-        s = 'git@{}:'.format(args.server)
-    else:
-        s = 'https://{}/'.format(args.server)
-    r = '{}{}/{}.git'.format(s, args.organization, args.project)
-
-    # Fetch upstream
-    u = repo.create_remote(str(uuid.uuid4()), r)
-    try:
-        u.fetch(refspec='master')
-
-        # Get log
-        if hasattr(args, 'commit'):
-            c = repo.commit(args.commit)
-        else:
-            c = repo.commit('{}/master'.format(u.name))
-        m = re_merge.match(c.message.split('\n')[0])
-        if m is None:
-            fatal('Last commit is not a merge of a release candidate?')
-
-        m = re_branch.match(m.group(1))
-        if m is None:
-            fatal('Failed to extract version from release candidate merge')
-        v = m.group(1)
-
-        # Create and push tag
-        extra_args = {}
-        if args.force:
-            extra_args['force_with_lease'] = True
-
-        tag = 'uncrustify-{}'.format(v)
-        message = 'Create Uncrustify v{} release'.format(v)
-        repo.git.tag('-a', tag, c, '-m', message, '--force')
-        u.push(refspec=tag, **extra_args)
-
-    finally:
-        repo.delete_remote(u)
-
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(
-        description='Perform release-related actions')
-
-    root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-    parser.add_argument('--repo', type=str, default=root,
-                        help='path to uncrustify git repository')
-
-    subparsers = parser.add_subparsers(title='subcommands',
-                                       help='action to perform')
-
-    parser_init = subparsers.add_parser(
-        'init', help='initialize new version')
-    parser_init.set_defaults(func=cmd_init)
-    parser_init.add_argument('-v', '--version',
-                             help='version number for release')
-
-    parser_update = subparsers.add_parser(
-        'update', help='update version information')
-    parser_update.set_defaults(func=cmd_update)
-    parser_update.add_argument('executable',
-                               help='path to uncrustify executable')
-
-    parser_commit = subparsers.add_parser(
-        'commit', help='commit changes for new version')
-    parser_commit.set_defaults(func=cmd_commit)
-    parser_commit.add_argument('-a', '--amend', action='store_true',
-                               help='amend a previous release commit')
-
-    parser_tag = subparsers.add_parser(
-        'tag', help='tag release and push tag to github')
-    parser_tag.set_defaults(func=cmd_tag)
-    parser_tag.add_argument('--ssh', action='store_true',
-                            help='use ssh (instead of HTTPS) to push')
-    parser_tag.add_argument('-s', '--server', default='github.com',
-                            help='push to specified server')
-    parser_tag.add_argument('-o', '--organization', default='uncrustify',
-                            help='push to specified user or organization')
-    parser_tag.add_argument('-p', '--project', default='uncrustify',
-                            help='push to specified project')
-    parser_tag.add_argument('-c', '--commit',
-                            help='tag specified commit '
-                                 '(instead of latest \'master\')')
-    parser_tag.add_argument('-f', '--force', action='store_true',
-                            help='force push the tag')
-
-    args = parser.parse_args()
-    repo = git.Repo(args.repo)
-    args.func(repo, args)
-
-    return 0
-
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/run_ctest.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/run_ctest.py
deleted file mode 100755
index 0267e0ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/run_ctest.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import math
-import os
-import subprocess
-import sys
-
-from multiprocessing import cpu_count
-
-default_jobs = min(cpu_count() + 2, cpu_count() * 2)
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(description='Run CTest')
-    parser.add_argument('-q', '--quiet', action='store_true',
-                        help='suppress output of failing tests')
-    parser.add_argument('-j', '--parallel', type=int, default=default_jobs,
-                        help='number of jobs to use for parallel execution')
-    parser.add_argument('args', metavar='ARGS', nargs='*', default=[],
-                        help='additional arguments to pass to CTest')
-    args = parser.parse_args()
-
-    if not os.path.exists('CTestTestfile.cmake'):
-        print('No test configuration file found!')
-        print('(Note: This script must be run from your build directory.)')
-        sys.exit(-1)
-
-    cmd = ['ctest', '-j{}'.format(args.parallel)]
-    if not args.quiet:
-        cmd.append('--output-on-failure')
-    cmd += args.args
-
-    try:
-        subprocess.check_call(cmd)
-    except subprocess.CalledProcessError as exc:
-        sys.exit(exc.returncode)
-
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-if __name__ == '__main__':
-    main()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/tokenizer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/tokenizer.py
deleted file mode 100755
index 0bc33bac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/tokenizer.py
+++ /dev/null
@@ -1,316 +0,0 @@
-#! /usr/bin/env python
-# tokenize.py
-#
-# Parses a C/C++/C#/D/Java/Pawn/whatever file in an array of
-# tuples (string, type)
-#
-
-# punctuator lookup table
-punc_table = [
-   [ '!',  25,  26, '!'   ],   #   0: '!'
-   [ '#',  24,  35, '#'   ],   #   1: '#'
-   [ '$',  23,   0, '$'   ],   #   2: '$'
-   [ '%',  22,  36, '%'   ],   #   3: '%'
-   [ '&',  21,  41, '&'   ],   #   4: '&'
-   [ '(',  20,   0, '('   ],   #   5: '('
-   [ ')',  19,   0, ')'   ],   #   6: ')'
-   [ '*',  18,  43, '*'   ],   #   7: '*'
-   [ '+',  17,  44, '+'   ],   #   8: '+'
-   [ ',',  16,   0, ','   ],   #   9: ','
-   [ '-',  15,  46, '-'   ],   #  10: '-'
-   [ '.',  14,  50, '.'   ],   #  11: '.'
-   [ '/',  13,  53, '/'   ],   #  12: '/'
-   [ ':',  12,  54, ':'   ],   #  13: ':'
-   [ ';',  11,   0, ';'   ],   #  14: ';'
-   [ '<',  10,  56, '<'   ],   #  15: '<'
-   [ '=',   9,  63, '='   ],   #  16: '='
-   [ '>',   8,  65, '>'   ],   #  17: '>'
-   [ '?',   7,   0, '?'   ],   #  18: '?'
-   [ '[',   6,  70, '['   ],   #  19: '['
-   [ ']',   5,   0, ']'   ],   #  20: ']'
-   [ '^',   4,  71, '^'   ],   #  21: '^'
-   [ '{',   3,   0, '{'   ],   #  22: '{'
-   [ '|',   2,  72, '|'   ],   #  23: '|'
-   [ '}',   1,   0, '}'   ],   #  24: '}'
-   [ '~',   0,  74, '~'   ],   #  25: '~'
-   [ '<',   3,  30, '!<'  ],   #  26: '!<'
-   [ '=',   2,  33, '!='  ],   #  27: '!='
-   [ '>',   1,  34, '!>'  ],   #  28: '!>'
-   [ '~',   0,   0, '!~'  ],   #  29: '!~'
-   [ '=',   1,   0, '!<=' ],   #  30: '!<='
-   [ '>',   0,  32, '!<>' ],   #  31: '!<>'
-   [ '=',   0,   0, '!<>='],   #  32: '!<>='
-   [ '=',   0,   0, '!==' ],   #  33: '!=='
-   [ '=',   0,   0, '!>=' ],   #  34: '!>='
-   [ '#',   0,   0, '##'  ],   #  35: '##'
-   [ ':',   2,  39, '%:'  ],   #  36: '%:'
-   [ '=',   1,   0, '%='  ],   #  37: '%='
-   [ '>',   0,   0, '%>'  ],   #  38: '%>'
-   [ '%',   0,  40, None  ],   #  39: '%:%'
-   [ ':',   0,   0, '%:%:'],   #  40: '%:%:'
-   [ '&',   1,   0, '&&'  ],   #  41: '&&'
-   [ '=',   0,   0, '&='  ],   #  42: '&='
-   [ '=',   0,   0, '*='  ],   #  43: '*='
-   [ '+',   1,   0, '++'  ],   #  44: '++'
-   [ '=',   0,   0, '+='  ],   #  45: '+='
-   [ '-',   2,   0, '--'  ],   #  46: '--'
-   [ '=',   1,   0, '-='  ],   #  47: '-='
-   [ '>',   0,  49, '->'  ],   #  48: '->'
-   [ '*',   0,   0, '->*' ],   #  49: '->*'
-   [ '*',   1,   0, '.*'  ],   #  50: '.*'
-   [ '.',   0,  52, '..'  ],   #  51: '..'
-   [ '.',   0,   0, '...' ],   #  52: '...'
-   [ '=',   0,   0, '/='  ],   #  53: '/='
-   [ ':',   1,   0, '::'  ],   #  54: '::'
-   [ '>',   0,   0, ':>'  ],   #  55: ':>'
-   [ '%',   4,   0, '<%'  ],   #  56: '<%'
-   [ ':',   3,   0, '<:'  ],   #  57: '<:'
-   [ '<',   2,  61, '<<'  ],   #  58: '<<'
-   [ '=',   1,   0, '<='  ],   #  59: '<='
-   [ '>',   0,  62, '<>'  ],   #  60: '<>'
-   [ '=',   0,   0, '<<=' ],   #  61: '<<='
-   [ '=',   0,   0, '<>=' ],   #  62: '<>='
-   [ '=',   0,  64, '=='  ],   #  63: '=='
-   [ '=',   0,   0, '===' ],   #  64: '==='
-   [ '=',   1,   0, '>='  ],   #  65: '>='
-   [ '>',   0,  67, '>>'  ],   #  66: '>>'
-   [ '=',   1,   0, '>>=' ],   #  67: '>>='
-   [ '>',   0,  69, '>>>' ],   #  68: '>>>'
-   [ '=',   0,   0, '>>>='],   #  69: '>>>='
-   [ ']',   0,   0, '[]'  ],   #  70: '[]'
-   [ '=',   0,   0, '^='  ],   #  71: '^='
-   [ '=',   1,   0, '|='  ],   #  72: '|='
-   [ '|',   0,   0, '||'  ],   #  73: '||'
-   [ '=',   1,   0, '~='  ],   #  74: '~='
-   [ '~',   0,   0, '~~'  ],   #  75: '~~'
-]
-
-
-#
-# Token types:
-#  0 = newline
-#  1 = punctuator
-#  2 = integer
-#  3 = float
-#  4 = string
-#  5 = identifier
-#
-class Tokenizer:
-    def __init__(self):
-        self.tokens = []
-        self.text = ''
-        self.text_idx = 0
-
-    def tokenize_text(self, in_text):
-        self.tokens = []
-        self.text = in_text
-        self.text_idx = 0
-
-        print(in_text)
-        try:
-            while self.text_idx < len(self.text):
-                if self.parse_whitespace():
-                    continue
-                elif self.text[self.text_idx] == '\\' and self.text[self.text_idx + 1] == '\n':
-                    self.text_idx += 2
-                    continue
-                elif self.parse_comment():
-                    continue
-                elif self.parse_number():
-                    continue
-                elif self.parse_identifier():
-                    continue
-                elif self.parse_string():
-                    continue
-                elif self.parse_punctuator():
-                    continue
-                else:
-                    print("confused: %s" % self.text[self.text_idx:])
-                    break
-        except:
-            print("bombed")
-            raise
-
-    def parse_whitespace(self):
-        start_idx = self.text_idx
-        hit_newline = False
-        while self.text_idx < len(self.text):
-            if self.text[self.text_idx] in '\n\r':
-                hit_newline = True
-            elif not self.text[self.text_idx] in ' \t':
-                break
-            self.text_idx += 1
-
-        if hit_newline:
-            self.tokens.append(('\n', 0))
-        return start_idx != self.text_idx
-
-    def parse_comment(self):
-        if not self.text[self.text_idx] == '/' or not self.text[self.text_idx + 1] in '/*':
-            return False
-        if self.text[self.text_idx + 1] == '/':
-            while self.text_idx < len(self.text):
-                if self.text[self.text_idx] in '\n\r':
-                    break
-                self.text_idx += 1
-        else:
-            while self.text_idx < len(self.text) - 1:
-                if self.text[self.text_idx] == '*' and self.text[self.text_idx + 1] == '/':
-                    self.text_idx += 2
-                    break
-                self.text_idx += 1
-        return True
-
-    def parse_identifier(self):
-        if not self.text[self.text_idx].upper() in '@_ABCDEFGHIJKLMNOPQRSTUVWXYZ':
-            return False
-        start_idx = self.text_idx
-        while self.text_idx < len(self.text) and \
-                self.text[self.text_idx].upper() in '@_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890':
-            self.text_idx += 1
-        self.tokens.append((self.text[start_idx : self.text_idx], 5))
-        return True
-
-    def parse_string(self):
-        starter = 0
-        start_ch = self.text[self.text_idx]
-        if start_ch == 'L':
-            starter = 1
-            start_ch = self.text[self.text_idx + 1]
-        if not start_ch in '"\'':
-            return False
-        start_idx = self.text_idx
-        self.text_idx += starter + 1
-        escaped = False
-        while self.text_idx < len(self.text):
-            if escaped:
-                escaped = False
-            else:
-                if self.text[self.text_idx] == '\\':
-                    escaped = True
-                elif self.text[self.text_idx] == start_ch:
-                    self.text_idx += 1
-                    break
-            self.text_idx += 1
-
-        self.tokens.append((self.text[start_idx : self.text_idx], 4))
-        return True
-
-    # Checks for punctuators
-    # Returns whether a punctuator was consumed (True or False)
-    def parse_punctuator(self):
-        tab_idx = 0
-        punc_len = 0
-        saved_punc = None
-        while 1:
-            pte = punc_table[tab_idx]
-            if pte[0] == self.text[self.text_idx]:
-                if pte[3] is not None:
-                    saved_punc = pte[3]
-                self.text_idx += 1
-                tab_idx = pte[2]
-                if tab_idx == 0:
-                    break
-            elif pte[1] == 0:
-                break
-            else:
-                tab_idx += 1
-        if saved_punc is not None:
-            self.tokens.append((saved_punc, 1))
-            return True
-        return False
-
-    def parse_number(self):
-        # A number must start with a digit or a dot followed by a digit
-        ch = self.text[self.text_idx]
-        if not ch.isdigit() and (ch != '.' or not self.text[self.text_idx + 1].isdigit()):
-            return False
-        token_type = 2 # integer
-        if ch == '.':
-            token_type = 3 # float
-        did_hex = False
-        start_idx = self.text_idx
-
-        # Check for Hex, Octal, or Binary
-        # Note that only D and Pawn support binary, but who cares?
-        #
-        if ch == '0':
-            self.text_idx += 1
-            ch = self.text[self.text_idx].upper()
-            if ch == 'X':                # hex
-                did_hex = True
-                self.text_idx += 1
-                while self.text[self.text_idx] in '_0123456789abcdefABCDEF':
-                    self.text_idx += 1
-            elif ch == 'B':              # binary
-                self.text_idx += 1
-                while self.text[self.text_idx] in '_01':
-                    self.text_idx += 1
-            elif ch >= '0' and ch <= 7:  # octal (but allow decimal)
-                self.text_idx += 1
-                while self.text[self.text_idx] in '_0123456789':
-                    self.text_idx += 1
-            else:
-                # either just 0 or 0.1 or 0UL, etc
-                pass
-        else:
-            # Regular int or float
-            while self.text[self.text_idx] in '_0123456789':
-                self.text_idx += 1
-
-        # Check if we stopped on a decimal point
-        if self.text[self.text_idx] == '.':
-            self.text_idx += 1
-            token_type = 3 # float
-            if did_hex:
-                while self.text[self.text_idx] in '_0123456789abcdefABCDEF':
-                    self.text_idx += 1
-            else:
-                while self.text[self.text_idx] in '_0123456789':
-                    self.text_idx += 1
-
-        # Check exponent
-        # Valid exponents per language (not that it matters):
-        # C/C++/D/Java: eEpP
-        # C#/Pawn:      eE
-        if self.text[self.text_idx] in 'eEpP':
-            token_type = 3 # float
-            self.text_idx += 1
-            if self.text[self.text_idx] in '+-':
-                self.text_idx += 1
-            while self.text[self.text_idx] in '_0123456789':
-                self.text_idx += 1
-
-        # Check the suffixes
-        # Valid suffixes per language (not that it matters):
-        #        Integer       Float
-        # C/C++: uUlL          lLfF
-        # C#:    uUlL          fFdDMm
-        # D:     uUL           ifFL
-        # Java:  lL            fFdD
-        # Pawn:  (none)        (none)
-        #
-        # Note that i, f, d, and m only appear in floats.
-        while 1:
-            if self.text[self.text_idx] in 'tTfFdDmM':
-                token_type = 3 # float
-            elif not self.text[self.text_idx] in 'lLuU':
-                break
-            self.text_idx += 1
-
-        self.tokens.append((self.text[start_idx : self.text_idx], token_type))
-        return True
-
-text = """
-1.23+4-3*16%2 *sin(1.e-3 + .5p32) "hello" and "hello\\"there"
-123 // some comment
-a = b + c;
-#define abc \\
-        5
-d = 5 /* hello */ + 3;
-"""
-
-t = Tokenizer()
-t.tokenize_text(text)
-print(t.tokens)
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/update_emscripten_bindings.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/update_emscripten_bindings.py
deleted file mode 100644
index d44a58a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/update_emscripten_bindings.py
+++ /dev/null
@@ -1,316 +0,0 @@
-#!/bin/python
-from __future__ import print_function  # python >= 2.6, chained 'with' >= 2.7
-
-from os.path import dirname, abspath
-from os import fdopen as os_fdopen, remove as os_remove, name as os_name
-from shutil import copy2
-from subprocess import Popen, PIPE
-from sys import exit as sys_exit, stderr
-from tempfile import mkstemp
-from contextlib import contextmanager
-from threading import Timer
-import re
-
-
-ROOT_DIR = dirname(dirname(abspath(__file__)))
-
-# ==============================================================================
-
-FILE_BINDINGS = "%s/src/uncrustify_emscripten.cpp" % ROOT_DIR
-FILE_TS = "%s/emscripten/libUncrustify.d.ts" % ROOT_DIR
-
-REGION_START = "region enum bindings"
-REGION_END = "endregion enum bindings"
-
-''' Enums which values need to be updated in the binding code '''
-ENUMS_INFO = [
-    {
-        'name': 'option_type_e',
-        'substitute_name': 'OptionType',
-        'filepath': '%s/src/option.h' % ROOT_DIR,
-        'extra_arg': [],
-        'filter_values': [],
-        'suffix_chars': 0,
-    },
-    {
-        'name': 'iarf_e',
-        'substitute_name': 'IARF',
-        'filepath': '%s/src/option.h' % ROOT_DIR,
-        'extra_arg': [],
-        'filter_values': ['NOT_DEFINED'],
-        'suffix_chars': 0,
-    },
-    {
-        'name': 'line_end_e',
-        'substitute_name': 'LineEnd',
-        'filepath': '%s/src/option.h' % ROOT_DIR,
-        'extra_arg': [],
-        'filter_values': [],
-        'suffix_chars': 0,
-    },
-    {
-        'name': 'token_pos_e',
-        'substitute_name': 'TokenPos',
-        'filepath': '%s/src/option.h' % ROOT_DIR,
-        'extra_arg': [],
-        'filter_values': [],
-        'suffix_chars': 0,
-    },
-    {
-        'name': 'log_sev_t',
-        'substitute_name': 'LogType',
-        'filepath': '%s/src/log_levels.h' % ROOT_DIR,
-        'extra_arg': [],
-        'filter_values': [],
-        'suffix_chars': 1,
-    },
-    {
-        'name': 'c_token_t',
-        'substitute_name': 'TokenType',
-        'filepath': '%s/src/token_enum.h' % ROOT_DIR,
-        'extra_arg': [],
-        'filter_values': ['CT_TOKEN_COUNT_'],
-        'suffix_chars': 3,
-    },
-    {
-        'name': 'lang_flag_e',
-        'substitute_name': 'Language',
-        'filepath': '%s/src/uncrustify_types.h' % ROOT_DIR,
-        'extra_arg': ["-extra-arg=-std=c++1z", "-extra-arg=-DEMSCRIPTEN"],
-        'filter_values': [
-            'LANG_ALLC',
-            'LANG_ALL',
-            'FLAG_HDR',
-            'FLAG_DIG',
-            'FLAG_PP',
-        ],
-        'suffix_chars': 5,
-    },
-]
-
-# ==============================================================================
-
-NULL_DEV = "/dev/null" if os_name != "nt" else "nul"
-
-
-@contextmanager
-def make_raw_temp_file(*args, **kwargs):
-    fd, tmp_file_name = mkstemp(*args, **kwargs)
-    try:
-        yield (fd, tmp_file_name)
-    finally:
-        os_remove(tmp_file_name)
-
-
-@contextmanager
-def open_fd(*args, **kwargs):
-    fp = os_fdopen(*args, **kwargs)
-    try:
-        yield fp
-    finally:
-        fp.close()
-
-
-def term_proc(proc, timeout):
-    """
-    helper function terminate a process if a timer times out
-
-    :param proc: the process object that is going to be terminated
-    :param timeout: value that will be set to indicate termination
-    """
-    timeout["value"] = True
-    proc.terminate()
-
-
-def proc_output(args, timeout_sec=10):
-    """
-    grabs output from called program
-    :param args: string array containing program name and program arguments
-    :param timeout_sec: max sec the program can run without being terminated
-    :return: utf8 decoded program output in a string
-    """
-    proc = Popen(args, stdout=PIPE)
-
-    timeout = {"value": False}
-    if timeout_sec is not None:
-        timeout = {"value": False}
-        timer = Timer(timeout_sec, term_proc, [proc, timeout])
-        timer.start()
-
-    output_b, error_txt_b = proc.communicate()
-
-    if timeout_sec is not None:
-        timer.cancel()
-
-    output = output_b.decode("UTF-8")
-
-    if timeout["value"]:
-        print("proc timeout: %s" % ' '.join(args), file=stderr)
-
-    return output if not timeout["value"] else None
-
-
-def get_enum_lines(enum_info):
-    """
-    extracts enum values from a file via clang-check
-
-    :param enum_info: dict with:
-                        'name' (name of the enum),
-                        'filepath' (file containing the enum definition),
-                        'extra_arg' (extra arguments passed to clang-check)
-    :return: list containing enum values
-    """
-    cut_len = len(enum_info['name'])
-
-    proc_args = ["clang-check", enum_info['filepath'], "-ast-dump",
-                 '-ast-dump-filter=%s' % enum_info['name']]
-    proc_args += enum_info['extra_arg']
-
-    output = proc_output(proc_args)
-    if output is None or len(output) == 0:
-        print("ScriptError: %s - empty clang-check return" % get_enum_lines.__name__,
-              file=stderr)
-        return ()
-
-    reg_obj = re.compile("EnumConstantDecl.+col:\d+ (referenced )?(\w+)")
-
-    lines = [m.group(2) for l in output.splitlines()
-             for m in [re.search(reg_obj, l)] if m]
-    lines = [line for line in lines if line not in enum_info['filter_values']]
-
-    if len(lines) == 0:
-        print("ScriptError: %s - no enum_info names found" % get_enum_lines.__name__,
-              file=stderr)
-        return ()
-    return lines
-
-
-def write_ts(opened_file_obj, enum_info):
-    """
-    writes enum values in a specific typescript d.ts file format
-
-    :param opened_file_obj: opened file file object (with write permissions)
-    :param enum_info: dict with:
-                        'name' (name of the enum),
-                        'substitute_name' (substitute name for the enum),
-                        'filepath' (file containing the enum definition),
-                        'extra_arg' (extra arguments passed to clang-check)
-    :return: False on failure else True
-    """
-    lines = get_enum_lines(enum_info)
-    if len(lines) == 0:
-        return False
-
-    opened_file_obj.write(
-        '    export interface %sValue extends EmscriptenEnumTypeObject {}\n'
-        '    export interface %s extends EmscriptenEnumType\n'
-        '    {\n'
-        % (enum_info['substitute_name'], enum_info['substitute_name'])
-    )
-    for line in lines:
-        opened_file_obj.write(
-            '        %s : %sValue;\n'
-            % (line[enum_info['suffix_chars']:], enum_info['substitute_name'])
-        )
-    opened_file_obj.write(
-        '    }\n\n'
-    )
-    return True
-
-
-def write_bindings(opened_file_obj, enum_info):
-    """
-    writes enum values in a specific emscripten embind enum bindings format
-
-    :param opened_file_obj: opened file file object (with write permissions)
-    :param enum_info: dict with:
-                        'name' (name of the enum),
-                        'filepath' (file containing the enum definition),
-                        'extra_arg' (extra arguments passed to clang-check)
-    :return: False on failure else True
-    """
-    lines = get_enum_lines(enum_info)
-    if len(lines) == 0:
-        return False
-
-    opened_file_obj.write(
-        '   enum_<%s>("%s")' % (enum_info['name'], enum_info['substitute_name'])
-    )
-    for line in lines:
-        opened_file_obj.write(
-            '\n      .value("%s", %s::%s)'
-            % (line[enum_info['suffix_chars']:], enum_info['name'], line)
-        )
-    opened_file_obj.write(
-        ';\n\n'
-    )
-    return True
-
-
-def update_file(file_path, writer_func, enums_info):
-    """
-    reads in a file and replaces old enum value in a region, which is defined by
-    region start and end string, with updated ones
-
-    :param file_path: file in which the replacement will be made
-    :param writer_func: name of the function that will be called to write new
-                        content
-    :param enums_info:list of dicts each containing:
-                    'name' (name of the enum),
-                    'substitute_name' (substitute name for the enum),
-                    'filepath' (file containing the enum definition),
-                    'extra_arg' (extra arguments passed to clang-check)
-    :return: False on failure else True
-    """
-    in_target_region = False
-
-    reg_obj_start = re.compile(".*%s$" % REGION_START)
-    reg_obj_end = re.compile(".*%s$" % REGION_END)
-    reg_obj = reg_obj_start
-
-    with make_raw_temp_file(suffix='.unc') as (fd, tmp_file_path):
-        with open(file_path, 'r') as fr, open_fd(fd, 'w') as fw:
-            for line in fr:
-                match = None if reg_obj is None else re.search(reg_obj, line)
-
-                if match is None and not in_target_region:
-                    fw.write(line)                # write out of region code
-
-                elif match is not None and not in_target_region:
-                    fw.write(line)                # hit the start region
-
-                    in_target_region = True
-                    reg_obj = reg_obj_end
-
-                    for enum in enums_info:
-                        succes_flag = writer_func(fw, enum)
-                        if not succes_flag:       # abort, keep input file clean
-                            return False
-
-                elif match is None and in_target_region:
-                    pass                          # ignore old binding code
-
-                elif match and in_target_region:  # hit the endregion
-                    fw.write(line)
-
-                    in_target_region = False
-                    reg_obj = None
-
-        copy2(tmp_file_path, file_path)           # overwrite input file
-        return True
-
-
-def main():
-    flag = update_file(FILE_BINDINGS, write_bindings, ENUMS_INFO)
-    if not flag:
-        return 1
-
-    flag = update_file(FILE_TS, write_ts, ENUMS_INFO)
-    if not flag:
-        return 1
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys_exit(main())
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/.kateconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/.kateconfig
deleted file mode 100644
index 4d9024f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/.kateconfig
+++ /dev/null
@@ -1 +0,0 @@
-kate: indent-width 3;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.cpp
deleted file mode 100644
index c04c6e5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * @file ChunkStack.cpp
- * Manages a chunk stack
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "ChunkStack.h"
-
-
-void ChunkStack::Set(const ChunkStack &cs)
-{
-   m_cse.resize(cs.m_cse.size());
-
-   for (size_t idx = 0; idx < m_cse.size(); idx++)
-   {
-      m_cse[idx].m_pc     = cs.m_cse[idx].m_pc;
-      m_cse[idx].m_seqnum = cs.m_cse[idx].m_seqnum;
-   }
-
-   m_seqnum = cs.m_seqnum;
-}
-
-
-const ChunkStack::Entry *ChunkStack::Top() const
-{
-   if (!m_cse.empty())
-   {
-      return(&m_cse[m_cse.size() - 1]);
-   }
-   return(nullptr);
-}
-
-
-const ChunkStack::Entry *ChunkStack::Get(size_t idx) const
-{
-   if (idx < m_cse.size())
-   {
-      return(&m_cse[idx]);
-   }
-   return(nullptr);
-}
-
-
-chunk_t *ChunkStack::GetChunk(size_t idx) const
-{
-   if (idx < m_cse.size())
-   {
-      return(m_cse[idx].m_pc);
-   }
-   return(nullptr);
-}
-
-
-chunk_t *ChunkStack::Pop_Front()
-{
-   chunk_t *pc = nullptr;
-
-   if (!m_cse.empty())
-   {
-      pc = m_cse[0].m_pc;
-      m_cse.pop_front();
-   }
-   return(pc);
-}
-
-
-chunk_t *ChunkStack::Pop_Back()
-{
-   chunk_t *pc = nullptr;
-
-   if (!m_cse.empty())
-   {
-      pc = m_cse[m_cse.size() - 1].m_pc;
-      m_cse.pop_back();
-   }
-   return(pc);
-}
-
-
-void ChunkStack::Push_Back(chunk_t *pc, size_t seqnum)
-{
-   m_cse.push_back(Entry(seqnum, pc));
-
-   if (m_seqnum < seqnum)
-   {
-      m_seqnum = seqnum;
-   }
-}
-
-
-void ChunkStack::Zap(size_t idx)
-{
-   if (idx < m_cse.size())
-   {
-      m_cse[idx].m_pc = nullptr;
-   }
-}
-
-
-void ChunkStack::Collapse()
-{
-   size_t wr_idx = 0;
-
-   for (size_t rd_idx = 0; rd_idx < m_cse.size(); rd_idx++)
-   {
-      if (m_cse[rd_idx].m_pc != nullptr)
-      {
-         if (rd_idx != wr_idx)
-         {
-            m_cse[wr_idx].m_pc     = m_cse[rd_idx].m_pc;
-            m_cse[wr_idx].m_seqnum = m_cse[rd_idx].m_seqnum;
-         }
-         wr_idx++;
-      }
-   }
-
-   m_cse.resize(wr_idx);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.h
deleted file mode 100644
index 8434d895..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * @file ChunkStack.h
- * Manages a simple stack of chunks
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef CHUNKSTACK_H_INCLUDED
-#define CHUNKSTACK_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-class ChunkStack
-{
-public:
-   struct Entry
-   {
-      Entry()
-         : m_seqnum(0)
-         , m_pc(0)
-      {
-      }
-
-
-      Entry(const Entry &ref)
-         : m_seqnum(ref.m_seqnum)
-         , m_pc(ref.m_pc)
-      {
-      }
-
-
-      Entry(size_t sn, chunk_t *pc)
-         : m_seqnum(sn)
-         , m_pc(pc)
-      {
-      }
-
-
-      size_t  m_seqnum;
-      chunk_t *m_pc;
-   };
-
-protected:
-   std::deque<Entry> m_cse;
-   size_t            m_seqnum; //! current sequence number
-
-public:
-   ChunkStack()
-      : m_seqnum(0)
-   {
-   }
-
-
-   ChunkStack(const ChunkStack &cs)
-   {
-      Set(cs);
-   }
-
-
-   virtual ~ChunkStack()
-   {
-   }
-
-
-   void Set(const ChunkStack &cs);
-
-
-   void Push_Back(chunk_t *pc)
-   {
-      Push_Back(pc, ++m_seqnum);
-   }
-
-
-   bool Empty() const
-   {
-      return(m_cse.empty());
-   }
-
-
-   size_t Len() const
-   {
-      return(m_cse.size());
-   }
-
-
-   const Entry *Top() const;
-
-
-   const Entry *Get(size_t idx) const;
-
-
-   chunk_t *GetChunk(size_t idx) const;
-
-
-   chunk_t *Pop_Back();
-
-
-   void Push_Back(chunk_t *pc, size_t seqnum);
-
-
-   chunk_t *Pop_Front();
-
-
-   void Reset()
-   {
-      m_cse.clear();
-   }
-
-
-   /**
-    * Mark an entry to be removed by Collapse()
-    *
-    * @param idx  The item to remove
-    */
-   void Zap(size_t idx);
-
-
-   //! Compresses down the stack by removing dead entries
-   void Collapse();
-};
-
-
-#endif /* CHUNKSTACK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.cpp
deleted file mode 100644
index 48e1911d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.cpp
+++ /dev/null
@@ -1,2858 +0,0 @@
-/**
- * @file EnumStructUnionParser.cpp
- *
- * @author
- * @license GPL v2+
- */
-
-#include "EnumStructUnionParser.h"
-
-#include "combine_fix_mark.h"
-#include "combine_skip.h"
-#include "combine_tools.h"
-#include "flag_parens.h"
-#include "lang_pawn.h"
-
-
-/**
- * Extern declarations
- */
-extern const char *get_token_name(c_token_t);
-extern void log_pcf_flags(log_sev_t, pcf_flags_t);
-
-
-/**
- * Forward declarations
- */
-static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *, std::size_t);
-static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *, std::size_t);
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *);
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers_rev(chunk_t *);
-
-
-/**
- * Returns true if two adjacent chunks potentially match a pattern consistent
- * with that of a qualified identifier
- */
-static bool adj_tokens_match_qualified_identifier_pattern(chunk_t *prev, chunk_t *next)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  prev != nullptr
-      && next != nullptr)
-   {
-      auto prev_token_type = prev->type;
-      auto next_token_type = next->type;
-
-      switch (prev_token_type)
-      {
-      case CT_ANGLE_CLOSE:
-         /**
-          * assuming the previous token is possibly the closing angle of a
-          * templated type, the next token may be a scope resolution operator ("::")
-          */
-         return(next_token_type == CT_DC_MEMBER);
-
-      case CT_ANGLE_OPEN:
-         /**
-          * assuming the previous token is possibly the opening angle of a
-          * templated type, just check to see if there's a matching closing
-          * angle
-          */
-         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
-
-      case CT_DC_MEMBER:
-         /**
-          * if the previous token is a double colon ("::"), it is likely part
-          * of a chain of scope-resolution qualifications preceding a word or
-          * type
-          */
-         return(  next_token_type == CT_TYPE
-               || next_token_type == CT_WORD);
-
-      case CT_TYPE:
-      case CT_WORD:
-         /**
-          * if the previous token is an identifier, the next token may be
-          * one of the following:
-          * - an opening angle, which may indicate a templated type as part of a
-          *   scope resolution preceding the actual variable identifier
-          * - a double colon ("::")
-          */
-         return(  next_token_type == CT_ANGLE_OPEN
-               || next_token_type == CT_DC_MEMBER);
-
-      default:
-         // do nothing
-         break;
-      } // switch
-   }
-   return(false);
-} // adj_tokens_match_qualified_identifier_pattern
-
-
-/**
- * Returns true if two adjacent chunks potentially match a pattern consistent
- * with that of a variable definition
- */
-static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *next)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  prev != nullptr
-      && next != nullptr)
-   {
-      auto prev_token_type = prev->type;
-      auto next_token_type = next->type;
-
-      switch (prev_token_type)
-      {
-      case CT_ANGLE_CLOSE:
-         /**
-          * assuming the previous token is possibly the closing angle of a
-          * templated type, the next token may be one of the following:
-          * - a pointer symbol ('*', '^')
-          * - a double colon ("::")
-          * - a reference symbol ('&')
-          * - a qualifier (const, etc.)
-          * - an identifier
-          */
-         return(  chunk_is_pointer_or_reference(next)
-               || next_token_type == CT_DC_MEMBER
-               || next_token_type == CT_QUALIFIER
-               || next_token_type == CT_WORD);
-
-
-      case CT_ANGLE_OPEN:
-         /**
-          * assuming the previous token is possibly the opening angle of a
-          * templated type, just check to see if there's a matching closing
-          * angle
-          */
-         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
-
-      case CT_BRACE_CLOSE:
-         /**
-          * assuming the previous token is possibly the closing brace of a
-          * class/enum/struct/union definition, one or more inline variable
-          * definitions may follow; in that case, the next token may be one of
-          * the following:
-          * - a pointer symbol ('*', '^')
-          * - a reference symbol ('&')
-          * - a qualifier (const, etc.)
-          * - an identifier
-          */
-         return(  chunk_is_pointer_or_reference(next)
-               || next_token_type == CT_QUALIFIER
-               || next_token_type == CT_WORD);
-
-      case CT_BRACE_OPEN:
-         /**
-          * if the previous token is an opening brace, it may indicate the
-          * start of a braced initializer list - skip ahead to find a matching
-          * closing brace
-          */
-         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
-
-      case CT_BYREF:
-         /**
-          * if the previous token is a reference symbol ('&'), the next token
-          * may be an identifier
-          */
-         return(next_token_type == CT_WORD);
-
-      case CT_CARET:
-         /**
-          * if the previous token is a managed C++/CLI pointer symbol ('^'),
-          * the next token may be one of the following:
-          * - a pointer symbol ('*', '^')
-          * - a reference symbol ('&')
-          * - a qualifier (const, etc.)
-          * - an identifier
-          */
-         return(  language_is_set(LANG_CPP)
-               && (  chunk_is_pointer_or_reference(next)
-                  || next_token_type == CT_QUALIFIER
-                  || next_token_type == CT_WORD));
-
-      case CT_COMMA:
-         /**
-          * if the previous token is a comma, this may indicate a variable
-          * declaration trailing a prior declaration; in that case, the next
-          * token may be one of the following:
-          * - a pointer symbol ('*', '^')
-          * - a reference symbol ('&')
-          * - an identifier
-          */
-         return(  chunk_is_pointer_or_reference(next)
-               || next_token_type == CT_WORD);
-
-      case CT_DC_MEMBER:
-         /**
-          * if the previous token is a double colon ("::"), it is likely part
-          * of a chain of scope-resolution qualifications preceding a word or
-          * type
-          */
-         return(  next_token_type == CT_TYPE
-               || next_token_type == CT_WORD);
-
-      case CT_PAREN_OPEN:
-         /**
-          * if the previous token is an opening paren, it may indicate the
-          * start of a constructor call parameter list - skip ahead to find a
-          * matching closing paren
-          */
-         next = chunk_skip_to_match(prev, scope_e::PREPROC);
-
-         if (next != nullptr)
-         {
-            next_token_type = next->type;
-         }
-         return(next_token_type == CT_PAREN_CLOSE);
-
-      case CT_PTR_TYPE:
-         /**
-          * if the previous token is a pointer type, ('*', '^'), the next token
-          * may be one of the following:
-          * - another pointer symbol ('*', '^')
-          * - a reference symbol ('&')
-          * - a qualifier (const, etc.)
-          * - an identifier
-          */
-         return(  chunk_is_pointer_or_reference(next)
-               || next_token_type == CT_QUALIFIER
-               || next_token_type == CT_WORD);
-
-      case CT_QUALIFIER:
-         /**
-          * if the previous token is a qualifier (const, etc.), the next token
-          * may be one of the following:
-          * - a pointer symbol ('*', '^')
-          * - a reference symbol ('&')
-          * - another qualifier
-          * - an identifier
-          */
-         return(  chunk_is_pointer_or_reference(next)
-               || next_token_type == CT_QUALIFIER
-               || next_token_type == CT_WORD);
-
-      case CT_SQUARE_CLOSE:
-         /**
-          * if the previous token is a closing bracket, the next token may be
-          * an assignment following an array variable declaration
-          */
-         return(next_token_type == CT_ASSIGN);
-
-      case CT_SQUARE_OPEN:
-         /**
-          * if the previous token is an opening bracket, it may indicate an
-          * array declaration - skip ahead to find a matching closing bracket
-          */
-         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
-
-      case CT_STAR:
-         /**
-          * if the previous token is a pointer symbol, ('*'), the next token
-          * may be one of the following:
-          * - another pointer symbol ('*', '^')
-          * - a reference symbol ('&')
-          * - a qualifier (const, etc.)
-          * - an identifier
-          */
-         return(  chunk_is_pointer_or_reference(next)
-               || next_token_type == CT_QUALIFIER
-               || next_token_type == CT_WORD);
-
-      case CT_TSQUARE:
-         /**
-          * if the previous token is a set of brackets, the next token may be
-          * an assignment following an array variable declaration
-          */
-         return(next_token_type == CT_ASSIGN);
-
-      case CT_TYPE:
-         /**
-          * if the previous token is marked as a type, the next token may be
-          * one of the following:
-          * - a pointer symbol ('*', '^')
-          * - a reference symbol ('&')
-          * - an opening angle, which may indicate a templated type as part of a
-          *   scope resolution preceding the actual variable identifier
-          * - a double colon ("::")
-          * - a qualifier (const, etc.)
-          * - an identifier
-          */
-         return(  chunk_is_pointer_or_reference(next)
-               || next_token_type == CT_ANGLE_OPEN
-               || next_token_type == CT_DC_MEMBER
-               || next_token_type == CT_QUALIFIER
-               || next_token_type == CT_WORD);
-
-      case CT_WORD:
-         /**
-          * if the previous token is an identifier, the next token may be one
-          * of the following:
-          * - an assignment symbol ('=')
-          * - an opening angle, which may indicate a templated type as part of a
-          *   scope resolution preceding the actual variable identifier
-          * - an opening brace, which may indicate a braced-initializer list
-          * - a double colon ("::")
-          * - an opening paren, which may indicate a constructor call parameter
-          *   list
-          * - an opening square bracket, which may indicate an array variable
-          * - an set of empty square brackets, which also may indicate an array
-          *   variable
-          */
-         return(  next_token_type == CT_ANGLE_OPEN
-               || next_token_type == CT_ASSIGN
-               || next_token_type == CT_BRACE_OPEN
-               || next_token_type == CT_DC_MEMBER
-               || next_token_type == CT_PAREN_OPEN
-               || next_token_type == CT_SQUARE_OPEN
-               || next_token_type == CT_TSQUARE);
-
-      default:
-         // do nothing
-         break;
-      } // switch
-   }
-   return(false);
-} // adj_tokens_match_var_def_pattern
-
-
-/**
- * Returns true if the first chunk occurs AFTER the second chunk in the argument
- * list
- * @param pc         points to the first chunk
- * @param after      points to the second chunk
- * @param test_equal if true, returns true when both chunks refer to the same chunk
- */
-static bool chunk_is_after(chunk_t *pc, chunk_t *after, bool test_equal = true)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc != nullptr)
-   {
-      if (  test_equal
-         && pc == after)
-      {
-         return(true);
-      }
-      else if (after != nullptr)
-      {
-         auto pc_column    = pc->orig_col;
-         auto pc_line      = pc->orig_line;
-         auto after_column = after->orig_col;
-         auto after_line   = after->orig_line;
-
-         return(  pc_line > after_line
-               || (  pc_line == after_line
-                  && pc_column > after_column));
-      }
-   }
-   return(false);
-} // chunk_is_after
-
-
-/**
- * Returns true if the first chunk occurs BEFORE the second chunk in the argument
- * list
- * @param pc         points to the first chunk
- * @param before     points to the second chunk
- * @param test_equal if true, returns true when both chunks refer to the same chunk
- */
-static bool chunk_is_before(chunk_t *pc, chunk_t *before, bool test_equal = true)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc != nullptr)
-   {
-      if (  test_equal
-         && pc == before)
-      {
-         return(true);
-      }
-      else if (before != nullptr)
-      {
-         auto pc_column     = pc->orig_col;
-         auto pc_line       = pc->orig_line;
-         auto before_column = before->orig_col;
-         auto before_line   = before->orig_line;
-
-         return(  pc_line < before_line
-               || (  pc_line == before_line
-                  && pc_column < before_column));
-      }
-   }
-   return(false);
-} // chunk_is_before
-
-
-/**
- * Returns true if the first chunk occurs both AFTER and BEFORE
- * the second and third chunks, respectively, in the argument list
- * @param pc         points to the first chunk
- * @param after      points to the second chunk
- * @param before     points to the third chunk
- * @param test_equal if true, returns true when the first chunk tests equal to
- *                   either the second or third chunk
- */
-static bool chunk_is_between(chunk_t *pc, chunk_t *after, chunk_t *before, bool test_equal = true)
-{
-   LOG_FUNC_ENTRY();
-
-   return(  chunk_is_before(pc, before, test_equal)
-         && chunk_is_after(pc, after, test_equal));
-} // chunk_is_between
-
-
-/**
- * Returns true if the chunk under test is a reference to a macro defined elsewhere in
- * the source file currently being processed. Note that a macro may be defined in
- * another source or header file, for which this function does not currently account
- */
-static bool chunk_is_macro_reference(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   auto *next = chunk_get_head();
-
-   if (  (  language_is_set(LANG_CPP)
-         || language_is_set(LANG_C))
-      && chunk_is_token(pc, CT_WORD)
-      && !pc->flags.test(PCF_IN_PREPROC))
-   {
-      while (next != nullptr)
-      {
-         if (  next->flags.test(PCF_IN_PREPROC)
-            && std::strcmp(pc->str.c_str(), next->str.c_str()) == 0)
-         {
-            return(true);
-         }
-         next = chunk_search_next_cat(next, CT_MACRO);
-      }
-   }
-   return(false);
-} // chunk_is_macro_reference
-
-
-/**
- * Returns true if the input chunk is a pointer/reference operator or a
- * qualifier
- */
-static bool chunk_is_pointer_reference_or_qualifier(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   return(  chunk_is_pointer_or_reference(pc)
-         || (  chunk_is_token(pc, CT_QUALIFIER)
-            && !chunk_is_cpp_inheritance_access_specifier(pc)));
-} // chunk_is_pointer_reference_or_qualifier
-
-
-/**
- * This function attempts to match the starting and ending chunks of a qualified
- * identifier, which consists of one or more scope resolution operator(s) and
- * zero or more nested name specifiers
- * specifiers
- * @param pc the starting chunk
- * @return   an std::pair, where the first chunk indicates the starting chunk of the
- *           match and second indicates the ending chunk. Upon finding a successful
- *           match, the starting chunk may consist of an identifier or a scope
- *           resolution operator, while the ending chunk may consist of identifier
- *           or the closing angle bracket of a template. If no match is found, a
- *           pair of null chunks is returned
- */
-static std::pair<chunk_t *, chunk_t *> match_qualified_identifier(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   auto *end   = skip_scope_resolution_and_nested_name_specifiers(pc);
-   auto *start = skip_scope_resolution_and_nested_name_specifiers_rev(pc);
-
-   if (  end != nullptr
-      && start != nullptr)
-   {
-      auto *double_colon = chunk_search_next_cat(start, CT_DC_MEMBER);
-
-      if (  double_colon != nullptr
-         && chunk_is_between(double_colon, start, end))
-      {
-         return(std::make_pair(start, end));
-      }
-   }
-   return(std::make_pair(nullptr, nullptr));
-} // match_qualified_identifier
-
-
-/**
- * Starting from the input chunk, this function attempts to match a variable
- * declaration/definition in both the forward and reverse directions; each pair of
- * consecutive chunks is tested to determine if a potential match is satisfied.
- * @param pc    the starting chunk
- * @param level the brace level
- * @return      upon successful match, function returns an std::tuple, where the
- *              first chunk indicates the starting chunk, the second chunk indicates
- *              the identifier name, and the third chunk indicates the end associated
- *              with the variable declaration/definition
- */
-static std::tuple<chunk_t *, chunk_t *, chunk_t *> match_variable(chunk_t *pc, std::size_t level)
-{
-   LOG_FUNC_ENTRY();
-
-   auto identifier_end_pair   = match_variable_end(pc, level);
-   auto start_identifier_pair = match_variable_start(pc, level);
-   auto *end                  = identifier_end_pair.second;
-   auto *identifier           = identifier_end_pair.first != nullptr ? identifier_end_pair.first : start_identifier_pair.second;
-   auto *start                = start_identifier_pair.first;
-
-   /**
-    * a forward search starting at the chunk under test will fail if two consecutive chunks marked as CT_WORD
-    * are encountered; in that case, it's likely that the preceding chunk indicates a type and the subsequent
-    * chunk indicates a variable declaration/definition
-    */
-
-   if (  identifier != nullptr
-      && start != nullptr
-      && (  end != nullptr
-         || chunk_is_token(chunk_get_prev_ncnnlni(identifier), CT_WORD)))
-   {
-      return(std::make_tuple(start, identifier, end));
-   }
-   return(std::make_tuple(nullptr, nullptr, nullptr));
-} // match_variable
-
-
-/**
- * Starting from the input chunk, this function attempts to match a variable in the
- * forward direction, and tests each pair of consecutive chunks to determine if a
- * potential variable declaration/definition match is satisfied. Secondly, the
- * function attempts to identify the end chunk associated with the candidate variable
- * match. For scalar variables (simply declared and not defined), both the end chunk
- * and identifier chunk should be one in the same
- * @param pc    the starting chunk
- * @param level the brace level
- * @return      an std::pair, where the first chunk indicates the identifier
- *              (if non-null) and the second chunk indicates the end associated with
- *              the variable declaration/definition; assuming a valid match, the first
- *              chunk may be null if the function is called with a starting chunk
- *              that occurs after the identifier
- */
-static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *pc, std::size_t level)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *identifier = nullptr;
-
-   while (pc != nullptr)
-   {
-      /**
-       * skip any right-hand side assignments
-       */
-      chunk_t *rhs_exp_end = nullptr;
-
-      if (chunk_is_token(pc, CT_ASSIGN))
-      {
-         /**
-          * store a pointer to the end chunk of the rhs expression;
-          * use it later to test against setting the identifier
-          */
-         rhs_exp_end = skip_to_expression_end(pc);
-         pc          = rhs_exp_end;
-      }
-
-      /**
-       * skip current and preceding chunks if at a higher brace level
-       */
-      while (  pc != nullptr
-            && pc->level > level)
-      {
-         pc = chunk_get_next_ncnnl(pc);
-      }
-
-      /**
-       * skip to any following match for angle brackets, braces, parens,
-       * or square brackets
-       */
-      if (  chunk_is_token(pc, CT_ANGLE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_paren_open(pc)
-         || chunk_is_token(pc, CT_SQUARE_OPEN))
-      {
-         pc = chunk_skip_to_match(pc, scope_e::PREPROC);
-      }
-      /**
-       * call a separate function to validate adjacent tokens as potentially
-       * matching a variable declaration/definition
-       */
-
-      chunk_t *next = chunk_get_next_ncnnl(pc);
-
-      if (  chunk_is_not_token(next, CT_COMMA)
-         && chunk_is_not_token(next, CT_FPAREN_CLOSE)
-         && !chunk_is_semicolon(next)
-         && !adj_tokens_match_var_def_pattern(pc, next))
-      {
-         /**
-          * error, pattern is not consistent with a variable declaration/definition
-          */
-
-         break;
-      }
-
-      if (  chunk_is_token(pc, CT_WORD)
-         && pc != rhs_exp_end)
-      {
-         /**
-          * we've encountered a candidate for the variable name
-          */
-
-         identifier = pc;
-      }
-
-      /**
-       * we're done searching if we've previously identified a variable name
-       * and then encounter a comma or semicolon
-       */
-      if (  chunk_is_token(next, CT_COMMA)
-         || chunk_is_token(next, CT_FPAREN_CLOSE)
-         || chunk_is_semicolon(next))
-      {
-         return(std::make_pair(identifier, pc));
-      }
-      pc = next;
-   }
-   return(std::make_pair(nullptr, nullptr));
-} // match_variable_end
-
-
-/**
- * Starting from the input chunk, this function attempts to match a variable in the
- * reverse direction, and tests each pair of consecutive chunks to determine if a
- * potential variable declaration/definition match is satisfied. Secondly, the
- * function attempts to identify the starting chunk associated with the candidate
- * variable match. The start and identifier chunks may refer to each other in cases
- * where the identifier is not preceded by pointer or reference operators or qualifiers,
- * etc.
- * @param pc    the starting chunk
- * @param level the brace level
- * @return      an std::pair, where the first chunk indicates the starting chunk and
- *              the second chunk indicates the identifier associated with the variable
- *              match; assuming a valid match, the second chunk may be null if the
- *              function is called with a starting chunk that occurs before the
- *              identifier
- */
-static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::size_t level)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *identifier = nullptr;
-
-   while (pc != nullptr)
-   {
-      /**
-       * skip any right-hand side assignments
-       */
-      chunk_t *before_rhs_exp_start = skip_expression_rev(pc);
-      chunk_t *prev                 = nullptr;
-      chunk_t *next                 = pc;
-
-      while (  chunk_is_after(next, before_rhs_exp_start)
-            && pc != prev)
-      {
-         next = prev;
-         prev = chunk_get_prev_ncnnlni(next);
-
-         if (chunk_is_token(next, CT_ASSIGN))
-         {
-            pc = prev;
-         }
-      }
-      /**
-       * skip current and preceding chunks if at a higher brace level
-       */
-
-      while (  pc != nullptr
-            && pc->level > level)
-      {
-         pc = chunk_get_prev_ncnnlni(pc);
-      }
-
-      /**
-       * skip to any preceding match for angle brackets, braces, parens,
-       * or square brackets
-       */
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_paren_close(pc)
-         || chunk_is_token(pc, CT_SQUARE_CLOSE))
-      {
-         pc = chunk_skip_to_match_rev(pc, scope_e::PREPROC);
-      }
-      /**
-       * call a separate function to validate adjacent tokens as potentially
-       * matching a variable declaration/definition
-       */
-
-      prev = chunk_get_prev_ncnnlni(pc);
-
-      if (!adj_tokens_match_var_def_pattern(prev, pc))
-      {
-         /**
-          * perhaps the previous chunk possibly indicates a type that yet to be
-          * marked? if not, then break
-          */
-         if (  chunk_is_not_token(prev, CT_WORD)
-            || (  !chunk_is_pointer_or_reference(pc)
-               && chunk_is_not_token(pc, CT_WORD)))
-         {
-            /**
-             * error, pattern is not consistent with a variable declaration/definition
-             */
-
-            break;
-         }
-      }
-
-      if (  identifier == nullptr
-         && chunk_is_token(pc, CT_WORD))
-      {
-         /**
-          * we've encountered a candidate for the variable name
-          */
-
-         identifier = pc;
-      }
-
-      /**
-       * we're done searching if we've previously identified a variable name
-       * and then encounter another identifier, or we encounter a closing
-       * brace (which would likely indicate an inline variable definition)
-       */
-      if (  chunk_is_token(prev, CT_ANGLE_CLOSE)
-         || chunk_is_token(prev, CT_BRACE_CLOSE)
-         || chunk_is_token(prev, CT_COMMA)
-         || chunk_is_token(prev, CT_TYPE)
-         || chunk_is_token(prev, CT_WORD))
-      {
-         return(std::make_pair(pc, identifier));
-      }
-      pc = prev;
-   }
-   return(std::make_pair(nullptr, nullptr));
-} // match_variable_start
-
-
-/**
- * Skip forward past any scope resolution operators and nested name specifiers and return
- * just the qualified identifier name; while similar to the existing skip_dc_member()
- * function, this function also takes into account templates that may comprise any
- * nested name specifiers
- */
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  (  pc != nullptr
-         && pc->flags.test(PCF_IN_TEMPLATE))
-      || chunk_is_token(pc, CT_DC_MEMBER)
-      || chunk_is_token(pc, CT_TYPE)
-      || chunk_is_token(pc, CT_WORD))
-   {
-      while (pc != nullptr)
-      {
-         /**
-          * skip to any following match for angle brackets
-          */
-         if (chunk_is_token(pc, CT_ANGLE_OPEN))
-         {
-            pc = chunk_skip_to_match(pc, scope_e::PREPROC);
-         }
-         auto *next = chunk_get_next_ncnnl(pc);
-
-         /**
-          * call a separate function to validate adjacent tokens as potentially
-          * matching a qualified identifier
-          */
-         if (!adj_tokens_match_qualified_identifier_pattern(pc, next))
-         {
-            break;
-         }
-         pc = next;
-      }
-   }
-   return(pc);
-} // skip_scope_resolution_and_nested_name_specifiers
-
-
-/**
- * Skip in reverse to the beginning chunk of a qualified identifier; while similar to
- * the existing skip_dc_member_rev() function, this function also takes into account
- * templates that may comprise any nested name specifiers
- */
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers_rev(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  (  pc != nullptr
-         && pc->flags.test(PCF_IN_TEMPLATE))
-      || chunk_is_token(pc, CT_DC_MEMBER)
-      || chunk_is_token(pc, CT_TYPE)
-      || chunk_is_token(pc, CT_WORD))
-   {
-      while (pc != nullptr)
-      {
-         /**
-          * skip to any preceding match for angle brackets
-          */
-         if (chunk_is_token(pc, CT_ANGLE_CLOSE))
-         {
-            pc = chunk_skip_to_match_rev(pc, scope_e::PREPROC);
-         }
-         auto *prev = chunk_get_prev_ncnnlni(pc);
-
-         /**
-          * call a separate function to validate adjacent tokens as potentially
-          * matching a qualified identifier
-          */
-         if (!adj_tokens_match_qualified_identifier_pattern(prev, pc))
-         {
-            break;
-         }
-         pc = prev;
-      }
-   }
-   return(pc);
-} // skip_scope_resolution_and_nested_name_specifiers_rev
-
-
-EnumStructUnionParser::EnumStructUnionParser()
-   : m_end(nullptr)
-   , m_parse_error(false)
-   , m_start(nullptr)
-   , m_type(nullptr)
-{
-} // EnumStructUnionParser::EnumStructUnionParser
-
-
-EnumStructUnionParser::~EnumStructUnionParser()
-{
-} // EnumStructUnionParser::~EnumStructUnionParser
-
-
-void EnumStructUnionParser::analyze_identifiers()
-{
-   LOG_FUNC_ENTRY();
-
-   /**
-    * the enum (and variable declarations thereof) could be of
-    * the following forms:
-    *
-    * "enum type [: integral_type] { ... } [x, ...]"
-    * "enum type : integral_type"
-    * "enum type x, ..."
-    * "enum class type [: integral_type] { ... } [x, ...]"
-    * "enum class type [: integral_type]"
-    * "enum [: integral_type] { ... } x, ..."
-    */
-
-   /**
-    * the class/struct (and variable declarations thereof) could be of
-    * the following forms:
-    *
-    * "template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }"
-    * "template<...> class/struct[<...>] [macros/attributes ...] type"
-    * "class/struct [macros/attributes ...] type [: bases ...] { } [x, ...]"
-    * "class/struct [macros/attributes ...] type [x, ...]"
-    * "class/struct [macros/attributes ...] [: bases] { } x, ..."
-    */
-
-   chunk_t     *template_end      = get_template_end();
-   auto        *body_end          = get_body_end();
-   auto        *body_start        = get_body_start();
-   pcf_flags_t flags              = PCF_VAR_1ST_DEF;
-   auto        *inheritance_start = get_inheritance_start();
-   chunk_t     *pc                = body_end ? body_end : m_start;
-
-   /**
-    * first, try a simple approach to identify any associated type
-    */
-   if (try_pre_identify_type())
-   {
-      /**
-       * a type was identified, meaning a pair of braces, angle brackets, or
-       * a colon was found; if a colon was found, then there should be a
-       * balanced set of braces that follow; therefore, start the search for
-       * variable identifiers after the closing brace or close angle bracket
-       */
-
-      if (body_end != nullptr)
-      {
-         pc = body_end;
-      }
-      else if (template_end != nullptr)
-      {
-         pc = template_end;
-      }
-   }
-
-   if (chunk_get_next_ncnnl(pc) == m_end)
-   {
-      /**
-       * we're likely at the end of a class/enum/struct/union body which lacks
-       * any trailing inline definitions
-       */
-
-      pc = chunk_get_next_ncnnl(m_end);
-   }
-
-   if (  type_identified()
-      || chunk_is_class_enum_struct_union(pc)
-      || pc == m_end)
-   {
-      /**
-       * in case we're pointing at the end chunk, advance the chunk pointer
-       * by one more so that we don't perform a variable identifier search
-       * below
-       */
-      pc = chunk_get_next_ncnnl(pc);
-   }
-
-   if (body_end != nullptr)
-   {
-      /**
-       * a closing brace was found, so any identifiers trailing the closing
-       * brace are probably inline variable declarations following a
-       * class/enum/struct/union definition
-       */
-      flags |= PCF_VAR_INLINE;
-   }
-   else if (!type_identified())
-   {
-      /**
-       * skip any chain of one or more function-like macro calls,
-       * declspecs, and attributes
-       */
-
-      chunk_t *tmp = pc;
-
-      do
-      {
-         pc  = tmp;
-         tmp = skip_attribute_next(tmp);
-         tmp = skip_declspec_next(tmp);
-      } while (tmp != pc);
-   }
-   /**
-    * try to match some variable identifiers in the loop below
-    */
-
-   while (chunk_is_between(pc, m_start, m_end, false))
-   {
-      auto match       = match_variable(pc, m_start->level);
-      auto *start      = std::get<0>(match);
-      auto *identifier = std::get<1>(match);
-      auto *end        = std::get<2>(match);
-
-      if (  start != nullptr
-         && identifier != nullptr)
-      {
-         if (end != nullptr)
-         {
-            mark_variable(identifier, flags);
-
-            if (flags & PCF_VAR_1ST)
-            {
-               flags &= ~PCF_VAR_1ST; // clear the first flag for the next items
-            }
-         }
-      }
-
-      if (end != nullptr)
-      {
-         pc = end;
-      }
-      pc = chunk_get_next_ncnnl(pc);
-
-      /**
-       * skip any right-hand side assignments
-       */
-      if (chunk_is_token(pc, CT_ASSIGN))
-      {
-         pc = skip_to_expression_end(pc);
-      }
-
-      /**
-       * if we're sitting at a comma or semicolon, skip it
-       */
-      if (  chunk_is_semicolon(pc)
-         || (  chunk_is_token(pc, CT_COMMA)
-            && !pc->flags.test_any(PCF_IN_FCN_DEF | PCF_IN_FCN_CALL | PCF_IN_TEMPLATE)
-            && !chunk_is_between(pc, inheritance_start, body_start)))
-      {
-         pc = chunk_get_next_ncnnl(pc);
-      }
-   }
-   /**
-    * if we still haven't identified a type, try doing so now that the
-    * variables, if any, have been marked
-    */
-   try_post_identify_type();
-
-   /**
-    * identify possible macros preceding the type name
-    */
-   try_post_identify_macro_calls();
-
-   if (  chunk_is_class_or_struct(m_start)
-      && (  chunk_is_not_token(m_start, CT_STRUCT)
-         || !language_is_set(LANG_C)))
-   {
-      /**
-       * if a type has been identifies, mark any constructor matching constructor
-       * declarations/definitions
-       */
-      mark_constructors();
-   }
-
-   if (type_identified())
-   {
-      if (~flags & PCF_VAR_1ST)
-      {
-         /**
-          * PCF_VAR_1ST was cleared and a type was identified; therefore, set
-          * PCF_VAR_TYPE for the identified type
-          */
-         chunk_flags_set(m_type, PCF_VAR_TYPE);
-      }
-      else if (~flags & PCF_VAR_INLINE)
-      {
-         /**
-          * if a type was identified but no braced-enclosed body was found and no
-          * identifiers were marked as variables, then we're likely we're likely
-          * dealing with a forward declaration
-          */
-         flag_series(m_start, m_type, PCF_INCOMPLETE);
-      }
-   }
-} // EnumStructUnionParser::analyze_identifiers
-
-
-bool EnumStructUnionParser::body_detected() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto *body_end   = get_body_end();
-   auto *body_start = get_body_start();
-
-   return(  body_end != nullptr
-         && body_start != nullptr);
-} // EnumStructUnionParser::body_detected
-
-
-bool EnumStructUnionParser::comma_separated_values_detected() const
-{
-   LOG_FUNC_ENTRY();
-
-   return(!get_top_level_commas().empty());
-} // EnumStructUnionParser::comma_separated_values_detected
-
-
-bool EnumStructUnionParser::enum_base_detected() const
-{
-   LOG_FUNC_ENTRY();
-
-   return(m_chunk_map.find(CT_BIT_COLON) != m_chunk_map.cend());
-} // EnumStructUnionParser::enum_base_detected
-
-
-chunk_t *EnumStructUnionParser::get_body_end() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_BRACE_CLOSE);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_body_end
-
-
-chunk_t *EnumStructUnionParser::get_body_start() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_BRACE_OPEN);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_body_start
-
-
-chunk_t *EnumStructUnionParser::get_enum_base_start() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_BIT_COLON);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_enum_base_start
-
-
-chunk_t *EnumStructUnionParser::get_first_top_level_comma() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_COMMA);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_first_top_level_comma
-
-
-chunk_t *EnumStructUnionParser::get_inheritance_end() const
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *brace_open        = nullptr;
-   auto    *inheritance_start = get_inheritance_start();
-
-   if (inheritance_start != nullptr)
-   {
-      brace_open = get_body_start();
-
-      if (brace_open == nullptr)
-      {
-         brace_open = chunk_get_next_type(inheritance_start,
-                                          CT_BRACE_OPEN,
-                                          m_start->level,
-                                          scope_e::ALL);
-      }
-   }
-   return(brace_open);
-} // EnumStructUnionParser::get_inheritance_end
-
-
-chunk_t *EnumStructUnionParser::get_inheritance_start() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_COLON);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_inheritance_start
-
-
-std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_question_operators() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_QUESTION);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second);
-   }
-   return(std::map<std::size_t, chunk_t *>());
-} // EnumStructUnionParser::get_question_operators
-
-
-chunk_t *EnumStructUnionParser::get_template_end() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_ANGLE_CLOSE);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_template_end
-
-
-chunk_t *EnumStructUnionParser::get_template_start() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_ANGLE_OPEN);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_template_start
-
-
-std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_top_level_commas() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_COMMA);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second);
-   }
-   return(std::map<std::size_t, chunk_t *>());
-} // EnumStructUnionParser::get_top_level_commas
-
-
-chunk_t *EnumStructUnionParser::get_where_end() const
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *brace_open  = nullptr;
-   auto    *where_start = get_where_start();
-
-   if (where_start != nullptr)
-   {
-      brace_open = get_body_start();
-
-      if (brace_open == nullptr)
-      {
-         brace_open = chunk_get_next_type(where_start,
-                                          CT_BRACE_OPEN,
-                                          m_start->level,
-                                          scope_e::ALL);
-      }
-   }
-   return(brace_open);
-} // EnumStructUnionParser::get_where_end
-
-
-chunk_t *EnumStructUnionParser::get_where_start() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_WHERE);
-
-   if (it_token_chunk_map_pair != m_chunk_map.cend())
-   {
-      return(it_token_chunk_map_pair->second.at(0));
-   }
-   return(nullptr);
-} // EnumStructUnionParser::get_where_start
-
-
-bool EnumStructUnionParser::inheritance_detected() const
-{
-   LOG_FUNC_ENTRY();
-
-   return(m_chunk_map.find(CT_COLON) != m_chunk_map.cend());
-} // EnumStructUnionParser::inheritance_detected
-
-
-void EnumStructUnionParser::initialize(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   parse_error_detected(false);
-   m_chunk_map.clear();
-
-   m_start = pc;
-   m_type  = nullptr;
-   pc      = try_find_end_chunk(pc);
-   m_end   = refine_end_chunk(pc);
-} // EnumStructUnionParser::initialize
-
-
-bool EnumStructUnionParser::is_potential_end_chunk(chunk_t *pc) const
-{
-   LOG_FUNC_ENTRY();
-
-   /**
-    * test for a semicolon or closing brace at the level of the starting chunk
-    */
-   if (  pc == nullptr
-      || parse_error_detected()
-      || (  (  chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_BRACE_CLOSE))
-         && pc->level == m_start->level))
-   {
-      return(true);
-   }
-   /**
-    * check for the following:
-    * 1) did we encounter a closing paren, which may indicate the end of cast?
-    * 2) did we cross a preprocessor boundary?
-    * 3) did we cross the closing paren of a function signature?
-    */
-
-   auto const pc_in_funcdef    = pc->flags & PCF_IN_FCN_DEF;
-   auto const pc_in_preproc    = pc->flags & PCF_IN_PREPROC;
-   auto const start_in_funcdef = m_start->flags & PCF_IN_FCN_DEF;
-   auto const start_in_preproc = m_start->flags & PCF_IN_PREPROC;
-
-   /**
-    * the following may identify cases where we've reached the
-    * end of a cast terminated by a closing paren
-    */
-   if (  (  chunk_is_token(pc, CT_PAREN_CLOSE)
-         && pc->level < m_start->level)
-      || (start_in_funcdef ^ pc_in_funcdef).test_any()
-      || (start_in_preproc ^ pc_in_preproc).test_any())
-   {
-      return(true);
-   }
-   /**
-    * check whether the current chunk's nest level is less than that
-    * of the starting chunk
-    */
-
-   std::size_t pc_template_nest    = get_cpp_template_angle_nest_level(pc);
-   std::size_t start_template_nest = get_cpp_template_angle_nest_level(m_start);
-
-   if (start_template_nest > pc_template_nest)
-   {
-      return(true);
-   }
-   /**
-    * assuming the chunk is within a function call/definition, check the following:
-    * 1) chunk is a closing function paren at a lower level than the starting chunk
-    * 2) chunk is an assignment ('=') or comma at the level of the starting chunk
-    */
-
-   auto const pc_in_funccall    = pc->flags & PCF_IN_FCN_CALL;
-   auto const start_in_funccall = m_start->flags & PCF_IN_FCN_CALL;
-
-   if (  (  pc_in_funccall.test_any()
-         && start_in_funccall.test_any()
-         && chunk_is_token(pc, CT_COMMA)
-         && pc->level == m_start->level)
-      || (  pc_in_funcdef.test_any()
-         && (  (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-               && pc->level < m_start->level)
-            || (  (  chunk_is_token(pc, CT_ASSIGN)
-                  || chunk_is_token(pc, CT_COMMA))
-               && pc->level == m_start->level))))
-   {
-      return(true);
-   }
-   return(false);
-} // EnumStructUnionParser::is_potential_end_chunk
-
-
-bool EnumStructUnionParser::is_within_conditional(chunk_t *pc) const
-{
-   LOG_FUNC_ENTRY();
-
-   auto question_operators = get_question_operators();
-
-   if (!question_operators.empty())
-   {
-      auto &&it_token_chunk_pair = question_operators.cbegin();
-
-      while (it_token_chunk_pair != question_operators.cend())
-      {
-         auto *question = it_token_chunk_pair->second;
-         auto *end      = skip_to_expression_end(question);
-         auto *start    = skip_to_expression_start(question);
-
-         if (chunk_is_between(pc, start, end))
-         {
-            return(true);
-         }
-         ++it_token_chunk_pair;
-      }
-   }
-   return(false);
-} // EnumStructUnionParser::is_within_conditional
-
-
-bool EnumStructUnionParser::is_within_inheritance_list(chunk_t *pc) const
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc != nullptr
-      && pc->flags.test(PCF_IN_CLASS_BASE))
-   {
-      return(true);
-   }
-   auto *inheritance_end   = get_inheritance_end();
-   auto *inheritance_start = get_inheritance_start();
-
-   if (  inheritance_end != nullptr
-      && inheritance_start != nullptr)
-   {
-      return(chunk_is_between(pc, inheritance_start, inheritance_end));
-   }
-   return(false);
-} // EnumStructUnionParser::is_within_inheritance_list
-
-
-bool EnumStructUnionParser::is_within_where_clause(chunk_t *pc) const
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc != nullptr
-      && pc->flags.test(PCF_IN_WHERE_SPEC))
-   {
-      return(true);
-   }
-   auto *where_end   = get_where_end();
-   auto *where_start = get_where_start();
-
-   if (  where_end != nullptr
-      && where_start != nullptr)
-   {
-      return(chunk_is_between(pc, where_start, where_end));
-   }
-   return(false);
-} // EnumStructUnionParser::is_within_where_clause
-
-
-void EnumStructUnionParser::mark_base_classes(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   pcf_flags_t flags = PCF_VAR_1ST_DEF;
-
-   while (pc != nullptr)
-   {
-      chunk_flags_set(pc, PCF_IN_CLASS_BASE);
-      /**
-       * clear the PCF_VAR_TYPE flag for all chunks within the inheritance list
-       * TODO: this may not be necessary in the future once code outside this
-       *       class is improved such that PCF_VAR_TYPE is not set for these chunks
-       */
-      pc->flags &= ~PCF_VAR_TYPE;
-
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-      if (chunk_is_token(next, CT_DC_MEMBER))
-      {
-         /**
-          * just in case it's a templated type
-          */
-         pc = skip_template_prev(pc);
-
-         if (chunk_is_token(pc, CT_WORD))
-         {
-            /**
-             * TODO:
-             * To comply with conventions used elsewhere in the code, we're going
-             * to change chunks marked CT_WORD to CT_TYPE if followed by a scope-
-             * resolution operator; if a chunk marked CT_WORD is followed by a set
-             * of angle brackets, then it's obviously a templated type. However,
-             * in the absence of a pair trailing angle brackets, the chunk may be
-             * a namespace rather than a type. Need to revisit this!
-             */
-            set_chunk_type(pc, CT_TYPE);
-         }
-      }
-      else if (  (  chunk_is_token(next, CT_BRACE_OPEN)
-                 || (  chunk_is_token(next, CT_COMMA)
-                    && !is_within_where_clause(next)))
-              && next->level == m_start->level)
-      {
-         /**
-          * just in case it's a templated type
-          */
-         pc = skip_template_prev(pc);
-
-         if (chunk_is_token(pc, CT_WORD))
-         {
-            chunk_flags_set(pc, flags);
-
-            if (flags & PCF_VAR_1ST)
-            {
-               flags &= ~PCF_VAR_1ST; // clear the first flag for the next items
-            }
-         }
-
-         if (chunk_is_token(next, CT_BRACE_OPEN))
-         {
-            break;
-         }
-      }
-      pc = next;
-   }
-   chunk_flags_set(pc, PCF_IN_CLASS_BASE);
-} // EnumStructUnionParser::mark_base_classes
-
-
-void EnumStructUnionParser::mark_braces(chunk_t *brace_open)
-{
-   LOG_FUNC_ENTRY();
-
-   pcf_flags_t flags = PCF_NONE;
-
-   if (chunk_is_token(m_start, CT_CLASS))
-   {
-      flags = PCF_IN_CLASS;
-   }
-   else if (chunk_is_enum(m_start))
-   {
-      flags = PCF_IN_ENUM;
-   }
-   else if (chunk_is_token(m_start, CT_STRUCT))
-   {
-      flags = PCF_IN_STRUCT;
-   }
-   /**
-    * TODO: why does flag_parens() flag the closing paren,
-    *       but it doesn't flag the opening paren?
-    */
-
-   flag_parens(brace_open,
-               flags,
-               CT_NONE,
-               CT_NONE,
-               false);
-
-   if (chunk_is_class_struct_union(m_start))
-   {
-      mark_struct_union_body(brace_open);
-
-      auto *inheritance_start = get_inheritance_start();
-
-      if (inheritance_start != nullptr)
-      {
-         /**
-          * the class/struct/union is a derived class; mark the base
-          * classes between the colon/java "implements" keyword and the
-          * opening brace
-          */
-
-         mark_base_classes(inheritance_start);
-      }
-   }
-   set_chunk_parent(brace_open, m_start->type);
-
-   auto *brace_close = chunk_skip_to_match(brace_open, scope_e::PREPROC);
-
-   if (brace_close != nullptr)
-   {
-      set_chunk_parent(brace_close, m_start->type);
-   }
-} // EnumStructUnionParser::mark_braces
-
-
-void EnumStructUnionParser::mark_class_colon(chunk_t *colon)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LFTOR,
-           "%s(%d): Class colon detected: orig_line is %zu, orig_col is %zu\n",
-           __unqualified_func__,
-           __LINE__,
-           colon->orig_line,
-           colon->orig_col);
-
-   set_chunk_type(colon, CT_CLASS_COLON);
-   set_chunk_parent(colon, m_start->type);
-} // EnumStructUnionParser::mark_class_colon
-
-
-void EnumStructUnionParser::mark_conditional_colon(chunk_t *colon)
-{
-   set_chunk_type(colon, CT_COND_COLON);
-} // EnumStructUnionParser::mark_conditional_colon
-
-
-void EnumStructUnionParser::mark_constructors()
-{
-   LOG_FUNC_ENTRY();
-
-   /**
-    * if a type was previously identified, then look for
-    * class/struct constructors in the body
-    */
-   if (  body_detected()
-      && type_identified()
-      && chunk_is_class_or_struct(m_start))
-   {
-      LOG_FMT(LFTOR,
-              "%s(%d): orig_line is %zu, orig_col is %zu, start is '%s', parent_type is %s\n",
-              __unqualified_func__,
-              __LINE__,
-              m_start->orig_line,
-              m_start->orig_col,
-              m_start->text(),
-              get_token_name(get_chunk_parent_type(m_start)));
-
-      log_pcf_flags(LFTOR, m_start->flags);
-
-      /**
-       * get the name of the type
-       */
-      auto *body_end   = get_body_end();
-      auto *body_start = get_body_start();
-      auto *name       = m_type->text();
-
-      LOG_FMT(LFTOR,
-              "%s(%d): Name of type is '%s'\n",
-              __unqualified_func__,
-              __LINE__,
-              name);
-      log_pcf_flags(LFTOR, m_type->flags);
-
-      chunk_t     *next = nullptr;
-      std::size_t level = m_type->brace_level + 1;
-
-      for (auto *prev = body_start; next != body_end; prev = next)
-      {
-         chunk_flags_set(prev, PCF_IN_CLASS);
-
-         next = chunk_get_next_ncnnl(prev, scope_e::PREPROC);
-
-         /**
-          * find a chunk within the class/struct body that
-          */
-         if (  prev != nullptr
-            && std::strcmp(prev->text(), name) == 0
-            && prev->level == level
-            && chunk_is_paren_open(next))
-         {
-            set_chunk_type(prev, CT_FUNC_CLASS_DEF);
-
-            LOG_FMT(LFTOR,
-                    "%s(%d): Constructor/destructor detected: '%s' at orig_line is %zu, orig_col is %zu, type is %s\n",
-                    __unqualified_func__,
-                    __LINE__,
-                    name,
-                    prev->orig_line,
-                    prev->orig_col,
-                    get_token_name(prev->type));
-
-            mark_cpp_constructor(prev);
-         }
-      }
-
-      chunk_flags_set(next, PCF_IN_CLASS);
-   }
-} // EnumStructUnionParser::mark_constructor
-
-
-void EnumStructUnionParser::mark_enum_integral_type(chunk_t *colon)
-{
-   LOG_FUNC_ENTRY();
-
-   set_chunk_type(colon, CT_BIT_COLON);
-   set_chunk_parent(colon, m_start->type);
-
-   auto *body_start = get_body_start();
-   auto *pc         = chunk_get_next_ncnnl(colon);
-
-   /**
-    * the chunk(s) between the colon and opening
-    * brace (if present) should specify the enum's
-    * integral type
-    */
-
-   while (  chunk_is_between(pc, m_start, m_end)
-         && pc != body_start
-         && chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && !chunk_is_semicolon(pc))
-   {
-      /**
-       * clear the PCF_VAR_TYPE flag for all chunks within the enum integral base
-       * TODO: this may not be necessary in the future once code outside this
-       *       class is improved such that PCF_VAR_TYPE is not set for these chunks
-       */
-      pc->flags &= ~PCF_VAR_TYPE;
-
-      set_chunk_type(pc, CT_TYPE);
-      set_chunk_parent(pc, colon->type);
-
-      pc = chunk_get_next_ncnnl(pc);
-   }
-} // EnumStructUnionParser::mark_enum_integral_type
-
-
-void EnumStructUnionParser::mark_extracorporeal_lvalues()
-{
-   /**
-    * clear the PCF_LVALUE flag for all chunks outside the body definition,
-    * as this flag may have been set elsewhere by code outside this class
-    * TODO: the mark_lvalue() function needs some improvement so that the
-    *       following isn't necessary
-    */
-   chunk_t *next = m_start;
-   chunk_t *prev = nullptr;
-
-   /**
-    * if the class is a template, go the extra step and correct the
-    * erroneously marked chunks - as previously mentioned, this likely
-    * won't be necessary with improvements to the mark_lvalue() function
-    */
-   if (get_chunk_parent_type(next) == CT_TEMPLATE)
-   {
-      while (true)
-      {
-         prev = chunk_get_prev_ncnnlni(next);
-
-         if (  prev == nullptr
-            || (  !prev->flags.test(PCF_IN_TEMPLATE)
-               && chunk_is_not_token(prev, CT_TEMPLATE)))
-         {
-            break;
-         }
-         next = prev;
-      }
-   }
-   auto *body_end   = get_body_end();
-   auto *body_start = get_body_start();
-
-   while (next != m_end)
-   {
-      if (  !chunk_is_between(next, body_start, body_end)
-         && next->flags.test(PCF_LVALUE))
-      {
-         next->flags &= ~PCF_LVALUE;
-      }
-      else if (  (  chunk_is_token(next, CT_ASSIGN)
-                 || chunk_is_token(next, CT_BRACE_OPEN))
-              && chunk_is_token(prev, CT_WORD)
-              && prev->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
-      {
-         chunk_flags_set(prev, PCF_LVALUE);
-      }
-      prev = next;
-      next = chunk_get_next_ncnnl(next);
-   }
-} // EnumStructUnionParser::mark_extracorporeal_lavlues
-
-
-void EnumStructUnionParser::mark_nested_name_specifiers(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   auto start_end_pair = match_qualified_identifier(pc);
-   auto start          = start_end_pair.first;
-   auto end            = start_end_pair.second;
-
-   for (pc = start; chunk_is_between(pc, start, end); pc = chunk_get_next_ncnnl(pc))
-   {
-      if (chunk_is_token(pc, CT_WORD))
-      {
-         /**
-          * if the next token is an opening angle, then we can safely
-          * mark the current identifier as a type
-          */
-         auto *next = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(next, CT_ANGLE_OPEN))
-         {
-            /**
-             * the template may have already been previously marked elsewhere...
-             */
-            auto *angle_open  = next;
-            auto *angle_close = chunk_skip_to_match(angle_open, scope_e::PREPROC);
-
-            if (angle_close == nullptr)
-            {
-               // parse error
-               parse_error_detected(true);
-
-               // TODO: should this be just a warning or an error (with exit condition?)
-               LOG_FMT(LWARN,
-                       "%s(%d): Unmatched '<' at orig_line is %zu, orig_col is %zu\n",
-                       __unqualified_func__,
-                       __LINE__,
-                       angle_open->orig_line,
-                       angle_open->orig_col);
-
-               break;
-            }
-            set_chunk_type(pc, CT_TYPE);
-            mark_template(next);
-            pc = angle_close;
-         }
-         else if (  is_within_inheritance_list(pc)
-                 && (  chunk_is_token(next, CT_COMMA)
-                    || chunk_is_token(next, CT_BRACE_OPEN)))
-         {
-            set_chunk_type(pc, CT_TYPE);
-         }
-      }
-   }
-} // EnumStructUnionParser::mark_nested_name_specifiers
-
-
-void EnumStructUnionParser::mark_pointer_types(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(pc, CT_WORD))
-   {
-      do
-      {
-         // TODO: should there be a CT_BYREF_TYPE?
-         pc = chunk_get_prev_ncnnlni(pc);
-
-         if (chunk_is_ptr_operator(pc))
-         {
-            set_chunk_parent(pc, m_start->type);
-            set_chunk_type(pc, CT_PTR_TYPE);
-         }
-      } while (chunk_is_pointer_reference_or_qualifier(pc));
-   }
-} // EnumStructUnionParser::mark_pointer_types
-
-
-void EnumStructUnionParser::mark_template(chunk_t *start) const
-{
-   LOG_FUNC_ENTRY();
-
-   if (start != nullptr)
-   {
-      LOG_FMT(LTEMPL,
-              "%s(%d): Template detected: '%s' at orig_line %zu, orig_col %zu\n",
-              __unqualified_func__,
-              __LINE__,
-              start->text(),
-              start->orig_line,
-              start->orig_col);
-   }
-   set_chunk_parent(start, CT_TEMPLATE);
-
-   auto *end = chunk_skip_to_match(start, scope_e::PREPROC);
-
-   if (end != nullptr)
-   {
-      set_chunk_parent(end, CT_TEMPLATE);
-
-      mark_template_args(start, end);
-   }
-} // EnumStructUnionParser::mark_template
-
-
-void EnumStructUnionParser::mark_template_args(chunk_t *start, chunk_t *end) const
-{
-   LOG_FUNC_ENTRY();
-
-   if (  end != nullptr
-      && start != nullptr)
-   {
-      LOG_FMT(LTEMPL,
-              "%s(%d): Start of template detected: '%s' at orig_line %zu, orig_col %zu\n",
-              __unqualified_func__,
-              __LINE__,
-              start->text(),
-              start->orig_line,
-              start->orig_col);
-
-      pcf_flags_t flags = PCF_IN_TEMPLATE;
-      chunk_t     *next = start;
-
-      /**
-       * TODO: for now, just mark the chunks within the template as PCF_IN_TEMPLATE;
-       *       we probably need to create a TemplateParser class to handle all
-       *       things template-related
-       */
-
-      while (true)
-      {
-         next = chunk_get_next_ncnnl(next);
-
-         if (next == end)
-         {
-            break;
-         }
-         chunk_flags_set(next, flags);
-      }
-      LOG_FMT(LTEMPL,
-              "%s(%d): End of template detected: '%s' at orig_line %zu, orig_col %zu\n",
-              __unqualified_func__,
-              __LINE__,
-              end->text(),
-              end->orig_line,
-              end->orig_col);
-   }
-} // EnumStructUnionParser::mark_template_args
-
-
-void EnumStructUnionParser::mark_type(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc != nullptr)
-   {
-      m_type = pc;
-
-      do
-      {
-         make_type(pc);
-         set_chunk_parent(pc, m_start->type);
-         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      } while (chunk_is_pointer_or_reference(pc));
-   }
-} // EnumStructUnionParser::mark_type
-
-
-void EnumStructUnionParser::mark_variable(chunk_t *variable, pcf_flags_t flags)
-{
-   LOG_FUNC_ENTRY();
-
-   if (variable != nullptr)
-   {
-      LOG_FMT(LVARDEF,
-              "%s(%d): Variable definition detected: '%s' at orig_line is %zu, orig_col is %zu, set %s\n",
-              __unqualified_func__,
-              __LINE__,
-              variable->text(),
-              variable->orig_line,
-              variable->orig_col,
-              flags & PCF_VAR_1ST_DEF ? "PCF_VAR_1ST_DEF" : "PCF_VAR_1ST");
-
-      chunk_flags_set(variable, flags);
-      set_chunk_type(variable, CT_WORD);
-      mark_pointer_types(variable);
-   }
-} // EnumStructUnionParser::mark_variable
-
-
-void EnumStructUnionParser::mark_where_clause(chunk_t *where)
-{
-   LOG_FUNC_ENTRY();
-
-   if (where != nullptr)
-   {
-      LOG_FMT(LFTOR,
-              "%s(%d): Where clause detected: orig_line is %zu, orig_col is %zu\n",
-              __unqualified_func__,
-              __LINE__,
-              where->orig_line,
-              where->orig_col);
-   }
-   set_where_start(where);
-
-   auto *where_end   = get_where_end();
-   auto *where_start = get_where_start();
-
-   set_where_end(where_end);
-
-   pcf_flags_t flags;
-
-   for (auto *pc = where_start; pc != where_end; pc = chunk_get_next_ncnnl(pc))
-   {
-      flags = mark_where_chunk(pc, m_start->type, flags);
-   }
-} // EnumStructUnionParser::mark_where_clause
-
-
-void EnumStructUnionParser::mark_where_colon(chunk_t *colon)
-{
-   LOG_FUNC_ENTRY();
-
-   if (colon != nullptr)
-   {
-      LOG_FMT(LFTOR,
-              "%s(%d): Where colon detected: orig_line is %zu, orig_col is %zu\n",
-              __unqualified_func__,
-              __LINE__,
-              colon->orig_line,
-              colon->orig_col);
-   }
-   set_chunk_type(colon, CT_WHERE_COLON);
-   set_chunk_parent(colon, m_start->type);
-} // EnumStructUnionParser::mark_where_colon
-
-
-void EnumStructUnionParser::parse(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   initialize(pc);
-
-   /**
-    * make sure this wasn't a cast, and also make sure we're
-    * actually dealing with a class/enum/struct/union type
-    */
-   if (  get_chunk_parent_type(m_start) == CT_C_CAST
-      || !chunk_is_class_enum_struct_union(m_start))
-   {
-      return;
-   }
-   chunk_t *prev = m_start;
-   chunk_t *next = chunk_get_next_ncnnl(prev);
-
-   /**
-    * the enum-key might be enum, enum class or enum struct
-    */
-   if (chunk_is_enum(next))
-   {
-      prev = next;
-      next = chunk_get_next_ncnnl(prev);
-   }
-   else if (chunk_is_enum(prev))
-   {
-      auto *prev_prev = chunk_get_prev_ncnnlni(prev);
-
-      if (  chunk_is_enum(prev_prev)
-         && chunk_is_enum(prev))
-      {
-         m_start = prev_prev;
-      }
-   }
-   /**
-    * pre-process all chunks between the starting and ending chunks identified
-    * in the initial pass
-    */
-
-   while (chunk_is_between(next, m_start, m_end))
-   {
-      /**
-       * skip attributes
-       */
-      next = skip_attribute(next);
-
-      /**
-       * skip declspec
-       */
-      next = skip_declspec(next);
-
-      /**
-       * skip any right-hand side assignments
-       */
-      if (chunk_is_token(next, CT_ASSIGN))
-      {
-         next = skip_to_expression_end(next);
-      }
-
-      if (  chunk_is_token(next, CT_ANGLE_OPEN)
-         && !template_detected())
-      {
-         next = parse_angles(next);
-      }
-      else if (  chunk_is_token(next, CT_BRACE_OPEN)
-              && !body_detected())
-      {
-         next = parse_braces(next);
-      }
-      else if (chunk_is_colon(next))
-      {
-         parse_colon(next);
-      }
-      else if (chunk_is_token(next, CT_COMMA))
-      {
-         record_top_level_comma(next);
-      }
-      else if (chunk_is_token(next, CT_DC_MEMBER))
-      {
-         next = parse_double_colon(next);
-      }
-      else if (  chunk_is_paren_open(next)
-              && (  language_is_set(LANG_D)
-                 || (  language_is_set(LANG_PAWN)
-                    && chunk_is_enum(m_start))))
-      {
-         set_paren_parent(next, m_start->type);
-
-         if (  chunk_is_token(prev, CT_WORD)
-            && language_is_set(LANG_D))
-         {
-            mark_template(next);
-         }
-         next = chunk_skip_to_match(next, scope_e::PREPROC);
-      }
-      else if (  chunk_is_token(next, CT_QUALIFIER)
-              && language_is_set(LANG_JAVA)
-              && std::strncmp(next->str.c_str(), "implements", 10) == 0)
-      {
-         mark_base_classes(next);
-      }
-      else if (chunk_is_token(next, CT_QUESTION))
-      {
-         record_question_operator(next);
-      }
-      else if (  chunk_is_token(next, CT_WHERE)
-              && !where_clause_detected())
-      {
-         mark_where_clause(next);
-      }
-      prev = next;
-
-      do
-      {
-         next = chunk_get_next_ncnnl(next);
-      } while (  next != nullptr
-              && next->level > m_start->level);
-   }
-   /**
-    * identify the type and/or variable(s)
-    */
-   analyze_identifiers();
-
-   /**
-    * identify and mark lvalues occurring outside the body definition
-    */
-   mark_extracorporeal_lvalues();
-
-   if (  prev != nullptr
-      && chunk_is_semicolon(prev)
-      && prev->level == m_start->level
-      && !prev->flags.test(PCF_IN_FOR))
-   {
-      set_chunk_parent(prev, m_start->type);
-   }
-} // EnumStructUnionParser::parse
-
-
-chunk_t *EnumStructUnionParser::parse_angles(chunk_t *angle_open)
-{
-   LOG_FUNC_ENTRY();
-
-   /**
-    * first check to see if the open angle occurs within an inheritance list
-    */
-   auto *pc = angle_open;
-
-   if (!is_within_inheritance_list(pc))
-   {
-      /**
-       * check to see if there's a matching closing angle bracket
-       */
-      auto *angle_close = chunk_skip_to_match(angle_open, scope_e::PREPROC);
-
-      if (angle_close == nullptr)
-      {
-         // parse error
-         parse_error_detected(true);
-
-         // TODO: should this be just a warning or an error (with exit condition?)
-         LOG_FMT(LWARN,
-                 "%s(%d): Unmatched '<' at orig_line is %zu, orig_col is %zu\n",
-                 __unqualified_func__,
-                 __LINE__,
-                 angle_open->orig_line,
-                 angle_open->orig_col);
-      }
-      else
-      {
-         /**
-          * check to make sure that the template is the final chunk in a list
-          * of scope-resolution qualifications
-          */
-         auto *next = chunk_get_next_ncnnl(angle_close);
-
-         if (chunk_is_not_token(next, CT_DC_MEMBER))
-         {
-            set_template_start(angle_open);
-
-            /**
-             * we could be dealing with a template type; if so, the opening angle
-             * bracket should be preceded by a CT_WORD token and we should have
-             * found a closing angle bracket
-             */
-            auto *prev = chunk_get_prev_ncnnlni(angle_open);
-
-            if (chunk_is_not_token(prev, CT_WORD))
-            {
-               // parse error
-               parse_error_detected(true);
-
-               // TODO: should this be just a warning or an error (with exit condition?)
-               LOG_FMT(LWARN,
-                       "%s(%d): Identifier missing before '<' at orig_line is %zu, orig_col is %zu\n",
-                       __unqualified_func__,
-                       __LINE__,
-                       angle_open->orig_line,
-                       angle_open->orig_col);
-            }
-            else
-            {
-               set_template_end(angle_close);
-               mark_template(angle_open);
-            }
-         }
-         /**
-          * update input argument to point to the closing angle bracket
-          */
-         pc = angle_close;
-      }
-   }
-   return(pc);
-} // EnumStructUnionParser::parse_angles
-
-
-chunk_t *EnumStructUnionParser::parse_braces(chunk_t *brace_open)
-{
-   LOG_FUNC_ENTRY();
-
-   /**
-    * check to see if there's a matching closing brace
-    */
-
-   auto *pc          = brace_open;
-   auto *brace_close = chunk_skip_to_match(pc, scope_e::PREPROC);
-
-   if (brace_close != nullptr)
-   {
-      /**
-       * we could be dealing with a variable definition preceded by
-       * the class/struct keyword. It's possible that the variable is
-       * assigned via direct-list initialization, hence the open brace
-       * is NOT part of a class/struct type definition.
-       */
-      auto *first_comma = get_first_top_level_comma();
-
-      if (chunk_is_after(pc, first_comma))
-      {
-         /**
-          * the open brace occurs after a top-level comma was encountered, which
-          * likely implies a direct-initialization or braced initializer list in
-          * the midst of a list of variable definitions
-          */
-
-         return(pc);
-      }
-      set_body_end(brace_close);
-      set_body_start(brace_open);
-
-      auto *enum_base_start   = get_enum_base_start();
-      auto *inheritance_start = get_inheritance_start();
-      auto *prev              = chunk_get_prev_ncnnlni(pc);
-
-      /**
-       * check to see if the open brace was preceded by a closing paren;
-       * it could possibly be a function-like macro call preceding the
-       * open brace, but it's more likely that we're dealing with a
-       * signature associated with a function definition
-       */
-
-      if (  language_is_set(LANG_D)
-         || language_is_set(LANG_PAWN)
-         || !chunk_is_paren_close(prev)
-         || chunk_is_between(prev, enum_base_start, brace_open)
-         || chunk_is_between(prev, inheritance_start, brace_open))
-      {
-         mark_braces(brace_open);
-
-         /**
-          * D does not require a semicolon after an enum, but we add one to make
-          * other code happy.
-          */
-         if (  language_is_set(LANG_D)
-            && chunk_is_enum(m_start))
-         {
-            pawn_add_vsemi_after(brace_close); // Issue #2279
-         }
-         pc = brace_close;
-      }
-      else
-      {
-         // TODO: should this be just a warning or an error (with exit condition?)
-         LOG_FMT(LWARN,
-                 "%s(%d): Parsing error precedes start of body '{' at orig_line is %zu, orig_col is %zu\n",
-                 __unqualified_func__,
-                 __LINE__,
-                 brace_open->orig_line,
-                 brace_open->orig_col);
-
-         // parse error
-         parse_error_detected(true);
-      }
-   }
-   return(pc);
-} // EnumStructUnionParser::parse_braces
-
-
-void EnumStructUnionParser::parse_colon(chunk_t *colon)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(m_start, CT_UNION))
-   {
-      /**
-       * unions do not implement inheritance
-       */
-
-      // TODO: should this be just a warning or an error (with exit condition?)
-      LOG_FMT(LWARN,
-              "%s(%d): Colon follows union declaration at orig_line is %zu, orig_col is %zu\n",
-              __unqualified_func__,
-              __LINE__,
-              colon->orig_line,
-              colon->orig_col);
-
-      // parse error
-      parse_error_detected(true);
-   }
-   else if (is_within_conditional(colon))
-   {
-      mark_conditional_colon(colon);
-   }
-   else if (is_within_where_clause(colon))
-   {
-      mark_where_colon(colon);
-   }
-   else if (!inheritance_detected())
-   {
-      if (chunk_is_class_or_struct(m_start))
-      {
-         /**
-          * the colon likely specifies an inheritance list for a struct
-          * or class type
-          */
-
-         set_inheritance_start(colon);
-         mark_class_colon(colon);
-      }
-      else if (chunk_is_enum(m_start))
-      {
-         set_enum_base_start(colon);
-         mark_enum_integral_type(colon);
-      }
-   }
-} // EnumStructUnionParser::parse_colon
-
-
-chunk_t *EnumStructUnionParser::parse_double_colon(chunk_t *double_colon)
-{
-   LOG_FUNC_ENTRY();
-
-   auto *pc = double_colon;
-
-   if (  language_is_set(LANG_CPP)
-      && chunk_is_token(pc, CT_DC_MEMBER))
-   {
-      mark_nested_name_specifiers(pc);
-      pc = skip_scope_resolution_and_nested_name_specifiers(pc);
-   }
-   return(pc);
-} // EnumStructUnionParser::parse_double_colon
-
-
-bool EnumStructUnionParser::parse_error_detected() const
-{
-   LOG_FUNC_ENTRY();
-
-   return(m_parse_error);
-} // EnumStructUnionParser::parse_error_detected
-
-
-void EnumStructUnionParser::parse_error_detected(bool status)
-{
-   LOG_FUNC_ENTRY();
-
-   m_parse_error = status;
-} // EnumStructUnionParser::parse_error_detected
-
-
-void EnumStructUnionParser::record_question_operator(chunk_t *question)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(question, CT_QUESTION))
-   {
-      std::size_t index = m_chunk_map[CT_QUESTION].size();
-
-      m_chunk_map[CT_QUESTION][index] = question;
-   }
-} // EnumStructUnionParser::record_question_operator
-
-
-void EnumStructUnionParser::record_top_level_comma(chunk_t *comma)
-{
-   if (  comma != nullptr
-      && comma->level == m_start->level
-      && !is_within_conditional(comma)
-      && !is_within_inheritance_list(comma))
-   {
-      std::size_t index = m_chunk_map[CT_COMMA].size();
-
-      m_chunk_map[CT_COMMA][index] = comma;
-   }
-} // EnumStructUnionParser::record_top_level_comma
-
-
-chunk_t *EnumStructUnionParser::refine_end_chunk(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  (  language_is_set(LANG_C)
-         || language_is_set(LANG_CPP))
-      && chunk_is_token(pc, CT_BRACE_CLOSE))
-   {
-      /**
-       * if dealing with C/C++, one or more trailing variable definitions may
-       * follow the closing brace; a semi-colon should've been good enough to
-       * indicate the terminating condition, however some of the classes defined
-       * in the input tests cases for Continuous Integration DO NOT correctly
-       * terminate classes/struct with a semicolon (which is compilation error).
-       * As a consequence, more checks must be performed to determine where
-       * the terminating chunk is located. For instance, see operator.cpp and
-       * enum_comma.h for examples of offenders
-       */
-      auto *next = chunk_get_next_ncnnl(pc);
-
-      while (true)
-      {
-         if (chunk_is_semicolon(next))
-         {
-            pc = next;
-
-            break;
-         }
-         else
-         {
-            /**
-             * if we're sitting at a comma, skip it
-             */
-            if (chunk_is_token(next, CT_COMMA))
-            {
-               next = chunk_get_next_ncnnl(next);
-            }
-            auto match       = match_variable(next, m_start->level);
-            auto *start      = std::get<0>(match);
-            auto *identifier = std::get<1>(match);
-            auto *end        = std::get<2>(match);
-
-            if (  end == nullptr
-               || identifier == nullptr
-               || start == nullptr)
-            {
-               break;
-            }
-            else
-            {
-               pc = chunk_get_next_ncnnl(end);
-
-               /**
-                * skip any right-hand side assignments
-                */
-               if (chunk_is_token(pc, CT_ASSIGN))
-               {
-                  pc = skip_to_expression_end(pc);
-               }
-               next = pc;
-            }
-         }
-      }
-   }
-   return(pc);
-} // EnumStructUnionParser::refine_end_chunk
-
-
-void EnumStructUnionParser::set_body_end(chunk_t *body_end)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(body_end, CT_BRACE_CLOSE))
-   {
-      m_chunk_map[CT_BRACE_CLOSE][0] = body_end;
-   }
-} // EnumStructUnionParser::set_body_end
-
-
-void EnumStructUnionParser::set_body_start(chunk_t *body_start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(body_start, CT_BRACE_OPEN))
-   {
-      m_chunk_map[CT_BRACE_OPEN][0] = body_start;
-   }
-} // EnumStructUnionParser::set_body_start
-
-
-void EnumStructUnionParser::set_enum_base_start(chunk_t *enum_base_start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_colon(enum_base_start))
-   {
-      m_chunk_map[CT_BIT_COLON][0] = enum_base_start;
-   }
-} // EnumStructUnionParser::set_enum_base_start
-
-
-void EnumStructUnionParser::set_inheritance_start(chunk_t *inheritance_start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_colon(inheritance_start))
-   {
-      m_chunk_map[CT_COLON][0] = inheritance_start;
-   }
-} // EnumStructUnionParser::set_inheritance_start
-
-
-void EnumStructUnionParser::set_template_end(chunk_t *template_end)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(template_end, CT_ANGLE_CLOSE))
-   {
-      m_chunk_map[CT_ANGLE_CLOSE][0] = template_end;
-   }
-} // EnumStructUnionParser::set_template_end
-
-
-void EnumStructUnionParser::set_template_start(chunk_t *template_start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(template_start, CT_ANGLE_OPEN))
-   {
-      m_chunk_map[CT_ANGLE_OPEN][0] = template_start;
-   }
-} // EnumStructUnionParser::set_template_start
-
-
-void EnumStructUnionParser::set_where_end(chunk_t *where_end)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(where_end, CT_BRACE_OPEN))
-   {
-      m_chunk_map[CT_WHERE][0] = where_end;
-   }
-} // EnumStructUnionParser::set_where_end
-
-
-void EnumStructUnionParser::set_where_start(chunk_t *where_start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(where_start, CT_WHERE))
-   {
-      m_chunk_map[CT_WHERE][0] = where_start;
-   }
-} // EnumStructUnionParser::set_where_start
-
-
-bool EnumStructUnionParser::template_detected() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto *template_end   = get_template_end();
-   auto *template_start = get_template_start();
-
-   return(  template_end != nullptr
-         && template_start != nullptr);
-} // EnumStructUnionParser::template_detected
-
-
-chunk_t *EnumStructUnionParser::try_find_end_chunk(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   do
-   {
-      /**
-       * clear some previously marked token types, some of which have likely
-       * been erroneously marked up to this point; a good example of this
-       * arises when macro variables and/or macro function calls follow the
-       * class/enum/struct/union keyword and precede the actual type name
-       */
-      if (  chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_WORD))
-      {
-         set_chunk_type(pc, CT_WORD);
-         set_chunk_parent(pc, CT_NONE);
-      }
-
-      do
-      {
-         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      } while (  pc != nullptr
-              && pc->level > m_start->level);
-   } while (!is_potential_end_chunk(pc));
-
-   /**
-    * perform a second pass for c++ that
-    */
-   pc = refine_end_chunk(pc);
-
-   return(pc);
-} // EnumStructUnionParser::try_find_end_chunk
-
-
-void EnumStructUnionParser::try_post_identify_macro_calls()
-{
-   LOG_FUNC_ENTRY();
-
-   if (  language_is_set(LANG_CPP)
-      && type_identified())
-   {
-      /**
-       * for all chunks at class/enum/struct/union level, identify function-like
-       * macro calls and mark them as CT_MACRO_FUNC_CALL. The reason for doing
-       * so is to avoid mis-interpretation by code executed at a later time
-       */
-
-      auto    *body_start        = get_body_start();
-      auto    *inheritance_start = get_inheritance_start();
-      chunk_t *pc                = m_start;
-      chunk_t *prev              = nullptr;
-
-      do
-      {
-         if (  !chunk_is_between(prev, inheritance_start, body_start)
-            && (  chunk_is_token(prev, CT_WORD)
-               || chunk_is_token(prev, CT_FUNCTION)
-               || chunk_is_token(prev, CT_FUNC_DEF))
-            && !prev->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE)
-            && prev->level == m_start->level)
-         {
-            if (chunk_is_paren_open(pc))
-            {
-               auto *paren_open  = pc;
-               auto *paren_close = chunk_skip_to_match(paren_open, scope_e::PREPROC);
-
-               if (paren_close != nullptr)
-               {
-                  set_chunk_type(paren_open, CT_FPAREN_OPEN);
-                  set_chunk_parent(paren_open, CT_MACRO_FUNC_CALL);
-                  set_chunk_type(paren_close, CT_FPAREN_CLOSE);
-                  set_chunk_parent(paren_close, CT_MACRO_FUNC_CALL);
-                  set_chunk_type(prev, CT_MACRO_FUNC_CALL);
-               }
-            }
-         }
-         prev = pc;
-         pc   = chunk_get_next_ncnnl(prev);
-      } while (chunk_is_between(pc, m_start, m_end));
-   }
-} // EnumStructUnionParser::try_post_identify_macro_calls
-
-
-void EnumStructUnionParser::try_post_identify_type()
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *body_end = get_body_end();
-
-   if (  !type_identified()
-      && body_end == nullptr)
-   {
-      /**
-       * a type wasn't identified and no closing brace is present; we're
-       * likely not dealing with an anonymous enum/class/struct
-       */
-
-      /**
-       * a type has yet to be identified, so search for the last word
-       * that hasn't been marked as a variable
-       */
-      chunk_t *type = nullptr;
-      chunk_t *pc   = m_start;
-
-      do
-      {
-         /**
-          * in case it's a qualified identifier, skip scope-resolution and
-          * nested name specifiers and return just the qualified identifier name
-          */
-         pc = skip_scope_resolution_and_nested_name_specifiers(pc);
-
-         if (pc->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
-         {
-            break;
-         }
-         else if (  chunk_is_token(pc, CT_WORD)
-                 || chunk_is_token(pc, CT_ANGLE_CLOSE))
-         {
-            type = skip_template_prev(pc);
-         }
-         pc = chunk_get_next_ncnnl(pc);
-      } while (chunk_is_between(pc, m_start, m_end));
-
-      if (type != nullptr)
-      {
-         mark_type(type);
-      }
-   }
-} // EnumStructUnionParser::try_post_identify_type
-
-
-bool EnumStructUnionParser::try_pre_identify_type()
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = get_body_start();
-
-   if (  language_is_set(LANG_PAWN)
-      && chunk_is_enum(m_start))
-   {
-      set_paren_parent(pc, m_start->type);
-   }
-   else if (template_detected())
-   {
-      pc = get_template_start();
-   }
-   else if (enum_base_detected())
-   {
-      pc = get_enum_base_start();
-   }
-   else if (inheritance_detected())
-   {
-      pc = get_inheritance_start();
-
-      if (chunk_is_token(m_start, CT_UNION))
-      {
-         /**
-          * unions do not implement inheritance
-          */
-
-         // TODO: should this be just a warning or an error (with exit condition?)
-         LOG_FMT(LWARN,
-                 "%s(%d): Bad union declaration detected at orig_line is %zu, orig_col is %zu\n",
-                 __unqualified_func__,
-                 __LINE__,
-                 m_start->orig_line,
-                 m_start->orig_col);
-
-         parse_error_detected(true);
-
-         return(false);
-      }
-   }
-
-   if (pc == nullptr)
-   {
-      chunk_t *next = chunk_get_next_ncnnl(m_start);
-
-      /**
-       * in case it's a qualified identifier, skip scope-resolution and
-       * nested name specifiers and return just the qualified identifier name
-       */
-      next = skip_scope_resolution_and_nested_name_specifiers(next);
-
-      chunk_t *next_next = chunk_get_next_ncnnl(next);
-
-      /**
-       * in case it's a qualified identifier, skip scope-resolution and
-       * nested name specifiers and return just the qualified identifier name
-       */
-      next_next = skip_scope_resolution_and_nested_name_specifiers(next_next);
-
-      /**
-       * if there is one word between the start and end chunks, then we've likely
-       * identified the type; if there are two words, then the first is likely a
-       * type and the second is an instantiation thereof; however, it is possible
-       * that the first word is actually a reference to a macro definition, in which
-       * the second word would be the type
-       */
-      if (next_next == m_end)
-      {
-         pc = next_next;
-      }
-      else if (  next != nullptr
-              && chunk_is_token(next, CT_WORD)
-              && chunk_is_token(next_next, CT_WORD)
-              && chunk_get_prev_ncnnlni(m_end) == next_next)
-      {
-         /**
-          * check to see if we've got a macro reference preceding the last word chunk;
-          * this won't work in all cases, because a macro may be defined in another header
-          * file, but this is an attempt to increase the chances of identifying the correct
-          * chunk as the type
-          */
-         if (  chunk_is_macro_reference(next)
-            || get_chunk_parent_type(m_start) == CT_TEMPLATE)
-         {
-            pc = m_end;
-         }
-         else
-         {
-            pc = next_next;
-         }
-      }
-      else
-      {
-         /**
-          * search for some common patterns that may indicate a type
-          */
-         chunk_t *prev = m_start;
-
-         while (  chunk_is_between(next, m_start, m_end)
-               && (  (  chunk_is_not_token(next, CT_ASSIGN)
-                     && chunk_is_not_token(next, CT_COMMA))
-                  || next->level != m_start->level)
-               && !chunk_is_semicolon(next))
-         {
-            prev = next;
-            next = chunk_get_next_ncnnl(next);
-
-            /**
-             * in case it's a qualified identifier, skip scope-resolution and
-             * nested name specifiers and return just the qualified identifier name
-             */
-            next = skip_scope_resolution_and_nested_name_specifiers(next);
-
-            if (  chunk_is_token(prev, CT_WORD)
-               && chunk_is_pointer_or_reference(next))
-            {
-               pc = next;
-
-               break;
-            }
-         }
-      }
-   }
-
-   if (pc != nullptr)
-   {
-      /**
-       * the chunk preceding the previously selected chunk should indicate the type
-       */
-
-      pc = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);
-
-      if (  chunk_is_token(pc, CT_QUALIFIER)
-         && std::strncmp(pc->str.c_str(), "final", 5) == 0)
-      {
-         pc = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);
-      }
-
-      if (  language_is_set(LANG_D)
-         && chunk_is_paren_close(pc))
-      {
-         pc = chunk_skip_to_match_rev(pc);
-         pc = chunk_get_prev_ncnnlni(pc);
-      }
-
-      if (chunk_is_token(pc, CT_WORD))
-      {
-         mark_type(pc);
-
-         return(true);
-      }
-   }
-   return(false);
-} // EnumStructUnionParser::try_pre_identify_type
-
-
-bool EnumStructUnionParser::type_identified() const
-{
-   LOG_FUNC_ENTRY();
-
-   return(m_type != nullptr);
-} // EnumStructUnionParser::type_identified
-
-
-/**
- * Returns true if a where clause was detected during parsing
- */
-bool EnumStructUnionParser::where_clause_detected() const
-{
-   LOG_FUNC_ENTRY();
-
-   auto *where_end   = get_where_end();
-   auto *where_start = get_where_start();
-
-   return(  where_end != nullptr
-         && where_start != nullptr);
-} // EnumStructUnionParser::where_clause_detected
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.h
deleted file mode 100644
index b3062d48..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.h
+++ /dev/null
@@ -1,496 +0,0 @@
-/**
- * @file combine_fix_mark_enum_struct_union.h
- *
- * @author
- * @license GPL v2+
- * extract from combine_fix_mark.h
- */
-
-#ifndef ENUM_STRUCT_UNION_PARSER_H_INCLUDED
-#define ENUM_STRUCT_UNION_PARSER_H_INCLUDED
-
-#include "pcf_flags.h"
-#include "token_enum.h"
-#include <map>
-
-
-/**
- * Class EnumStructUnionParser : This class facilitates the parsing and interpretation
- *                               of ALL instances of the class, enum, union, and
- *                               struct keywords, including user-defined types with
- *                               a body {} and any trailing inline variable declarations
- *                               that may follow the definition (as permitted by
- *                               the coding language in question). The class also
- *                               interprets variable declarations preceded by one
- *                               of those keywords, as well as any C/C++ forward
- *                               declarations
- */
-class EnumStructUnionParser
-{
-public:
-   /**
-    * Constructor
-    */
-   EnumStructUnionParser();
-
-
-   /**
-    * Destructor
-    */
-   ~EnumStructUnionParser();
-
-
-private:
-   /**
-    * Analyzes all identifiers (marked as CT_WORD) between the starting and
-    * ending chunks and changes CT_WORD to one of CT_TYPE, CT_MACRO_FUNC_CALL,
-    * etc. and sets flags (PCF_VAR_1ST, PCF_VAR_1ST_DEF, PCF_VAR_INLINE, etc.)
-    * for variable identifiers accordingly. Flags C++ forward declarations as
-    * PCF_INCOMPLETE
-    */
-   void analyze_identifiers();
-
-
-   /**
-    * Returns true if a pair of braces were both detected AND determined to be
-    * part of a class/enum/struct/union body
-    */
-   bool body_detected() const;
-
-
-   /**
-    * Returns true if comma-separated values were detected during parsing
-    */
-   bool comma_separated_values_detected() const;
-
-
-   /**
-    * Returns true if an enumerated integral type was detected during parsing
-    */
-   bool enum_base_detected() const;
-
-
-   /**
-    * Returns the end chunk of a class/enum/struct/union body, if detected
-    * during parsing
-    */
-   struct chunk_t *get_body_end() const;
-
-
-   /**
-    * Returns the starting chunk of a class/enum/struct/union body, if detected
-    * during parsing
-    */
-   struct chunk_t *get_body_start() const;
-
-
-   /**
-    * Returns the starting chunk associated with an enumerated type's base
-    * specifier statement, if detected during parsing
-    */
-   struct chunk_t *get_enum_base_start() const;
-
-
-   /**
-    * Returns the first comma encountered at the level of the starting chunk,
-    * if detected during parsing
-    */
-   struct chunk_t *get_first_top_level_comma() const;
-
-
-   /**
-    * Returns the ending chunk associated with an class/struct inheritance
-    * list, if detected during parsing
-    */
-   struct chunk_t *get_inheritance_end() const;
-
-
-   /**
-    * Returns the starting chunk associated with an class/struct inheritance
-    * list, if detected during parsing
-    */
-   struct chunk_t *get_inheritance_start() const;
-
-
-   /**
-    * Returns a numerically-indexed map of all question operators encountered
-    * during parsing
-    */
-   std::map<std::size_t, struct chunk_t *> get_question_operators() const;
-
-
-   /**
-    * Returns the end chunk associated with a template parameter list, if
-    * detected during parsing
-    */
-   struct chunk_t *get_template_end() const;
-
-
-   /**
-    * Return the starting chunk associated with a template parameter list, if
-    * detected during parsing
-    */
-   struct chunk_t *get_template_start() const;
-
-
-   /**
-    * Returns a numerically-indexed map of all top-level commas encountered
-    * during parsing
-    */
-   std::map<std::size_t, struct chunk_t *> get_top_level_commas() const;
-
-
-   /**
-    * Return the starting chunk associated with a where clause, if
-    * detected during parsing
-    */
-   struct chunk_t *get_where_end() const;
-
-
-   /**
-    * Return the starting chunk associated with a where clause, if
-    * detected during parsing
-    */
-   struct chunk_t *get_where_start() const;
-
-
-   /**
-    * Returns true if an inheritance list associated with a class or struct was
-    * discovered during parsing
-    */
-   bool inheritance_detected() const;
-
-
-public:
-   /**
-    * Performs object initialization prior to parsing
-    */
-   void initialize(struct chunk_t *pc);
-
-
-private:
-   /**
-    * Returns true if the chunk under test represents a potential end chunk past
-    * which further parsing is not likely warranted
-    */
-   bool is_potential_end_chunk(struct chunk_t *pc) const;
-
-
-   /**
-    * Returns true if the chunk under test is deemed to be located within a
-    * conditional/ternary statement
-    */
-   bool is_within_conditional(struct chunk_t *pc) const;
-
-
-   /**
-    * Returns true if the chunk under test is deemed to be located within an
-    * inheritance list
-    */
-   bool is_within_inheritance_list(struct chunk_t *pc) const;
-
-
-   /**
-    * Returns true if the chunk under test is deemed to be located within a
-    * where clause
-    */
-   bool is_within_where_clause(struct chunk_t *pc) const;
-
-
-   /**
-    * Marks all base classes that appear as part of an inheritance list
-    */
-   void mark_base_classes(struct chunk_t *pc);
-
-
-   /**
-    * Marks pairs of braces associated with the body of a class/enum/struct/union,
-    * and additionally calls a separate routine to mark any base classes for that
-    * may precede the opening brace
-    */
-   void mark_braces(struct chunk_t *start);
-
-
-   /**
-    * Marks the beginning chunk of an inheritance list
-    */
-   void mark_class_colon(struct chunk_t *colon);
-
-
-   /**
-    * Mark a colon as a conditional
-    */
-   void mark_conditional_colon(struct chunk_t *colon);
-
-
-   /**
-    * Mark any struct/class constructor declarations/definitions
-    */
-   void mark_constructors();
-
-
-   /**
-    * Marks the beginning chunk of an enumerated integral type specification
-    */
-   void mark_enum_integral_type(struct chunk_t *colon);
-
-
-   /**
-    * Scan chunks outside the definition body and mark lvalues accordingly
-    */
-   void mark_extracorporeal_lvalues();
-
-
-   /**
-    * Mark nested name specifiers preceding qualified identifiers
-    */
-   void mark_nested_name_specifiers(struct chunk_t *pc);
-
-
-   /**
-    * Marks pointer operators preceding a variable identifier
-    */
-   void mark_pointer_types(struct chunk_t *pc);
-
-
-   /**
-    * Marks the beginning and ending chunks associated with a template
-    * (templates may appear after the identifier type name as part of a class
-    * specialization)
-    */
-   void mark_template(struct chunk_t *start) const;
-
-
-   /**
-    * Marks the arguments within a template argument list bounded by the
-    * starting and ending chunks
-    */
-   void mark_template_args(struct chunk_t *start, struct chunk_t *end) const;
-
-
-   /**
-    * Marks the type identifier associated with the class/enum/struct/union,
-    * if not anonymously defined
-    */
-   void mark_type(struct chunk_t *pc);
-
-
-   /**
-    * Marks all variable identifiers associated with the class/enum/struct/union
-    */
-   void mark_variable(struct chunk_t *variable, pcf_flags_t flags);
-
-
-   /**
-    * Marks all chunks belonging to a c# where clause
-    */
-   void mark_where_clause(struct chunk_t *where);
-
-
-   /**
-    * Marks the beginning of a where clause
-    */
-   void mark_where_colon(struct chunk_t *colon);
-
-
-public:
-   /**
-    * Parses the class/enum/struct/union and all associated chunks
-    */
-   void parse(struct chunk_t *pc);
-
-
-private:
-   /**
-    * Parses closing and opening angle brackets
-    */
-   struct chunk_t *parse_angles(struct chunk_t *angle_open);
-
-
-   /**
-    * Parses closing and opening braces
-    */
-   struct chunk_t *parse_braces(struct chunk_t *brace_open);
-
-
-   /**
-    * Parses a single colon, which may precede an inheritance list or
-    * enumerated integral type specification
-    */
-   void parse_colon(struct chunk_t *colon);
-
-
-   /**
-    * Parses a double colon, which may indicate a scope resolution chain
-    */
-   struct chunk_t *parse_double_colon(struct chunk_t *double_colon);
-
-
-   /**
-    * Returns the parsing error status
-    */
-   bool parse_error_detected() const;
-
-
-   /**
-    * Sets the parsing error status
-    */
-   void parse_error_detected(bool status);
-
-
-   /**
-    * Records all question operators encountered during parsing
-    */
-   void record_question_operator(struct chunk_t *question);
-
-
-   /**
-    * Records a comma chunk given one the following conditions are satisfied:
-    * 1) it is encountered at the level of the starting chunk
-    * 2) it is not part of a right-hand side assignment
-    * 3) it is not part of an inheritance list
-    * 4) it is not part of a conditional/ternary expression
-    */
-   void record_top_level_comma(struct chunk_t *comma);
-
-
-   /**
-    * Adjusts the end chunk returned by the try_find_end_chunk() function
-    * for any potential trailing inline variable declarations that may follow
-    * the body of a class/enum/struct/union definition
-    */
-   struct chunk_t *refine_end_chunk(struct chunk_t *pc);
-
-
-   /**
-    * Sets the chunk associated with the end of a class/enum/struct/union
-    * body
-    */
-   void set_body_end(struct chunk_t *body_end);
-
-
-   /**
-    * Sets the chunk associated with the start of a class/enum/struct/union
-    * body
-    */
-   void set_body_start(struct chunk_t *body_start);
-
-
-   /**
-    * Sets the chunk associated with the start of an enumerated integral
-    * base type specification
-    */
-   void set_enum_base_start(struct chunk_t *enum_base_start);
-
-
-   /**
-    * Sets the chunk associated with the start of an inheritance list
-    */
-   void set_inheritance_start(struct chunk_t *inheritance_start);
-
-
-   /**
-    * Sets the chunk associated with the end of a template
-    */
-   void set_template_end(struct chunk_t *template_end);
-
-
-   /**
-    * Sets the chunk associated with the start of a template
-    */
-   void set_template_start(struct chunk_t *template_start);
-
-
-   /**
-    * Return the ending chunk associated with a where clause, if
-    * detected during parsing
-    */
-   void set_where_end(struct chunk_t *where_end);
-
-
-   /**
-    * Return the starting chunk associated with a where clause, if
-    * detected during parsing
-    */
-   void set_where_start(struct chunk_t *where_start);
-
-
-   /**
-    * Returns true if a template was detected during parsing
-    */
-   bool template_detected() const;
-
-
-   /**
-    * Attempts to find the last chunk associated with the class/enum/struct/union
-    */
-   struct chunk_t *try_find_end_chunk(struct chunk_t *pc);
-
-
-   /**
-    * Attempts to identify any function-like macro calls which may precede the
-    * actual type identifier
-    */
-   void try_post_identify_macro_calls();
-
-
-   /**
-    * Attempts to find the identifier type name (if not anonymously-defined) post
-    * variable identifier interpretation
-    */
-   void try_post_identify_type();
-
-
-   /**
-    * Attempts to find the identifier type name prior to variable identifier
-    * interpretation
-    */
-   bool try_pre_identify_type();
-
-
-   /**
-    * Returns true if a corresponding type was identified for the class/enum/struct/union
-    */
-   bool type_identified() const;
-
-
-   /**
-    * Returns true if a where clause was detected during parsing
-    */
-   bool where_clause_detected() const;
-
-
-   /**
-    * Map of token-type, chunk pairs
-    */
-   std::map<c_token_t, std::map<std::size_t, struct chunk_t *> > m_chunk_map;
-
-
-   /**
-    * Indicates the last chunk associated with the class/enum/struct/union keyword
-    */
-   struct chunk_t *m_end;
-
-
-   /**
-    * Indicates whether or not a parse error has occurred
-    */
-   bool m_parse_error;
-
-
-   /**
-    * Stores a pointer to the class/enum/struct/union keyword chunk with which the
-    * parse() routine was invoked
-    */
-   struct chunk_t *m_start;
-
-
-   /**
-    * Stores a pointer to the type identifier associated with the class/enum/struct/union,
-    * if not anonymously defined
-    */
-   struct chunk_t *m_type;
-};
-
-
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ListManager.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ListManager.h
deleted file mode 100644
index 1b45c2a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ListManager.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * @file ListManager.h
- * Template class that manages items in a double-linked list.
- * If C++ could do it, this would just be a class that worked on an interface.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef LIST_MANAGER_H_INCLUDED
-#define LIST_MANAGER_H_INCLUDED
-
-/*
- * TODO: why do we provide this template class? can't we use
- * a double linked list std::deque from the standard library ?
- */
-/**
- * A simple list manager for a double-linked list.
- * Class T must define 'next' and 'prev', which must be pointers to type T.
- */
-template<class T>
-class ListManager
-{
-protected:
-   T *first; //! pointer to the head of list
-   T *last;  //! pointer to tail of list
-
-private:
-   // Hide copy constructor
-   ListManager(const ListManager &ref)
-   {
-      first = NULL;
-      last  = NULL;
-   }
-
-public:
-   ListManager()
-   {
-      first = NULL;
-      last  = NULL;
-   }
-
-
-   /**
-    * @brief return the first element of the linked list
-    *
-    * @return pointer to first element or nullptr if list is empty
-    */
-   T *GetHead()
-   {
-      return(first);
-   }
-
-
-   /**
-    * @brief return the last element of the linked list
-    *
-    * @return pointer to last element or nullptr if list is empty
-    */
-   T *GetTail()
-   {
-      return(last);
-   }
-
-
-   /**
-    *  @brief return the next element of the linked list
-    *
-    * @param[in] ref  pointer to current list element
-    *
-    * @return pointer to next element or nullptr if no next element exists
-    */
-   T *GetNext(T *ref)
-   {
-      return((ref != NULL) ? ref->next : NULL);
-   }
-
-
-   /**
-    * @brief return the previous element of the linked list
-    *
-    * @param[in] ref  pointer to current list element
-    *
-    * @return pointer to previous element or nullptr if no previous element exists
-    */
-   T *GetPrev(T *ref)
-   {
-      return((ref != NULL) ? ref->prev : NULL);
-   }
-
-
-   void InitEntry(T *obj) const
-   {
-      if (obj != NULL)
-      {
-         obj->next = NULL;
-         obj->prev = NULL;
-      }
-   }
-
-
-   /**
-    * @brief remove an element from a linked list
-    *
-    * @param[in] obj  list element to remove
-    */
-   void Pop(T *obj)
-   {
-      if (obj != NULL)
-      {
-         if (first == obj)
-         {
-            first = obj->next;
-         }
-
-         if (last == obj)
-         {
-            last = obj->prev;
-         }
-
-         if (obj->next != NULL)
-         {
-            obj->next->prev = obj->prev;
-         }
-
-         if (obj->prev != NULL)
-         {
-            obj->prev->next = obj->next;
-         }
-         obj->next = NULL;
-         obj->prev = NULL;
-      }
-   }
-
-
-   //! swap two elements of a list
-   void Swap(T *obj1, T *obj2)
-   {
-      if (  obj1 != NULL
-         && obj2 != NULL)
-      {
-         if (obj1->prev == obj2)
-         {
-            Pop(obj1);
-            AddBefore(obj1, obj2);
-         }
-         else if (obj2->prev == obj1)
-         {
-            Pop(obj2);
-            AddBefore(obj2, obj1);
-         }
-         else
-         {
-            T *prev1 = obj1->prev;
-            Pop(obj1);
-
-            T *prev2 = obj2->prev;
-            Pop(obj2);
-
-            AddAfter(obj1, prev2);
-            AddAfter(obj2, prev1);
-         }
-      }
-   }
-
-
-   /**
-    * @brief add a new element after a reference position in a list
-    *
-    * @param obj  new element to add to list
-    * @param ref  chunk after which to insert new object
-    */
-   void AddAfter(T *obj, T *ref)
-   {
-      if (  obj != NULL
-         && ref != NULL)
-      {
-         Pop(obj); // TODO: is this necessary?
-         obj->next = ref->next;
-         obj->prev = ref;
-
-         if (ref->next != NULL)
-         {
-            ref->next->prev = obj;
-         }
-         else
-         {
-            last = obj;
-         }
-         ref->next = obj;
-      }
-   }
-
-
-   /**
-    * @brief add a new element before a reference position in a list
-    *
-    * @param obj  new element to add to list
-    * @param ref  chunk before to insert new object
-    */
-   void AddBefore(T *obj, T *ref)
-   {
-      if (  obj != NULL
-         && ref != NULL)
-      {
-         Pop(obj);
-         obj->next = ref;
-         obj->prev = ref->prev;
-
-         if (ref->prev != NULL)
-         {
-            ref->prev->next = obj;
-         }
-         else
-         {
-            first = obj;
-         }
-         ref->prev = obj;
-      }
-   }
-
-
-   /**
-    * @brief add a new element to the tail of a lis
-    *
-    * @param obj  new element to add to the list
-    */
-   void AddTail(T *obj)
-   {
-      obj->next = NULL;
-      obj->prev = last;
-
-      if (last == NULL)
-      {
-         last  = obj;
-         first = obj;
-      }
-      else
-      {
-         last->next = obj;
-      }
-      last = obj;
-   }
-
-
-   /**
-    * @brief add a new element to the head of a list
-    *
-    * @param obj  new element to add to the list
-    */
-   void AddHead(T *obj)
-   {
-      obj->next = first;
-      obj->prev = NULL;
-
-      if (first == NULL)
-      {
-         last  = obj;
-         first = obj;
-      }
-      else
-      {
-         first->prev = obj;
-      }
-      first = obj;
-   }
-};
-
-
-#endif /* LIST_MANAGER_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.cpp
deleted file mode 100644
index 7ac3f66d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/**
- * @file ParseFrame.cpp
- *
- * Container that holds data needed for indenting and brace parsing
- *
- * @author  Daniel Chumak
- * @license GPL v2+
- */
-
-#include "ParseFrame.h"
-
-#include "uncrustify.h"
-
-#include <stdexcept>            // to get std::logic_error
-
-
-using std::string;
-using std::to_string;
-using std::logic_error;
-using std::invalid_argument;
-
-using ContainerType = paren_stack_entry_t;
-using Container     = std::vector<ContainerType>;
-
-
-//! amount of elements for which memory is going to be pre-initialized
-static constexpr const int CONTAINER_INIT_SIZE = 16;
-
-
-static ContainerType genDummy()
-{
-   ContainerType tmp_dummy{};
-
-   tmp_dummy.indent     = 1;
-   tmp_dummy.indent_tmp = 1;
-   tmp_dummy.indent_tab = 1;
-   tmp_dummy.type       = CT_EOF;
-
-   return(tmp_dummy);
-}
-
-
-void ParseFrame::clear()
-{
-   last_poped = genDummy();
-
-   pse = Container{};
-   pse.reserve(CONTAINER_INIT_SIZE);
-   pse.push_back(genDummy());
-
-   ref_no       = 0;
-   level        = 0;
-   brace_level  = 0;
-   pp_level     = 0;
-   sparen_count = 0;
-   paren_count  = 0;
-   in_ifdef     = c_token_t::CT_NONE;
-   stmt_count   = 0;
-   expr_count   = 0;
-}
-
-
-ParseFrame::ParseFrame()
-{
-   ParseFrame::clear();
-}
-
-
-bool ParseFrame::empty() const
-{
-   // always at least one (dummy) element inside pse guaranteed
-   return(false);
-//   return(pse.empty());
-}
-
-
-ContainerType &ParseFrame::at(size_t idx)
-{
-   return(pse.at(idx));
-}
-
-
-const ContainerType &ParseFrame::at(size_t idx) const
-{
-   return(pse.at(idx));
-}
-
-
-ContainerType &ParseFrame::prev(size_t idx)
-{
-   LOG_FUNC_ENTRY();
-
-   if (idx == 0)
-   {
-      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
-                             + " idx can't be zero");
-   }
-
-   if (idx >= pse.size())
-   {
-      LOG_FMT(LINDPSE, "%s(%d): idx is %zu, size is %zu\n",
-              __func__, __LINE__, idx, pse.size());
-      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
-                             + " idx can't be >= size()");
-   }
-   return(*std::prev(std::end(pse), idx + 1));
-}
-
-
-const ContainerType &ParseFrame::prev(size_t idx) const
-{
-   LOG_FUNC_ENTRY();
-
-   if (  idx == 0
-      || idx >= pse.size())
-   {
-      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
-                             + " idx can't be zero or >= size()");
-   }
-   return(*std::prev(std::end(pse), idx + 1));
-}
-
-
-ContainerType &ParseFrame::top()
-{
-   // always at least one (dummy) element inside pse guaranteed
-//   if (pse.empty())
-//   {
-//      throw logic_error(string(__FILE__) + ":" + to_string(__LINE__)
-//                        + " called top on an empty stack");
-//   }
-   return(*std::prev(std::end(pse)));
-}
-
-
-const ContainerType &ParseFrame::top() const
-{
-   // always at least one (dummy) element inside pse guaranteed
-//   if (pse.empty())
-//   {
-//      throw logic_error(string(__FILE__) + ":" + to_string(__LINE__)
-//                        + " called top on an empty stack");
-//   }
-   return(*std::prev(std::end(pse)));
-}
-
-
-void ParseFrame::push(std::nullptr_t, brace_stage_e stage)
-{
-   static chunk_t dummy;
-
-   push(&dummy, __func__, __LINE__, stage);
-   top().pc = nullptr;
-}
-
-
-void ParseFrame::push(chunk_t *pc, const char *func, int line, brace_stage_e stage)
-{
-   LOG_FUNC_ENTRY();
-
-   ContainerType new_entry = {};
-
-   new_entry.type      = pc->type;
-   new_entry.level     = pc->level;
-   new_entry.open_line = pc->orig_line;
-   new_entry.open_colu = pc->orig_col;
-   new_entry.pc        = pc;
-
-   new_entry.indent_tab  = top().indent_tab;
-   new_entry.indent_cont = top().indent_cont;
-   new_entry.stage       = stage;
-
-   new_entry.in_preproc = pc->flags.test(PCF_IN_PREPROC);
-   new_entry.non_vardef = false;
-   new_entry.ip         = top().ip;
-
-   pse.push_back(new_entry);
-
-// un comment the line below to get the address of the pse
-// #define DEBUG_PUSH_POP
-#ifdef DEBUG_PUSH_POP
-   LOG_FMT(LINDPSE, "ParseFrame::push(%s:%d) Add is %zu: orig_line is %zu, orig_col is %zu, type is %s, "
-           "brace_level is %zu, level is %zu, pse_tos: %zu -> %zu\n",
-           func, line, (size_t)this, pc->orig_line, pc->orig_col,
-           get_token_name(pc->type), pc->brace_level, pc->level,
-           (pse.size() - 2), (pse.size() - 1));
-#else /* DEBUG_PUSH_POP */
-   LOG_FMT(LINDPSE, "ParseFrame::push(%s:%d): orig_line is %zu, orig_col is %zu, type is %s, "
-           "brace_level is %zu, level is %zu, pse_tos: %zu -> %zu\n",
-           func, line, pc->orig_line, pc->orig_col,
-           get_token_name(pc->type), pc->brace_level, pc->level,
-           (pse.size() - 2), (pse.size() - 1));
-#endif /* DEBUG_PUSH_POP */
-}
-
-
-void ParseFrame::pop(const char *func, int line)
-{
-   LOG_FUNC_ENTRY();
-
-   // always at least one (dummy) element inside pse guaranteed
-//   if (pse.empty())
-//   {
-//      throw logic_error(string(__FILE__) + ":" + to_string(__LINE__)
-//                        + "the stack index is already zero");
-//   }
-
-#ifdef DEBUG_PUSH_POP
-   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d) Add is %zu: open_line is %zu, clos_col is %zu, type is %s, "
-           "cpd.level   is %d, level is %zu, pse_tos: %zu -> %zu\n",
-           func, line, (size_t)this, pse.back().open_line, pse.back().open_colu,
-           get_token_name(pse.back().type), cpd.pp_level, pse.back().level,
-           (pse.size() - 1), (pse.size() - 2));
-#else /* DEBUG_PUSH_POP */
-   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): open_line is %zu, clos_col is %zu, type is %s, "
-           "cpd.level   is %d, level is %zu, pse_tos: %zu -> %zu\n",
-           func, line, pse.back().open_line, pse.back().open_colu,
-           get_token_name(pse.back().type), cpd.pp_level, pse.back().level,
-           (pse.size() - 1), (pse.size() - 2));
-#endif /* DEBUG_PUSH_POP */
-
-   last_poped = *std::prev(std::end(pse));
-
-   if (pse.size() == 1)
-   {
-      *std::begin(pse) = genDummy();
-   }
-   else
-   {
-      pse.pop_back();
-   }
-}
-
-
-size_t ParseFrame::size() const
-{
-   // always at least one (dummy) element inside pse guaranteed
-   return(pse.size());
-}
-
-
-const paren_stack_entry_t &ParseFrame::poped() const
-{
-   return(last_poped);
-}
-
-
-// TODO C++14: see abstract versions: std::rend, std::cend, std::crend ...
-ParseFrame::iterator ParseFrame::begin()
-{
-   return(std::begin(pse));
-}
-
-
-ParseFrame::const_iterator ParseFrame::begin() const
-{
-   return(std::begin(pse));
-}
-
-
-ParseFrame::reverse_iterator ParseFrame::rbegin()
-{
-   return(pse.rbegin());
-}
-
-
-ParseFrame::const_reverse_iterator ParseFrame::rbegin() const
-{
-   return(pse.rbegin());
-}
-
-
-ParseFrame::iterator ParseFrame::end()
-{
-   return(std::end(pse));
-}
-
-
-ParseFrame::const_iterator ParseFrame::end() const
-{
-   return(std::end(pse));
-}
-
-
-ParseFrame::reverse_iterator ParseFrame::rend()
-{
-   return(pse.rend());
-}
-
-
-ParseFrame::const_reverse_iterator ParseFrame::rend() const
-{
-   return(pse.rend());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.h
deleted file mode 100644
index cad34ab3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file ParseFrame.h
- *
- * Container that holds data needed for indenting and brace parsing
- *
- * @author  Daniel Chumak
- * @license GPL v2+
- */
-
-#ifndef SRC_PARSEFRAME_H_
-#define SRC_PARSEFRAME_H_
-
-#include "uncrustify_types.h"
-
-#include <memory>
-
-
-//! Structure for counting nested level
-struct paren_stack_entry_t
-{
-   c_token_t     type;         //! the type that opened the entry
-   size_t        level;        //! Level of opening type
-   size_t        open_line;    //! line that open symbol is on, only for logging purposes
-   size_t        open_colu;    //! column that open symbol is on, only for logging purposes
-   chunk_t       *pc;          //! Chunk that opened the level, TODO: make const
-   size_t        brace_indent; //! indent for braces - may not relate to indent
-   size_t        indent;       //! indent level (depends on use)
-   size_t        indent_tmp;   //! temporary indent level (depends on use)
-   size_t        indent_tab;   //! the 'tab' indent (always <= real column)
-   bool          indent_cont;  //! indent_continue was applied
-   c_token_t     parent;       //! if, for, function, etc
-   brace_stage_e stage;        //! used to check progression of complex statements.
-   bool          in_preproc;   //! whether this was created in a preprocessor
-   size_t        ns_cnt;       //! Number of consecutive namespace levels
-   bool          non_vardef;   //! Hit a non-vardef line
-   indent_ptr_t  ip;
-   chunk_t       *pop_pc;
-};
-
-class ParseFrame
-{
-private:
-   std::vector<paren_stack_entry_t> pse;
-   paren_stack_entry_t              last_poped;
-
-   void clear();
-
-public:
-   size_t    ref_no;
-   size_t    level;           //! level of parens/square/angle/brace
-   size_t    brace_level;     //! level of brace/vbrace
-   size_t    pp_level;        //! level of preproc #if stuff
-   size_t    sparen_count;
-   size_t    paren_count;
-   c_token_t in_ifdef;
-   size_t    stmt_count;
-   size_t    expr_count;
-
-
-   ParseFrame();
-   virtual ~ParseFrame() = default;
-
-   bool empty() const;
-
-   paren_stack_entry_t &at(size_t idx);
-   const paren_stack_entry_t &at(size_t idx) const;
-
-   paren_stack_entry_t &prev(size_t idx = 1);
-   const paren_stack_entry_t &prev(size_t idx = 1) const;
-
-   paren_stack_entry_t &top();
-   const paren_stack_entry_t &top() const;
-
-   const paren_stack_entry_t &poped() const;
-
-   void push(chunk_t *pc, const char *func, int line, brace_stage_e stage = brace_stage_e::NONE);
-   void push(std::nullptr_t, brace_stage_e stage = brace_stage_e::NONE);
-   void pop(const char *func, int line);
-
-   size_t size() const;
-
-   using iterator = std::vector<paren_stack_entry_t>::iterator;
-   iterator begin();
-   iterator end();
-
-   using const_iterator = std::vector<paren_stack_entry_t>::const_iterator;
-   const_iterator begin() const;
-   const_iterator end() const;
-
-   using reverse_iterator = std::vector<paren_stack_entry_t>::reverse_iterator;
-   reverse_iterator rbegin();
-   reverse_iterator rend();
-
-   using const_reverse_iterator = std::vector<paren_stack_entry_t>::const_reverse_iterator;
-   const_reverse_iterator rbegin() const;
-   const_reverse_iterator rend() const;
-};
-
-#endif /* SRC_PARSEFRAME_H_ */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/add_space_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/add_space_table.h
deleted file mode 100644
index 759507b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/add_space_table.h
+++ /dev/null
@@ -1,302 +0,0 @@
-// *INDENT-OFF*
-   { CT_ACCESS,                CT_TYPE                  },
-   { CT_ACCESS,                CT_WORD                  },
-   { CT_ALIGN,                 CT_PAREN_OPEN            },
-   { CT_AMP,                   CT_WORD                  },
-   { CT_ANGLE_CLOSE,           CT_BRACE_OPEN            },
-   { CT_ANNOTATION,            CT_ANNOTATION            },
-   { CT_ANNOTATION,            CT_TYPE                  },
-   { CT_ASM_COLON,             CT_ASM_COLON             },
-   { CT_ASM_COLON,             CT_STRING                },
-   { CT_ASM,                   CT_FUNC_CALL             },
-   { CT_ASM,                   CT_PAREN_OPEN            },
-   { CT_ASM,                   CT_QUALIFIER             },
-   { CT_ASSERT,                CT_PAREN_OPEN            },
-   { CT_ASSIGN_FUNC_PROTO,     CT_DEFAULT               },
-   { CT_ASSIGN_FUNC_PROTO,     CT_DELETE                },
-   { CT_ASSIGN_FUNC_PROTO,     CT_NUMBER                },
-   { CT_ATTRIBUTE,             CT_ATTRIBUTE             },
-   { CT_ATTRIBUTE,             CT_BRACE_OPEN            },
-   { CT_ATTRIBUTE,             CT_CASE                  },
-   { CT_ATTRIBUTE,             CT_QUALIFIER             },
-   { CT_ATTRIBUTE,             CT_TYPE                  },
-   { CT_ATTRIBUTE,             CT_WORD                  },
-   { CT_AUTORELEASEPOOL,       CT_BRACE_OPEN            },
-   { CT_BIT_COLON,             CT_NUMBER                },
-   { CT_BIT_COLON,             CT_SIZEOF                },
-   { CT_BIT_COLON,             CT_TYPE                  },
-   { CT_BIT_COLON,             CT_WORD                  },
-   { CT_BODY,                  CT_BRACE_OPEN            },
-   { CT_BRACE_CLOSE,           CT_BRACE_OPEN            },
-   { CT_BRACE_CLOSE,           CT_CLASS                 },
-   { CT_BRACE_CLOSE,           CT_FUNC_CALL             },
-   { CT_BRACE_CLOSE,           CT_GETSET                },
-   { CT_BRACE_CLOSE,           CT_IF                    },
-   { CT_BRACE_CLOSE,           CT_OC_MSG_NAME           },
-   { CT_BRACE_CLOSE,           CT_PAREN_OPEN            },
-   { CT_BRACE_CLOSE,           CT_QUALIFIER             },
-   { CT_BRACE_CLOSE,           CT_RETURN                },
-   { CT_BRACE_CLOSE,           CT_TYPE                  },
-   { CT_BRACE_CLOSE,           CT_WORD                  },
-   { CT_BREAK,                 CT_WORD                  },
-   { CT_BYREF,                 CT_INV                   },
-   { CT_CASE_COLON,            CT_ATTRIBUTE             },
-   { CT_CASE_COLON,            CT_BRACE_OPEN            },
-   { CT_CASE_COLON,            CT_BREAK                 },
-   { CT_CASE_COLON,            CT_RETURN                },
-   { CT_CASE_COLON,            CT_WORD                  },
-   { CT_CASE,                  CT_NEG                   },
-   { CT_CASE,                  CT_PAREN_OPEN            },
-   { CT_CASE,                  CT_STRING                },
-   { CT_CASE_ELLIPSIS,         CT_NUMBER                },
-   { CT_CATCH,                 CT_FUNC_CALL             },
-   { CT_CLASS_COLON,           CT_FUNC_CALL             },
-   { CT_CLASS_COLON,           CT_QUALIFIER             },
-   { CT_CLASS_COLON,           CT_TYPE                  },
-   { CT_CLASS_COLON,           CT_WORD                  },
-   { CT_COLON,                 CT_COLON                 },
-   { CT_COLON,                 CT_NUMBER                },
-   { CT_COLON,                 CT_QUALIFIER             },
-   { CT_COLON,                 CT_STRING                },
-   { CT_COLON,                 CT_TYPE                  },
-   { CT_COLON,                 CT_WORD                  },
-   { CT_COMMENT_EMBED,         CT_FUNC_CLASS_PROTO      },
-   { CT_COMMENT_MULTI,         CT_ELSE                  },
-   { CT_CONCAT,                CT_STRING                },
-   { CT_CONCAT,                CT_WORD                  },
-   { CT_COND_COLON,            CT_FUNC_CALL             },
-   { CT_COND_COLON,            CT_STRING                },
-   { CT_COND_COLON,            CT_WORD                  },
-   { CT_CONSTR_COLON,          CT_FUNC_CALL             },
-   { CT_CONSTR_COLON,          CT_FUNC_CLASS_DEF        },
-   { CT_CONSTR_COLON,          CT_FUNC_CTOR_VAR         },
-   { CT_CONSTRUCT,             CT_TYPE                  },
-   { CT_CONTINUE,              CT_WORD                  },
-   { CT_CS_PROPERTY,           CT_BRACE_OPEN            },
-   { CT_DEFAULT,               CT_STRING                },
-   { CT_DEFAULT,               CT_WORD                  },
-   { CT_DELEGATE,              CT_BRACE_OPEN            },
-   { CT_D_MODULE,              CT_WORD                  },
-   { CT_ELLIPSIS,              CT_NUMBER                },
-   { CT_ELSE,                  CT_FOR                   },
-   { CT_ELSE,                  CT_IF                    },
-   { CT_ELSE,                  CT_PAREN_OPEN            },
-   { CT_ELSE,                  CT_WORD                  },
-   { CT_ELSEIF,                CT_CONSTEXPR             },
-   { CT_ENUM_CLASS,            CT_ATTRIBUTE             },
-   { CT_ENUM_CLASS,            CT_TYPE                  },
-   { CT_ENUM,                  CT_ATTRIBUTE             },
-   { CT_ENUM,                  CT_BIT_COLON             },
-   { CT_ENUM,                  CT_BRACE_OPEN            },
-   { CT_ENUM,                  CT_ENUM_CLASS            },
-   { CT_ENUM,                  CT_FPAREN_OPEN           },
-   { CT_ENUM,                  CT_FUNCTION              },
-   { CT_ENUM,                  CT_TYPE                  },
-   { CT_ENUM,                  CT_WORD                  },
-   { CT_EXECUTION_CONTEXT,     CT_EXECUTION_CONTEXT     },
-   { CT_EXECUTION_CONTEXT,     CT_FPAREN_OPEN           },
-   { CT_EXTERN,                CT_STRING                },
-   { CT_FPAREN_CLOSE,          CT_ASSIGN_FUNC_PROTO     },
-   { CT_FPAREN_CLOSE,          CT_ATTRIBUTE             },
-   { CT_FPAREN_CLOSE,          CT_CLASS_COLON           },
-   { CT_FPAREN_CLOSE,          CT_COND_COLON            },
-   { CT_FPAREN_CLOSE,          CT_CONSTR_COLON          },
-   { CT_FPAREN_CLOSE,          CT_DEFAULT               },
-   { CT_FPAREN_CLOSE,          CT_FUNC_CALL             },
-   { CT_FPAREN_CLOSE,          CT_NEG                   },
-   { CT_FPAREN_CLOSE,          CT_NOT                   },
-   { CT_FPAREN_CLOSE,          CT_OC_MSG_NAME           },
-   { CT_FPAREN_CLOSE,          CT_QUESTION              },
-   { CT_FPAREN_CLOSE,          CT_STRING                },
-   { CT_FPAREN_CLOSE,          CT_THROW                 },
-   { CT_FPAREN_CLOSE,          CT_TYPE                  },
-   { CT_FPAREN_CLOSE,          CT_WHERE_SPEC            },
-   { CT_FPAREN_CLOSE,          CT_WORD                  },
-   { CT_FRIEND,                CT_CLASS                 },
-   { CT_FRIEND,                CT_STRUCT                },
-   { CT_FRIEND,                CT_TYPE                  },
-   { CT_FUNCTION,              CT_PAREN_OPEN            },
-   { CT_FUNC_VAR,              CT_PPAREN_CLOSE          },
-   { CT_GOTO,                  CT_WORD                  },
-   { CT_IF,                    CT_CONSTEXPR             },
-   { CT_IMPORT,                CT_WORD                  },
-   { CT_INCDEC_AFTER,          CT_DEREF                 },
-   { CT_IN,                    CT_TYPE                  },
-   { CT_IN,                    CT_WORD                  },
-   { CT_LABEL_COLON,           CT_CS_PROPERTY           },
-   { CT_LABEL_COLON,           CT_FUNC_CALL             },
-   { CT_LABEL_COLON,           CT_NEW                   },
-   { CT_LABEL_COLON,           CT_PAREN_OPEN            },
-   { CT_LABEL_COLON,           CT_RETURN                },
-   { CT_LABEL_COLON,           CT_STRING                },
-   { CT_LABEL_COLON,           CT_TYPE                  },
-   { CT_LABEL_COLON,           CT_WORD                  },
-   { CT_LOCK,                  CT_PAREN_OPEN            },
-   { CT_NAMESPACE,             CT_BRACE_OPEN            },
-   { CT_NAMESPACE,             CT_TYPE                  },
-   { CT_NAMESPACE,             CT_WORD                  },
-   { CT_NATIVE,                CT_TAG                   },
-   { CT_NUMBER,                CT_CASE_ELLIPSIS         },
-   { CT_NUMBER,                CT_CHAR                  },
-   { CT_NUMBER,                CT_COLON                 },
-   { CT_NUMBER,                CT_ELLIPSIS              },
-   { CT_NUMBER,                CT_OC_MSG_NAME           },
-   { CT_NUMBER,                CT_PAREN_OPEN            },
-   { CT_NUMBER,                CT_WORD                  },
-   { CT_NUMBER_FP,             CT_NUMBER                },
-   { CT_NUMBER_FP,             CT_OC_MSG_NAME           },
-   { CT_NUMBER_FP,             CT_WORD                  },
-   { CT_OC_CLASS,              CT_CLASS_COLON           },
-   { CT_OC_CLASS,              CT_PAREN_OPEN            },
-   { CT_OC_DYNAMIC,            CT_WORD                  },
-   { CT_OC_IMPL,               CT_OC_CLASS              },
-   { CT_OC_INTF,               CT_OC_CLASS              },
-   { CT_OC_MSG_DECL,           CT_BRACE_OPEN            },
-   { CT_OC_PROTOCOL,           CT_OC_CLASS              },
-   { CT_PACKAGE,               CT_WORD                  },
-   { CT_PAREN_CLOSE,           CT_ASM_COLON             },
-   { CT_PAREN_CLOSE,           CT_COLON                 },
-   { CT_PAREN_CLOSE,           CT_COND_COLON            },
-   { CT_PAREN_CLOSE,           CT_CS_PROPERTY           },
-   { CT_PAREN_CLOSE,           CT_DEREF                 },
-   { CT_PAREN_CLOSE,           CT_NOT                   },
-   { CT_PAREN_CLOSE,           CT_NUMBER                },
-   { CT_PAREN_CLOSE,           CT_OC_MSG_NAME           },
-   { CT_PAREN_CLOSE,           CT_POS                   },
-   { CT_PAREN_CLOSE,           CT_QUALIFIER             },
-   { CT_PAREN_CLOSE,           CT_TYPE                  },
-   { CT_PP_DEFINE,             CT_MACRO                 },
-   { CT_PP_DEFINE,             CT_MACRO_FUNC            },
-   { CT_PP_DEFINE,             CT_NUMBER                },
-   { CT_PP_DEFINE,             CT_PP_IGNORE             },
-   { CT_PP_DEFINED,            CT_TYPE                  },
-   { CT_PP_DEFINED,            CT_WORD                  },
-   { CT_PP_ELSE,               CT_FUNC_CALL             },
-   { CT_PP_ELSE,               CT_NOT                   },
-   { CT_PP_ELSE,               CT_NUMBER                },
-   { CT_PP_ELSE,               CT_PAREN_OPEN            },
-   { CT_PP_ELSE,               CT_PP_DEFINED            },
-   { CT_PP_ELSE,               CT_WORD                  },
-   { CT_PP_EMIT,               CT_MACRO                 },
-   { CT_PP_ENDIF,              CT_WORD                  },
-   { CT_PP_ENDREGION,          CT_PREPROC_BODY          },
-   { CT_PP_IF,                 CT_CNG_HASINC            },
-   { CT_PP_IF,                 CT_FUNC_CALL             },
-   { CT_PP_IF,                 CT_NOT                   },
-   { CT_PP_IF,                 CT_NUMBER                },
-   { CT_PP_IF,                 CT_PAREN_OPEN            },
-   { CT_PP_IF,                 CT_PP_ASM                },
-   { CT_PP_IF,                 CT_PP_DEFINE             },
-   { CT_PP_IF,                 CT_PP_DEFINED            },
-   { CT_PP_IF,                 CT_TYPE                  },
-   { CT_PP_IF,                 CT_WORD                  },
-   { CT_PP_INCLUDE,            CT_STRING                },
-   { CT_PP_INCLUDE,            CT_WORD                  },
-   { CT_PP_OTHER,              CT_PREPROC_BODY          },
-   { CT_PP_PROPERTY,           CT_WORD                  },
-   { CT_PP_REGION,             CT_PREPROC_BODY          },
-   { CT_PP_UNDEF,              CT_TYPE                  },
-   { CT_PP_UNDEF,              CT_WORD                  },
-   { CT_Q_EMIT,                CT_FUNC_CALL             },
-   { CT_Q_FOREVER,             CT_BRACE_OPEN            },
-   { CT_QUESTION,              CT_FUNC_CALL             },
-   { CT_QUESTION,              CT_PAREN_OPEN            },
-   { CT_QUESTION,              CT_STRING                },
-   { CT_QUESTION,              CT_WORD                  },
-   { CT_SBOOL,                 CT_TYPE                  },
-   { CT_SCOMPARE,              CT_WORD                  },
-   { CT_SPAREN_CLOSE,          CT_ATTRIBUTE             },
-   { CT_SPAREN_CLOSE,          CT_AUTORELEASEPOOL       },
-   { CT_SPAREN_CLOSE,          CT_BRACE_OPEN            },
-   { CT_SPAREN_CLOSE,          CT_FUNC_CALL             },
-   { CT_SPAREN_CLOSE,          CT_WORD                  },
-   { CT_SQL_ASSIGN,            CT_FUNC_CALL             },
-   { CT_SQL_ASSIGN,            CT_WORD                  },
-   { CT_SQL_BEGIN,             CT_SQL_WORD              },
-   { CT_SQL_END,               CT_SQL_WORD              },
-   { CT_SQL_EXEC,              CT_SQL_WORD              },
-   { CT_SQL_WORD,              CT_COLON                 },
-   { CT_SQL_WORD,              CT_PAREN_OPEN            },
-   { CT_SQL_WORD,              CT_SQL_WORD              },
-   { CT_SQUARE_CLOSE,          CT_ATTRIBUTE             },
-   { CT_SQUARE_CLOSE,          CT_BRACE_OPEN            },
-   { CT_SQUARE_CLOSE,          CT_COLON                 },
-   { CT_SQUARE_CLOSE,          CT_EXECUTION_CONTEXT     },
-   { CT_SQUARE_CLOSE,          CT_OC_MSG_NAME           },
-   { CT_SQUARE_CLOSE,          CT_STRING                },
-   { CT_SQUARE_CLOSE,          CT_WORD                  },
-   { CT_STATE,                 CT_TYPE                  },
-   { CT_STOCK,                 CT_QUALIFIER             },
-   { CT_STOCK,                 CT_TAG                   },
-   { CT_STRING,                CT_ATTRIBUTE             },
-   { CT_STRING,                CT_BRACE_OPEN            },
-   { CT_STRING,                CT_COLON                 },
-   { CT_STRING,                CT_CONCAT                },
-   { CT_STRING,                CT_OC_MSG_NAME           },
-   { CT_STRING,                CT_PAREN_OPEN            },
-   { CT_STRING,                CT_STRING                },
-   { CT_STRING,                CT_STRUCT                },
-   { CT_STRING,                CT_TYPE                  },
-   { CT_STRING,                CT_WORD                  },
-   { CT_STRUCT,                CT_BRACE_OPEN            },
-   { CT_STRUCT,                CT_CLASS_COLON           },
-   { CT_STRUCT,                CT_MACRO_FUNC_CALL       },
-   { CT_STRUCT,                CT_TYPE                  },
-   { CT_STRUCT,                CT_WORD                  },
-   { CT_TEMPLATE,              CT_CLASS                 },
-   { CT_TEMPLATE,              CT_TYPE                  },
-   { CT_THIS,                  CT_OC_MSG_NAME           },
-   { CT_THIS,                  CT_TYPE                  },
-   { CT_TSQUARE,               CT_BRACE_OPEN            },
-   { CT_TSQUARE,               CT_PAREN_OPEN            },
-   { CT_TSQUARE,               CT_WORD                  },
-   { CT_TYPEDEF,               CT_ENUM                  },
-   { CT_TYPEDEF,               CT_FUNC_TYPE             },
-   { CT_TYPEDEF,               CT_PAREN_OPEN            },
-   { CT_TYPEDEF,               CT_QUALIFIER             },
-   { CT_TYPEDEF,               CT_STRUCT                },
-   { CT_TYPEDEF,               CT_TYPE                  },
-   { CT_TYPEDEF,               CT_TYPENAME              },
-   { CT_TYPEDEF,               CT_UNION                 },
-   { CT_TYPENAME,              CT_ELLIPSIS              },
-   { CT_TYPENAME,              CT_WORD                  },
-   { CT_UNION,                 CT_BRACE_OPEN            },
-   { CT_UNION,                 CT_TYPE                  },
-   { CT_UNION,                 CT_WORD                  },
-   { CT_USING,                 CT_NAMESPACE             },
-   { CT_USING,                 CT_TYPE                  },
-   { CT_USING,                 CT_WORD                  },
-   { CT_USING_STMT,            CT_PAREN_OPEN            },
-   { CT_VOLATILE,              CT_BRACE_OPEN            },
-   { CT_WHERE_COLON,           CT_CS_PROPERTY           },
-   { CT_WHERE_COLON,           CT_NEW                   },
-   { CT_WHERE_COLON,           CT_TYPE                  },
-   { CT_WHERE_COLON,           CT_WORD                  },
-   { CT_WHERE_SPEC,            CT_WORD                  },
-   { CT_WORD,                  CT_ATTRIBUTE             },
-   { CT_WORD,                  CT_BIT_COLON             },
-   { CT_WORD,                  CT_BRACE_OPEN            },
-   { CT_WORD,                  CT_CLASS_COLON           },
-   { CT_WORD,                  CT_COLON                 },
-   { CT_WORD,                  CT_COMMENT_CPP           },
-   { CT_WORD,                  CT_CONCAT                },
-   { CT_WORD,                  CT_ELLIPSIS              },
-   { CT_WORD,                  CT_IN                    },
-   { CT_WORD,                  CT_NEW                   },
-   { CT_WORD,                  CT_NOT                   },
-   { CT_WORD,                  CT_NUMBER                },
-   { CT_WORD,                  CT_NUMBER_FP             },
-   { CT_WORD,                  CT_OPERATOR              },
-   { CT_WORD,                  CT_QUALIFIER             },
-   { CT_WORD,                  CT_QUESTION              },
-   { CT_WORD,                  CT_SCOMPARE              },
-   { CT_WORD,                  CT_SQL_ASSIGN            },
-   { CT_WORD,                  CT_STRING                },
-   { CT_WORD,                  CT_STRUCT                },
-   { CT_WORD,                  CT_TYPE                  },
-   { CT_WORD,                  CT_TYPE_CAST             },
-   { CT_WORD,                  CT_TYPEDEF               },
-   { CT_WORD,                  CT_WHERE_COLON           },
-   { CT_WORD,                  CT_WHERE_SPEC            },
-   { CT_WORD,                  CT_WORD                  },
-// *INDENT-ON*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.cpp
deleted file mode 100644
index 09e45dc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * @file align.cpp
- * Does all the aligning stuff.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
- * @license GPL v2+
- */
-
-#include "align.h"
-
-#include "align_asm_colon.h"
-#include "align_assign.h"
-#include "align_eigen_comma_init.h"
-#include "align_func_params.h"
-#include "align_func_proto.h"
-#include "align_init_brace.h"
-#include "align_left_shift.h"
-#include "align_oc_decl_colon.h"
-#include "align_oc_msg_colons.h"
-#include "align_oc_msg_spec.h"
-#include "align_preprocessor.h"
-#include "align_same_func_call_params.h"
-#include "align_stack.h"
-#include "align_struct_initializers.h"
-#include "align_trailing_comments.h"
-#include "align_typedefs.h"
-#include "align_var_def_brace.h"
-#include "log_rules.h"
-#include "quick_align_again.h"
-
-constexpr static auto LCURRENT = LALIGN;
-
-using namespace uncrustify;
-
-
-/*
- *   Here are the items aligned:
- *
- *   - enum value assignments
- *     enum {
- *        cat  = 1,
- *        fred = 2,
- *     };
- *
- *   - struct/union variable & bit definitions
- *     struct foo {
- *        char cat;
- *        int  id       : 5;
- *        int  name_len : 6;
- *        int  height   : 12;
- *     };
- *
- *   - variable definitions & assignments in normal code
- *     const char *cat = "feline";
- *     int        id   = 4;
- *     a   = 5;
- *     bat = 14;
- *
- *   - simple array initializers
- *     int a[] = {
- *        1, 2, 3, 4, 5,
- *        6, 7, 8, 9, 10
- *     };
- *
- *   - c99 array initializers
- *     const char *name[] = {
- *        [FRED]  = "fred",
- *        [JOE]   = "joe",
- *        [PETER] = "peter",
- *     };
- *     struct foo b[] = {
- *        { .id = 1,   .name = "text 1" },
- *        { .id = 567, .name = "text 2" },
- *     };
- *     struct foo_t bars[] =
- *     {
- *        [0] = { .name = "bar",
- *                .age  = 21 },
- *        [1] = { .name = "barley",
- *                .age  = 55 },
- *     };
- *
- *   - compact array initializers
- *     struct foo b[] = {
- *        { 3, "dog" },      { 6, "spider" },
- *        { 8, "elephant" }, { 3, "cat" },
- *     };
- *
- *   - multiline array initializers (2nd line indented, not aligned)
- *     struct foo b[] = {
- *        { AD_NOT_ALLOWED, "Sorry, you failed to guess the password.",
- *          "Try again?", "Yes", "No" },
- *        { AD_SW_ERROR,    "A software error has occured.", "Bye!", NULL, NULL },
- *     };
- *
- *   - Trailing comments
- *
- *   - Back-slash newline groups
- *
- *   - Function prototypes
- *     int  foo();
- *     void bar();
- *
- *   - Preprocessors
- *     #define FOO_VAL        15
- *     #define MAX_TIMEOUT    60
- *     #define FOO(x)         ((x) * 65)
- *
- *   - typedefs
- *     typedef uint8_t     BYTE;
- *     typedef int32_t     INT32;
- *     typedef uint32_t    UINT32;
- */
-void align_all(void)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("align_typedef_span");
-
-   if (options::align_typedef_span() > 0)
-   {
-      align_typedefs(options::align_typedef_span());
-   }
-   log_rule_B("align_left_shift");
-
-   if (options::align_left_shift())
-   {
-      align_left_shift();
-   }
-   log_rule_B("align_eigen_comma_init");
-
-   if (options::align_eigen_comma_init())
-   {
-      align_eigen_comma_init();
-   }
-   log_rule_B("align_oc_msg_colon_span");
-
-   if (options::align_oc_msg_colon_span() > 0)
-   {
-      align_oc_msg_colons();
-   }
-   // Align variable definitions
-   log_rule_B("align_var_def_span");
-   log_rule_B("align_var_struct_span");
-   log_rule_B("align_var_class_span");
-
-   if (  (options::align_var_def_span() > 0)
-      || (options::align_var_struct_span() > 0)
-      || (options::align_var_class_span() > 0))
-   {
-      align_var_def_brace(chunk_get_head(), options::align_var_def_span(), nullptr);
-   }
-   // Align assignments
-   log_rule_B("align_enum_equ_span");
-   log_rule_B("align_assign_span");
-   log_rule_B("align_assign_thresh");
-
-   if (  (options::align_enum_equ_span() > 0)
-      || (options::align_assign_span() > 0))
-   {
-      align_assign(chunk_get_head(),
-                   options::align_assign_span(),
-                   options::align_assign_thresh(),
-                   nullptr);
-   }
-   // Align structure initializers
-   log_rule_B("align_struct_init_span");
-
-   if (options::align_struct_init_span() > 0)
-   {
-      align_struct_initializers();
-   }
-   // Align function prototypes
-   log_rule_B("align_func_proto_span");
-   log_rule_B("align_mix_var_proto");
-
-   if (  (options::align_func_proto_span() > 0)
-      && !options::align_mix_var_proto())
-   {
-      align_func_proto(options::align_func_proto_span());
-   }
-   // Align function prototypes
-   log_rule_B("align_oc_msg_spec_span");
-
-   if (options::align_oc_msg_spec_span() > 0)
-   {
-      align_oc_msg_spec(options::align_oc_msg_spec_span());
-   }
-   // Align OC colons
-   log_rule_B("align_oc_decl_colon");
-
-   if (options::align_oc_decl_colon())
-   {
-      align_oc_decl_colon();
-   }
-   log_rule_B("align_asm_colon");
-
-   if (options::align_asm_colon())
-   {
-      align_asm_colon();
-   }
-   // Align variable definitions in function prototypes
-   log_rule_B("align_func_params");
-   log_rule_B("align_func_params_span");
-
-   if (  options::align_func_params()
-      || options::align_func_params_span() > 0)
-   {
-      align_func_params();
-   }
-   log_rule_B("align_same_func_call_params");
-
-   if (options::align_same_func_call_params())
-   {
-      align_same_func_call_params();
-   }
-   // Just in case something was aligned out of order... do it again
-   quick_align_again();
-} // align_all
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.h
deleted file mode 100644
index 110a2c86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file align.h
- * prototypes for align.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef ALIGN_H_INCLUDED
-#define ALIGN_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-void align_all(void);
-
-#endif /* ALIGN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.cpp
deleted file mode 100644
index 2bd93381..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file align_add.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_add.h"
-#include "uncrustify.h"
-
-
-void align_add(ChunkStack &cs, chunk_t *pc, size_t &max_col)
-{
-   LOG_FUNC_ENTRY();
-
-   size_t  min_col;
-   chunk_t *prev = chunk_get_prev(pc);
-
-   if (  prev == nullptr
-      || chunk_is_newline(prev))
-   {
-      min_col = 1;
-      LOG_FMT(LALADD, "%s(%d): pc->orig_line=%zu, pc->col=%zu max_col=%zu min_col=%zu\n",
-              __func__, __LINE__, pc->orig_line, pc->column, max_col, min_col);
-   }
-   else
-   {
-      if (chunk_is_token(prev, CT_COMMENT_MULTI))
-      {
-         min_col = prev->orig_col_end + 1;
-      }
-      else
-      {
-         min_col = prev->column + prev->len() + 1;
-      }
-      LOG_FMT(LALADD, "%s(%d): pc->orig_line=%zu, pc->col=%zu max_col=%zu min_col=%zu multi:%s prev->col=%zu prev->len()=%zu %s\n",
-              __func__, __LINE__, pc->orig_line, pc->column, max_col, min_col, (chunk_is_token(prev, CT_COMMENT_MULTI)) ? "Y" : "N",
-              (chunk_is_token(prev, CT_COMMENT_MULTI)) ? prev->orig_col_end : (UINT32)prev->column, prev->len(), get_token_name(prev->type));
-   }
-
-   if (cs.Empty())
-   {
-      max_col = 0;
-   }
-   cs.Push_Back(pc);
-
-   if (min_col > max_col)
-   {
-      max_col = min_col;
-   }
-} // align_add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.h
deleted file mode 100644
index 07f1efee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file align_add.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_ADD_H_INCLUDED
-#define ALIGN_ADD_H_INCLUDED
-
-#include "chunk_list.h"
-#include "ChunkStack.h"
-
-void align_add(ChunkStack &cs, chunk_t *pc, size_t &max_col);
-
-#endif /* ALIGN_ADD_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.cpp
deleted file mode 100644
index 1fb6c636..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @file align_asm_colon.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_asm_colon.h"
-
-#include "align_stack.h"
-#include "chunk_list.h"
-
-
-void align_asm_colon(void)
-{
-   LOG_FUNC_ENTRY();
-
-   bool       did_nl;
-   AlignStack cas; // for the colons
-
-   cas.Start(4);
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_not_token(pc, CT_ASM_COLON))
-      {
-         pc = chunk_get_next(pc);
-         continue;
-      }
-      cas.Reset();
-
-      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      size_t level = pc ? pc->level : 0;
-      did_nl = true;
-
-      while (  pc != nullptr
-            && pc->level >= level)
-      {
-         if (chunk_is_newline(pc))
-         {
-            cas.NewLines(pc->nl_count);
-            did_nl = true;
-         }
-         else if (chunk_is_token(pc, CT_ASM_COLON))
-         {
-            cas.Flush();
-            did_nl = true;
-         }
-         else if (did_nl)
-         {
-            did_nl = false;
-            cas.Add(pc);
-         }
-         pc = chunk_get_next_nc(pc, scope_e::PREPROC);
-      }
-      cas.End();
-   }
-} // align_asm_colon
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.h
deleted file mode 100644
index 25704404..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file align_asm_colon.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_ASM_COLON_H_INCLUDED
-#define ALIGN_ASM_COLON_H_INCLUDED
-
-
-/**
- * Aligns asm declarations on the colon
- * asm volatile (
- *    "xxx"
- *    : "x"(h),
- *      "y"(l),
- *    : "z"(h)
- *    );
- */
-void align_asm_colon(void);
-
-#endif /* ALIGN_ASM_COLON_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.cpp
deleted file mode 100644
index 3e745bd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * @file align_assign.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_assign.h"
-
-#include "align_stack.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALASS;
-
-using namespace uncrustify;
-
-
-chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_count)
-{
-   LOG_FUNC_ENTRY();
-
-   if (first == nullptr)
-   {
-      // coveralls will complain here. There are no example for that.
-      // see https://en.wikipedia.org/wiki/Robustness_principle
-      return(nullptr);
-   }
-   size_t my_level = first->level;
-
-   char   copy[1000];
-
-   LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig_line %zu, span is %zu, thresh is %zu\n",
-           __func__, __LINE__, my_level, first->elided_text(copy), first->orig_line, span, thresh);
-
-   // If we are aligning on a tabstop, we shouldn't right-align
-   AlignStack as;    // regular assigns
-
-   as.Start(span, thresh);
-   log_rule_B("align_on_tabstop");
-   as.m_right_align = !options::align_on_tabstop();
-
-   AlignStack vdas;  // variable def assigns
-
-   vdas.Start(span, thresh);
-   vdas.m_right_align = as.m_right_align;
-
-   std::deque<AlignStack> fcnDefault(1);
-
-   fcnDefault.back().Start(span, thresh);
-   fcnDefault.back().m_right_align = as.m_right_align;
-
-   AlignStack fcnProto;
-
-   fcnProto.Start(span, thresh);
-   fcnProto.m_right_align = as.m_right_align;
-
-   size_t  var_def_cnt = 0;
-   size_t  equ_count   = 0;
-   size_t  fcn_idx     = 0;
-   size_t  tmp;
-   chunk_t *pc = first;
-
-   while (pc != nullptr)
-   {
-      LOG_FMT(LALASS, "%s(%d): orig_line is %zu, check pc->text() '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->elided_text(copy), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
-
-      // Don't check inside SPAREN, PAREN or SQUARE groups
-      if (  chunk_is_token(pc, CT_SPAREN_OPEN)
-            // || chunk_is_token(pc, CT_FPAREN_OPEN) Issue #1340
-         || chunk_is_token(pc, CT_SQUARE_OPEN)
-         || chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         LOG_FMT(LALASS, "%s(%d): Don't check inside SPAREN, PAREN or SQUARE groups, type is %s\n",
-                 __func__, __LINE__, get_token_name(pc->type));
-         tmp = pc->orig_line;
-         pc  = chunk_skip_to_match(pc);
-
-         if (pc != nullptr)
-         {
-            as.NewLines(pc->orig_line - tmp);
-            vdas.NewLines(pc->orig_line - tmp);
-
-            if (pc->orig_line != tmp)
-            {
-               fcn_idx = 0;
-
-               for (auto &fcn : fcnDefault)
-               {
-                  fcn.NewLines(pc->orig_line - tmp);
-               }
-            }
-            fcnProto.NewLines(pc->orig_line - tmp);
-         }
-         continue;
-      }
-
-      // Recurse if a brace set is found
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_OPEN))
-      {
-         size_t myspan;
-         size_t mythresh;
-
-         size_t sub_nl_count = 0;
-
-         if (get_chunk_parent_type(pc) == CT_ENUM)
-         {
-            log_rule_B("align_enum_equ_span");
-            myspan = options::align_enum_equ_span();
-            log_rule_B("align_enum_equ_thresh");
-            mythresh = options::align_enum_equ_thresh();
-         }
-         else
-         {
-            log_rule_B("align_assign_span");
-            myspan = options::align_assign_span();
-            log_rule_B("align_assign_thresh");
-            mythresh = options::align_assign_thresh();
-         }
-         pc = align_assign(chunk_get_next_ncnnl(pc), myspan, mythresh, &sub_nl_count);
-
-         if (sub_nl_count > 0)
-         {
-            as.NewLines(sub_nl_count);
-            vdas.NewLines(sub_nl_count);
-            fcn_idx = 0;
-
-            for (auto &fcn : fcnDefault)
-            {
-               fcn.NewLines(sub_nl_count);
-            }
-
-            fcnProto.NewLines(sub_nl_count);
-
-            if (p_nl_count != nullptr)
-            {
-               *p_nl_count += sub_nl_count;
-            }
-         }
-         continue;
-      }
-
-      // Done with this brace set?
-      if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE))
-      {
-         pc = chunk_get_next(pc);
-         break;
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         as.NewLines(pc->nl_count);
-         vdas.NewLines(pc->nl_count);
-         fcn_idx = 0;
-
-         for (auto &fcn : fcnDefault)
-         {
-            fcn.NewLines(pc->nl_count);
-         }
-
-         fcnProto.NewLines(pc->nl_count);
-
-         if (p_nl_count != nullptr)
-         {
-            *p_nl_count += pc->nl_count;
-         }
-         var_def_cnt = 0;
-         equ_count   = 0;
-      }
-      else if (  pc->flags.test(PCF_VAR_DEF)
-              && !pc->flags.test(PCF_IN_CONST_ARGS) // Issue #1717
-              && !pc->flags.test(PCF_IN_FCN_DEF)    // Issue #1717
-              && !pc->flags.test(PCF_IN_FCN_CALL))  // Issue #1717
-      {
-         // produces much more log output. Use it only debugging purpose
-         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags:\n   ", __func__, __LINE__);
-         //log_pcf_flags(LALASS, pc->flags);
-         var_def_cnt++;
-      }
-      else if (var_def_cnt > 1)
-      {
-         // we hit the second variable def - don't look for assigns, don't align
-         vdas.Reset();
-      }
-      else if (  equ_count == 0                      // indent only if first '=' in line
-              && !pc->flags.test(PCF_IN_TEMPLATE)    // and it is not inside a template #999
-              && (  chunk_is_token(pc, CT_ASSIGN)
-                 || chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG)
-                 || chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO)))
-      {
-         if (chunk_is_token(pc, CT_ASSIGN))               // Issue #2236
-         {
-            equ_count++;
-         }
-         LOG_FMT(LALASS, "%s(%d): align_assign_decl_func() is %d\n",
-                 __func__, __LINE__, options::align_assign_decl_func());
-         // produces much more log output. Use it only debugging purpose
-         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags: ", __func__, __LINE__);
-         //log_pcf_flags(LALASS, pc->flags);
-
-         log_rule_B("align_assign_decl_func");
-
-         if (  options::align_assign_decl_func() == 0         // Align with other assignments (default)
-            && (  chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG)   // Foo( int bar = 777 );
-               || chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO)))  // Foo( const Foo & ) = delete;
-         {
-            LOG_FMT(LALASS, "%s(%d): fcnDefault[%zu].Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, fcn_idx, pc->text(), pc->orig_line, pc->orig_col);
-
-            if (++fcn_idx == fcnDefault.size())
-            {
-               fcnDefault.emplace_back();
-               fcnDefault.back().Start(span, thresh);
-               fcnDefault.back().m_right_align = as.m_right_align;
-            }
-            fcnDefault[fcn_idx].Add(pc);
-         }
-         else if (options::align_assign_decl_func() == 1)   // Align with each other
-         {
-            log_rule_B("align_assign_decl_func");
-
-            if (chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG))  // Foo( int bar = 777 );
-            {
-               LOG_FMT(LALASS, "%s(%d): default: fcnDefault[%zu].Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, fcn_idx, pc->text(), pc->orig_line, pc->orig_col);
-
-               if (++fcn_idx == fcnDefault.size())
-               {
-                  fcnDefault.emplace_back();
-                  fcnDefault.back().Start(span, thresh);
-                  fcnDefault.back().m_right_align = as.m_right_align;
-               }
-               fcnDefault[fcn_idx].Add(pc);
-            }
-            else if (chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO))  // Foo( const Foo & ) = delete;
-            {
-               LOG_FMT(LALASS, "%s(%d): proto: fcnProto.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-               fcnProto.Add(pc);
-            }
-            else if (chunk_is_token(pc, CT_ASSIGN)) // Issue #2197
-            {
-               LOG_FMT(LALASS, "%s(%d): vdas.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-               vdas.Add(pc);
-            }
-         }
-         else if (  options::align_assign_decl_func() == 2         // Don't align
-                 && (  chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG)   // Foo( int bar = 777 );
-                    || chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO)))  // Foo( const Foo & ) = delete;
-         {
-            log_rule_B("align_assign_decl_func");
-            LOG_FMT(LALASS, "%s(%d): Don't align\n",               // Issue #2236
-                    __func__, __LINE__);
-         }
-         else if (var_def_cnt != 0)
-         {
-            LOG_FMT(LALASS, "%s(%d): vdas.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-            vdas.Add(pc);
-         }
-         else
-         {
-            if (chunk_is_token(pc, CT_ASSIGN))
-            {
-               LOG_FMT(LALASS, "%s(%d): as.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-               as.Add(pc);
-            }
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-   as.End();
-   vdas.End();
-
-   for (auto &fcn : fcnDefault)
-   {
-      fcn.End();
-   }
-
-   fcnProto.End();
-
-   if (pc != nullptr)
-   {
-      LOG_FMT(LALASS, "%s(%d): done on '%s' on orig_line %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line);
-   }
-   else
-   {
-      LOG_FMT(LALASS, "%s(%d): done on NULL\n", __func__, __LINE__);
-   }
-   return(pc);
-} // align_assign
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.h
deleted file mode 100644
index e14ad62c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file align_assign.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_ASSIGN_H_INCLUDED
-#define ALIGN_ASSIGN_H_INCLUDED
-
-#include "chunk_list.h"
-
-/**
- * Aligns all assignment operators on the same level as first, starting with
- * first.
- * For variable definitions, only consider the '=' for the first variable.
- * Otherwise, only look at the first '=' on the line.
- *
- * @param first  chunk pointing to the first assignment
- */
-chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_count);
-
-#endif /* ALIGN_ASSIGN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.cpp
deleted file mode 100644
index c659c214..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * @file align_eigen_comma_init.cpp
- *
- * @author  Matthew Woehlke
- * copied/adapted from align_left_shift.cpp
- * @author  Guy Maurel
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_eigen_comma_init.h"
-
-#include "align_stack.h"
-#include "indent.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALIGN;
-
-using namespace uncrustify;
-
-
-void align_eigen_comma_init(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t    *start = nullptr;
-   AlignStack as;
-
-   as.Start(255);
-
-   auto *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_newline(pc))
-      {
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
-      }
-      else
-      {
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      }
-
-      if (  start != nullptr
-         && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC)))
-      {
-         // a change in preproc status restarts the aligning
-         as.Flush();
-         start = nullptr;
-      }
-      else if (chunk_is_newline(pc))
-      {
-         as.NewLines(pc->nl_count);
-      }
-      else if (  start != nullptr
-              && pc->level < start->level)
-      {
-         // A drop in level restarts the aligning
-         as.Flush();
-         start = nullptr;
-      }
-      else if (  start != nullptr
-              && pc->level > start->level)
-      {
-         // Ignore any deeper levels when aligning
-      }
-      else if (chunk_is_token(pc, CT_SEMICOLON))
-      {
-         // A semicolon at the same level flushes
-         as.Flush();
-         start = nullptr;
-      }
-      else if (  !pc->flags.test(PCF_IN_ENUM)
-              && !pc->flags.test(PCF_IN_TYPEDEF)
-              && chunk_is_str(pc, "<<", 2))
-      {
-         if (get_chunk_parent_type(pc) == CT_OPERATOR)
-         {
-            // Ignore operator<<
-         }
-         else
-         {
-            /*
-             * check if the first one is actually on a blank line and then
-             * indent it. Eg:
-             *
-             *      cout
-             *          << "something";
-             */
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (  prev != nullptr
-               && chunk_is_newline(prev))
-            {
-               log_rule_B("indent_columns");
-               indent_to_column(pc, pc->column_indent + options::indent_columns());
-               pc->column_indent = pc->column;
-               chunk_flags_set(pc, PCF_DONT_INDENT);
-            }
-            // Restart alignment
-            as.Flush();
-            as.Add(chunk_get_next(pc));
-            start = pc;
-         }
-      }
-      else if (!as.m_aligned.Empty())
-      {
-         auto *const prev = chunk_get_prev(pc);
-
-         if (  chunk_is_newline(prev)
-            && chunk_is_token(chunk_get_prev_ncnnl(pc), CT_COMMA))
-         {
-            log_rule_B("align_eigen_comma_init");
-            as.Add(pc);
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-   as.End();
-} // align_left_shift
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.h
deleted file mode 100644
index 8f8ce34b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @file align_left_shift.h
- *
- * @author  Matthew Woehlke
- * @license GPL v2+
- */
-
-#ifndef ALIGN_EIGEN_COMMA_INIT_H_INCLUDED
-#define ALIGN_EIGEN_COMMA_INIT_H_INCLUDED
-
-//! Align comma-separated expressions following left shift operator '<<'
-void align_eigen_comma_init(void);
-
-#endif /* ALIGN_EIGEN_COMMA_INIT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.cpp
deleted file mode 100644
index 41990576..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * @file align_func_params.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_func_params.h"
-
-#include "align_stack.h"
-#include "log_rules.h"
-
-#include <algorithm>                           // to get max
-
-constexpr static auto LCURRENT = LALIGN;
-
-using namespace uncrustify;
-
-
-chunk_t *align_func_param(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LAS, "AlignStack::%s(%d): Candidate is '%s': orig_line is %zu, column is %zu, type is %s, level is %zu\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->column,
-           get_token_name(start->type), start->level);
-   // Defaults, if the align_func_params = true
-   size_t myspan   = 2;
-   size_t mythresh = 0;
-   size_t mygap    = 0;
-
-   // Override, if the align_func_params_span > 0
-   log_rule_B("align_func_params_span");
-
-   if (options::align_func_params_span() > 0)
-   {
-      myspan = options::align_func_params_span();
-      log_rule_B("align_func_params_thresh");
-      mythresh = options::align_func_params_thresh();
-      log_rule_B("align_func_params_gap");
-      mygap = options::align_func_params_gap();
-   }
-   const size_t HOW_MANY_AS = 16;                         // Issue #2921
-   AlignStack   many_as[HOW_MANY_AS + 1];
-
-   size_t       max_level_is = 0;
-
-   log_rule_B("align_var_def_star_style");
-   log_rule_B("align_var_def_amp_style");
-
-   for (size_t idx = 0; idx <= HOW_MANY_AS; idx++)
-   {
-      many_as[idx].Start(myspan, mythresh);
-      many_as[idx].m_gap        = mygap;
-      many_as[idx].m_star_style = static_cast<AlignStack::StarStyle>(options::align_var_def_star_style());
-      many_as[idx].m_amp_style  = static_cast<AlignStack::StarStyle>(options::align_var_def_amp_style());
-   }
-
-   size_t  comma_count = 0;
-   size_t  chunk_count = 0;
-   chunk_t *pc         = start;
-
-   while ((pc = chunk_get_next(pc)) != nullptr)
-   {
-      chunk_count++;
-      LOG_FMT(LFLPAREN, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-              get_token_name(pc->type));
-
-      if (chunk_is_token(pc, CT_FUNC_VAR))                    // Issue #2278
-      {
-         // look after 'protect parenthesis'
-         chunk_t *after = chunk_get_next_nc(pc);
-
-         if (chunk_is_token(after, CT_PAREN_CLOSE))
-         {
-            chunk_t *before = chunk_get_prev_type(after, CT_PAREN_OPEN, after->level);
-
-            if (before != nullptr)
-            {
-               // these are 'protect parenthesis'
-               // change the types and the level
-               set_chunk_type(before, CT_PPAREN_OPEN);
-               set_chunk_type(after, CT_PPAREN_CLOSE);
-               pc->level = before->level;
-               chunk_t *tmp = chunk_get_prev_nc(pc);
-
-               if (chunk_is_token(tmp, CT_PTR_TYPE))
-               {
-                  tmp->level = before->level;
-               }
-            }
-         }
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         comma_count = 0;
-         chunk_count = 0;
-         many_as[pc->level].NewLines(pc->nl_count);
-      }
-      else if (pc->level <= start->level)
-      {
-         break;
-      }
-      else if (pc->flags.test(PCF_VAR_DEF))
-      {
-         if (chunk_count > 1)
-         {
-            if (pc->level > HOW_MANY_AS)
-            {
-               fprintf(stderr, "%s(%d): Not enought memory for Stack\n",
-                       __func__, __LINE__);
-               fprintf(stderr, "%s(%d): the current maximum is %zu\n",
-                       __func__, __LINE__, HOW_MANY_AS);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            max_level_is = max(max_level_is, pc->level);
-            many_as[pc->level].Add(pc);
-         }
-      }
-      else if (comma_count > 0)
-      {
-         if (!chunk_is_comment(pc))
-         {
-            comma_count = 2;
-            break;
-         }
-      }
-      else if (chunk_is_token(pc, CT_COMMA))
-      {
-         if (pc->flags.test(PCF_IN_TEMPLATE))            // Issue #2757
-         {
-            LOG_FMT(LFLPAREN, "%s(%d): comma is in template\n",
-                    __func__, __LINE__);
-         }
-         else
-         {
-            chunk_t *tmp_prev = chunk_get_prev_nc(pc);
-
-            if (!chunk_is_newline(tmp_prev))  // don't count leading commas
-            {
-               comma_count++;
-               LOG_FMT(LFLPAREN, "%s(%d): comma_count is %zu\n",
-                       __func__, __LINE__, comma_count);
-            }
-         }
-      }
-   }
-
-   if (comma_count <= 1)
-   {
-      for (size_t idx = 1; idx <= max_level_is; idx++)
-      {
-         many_as[idx].End();
-      }
-   }
-   return(pc);
-} // align_func_param
-
-
-void align_func_params(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_head();
-
-   while ((pc = chunk_get_next(pc)) != nullptr)
-   {
-      LOG_FMT(LFLPAREN, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', parent_type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-              get_token_name(pc->type), get_token_name(pc->parent_type));
-
-      if (  chunk_is_not_token(pc, CT_FPAREN_OPEN)
-         || (  get_chunk_parent_type(pc) != CT_FUNC_PROTO
-            && get_chunk_parent_type(pc) != CT_FUNC_DEF
-            && get_chunk_parent_type(pc) != CT_FUNC_CLASS_PROTO
-            && get_chunk_parent_type(pc) != CT_FUNC_CLASS_DEF
-            && get_chunk_parent_type(pc) != CT_TYPEDEF))
-      {
-         continue;
-      }
-      // We are on a open parenthesis of a prototype
-      pc = align_func_param(pc);
-   }
-} // void align_func_params
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.h
deleted file mode 100644
index b200a0cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file align_func_params.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_FUNC_PARAMS_H_INCLUDED
-#define ALIGN_FUNC_PARAMS_H_INCLUDED
-
-#include "chunk_list.h"
-
-void align_func_params(void);
-
-chunk_t *align_func_param(chunk_t *start);
-
-#endif /* ALIGN_FUNC_PARAMS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.cpp
deleted file mode 100644
index 2a96b865..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * @file align_func_proto.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_func_proto.h"
-
-#include "align_stack.h"
-#include "align_tools.h"
-#include "log_rules.h"
-
-#include <algorithm>                           // to get max
-
-constexpr static auto LCURRENT = LALPROTO;
-
-using namespace uncrustify;
-
-
-void align_func_proto(size_t span)
-{
-   LOG_FUNC_ENTRY();
-
-   size_t myspan   = span;
-   size_t mythresh = 0;
-
-   log_rule_B("align_func_proto_gap");
-   size_t mygap = options::align_func_proto_gap();
-
-   log_rule_B("align_func_proto_thresh");
-   mythresh = options::align_func_proto_thresh();
-
-   // Issue #2771
-   // we align token-1 and token-2 if:
-   //   token-1->level == token-2->level
-   //   and
-   //   token-1->brace_level == token-2->brace_level
-   // we don't check if token-1 and token-2 are in the same block
-
-   log_rule_B("align_var_def_star_style");
-   size_t mystar_style = options::align_var_def_star_style();
-
-   log_rule_B("align_var_def_amp_style");
-   size_t myamp_style = options::align_var_def_amp_style();
-
-
-   size_t     num_of_column     = 1;
-   size_t     num_of_row        = 1;
-   AlignStack *stack_init_value = nullptr;
-
-
-   // Issue #2984
-   vector<vector<AlignStack *> > many_as;
-   // Issue #2771
-   vector<vector<AlignStack *> > many_as_brace;
-
-   // init the vector ...
-   many_as.resize(num_of_column, vector<AlignStack *>(num_of_row, stack_init_value));
-   many_as_brace.resize(num_of_column, vector<AlignStack *>(num_of_row, stack_init_value));
-
-   log_rule_B("align_single_line_brace_gap");
-   size_t mybr_gap = options::align_single_line_brace_gap();
-
-
-   bool    look_bro = false;
-   chunk_t *toadd;
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      char copy[1000];
-      LOG_FMT(LAS, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, level is %zu, brace_level is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy),
-              get_token_name(pc->type), pc->level, pc->brace_level);
-
-      // make the vector larger if necessary
-      if (  pc->level >= num_of_column                             // Issue #2960
-         || pc->brace_level >= num_of_row)
-      {
-         num_of_column = pc->level + 1;
-         num_of_row    = pc->brace_level + 1;
-
-         many_as.resize(num_of_column);
-         many_as_brace.resize(num_of_column);
-
-         for (size_t i = 0; i < num_of_column; ++i)
-         {
-            many_as[i].resize(num_of_row);
-            many_as_brace[i].resize(num_of_row);
-         }
-      }
-
-      if (  chunk_is_newline(pc)
-         && !pc->flags.test(PCF_IN_FCN_CALL))                 // Issue #2831
-      {
-         look_bro = false;
-         AlignStack *stack_at_l_bl = many_as.at(pc->level).at(pc->brace_level);
-
-         if (stack_at_l_bl == nullptr)
-         {
-            // get a Stack
-            stack_at_l_bl = new AlignStack();
-            // start it
-            stack_at_l_bl->Start(myspan, mythresh);
-            stack_at_l_bl->m_gap        = mygap;
-            stack_at_l_bl->m_star_style = static_cast<AlignStack::StarStyle>(mystar_style);
-            stack_at_l_bl->m_amp_style  = static_cast<AlignStack::StarStyle>(myamp_style);
-            // store
-            many_as.at(pc->level).at(pc->brace_level) = stack_at_l_bl;
-         }
-         stack_at_l_bl->Debug();
-
-         for (size_t idx = 0; idx < num_of_column; idx++)
-         {
-            for (size_t idx_brace = 0; idx_brace < num_of_row; idx_brace++)
-            {
-               stack_at_l_bl = many_as.at(idx).at(idx_brace);
-
-               if (stack_at_l_bl != nullptr)
-               {
-                  stack_at_l_bl->NewLines(pc->nl_count);
-               }
-            }
-         }
-
-         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->level).at(pc->brace_level);
-
-         if (stack_at_l_bl_brace == nullptr)
-         {
-            // get a Stack
-            stack_at_l_bl_brace = new AlignStack();
-            // start it
-            stack_at_l_bl_brace->Start(myspan, mythresh);
-            stack_at_l_bl_brace->m_gap = mybr_gap;
-            // store
-            many_as_brace.at(pc->level).at(pc->brace_level) = stack_at_l_bl_brace;
-         }
-         stack_at_l_bl_brace->Debug();
-         stack_at_l_bl_brace->NewLines(pc->nl_count);
-      }
-      else if (  chunk_is_token(pc, CT_FUNC_PROTO)
-              || (  chunk_is_token(pc, CT_FUNC_DEF)
-                 && options::align_single_line_func()))
-      {
-         log_rule_B("align_single_line_func");
-         log_rule_B("align_on_operator");
-
-         if (  get_chunk_parent_type(pc) == CT_OPERATOR
-            && options::align_on_operator())
-         {
-            toadd = chunk_get_prev_ncnnl(pc);
-         }
-         else
-         {
-            toadd = pc;
-         }
-         chunk_t *tmp = step_back_over_member(toadd);
-         LOG_FMT(LAS, "%s(%d): tmp->text() is '%s', orig_line is %zu, orig_col is %zu, level is %zu, brace_level is %zu\n",
-                 __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col,
-                 tmp->level, tmp->brace_level);
-         // test the Stack
-         AlignStack *stack_at_l_bl = many_as.at(pc->level).at(pc->brace_level);
-
-         if (stack_at_l_bl == nullptr)
-         {
-            // get a Stack
-            stack_at_l_bl = new AlignStack();
-            // start it
-            stack_at_l_bl->Start(myspan, mythresh);
-            stack_at_l_bl->m_gap        = mygap;
-            stack_at_l_bl->m_star_style = static_cast<AlignStack::StarStyle>(mystar_style);
-            stack_at_l_bl->m_amp_style  = static_cast<AlignStack::StarStyle>(myamp_style);
-            // store
-            many_as.at(pc->level).at(pc->brace_level) = stack_at_l_bl;
-         }
-         stack_at_l_bl->Add(tmp);
-         log_rule_B("align_single_line_brace");
-         look_bro = (chunk_is_token(pc, CT_FUNC_DEF))
-                    && options::align_single_line_brace();
-      }
-      else if (  look_bro
-              && chunk_is_token(pc, CT_BRACE_OPEN)
-              && pc->flags.test(PCF_ONE_LINER))
-      {
-         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->level).at(pc->brace_level);
-         stack_at_l_bl_brace->Add(pc);
-         look_bro = false;
-      }
-   }
-
-   LOG_FMT(LAS, "%s(%d):  as\n", __func__, __LINE__);
-
-   // purge
-   for (size_t idx = 0; idx < num_of_column; idx++)
-   {
-      for (size_t idx_brace = 0; idx_brace < num_of_row; idx_brace++)
-      {
-         AlignStack *stack_at_l_bl = many_as.at(idx).at(idx_brace);
-
-         if (stack_at_l_bl != nullptr)
-         {
-            stack_at_l_bl->End();
-            delete stack_at_l_bl;
-            stack_at_l_bl = nullptr;
-         }
-         AlignStack *stack_at_l_bl_brace = many_as_brace.at(idx).at(idx_brace);
-
-         if (stack_at_l_bl_brace != nullptr)
-         {
-            stack_at_l_bl_brace->End();
-            delete stack_at_l_bl_brace;
-            stack_at_l_bl_brace = nullptr;
-         }
-      }
-   }
-} // align_func_proto
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.h
deleted file mode 100644
index 0edf442d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file align_func_proto.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_FUNC_PROTO_H_INCLUDED
-#define ALIGN_FUNC_PROTO_H_INCLUDED
-
-#include "chunk_list.h"
-
-//! Aligns all function prototypes in the file.
-void align_func_proto(size_t span);
-
-#endif /* ALIGN_FUNC_PROTO_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.cpp
deleted file mode 100644
index 2fbe59d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * @file align_init_brace.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_init_brace.h"
-
-#include "align_log_al.h"
-#include "align_tab_column.h"
-#include "align_tools.h"
-#include "indent.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALBR;
-
-using namespace uncrustify;
-
-
-void align_init_brace(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *num_token = nullptr;
-
-   cpd.al_cnt       = 0;
-   cpd.al_c99_array = false;
-
-   LOG_FMT(LALBR, "%s(%d): start @ orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->orig_line, start->orig_col);
-
-   chunk_t *pc       = chunk_get_next_ncnnl(start);
-   chunk_t *pcSingle = scan_ib_line(pc, true);
-
-   if (  pcSingle == nullptr
-      || (  chunk_is_token(pcSingle, CT_BRACE_CLOSE)
-         && get_chunk_parent_type(pcSingle) == CT_ASSIGN))
-   {
-      // single line - nothing to do
-      LOG_FMT(LALBR, "%s(%d): single line - nothing to do\n", __func__, __LINE__);
-      return;
-   }
-   LOG_FMT(LALBR, "%s(%d): is not a single line\n", __func__, __LINE__);
-
-   do
-   {
-      pc = scan_ib_line(pc, false);
-
-      // debug dump the current frame
-      LOG_FMT(LALBR, "%s(%d): debug dump after, orig_line is %zu\n",
-              __func__, __LINE__, pc->orig_line);
-      align_log_al(LALBR, pc->orig_line);
-
-      while (chunk_is_newline(pc))
-      {
-         pc = chunk_get_next(pc);
-      }
-   } while (  pc != nullptr
-           && pc->level > start->level);
-
-   // debug dump the current frame
-   align_log_al(LALBR, start->orig_line);
-
-   log_rule_B("align_on_tabstop");
-
-   if (  options::align_on_tabstop()
-      && cpd.al_cnt >= 1
-      && (cpd.al[0].type == CT_ASSIGN))
-   {
-      cpd.al[0].col = align_tab_column(cpd.al[0].col);
-   }
-   pc = chunk_get_next(start);
-   size_t idx = 0;
-
-   do
-   {
-      chunk_t *tmp;
-
-      if (  idx == 0
-         && ((tmp = skip_c99_array(pc)) != nullptr))
-      {
-         pc = tmp;
-
-         if (pc != nullptr)
-         {
-            LOG_FMT(LALBR, " -%zu- skipped '[] =' to %s\n",
-                    pc->orig_line, get_token_name(pc->type));
-         }
-         continue;
-      }
-      chunk_t *next = pc;
-
-      if (idx < cpd.al_cnt)
-      {
-         LOG_FMT(LALBR, " (%zu) check %s vs %s -- ",
-                 idx, get_token_name(pc->type), get_token_name(cpd.al[idx].type));
-
-         if (chunk_is_token(pc, cpd.al[idx].type))
-         {
-            if (  idx == 0
-               && cpd.al_c99_array)
-            {
-               chunk_t *prev = chunk_get_prev(pc);
-
-               if (chunk_is_newline(prev))
-               {
-                  chunk_flags_set(pc, PCF_DONT_INDENT);
-               }
-            }
-            LOG_FMT(LALBR, " [%s] to col %zu\n", pc->text(), cpd.al[idx].col);
-
-            if (num_token != nullptr)
-            {
-               int col_diff = pc->column - num_token->column;
-
-               reindent_line(num_token, cpd.al[idx].col - col_diff);
-               //LOG_FMT(LSYS, "-= %zu =- NUM indent [%s] col=%d diff=%d\n",
-               //        num_token->orig_line,
-               //        num_token->text(), cpd.al[idx - 1].col, col_diff);
-
-               chunk_flags_set(num_token, PCF_WAS_ALIGNED);
-               num_token = nullptr;
-            }
-
-            // Comma's need to 'fall back' to the previous token
-            if (chunk_is_token(pc, CT_COMMA))
-            {
-               next = chunk_get_next(pc);
-
-               if (!chunk_is_newline(next))
-               {
-                  //LOG_FMT(LSYS, "-= %zu =- indent [%s] col=%d len=%d\n",
-                  //        next->orig_line,
-                  //        next->text(), cpd.al[idx].col, cpd.al[idx].len);
-
-                  log_rule_B("align_number_right");
-
-                  if (  (idx < (cpd.al_cnt - 1))
-                     && options::align_number_right()
-                     && (  chunk_is_token(next, CT_NUMBER_FP)
-                        || chunk_is_token(next, CT_NUMBER)
-                        || chunk_is_token(next, CT_POS)
-                        || chunk_is_token(next, CT_NEG)))
-                  {
-                     // Need to wait until the next match to indent numbers
-                     num_token = next;
-                  }
-                  else if (idx < (cpd.al_cnt - 1))
-                  {
-                     LOG_FMT(LALBR, "%s(%d): idx is %zu, al_cnt is %zu, cpd.al[%zu].col is %zu, cpd.al[%zu].len is %zu\n",
-                             __func__, __LINE__, idx, cpd.al_cnt, idx, cpd.al[idx].col, idx, cpd.al[idx].len);
-                     reindent_line(next, cpd.al[idx].col + cpd.al[idx].len);
-                     chunk_flags_set(next, PCF_WAS_ALIGNED);
-                  }
-               }
-            }
-            else
-            {
-               // first item on the line
-               LOG_FMT(LALBR, "%s(%d): idx is %zu, cpd.al[%zu].col is %zu\n",
-                       __func__, __LINE__, idx, idx, cpd.al[idx].col);
-               reindent_line(pc, cpd.al[idx].col);
-               chunk_flags_set(pc, PCF_WAS_ALIGNED);
-
-               // see if we need to right-align a number
-               log_rule_B("align_number_right");
-
-               if (  (idx < (cpd.al_cnt - 1))
-                  && options::align_number_right())
-               {
-                  next = chunk_get_next(pc);
-
-                  if (  !chunk_is_newline(next)
-                     && (  chunk_is_token(next, CT_NUMBER_FP)
-                        || chunk_is_token(next, CT_NUMBER)
-                        || chunk_is_token(next, CT_POS)
-                        || chunk_is_token(next, CT_NEG)))
-                  {
-                     // Need to wait until the next match to indent numbers
-                     num_token = next;
-                  }
-               }
-            }
-            idx++;
-         }
-         else
-         {
-            LOG_FMT(LALBR, " no match\n");
-         }
-      }
-
-      if (  chunk_is_newline(pc)
-         || chunk_is_newline(next))
-      {
-         idx = 0;
-      }
-      pc = chunk_get_next(pc);
-   } while (  pc != nullptr
-           && pc->level > start->level);
-} // align_init_brace
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.h
deleted file mode 100644
index 6c0c4909..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @file align_init_brace.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_INIT_BRACE_H_INCLUDED
-#define ALIGN_INIT_BRACE_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-/**
- * Generically aligns on '=', '{', '(' and item after ','
- * It scans the first line and picks up the location of those tags.
- * It then scans subsequent lines and adjusts the column.
- * Finally it does a second pass to align everything.
- *
- * Aligns all the '=' signs in structure assignments.
- * a = {
- *    .a    = 1;
- *    .type = fast;
- * };
- *
- * And aligns on '{', numbers, strings, words.
- * colors[] = {
- *    {"red",   {255, 0,   0}}, {"blue",   {  0, 255, 0}},
- *    {"green", {  0, 0, 255}}, {"purple", {255, 255, 0}},
- * };
- *
- * For the C99 indexed array assignment, the leading []= is skipped (no aligning)
- * struct foo_t bars[] =
- * {
- *    [0] = { .name = "bar",
- *            .age  = 21 },
- *    [1] = { .name = "barley",
- *            .age  = 55 },
- * };
- *
- * NOTE: this assumes that spacing is at the minimum correct spacing (ie force)
- *       if it isn't, some extra spaces will be inserted.
- *
- * @param start   Points to the open brace chunk
- */
-void align_init_brace(chunk_t *start);
-
-#endif /* ALIGN_INIT_BRACE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.cpp
deleted file mode 100644
index 777f7d27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * @file align_left_shift.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_left_shift.h"
-
-#include "align_stack.h"
-#include "indent.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALIGN;
-
-using namespace uncrustify;
-
-
-void align_left_shift(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t    *start = nullptr;
-   AlignStack as;
-
-   as.Start(255);
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_newline(pc))
-      {
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
-      }
-      else
-      {
-         char copy[1000];
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
-      }
-
-      if (  start != nullptr
-         && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC)))
-      {
-         // a change in preproc status restarts the aligning
-         as.Flush();
-         start = nullptr;
-      }
-      else if (chunk_is_newline(pc))
-      {
-         as.NewLines(pc->nl_count);
-      }
-      else if (  start != nullptr
-              && pc->level < start->level)
-      {
-         // A drop in level restarts the aligning
-         as.Flush();
-         start = nullptr;
-      }
-      else if (  start != nullptr
-              && pc->level > start->level)
-      {
-         // Ignore any deeper levels when aligning
-      }
-      else if (chunk_is_token(pc, CT_SEMICOLON))
-      {
-         // A semicolon at the same level flushes
-         as.Flush();
-         start = nullptr;
-      }
-      else if (  !pc->flags.test(PCF_IN_ENUM)
-              && !pc->flags.test(PCF_IN_TYPEDEF)
-              && chunk_is_str(pc, "<<", 2))
-      {
-         if (get_chunk_parent_type(pc) == CT_OPERATOR)
-         {
-            // Ignore operator<<
-         }
-         else if (as.m_aligned.Empty())
-         {
-            /*
-             * check if the first one is actually on a blank line and then
-             * indent it. Eg:
-             *
-             *      cout
-             *          << "something";
-             */
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (  prev != nullptr
-               && chunk_is_newline(prev))
-            {
-               log_rule_B("indent_columns");
-               indent_to_column(pc, pc->column_indent + options::indent_columns());
-               pc->column_indent = pc->column;
-               chunk_flags_set(pc, PCF_DONT_INDENT);
-            }
-            // first one can be anywhere
-            as.Add(pc);
-            start = pc;
-         }
-         else if (chunk_is_newline(chunk_get_prev(pc)))
-         {
-            // subsequent ones must be after a newline
-            as.Add(pc);
-         }
-      }
-      else if (!as.m_aligned.Empty())
-      {
-         /*
-          * check if the given statement is on a line of its own, immediately following <<
-          * and then it. Eg:
-          *
-          *      cout <<
-          *          "something";
-          */
-         chunk_t *prev = chunk_get_prev(pc);
-
-         if (  prev != nullptr
-            && chunk_is_newline(prev))
-         {
-            log_rule_B("indent_columns");
-            indent_to_column(pc, pc->column_indent + options::indent_columns());
-            pc->column_indent = pc->column;
-            chunk_flags_set(pc, PCF_DONT_INDENT);
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-   as.End();
-} // align_left_shift
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.h
deleted file mode 100644
index 47d9eb81..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file align_left_shift.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_LEFT_SHIFT_H_INCLUDED
-#define ALIGN_LEFT_SHIFT_H_INCLUDED
-
-//! Align left shift operators '<<' (CT_SHIFT)
-void align_left_shift(void);
-
-#endif /* ALIGN_LEFT_SHIFT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.cpp
deleted file mode 100644
index 802b0280..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file align_log_al.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_log_al.h"
-
-#include "uncrustify.h"
-
-
-void align_log_al(log_sev_t sev, size_t line)
-{
-   if (log_sev_on(sev))
-   {
-      log_fmt(sev, "%s(%d): line %zu, cpd.al_cnt is %zu\n",
-              __func__, __LINE__, line, cpd.al_cnt);
-
-      for (size_t idx = 0; idx < cpd.al_cnt; idx++)
-      {
-         log_fmt(sev, "   cpd.al[%2.1zu].col is %2.1zu, cpd.al[%2.1zu].len is %zu, type is %s\n",
-                 idx, cpd.al[idx].col, idx, cpd.al[idx].len,
-                 get_token_name(cpd.al[idx].type));
-      }
-
-      log_fmt(sev, "\n");
-   }
-} // align_log_al
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.h
deleted file mode 100644
index 8cb2ece8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @file align_log_al.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_LOG_AL_H_INCLUDED
-#define ALIGN_LOG_AL_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-void align_log_al(log_sev_t sev, size_t line);
-
-#endif /* ALIGN_LOG_AL_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.cpp
deleted file mode 100644
index ffe17f57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @file align_nl_cont.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_nl_cont.h"
-
-#include "align_add.h"
-#include "uncrustify.h"
-
-
-chunk_t *align_nl_cont(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LALNLC, "%s(%d): start on [%s] on line %zu\n",
-           __func__, __LINE__, get_token_name(start->type), start->orig_line);
-
-   // Find the max column
-   ChunkStack cs;
-   size_t     max_col = 0;
-   chunk_t    *pc     = start;
-
-   while (  chunk_is_not_token(pc, CT_NEWLINE)
-         && chunk_is_not_token(pc, CT_COMMENT_MULTI))
-   {
-      if (chunk_is_token(pc, CT_NL_CONT))
-      {
-         align_add(cs, pc, max_col);
-      }
-      pc = chunk_get_next(pc);
-   }
-   // NL_CONT is always the last thing on a line
-   chunk_t *tmp;
-
-   while ((tmp = cs.Pop_Back()) != nullptr)
-   {
-      chunk_flags_set(tmp, PCF_WAS_ALIGNED);
-      tmp->column = max_col;
-   }
-   return(pc);
-} // align_nl_cont
-
-
-void align_backslash_newline(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_not_token(pc, CT_NL_CONT))
-      {
-         pc = chunk_get_next_type(pc, CT_NL_CONT, -1);
-         continue;
-      }
-      pc = align_nl_cont(pc);
-   }
-} // align_backslash_newline
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.h
deleted file mode 100644
index cdef76f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file align_nl_cont.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_NL_COUNT_H_INCLUDED
-#define ALIGN_NL_COUNT_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-#include "chunk_list.h"
-
-/**
- * For a series of lines ending in backslash-newline, align them.
- * The series ends when a newline or multi-line C comment is encountered.
- *
- * @param start   Start point
- *
- * @return pointer the last item looked at (nullptr/newline/comment)
- */
-chunk_t *align_nl_cont(chunk_t *start);
-
-/**
- * Aligns all backslash-newline combos in the file.
- * This should be done LAST.
- */
-void align_backslash_newline(void);
-
-#endif /* ALIGN_NL_COUNT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.cpp
deleted file mode 100644
index 628c9994..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file align_oc_decl_colon.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_oc_decl_colon.h"
-
-#include "align_stack.h"
-#include "chunk_list.h"
-
-
-using namespace uncrustify;
-
-
-void align_oc_decl_colon(void)
-{
-   LOG_FUNC_ENTRY();
-
-   bool       did_line;
-   AlignStack cas;   // for the colons
-   AlignStack nas;   // for the parameter label
-
-   cas.Start(4);
-   nas.Start(4);
-   nas.m_right_align = !options::align_on_tabstop();
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_not_token(pc, CT_OC_SCOPE))
-      {
-         pc = chunk_get_next(pc);
-         continue;
-      }
-      nas.Reset();
-      cas.Reset();
-
-      size_t level = pc->level;
-      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-      did_line = false;
-
-      while (  pc != nullptr
-            && pc->level >= level)
-      {
-         // The declaration ends with an open brace or semicolon
-         if (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_semicolon(pc))
-         {
-            break;
-         }
-
-         if (chunk_is_newline(pc))
-         {
-            nas.NewLines(pc->nl_count);
-            cas.NewLines(pc->nl_count);
-            did_line = false;
-         }
-         else if (  !did_line
-                 && chunk_is_token(pc, CT_OC_COLON))
-         {
-            cas.Add(pc);
-
-            chunk_t *tmp  = chunk_get_prev(pc, scope_e::PREPROC);
-            chunk_t *tmp2 = chunk_get_prev_ncnnl(tmp, scope_e::PREPROC);
-
-            // Check for an un-labeled parameter
-            if (  (  chunk_is_token(tmp, CT_WORD)
-                  || chunk_is_token(tmp, CT_TYPE)
-                  || chunk_is_token(tmp, CT_OC_MSG_DECL)
-                  || chunk_is_token(tmp, CT_OC_MSG_SPEC))
-               && (  chunk_is_token(tmp2, CT_WORD)
-                  || chunk_is_token(tmp2, CT_TYPE)
-                  || chunk_is_token(tmp2, CT_PAREN_CLOSE)))
-            {
-               nas.Add(tmp);
-            }
-            did_line = true;
-         }
-         pc = chunk_get_next(pc, scope_e::PREPROC);
-      }
-      nas.End();
-      cas.End();
-   }
-} // align_oc_decl_colon
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.h
deleted file mode 100644
index 370ee655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file align_oc_decl_colon.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_OC_DECL_COLON_H_INCLUDED
-#define ALIGN_OC_DECL_COLON_H_INCLUDED
-
-
-/**
- * Aligns OC declarations on the colon
- * -(void) doSomething: (NSString*) param1
- *                with: (NSString*) param2
- */
-void align_oc_decl_colon(void);
-
-#endif /* ALIGN_OC_DECL_COLON_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.cpp
deleted file mode 100644
index fedec9a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * @file align_oc_msg_colons.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "align_oc_msg_colons.h"
-
-#include "align_stack.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LOCMSG;
-
-using namespace uncrustify;
-
-
-void align_oc_msg_colon(chunk_t *so)
-{
-   LOG_FUNC_ENTRY();
-
-   AlignStack nas;   // for the parameter tag
-
-   nas.Start(1);
-   nas.Reset();
-   log_rule_B("align_on_tabstop");
-   nas.m_right_align = !options::align_on_tabstop();
-
-   AlignStack cas;   // for the colons
-
-   log_rule_B("align_oc_msg_colon_span");
-   size_t span = options::align_oc_msg_colon_span();
-
-   cas.Start(span);
-
-   size_t  level = so->level;
-   chunk_t *pc   = chunk_get_next_ncnnl(so, scope_e::PREPROC);
-
-   bool    did_line   = false;
-   bool    has_colon  = false;
-   size_t  lcnt       = 0; // line count with no colon for span
-   bool    first_line = true;
-
-   while (  pc != nullptr
-         && pc->level > level)
-   {
-      if (pc->level > (level + 1))
-      {
-         // do nothing
-      }
-      else if (chunk_is_newline(pc))
-      {
-         if (!has_colon)
-         {
-            ++lcnt;
-         }
-         did_line = false;
-
-         log_rule_B("align_oc_msg_colon_xcode_like");
-
-         if (  options::align_oc_msg_colon_xcode_like()
-            && first_line
-            && !has_colon)
-         {
-            span = 0;
-         }
-         has_colon  = !has_colon;
-         first_line = false;
-      }
-      else if (  !did_line
-              && (lcnt < span + 1)
-              && chunk_is_token(pc, CT_OC_COLON))
-      {
-         has_colon = true;
-         cas.Add(pc);
-         chunk_t *tmp = chunk_get_prev(pc);
-
-         if (  tmp != nullptr
-            && (  chunk_is_token(tmp, CT_OC_MSG_FUNC)
-               || chunk_is_token(tmp, CT_OC_MSG_NAME)))
-         {
-            nas.Add(tmp);
-            chunk_flags_set(tmp, PCF_DONT_INDENT);
-         }
-         did_line = true;
-      }
-      pc = chunk_get_next(pc, scope_e::PREPROC);
-   }
-   log_rule_B("align_oc_msg_colon_first");
-   nas.m_skip_first = !options::align_oc_msg_colon_first();
-   cas.m_skip_first = !options::align_oc_msg_colon_first();
-
-   // find the longest args that isn't the first one
-   size_t  first_len = 0;
-   size_t  mlen      = 0;
-   chunk_t *longest  = nullptr;
-
-   size_t  len = nas.m_aligned.Len();
-
-   for (size_t idx = 0; idx < len; idx++)
-   {
-      chunk_t *tmp = nas.m_aligned.GetChunk(idx);
-
-      if (tmp != nullptr)
-      {
-         size_t tlen = tmp->str.size();
-
-         if (tlen > mlen)
-         {
-            mlen = tlen;
-
-            if (idx != 0)
-            {
-               longest = tmp;
-            }
-         }
-
-         if (idx == 0)
-         {
-            first_len = tlen + 1;
-         }
-      }
-   }
-
-   // add spaces before the longest arg
-   log_rule_B("indent_oc_msg_colon");
-   len = options::indent_oc_msg_colon();
-   size_t len_diff = mlen - first_len;
-
-   log_rule_B("indent_columns");
-   size_t indent_size = options::indent_columns();
-
-   // Align with first colon if possible by removing spaces
-   log_rule_B("indent_oc_msg_prioritize_first_colon");
-
-   if (  longest != nullptr
-      && options::indent_oc_msg_prioritize_first_colon()
-      && len_diff > 0
-      && (  (longest->column >= len_diff)
-         && (longest->column - len_diff) > (longest->brace_level * indent_size)))
-   {
-      longest->column -= len_diff;
-   }
-   else if (  longest != nullptr
-           && len > 0)
-   {
-      chunk_t chunk;
-
-      set_chunk_type(&chunk, CT_SPACE);
-      set_chunk_parent(&chunk, CT_NONE);
-      chunk.orig_line   = longest->orig_line;
-      chunk.orig_col    = longest->orig_col;
-      chunk.level       = longest->level;
-      chunk.brace_level = longest->brace_level;
-      chunk.flags       = longest->flags & PCF_COPY_FLAGS;
-
-      // start at one since we already indent for the '['
-      for (size_t idx = 1; idx < len; idx++)
-      {
-         chunk.str.append(' ');
-      }
-
-      chunk_add_before(&chunk, longest);
-   }
-   nas.End();
-   cas.End();
-} // align_oc_msg_colon
-
-
-void align_oc_msg_colons(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-         && get_chunk_parent_type(pc) == CT_OC_MSG)
-      {
-         align_oc_msg_colon(pc);
-      }
-   }
-} // align_oc_msg_colons
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.h
deleted file mode 100644
index 4d8ea07d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file align_oc_msg_colons.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_OC_MSG_COLONS_H_INCLUDED
-#define ALIGN_OC_MSG_COLONS_H_INCLUDED
-
-//! Aligns OC messages
-void align_oc_msg_colons(void);
-
-#endif /* ALIGN_OC_MSG_COLONS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.cpp
deleted file mode 100644
index f57fa881..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file align_oc_msg_spec.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_oc_msg_spec.h"
-
-#include "align_assign.h"
-#include "align_stack.h"
-
-
-void align_oc_msg_spec(size_t span)
-{
-   LOG_FUNC_ENTRY();
-
-   AlignStack as;
-
-   as.Start(span, 0);
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_newline(pc))
-      {
-         as.NewLines(pc->nl_count);
-      }
-      else if (chunk_is_token(pc, CT_OC_MSG_SPEC))
-      {
-         as.Add(pc);
-      }
-   }
-
-   as.End();
-} // void align_oc_msg_spec
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.h
deleted file mode 100644
index b6500a6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file align_oc_msg_spec.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_OC_MSG_SPEC_H_INCLUDED
-#define ALIGN_OC_MSG_SPEC_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-//! Aligns all function prototypes in the file.
-void align_oc_msg_spec(size_t span);
-
-#endif /* ALIGN_OC_MSG_SPEC_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.cpp
deleted file mode 100644
index 8d54188b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @file align_preprocessor.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_preprocessor.h"
-
-#include "align_stack.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALPP;
-
-using namespace uncrustify;
-
-
-void align_preprocessor(void)
-{
-   LOG_FUNC_ENTRY();
-
-   AlignStack as;    // value macros
-
-   log_rule_B("align_pp_define_span");
-   as.Start(options::align_pp_define_span());
-   log_rule_B("align_pp_define_gap");
-   as.m_gap = options::align_pp_define_gap();
-   AlignStack *cur_as = &as;
-
-   AlignStack asf;   // function macros
-
-   log_rule_B("align_pp_define_span");
-   asf.Start(options::align_pp_define_span());
-   log_rule_B("align_pp_define_gap");
-   asf.m_gap = options::align_pp_define_gap();
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      // Note: not counting back-slash newline combos
-      if (chunk_is_token(pc, CT_NEWLINE))   // mind the gap: chunk_is_newline(pc) is NOT the same!
-      {
-         as.NewLines(pc->nl_count);
-         asf.NewLines(pc->nl_count);
-      }
-
-      // If we aren't on a 'define', then skip to the next non-comment
-      if (chunk_is_not_token(pc, CT_PP_DEFINE))
-      {
-         pc = chunk_get_next_nc(pc);
-         continue;
-      }
-      // step past the 'define'
-      pc = chunk_get_next_nc(pc);
-
-      if (pc == nullptr)
-      {
-         // coveralls will complain here. There are no example for that.
-         // see https://en.wikipedia.org/wiki/Robustness_principle
-         break;
-      }
-      LOG_FMT(LALPP, "%s(%d): define (%s) on line %zu col %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-
-      cur_as = &as;
-
-      if (chunk_is_token(pc, CT_MACRO_FUNC))
-      {
-         log_rule_B("align_pp_define_together");
-
-         if (!options::align_pp_define_together())
-         {
-            cur_as = &asf;
-         }
-         // Skip to the close parenthesis
-         pc = chunk_get_next_nc(pc); // point to open (
-         pc = chunk_get_next_type(pc, CT_FPAREN_CLOSE, pc->level);
-
-         LOG_FMT(LALPP, "%s(%d): jumped to (%s) on line %zu col %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-      }
-      // step to the value past the close parenthesis or the macro name
-      pc = chunk_get_next(pc);
-
-      if (pc == nullptr)
-      {
-         // coveralls will complain here. There are no example for that.
-         // see https://en.wikipedia.org/wiki/Robustness_principle
-         break;
-      }
-
-      /*
-       * don't align anything if the first line ends with a newline before
-       * a value is given
-       */
-      if (!chunk_is_newline(pc))
-      {
-         LOG_FMT(LALPP, "%s(%d): align on '%s', line %zu col %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-
-         cur_as->Add(pc);
-      }
-   }
-   as.End();
-   asf.End();
-} // align_preprocessor
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.h
deleted file mode 100644
index ec944587..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file align_preprocessor.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_PREPROCESSOR_H_INCLUDED
-#define ALIGN_PREPROCESSOR_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-//! Scans the whole file for #defines. Aligns all within X lines of each other
-void align_preprocessor(void);
-
-#endif /* ALIGN_PREPROCESSOR_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.cpp
deleted file mode 100644
index 72e32337..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * @file align_same_func_call_params.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_same_func_call_params.h"
-
-#include "align_stack.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LASFCP;
-
-using namespace uncrustify;
-
-
-void align_same_func_call_params(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t           *pc;
-   chunk_t           *align_root = nullptr;
-   chunk_t           *align_cur  = nullptr;
-   size_t            align_len   = 0;
-   size_t            span        = 3;
-   size_t            thresh;
-   chunk_t           *align_fcn;
-   unc_text          align_fcn_name;
-   unc_text          align_root_name;
-   deque<chunk_t *>  chunks;
-   deque<AlignStack> array_of_AlignStack;
-   AlignStack        fcn_as;
-   const char        *add_str;
-
-   // Default span is 3 if align_same_func_call_params is true
-   log_rule_B("align_same_func_call_params_span");
-
-   if (options::align_same_func_call_params_span() > 0)
-   {
-      span = options::align_same_func_call_params_span();
-   }
-   log_rule_B("align_same_func_call_params_thresh");
-   thresh = options::align_same_func_call_params_thresh();
-
-   fcn_as.Start(span, thresh);
-   LOG_FMT(LAS, "%s(%d): (3): span is %zu, thresh is %zu\n",
-           __func__, __LINE__, span, thresh);
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_newline(pc))
-      {
-         LOG_FMT(LAS, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
-      }
-      else
-      {
-         LOG_FMT(LAS, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      }
-
-      if (chunk_is_not_token(pc, CT_FUNC_CALL))
-      {
-         if (chunk_is_newline(pc))
-         {
-            for (auto &as_v : array_of_AlignStack)
-            {
-               as_v.NewLines(pc->nl_count);
-            }
-
-            fcn_as.NewLines(pc->nl_count);
-         }
-         else
-         {
-            // if we drop below the brace level that started it, we are done
-            if (  align_root != nullptr
-               && align_root->brace_level > pc->brace_level)
-            {
-               LOG_FMT(LASFCP, "  ++ (drop) Ended with %zu fcns\n", align_len);
-
-               // Flush it all!
-               fcn_as.Flush();
-
-               for (auto &as_v : array_of_AlignStack)
-               {
-                  as_v.Flush();
-               }
-
-               align_root = nullptr;
-            }
-         }
-         continue;
-      }
-      // Only align function calls that are right after a newline
-      chunk_t *prev = chunk_get_prev(pc);
-
-      while (  chunk_is_token(prev, CT_MEMBER)
-            || chunk_is_token(prev, CT_DC_MEMBER))
-      {
-         chunk_t *tprev = chunk_get_prev(prev);
-
-         if (chunk_is_not_token(tprev, CT_TYPE))
-         {
-            prev = tprev;
-            break;
-         }
-         prev = chunk_get_prev(tprev);
-      }
-
-      if (!chunk_is_newline(prev))
-      {
-         continue;
-      }
-      prev      = chunk_get_next(prev);
-      align_fcn = prev;
-      align_fcn_name.clear();
-      LOG_FMT(LASFCP, "%s(%d):\n", __func__, __LINE__);
-
-      while (prev != pc)
-      {
-         align_fcn_name += prev->str;
-         prev            = chunk_get_next(prev);
-      }
-      align_fcn_name += pc->str;
-      LOG_FMT(LASFCP, "%s(%d): Func Call found at orig_line is %zu, orig_col is %zu, c_str() '%s'\n",
-              __func__, __LINE__, align_fcn->orig_line,
-              align_fcn->orig_col,
-              align_fcn_name.c_str());
-
-      add_str = nullptr;
-
-      if (align_root != nullptr)
-      {
-         // Issue # 1395
-         // can only align functions on the same brace level
-         // and on the same level
-         LOG_FMT(LASFCP, "%s(%d):align_root is not nullptr\n", __func__, __LINE__);
-
-         if (  align_root->brace_level == pc->brace_level
-            && align_root->level == pc->level
-            && align_fcn_name.equals(align_root_name))
-         {
-            fcn_as.Add(pc);
-            align_cur->align.next = pc;
-            align_cur             = pc;
-            align_len++;
-            add_str = "  Add";
-         }
-         else
-         {
-            LOG_FMT(LASFCP, "  ++ Ended with %zu fcns\n", align_len);
-
-            // Flush it all!
-            fcn_as.Flush();
-
-            for (auto &as_v : array_of_AlignStack)
-            {
-               as_v.Flush();
-            }
-
-            align_root = nullptr;
-         }
-      }
-      LOG_FMT(LASFCP, "%s(%d):\n", __func__, __LINE__);
-
-      if (align_root == nullptr)
-      {
-         LOG_FMT(LASFCP, "%s(%d):align_root is nullptr, Add pc '%s'\n", __func__, __LINE__, pc->text());
-         fcn_as.Add(pc);
-         align_root      = align_fcn;
-         align_root_name = align_fcn_name;
-         align_cur       = pc;
-         align_len       = 1;
-         add_str         = "Start";
-      }
-      LOG_FMT(LASFCP, "%s(%d):\n", __func__, __LINE__);
-
-      if (add_str != nullptr)
-      {
-         LOG_FMT(LASFCP, "%s(%d): %s with function '%s', on orig_line %zu, ",
-                 __func__, __LINE__, add_str, align_fcn_name.c_str(), pc->orig_line);
-         align_params(pc, chunks);
-         LOG_FMT(LASFCP, "%zu items:", chunks.size());
-
-         for (size_t idx = 0; idx < chunks.size(); idx++)
-         {
-            // show the chunk(s)
-            LOG_FMT(LASFCP, " [%s]", chunks[idx]->text());
-
-            if (idx < chunks.size() - 1)
-            {
-               LOG_FMT(LASFCP, ",");
-            }
-         }
-
-         LOG_FMT(LASFCP, "\n");
-
-         for (size_t idx = 0; idx < chunks.size(); idx++)
-         {
-            LOG_FMT(LASFCP, "%s(%d): chunks[%zu] is [%s]\n", __func__, __LINE__, idx, chunks[idx]->text());
-            // Issue #2368
-
-            if (array_of_AlignStack.size() > idx)
-            {
-               // Issue #2368
-               array_of_AlignStack[idx].m_right_align = false;
-            }
-
-            if (idx >= array_of_AlignStack.size())
-            {
-               LOG_FMT(LASFCP, "%s(%d): resize with %zu\n", __func__, __LINE__, idx + 1);
-               array_of_AlignStack.resize(idx + 1);
-               LOG_FMT(LASFCP, "%s(%d): Start for the new\n", __func__, __LINE__);
-               array_of_AlignStack[idx].Start(span, thresh);
-
-               log_rule_B("align_number_right");
-
-               if (!options::align_number_right())
-               {
-                  if (  chunk_is_token(chunks[idx], CT_NUMBER_FP)
-                     || chunk_is_token(chunks[idx], CT_NUMBER)
-                     || chunk_is_token(chunks[idx], CT_POS)
-                     || chunk_is_token(chunks[idx], CT_NEG))
-                  {
-                     log_rule_B("align_on_tabstop");
-                     array_of_AlignStack[idx].m_right_align = !options::align_on_tabstop();
-                  }
-               }
-            }
-            LOG_FMT(LASFCP, "%s(%d): save the chunk %s\n", __func__, __LINE__, chunks[idx]->text());
-            array_of_AlignStack[idx].Add(chunks[idx]);
-         }
-      }
-   }
-
-   if (align_len > 1)
-   {
-      LOG_FMT(LASFCP, "  ++ Ended with %zu fcns\n", align_len);
-      fcn_as.End();
-
-      for (auto &as_v : array_of_AlignStack)
-      {
-         as_v.End();
-      }
-   }
-} // align_same_func_call_params
-
-
-void align_params(chunk_t *start, deque<chunk_t *> &chunks)
-{
-   LOG_FUNC_ENTRY();
-
-   chunks.clear();
-
-   bool    hit_comma = true;
-   chunk_t *pc       = chunk_get_next_type(start, CT_FPAREN_OPEN, start->level);
-
-   while ((pc = chunk_get_next(pc)) != nullptr)
-   {
-      if (  chunk_is_newline(pc)
-         || chunk_is_token(pc, CT_SEMICOLON)
-         || (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-            && pc->level == start->level))
-      {
-         break;
-      }
-
-      if (pc->level == (start->level + 1))
-      {
-         if (hit_comma)
-         {
-            chunks.push_back(pc);
-            hit_comma = false;
-         }
-         else if (chunk_is_token(pc, CT_COMMA))
-         {
-            hit_comma = true;
-         }
-      }
-   }
-} // void align_params
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.h
deleted file mode 100644
index c7e122fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file align_same_func_call_params.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_SAME_FUNC_CALL_PARAMS_H_INCLUDED
-#define ALIGN_SAME_FUNC_CALL_PARAMS_H_INCLUDED
-
-#include "ChunkStack.h"
-#include <deque>
-
-using namespace std;
-
-void align_params(chunk_t *start, deque<chunk_t *> &chunks);
-
-void align_same_func_call_params(void);
-
-#endif /* ALIGN_SAME_FUNC_CALL_PARAMS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.cpp
deleted file mode 100644
index c8e15bc5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.cpp
+++ /dev/null
@@ -1,659 +0,0 @@
-/**
- * @file align_stack.cpp
- * Manages an align stack, which is just a pair of chunk stacks.
- * There can be at most 1 item per line in the stack.
- * The seqnum is actually a line counter.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_stack.h"
-
-#include "align_tab_column.h"
-#include "indent.h"
-#include "space.h"
-#if defined WITH_STACKID
-#include "unc_tools.h"                   // to get stackID and get_A_Number()
-#endif
-
-
-constexpr static auto LCURRENT = LAS;
-
-using namespace uncrustify;
-
-using std::numeric_limits;
-
-
-void AlignStack::Start(size_t span, int thresh)
-{
-#if defined WITH_STACKID
-   stackID = get_A_Number();   // for debugging purpose only
-#endif
-   // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
-
-   //LOG_FMT(LAS, "AlignStack::Start(%d):m_aligned.Reset()\n", __LINE__);
-   m_aligned.Reset();
-   //LOG_FMT(LAS, "AlignStack::Start(%d):m_skipped.Reset()\n", __LINE__);
-   m_skipped.Reset();
-
-   if (thresh > 0)
-   {
-      m_absolute_thresh = false;
-      m_thresh          = thresh;
-   }
-   else
-   {
-      m_absolute_thresh = true;
-      m_thresh          = -thresh;
-   }
-   m_span        = span;
-   m_min_col     = numeric_limits<size_t>::max();
-   m_max_col     = 0;
-   m_nl_seqnum   = 0;
-   m_seqnum      = 0;
-   m_gap         = 0;
-   m_right_align = false;
-   m_star_style  = SS_IGNORE;
-   m_amp_style   = SS_IGNORE;
-}
-
-
-void AlignStack::ReAddSkipped()
-{
-   // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
-
-   if (m_skipped.Empty())
-   {
-      return;
-   }
-   // Make a copy of the ChunkStack and clear m_skipped
-   m_scratch.Set(m_skipped);
-   //LOG_FMT(LAS, "AlignStack::ReAddSkipped(%d):m_skipped.Reset()\n", __LINE__);
-   m_skipped.Reset();
-
-   // Need to add them in order so that m_nl_seqnum is correct
-   for (size_t idx = 0; idx < m_scratch.Len(); idx++)
-   {
-      const ChunkStack::Entry *ce = m_scratch.Get(idx);
-      LOG_FMT(LAS, "AlignStack::ReAddSkipped [%zu] - ", ce->m_seqnum);
-      Add(ce->m_pc, ce->m_seqnum);
-   }
-
-   NewLines(0); // Check to see if we need to flush right away
-}
-
-
-void AlignStack::Add(chunk_t *start, size_t seqnum)
-{
-   // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LAS, "AlignStack::%s(%d): Candidate is '%s': orig_line is %zu, column is %zu, type is %s, level is %zu\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->column, get_token_name(start->type), start->level);
-   LOG_FMT(LAS, "AlignStack::%s(%d): seqnum is %zu\n", __func__, __LINE__, seqnum);
-
-   // Assign a seqnum if needed
-   if (seqnum == 0)
-   {
-      LOG_FMT(LAS, "AlignStack::%s(%d): m_seqnum is %zu\n", __func__, __LINE__, m_seqnum);
-      seqnum = m_seqnum;
-      LOG_FMT(LAS, "AlignStack::%s(%d): seqnum is %zu\n", __func__, __LINE__, seqnum);
-   }
-   m_last_added = 0;
-
-   // Threshold check should begin after
-   // tighten down the spacing between ref and start
-
-   /*
-    * SS_IGNORE: no special handling of '*' or '&', only 'foo' is aligned
-    *     void     foo;  // gap=5, 'foo' is aligned
-    *     char *   foo;  // gap=3, 'foo' is aligned
-    *     foomatic foo;  // gap=1, 'foo' is aligned
-    *  The gap is the columns between 'foo' and the previous token.
-    *  [void - foo], ['*' - foo], etc
-    *
-    * SS_INCLUDE: - space between variable and '*' or '&' is eaten
-    *     void     foo;  // gap=5, 'foo' is aligned
-    *     char     *foo; // gap=5, '*' is aligned
-    *     foomatic foo;  // gap=1, 'foo' is aligned
-    *  The gap is the columns between the first '*' or '&' before foo
-    *  and the previous token. [void - foo], [char - '*'], etc
-    *
-    * SS_DANGLE: - space between variable and '*' or '&' is eaten
-    *     void     foo;  // gap=5
-    *     char    *bar;  // gap=5, as the '*' doesn't count
-    *     foomatic foo;  // gap=1
-    *  The gap is the columns between 'foo' and the chunk before the first
-    *  '*' or '&'. [void - foo], [char - bar], etc
-    *
-    * If the gap < m_gap, then the column is bumped out by the difference.
-    * So, if m_gap is 2, then the above would be:
-    * SS_IGNORE:
-    *     void      foo;  // gap=6
-    *     char *    foo;  // gap=4
-    *     foomatic  foo;  // gap=2
-    * SS_INCLUDE:
-    *     void      foo;  // gap=6
-    *     char      *foo; // gap=6
-    *     foomatic  foo;  // gap=2
-    * SS_DANGLE:
-    *     void      foo;  // gap=6
-    *     char     *bar;  // gap=6, as the '*' doesn't count
-    *     foomatic  foo;  // gap=2
-    * Right aligned numbers:
-    *     #define A    -1
-    *     #define B   631
-    *     #define C     3
-    * Left aligned numbers:
-    *     #define A     -1
-    *     #define B     631
-    *     #define C     3
-    *
-    * In the code below, pc is set to the item that is aligned.
-    * In the above examples, that is 'foo', '*', '-', or 63.
-    *
-    * Ref is set to the last part of the type.
-    * In the above examples, that is 'void', 'char', 'foomatic', 'A', or 'B'.
-    *
-    * The '*' and '&' can float between the two.
-    *
-    * If align_on_tabstop=true, then SS_DANGLE is changed to SS_INCLUDE.
-    */
-   log_rule_B("align_on_tabstop");
-
-   if (  options::align_on_tabstop()
-      && m_star_style == SS_DANGLE)
-   {
-      m_star_style = SS_INCLUDE;
-   }
-   LOG_FMT(LAS, "AlignStack::%s(%d): m_star_style is %s\n",
-           __func__, __LINE__, get_StarStyle_name(m_star_style));
-   // Find ref. Back up to the real item that is aligned.
-   chunk_t *prev = start;
-
-   while (  (prev = chunk_get_prev(prev)) != nullptr
-         && (  chunk_is_ptr_operator(prev)
-            || chunk_is_token(prev, CT_TPAREN_OPEN)))
-   {
-      // do nothing - we want prev when this exits
-   }
-
-   if (prev == nullptr)
-   {
-      return;
-   }
-   chunk_t *ref = prev;
-
-   if (chunk_is_newline(ref))
-   {
-      ref = chunk_get_next(ref);
-   }
-   // Find the item that we are going to align.
-   chunk_t *ali = start;
-
-   if (m_star_style != SS_IGNORE)
-   {
-      // back up to the first '*' or '^' preceding the token
-      chunk_t *tmp_prev = chunk_get_prev(ali);
-
-      while (  chunk_is_star(tmp_prev)
-            || chunk_is_msref(tmp_prev))
-      {
-         ali      = tmp_prev;
-         tmp_prev = chunk_get_prev(ali);
-      }
-
-      if (chunk_is_token(tmp_prev, CT_TPAREN_OPEN))
-      {
-         ali      = tmp_prev;
-         tmp_prev = chunk_get_prev(ali);
-         // this is correct, even Coverity says:
-         // CID 76021 (#1 of 1): Unused value (UNUSED_VALUE)returned_pointer: Assigning value from
-         // chunk_get_prev(ali, nav_e::ALL) to prev here, but that stored value is overwritten before it can be used.
-      }
-   }
-
-   if (m_amp_style != SS_IGNORE)
-   {
-      // back up to the first '&' preceding the token
-      chunk_t *tmp_prev = chunk_get_prev(ali);
-
-      while (chunk_is_addr(tmp_prev))
-      {
-         ali      = tmp_prev;
-         tmp_prev = chunk_get_prev(ali);
-      }
-   }
-   log_rule_B("align_keep_extra_space");
-
-   // Tighten down the spacing between ref and start
-   if (!options::align_keep_extra_space())
-   {
-      size_t  tmp_col = ref->column;
-      chunk_t *tmp    = ref;
-      LOG_FMT(LAS, "AlignStack::%s(%d): tmp_col is %zu\n",
-              __func__, __LINE__, tmp_col);
-
-      while (  tmp != nullptr
-            && tmp != start)
-      {
-         chunk_t *next = chunk_get_next(tmp);
-
-         if (next != nullptr)
-         {
-            LOG_FMT(LAS, "AlignStack::%s(%d): next->orig_line is %zu, orig_col is %zu, text() '%s', level is %zu, type is %s\n",
-                    __func__, __LINE__, next->orig_line, next->orig_col, next->text(), next->level, get_token_name(next->type));
-            tmp_col += space_col_align(tmp, next);
-            LOG_FMT(LAS, "AlignStack::%s(%d): next->column is %zu, level is %zu, tmp_col is %zu\n",
-                    __func__, __LINE__, next->column, next->level, tmp_col);
-
-            if (next->column != tmp_col)
-            {
-               LOG_FMT(LAS, "AlignStack::%s(%d): Call align_to_column\n", __func__, __LINE__);
-               align_to_column(next, tmp_col);
-            }
-         }
-         tmp = next;
-      }
-   }
-
-   // Check threshold limits
-   if (  m_max_col == 0
-      || m_thresh == 0
-      || (  ((start->column + m_gap) <= (m_thresh + (m_absolute_thresh ? m_min_col : m_max_col))) // don't use subtraction here to prevent underflow
-         && (  (start->column + m_gap + m_thresh) >= m_max_col                                    // change the expression to mind negative expression
-            || start->column >= m_min_col)))
-   {
-      // we are adding it, so update the newline seqnum
-      if (seqnum > m_nl_seqnum)
-      {
-         m_nl_seqnum = seqnum;
-      }
-      // Set the column adjust and gap
-      size_t col_adj = 0; // Amount the column is shifted for 'dangle' mode
-      size_t gap     = 0;
-
-      if (ref != ali)
-      {
-         gap = ali->column - (ref->column + ref->len());
-      }
-      chunk_t *tmp = ali;
-
-      if (chunk_is_token(tmp, CT_TPAREN_OPEN))
-      {
-         tmp = chunk_get_next(tmp);
-      }
-
-      if (  (  chunk_is_star(tmp)
-            && m_star_style == SS_DANGLE)
-         || (  chunk_is_addr(tmp)
-            && m_amp_style == SS_DANGLE)
-         || (  chunk_is_nullable(tmp)
-            && (m_star_style == SS_DANGLE))
-         || (  chunk_is_msref(tmp)
-            && m_star_style == SS_DANGLE)) // TODO: add m_msref_style
-      {
-         col_adj = start->column - ali->column;
-         gap     = start->column - (ref->column + ref->len());
-      }
-      // See if this pushes out the max_col
-      const size_t endcol = ali->column + col_adj
-                            + (gap < m_gap ? m_gap - gap : 0);
-
-      ali->align.col_adj = col_adj;
-      ali->align.ref     = ref;
-      ali->align.start   = start;
-      m_aligned.Push_Back(ali, seqnum);
-      m_last_added = 1;
-
-      // Issue #2278
-      if (chunk_is_token(ali, CT_PTR_TYPE))
-      {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-[%s][%s]: ali->orig_line is %zu, column is %zu, type is %s, level is %zu\n",
-                 __func__, __LINE__, ali->text(), start->text(), ali->orig_line, ali->column, get_token_name(ali->type), ali->level);
-      }
-      else
-      {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-[%s]: ali->orig_line is %zu, column is %zu, type is %s, level is %zu\n",
-                 __func__, __LINE__, ali->text(), ali->orig_line, ali->column, get_token_name(ali->type), ali->level);
-      }
-      LOG_FMT(LAS, "AlignStack::%s(%d):    ali->align.col_adj is %d, ref '%s', endcol is %zu\n",
-              __func__, __LINE__, ali->align.col_adj, ref->text(), endcol);
-
-      if (m_min_col > endcol)
-      {
-         m_min_col = endcol;
-      }
-
-      if (endcol > m_max_col)
-      {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-aligned: seqnum is %zu, m_nl_seqnum is %zu, m_seqnum is %zu\n",
-                 __func__, __LINE__, seqnum, m_nl_seqnum, m_seqnum);
-         LOG_FMT(LAS, "AlignStack::%s(%d):    ali->orig_line is %zu, ali->column is %zu, max_col old is %zu, new is %zu, m_min_col is %zu\n",
-                 __func__, __LINE__, ali->orig_line, ali->column, m_max_col, endcol, m_min_col);
-         m_max_col = endcol;
-
-         /*
-          * If there were any entries that were skipped, re-add them as they
-          * may now be within the threshold
-          */
-         if (!m_skipped.Empty())
-         {
-            ReAddSkipped();
-         }
-      }
-      else
-      {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-aligned: seqnum is %zu, m_nl_seqnum is %zu, m_seqnum is %zu\n",
-                 __func__, __LINE__, seqnum, m_nl_seqnum, m_seqnum);
-         LOG_FMT(LAS, "AlignStack::%s(%d):    ali->orig_line is %zu, ali->column is %zu, max_col old is %zu, new is %zu, m_min_col is %zu\n",
-                 __func__, __LINE__, ali->orig_line, ali->column, m_max_col, endcol, m_min_col);
-      }
-   }
-   else
-   {
-      // The threshold check failed, so add it to the skipped list
-      m_skipped.Push_Back(start, seqnum);
-      m_last_added = 2;
-
-      LOG_FMT(LAS, "AlignStack::Add-skipped [%zu/%zu/%zu]: line %zu, col %zu <= %zu + %zu\n",
-              seqnum, m_nl_seqnum, m_seqnum,
-              start->orig_line, start->column, m_max_col, m_thresh);
-   }
-   // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
-} // AlignStack::Add
-
-
-void AlignStack::NewLines(size_t cnt)
-{
-   // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
-
-   if (m_aligned.Empty())
-   {
-      //LOG_FMT(LAS, "AlignStack::Newlines(%d): nothing to do, is empty\n", __LINE__);
-      return;
-   }
-   LOG_FMT(LAS, "AlignStack::Newlines(%d): cnt is %zu\n", __LINE__, cnt);
-   m_seqnum += cnt;
-   LOG_FMT(LAS, "AlignStack::Newlines(%d): m_seqnum is %zu, m_nl_seqnum is %zu, m_span is %zu\n",
-           __LINE__, m_seqnum, m_nl_seqnum, m_span);
-
-   if (m_seqnum > (m_nl_seqnum + m_span))
-   {
-      LOG_FMT(LAS, "AlignStack::Newlines(%d): cnt is %zu\n", __LINE__, cnt);
-      Flush();
-   }
-}
-
-
-void AlignStack::Flush()
-{
-   // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
-
-   LOG_FMT(LAS, "AlignStack::%s(%d): Len() is %zu\n",
-           __func__, __LINE__, Len());
-
-   if (Len() > 0)
-   {
-      LOG_FMT(LAS, "   (min is %zu, max is %zu)\n",
-              m_min_col, m_max_col);
-   }
-
-   if (Len() == 1)
-   {
-      // check if we have *one* typedef in the line
-      chunk_t *pc   = m_aligned.Get(0)->m_pc;
-      chunk_t *temp = chunk_get_prev_type(pc, CT_TYPEDEF, pc->level);
-
-      if (temp != nullptr)
-      {
-         if (pc->orig_line == temp->orig_line)
-         {
-            // reset the gap only for *this* stack
-            m_gap = 1;
-         }
-      }
-   }
-   m_last_added = 0;
-   m_max_col    = 0;
-
-   // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
-   LOG_FMT(LAS, "AlignStack::%s(%d): Debug the stack, Len is %zu\n",
-           __func__, __LINE__, Len());
-
-   for (size_t idx = 0; idx < Len(); idx++)
-   {
-      chunk_t *pc = m_aligned.Get(idx)->m_pc;
-      LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, pc->text() is '%s', pc->align.col_adj is %d\n",
-              __func__, __LINE__, idx, pc->text(), pc->align.col_adj);
-   }
-
-   // Recalculate the max_col - it may have shifted since the last Add()
-   for (size_t idx = 0; idx < Len(); idx++)
-   {
-      chunk_t *pc = m_aligned.Get(idx)->m_pc;
-
-      // Set the column adjust and gap
-      size_t col_adj = 0;
-      size_t gap     = 0;
-
-      if (pc != pc->align.ref)
-      {
-         gap = pc->column - (pc->align.ref->column + pc->align.ref->len());
-      }
-
-      if (m_star_style == SS_DANGLE)
-      {
-         chunk_t *tmp = (chunk_is_token(pc, CT_TPAREN_OPEN)) ? chunk_get_next(pc) : pc;
-
-         if (chunk_is_ptr_operator(tmp))
-         {
-            col_adj = pc->align.start->column - pc->column;
-            gap     = pc->align.start->column - (pc->align.ref->column + pc->align.ref->len());
-         }
-      }
-
-      if (m_right_align)
-      {
-         // Adjust the width for signed numbers
-         if (pc->align.start != nullptr)
-         {
-            size_t start_len = pc->align.start->len();
-
-            if (pc->align.start->type == CT_NEG)
-            {
-               chunk_t *next = chunk_get_next(pc->align.start);
-
-               if (chunk_is_token(next, CT_NUMBER))
-               {
-                  start_len += next->len();
-               }
-            }
-            col_adj += start_len;
-         }
-      }
-      pc->align.col_adj = col_adj;
-
-      // See if this pushes out the max_col
-      const size_t endcol = pc->column + col_adj
-                            + (gap < m_gap ? m_gap - gap : 0);
-
-      if (endcol > m_max_col)
-      {
-         m_max_col = endcol;
-      }
-   }
-
-   log_rule_B("align_on_tabstop");
-
-   if (  options::align_on_tabstop()
-      && Len() > 1)
-   {
-      m_max_col = align_tab_column(m_max_col);
-   }
-   LOG_FMT(LAS, "AlignStack::%s(%d): Len() is %zu\n",
-           __func__, __LINE__, Len());
-
-   const ChunkStack::Entry *ce = nullptr;
-
-   for (size_t idx = 0; idx < Len(); idx++)
-   {
-      ce = m_aligned.Get(idx);
-      LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, ce->m_pc->text() is '%s', orig_line is %zu, orig_col is %zu, align.col_adj is %d\n",
-              __func__, __LINE__, idx, ce->m_pc->text(), ce->m_pc->orig_line, ce->m_pc->orig_col, ce->m_pc->align.col_adj);
-   }
-
-   for (size_t idx = 0; idx < Len(); idx++)
-   {
-      ce = m_aligned.Get(idx);
-      chunk_t      *pc = ce->m_pc;
-
-      const size_t tmp_col = m_max_col - pc->align.col_adj;
-
-      if (idx == 0)
-      {
-         if (  m_skip_first
-            && pc->column != tmp_col)
-         {
-            LOG_FMT(LAS, "AlignStack::%s(%d): orig_line is %zu, orig_col is %zu, dropping first item due to skip_first\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
-            m_skip_first = false;
-            m_aligned.Pop_Front();
-            Flush();
-            m_skip_first = true;
-            return;
-         }
-         chunk_flags_set(pc, PCF_ALIGN_START);
-
-         pc->align.right_align = m_right_align;
-         pc->align.amp_style   = m_amp_style;
-         pc->align.star_style  = m_star_style;
-      }
-      pc->align.gap  = m_gap;
-      pc->align.next = m_aligned.GetChunk(idx + 1);
-
-      // Indent the token, taking col_adj into account
-      LOG_FMT(LAS, "AlignStack::%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', set to col %zu (adj is %d)\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), tmp_col, pc->align.col_adj);
-      align_to_column(pc, tmp_col);
-   }
-
-   size_t last_seqnum = 0;
-
-   if (ce != nullptr)
-   {
-      last_seqnum = ce->m_seqnum;
-      //LOG_FMT(LAS, "AlignStack::Flush(%d):m_aligned.Reset()\n", __LINE__);
-      m_aligned.Reset();
-   }
-   m_min_col = numeric_limits<size_t>::max(); // use unrealistic high numbers
-   m_max_col = 0;                             // as start value
-
-   if (m_skipped.Empty())
-   {
-      // Nothing was skipped, sync the sequence numbers
-      m_nl_seqnum = m_seqnum;
-   }
-   else
-   {
-      // Remove all items with seqnum < last_seqnum
-      for (size_t idx = 0; idx < m_skipped.Len(); idx++)
-      {
-         if (m_skipped.Get(idx)->m_seqnum < last_seqnum)
-         {
-            m_skipped.Zap(idx);
-         }
-      }
-
-      m_skipped.Collapse();
-
-      ReAddSkipped(); // Add all items from the skipped list
-   }
-} // AlignStack::Flush
-
-
-void AlignStack::Reset()
-{
-   //WITH_STACKID_DEBUG;
-   //LOG_FMT(LAS, "AlignStack::Reset(%d):m_aligned.Reset()\n", __LINE__);
-   m_aligned.Reset();
-   //LOG_FMT(LAS, "AlignStack::Reset(%d):m_skipped.Reset()\n", __LINE__);
-   m_skipped.Reset();
-}
-
-
-void AlignStack::End()
-{
-   //WITH_STACKID_DEBUG;
-
-   if (!m_aligned.Empty())
-   {
-      //LOG_FMT(LAS, "AlignStack::End(%d):\n", __LINE__);
-      Flush();
-   }
-   //LOG_FMT(LAS, "AlignStack::End(%d):m_aligned.Reset()\n", __LINE__);
-   m_aligned.Reset();
-   //LOG_FMT(LAS, "AlignStack::End(%d):m_skipped.Reset()\n", __LINE__);
-   m_skipped.Reset();
-}
-
-
-size_t AlignStack::Len()
-{
-   return(m_aligned.Len());
-}
-
-
-void AlignStack::Debug()
-{
-   //WITH_STACKID_DEBUG;
-
-   size_t length = Len();
-
-   if (length > 0)
-   {
-      LOG_FMT(LAS, "AlignStack::%s(%d): Debug the stack, Len is %zu\n",
-              __func__, __LINE__, Len());
-
-      for (size_t idx = 0; idx < length; idx++)
-      {
-         chunk_t *pc = m_aligned.Get(idx)->m_pc;
-
-         if (chunk_is_token(pc, CT_PTR_TYPE))
-         {
-            LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, [%s][%s]: orig_line is %zu, orig_col is %zu, type is %s, level is %zu, brace_level is %zu\n",
-                    __func__, __LINE__, idx, pc->text(), pc->next->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->level, pc->brace_level);
-         }
-         else
-         {
-            LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, [%s]: orig_line is %zu, orig_col is %zu, type is %s, level is %zu, brace_level is %zu\n",
-                    __func__, __LINE__, idx, pc->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->level, pc->brace_level);
-         }
-      }
-   }
-}
-
-
-const char *AlignStack::get_StarStyle_name(StarStyle star_style)
-{
-   switch (star_style)
-   {
-   case StarStyle::SS_IGNORE:
-      return("SS_IGNORE");
-
-   case StarStyle::SS_INCLUDE:
-      return("SS_INCLUDE");
-
-   case StarStyle::SS_DANGLE:
-      return("SS_DANGLE");
-   }
-   return("?????");
-} // get_StarStyle_name
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.h
deleted file mode 100644
index ebd29dcc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * @file align_stack.h
- * Manages a align stack, which is just a pair of chunk stacks with a few
- * fancy functions.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_STACK_H_INCLUDED
-#define ALIGN_STACK_H_INCLUDED
-
-#include "ChunkStack.h"
-
-#include <limits>
-
-class AlignStack
-{
-public:
-   enum StarStyle
-   {
-      SS_IGNORE,  //! don't look for prev stars
-      SS_INCLUDE, //! include prev * before add
-      SS_DANGLE   //! include prev * after add
-   };
-
-   ChunkStack m_aligned;      //! contains the token that is aligned
-   ChunkStack m_skipped;      //! contains the tokens sent to Add()
-   size_t     m_max_col;
-   size_t     m_min_col;
-   size_t     m_span;
-   size_t     m_thresh;
-   size_t     m_seqnum;
-   size_t     m_nl_seqnum;
-   size_t     m_gap;
-   bool       m_right_align;
-   bool       m_absolute_thresh;
-   StarStyle  m_star_style;
-   StarStyle  m_amp_style;  //! do not include the first item if it causes it to be indented
-   bool       m_skip_first; //! do not include the first item if it causes it to be indented
-#define WITH_STACKID    1
-#if defined WITH_STACKID
-   size_t stackID;      // for debugging purpose only
-#endif
-
-
-   AlignStack()
-      : m_max_col(0)
-      , m_min_col(0)
-      , m_span(0)
-      , m_thresh(0)
-      , m_seqnum(0)
-      , m_nl_seqnum(0)
-      , m_gap(0)
-      , m_right_align(false)
-      , m_absolute_thresh(false)
-      , m_star_style(SS_IGNORE)
-      , m_amp_style(SS_IGNORE)
-      , m_skip_first(false)
-#if defined WITH_STACKID
-      , stackID(std::numeric_limits<std::size_t>::max()) // under linux 64 bits: 18446744073709551615
-#endif
-      , m_last_added(0)
-   {
-   }
-
-
-   AlignStack(const AlignStack &ref)
-      : m_aligned(ref.m_aligned)
-      , m_skipped(ref.m_skipped)
-      , m_max_col(ref.m_max_col)
-      , m_min_col(ref.m_min_col)
-      , m_span(ref.m_span)
-      , m_thresh(ref.m_thresh)
-      , m_seqnum(ref.m_seqnum)
-      , m_nl_seqnum(ref.m_nl_seqnum)
-      , m_gap(ref.m_gap)
-      , m_right_align(ref.m_right_align)
-      , m_absolute_thresh(ref.m_absolute_thresh)
-      , m_star_style(ref.m_star_style)
-      , m_amp_style(ref.m_amp_style)
-      , m_skip_first(ref.m_skip_first)
-      , m_last_added(ref.m_last_added)
-   {
-   }
-
-
-   ~AlignStack()
-   {
-   }
-
-   /**
-    * Resets the two ChunkLists and zeroes local vars.
-    *
-    * @param span       The row span limit
-    * @param threshold  The column threshold
-    */
-   void Start(size_t span, int threshold = 0);
-
-
-   /**
-    * Adds an entry to the appropriate stack.
-    *
-    * @param pc      the chunk
-    * @param seqnum  optional sequence number (0=assign one)
-    */
-   void Add(chunk_t *pc, size_t seqnum = 0);
-
-
-   //! Adds some newline and calls Flush() if needed
-   void NewLines(size_t cnt);
-
-
-   /**
-    * Aligns all the stuff in m_aligned.
-    * Re-adds 'newer' items in m_skipped.
-    */
-   void Flush();
-
-
-   //! Resets the stack, discarding anything that was previously added
-   void Reset();
-
-
-   //! Aligns everything else and resets the lists.
-   void End();
-
-
-   //! the size of the lists.
-   size_t Len();
-
-
-   //! for debuging purpose only
-   void Debug();
-
-
-   const char *get_StarStyle_name(StarStyle star_style);
-
-protected:
-   size_t     m_last_added; //! 0=none, 1=aligned, 2=skipped
-   ChunkStack m_scratch;    //! used in ReAddSkipped()
-
-   //! Calls Add on all the skipped items
-   void ReAddSkipped();
-};
-
-#if defined WITH_STACKID
-#define WITH_STACKID_DEBUG                                                                                  \
-   if (stackID == std::numeric_limits<std::size_t>::max())                                                  \
-   {                                                                                                        \
-      fprintf(stderr, "AlignStack::%s(%d): the stack is not ready, Start is missed\n", __func__, __LINE__); \
-      log_flush(true);                                                                                      \
-      exit(EX_SOFTWARE);                                                                                    \
-   }                                                                                                        \
-   else                                                                                                     \
-   {                                                                                                        \
-      LOG_FMT(LAS, "AlignStack::%s(%d): stackID is %zu\n", __func__, __LINE__, stackID);                    \
-   }
-#else
-#define WITH_STACKID_DEBUG    ;
-#endif
-
-#endif /* ALIGN_STACK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.cpp
deleted file mode 100644
index 95b09da0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file align_struct_initializers.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_struct_initializers.h"
-
-#include "align_init_brace.h"
-#include "chunk_list.h"
-
-
-void align_struct_initializers(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-      if (  chunk_is_token(prev, CT_ASSIGN)
-         && (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || (  language_is_set(LANG_D)
-               && chunk_is_token(pc, CT_SQUARE_OPEN))))
-      {
-         align_init_brace(pc);
-      }
-      pc = chunk_get_next_type(pc, CT_BRACE_OPEN, -1);
-   }
-} // align_struct_initializers
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.h
deleted file mode 100644
index 1c71d5af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file align_struct_initializers.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_STRUCT_INITIALIZERS_H_INCLUDED
-#define ALIGN_STRUCT_INITIALIZERS_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-//! Aligns stuff inside a multi-line "= { ... }" sequence.
-void align_struct_initializers(void);
-
-#endif /* ALIGN_STRUCT_INITIALIZERS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.cpp
deleted file mode 100644
index 8d91b0ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file align_tab_column.cpp
- *
- * @author  Guy Maurel
- * split from prototypes.h
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_tab_column.h"
-
-#include "prototypes.h"
-
-constexpr static auto LCURRENT = LALIGN;
-
-using namespace uncrustify;
-
-
-/**
- * Advances to the next tab stop if not currently on one.
- *
- * @param col  The current column
- * @return the next tabstop column
- */
-size_t align_tab_column(size_t col)
-{
-   //if (col <= 0)
-   if (col == 0)
-   {
-      col = 1;
-   }
-   log_rule_B("output_tab_size");
-
-   if ((col % uncrustify::options::output_tab_size()) != 1)
-   {
-      col = next_tab_column(col);
-   }
-   return(col);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.h
deleted file mode 100644
index 9e57baa0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file align_tab_column.h
- *
- * @author  Guy Maurel
- * split from prototypes.h
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_TAB_COLUMN_H_INCLUDED
-#define ALIGN_TAB_COLUMN_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-/**
- * Advances to the next tab stop if not currently on one.
- *
- * @param col  The current column
- * @return the next tabstop column
- */
-size_t align_tab_column(size_t col);
-
-#endif /* ALIGN_TAB_COLUMN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.cpp
deleted file mode 100644
index bd067be5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * @file align_tools.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_tools.h"
-
-#include "space.h"
-#include "uncrustify.h"
-
-
-chunk_t *skip_c99_array(chunk_t *sq_open)
-{
-   if (chunk_is_token(sq_open, CT_SQUARE_OPEN))
-   {
-      chunk_t *tmp = chunk_get_next_nc(chunk_skip_to_match(sq_open));
-
-      if (chunk_is_token(tmp, CT_ASSIGN))
-      {
-         return(chunk_get_next_nc(tmp));
-      }
-   }
-   return(nullptr);
-} // skip_c99_array
-
-
-chunk_t *scan_ib_line(chunk_t *start, bool first_pass)
-{
-   UNUSED(first_pass);
-   LOG_FUNC_ENTRY();
-   chunk_t *prev_match = nullptr;
-   size_t  idx         = 0;
-
-   // Skip past C99 "[xx] =" stuff
-   chunk_t *tmp = skip_c99_array(start);
-
-   if (tmp != nullptr)
-   {
-      set_chunk_parent(start, CT_TSQUARE);
-      start            = tmp;
-      cpd.al_c99_array = true;
-   }
-   chunk_t *pc = start;
-
-   if (pc != nullptr)
-   {
-      LOG_FMT(LSIB, "%s(%d): start: orig_line is %zu, orig_col is %zu, column is %zu, type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, get_token_name(pc->type));
-   }
-
-   while (  pc != nullptr
-         && !chunk_is_newline(pc)
-         && pc->level >= start->level)
-   {
-      //LOG_FMT(LSIB, "%s:     '%s'   col %d/%d line %zu\n", __func__,
-      //        pc->text(), pc->column, pc->orig_col, pc->orig_line);
-
-      chunk_t *next = chunk_get_next(pc);
-
-      if (  next == nullptr
-         || chunk_is_comment(next))
-      {
-         // do nothing
-      }
-      else if (  chunk_is_token(pc, CT_ASSIGN)
-              || chunk_is_token(pc, CT_BRACE_OPEN)
-              || chunk_is_token(pc, CT_BRACE_CLOSE)
-              || chunk_is_token(pc, CT_COMMA))
-      {
-         size_t token_width = space_col_align(pc, next);
-
-         // TODO: need to handle missing structure defs? ie NULL vs { ... } ??
-
-         // Is this a new entry?
-         if (idx >= cpd.al_cnt)
-         {
-            if (idx == 0)
-            {
-               LOG_FMT(LSIB, "%s(%d): Prepare the 'idx's\n", __func__, __LINE__);
-            }
-            LOG_FMT(LSIB, "%s(%d):   New idx is %2.1zu, pc->column is %2.1zu, text() '%s', token_width is %zu, type is %s\n",
-                    __func__, __LINE__, idx, pc->column, pc->text(), token_width, get_token_name(pc->type));
-            cpd.al[cpd.al_cnt].type = pc->type;
-            cpd.al[cpd.al_cnt].col  = pc->column;
-            cpd.al[cpd.al_cnt].len  = token_width;
-            cpd.al_cnt++;
-
-            if (cpd.al_cnt == uncrustify::limits::AL_SIZE)
-            {
-               fprintf(stderr, "Number of 'entry' to be aligned is too big for the current value %d,\n",
-                       uncrustify::limits::AL_SIZE);
-               fprintf(stderr, "at line %zu, column %zu.\n",
-                       pc->orig_line, pc->orig_col);
-               fprintf(stderr, "Please make a report.\n");
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            idx++;
-         }
-         else
-         {
-            // expect to match stuff
-            if (cpd.al[idx].type == pc->type)
-            {
-               LOG_FMT(LSIB, "%s(%d):   Match? idx is %2.1zu, orig_line is %2.1zu, column is %2.1zu, token_width is %zu, type is %s\n",
-                       __func__, __LINE__, idx, pc->orig_line, pc->column, token_width, get_token_name(pc->type));
-
-               // Shift out based on column
-               if (prev_match == nullptr)
-               {
-                  if (pc->column > cpd.al[idx].col)
-                  {
-                     LOG_FMT(LSIB, "%s(%d): [ pc->column (%zu) > cpd.al[%zu].col(%zu) ] \n",
-                             __func__, __LINE__, pc->column, idx, cpd.al[idx].col);
-
-                     ib_shift_out(idx, pc->column - cpd.al[idx].col);
-                     cpd.al[idx].col = pc->column;
-                  }
-               }
-               else if (idx > 0)
-               {
-                  LOG_FMT(LSIB, "%s(%d):   prev_match '%s', prev_match->orig_line is %zu, prev_match->orig_col is %zu\n",
-                          __func__, __LINE__, prev_match->text(), prev_match->orig_line, prev_match->orig_col);
-                  int min_col_diff = pc->column - prev_match->column;
-                  int cur_col_diff = cpd.al[idx].col - cpd.al[idx - 1].col;
-
-                  if (cur_col_diff < min_col_diff)
-                  {
-                     LOG_FMT(LSIB, "%s(%d):   pc->orig_line is %zu\n",
-                             __func__, __LINE__, pc->orig_line);
-                     ib_shift_out(idx, min_col_diff - cur_col_diff);
-                  }
-               }
-               LOG_FMT(LSIB, "%s(%d): at ende of the loop: now is col %zu, len is %zu\n",
-                       __func__, __LINE__, cpd.al[idx].col, cpd.al[idx].len);
-               idx++;
-            }
-         }
-         prev_match = pc;
-      }
-      pc = chunk_get_next_nc(pc);
-   }
-   return(pc);
-} // scan_ib_line
-
-
-void ib_shift_out(size_t idx, size_t num)
-{
-   while (idx < cpd.al_cnt)
-   {
-      cpd.al[idx].col += num;
-      idx++;
-   }
-} // ib_shift_out
-
-
-chunk_t *step_back_over_member(chunk_t *pc)
-{
-   chunk_t *tmp;
-
-   // Skip over any class stuff: bool CFoo::bar()
-   while (  ((tmp = chunk_get_prev_ncnnl(pc)) != nullptr)
-         && chunk_is_token(tmp, CT_DC_MEMBER))
-   {
-      // TODO: verify that we are pointing at something sane?
-      pc = chunk_get_prev_ncnnl(tmp);
-   }
-   return(pc);
-} // step_back_over_member
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.h
deleted file mode 100644
index b22c5f3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @file align_tools.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_TOOLS_H_INCLUDED
-#define ALIGN_TOOLS_H_INCLUDED
-
-#include "chunk_list.h"
-#include "uncrustify_types.h"
-
-
-/**
- * @brief return the chunk the follows after a C array
- *
- * The provided chunk is considered an array if it is an opening square
- * (CT_SQUARE_OPEN) and the matching close is followed by an equal sign '='
- *
- * Example:                  array[25] = 12;
- *                               /|\     /|\
- *                                |       |
- * provided chunk has to point to [       |
- * returned chunk points to              12
- *
- * @param chunk  chunk to operate on
- *
- * @return the chunk after the '=' if the check succeeds
- * @return nullptr in all other cases
- */
-chunk_t *skip_c99_array(chunk_t *sq_open);
-
-/**
- * Scans a line for stuff to align on.
- *
- * We trigger on BRACE_OPEN, FPAREN_OPEN, ASSIGN, and COMMA.
- * We want to align the NEXT item.
- */
-chunk_t *scan_ib_line(chunk_t *start, bool first_pass);
-
-void ib_shift_out(size_t idx, size_t num);
-
-chunk_t *step_back_over_member(chunk_t *pc);
-
-#endif /* ALIGN_TOOLS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.cpp
deleted file mode 100644
index 2c94866b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * @file align_trailing_comments.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_trailing_comments.h"
-
-#include "align_add.h"
-#include "align_tab_column.h"
-#include "indent.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALTC;
-
-using namespace uncrustify;
-
-
-void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("align_on_tabstop");
-
-   if (options::align_on_tabstop())
-   {
-      col = align_tab_column(col);
-   }
-
-   if (  (cs.Len() > 1)
-      || (  align_single
-         && (cs.Len() == 1)))
-   {
-      LOG_FMT(sev, "%s(%d): max_col=%zu\n", __func__, __LINE__, col);
-      chunk_t *pc;
-
-      while ((pc = cs.Pop_Back()) != nullptr)
-      {
-         align_to_column(pc, col);
-         chunk_flags_set(pc, PCF_WAS_ALIGNED);
-
-         LOG_FMT(sev, "%s(%d): indented [%s] on line %zu to %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line, pc->column);
-      }
-   }
-   cs.Reset();
-} // align_stack
-
-
-chunk_t *align_trailing_comments(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   size_t       min_col  = 0;
-   size_t       min_orig = 0;
-   chunk_t      *pc      = start;
-   const size_t lvl      = start->brace_level;
-   size_t       nl_count = 0;
-   ChunkStack   cs;
-   size_t       col;
-
-   log_rule_B("align_right_cmt_at_col");
-   size_t intended_col = options::align_right_cmt_at_col();
-
-   log_rule_B("align_right_cmt_same_level");
-   const bool      same_level = options::align_right_cmt_same_level();
-   comment_align_e cmt_type_cur;
-   comment_align_e cmt_type_start = get_comment_align_type(pc);
-
-   LOG_FMT(LALADD, "%s(%d): start on line=%zu\n",
-           __func__, __LINE__, pc->orig_line);
-
-   // Find the max column
-   log_rule_B("align_right_cmt_span");
-
-   while (  pc != nullptr
-         && (nl_count < options::align_right_cmt_span()))
-   {
-      if (  pc->flags.test(PCF_RIGHT_COMMENT)
-         && pc->column > 1)
-      {
-         if (  same_level
-            && pc->brace_level != lvl)
-         {
-            pc = chunk_get_prev(pc);
-            break;
-         }
-         cmt_type_cur = get_comment_align_type(pc);
-
-         if (cmt_type_cur == cmt_type_start)
-         {
-            LOG_FMT(LALADD, "%s(%d): line=%zu min_col=%zu pc->col=%zu pc->len=%zu %s\n",
-                    __func__, __LINE__, pc->orig_line, min_col, pc->column, pc->len(),
-                    get_token_name(pc->type));
-
-            if (  min_orig == 0
-               || min_orig > pc->column)
-            {
-               min_orig = pc->column;
-            }
-            align_add(cs, pc, min_col); // (intended_col < col));
-            nl_count = 0;
-         }
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         nl_count += pc->nl_count;
-      }
-      pc = chunk_get_next(pc);
-   }
-   // Start with the minimum original column
-   col = min_orig;
-
-   // fall back to the intended column
-   if (  intended_col > 0
-      && col > intended_col)
-   {
-      col = intended_col;
-   }
-
-   // if less than allowed, bump it out
-   if (col < min_col)
-   {
-      col = min_col;
-   }
-
-   // bump out to the intended column
-   if (col < intended_col)
-   {
-      col = intended_col;
-   }
-   LOG_FMT(LALADD, "%s(%d):  -- min_orig=%zu intended_col=%zu min_allowed=%zu ==> col=%zu\n",
-           __func__, __LINE__, min_orig, intended_col, min_col, col);
-
-   if (  cpd.frag_cols > 0
-      && cpd.frag_cols <= col)
-   {
-      col -= cpd.frag_cols;
-   }
-   align_stack(cs, col, (intended_col != 0), LALTC);
-
-   return(chunk_get_next(pc));
-} // align_trailing_comments
-
-
-comment_align_e get_comment_align_type(chunk_t *cmt)
-{
-   chunk_t         *prev;
-   comment_align_e cmt_type = comment_align_e::REGULAR;
-
-   log_rule_B("align_right_cmt_mix");
-
-   if (  !options::align_right_cmt_mix()
-      && ((prev = chunk_get_prev(cmt)) != nullptr))
-   {
-      if (  chunk_is_token(prev, CT_PP_ENDIF)
-         || chunk_is_token(prev, CT_PP_ELSE)
-         || chunk_is_token(prev, CT_ELSE)
-         || chunk_is_token(prev, CT_BRACE_CLOSE))
-      {
-         // TODO: make the magic 3 configurable
-         if ((cmt->column - (prev->column + prev->len())) < 3)
-         {
-            cmt_type = (chunk_is_token(prev, CT_PP_ENDIF)) ? comment_align_e::ENDIF : comment_align_e::BRACE;
-         }
-      }
-   }
-   return(cmt_type);
-} // get_comment_align_type
-
-
-void align_right_comments(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (  chunk_is_token(pc, CT_COMMENT)
-         || chunk_is_token(pc, CT_COMMENT_CPP)
-         || chunk_is_token(pc, CT_COMMENT_MULTI))
-      {
-         if (get_chunk_parent_type(pc) == CT_COMMENT_END)
-         {
-            chunk_t *prev = chunk_get_prev(pc);
-
-            log_rule_B("align_right_cmt_gap");
-
-            if (pc->orig_col < prev->orig_col_end + options::align_right_cmt_gap())
-            {
-               LOG_FMT(LALTC, "NOT changing END comment on line %zu (%zu <= %zu + %u)\n",
-                       pc->orig_line, pc->orig_col, prev->orig_col_end,
-                       options::align_right_cmt_gap());
-            }
-            else
-            {
-               LOG_FMT(LALTC, "Changing END comment on line %zu into a RIGHT-comment\n",
-                       pc->orig_line);
-               chunk_flags_set(pc, PCF_RIGHT_COMMENT);
-            }
-         }
-
-         // Change certain WHOLE comments into RIGHT-alignable comments
-         if (get_chunk_parent_type(pc) == CT_COMMENT_WHOLE)
-         {
-            log_rule_B("input_tab_size");
-            size_t max_col = pc->column_indent + options::input_tab_size();
-
-            // If the comment is further right than the brace level...
-            if (pc->column >= max_col)
-            {
-               LOG_FMT(LALTC, "Changing WHOLE comment on line %zu into a RIGHT-comment (col=%zu col_ind=%zu max_col=%zu)\n",
-                       pc->orig_line, pc->column, pc->column_indent, max_col);
-
-               chunk_flags_set(pc, PCF_RIGHT_COMMENT);
-            }
-         }
-      }
-   }
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (pc->flags.test(PCF_RIGHT_COMMENT))
-      {
-         pc = align_trailing_comments(pc);
-      }
-      else
-      {
-         pc = chunk_get_next(pc);
-      }
-   }
-} // align_right_comments
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.h
deleted file mode 100644
index a7a7b743..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file align_trailing_comments.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_TRAILING_COMMENTS_H_INCLUDED
-#define ALIGN_TRAILING_COMMENTS_H_INCLUDED
-
-#include "chunk_list.h"
-#include "ChunkStack.h"
-
-enum class comment_align_e : unsigned int
-{
-   REGULAR,
-   BRACE,
-   ENDIF,
-};
-
-/**
- * For a series of lines ending in a comment, align them.
- * The series ends when more than align_right_cmt_span newlines are found.
- *
- * Interesting info:
- *  - least physically allowed column
- *  - intended column
- *  - least original cmt column
- *
- * min_col is the minimum allowed column (based on prev token col/size)
- * cmt_col less than
- *
- * @param start   Start point
- * @return        pointer the last item looked at
- */
-chunk_t *align_trailing_comments(chunk_t *start);
-
-comment_align_e get_comment_align_type(chunk_t *cmt);
-
-void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev);
-
-void align_right_comments(void);
-
-#endif /* ALIGN_TRAILING_COMMENTS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.cpp
deleted file mode 100644
index face575c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * @file align_typedefs.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_typedefs.h"
-
-#include "align_stack.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALTD;
-
-using namespace uncrustify;
-
-
-void align_typedefs(size_t span)
-{
-   LOG_FUNC_ENTRY();
-
-   AlignStack as;
-
-   as.Start(span);
-   log_rule_B("align_typedef_gap");
-   as.m_gap = options::align_typedef_gap();
-   log_rule_B("align_typedef_star_style");
-   as.m_star_style = static_cast<AlignStack::StarStyle>(options::align_typedef_star_style());
-   log_rule_B("align_typedef_amp_style");
-   as.m_amp_style = static_cast<AlignStack::StarStyle>(options::align_typedef_amp_style());
-
-   chunk_t *c_typedef = nullptr;
-   chunk_t *pc        = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_newline(pc))
-      {
-         as.NewLines(pc->nl_count);
-         c_typedef = nullptr;
-      }
-      else if (c_typedef != nullptr)
-      {
-         if (pc->flags.test(PCF_ANCHOR))
-         {
-            as.Add(pc);
-            LOG_FMT(LALTD, "%s(%d): typedef @ %zu:%zu, tag '%s' @ %zu:%zu\n",
-                    __func__, __LINE__, c_typedef->orig_line, c_typedef->orig_col,
-                    pc->text(), pc->orig_line, pc->orig_col);
-            c_typedef = nullptr;
-         }
-      }
-      else
-      {
-         if (chunk_is_token(pc, CT_TYPEDEF))
-         {
-            c_typedef = pc;
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-   as.End();
-} // align_typedefs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.h
deleted file mode 100644
index 2902d0d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file align_typedefs.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_TYPEDEFS_H_INCLUDED
-#define ALIGN_TYPEDEFS_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-/**
- * Aligns simple typedefs that are contained on a single line each.
- * This should be called after the typedef target is marked as a type.
- *
- * typedef int        foo_t;
- * typedef char       bar_t;
- * typedef const char cc_t;
- */
-void align_typedefs(size_t span);
-
-#endif /* ALIGN_TYPEDEFS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.cpp
deleted file mode 100644
index 637fb054..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/**
- * @file align_var_def_brace.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_var_def_brace.h"
-
-#include "align_stack.h"
-#include "align_tools.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LAVDB;
-
-using namespace uncrustify;
-
-
-chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
-{
-   LOG_FUNC_ENTRY();
-
-   if (start == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk_t *next;
-   size_t  myspan   = span;
-   size_t  mythresh = 0;
-   size_t  mygap    = 0;
-
-   // Override the span, if this is a struct/union
-   if (  get_chunk_parent_type(start) == CT_STRUCT
-      || get_chunk_parent_type(start) == CT_UNION)
-   {
-      log_rule_B("align_var_struct_span");
-      myspan = options::align_var_struct_span();
-      log_rule_B("align_var_struct_thresh");
-      mythresh = options::align_var_struct_thresh();
-      log_rule_B("align_var_struct_gap");
-      mygap = options::align_var_struct_gap();
-   }
-   else if (get_chunk_parent_type(start) == CT_CLASS)
-   {
-      log_rule_B("align_var_class_span");
-      myspan = options::align_var_class_span();
-      log_rule_B("align_var_class_thresh");
-      mythresh = options::align_var_class_thresh();
-      log_rule_B("align_var_class_gap");
-      mygap = options::align_var_class_gap();
-   }
-   else
-   {
-      log_rule_B("align_var_def_thresh");
-      mythresh = options::align_var_def_thresh();
-      log_rule_B("align_var_def_gap");
-      mygap = options::align_var_def_gap();
-   }
-   // can't be any variable definitions in a "= {" block
-   chunk_t *prev = chunk_get_prev_ncnnl(start);
-
-   if (chunk_is_token(prev, CT_ASSIGN))
-   {
-      LOG_FMT(LAVDB, "%s(%d): start->text() '%s', type is %s, on orig_line %zu (abort due to assign)\n",
-              __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line);
-
-      chunk_t *pc = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
-      return(chunk_get_next_ncnnl(pc));
-   }
-   char copy[1000];
-
-   LOG_FMT(LAVDB, "%s(%d): start->text() '%s', type is %s, on orig_line %zu\n",
-           __func__, __LINE__, start->elided_text(copy), get_token_name(start->type), start->orig_line);
-
-   log_rule_B("align_var_def_inline");
-   auto const align_mask =
-      PCF_IN_FCN_DEF | PCF_VAR_1ST |
-      (options::align_var_def_inline() ? PCF_NONE : PCF_VAR_INLINE);
-
-   // Set up the variable/prototype/definition aligner
-   AlignStack as;
-
-   as.Start(myspan, mythresh);
-   as.m_gap = mygap;
-   log_rule_B("align_var_def_star_style");
-   as.m_star_style = static_cast<AlignStack::StarStyle>(options::align_var_def_star_style());
-   log_rule_B("align_var_def_amp_style");
-   as.m_amp_style = static_cast<AlignStack::StarStyle>(options::align_var_def_amp_style());
-
-   // Set up the bit colon aligner
-   AlignStack as_bc;
-
-   as_bc.Start(myspan, 0);
-   log_rule_B("align_var_def_colon_gap");
-   as_bc.m_gap = options::align_var_def_colon_gap();
-
-   AlignStack as_at; // attribute
-
-   as_at.Start(myspan, 0);
-
-   // Set up the brace open aligner
-   AlignStack as_br;
-
-   as_br.Start(myspan, mythresh);
-   log_rule_B("align_single_line_brace_gap");
-   as_br.m_gap = options::align_single_line_brace_gap();
-
-   bool fp_look_bro   = false;
-   bool did_this_line = false;
-
-   log_rule_B("align_mix_var_proto");
-   bool    fp_active = options::align_mix_var_proto();
-   chunk_t *pc       = chunk_get_next(start);
-
-   while (  pc != nullptr
-         && (  pc->level >= start->level
-            || pc->level == 0))
-   {
-      if (chunk_is_newline(pc))
-      {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-      }
-      else
-      {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      }
-
-      if (chunk_is_comment(pc))
-      {
-         if (pc->nl_count > 0)
-         {
-            as.NewLines(pc->nl_count);
-            as_bc.NewLines(pc->nl_count);
-            as_at.NewLines(pc->nl_count);
-            as_br.NewLines(pc->nl_count);
-         }
-         pc = chunk_get_next(pc);
-         continue;
-      }
-
-      if (  fp_active
-         && !pc->flags.test(PCF_IN_CLASS_BASE))
-      {
-         // WARNING: Duplicate from the align_func_proto()
-         log_rule_B("align_single_line_func");
-
-         if (  chunk_is_token(pc, CT_FUNC_PROTO)
-            || (  chunk_is_token(pc, CT_FUNC_DEF)
-               && options::align_single_line_func()))
-         {
-            LOG_FMT(LAVDB, "%s(%d): add = '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level);
-
-            chunk_t *toadd;
-
-            log_rule_B("align_on_operator");
-
-            if (  get_chunk_parent_type(pc) == CT_OPERATOR
-               && options::align_on_operator())
-            {
-               toadd = chunk_get_prev_ncnnl(pc);
-            }
-            else
-            {
-               toadd = pc;
-            }
-            as.Add(step_back_over_member(toadd));
-            log_rule_B("align_single_line_brace");
-            fp_look_bro = (chunk_is_token(pc, CT_FUNC_DEF))
-                          && options::align_single_line_brace();
-         }
-         else if (  fp_look_bro
-                 && chunk_is_token(pc, CT_BRACE_OPEN)
-                 && pc->flags.test(PCF_ONE_LINER))
-         {
-            as_br.Add(pc);
-            fp_look_bro = false;
-         }
-      }
-
-      // process nested braces
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
-      {
-         size_t sub_nl_count = 0;
-
-         pc = align_var_def_brace(pc, span, &sub_nl_count);
-
-         if (sub_nl_count > 0)
-         {
-            fp_look_bro   = false;
-            did_this_line = false;
-            as.NewLines(sub_nl_count);
-            as_bc.NewLines(sub_nl_count);
-            as_at.NewLines(sub_nl_count);
-            as_br.NewLines(sub_nl_count);
-
-            if (p_nl_count != nullptr)
-            {
-               *p_nl_count += sub_nl_count;
-            }
-         }
-         continue;
-      }
-
-      // Done with this brace set?
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         pc = chunk_get_next(pc);
-         break;
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         fp_look_bro   = false;
-         did_this_line = false;
-         as.NewLines(pc->nl_count);
-         as_bc.NewLines(pc->nl_count);
-         as_at.NewLines(pc->nl_count);
-         as_br.NewLines(pc->nl_count);
-
-         if (p_nl_count != nullptr)
-         {
-            *p_nl_count += pc->nl_count;
-         }
-      }
-      LOG_FMT(LAVDB, "%s(%d): pc->text() is '%s', level is %zu, pc->brace_level is %zu\n",
-              __func__, __LINE__, chunk_is_newline(pc) ? "Newline" : pc->text(), pc->level, pc->brace_level);
-
-      if (!chunk_is_newline(pc))
-      {
-         LOG_FMT(LAVDB, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-
-         if (chunk_is_not_token(pc, CT_IGNORED))
-         {
-            LOG_FMT(LAVDB, "   ");
-            log_pcf_flags(LAVDB, pc->flags);
-         }
-      }
-
-      // don't align stuff inside parenthesis/squares/angles
-      if (pc->level > pc->brace_level)
-      {
-         pc = chunk_get_next(pc);
-         continue;
-      }
-
-      // If this is a variable def, update the max_col
-      if (  !pc->flags.test(PCF_IN_CLASS_BASE)
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_DEF)
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_PROTO)
-         && ((pc->flags & align_mask) == PCF_VAR_1ST)
-         && chunk_is_not_token(pc, CT_FUNC_DEF)                                   // Issue 1452
-         && (  (pc->level == (start->level + 1))
-            || pc->level == 0)
-         && pc->prev != nullptr
-         && pc->prev->type != CT_MEMBER)
-      {
-         LOG_FMT(LAVDB, "%s(%d): a-did_this_line is %s\n",
-                 __func__, __LINE__, did_this_line ? "TRUE" : "FALSE");
-         LOG_FMT(LAVDB, "%s(%d): text() is '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level);
-
-         if (!did_this_line)
-         {
-            if (  get_chunk_parent_type(start) == CT_STRUCT
-               && (as.m_star_style == AlignStack::SS_INCLUDE))
-            {
-               // we must look after the previous token
-               chunk_t *prev_local = pc->prev;
-
-               while (  chunk_is_token(prev_local, CT_PTR_TYPE)
-                     || chunk_is_token(prev_local, CT_ADDR))
-               {
-                  LOG_FMT(LAVDB, "%s(%d): prev_local '%s', prev_local->type %s\n",
-                          __func__, __LINE__, prev_local->text(), get_token_name(prev_local->type));
-                  prev_local = prev_local->prev;
-               }
-               pc = prev_local->next;
-            }
-            LOG_FMT(LAVDB, "%s(%d): add = '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level);
-
-            as.Add(step_back_over_member(pc));
-
-            log_rule_B("align_var_def_colon");
-
-            if (options::align_var_def_colon())
-            {
-               next = chunk_get_next_nc(pc);
-
-               if (chunk_is_token(next, CT_BIT_COLON))
-               {
-                  as_bc.Add(next);
-               }
-            }
-            log_rule_B("align_var_def_attribute");
-
-            if (options::align_var_def_attribute())
-            {
-               next = pc;
-
-               while ((next = chunk_get_next_nc(next)) != nullptr)
-               {
-                  if (chunk_is_token(next, CT_ATTRIBUTE))
-                  {
-                     as_at.Add(next);
-                     break;
-                  }
-
-                  if (  chunk_is_token(next, CT_SEMICOLON)
-                     || chunk_is_newline(next))
-                  {
-                     break;
-                  }
-               }
-            }
-         }
-         did_this_line = true;
-      }
-      else if (chunk_is_token(pc, CT_BIT_COLON))
-      {
-         if (!did_this_line)
-         {
-            as_bc.Add(pc);
-            did_this_line = true;
-         }
-      }
-      else
-      {
-         LOG_FMT(LAVDB, "%s(%d): b-did_this_line is %s\n",
-                 __func__, __LINE__, did_this_line ? "TRUE" : "FALSE");
-      }
-      pc = chunk_get_next(pc);
-   }
-   as.End();
-   as_bc.End();
-   as_at.End();
-   as_br.End();
-
-   return(pc);
-} // align_var_def_brace
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.h
deleted file mode 100644
index 0cc133ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file align_var_def_brace.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef ALIGN_VAR_DEF_BRACE_H_INCLUDED
-#define ALIGN_VAR_DEF_BRACE_H_INCLUDED
-
-#include "chunk_list.h"
-
-/**
- * Scan everything at the current level until the close brace and find the
- * variable def align column.  Also aligns bit-colons, but that assumes that
- * bit-types are the same! But that should always be the case...
- */
-chunk_t *align_var_def_brace(chunk_t *pc, size_t span, size_t *nl_count);
-
-#endif /* ALIGN_VAR_DEF_BRACE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.cpp
deleted file mode 100644
index 4147bd91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * @file args.cpp
- * Parses command line arguments.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "args.h"
-
-#include "unc_ctype.h"
-
-#include <cstring>
-
-Args::Args(int argc, char **argv)
-{
-   m_count  = argc;
-   m_values = argv;
-   size_t len = (argc >> 3) + 1;
-
-   m_used = new UINT8[len];
-
-   if (m_used != nullptr)
-   {
-      memset(m_used, 0, len);
-   }
-}
-
-
-Args::~Args()
-{
-   if (m_used != nullptr)
-   {
-      delete[] m_used;
-      m_used = nullptr;
-   }
-   m_count = 0;
-}
-
-
-bool Args::Present(const char *token)
-{
-   if (token != nullptr)
-   {
-      for (size_t idx = 0; idx < m_count; idx++)
-      {
-         if (strcmp(token, m_values[idx]) == 0)
-         {
-            SetUsed(idx);
-            return(true);
-         }
-      }
-   }
-   return(false);
-}
-
-
-const char *Args::Param(const char *token)
-{
-   size_t idx = 0;
-
-   return(Params(token, idx));
-}
-
-
-const char *Args::Params(const char *token, size_t &index)
-{
-   if (token == nullptr)
-   {
-      // coveralls will complain
-      // can only occur with a call such as: arg.Param(nullptr)
-      return(nullptr);
-   }
-   size_t token_len = strlen(token);
-
-   for (size_t idx = index; idx < m_count; idx++)
-   {
-      size_t arg_len = strlen(m_values[idx]);
-
-      if (  arg_len >= token_len
-         && (memcmp(token, m_values[idx], token_len) == 0))
-      {
-         SetUsed(idx);
-
-         if (arg_len > token_len)
-         {
-            if (m_values[idx][token_len] == '=')
-            {
-               token_len++;
-            }
-            index = idx + 1;
-            return(&m_values[idx][token_len]);
-         }
-         idx++;
-         index = idx + 1;
-
-         if (idx < m_count)
-         {
-            SetUsed(idx);
-            return(m_values[idx]);
-         }
-         return("");
-      }
-   }
-
-   return(nullptr);
-} // Args::Params
-
-
-bool Args::GetUsed(size_t idx)
-{
-   if (  m_used != nullptr
-      && idx > 0
-      && idx < m_count)
-   {
-      return((m_used[idx >> 3] & (1 << (idx & 0x07))) != 0);
-   }
-   return(false);
-}
-
-
-void Args::SetUsed(size_t idx)
-{
-   if (  m_used != nullptr
-      && idx > 0
-      && idx < m_count)
-   {
-      m_used[idx >> 3] |= (1 << (idx & 0x07));
-   }
-}
-
-
-const char *Args::Unused(size_t &index)
-{
-   if (m_used == nullptr)
-   {
-      return(nullptr);
-   }
-
-   for (size_t idx = index; idx < m_count; idx++)
-   {
-      if (!GetUsed(idx))
-      {
-         index = idx + 1;
-         return(m_values[idx]);
-      }
-   }
-
-   index = m_count;
-   return(nullptr);
-}
-
-
-size_t Args::SplitLine(char *text, char *args[], size_t num_args)
-{
-   if (  text == nullptr
-      || num_args == 0)
-   {
-      return(0);
-   }
-   char   cur_quote    = 0;
-   bool   in_backslash = false;
-   bool   in_arg       = false;
-   size_t argc         = 0;
-   char   *dest        = text;
-
-   while (  argc <= num_args // maximal number of arguments not reached yet
-         && *text != 0)      // end of string not reached yet
-   {
-      // Detect the start of an arg
-      if (  !in_arg
-         && !unc_isspace(*text))
-      {
-         in_arg     = true;
-         args[argc] = dest;
-         argc++;
-      }
-
-      if (in_arg)
-      {
-         if (in_backslash)
-         {
-            in_backslash = false;
-            *dest        = *text;
-            dest++;
-         }
-         else if (*text == '\\')
-         {
-            in_backslash = true;
-         }
-         else if (*text == cur_quote)
-         {
-            cur_quote = 0;
-         }
-         else if (  (*text == '\'')
-                 || (*text == '"')
-                 || (*text == '`'))
-         {
-            cur_quote = *text;
-         }
-         else if (cur_quote != 0)
-         {
-            *dest = *text;
-            dest++;
-         }
-         else if (unc_isspace(*text))
-         {
-            *dest = 0;
-            dest++;
-            in_arg = false;
-
-            if (argc == num_args)
-            {
-               break; // all arguments found, we can stop
-            }
-         }
-         else
-         {
-            *dest = *text;
-            dest++;
-         }
-      }
-      text++; // go on with next character
-   }
-   *dest = 0;
-
-   return(argc);
-} // Args::SplitLine
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.h
deleted file mode 100644
index 712fbd59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * @file args.h
- * Parses command line arguments.
- *
- * This differs from the GNU/getopt way in that:
- *  - parameters cannot mixed "-e -f" is not the same as "-ef"
- *  - knowledge of the complete set of parameters is not required
- *  - this means you can handle args in multiple spots
- *  - it is more portable
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef ARGS_H_INCLUDED
-#define ARGS_H_INCLUDED
-
-#include "base_types.h"
-
-class Args
-{
-protected:
-   size_t m_count;     //! number of command line arguments
-   char   **m_values;  //! pointer array to each argument
-   UINT8  *m_used;     //! bit array with one flag per argument
-
-public:
-   /**
-    * Initializes the argument library.
-    * Store the values and allocates enough memory for the 'used' flags.
-    * This keeps a reference to argv, so don't change it.
-    *
-    * @param argc  number of command line parameter passed to main()
-    * @param argv  pointer array to command line parameters
-    */
-   Args(int argc, char **argv);
-
-   //! Standard destructor
-   ~Args();
-
-   /**
-    * Checks to see if an arg w/o a value is present.
-    * Scans the args looking for an exact match.
-    *
-    * "-c" matches "-c", but not "-call" or "-ec"
-    *
-    * @param token  The token string to match
-    *
-    * @return true/false -- Whether the argument was present
-    */
-   bool Present(const char *token);
-
-   /**
-    * Calls Args::Params() with index 0
-    *
-    * @param token  The token string to match
-    *
-    * @return nullptr or the pointer to the string
-    */
-   const char *Param(const char *token);
-
-   /**
-    * Check for an arg with a value.
-    * Returns only the first match.
-    *
-    * Assuming the token "-c"...
-    *   "-call" returns "all"
-    *   "-c=all" returns "all"
-    *   "-c", "all" returns "all"
-    *   "-c=", "all" returns ""
-    *
-    * @param          token  the token string to match
-    * @param[in, out] index  search start position, in case that something is
-    *                        found, it will get the succeeding position number
-    *                        assigned
-    *
-    * @return nullptr or the pointer to the string
-    */
-   const char *Params(const char *token, size_t &index);
-
-   /**
-    * Marks an argument as being used.
-    *
-    * @param idx  The index of the argument
-    */
-   void SetUsed(size_t idx);
-
-   /**
-    * Gets whether an argument has been used, by index.
-    *
-    * @param idx  The index of the argument
-    */
-   bool GetUsed(size_t idx);
-
-   /**
-    * This function retrieves all unused parameters.
-    * You must set the index before the first call.
-    * Set the index to 1 to skip argv[0].
-    *
-    * @param idx  Pointer to the index
-    *
-    * @return nullptr (done) or the pointer to the string
-    */
-   const char *Unused(size_t &idx);
-
-   /**
-    * Takes text and splits it into arguments.
-    * args is an array of char pointers that will get populated.
-    * num_args is the maximum number of args split off.
-    * If there are more than num_args, the remaining text is ignored.
-    * Note that text is modified (zeroes are inserted)
-    *
-    * @param      text      the text to split (modified)
-    * @param[out] args      array of pointers to be populated
-    * @param      num_args  number of items in input string
-    *
-    * @return The number of arguments parsed (always <= num_args)
-    */
-   static size_t SplitLine(char *text, char *args[], size_t num_args);
-};
-
-
-#endif /* ARGS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.cpp
deleted file mode 100644
index c2a9ae51..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * @file backup.cpp
- * Make a backup of a source file
- * The current plans are to use two files.
- *
- *  - A '.unc-backup~' file that contains the original contents
- *  - A '.unc-backup-md5~' file that contains the MD5 over the last output
- *    that uncrustify generated
- *
- * The logic goes like this:
- *  1. If there isn't a .backup-md5 or the md5 over the input file doesn't
- *     match what is in .backup-md5, then copy the source file to .backup.
- *
- *  2. Create the output file.
- *
- *  3. Calculate the md5 over the output file.
- *     Create the .backup-md5 file.
- *
- * This will let you run uncrustify multiple times over the same file without
- * losing the original file.  If you edit the file, then a new backup is made.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "prototypes.h"
-
-#include "backup.h"
-#include "md5.h"
-#include "unc_ctype.h"
-
-#ifdef __APPLE__
-#include <cerrno>                // is needed under OSX
-#endif
-
-using namespace std;
-
-
-int backup_copy_file(const char *filename, const vector<UINT8> &data)
-{
-   char  newpath[1024];
-   char  md5_str_in[33];
-   char  md5_str[34];
-   UINT8 dig[16];
-
-   md5_str_in[0] = 0;
-
-   MD5::Calc(&data[0], data.size(), dig);
-   snprintf(md5_str, sizeof(md5_str),
-            "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-            dig[0], dig[1], dig[2], dig[3],
-            dig[4], dig[5], dig[6], dig[7],
-            dig[8], dig[9], dig[10], dig[11],
-            dig[12], dig[13], dig[14], dig[15]);
-
-   // Create the backup-md5 filename, open it and read the md5
-   snprintf(newpath, sizeof(newpath), "%s%s", filename, UNC_BACKUP_MD5_SUFFIX);
-
-   FILE *thefile = fopen(newpath, "rb");
-
-   if (thefile != nullptr)
-   {
-      char buffer[128];
-
-      if (fgets(buffer, sizeof(buffer), thefile) != nullptr)
-      {
-         for (int i = 0; buffer[i] != 0; i++)
-         {
-            if (unc_isxdigit(buffer[i]))
-            {
-               md5_str_in[i] = unc_tolower(buffer[i]);
-            }
-            else
-            {
-               md5_str_in[i] = 0;
-               break;
-            }
-         }
-      }
-      fclose(thefile);
-   }
-
-   // if the MD5s match, then there is no need to back up the file
-   if (memcmp(md5_str, md5_str_in, 32) == 0)
-   {
-      LOG_FMT(LNOTE, "%s: MD5 match for %s\n", __func__, filename);
-      return(EX_OK);
-   }
-   LOG_FMT(LNOTE, "%s: MD5 mismatch - backing up %s\n", __func__, filename);
-
-   // Create the backup file
-   snprintf(newpath, sizeof(newpath), "%s%s", filename, UNC_BACKUP_SUFFIX);
-
-   thefile = fopen(newpath, "wb");
-
-   if (thefile != nullptr)
-   {
-      size_t retval   = fwrite(&data[0], data.size(), 1, thefile);
-      int    my_errno = errno;
-
-      fclose(thefile);
-
-      if (retval == 1)
-      {
-         return(EX_OK);
-      }
-      LOG_FMT(LERR, "fwrite(%s) failed: %s (%d)\n",
-              newpath, strerror(my_errno), my_errno);
-      cpd.error_count++;
-   }
-   else
-   {
-      LOG_FMT(LERR, "fopen(%s) failed: %s (%d)\n",
-              newpath, strerror(errno), errno);
-      cpd.error_count++;
-   }
-   return(EX_IOERR);
-} // backup_copy_file
-
-
-void backup_create_md5_file(const char *filename)
-{
-   UINT8  dig[16];
-   MD5    md5;
-   FILE   *thefile;
-   UINT8  buf[4096];
-   size_t len;
-   char   newpath[1024];
-
-   md5.Init();
-
-   thefile = fopen(filename, "rb");
-
-   if (thefile == nullptr)
-   {
-      LOG_FMT(LERR, "%s: fopen(%s) failed: %s (%d)\n",
-              __func__, filename, strerror(errno), errno);
-      cpd.error_count++;
-      return;
-   }
-
-   // read file chunk by chunk and calculate its MD5 checksum
-   while ((len = fread(buf, 1, sizeof(buf), thefile)) > 0)
-   {
-      md5.Update(buf, len);
-   }
-   fclose(thefile);
-   md5.Final(dig);
-
-   snprintf(newpath, sizeof(newpath), "%s%s", filename, UNC_BACKUP_MD5_SUFFIX);
-
-   thefile = fopen(newpath, "wb");
-
-   if (thefile != nullptr)
-   {
-      fprintf(thefile,
-              "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x  %s\n",
-              dig[0], dig[1], dig[2], dig[3],
-              dig[4], dig[5], dig[6], dig[7],
-              dig[8], dig[9], dig[10], dig[11],
-              dig[12], dig[13], dig[14], dig[15],
-              path_basename(filename));
-
-      fclose(thefile);
-   }
-} // backup_create_md5_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.h
deleted file mode 100644
index 3e51f863..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @file backup.h
- * Handles backing up file data.
- *
- * It works like this:
- *
- * 1. Read in the file data
- *
- * 2. Call backup_copy_file() to create a backup of the input, if needed
- *
- * 3. Do the uncrustify magic and write the output file
- *
- * 4. Call backup_create_md5_file()
- *
- * This will let you run uncrustify multiple times over the same file without
- * losing the original file.  If you edit the file, then a new backup is made.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef BACKUP_H_INCLUDED
-#define BACKUP_H_INCLUDED
-
-#define UNC_BACKUP_SUFFIX        ".unc-backup~"
-#define UNC_BACKUP_MD5_SUFFIX    ".unc-backup.md5~"
-
-
-/**
- * @brief Check the backup-md5 file and copy the input file to a backup if needed.
- *
- * If there isn't a FILENAME+UNC_BACKUP_MD5_SUFFIX or the md5 over the data
- * doesn't match what is in FILENAME+UNC_BACKUP_MD5_SUFFIX, then write the
- * data to FILENAME+UNC_BACKUP_SUFFIX.
- *
- * Note that if this fails, we shouldn't overwrite to original file with the
- * output.
- *
- * @param filename   The file that was read (full path)
- * @param file_data  The file data
- * @param file_len   The file length
- *
- * @retval EX_OK     successfully created backup file
- * @retval EX_IOERR  could not create backup file
- */
-int backup_copy_file(const char *filename, const std::vector<UINT8> &data);
-
-
-/**
- * This calculates the MD5 over the file and writes the MD5 to
- * FILENAME+UNC_BACKUP_MD5_SUFFIX.*
- * This should be called after the file was written to disk.
- * We really don't care if it fails, as the MD5 just prevents us from backing
- * up a file that uncrustify created.
- *
- * This should be called after the file was written to disk.
- * It will be read back and an md5 will be calculated over it.
- *
- * @param filename  The file that was written (full path)
- */
-void backup_create_md5_file(const char *filename);
-
-
-#endif /* BACKUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/base_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/base_types.h
deleted file mode 100644
index 1e98b0ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/base_types.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file base_types.h
- *
- * Defines some base types, includes config.h
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef BASE_TYPES_H_INCLUDED
-#define BASE_TYPES_H_INCLUDED
-
-#include "error_types.h"
-
-#ifdef WIN32
-
-#include "windows_compat.h"
-
-#else // not WIN32
-
-#include "config.h"
-
-#define PATH_SEP    '/'
-
-#define __STDC_FORMAT_MACROS
-
-#if defined HAVE_INTTYPES_H
-#include <inttypes.h>
-#else
-#error "Don't know where int8_t is defined"
-#endif
-
-
-// some of my favorite aliases
-
-typedef char       CHAR;
-
-typedef int8_t     INT8;
-typedef int16_t    INT16;
-typedef int32_t    INT32;
-
-typedef uint8_t    UINT8;
-typedef uint16_t   UINT16;
-typedef uint32_t   UINT32;
-typedef uint64_t   UINT64;
-#endif /* ifdef WIN32 */
-
-// and the ever-so-important array size macro
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x)    (sizeof(x) / sizeof((x)[0]))
-#endif
-
-
-#endif /* BASE_TYPES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.cpp
deleted file mode 100644
index 03ab68e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.cpp
+++ /dev/null
@@ -1,1426 +0,0 @@
-/**
- * @file brace_cleanup.cpp
- * Determines the brace level and paren level.
- * Inserts virtual braces as needed.
- * Handles all that preprocessor stuff.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "brace_cleanup.h"
-
-#include "flag_parens.h"
-#include "frame_list.h"
-#include "keywords.h"
-#include "lang_pawn.h"
-#include "prototypes.h"
-
-#include <stdexcept>            // to get std::invalid_argument
-
-constexpr static auto LCURRENT = LBC;
-
-using namespace uncrustify;
-
-using std::invalid_argument;
-using std::string;
-using std::to_string;
-using std::stringstream;
-
-
-/*
- * abbreviations used:
- * - sparen = tbd
- * - PS     = Parenthesis Stack
- * - pse    = Parenthesis Stack
- */
-
-
-struct BraceState
-{
-   std::vector<ParseFrame> frames     = {};
-   c_token_t               in_preproc = CT_NONE;
-   int                     pp_level   = 0;
-   bool                    consumed   = false;
-};
-
-/**
- * Called when a statement was just closed and the pse_tos was just
- * decremented.
- *
- * - if the TOS is now VBRACE, insert a CT_VBRACE_CLOSE and recurse.
- * - if the TOS is a complex statement, call handle_complex_close()
- *
- * @retval true   done with this chunk
- * @retval false  keep processing
- */
-static bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState);
-
-
-static size_t preproc_start(BraceState &braceState, ParseFrame &frm, chunk_t *pc);
-
-
-static void print_stack(log_sev_t logsev, const char *str, const ParseFrame &frm);
-
-
-/**
- * pc is a CT_WHILE.
- * Scan backwards to see if we find a brace/vbrace with the parent set to CT_DO
- */
-static bool maybe_while_of_do(chunk_t *pc);
-
-
-/**
- * @param after  determines: true  - insert_vbrace_close_after(pc, frm)
- *                           false - insert_vbrace_open_before(pc, frm)
- */
-static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm);
-
-#define insert_vbrace_close_after(pc, frm)    insert_vbrace(pc, true, frm)
-#define insert_vbrace_open_before(pc, frm)    insert_vbrace(pc, false, frm)
-
-static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc);
-
-
-/**
- * Checks the progression of complex statements.
- * - checks for else after if
- * - checks for if after else
- * - checks for while after do
- * - checks for open brace in BRACE2 and BRACE_DO stages, inserts open VBRACE
- * - checks for open paren in PAREN1 and BRACE2 stages, complains
- *
- * @param frm  The parse frame
- * @param pc   The current chunk
- *
- * @return true - done with this chunk, false - keep processing
- */
-static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceState &braceState);
-
-
-/**
- * Handles a close paren or brace - just progress the stage, if the end
- * of the statement is hit, call close_statement()
- *
- * @param frm  The parse frame
- * @param pc   The current chunk
- *
- * @return true - done with this chunk, false - keep processing
- */
-static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState &braceState);
-
-
-//! We're on a 'namespace' skip the word and then set the parent of the braces.
-static void mark_namespace(chunk_t *pns);
-
-
-static size_t preproc_start(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   const size_t pp_level = braceState.pp_level;
-
-   chunk_t      *next = chunk_get_next_ncnnl(pc);
-
-   if (next == nullptr)
-   {
-      return(pp_level);
-   }
-   // Get the type of preprocessor and handle it
-   braceState.in_preproc = next->type;
-
-   // If we are not in a define, check for #if, #else, #endif, etc
-   if (braceState.in_preproc != CT_PP_DEFINE)
-   {
-      return(fl_check(braceState.frames, frm, braceState.pp_level, pc));
-   }
-   // else push the frame stack
-   fl_push(braceState.frames, frm);
-
-   // a preproc body starts a new, blank frame
-   frm             = {};
-   frm.level       = 1;
-   frm.brace_level = 1;
-
-   // TODO: not sure about the next 3 lines
-   frm.push(nullptr);
-   frm.top().type = CT_PP_DEFINE;
-
-   return(pp_level);
-}
-
-
-static void print_stack(log_sev_t logsev, const char *str,
-                        const ParseFrame &frm)
-{
-   LOG_FUNC_ENTRY();
-
-   if (!log_sev_on(logsev))
-   {
-      return;
-   }
-   log_fmt(logsev, "%s(%d): str is '%s'", __func__, __LINE__, str);
-
-   for (size_t idx = 1; idx < frm.size(); idx++)
-   {
-      if (frm.at(idx).stage != brace_stage_e::NONE)
-      {
-         LOG_FMT(logsev, " [%s - %u]", get_token_name(frm.at(idx).type),
-                 (unsigned int)frm.at(idx).stage);
-      }
-      else
-      {
-         LOG_FMT(logsev, " [%s]", get_token_name(frm.at(idx).type));
-      }
-   }
-
-   log_fmt(logsev, "\n");
-}
-
-
-//TODO: This can be cleaned up and simplified - we can look both forward and backward!
-void brace_cleanup(void)
-{
-   LOG_FUNC_ENTRY();
-
-   BraceState braceState;
-   ParseFrame frm{};
-   chunk_t    *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-
-      // Check for leaving a #define body
-      if (  braceState.in_preproc != CT_NONE
-         && !pc->flags.test(PCF_IN_PREPROC))
-      {
-         if (braceState.in_preproc == CT_PP_DEFINE)
-         {
-            // out of the #define body, restore the frame
-            fl_pop(braceState.frames, frm);
-         }
-         braceState.in_preproc = CT_NONE;
-      }
-      // Check for a preprocessor start
-      const size_t pp_level = (chunk_is_token(pc, CT_PREPROC))
-                              ? preproc_start(braceState, frm, pc)
-                              : braceState.pp_level;
-      LOG_FMT(LTOK, "%s(%d): pp_level is %zu\n",
-              __func__, __LINE__, pp_level);
-
-      // Do before assigning stuff from the frame
-      if (  language_is_set(LANG_PAWN)
-         && frm.top().type == CT_VBRACE_OPEN
-         && chunk_is_token(pc, CT_NEWLINE))
-      {
-         pc = pawn_check_vsemicolon(pc);
-
-         if (pc == nullptr)
-         {
-            return;
-         }
-      }
-
-      // Issue #1813
-      if (chunk_is_token(pc, CT_NAMESPACE))
-      {
-         mark_namespace(pc);
-      }
-      // Assume the level won't change
-      pc->level       = frm.level;
-      pc->brace_level = frm.brace_level;
-      pc->pp_level    = pp_level;
-
-      /*
-       * #define bodies get the full formatting treatment
-       * Also need to pass in the initial '#' to close out any virtual braces.
-       */
-      if (  !chunk_is_comment(pc)
-         && !chunk_is_newline(pc)
-         && !chunk_is_token(pc, CT_ATTRIBUTE)
-         && !chunk_is_token(pc, CT_IGNORED)            // Issue #2279
-         && (  braceState.in_preproc == CT_PP_DEFINE
-            || braceState.in_preproc == CT_NONE))
-      {
-         braceState.consumed = false;
-         parse_cleanup(braceState, frm, pc);
-         print_stack(LBCSAFTER, (chunk_is_token(pc, CT_VBRACE_CLOSE)) ? "Virt-}\n" : pc->str.c_str(), frm);
-      }
-      pc = chunk_get_next(pc);
-   }
-} // brace_cleanup
-
-
-static bool maybe_while_of_do(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-   if (  prev == nullptr
-      || !prev->flags.test(PCF_IN_PREPROC))
-   {
-      return(false);
-   }
-
-   // Find the chunk before the preprocessor
-   while (  prev != nullptr
-         && prev->flags.test(PCF_IN_PREPROC))
-   {
-      prev = chunk_get_prev_ncnnl(prev);
-   }
-
-   if (  (  chunk_is_token(prev, CT_VBRACE_CLOSE)
-         || chunk_is_token(prev, CT_BRACE_CLOSE))
-      && get_chunk_parent_type(prev) == CT_DO)
-   {
-      return(true);
-   }
-   return(false);
-}
-
-
-/**
- * At the heart of this algorithm are two stacks.
- * There is the Paren Stack (PS) and the Frame stack.
- *
- * The PS (pse in the code) keeps track of braces, parens,
- * if/else/switch/do/while/etc items -- anything that is nestable.
- * Complex statements go through stages.
- * Take this simple if statement as an example:
- *   if ( x ) { x--; }
- *
- * The stack would change like so: 'token' stack afterwards
- * 'if' [IF - 1]
- * '('  [IF - 1] [PAREN OPEN]
- * 'x'  [IF - 1] [PAREN OPEN]
- * ')'  [IF - 2]       <- note that the state was incremented
- * '{'  [IF - 2] [BRACE OPEN]
- * 'x'  [IF - 2] [BRACE OPEN]
- * '--' [IF - 2] [BRACE OPEN]
- * ';'  [IF - 2] [BRACE OPEN]
- * '}'  [IF - 3]
- *                             <- lack of else kills the IF, closes statement
- *
- * Virtual braces example:
- *   if ( x ) x--; else x++;
- *
- * 'if'   [IF - 1]
- * '('    [IF - 1] [PAREN OPEN]
- * 'x'    [IF - 1] [PAREN OPEN]
- * ')'    [IF - 2]
- * 'x'    [IF - 2] [VBRACE OPEN]   <- VBrace open inserted before because '{' was not next
- * '--'   [IF - 2] [VBRACE OPEN]
- * ';'    [IF - 3]                 <- VBrace close inserted after semicolon
- * 'else' [ELSE - 0]               <- IF changed into ELSE
- * 'x'    [ELSE - 0] [VBRACE OPEN] <- lack of '{' -> VBrace
- * '++'   [ELSE - 0] [VBRACE OPEN]
- * ';'    [ELSE - 0]               <- VBrace close inserted after semicolon
- *                                 <- ELSE removed after statement close
- *
- * The pse stack is kept on a frame stack.
- * The frame stack is need for languages that support preprocessors (C, C++, C#)
- * that can arbitrarily change code flow. It also isolates #define macros so
- * that they are indented independently and do not affect the rest of the program.
- *
- * When an #if is hit, a copy of the current frame is push on the frame stack.
- * When an #else/#elif is hit, a copy of the current stack is pushed under the
- * #if frame and the original (pre-#if) frame is copied to the current frame.
- * When #endif is hit, the top frame is popped.
- * This has the following effects:
- *  - a simple #if / #endif does not affect program flow
- *  - #if / #else /#endif - continues from the #if clause
- *
- * When a #define is entered, the current frame is pushed and cleared.
- * When a #define is exited, the frame is popped.
- */
-static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, type is %s, tos is %zu, TOS.type is %s, TOS.stage is %s, ",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type),
-           frm.size() - 1, get_token_name(frm.top().type),
-           get_brace_stage_name(frm.top().stage));
-   log_pcf_flags(LTOK, pc->flags);
-
-   // Mark statement starts
-   LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, text() is '%s'\n",
-           __func__, __LINE__, pc->orig_line, get_token_name(pc->type), pc->text());
-   LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-           __func__, __LINE__, frm.stmt_count, frm.expr_count);
-
-   if (  (  frm.stmt_count == 0
-         || frm.expr_count == 0)
-      && !chunk_is_semicolon(pc)
-      && chunk_is_not_token(pc, CT_BRACE_CLOSE)
-      && chunk_is_not_token(pc, CT_VBRACE_CLOSE)
-      && !chunk_is_str(pc, ")", 1)
-      && !chunk_is_str(pc, "]", 1))
-   {
-      chunk_flags_set(pc, PCF_EXPR_START | ((frm.stmt_count == 0) ? PCF_STMT_START : PCF_NONE));
-      LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 1.marked '%s' as %s, start stmt_count is %zu, expr_count is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->text(),
-              pc->flags.test(PCF_STMT_START) ? "stmt" : "expr", frm.stmt_count,
-              frm.expr_count);
-   }
-   frm.stmt_count++;
-   frm.expr_count++;
-   LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-           __func__, __LINE__, frm.stmt_count, frm.expr_count);
-
-   if (frm.sparen_count > 0)
-   {
-      chunk_flags_set(pc, PCF_IN_SPAREN);
-
-      // Mark everything in the for statement
-      for (int tmp = static_cast<int>(frm.size()) - 2; tmp >= 0; tmp--)
-      {
-         if (frm.at(tmp).type == CT_FOR)
-         {
-            chunk_flags_set(pc, PCF_IN_FOR);
-            break;
-         }
-      }
-
-      // Mark the parent on semicolons in for() statements
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && frm.size() > 2
-         && frm.prev().type == CT_FOR)
-      {
-         set_chunk_parent(pc, CT_FOR);
-      }
-   }
-
-   // Check the progression of complex statements
-   if (  frm.top().stage != brace_stage_e::NONE
-      && !chunk_is_token(pc, CT_AUTORELEASEPOOL)
-      && check_complex_statements(frm, pc, braceState))
-   {
-      return;
-   }
-
-   /*
-    * Check for a virtual brace statement close due to a semicolon.
-    * The virtual brace will get handled the next time through.
-    * The semicolon isn't handled at all.
-    * TODO: may need to float VBRACE past comments until newline?
-    */
-   if (frm.top().type == CT_VBRACE_OPEN)
-   {
-      if (chunk_is_semicolon(pc))
-      {
-         braceState.consumed = true;
-         close_statement(frm, pc, braceState);
-      }
-      else if (  language_is_set(LANG_PAWN)
-              && chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         close_statement(frm, pc, braceState);
-      }
-      else if (  language_is_set(LANG_D)
-              && chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         close_statement(frm, pc, braceState);
-      }
-   }
-
-   // Handle close parenthesis, vbrace, brace, and square
-   if (  chunk_is_token(pc, CT_PAREN_CLOSE)
-      || chunk_is_token(pc, CT_BRACE_CLOSE)
-      || chunk_is_token(pc, CT_VBRACE_CLOSE)
-      || chunk_is_token(pc, CT_ANGLE_CLOSE)
-      || chunk_is_token(pc, CT_MACRO_CLOSE)
-      || chunk_is_token(pc, CT_SQUARE_CLOSE))
-   {
-      // Change CT_PAREN_CLOSE into CT_SPAREN_CLOSE or CT_FPAREN_CLOSE
-      if (  chunk_is_token(pc, CT_PAREN_CLOSE)
-         && (  (frm.top().type == CT_FPAREN_OPEN)
-            || (frm.top().type == CT_SPAREN_OPEN)))
-      {
-         // TODO: fix enum hack
-         set_chunk_type(pc, static_cast<c_token_t>(frm.top().type + 1));
-
-         if (chunk_is_token(pc, CT_SPAREN_CLOSE))
-         {
-            frm.sparen_count--;
-            chunk_flags_clr(pc, PCF_IN_SPAREN);
-         }
-      }
-
-      // Make sure the open / close match
-      if (chunk_is_not_token(pc, (c_token_t)(frm.top().type + 1)))
-      {
-         LOG_FMT(LWARN, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         paren_stack_entry_t AA = frm.top();                // Issue #3055
-
-         if (AA.type != CT_EOF)
-         {
-            LOG_FMT(LWARN, "%s(%d): (frm.top().type + 1) is %s\n",
-                    __func__, __LINE__, get_token_name((c_token_t)(frm.top().type + 1)));
-         }
-
-         if (pc->flags.test(PCF_IN_PREPROC))                // Issue #3113
-         {
-            // do nothing
-         }
-         else
-         {
-            if (  frm.top().type != CT_EOF
-               && frm.top().type != CT_PP_DEFINE)
-            {
-               LOG_FMT(LWARN, "%s(%d): File: %s, orig_line is %zu, orig_col is %zu, Error: Unexpected '%s' for '%s', which was on line %zu\n",
-                       __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, pc->orig_col,
-                       pc->text(), get_token_name(frm.top().pc->type),
-                       frm.top().pc->orig_line);
-               print_stack(LBCSPOP, "=Error  ", frm);
-               cpd.error_count++;
-               exit(EXIT_FAILURE);
-            }
-         }
-      }
-      else
-      {
-         braceState.consumed = true;
-
-         // Copy the parent, update the parenthesis/brace levels
-         set_chunk_parent(pc, frm.top().parent);
-         frm.level--;
-
-         if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            || chunk_is_token(pc, CT_VBRACE_CLOSE)
-            || chunk_is_token(pc, CT_MACRO_CLOSE))
-         {
-            frm.brace_level--;
-            LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level decreased to %zu",
-                    __func__, __LINE__, frm.brace_level);
-            log_pcf_flags(LBCSPOP, pc->flags);
-         }
-         pc->level       = frm.level;
-         pc->brace_level = frm.brace_level;
-
-         // Pop the entry
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         frm.pop(__func__, __LINE__);
-         print_stack(LBCSPOP, "-Close  ", frm);
-
-         if (  frm.top().stage == brace_stage_e::NONE
-            && (  chunk_is_token(pc, CT_VBRACE_CLOSE)
-               || chunk_is_token(pc, CT_BRACE_CLOSE)
-               || chunk_is_token(pc, CT_SEMICOLON))
-            && chunk_is_token(frm.top().pc, CT_VBRACE_OPEN))
-         {
-            // frames for functions are not created as they are for an if
-            // this here is a hackish solution to close a vbrace of a block that
-            // contains the function
-            frm.push(nullptr); // <- dummy frame for the function
-            frm.top().stage = brace_stage_e::BRACE2;
-         }
-
-         // See if we are in a complex statement
-         if (frm.top().stage != brace_stage_e::NONE)
-         {
-            handle_complex_close(frm, pc, braceState);
-         }
-      }
-   }
-
-   /*
-    * In this state, we expect a semicolon, but we'll also hit the closing
-    * sparen, so we need to check braceState.consumed to see if the close sparen
-    * was aleady handled.
-    */
-   if (frm.top().stage == brace_stage_e::WOD_SEMI)
-   {
-      if (braceState.consumed)
-      {
-         /*
-          * If consumed, then we are on the close sparen.
-          * PAWN: Check the next chunk for a semicolon. If it isn't, then
-          * add a virtual semicolon, which will get handled on the next pass.
-          */
-         if (language_is_set(LANG_PAWN))
-         {
-            chunk_t *tmp = chunk_get_next_ncnnl(pc);
-
-            if (  chunk_is_not_token(tmp, CT_SEMICOLON)
-               && chunk_is_not_token(tmp, CT_VSEMICOLON))
-            {
-               pawn_add_vsemi_after(pc);
-            }
-         }
-      }
-      else
-      {
-         // Complain if this ISN'T a semicolon, but close out WHILE_OF_DO anyway
-         if (  chunk_is_token(pc, CT_SEMICOLON)
-            || chunk_is_token(pc, CT_VSEMICOLON))
-         {
-            braceState.consumed = true;
-            set_chunk_parent(pc, CT_WHILE_OF_DO);
-         }
-         else
-         {
-            LOG_FMT(LWARN, "%s: %s(%d): %zu: Error: Expected a semicolon for WHILE_OF_DO, but got '%s'\n",
-                    cpd.filename.c_str(), __func__, __LINE__, pc->orig_line,
-                    get_token_name(pc->type));
-            cpd.error_count++;
-         }
-         handle_complex_close(frm, pc, braceState);
-      }
-   }
-   // Get the parent type for brace and parenthesis open
-   c_token_t parent = get_chunk_parent_type(pc);
-
-   if (  chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_SPAREN_OPEN)
-      || chunk_is_token(pc, CT_BRACE_OPEN))
-   {
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-      if (prev != nullptr)
-      {
-         if (  chunk_is_token(pc, CT_PAREN_OPEN)
-            || chunk_is_token(pc, CT_FPAREN_OPEN)
-            || chunk_is_token(pc, CT_SPAREN_OPEN))
-         {
-            // Set the parent for parenthesis and change parenthesis type
-            if (  chunk_is_token(prev, CT_IF)
-               || chunk_is_token(prev, CT_CONSTEXPR)
-               || chunk_is_token(prev, CT_ELSEIF)
-               || chunk_is_token(prev, CT_WHILE)
-               || chunk_is_token(prev, CT_DO)
-               || chunk_is_token(prev, CT_FOR)
-               || chunk_is_token(prev, CT_SWITCH)
-               || chunk_is_token(prev, CT_CATCH)
-               || chunk_is_token(prev, CT_SYNCHRONIZED)
-               || chunk_is_token(prev, CT_D_VERSION)
-               || chunk_is_token(prev, CT_D_VERSION_IF)
-               || chunk_is_token(prev, CT_D_SCOPE)
-               || chunk_is_token(prev, CT_D_SCOPE_IF))
-            {
-               set_chunk_type(pc, CT_SPAREN_OPEN);
-               parent = frm.top().type;
-               frm.sparen_count++;
-            }
-            else if (chunk_is_token(prev, CT_FUNCTION))
-            {
-               set_chunk_type(pc, CT_FPAREN_OPEN);
-               parent = CT_FUNCTION;
-            }
-            // NS_ENUM and NS_OPTIONS are followed by a (type, name) pair
-            else if (  chunk_is_token(prev, CT_ENUM)
-                    && language_is_set(LANG_OC))
-            {
-               // Treat both as CT_ENUM since the syntax is identical
-               set_chunk_type(pc, CT_FPAREN_OPEN);
-               parent = CT_ENUM;
-            }
-            else if (chunk_is_token(prev, CT_DECLSPEC))  // Issue 1289
-            {
-               parent = CT_DECLSPEC;
-            }
-            // else: no need to set parent
-         }
-         else  // must be CT_BRACE_OPEN
-         {
-            // Set the parent for open braces
-            if (frm.top().stage != brace_stage_e::NONE)
-            {
-               parent = frm.top().type;
-            }
-            else if (  chunk_is_token(prev, CT_ASSIGN)
-                    && (prev->str[0] == '='))
-            {
-               parent = CT_ASSIGN;
-            }
-            else if (  chunk_is_token(prev, CT_RETURN)
-                    && language_is_set(LANG_CPP))
-            {
-               parent = CT_RETURN;
-            }
-            // Carry through CT_ENUM parent in NS_ENUM (type, name) {
-            // for the vim editor }
-            else if (  chunk_is_token(prev, CT_FPAREN_CLOSE)
-                    && language_is_set(LANG_OC)
-                    && get_chunk_parent_type(prev) == CT_ENUM)
-            {
-               parent = CT_ENUM;
-            }
-            else if (chunk_is_token(prev, CT_FPAREN_CLOSE))
-            {
-               parent = CT_FUNCTION;
-            }
-            // else: no need to set parent
-         }
-      }
-   }
-
-   /*
-    * Adjust the level for opens & create a stack entry
-    * Note that CT_VBRACE_OPEN has already been handled.
-    */
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_SPAREN_OPEN)
-      || chunk_is_token(pc, CT_ANGLE_OPEN)
-      || chunk_is_token(pc, CT_MACRO_OPEN)
-      || chunk_is_token(pc, CT_SQUARE_OPEN))
-   {
-      frm.level++;
-
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_MACRO_OPEN))
-      {
-         // Issue #1813
-         bool single = false;
-
-         if (get_chunk_parent_type(pc) == CT_NAMESPACE)
-         {
-            LOG_FMT(LBCSPOP, "%s(%d): parent_type is NAMESPACE\n",
-                    __func__, __LINE__);
-            chunk_t *tmp = frm.top().pc;
-
-            if (  tmp != nullptr
-               && get_chunk_parent_type(tmp) == CT_NAMESPACE)
-            {
-               LOG_FMT(LBCSPOP, "%s(%d): tmp->parent_type is NAMESPACE\n",
-                       __func__, __LINE__);
-
-               log_rule_B("indent_namespace");
-               log_rule_B("indent_namespace_single_indent");
-
-               if (  options::indent_namespace()
-                  && options::indent_namespace_single_indent())
-               {
-                  LOG_FMT(LBCSPOP, "%s(%d): Options are SINGLE\n",
-                          __func__, __LINE__);
-                  single = true;
-               }
-            }
-         }
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, parent_type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
-
-         if (!single)
-         {
-            frm.brace_level++;
-            LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level increased to %zu\n",
-                    __func__, __LINE__, frm.brace_level);
-         }
-      }
-      frm.push(pc, __func__, __LINE__);
-      frm.top().parent = parent;
-      // set parent type
-      set_chunk_parent(pc, parent);
-   }
-   // Issue #2281
-   LOG_FMT(LBCSPOP, "%s(%d):\n", __func__, __LINE__);
-
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      && pc->parent_type == CT_SWITCH)
-   {
-      size_t idx = frm.size();
-      LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
-              __func__, __LINE__, idx);
-      chunk_t *saved = frm.at(idx - 2).pc;
-
-      if (saved != nullptr)
-      {
-         // set parent member
-         chunk_set_parent(pc, saved);
-      }
-   }
-
-   if (  chunk_is_token(pc, CT_CASE)
-      || chunk_is_token(pc, CT_DEFAULT))
-   {
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col);
-      set_chunk_parent(pc, CT_SWITCH);
-      size_t idx = frm.size();
-      LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
-              __func__, __LINE__, idx);
-      chunk_t *saved = frm.at(idx - 2).pc;
-
-      if (saved != nullptr)
-      {
-         // set parent member
-         chunk_set_parent(pc, saved);
-      }
-   }
-
-   if (chunk_is_token(pc, CT_BREAK))
-   {
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col);
-      size_t idx = frm.size();
-      LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
-              __func__, __LINE__, idx);
-      chunk_t *saved = frm.at(idx - 2).pc;
-
-      if (saved != nullptr)
-      {
-         // set parent member
-         chunk_set_parent(pc, saved);
-      }
-   }
-   const pattern_class_e patcls = get_token_pattern_class(pc->type);
-
-   /*
-    * Create a stack entry for complex statements:
-    * if, elseif, switch, for, while, synchronized, using, lock, with,
-    * version, CT_D_SCOPE_IF
-    */
-   if (patcls == pattern_class_e::BRACED)
-   {
-      frm.push(pc, __func__, __LINE__, (chunk_is_token(pc, CT_DO) ? brace_stage_e::BRACE_DO
-                    : brace_stage_e::BRACE2));
-      // "+ComplexBraced"
-   }
-   else if (patcls == pattern_class_e::PBRACED)
-   {
-      brace_stage_e bs = brace_stage_e::PAREN1;
-
-      if (  chunk_is_token(pc, CT_WHILE)
-         && maybe_while_of_do(pc))
-      {
-         set_chunk_type(pc, CT_WHILE_OF_DO);
-         bs = brace_stage_e::WOD_PAREN;
-      }
-      frm.push(pc, __func__, __LINE__, bs);
-      // "+ComplexParenBraced"
-   }
-   else if (patcls == pattern_class_e::OPBRACED)
-   {
-      frm.push(pc, __func__, __LINE__, brace_stage_e::OP_PAREN1);
-      // "+ComplexOpParenBraced");
-   }
-   else if (patcls == pattern_class_e::ELSE)
-   {
-      frm.push(pc, __func__, __LINE__, brace_stage_e::ELSEIF);
-      // "+ComplexElse");
-   }
-
-   /*
-    * Mark simple statement/expression starts
-    *  - after { or }
-    *  - after ';', but not if the paren stack top is a paren
-    *  - after '(' that has a parent type of CT_FOR
-    */
-   if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-      || (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && get_chunk_parent_type(pc) != CT_ASSIGN)
-      || chunk_is_token(pc, CT_BRACE_CLOSE)
-      || chunk_is_token(pc, CT_VBRACE_CLOSE)
-      || (  chunk_is_token(pc, CT_SPAREN_OPEN)
-         && get_chunk_parent_type(pc) == CT_FOR)
-      || chunk_is_token(pc, CT_COLON)
-      || chunk_is_token(pc, CT_OC_END)
-      || (  chunk_is_semicolon(pc)
-         && frm.top().type != CT_PAREN_OPEN
-         && frm.top().type != CT_FPAREN_OPEN
-         && frm.top().type != CT_SPAREN_OPEN)
-      || chunk_is_token(pc, CT_MACRO))                         // Issue #2742
-   {
-      LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->text());
-      frm.stmt_count = 0;
-      frm.expr_count = 0;
-      LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-              __func__, __LINE__, frm.stmt_count, frm.expr_count);
-   }
-   // Mark expression starts
-   LOG_FMT(LSTMT, "%s(%d): Mark expression starts: orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-   chunk_t *tmp = chunk_get_next_ncnnl(pc);
-
-   if (  chunk_is_token(pc, CT_ARITH)
-      || chunk_is_token(pc, CT_SHIFT)
-      || chunk_is_token(pc, CT_ASSIGN)
-      || chunk_is_token(pc, CT_CASE)
-      || chunk_is_token(pc, CT_COMPARE)
-      || (  chunk_is_token(pc, CT_STAR)
-         && chunk_is_not_token(tmp, CT_STAR))
-      || chunk_is_token(pc, CT_BOOL)
-      || chunk_is_token(pc, CT_MINUS)
-      || chunk_is_token(pc, CT_PLUS)
-      || chunk_is_token(pc, CT_CARET)
-      || chunk_is_token(pc, CT_ANGLE_OPEN)
-      || chunk_is_token(pc, CT_ANGLE_CLOSE)
-      || chunk_is_token(pc, CT_RETURN)
-      || chunk_is_token(pc, CT_THROW)
-      || chunk_is_token(pc, CT_GOTO)
-      || chunk_is_token(pc, CT_CONTINUE)
-      || chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_SPAREN_OPEN)
-      || chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_semicolon(pc)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_NOT)
-      || chunk_is_token(pc, CT_INV)
-      || chunk_is_token(pc, CT_COLON)
-      || chunk_is_token(pc, CT_QUESTION))
-   {
-      frm.expr_count = 0;
-      LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, orig_col is %zu, reset expr on '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-   }
-} // parse_cleanup
-
-
-static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
-{
-   LOG_FUNC_ENTRY();
-
-   brace_stage_e atest = frm.top().stage;
-
-   LOG_FMT(LBCSPOP, "%s(%d): atest is %s\n",
-           __func__, __LINE__, get_brace_stage_name(atest));
-
-   // Turn an optional parenthesis into either a real parenthesis or a brace
-   if (frm.top().stage == brace_stage_e::OP_PAREN1)
-   {
-      frm.top().stage = (chunk_is_not_token(pc, CT_PAREN_OPEN))
-                        ? brace_stage_e::BRACE2
-                        : brace_stage_e::PAREN1;
-      LOG_FMT(LBCSPOP, "%s(%d): frm.top().stage is now %s\n",
-              __func__, __LINE__, get_brace_stage_name(frm.top().stage));
-   }
-
-   // Check for CT_ELSE after CT_IF
-   while (frm.top().stage == brace_stage_e::ELSE)
-   {
-      if (chunk_is_token(pc, CT_ELSE))
-      {
-         // Replace CT_IF with CT_ELSE on the stack & we are done
-         frm.top().type  = CT_ELSE;
-         frm.top().stage = brace_stage_e::ELSEIF;
-         print_stack(LBCSSWAP, "=Swap   ", frm);
-
-         return(true);
-      }
-      // Remove the CT_IF and close the statement
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      frm.pop(__func__, __LINE__);
-      print_stack(LBCSPOP, "-IF-CCS ", frm);
-
-      if (close_statement(frm, pc, braceState))
-      {
-         return(true);
-      }
-   }
-
-   // Check for CT_IF after CT_ELSE
-   if (frm.top().stage == brace_stage_e::ELSEIF)
-   {
-      log_rule_B("indent_else_if");
-
-      if (  chunk_is_token(pc, CT_IF)
-         && (  !options::indent_else_if()
-            || !chunk_is_newline(chunk_get_prev_nc(pc))))
-      {
-         // Replace CT_ELSE with CT_IF
-         set_chunk_type(pc, CT_ELSEIF);
-         frm.top().type  = CT_ELSEIF;
-         frm.top().stage = brace_stage_e::PAREN1;
-         return(true);
-      }
-      // Jump to the 'expecting brace' stage
-      frm.top().stage = brace_stage_e::BRACE2;
-   }
-
-   // Check for CT_CATCH or CT_FINALLY after CT_TRY or CT_CATCH
-   while (frm.top().stage == brace_stage_e::CATCH)
-   {
-      if (  chunk_is_token(pc, CT_CATCH)
-         || chunk_is_token(pc, CT_FINALLY))
-      {
-         // Replace CT_TRY with CT_CATCH or CT_FINALLY on the stack & we are done
-         frm.top().type = pc->type;
-
-         if (language_is_set(LANG_CS))
-         {
-            frm.top().stage = (chunk_is_token(pc, CT_CATCH)) ? brace_stage_e::CATCH_WHEN : brace_stage_e::BRACE2;
-         }
-         else
-         {
-            // historically this used OP_PAREN1; however, to my knowledge the expression after a catch clause
-            // is only optional for C# which has been handled above; therefore, this should now always expect
-            // a parenthetical expression after the catch keyword and brace after the finally keyword
-            frm.top().stage = (chunk_is_token(pc, CT_CATCH)) ? brace_stage_e::PAREN1 : brace_stage_e::BRACE2;
-         }
-         print_stack(LBCSSWAP, "=Swap   ", frm);
-
-         return(true);
-      }
-      // Remove the CT_TRY and close the statement
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      frm.pop(__func__, __LINE__);
-      print_stack(LBCSPOP, "-TRY-CCS ", frm);
-
-      if (close_statement(frm, pc, braceState))
-      {
-         return(true);
-      }
-   }
-
-   // Check for optional parenthesis and optional CT_WHEN after CT_CATCH
-   if (frm.top().stage == brace_stage_e::CATCH_WHEN)
-   {
-      if (chunk_is_token(pc, CT_PAREN_OPEN)) // this is for the paren after "catch"
-      {
-         // Replace CT_PAREN_OPEN with CT_SPAREN_OPEN
-         set_chunk_type(pc, CT_SPAREN_OPEN);
-         frm.top().type  = pc->type;
-         frm.top().stage = brace_stage_e::PAREN1;
-
-         return(false);
-      }
-
-      if (chunk_is_token(pc, CT_WHEN))
-      {
-         frm.top().type  = pc->type;
-         frm.top().stage = brace_stage_e::OP_PAREN1;
-
-         return(true);
-      }
-
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
-      {
-         frm.top().stage = brace_stage_e::BRACE2;
-
-         return(false);
-      }
-   }
-
-   // Check for CT_WHILE after the CT_DO
-   if (frm.top().stage == brace_stage_e::WHILE)
-   {
-      if (chunk_is_token(pc, CT_WHILE))
-      {
-         set_chunk_type(pc, CT_WHILE_OF_DO);
-         frm.top().type  = CT_WHILE_OF_DO; //CT_WHILE;
-         frm.top().stage = brace_stage_e::WOD_PAREN;
-
-         return(true);
-      }
-      LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected 'while', got '%s'\n",
-              __func__, __LINE__, cpd.filename.c_str(), pc->orig_line,
-              pc->text());
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      frm.pop(__func__, __LINE__);
-      print_stack(LBCSPOP, "-Error  ", frm);
-      cpd.error_count++;
-   }
-   // Insert a CT_VBRACE_OPEN, if needed
-   // but not in a preprocessor
-   atest = frm.top().stage;
-
-   if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-      && !pc->flags.test(PCF_IN_PREPROC)
-      && (  (frm.top().stage == brace_stage_e::BRACE2)
-         || (frm.top().stage == brace_stage_e::BRACE_DO)))
-   {
-      log_rule_B("indent_using_block");
-
-      if (  language_is_set(LANG_CS)
-         && chunk_is_token(pc, CT_USING_STMT)
-         && (!options::indent_using_block()))
-      {
-         // don't indent the using block
-      }
-      else
-      {
-         const c_token_t parent = frm.top().type;
-
-         chunk_t         *vbrace = insert_vbrace_open_before(pc, frm);
-         set_chunk_parent(vbrace, parent);
-
-         frm.level++;
-         frm.brace_level++;
-         LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level increased to %zu\n",
-                 __func__, __LINE__, frm.brace_level);
-         log_pcf_flags(LBCSPOP, pc->flags);
-
-         frm.push(vbrace, __func__, __LINE__, brace_stage_e::NONE);
-         // "+VBrace");
-
-         frm.top().parent = parent;
-
-         // update the level of pc
-         pc->level       = frm.level;
-         pc->brace_level = frm.brace_level;
-
-         // Mark as a start of a statement
-         frm.stmt_count = 0;
-         frm.expr_count = 0;
-         LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-                 __func__, __LINE__, frm.stmt_count, frm.expr_count);
-         chunk_flags_set(pc, PCF_STMT_START | PCF_EXPR_START);
-         frm.stmt_count = 1;
-         frm.expr_count = 1;
-         LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 2.marked '%s' as stmt start\n",
-                 __func__, __LINE__, pc->orig_line, pc->text());
-      }
-   }
-
-   // Check for "constexpr" after CT_IF or CT_ELSEIF
-   if (  frm.top().stage == brace_stage_e::PAREN1
-      && (  frm.top().type == CT_IF
-         || frm.top().type == CT_ELSEIF)
-      && chunk_is_token(pc, CT_CONSTEXPR))
-   {
-      return(false);
-   }
-
-   // Verify open parenthesis in complex statement
-   if (  chunk_is_not_token(pc, CT_PAREN_OPEN)
-      && (  (frm.top().stage == brace_stage_e::PAREN1)
-         || (frm.top().stage == brace_stage_e::WOD_PAREN)))
-   {
-      LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected '(', got '%s' for '%s'\n",
-              __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, pc->text(),
-              get_token_name(frm.top().type));
-
-      // Throw out the complex statement
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      frm.pop(__func__, __LINE__);
-      print_stack(LBCSPOP, "-Error  ", frm);
-      cpd.error_count++;
-   }
-   return(false);
-} // check_complex_statements
-
-
-static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
-{
-   LOG_FUNC_ENTRY();
-
-   if (frm.top().stage == brace_stage_e::PAREN1)
-   {
-      if (  pc->next != nullptr
-         && pc->next->type == CT_WHEN)
-      {
-         frm.top().type  = pc->type;
-         frm.top().stage = brace_stage_e::CATCH_WHEN;
-
-         return(true);
-      }
-      // PAREN1 always => BRACE2
-      frm.top().stage = brace_stage_e::BRACE2;
-   }
-   else if (frm.top().stage == brace_stage_e::BRACE2)
-   {
-      // BRACE2: IF => ELSE, anything else => close
-      if (  (frm.top().type == CT_IF)
-         || (frm.top().type == CT_ELSEIF))
-      {
-         frm.top().stage = brace_stage_e::ELSE;
-
-         // If the next chunk isn't CT_ELSE, close the statement
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (  next == nullptr
-            || chunk_is_not_token(next, CT_ELSE))
-         {
-            LOG_FMT(LBCSPOP, "%s(%d): no CT_ELSE, pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-            print_stack(LBCSPOP, "-IF-HCS ", frm);
-
-            return(close_statement(frm, pc, braceState));
-         }
-      }
-      else if (  (frm.top().type == CT_TRY)
-              || (frm.top().type == CT_CATCH))
-      {
-         frm.top().stage = brace_stage_e::CATCH;
-
-         // If the next chunk isn't CT_CATCH or CT_FINALLY, close the statement
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (  chunk_is_not_token(next, CT_CATCH)
-            && chunk_is_not_token(next, CT_FINALLY))
-         {
-            LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-            print_stack(LBCSPOP, "-TRY-HCS ", frm);
-
-            return(close_statement(frm, pc, braceState));
-         }
-      }
-      else
-      {
-         LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::BRACE2\n",
-                 __func__, __LINE__, get_token_name(frm.top().type));
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         frm.pop(__func__, __LINE__);
-         print_stack(LBCSPOP, "-HCC B2 ", frm);
-
-         return(close_statement(frm, pc, braceState));
-      }
-   }
-   else if (frm.top().stage == brace_stage_e::BRACE_DO)
-   {
-      frm.top().stage = brace_stage_e::WHILE;
-   }
-   else if (frm.top().stage == brace_stage_e::WOD_PAREN)
-   {
-      LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_PAREN\n",
-              __func__, __LINE__, get_token_name(frm.top().type));
-      frm.top().stage = brace_stage_e::WOD_SEMI;
-      print_stack(LBCSPOP, "-HCC WoDP ", frm);
-   }
-   else if (frm.top().stage == brace_stage_e::WOD_SEMI)
-   {
-      LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_SEMI\n",
-              __func__, __LINE__, get_token_name(frm.top().type));
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      frm.pop(__func__, __LINE__);
-      print_stack(LBCSPOP, "-HCC WoDS ", frm);
-
-      return(close_statement(frm, pc, braceState));
-   }
-   else
-   {
-      // PROBLEM
-      LOG_FMT(LWARN, "%s(%d): %s:%zu Error: TOS.type='%s' TOS.stage=%u\n",
-              __func__, __LINE__, cpd.filename.c_str(), pc->orig_line,
-              get_token_name(frm.top().type),
-              (unsigned int)frm.top().stage);
-      cpd.error_count++;
-   }
-   return(false);
-} // handle_complex_close
-
-
-static void mark_namespace(chunk_t *pns)
-{
-   LOG_FUNC_ENTRY();
-   // Issue #1813
-   chunk_t *br_close;
-   bool    is_using = false;
-
-   chunk_t *pc = chunk_get_prev_ncnnl(pns);
-
-   if (chunk_is_token(pc, CT_USING))
-   {
-      is_using = true;
-      set_chunk_parent(pns, CT_USING);
-   }
-   pc = chunk_get_next_ncnnl(pns);
-
-   while (pc != nullptr)
-   {
-      set_chunk_parent(pc, CT_NAMESPACE);
-
-      if (chunk_is_not_token(pc, CT_BRACE_OPEN))
-      {
-         if (chunk_is_token(pc, CT_SEMICOLON))
-         {
-            if (is_using)
-            {
-               set_chunk_parent(pc, CT_USING);
-            }
-            return;
-         }
-         pc = chunk_get_next_ncnnl(pc);
-         continue;
-      }
-      log_rule_B("indent_namespace_limit");
-
-      if (  (options::indent_namespace_limit() > 0)
-         && ((br_close = chunk_skip_to_match(pc)) != nullptr))
-      {
-         // br_close->orig_line is always >= pc->orig_line;
-         size_t numberOfLines = br_close->orig_line - pc->orig_line - 1;                 // Issue #2345
-         LOG_FMT(LTOK, "%s(%d): br_close->orig_line is %zu, pc->orig_line is %zu\n",
-                 __func__, __LINE__, br_close->orig_line, pc->orig_line);
-         LOG_FMT(LTOK, "%s(%d): numberOfLines is %zu, indent_namespace_limit() is %d\n",
-                 __func__, __LINE__, numberOfLines, options::indent_namespace_limit());
-
-         log_rule_B("indent_namespace_limit");
-
-         if (numberOfLines > options::indent_namespace_limit())
-         {
-            LOG_FMT(LTOK, "%s(%d): PCF_LONG_BLOCK is set\n", __func__, __LINE__);
-            chunk_flags_set(pc, PCF_LONG_BLOCK);
-            chunk_flags_set(br_close, PCF_LONG_BLOCK);
-         }
-      }
-      flag_parens(pc, PCF_IN_NAMESPACE, CT_NONE, CT_NAMESPACE, false);
-      return;
-   }
-} // mark_namespace
-
-
-static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t chunk;
-
-   set_chunk_parent(&chunk, frm.top().type);
-   chunk.orig_line   = pc->orig_line;
-   chunk.level       = frm.level;
-   chunk.pp_level    = frm.pp_level;
-   chunk.brace_level = frm.brace_level;
-   chunk.flags       = pc->flags & PCF_COPY_FLAGS;
-   chunk.str         = "";
-
-   if (after)
-   {
-      chunk.orig_col = pc->orig_col;
-      set_chunk_type(&chunk, CT_VBRACE_CLOSE);
-      return(chunk_add_after(&chunk, pc));
-   }
-   chunk_t *ref = chunk_get_prev(pc);
-
-   if (ref == nullptr)
-   {
-      return(nullptr);
-   }
-
-   if (!ref->flags.test(PCF_IN_PREPROC))
-   {
-      chunk.flags &= ~PCF_IN_PREPROC;
-   }
-
-   while (  chunk_is_newline(ref)
-         || chunk_is_comment(ref))
-   {
-      ref->level++;
-      ref->brace_level++;
-      ref = chunk_get_prev(ref);
-   }
-
-   if (ref == nullptr)
-   {
-      return(nullptr);
-   }
-
-   // Don't back into a preprocessor
-   if (  !pc->flags.test(PCF_IN_PREPROC)
-      && ref->flags.test(PCF_IN_PREPROC))
-   {
-      if (chunk_is_token(ref, CT_PREPROC_BODY))
-      {
-         while (  ref != nullptr
-               && ref->flags.test(PCF_IN_PREPROC))
-         {
-            ref = chunk_get_prev(ref);
-         }
-      }
-      else
-      {
-         ref = chunk_get_next(ref);
-
-         if (chunk_is_token(ref, CT_COMMENT)) // Issue #3034
-         {
-            ref = chunk_get_next_nc(ref);
-         }
-      }
-   }
-
-   if (ref == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk.orig_line = ref->orig_line;
-   chunk.orig_col  = ref->orig_col;
-   chunk.column    = ref->column + ref->len() + 1;
-   chunk.pp_level  = ref->pp_level;                         // Issue #3055
-   set_chunk_type(&chunk, CT_VBRACE_OPEN);
-
-   return(chunk_add_after(&chunk, ref));
-} // insert_vbrace
-
-
-bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      throw invalid_argument(string(__func__) + ":" + to_string(__LINE__)
-                             + "args cannot be nullptr");
-   }
-   LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, '%s' type is %s, stage is %u\n",
-           __func__, __LINE__, pc->orig_line,
-           get_token_name(pc->type), pc->text(),
-           get_token_name(frm.top().type),
-           (unsigned int)frm.top().stage);
-
-   if (braceState.consumed)
-   {
-      frm.stmt_count = 0;
-      frm.expr_count = 0;
-      LOG_FMT(LSTMT, "%s(%d): orig_line is %zu> reset2 stmt on '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->text());
-   }
-   /*
-    * Insert a CT_VBRACE_CLOSE, if needed:
-    * If we are in a virtual brace and we are not ON a CT_VBRACE_CLOSE add one
-    */
-   chunk_t *vbc = pc;
-
-   if (frm.top().type == CT_VBRACE_OPEN)
-   {
-      // If the current token has already been consumed, then add after it
-      if (braceState.consumed)
-      {
-         insert_vbrace_close_after(pc, frm);
-      }
-      else
-      {
-         // otherwise, add before it and consume the vbrace
-         vbc = chunk_get_prev_ncnnl(pc);
-
-         frm.level--;
-         frm.brace_level--;
-         vbc = insert_vbrace_close_after(vbc, frm);
-         set_chunk_parent(vbc, frm.top().parent);
-
-         LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level decreased to %zu\n",
-                 __func__, __LINE__, frm.brace_level);
-         log_pcf_flags(LBCSPOP, pc->flags);
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         frm.pop(__func__, __LINE__);
-
-         // Update the token level
-         pc->level       = frm.level;
-         pc->brace_level = frm.brace_level;
-
-         print_stack(LBCSPOP, "-CS VB  ", frm);
-
-         // And repeat the close
-         close_statement(frm, pc, braceState);
-         return(true);
-      }
-   }
-
-   // See if we are done with a complex statement
-   if (frm.top().stage != brace_stage_e::NONE)
-   {
-      if (handle_complex_close(frm, vbc, braceState))
-      {
-         return(true);
-      }
-   }
-   return(false);
-} // close_statement
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.h
deleted file mode 100644
index 4b2cfbba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file brace_cleanup.h
- * prototypes for brace_cleanup.cpp
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef BRACE_CLEANUP_H_INCLUDED
-#define BRACE_CLEANUP_H_INCLUDED
-
-#include "uncrustify_types.h"
-// necessary to not sort
-#include "ParseFrame.h"
-
-/**
- * Scans through the whole list and does stuff.
- * It has to do some tricks to parse preprocessors.
- */
-void brace_cleanup(void);
-
-
-#endif /* BRACE_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.cpp
deleted file mode 100644
index 7b7fa293..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.cpp
+++ /dev/null
@@ -1,1622 +0,0 @@
-/**
- * @file braces.cpp
- * Adds or removes braces.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "braces.h"
-
-#include "calculate_closing_brace_position.h"
-#include "combine_tools.h"
-#include "newlines.h"
-#include "prototypes.h"
-
-constexpr static auto LCURRENT = LBR;
-
-using namespace uncrustify;
-
-using std::vector;
-
-
-//! Converts a single brace into a virtual brace
-static void convert_brace(chunk_t *br);
-
-
-//! Converts a single virtual brace into a real brace
-static void convert_vbrace(chunk_t *br);
-
-
-static void convert_vbrace_to_brace(void);
-
-
-//! Go backwards to honor brace newline removal limits
-static void examine_braces(void);
-
-
-/**
- * Step forward and count the number of semi colons at the current level.
- * Abort if more than 1 or if we enter a preprocessor
- */
-static void examine_brace(chunk_t *bopen);
-
-
-static void move_case_break(void);
-
-
-static void mod_case_brace(void);
-
-
-static void mod_full_brace_if_chain(void);
-
-
-/**
- * Checks to see if the braces can be removed.
- *  - less than a certain length
- *  - doesn't mess up if/else stuff
- */
-static bool can_remove_braces(chunk_t *bopen);
-
-
-/**
- * Checks to see if the virtual braces should be converted to real braces.
- *  - over a certain length
- *
- * @param vbopen  Virtual Brace Open chunk
- *
- * @return true (convert to real braces) or false (leave alone)
- */
-static bool should_add_braces(chunk_t *vbopen);
-
-
-/**
- * Collect the text into txt that contains the full tag name.
- * Mainly for collecting namespace 'a.b.c' or function 'foo::bar()' names.
- */
-static void append_tag_name(unc_text &txt, chunk_t *pc);
-
-
-//! Remove the case brace, if allowable.
-static chunk_t *mod_case_brace_remove(chunk_t *br_open);
-
-
-//! Add the case brace, if allowable.
-static chunk_t *mod_case_brace_add(chunk_t *cl_colon);
-
-
-/**
- * Traverse the if chain and see if all can be removed
- *
- * @param br_start  chunk pointing to opening brace of if clause
- */
-static void process_if_chain(chunk_t *br_start);
-
-
-/**
- * Check if parenthesis pair that comes before a brace spans multiple lines
- *
- *
- * @param brace  the brace chunk whose predecessing parenthesis will be checked
- *
- * @pre   the brace chunk cannot be a nullptr,
- *        it needs to be of type CT_BRACE_OPEN or CT_BRACE_CLOSE,
- *        its parent type needs to be one of this types:
- *            CT_IF, CT_ELSEIF, CT_FOR, CT_USING_STMT, CT_WHILE,
- *            CT_FUNC_CLASS_DEF, CT_FUNC_DEF
- *
- * @return  false: if preconditions are not met,
- *                 if an error occurs while  counting the newline between the
- *                 parenthesis or
- *                 when no newlines are found between the parenthesis
- */
-static bool paren_multiline_before_brace(chunk_t *brace)
-{
-   if (  brace == nullptr
-      || (  chunk_is_not_token(brace, CT_BRACE_OPEN)
-         && chunk_is_not_token(brace, CT_BRACE_CLOSE))
-      || (  get_chunk_parent_type(brace) != CT_IF
-         && get_chunk_parent_type(brace) != CT_ELSEIF
-         && get_chunk_parent_type(brace) != CT_FOR
-         && get_chunk_parent_type(brace) != CT_USING_STMT
-         && get_chunk_parent_type(brace) != CT_WHILE
-         && get_chunk_parent_type(brace) != CT_FUNC_CLASS_DEF
-         && get_chunk_parent_type(brace) != CT_FUNC_DEF))
-   {
-      return(false);
-   }
-   const auto paren_t = CT_SPAREN_CLOSE;
-
-   // find parenthesis pair of the if/for/while/...
-   auto paren_close = chunk_get_prev_type(brace, paren_t, brace->level, scope_e::ALL);
-   auto paren_open  = chunk_skip_to_match_rev(paren_close, scope_e::ALL);
-
-   if (  paren_close == nullptr
-      || paren_open == nullptr
-      || paren_close == brace
-      || paren_open == paren_close)
-   {
-      return(false);
-   }
-   // determine number of lines in the parenthesis pair spans
-   auto       nl_count = size_t{};
-   const auto ret_flag = newlines_between(paren_open, paren_close, nl_count);
-
-   if (!ret_flag)
-   {
-      LOG_FMT(LERR, "%s(%d): newlines_between error\n", __func__, __LINE__);
-      return(false);
-   }
-   // nl_count = 0 -> 1 line
-   return(nl_count > 0);
-}
-
-
-void do_braces(void)
-{
-   LOG_FUNC_ENTRY();
-   // Mark one-liners
-   // Issue #2232 put this at the beginning
-   chunk_t *pc = chunk_get_head();
-
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-   {
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && chunk_is_not_token(pc, CT_VBRACE_OPEN))
-      {
-         continue;
-      }
-      chunk_t         *br_open = pc;
-      const c_token_t brc_type = c_token_t(pc->type + 1); // corresponds to closing type
-      // Detect empty bodies
-      chunk_t         *tmp = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_token(tmp, brc_type))
-      {
-         chunk_flags_set(br_open, PCF_EMPTY_BODY);
-         chunk_flags_set(tmp, PCF_EMPTY_BODY);
-      }
-      // Scan for the brace close or a newline
-      tmp = br_open;
-
-      while ((tmp = chunk_get_next_nc(tmp)) != nullptr)
-      {
-         if (chunk_is_newline(tmp))
-         {
-            break;
-         }
-
-         if (  chunk_is_token(tmp, brc_type)
-            && br_open->level == tmp->level)
-         {
-            flag_series(br_open, tmp, PCF_ONE_LINER);
-            break;
-         }
-      }
-   }
-   log_rule_B("mod_full_brace_if_chain");
-   log_rule_B("mod_full_brace_if_chain_only");
-
-   if (  options::mod_full_brace_if_chain()
-      || options::mod_full_brace_if_chain_only())
-   {
-      mod_full_brace_if_chain();
-   }
-   log_rule_B("mod_full_brace_if");
-   log_rule_B("mod_full_brace_do");
-   log_rule_B("mod_full_brace_for");
-   log_rule_B("mod_full_brace_using");
-   log_rule_B("mod_full_brace_while");
-
-   if ((options::mod_full_brace_if() |
-        options::mod_full_brace_do() |
-        options::mod_full_brace_for() |
-        options::mod_full_brace_using() |
-        options::mod_full_brace_while()) & IARF_REMOVE)
-   {
-      examine_braces();
-   }
-   // convert vbraces if needed
-   log_rule_B("mod_full_brace_if");
-   log_rule_B("mod_full_brace_do");
-   log_rule_B("mod_full_brace_for");
-   log_rule_B("mod_full_brace_function");
-   log_rule_B("mod_full_brace_using");
-   log_rule_B("mod_full_brace_while");
-
-   if ((options::mod_full_brace_if() |
-        options::mod_full_brace_do() |
-        options::mod_full_brace_for() |
-        options::mod_full_brace_function() |
-        options::mod_full_brace_using() |
-        options::mod_full_brace_while()) & IARF_ADD)
-   {
-      convert_vbrace_to_brace();
-   }
-   log_rule_B("mod_case_brace");
-
-   if (options::mod_case_brace() != IARF_IGNORE)
-   {
-      mod_case_brace();
-   }
-   log_rule_B("mod_move_case_break");
-
-   if (options::mod_move_case_break())
-   {
-      move_case_break();
-   }
-} // do_braces
-
-
-static void examine_braces(void)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("mod_full_brace_nl_block_rem_mlcond");
-   const auto multiline_block = options::mod_full_brace_nl_block_rem_mlcond();
-
-   log_rule_B("mod_full_brace_if");
-   log_rule_B("mod_full_brace_do");
-   log_rule_B("mod_full_brace_for");
-   log_rule_B("mod_full_brace_using");
-   log_rule_B("mod_full_brace_while");
-
-   for (auto pc = chunk_get_tail(); pc != nullptr;)
-   {
-      auto prev = chunk_get_prev_type(pc, CT_BRACE_OPEN, -1);
-
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && !pc->flags.test(PCF_IN_PREPROC)
-         && (  (  (  get_chunk_parent_type(pc) == CT_IF
-                  || get_chunk_parent_type(pc) == CT_ELSE
-                  || get_chunk_parent_type(pc) == CT_ELSEIF)
-               && options::mod_full_brace_if() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_DO
-               && options::mod_full_brace_do() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_FOR
-               && options::mod_full_brace_for() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_USING_STMT
-               && options::mod_full_brace_using() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_WHILE
-               && options::mod_full_brace_while() == IARF_REMOVE)))
-      {
-         if (  multiline_block
-            && paren_multiline_before_brace(pc))
-         {
-            pc = prev;
-            continue;
-         }
-         examine_brace(pc);
-      }
-      pc = prev;
-   }
-} // examine_braces
-
-
-static bool should_add_braces(chunk_t *vbopen)
-{
-   LOG_FUNC_ENTRY();
-   log_rule_B("mod_full_brace_nl");
-   const size_t nl_max = options::mod_full_brace_nl();
-
-   if (nl_max == 0)
-   {
-      return(false);
-   }
-   LOG_FMT(LBRDEL, "%s(%d): start on %zu:\n",
-           __func__, __LINE__, vbopen->orig_line);
-
-   size_t  nl_count = 0;
-
-   chunk_t *pc = nullptr;
-
-   for (pc = chunk_get_next_nc(vbopen, scope_e::PREPROC);
-        (pc != nullptr && pc->level > vbopen->level);
-        pc = chunk_get_next_nc(pc, scope_e::PREPROC))
-   {
-      if (chunk_is_newline(pc))
-      {
-         nl_count += pc->nl_count;
-      }
-   }
-
-   if (  pc != nullptr
-      && nl_count > nl_max
-      && vbopen->pp_level == pc->pp_level)
-   {
-      LOG_FMT(LBRDEL, "%s(%d): exceeded %zu newlines\n",
-              __func__, __LINE__, nl_max);
-      return(true);
-   }
-   return(false);
-}
-
-
-static bool can_remove_braces(chunk_t *bopen)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LBRDEL, "%s(%d): start on line %zu:\n",
-           __func__, __LINE__, bopen->orig_line);
-
-   // Cannot remove braces inside a preprocessor
-   if (bopen->flags.test(PCF_IN_PREPROC))
-   {
-      return(false);
-   }
-   chunk_t *pc = chunk_get_next_ncnnl(bopen, scope_e::PREPROC);
-
-   if (chunk_is_token(pc, CT_BRACE_CLOSE))
-   {
-      // Can't remove empty statement
-      return(false);
-   }
-   const size_t level = bopen->level + 1;
-
-   log_rule_B("mod_full_brace_nl");
-   const size_t nl_max = options::mod_full_brace_nl();
-   chunk_t      *prev  = nullptr;
-
-   size_t       semi_count = 0;
-   bool         hit_semi   = false;
-   size_t       nl_count   = 0;
-   size_t       if_count   = 0;
-   int          br_count   = 0;
-
-   pc = chunk_get_next_nc(bopen, scope_e::ALL);
-   LOG_FMT(LBRDEL, "%s(%d):  - begin with token '%s', orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-
-   while (  pc != nullptr
-         && pc->level >= level)
-   {
-      LOG_FMT(LBRDEL, "%s(%d): test token '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-
-      if (pc->flags.test(PCF_IN_PREPROC))
-      {
-         // Cannot remove braces that contain a preprocessor
-         return(false);
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         nl_count += pc->nl_count;
-
-         if (  nl_max > 0
-            && nl_count > nl_max)
-         {
-            LOG_FMT(LBRDEL, "%s(%d):  exceeded %zu newlines\n",
-                    __func__, __LINE__, nl_max);
-            return(false);
-         }
-      }
-      else
-      {
-         if (chunk_is_token(pc, CT_BRACE_OPEN))
-         {
-            br_count++;
-         }
-         else if (chunk_is_token(pc, CT_BRACE_CLOSE))
-         {
-            if (br_count == 0)
-            {
-               fprintf(stderr, "%s(%d): br_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            br_count--;
-
-            if (pc->level == level)
-            {
-               // mean a statement in a braces { stmt; }
-               // as a statement with a semicolon { stmt; };
-               ++semi_count;
-               hit_semi = true;
-            }
-         }
-         else if (  (  chunk_is_token(pc, CT_IF)
-                    || chunk_is_token(pc, CT_ELSEIF))
-                 && br_count == 0)
-         {
-            if_count++;
-         }
-
-         if (pc->level == level)
-         {
-            if (  semi_count > 0
-               && hit_semi)
-            {
-               // should have bailed due to close brace level drop
-               LOG_FMT(LBRDEL, "%s(%d):  no close brace\n", __func__, __LINE__);
-               return(false);
-            }
-            LOG_FMT(LBRDEL, "%s(%d): text() '%s', orig_line is %zu, semi_count is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, semi_count);
-
-            if (chunk_is_token(pc, CT_ELSE))
-            {
-               LOG_FMT(LBRDEL, "%s(%d):  bailed on '%s' on line %zu\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line);
-               return(false);
-            }
-
-            if (  chunk_is_semicolon(pc)
-               || chunk_is_token(pc, CT_IF)
-               || chunk_is_token(pc, CT_ELSEIF)
-               || chunk_is_token(pc, CT_FOR)
-               || chunk_is_token(pc, CT_DO)
-               || chunk_is_token(pc, CT_WHILE)
-               || chunk_is_token(pc, CT_USING_STMT)
-               || (  chunk_is_token(pc, CT_BRACE_OPEN)
-                  && chunk_is_token(prev, CT_FPAREN_CLOSE)))
-            {
-               hit_semi |= chunk_is_semicolon(pc);
-
-               if (++semi_count > 1)
-               {
-                  LOG_FMT(LBRDEL, "%s(%d):  bailed on %zu because of '%s' on line %zu\n",
-                          __func__, __LINE__, bopen->orig_line, pc->text(), pc->orig_line);
-                  return(false);
-               }
-            }
-         }
-      }
-      prev = pc;
-      pc   = chunk_get_next_nc(pc);
-   }
-
-   if (pc == nullptr)
-   {
-      LOG_FMT(LBRDEL, "%s(%d):  pc is nullptr\n", __func__, __LINE__);
-      return(false);
-   }
-
-   if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-      && get_chunk_parent_type(pc) == CT_IF)
-   {
-      chunk_t *next     = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      chunk_t *tmp_prev = chunk_get_prev_ncnnl(pc, scope_e::PREPROC);
-
-      if (  chunk_is_token(next, CT_ELSE)
-         && (  chunk_is_token(tmp_prev, CT_BRACE_CLOSE)
-            || chunk_is_token(tmp_prev, CT_VBRACE_CLOSE))
-         && get_chunk_parent_type(tmp_prev) == CT_IF)
-      {
-         LOG_FMT(LBRDEL, "%s(%d):  - bailed on '%s'[%s] on line %zu due to 'if' and 'else' sequence\n",
-                 __func__, __LINE__, get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-                 pc->orig_line);
-         return(false);
-      }
-   }
-   LOG_FMT(LBRDEL, "%s(%d):  - end on '%s' on line %zu. if_count is %zu semi_count is %zu\n",
-           __func__, __LINE__, get_token_name(pc->type), pc->orig_line, if_count, semi_count);
-
-   return(  chunk_is_token(pc, CT_BRACE_CLOSE)
-         && pc->pp_level == bopen->pp_level);
-} // can_remove_braces
-
-
-static void examine_brace(chunk_t *bopen)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LBRDEL, "%s(%d): start on orig_line %zu, bopen->level is %zu\n",
-           __func__, __LINE__, bopen->orig_line, bopen->level);
-
-   const size_t level = bopen->level + 1;
-
-   log_rule_B("mod_full_brace_nl");
-   const size_t nl_max = options::mod_full_brace_nl();
-
-   chunk_t      *prev      = nullptr;
-   size_t       semi_count = 0;
-   bool         hit_semi   = false;
-   size_t       nl_count   = 0;
-   size_t       if_count   = 0;
-   int          br_count   = 0;
-
-   chunk_t      *pc = chunk_get_next_nc(bopen);
-
-   while (  pc != nullptr
-         && pc->level >= level)
-   {
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-      }
-      else
-      {
-         LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      }
-
-      if (pc->flags.test(PCF_IN_PREPROC))
-      {
-         // Cannot remove braces that contain a preprocessor
-         LOG_FMT(LBRDEL, "%s(%d):  PREPROC\n", __func__, __LINE__);
-         return;
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         nl_count += pc->nl_count;
-
-         if (  nl_max > 0
-            && nl_count > nl_max)
-         {
-            LOG_FMT(LBRDEL, "%s(%d):  exceeded %zu newlines\n",
-                    __func__, __LINE__, nl_max);
-            return;
-         }
-      }
-      else
-      {
-         LOG_FMT(LBRDEL, "%s(%d): for pc->text() '%s', pc->level is %zu,  bopen->level is %zu\n",
-                 __func__, __LINE__, pc->text(), pc->level, bopen->level);
-
-         if (  chunk_is_token(pc, CT_BRACE_OPEN)
-            && pc->level == bopen->level)
-         {
-            br_count++;
-            LOG_FMT(LBRDEL, "%s(%d): br_count is now %d, pc->level is %zu,  bopen->level is %zu\n",
-                    __func__, __LINE__, br_count, pc->level, bopen->level);
-         }
-         else if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                 && pc->level == bopen->level)
-         {
-            if (br_count == 0)
-            {
-               fprintf(stderr, "%s(%d): br_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            br_count--;
-            LOG_FMT(LBRDEL, "%s(%d): br_count is now %d, pc->level is %zu,  bopen->level is %zu\n",
-                    __func__, __LINE__, br_count, pc->level, bopen->level);
-
-            if (br_count == 0)
-            {
-               chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-               if (  next == nullptr
-                  || chunk_is_not_token(next, CT_BRACE_CLOSE))
-               {
-                  LOG_FMT(LBRDEL, "%s(%d):  junk after close brace\n", __func__, __LINE__);
-                  return;
-               }
-            }
-         }
-         else if (  (  chunk_is_token(pc, CT_IF)
-                    || chunk_is_token(pc, CT_ELSEIF))
-                 && br_count == 0)
-         {
-            if_count++;
-         }
-         LOG_FMT(LBRDEL, "%s(%d): pc->level is %zu, level is %zu\n",
-                 __func__, __LINE__, pc->level, level);
-
-         if (pc->level == level)
-         {
-            if (  semi_count > 0
-               && hit_semi)
-            {
-               // should have bailed due to close brace level drop
-               LOG_FMT(LBRDEL, "%s(%d):  no close brace\n", __func__, __LINE__);
-               return;
-            }
-            LOG_FMT(LBRDEL, "%s(%d): text() '%s', orig_line is %zu, semi_count is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, semi_count);
-
-            if (chunk_is_token(pc, CT_ELSE))
-            {
-               LOG_FMT(LBRDEL, "%s(%d):  bailed on '%s' on line %zu\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line);
-               return;
-            }
-
-            if (prev != nullptr)
-            {
-               LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', prev->text '%s', prev->type %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), prev->text(), get_token_name(prev->type));
-            }
-            else
-            {
-               LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', prev is nullptr\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-            }
-            LOG_FMT(LBRDEL, "%s(%d): for pc->text() '%s', pc->level is %zu,  bopen->level is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->level, bopen->level);
-
-            if (  chunk_is_semicolon(pc)
-               || chunk_is_token(pc, CT_IF)
-               || chunk_is_token(pc, CT_ELSEIF)
-               || chunk_is_token(pc, CT_FOR)
-               || chunk_is_token(pc, CT_DO)
-               || chunk_is_token(pc, CT_WHILE)
-               || chunk_is_token(pc, CT_SWITCH)
-               || chunk_is_token(pc, CT_USING_STMT)
-               || (  chunk_is_token(pc, CT_BRACE_OPEN)
-                  && pc->level == bopen->level)) // Issue #1758
-            {
-               LOG_FMT(LBRDEL, "%s(%d): pc->text() '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level);
-               hit_semi |= chunk_is_semicolon(pc);
-               semi_count++;
-               LOG_FMT(LBRDEL, "%s(%d): semi_count is %zu\n",
-                       __func__, __LINE__, semi_count);
-
-               if (semi_count > 1)
-               {
-                  LOG_FMT(LBRDEL, "%s(%d):  bailed on %zu because of '%s' on line %zu\n",
-                          __func__, __LINE__, bopen->orig_line, pc->text(), pc->orig_line);
-                  return;
-               }
-            }
-         }
-      }
-      prev = pc;
-      pc   = chunk_get_next(pc);                  // Issue #1907
-   }
-
-   if (pc == nullptr)
-   {
-      LOG_FMT(LBRDEL, "%s(%d): pc is nullptr\n", __func__, __LINE__);
-      return;
-   }
-   LOG_FMT(LBRDEL, "%s(%d):  - end on '%s' on line %zu. if_count is %zu, semi_count is %zu\n",
-           __func__, __LINE__, get_token_name(pc->type), pc->orig_line, if_count, semi_count);
-
-   if (chunk_is_token(pc, CT_BRACE_CLOSE))
-   {
-      chunk_t *next = chunk_get_next_ncnnl(pc);
-
-      if (next != nullptr)
-      {
-         while (chunk_is_token(next, CT_VBRACE_CLOSE))
-         {
-            next = chunk_get_next_ncnnl(next);
-         }
-
-         if (next != nullptr)
-         {
-            LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, next is '%s'\n",
-                    __func__, __LINE__, next->orig_line, next->orig_col, get_token_name(next->type));
-         }
-
-         if (  if_count > 0
-            && (  chunk_is_token(next, CT_ELSE)
-               || chunk_is_token(next, CT_ELSEIF)))
-         {
-            LOG_FMT(LBRDEL, "%s(%d):  bailed on because 'else' is next and %zu ifs\n",
-                    __func__, __LINE__, if_count);
-            return;
-         }
-      }
-      LOG_FMT(LBRDEL, "%s(%d): semi_count is %zu\n",
-              __func__, __LINE__, semi_count);
-
-      if (semi_count > 0)
-      {
-         LOG_FMT(LBRDEL, "%s(%d): bopen->parent_type is %s\n",
-                 __func__, __LINE__, get_token_name(get_chunk_parent_type(bopen)));
-
-         if (get_chunk_parent_type(bopen) == CT_ELSE)
-         {
-            chunk_t *tmp_next = chunk_get_next_ncnnl(bopen);
-
-            if (chunk_is_token(tmp_next, CT_IF))
-            {
-               chunk_t *tmp_prev = chunk_get_prev_ncnnl(bopen);
-               LOG_FMT(LBRDEL, "%s(%d):  else-if removing braces on line %zu and %zu\n",
-                       __func__, __LINE__, bopen->orig_line, pc->orig_line);
-
-               chunk_del(bopen);
-               chunk_del(pc);
-               newline_del_between(tmp_prev, tmp_next);
-
-               log_rule_B("nl_else_if");
-
-               if (options::nl_else_if() & IARF_ADD)
-               {
-                  newline_add_between(tmp_prev, tmp_next);
-               }
-               return;
-            }
-         }
-         // we have a pair of braces with only 1 statement inside
-         LOG_FMT(LBRDEL, "%s(%d): we have a pair of braces with only 1 statement inside\n",
-                 __func__, __LINE__);
-         LOG_FMT(LBRDEL, "%s(%d): removing braces on line %zu and %zu\n",
-                 __func__, __LINE__, bopen->orig_line, pc->orig_line);
-         convert_brace(bopen);
-         convert_brace(pc);
-      }
-      else
-      {
-         LOG_FMT(LBRDEL, "%s(%d):  empty statement\n", __func__, __LINE__);
-      }
-   }
-   else
-   {
-      LOG_FMT(LBRDEL, "%s(%d):  not a close brace? - '%s'\n",
-              __func__, __LINE__, pc->text());
-   }
-} // examine_brace
-
-
-static void convert_brace(chunk_t *br)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  br == nullptr
-      || br->flags.test(PCF_KEEP_BRACE))
-   {
-      return;
-   }
-   chunk_t *tmp;
-
-   if (chunk_is_token(br, CT_BRACE_OPEN))
-   {
-      set_chunk_type(br, CT_VBRACE_OPEN);
-      br->str.clear();
-      tmp = chunk_get_prev(br);
-
-      if (tmp == nullptr)
-      {
-         return;
-      }
-   }
-   else if (chunk_is_token(br, CT_BRACE_CLOSE))
-   {
-      set_chunk_type(br, CT_VBRACE_CLOSE);
-      br->str.clear();
-      tmp = chunk_get_next(br);
-
-      if (tmp == nullptr)
-      {
-         return;
-      }
-   }
-   else
-   {
-      return;
-   }
-
-   if (chunk_is_newline(tmp))
-   {
-      if (tmp->nl_count > 1)
-      {
-         if (!br->flags.test(PCF_ONE_LINER)) // Issue #2232
-         {
-            if (tmp->nl_count == 0)
-            {
-               fprintf(stderr, "%s(%d): tmp->nl_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            tmp->nl_count--;
-            LOG_FMT(LBRDEL, "%s(%d): tmp->nl_count is %zu\n",
-                    __func__, __LINE__, tmp->nl_count);
-         }
-      }
-      else
-      {
-         // Issue #2219
-         // look for opening brace
-         chunk_t *brace = nullptr;
-
-         if (chunk_is_token(br, CT_VBRACE_OPEN))
-         {
-            brace = tmp;
-         }
-         else if (chunk_is_token(br, CT_VBRACE_CLOSE))
-         {
-            brace = chunk_skip_to_match_rev(br);
-
-            if (brace == nullptr)
-            {
-               brace = chunk_get_prev_type(br, CT_BRACE_OPEN, br->level);
-            }
-         }
-
-         if (  chunk_is_token(br, CT_VBRACE_OPEN)
-            || (  chunk_is_token(br, CT_VBRACE_CLOSE)
-               && brace->orig_line < tmp->orig_line))
-         {
-            if (chunk_safe_to_del_nl(tmp))
-            {
-               chunk_del(tmp);
-            }
-         }
-      }
-   }
-} // convert_brace
-
-
-static void convert_vbrace(chunk_t *vbr)
-{
-   LOG_FUNC_ENTRY();
-
-   if (vbr == nullptr)
-   {
-      return;
-   }
-
-   if (chunk_is_token(vbr, CT_VBRACE_OPEN))
-   {
-      set_chunk_type(vbr, CT_BRACE_OPEN);
-      vbr->str = "{";
-
-      /*
-       * If the next chunk is a preprocessor, then move the open brace after the
-       * preprocessor.
-       */
-      chunk_t *tmp = chunk_get_next(vbr);
-
-      if (chunk_is_token(tmp, CT_PREPROC))
-      {
-         tmp = chunk_get_next(vbr, scope_e::PREPROC);
-         chunk_move_after(vbr, tmp);
-         newline_add_after(vbr);
-      }
-   }
-   else if (chunk_is_token(vbr, CT_VBRACE_CLOSE))
-   {
-      set_chunk_type(vbr, CT_BRACE_CLOSE);
-      vbr->str = "}";
-
-      /*
-       * If the next chunk is a comment, followed by a newline, then
-       * move the brace after the newline and add another newline after
-       * the close brace.
-       */
-      chunk_t *tmp = chunk_get_next(vbr);
-
-      if (chunk_is_comment(tmp))
-      {
-         tmp = chunk_get_next(tmp);
-
-         if (chunk_is_newline(tmp))
-         {
-            chunk_move_after(vbr, tmp);
-            newline_add_after(vbr);
-         }
-      }
-   }
-} // convert_vbrace
-
-
-static void convert_vbrace_to_brace(void)
-{
-   LOG_FUNC_ENTRY();
-
-   // Find every vbrace open
-   log_rule_B("mod_full_brace_if");
-   log_rule_B("mod_full_brace_if_chain");
-   log_rule_B("mod_full_brace_for");
-   log_rule_B("mod_full_brace_do");
-   log_rule_B("mod_full_brace_while");
-   log_rule_B("mod_full_brace_using");
-   log_rule_B("mod_full_brace_function");
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (chunk_is_not_token(pc, CT_VBRACE_OPEN))
-      {
-         continue;
-      }
-      auto const in_preproc = pc->flags.test(PCF_IN_PREPROC);
-
-      if (  (  (  get_chunk_parent_type(pc) == CT_IF
-               || get_chunk_parent_type(pc) == CT_ELSE
-               || get_chunk_parent_type(pc) == CT_ELSEIF)
-            && (options::mod_full_brace_if() & IARF_ADD)
-            && !options::mod_full_brace_if_chain())
-         || (  get_chunk_parent_type(pc) == CT_FOR
-            && (options::mod_full_brace_for() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_DO
-            && (options::mod_full_brace_do() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_WHILE
-            && (options::mod_full_brace_while() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_USING_STMT
-            && (options::mod_full_brace_using() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-            && (options::mod_full_brace_function() & IARF_ADD)))
-      {
-         // Find the matching vbrace close
-         chunk_t *vbc = nullptr;
-         chunk_t *tmp = pc;
-
-         while ((tmp = chunk_get_next(tmp)) != nullptr)
-         {
-            if (  in_preproc
-               && !tmp->flags.test(PCF_IN_PREPROC))
-            {
-               // Can't leave a preprocessor
-               break;
-            }
-
-            if (  pc->brace_level == tmp->brace_level
-               && chunk_is_token(tmp, CT_VBRACE_CLOSE)
-               && get_chunk_parent_type(pc) == get_chunk_parent_type(tmp)
-               && ((tmp->flags & PCF_IN_PREPROC) == (pc->flags & PCF_IN_PREPROC)))
-            {
-               vbc = tmp;
-               break;
-            }
-         }
-
-         if (vbc == nullptr)
-         {
-            continue;
-         }
-         // if we found a corresponding virtual closing brace
-         convert_vbrace(pc);   // convert both the opening
-         convert_vbrace(vbc);  // and closing brace
-      }
-   }
-} // convert_vbrace_to_brace
-
-
-chunk_t *insert_comment_after(chunk_t *ref, c_token_t cmt_type,
-                              const unc_text &cmt_text)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t new_cmt = *ref;
-
-   new_cmt.prev  = nullptr;
-   new_cmt.next  = nullptr;
-   new_cmt.flags = (ref->flags & PCF_COPY_FLAGS);
-   set_chunk_type(&new_cmt, cmt_type);
-   new_cmt.str.clear();
-
-   if (cmt_type == CT_COMMENT_CPP)
-   {
-      new_cmt.str.append("// ");
-      new_cmt.str.append(cmt_text);
-   }
-   else
-   {
-      if (chunk_is_token(ref, CT_PP_ELSE))
-      {  // make test c/ 02501 stable
-         new_cmt.str.append(" ");
-      }
-      new_cmt.str.append("/* ");
-      new_cmt.str.append(cmt_text);
-      new_cmt.str.append(" */");
-   }
-   // TODO: expand comment type to cover other comment styles?
-
-   new_cmt.column   = ref->column + ref->len() + 1;
-   new_cmt.orig_col = new_cmt.column;
-
-   return(chunk_add_after(&new_cmt, ref));
-}
-
-
-static void append_tag_name(unc_text &txt, chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *tmp = pc;
-
-   LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
-           __func__, __LINE__, txt.c_str());
-
-   // step backwards over all a::b stuff
-   while ((tmp = chunk_get_prev_ncnnl(tmp)) != nullptr)
-   {
-      if (  chunk_is_not_token(tmp, CT_DC_MEMBER)
-         && chunk_is_not_token(tmp, CT_MEMBER))
-      {
-         break;
-      }
-      tmp = chunk_get_prev_ncnnl(tmp);
-      pc  = tmp;
-
-      if (!chunk_is_word(tmp))
-      {
-         break;
-      }
-   }
-   txt += pc->str;
-   LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
-           __func__, __LINE__, txt.c_str());
-
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-   {
-      if (  chunk_is_not_token(pc, CT_DC_MEMBER)
-         && chunk_is_not_token(pc, CT_MEMBER))
-      {
-         break;
-      }
-      txt += pc->str;
-      LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
-              __func__, __LINE__, txt.c_str());
-      pc = chunk_get_next_ncnnl(pc);
-
-      if (pc != nullptr)
-      {
-         txt += pc->str;
-         LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
-                 __func__, __LINE__, txt.c_str());
-      }
-   }
-} // append_tag_name
-
-
-void add_long_closebrace_comment(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *fcn_pc = nullptr;
-   chunk_t *sw_pc  = nullptr;
-   chunk_t *ns_pc  = nullptr;
-   chunk_t *cl_pc  = nullptr;
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (  chunk_is_token(pc, CT_FUNC_DEF)
-         || chunk_is_token(pc, CT_OC_MSG_DECL))
-      {
-         fcn_pc = pc;
-      }
-      else if (chunk_is_token(pc, CT_SWITCH))
-      {
-         // pointless, since it always has the text "switch"
-         sw_pc = pc;
-      }
-      else if (chunk_is_token(pc, CT_NAMESPACE))
-      {
-         ns_pc = pc;
-      }
-      else if (chunk_is_token(pc, CT_CLASS))
-      {
-         cl_pc = pc;
-      }
-
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         || pc->flags.test(PCF_IN_PREPROC))
-      {
-         continue;
-      }
-      chunk_t *br_open = pc;
-      size_t  nl_count = 0;
-
-      chunk_t *tmp = pc;
-
-      while ((tmp = chunk_get_next(tmp, scope_e::PREPROC)) != nullptr)
-      {
-         if (chunk_is_newline(tmp))
-         {
-            nl_count += tmp->nl_count;
-            continue;
-         }
-
-         // handle only matching closing braces, skip other chunks
-         if (  tmp->level != br_open->level
-            || chunk_is_not_token(tmp, CT_BRACE_CLOSE))
-         {
-            continue;
-         }
-         chunk_t *br_close = tmp;
-
-         tmp = chunk_get_next(tmp);
-
-         // check for a possible end semicolon
-         if (chunk_is_token(tmp, CT_SEMICOLON))
-         {
-            // set br_close to the semi token,
-            // as br_close is used to add the coment after it
-            br_close = tmp;
-            tmp      = chunk_get_next(tmp);
-         }
-
-         // make sure a newline follows in order to not overwrite an already
-         // existring comment
-         if (  tmp != nullptr
-            && !chunk_is_newline(tmp))
-         {
-            break;
-         }
-         size_t   nl_min  = 0;
-         chunk_t  *tag_pc = nullptr;
-         unc_text xstr;
-
-         if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
-            || get_chunk_parent_type(br_open) == CT_OC_MSG_DECL)
-         {
-            log_rule_B("mod_add_long_function_closebrace_comment");
-            nl_min = options::mod_add_long_function_closebrace_comment();
-            tag_pc = fcn_pc;
-
-            if (tag_pc != nullptr)
-            {
-               append_tag_name(xstr, tag_pc);
-               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                       __func__, __LINE__, xstr.c_str());
-            }
-         }
-         else if (  get_chunk_parent_type(br_open) == CT_SWITCH
-                 && sw_pc != nullptr)
-         {
-            log_rule_B("mod_add_long_switch_closebrace_comment");
-            nl_min = options::mod_add_long_switch_closebrace_comment();
-            tag_pc = sw_pc;
-            xstr   = sw_pc->str;
-            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                    __func__, __LINE__, xstr.c_str());
-         }
-         else if (  get_chunk_parent_type(br_open) == CT_NAMESPACE
-                 && ns_pc != nullptr)
-         {
-            log_rule_B("mod_add_long_namespace_closebrace_comment");
-            nl_min = options::mod_add_long_namespace_closebrace_comment();
-            tag_pc = ns_pc;
-            xstr   = tag_pc->str;    // add 'namespace' to the string
-            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                    __func__, __LINE__, xstr.c_str());
-
-            // next chunk, normally is going to be the namespace name
-            // append it with a space to generate "namespace xyz"
-            chunk_t *tmp_next = chunk_get_next_ncnnl(tag_pc);
-
-            if (chunk_is_not_token(tmp_next, CT_BRACE_OPEN)) // anonymous namespace -> ignore
-            {
-               xstr.append(" ");
-               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                       __func__, __LINE__, xstr.c_str());
-               append_tag_name(xstr, tmp_next);
-               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                       __func__, __LINE__, xstr.c_str());
-            }
-         }
-         else if (  get_chunk_parent_type(br_open) == CT_CLASS
-                 && cl_pc != nullptr
-                 && (  !language_is_set(LANG_CPP)               // proceed if not C++
-                    || chunk_is_token(br_close, CT_SEMICOLON))) // else a C++ class needs to end with a semicolon
-         {
-            log_rule_B("mod_add_long_class_closebrace_comment");
-            nl_min = options::mod_add_long_class_closebrace_comment();
-            tag_pc = cl_pc;
-            xstr   = tag_pc->str;
-            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                    __func__, __LINE__, xstr.c_str());
-
-            chunk_t *tmp_next = chunk_get_next(cl_pc);
-
-            if (tag_pc != nullptr)
-            {
-               xstr.append(" ");
-               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                       __func__, __LINE__, xstr.c_str());
-               append_tag_name(xstr, tmp_next);
-               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                       __func__, __LINE__, xstr.c_str());
-            }
-         }
-
-         if (  nl_min > 0
-            && nl_count >= nl_min
-            && tag_pc != nullptr)
-         {
-            // use the comment style that fits to the selected language
-            const c_token_t style = language_is_set(LANG_CPP | LANG_CS)
-                                    ? CT_COMMENT_CPP : CT_COMMENT;
-
-            // Add a comment after the close brace
-            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
-                    __func__, __LINE__, xstr.c_str());
-            insert_comment_after(br_close, style, xstr);
-         }
-         break;
-      }
-   }
-} // add_long_closebrace_comment
-
-
-static void move_case_break(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *prev = nullptr;
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (  chunk_is_token(pc, CT_BREAK)
-         && chunk_is_token(prev, CT_BRACE_CLOSE)
-         && get_chunk_parent_type(prev) == CT_CASE
-         && chunk_is_newline(chunk_get_prev(pc))
-         && chunk_is_newline(chunk_get_prev(prev)))
-      {
-         chunk_swap_lines(prev, pc);
-      }
-      prev = pc;
-   }
-}
-
-
-static chunk_t *mod_case_brace_remove(chunk_t *br_open)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LMCB, "%s(%d): line %zu",
-           __func__, __LINE__, br_open->orig_line);
-
-   // Find the matching brace close
-   chunk_t *next     = chunk_get_next_ncnnl(br_open, scope_e::PREPROC);
-   chunk_t *br_close = chunk_get_next_type(br_open, CT_BRACE_CLOSE, br_open->level, scope_e::PREPROC);
-
-   if (br_close == nullptr)
-   {
-      LOG_FMT(LMCB, "%s(%d):  - no close\n", __func__, __LINE__);
-      return(next);
-   }
-   // Make sure 'break', 'return', 'goto', 'case' or '}' is after the close brace
-   chunk_t *pc = chunk_get_next_ncnnl(br_close, scope_e::PREPROC);
-
-   if (  pc == nullptr
-      || (  chunk_is_not_token(pc, CT_BREAK)
-         && chunk_is_not_token(pc, CT_RETURN)
-         && chunk_is_not_token(pc, CT_CASE)
-         && chunk_is_not_token(pc, CT_GOTO)
-         && chunk_is_not_token(pc, CT_BRACE_CLOSE)))
-   {
-      LOG_FMT(LMCB, "%s(%d):  - after '%s'\n",
-              __func__, __LINE__, (pc == nullptr) ? "<null>" : get_token_name(pc->type));
-      return(next);
-   }
-
-   // scan to make sure there are no definitions at brace level between braces
-   for (chunk_t *tmp_pc = br_open;
-        tmp_pc != br_close;
-        tmp_pc = chunk_get_next_ncnnl(tmp_pc, scope_e::PREPROC))
-   {
-      if (  tmp_pc->level == (br_open->level + 1)
-         && tmp_pc->flags.test(PCF_VAR_DEF))
-      {
-         LOG_FMT(LMCB, "%s(%d):  - vardef on line %zu: '%s'\n",
-                 __func__, __LINE__, tmp_pc->orig_line, pc->text());
-         return(next);
-      }
-   }
-
-   LOG_FMT(LMCB, "%s(%d):  - removing braces on lines %zu and %zu\n",
-           __func__, __LINE__, br_open->orig_line, br_close->orig_line);
-
-   for (chunk_t *tmp_pc = br_open;
-        tmp_pc != br_close;
-        tmp_pc = chunk_get_next_ncnnl(tmp_pc, scope_e::PREPROC))
-   {
-      if (tmp_pc->brace_level == 0)
-      {
-         fprintf(stderr, "%s(%d): tmp_pc->brace_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                 __func__, __LINE__, tmp_pc->orig_line, tmp_pc->orig_col);
-         log_flush(true);
-         exit(EX_SOFTWARE);
-      }
-      tmp_pc->brace_level--;
-
-      if (tmp_pc->level == 0)
-      {
-         fprintf(stderr, "%s(%d): tmp_pc->level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                 __func__, __LINE__, tmp_pc->orig_line, tmp_pc->orig_col);
-         log_flush(true);
-         exit(EX_SOFTWARE);
-      }
-      tmp_pc->level--;
-   }
-
-   next = chunk_get_prev(br_open, scope_e::PREPROC);
-
-   chunk_del(br_open);
-   chunk_del(br_close);
-
-   return(chunk_get_next(next, scope_e::PREPROC));
-} // mod_case_brace_remove
-
-
-static chunk_t *mod_case_brace_add(chunk_t *cl_colon)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LMCB, "%s(%d): orig_line %zu, orig_col is %zu\n",
-           __func__, __LINE__, cl_colon->orig_line, cl_colon->orig_col);
-
-   chunk_t *pc   = cl_colon;
-   chunk_t *last = nullptr;
-   // look for the case token to the colon
-   chunk_t *cas_ = chunk_get_prev_type(cl_colon, CT_CASE, cl_colon->level);
-   // look for the parent
-   chunk_t *swit = cas_->parent;
-   // look for the opening brace of the switch
-   chunk_t *open = chunk_get_next_type(swit, CT_BRACE_OPEN, swit->level);
-   // look for the closing brace of the switch
-   chunk_t *clos = chunk_skip_to_match(open);
-
-   // find the end of the case-block
-   while ((pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC)) != nullptr)
-   {
-      LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu, pp_level is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->pp_level);
-
-      if (pc->level == cl_colon->level)
-      {
-         if (chunk_is_token(pc, CT_CASE))
-         {
-            LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-            last = calculate_closing_brace_position(cl_colon, pc);
-            break;
-         }
-      }
-      else if (pc->level == cl_colon->level - 1)
-      {
-         if (pc == clos)
-         {
-            LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-            // end of switch is reached
-            last = calculate_closing_brace_position(cl_colon, pc);
-            LOG_FMT(LMCB, "%s(%d): last->text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
-            break;
-         }
-      }
-   }
-
-   if (last == nullptr)
-   {
-      LOG_FMT(LMCB, "%s(%d):  - last is nullptr\n", __func__, __LINE__);
-      chunk_t *next = chunk_get_next_ncnnl(cl_colon, scope_e::PREPROC);
-      return(next);
-   }
-   LOG_FMT(LMCB, "%s(%d): last->text() is '%s', orig_line %zu, orig_col is %zu\n",
-           __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
-   LOG_FMT(LMCB, "%s(%d): adding braces after '%s' on line %zu\n",
-           __func__, __LINE__, cl_colon->text(), cl_colon->orig_line);
-
-   chunk_t chunk;
-
-   set_chunk_type(&chunk, CT_BRACE_OPEN);
-   set_chunk_parent(&chunk, CT_CASE);
-   chunk.orig_line   = cl_colon->orig_line;
-   chunk.orig_col    = cl_colon->orig_col;
-   chunk.level       = cl_colon->level;
-   chunk.pp_level    = cl_colon->pp_level;
-   chunk.brace_level = cl_colon->brace_level;
-   chunk.flags       = pc->flags & PCF_COPY_FLAGS;
-   chunk.str         = "{";
-   chunk_t *br_open = chunk_add_after(&chunk, cl_colon);
-
-   set_chunk_type(&chunk, CT_BRACE_CLOSE);
-   chunk.orig_line = last->orig_line;
-   chunk.orig_col  = last->orig_col;
-   chunk.str       = "}";
-   chunk_t *br_close = chunk_add_after(&chunk, last);
-
-   for (pc = chunk_get_next(br_open, scope_e::PREPROC);
-        pc != br_close;
-        pc = chunk_get_next(pc, scope_e::PREPROC))
-   {
-      pc->level++;
-      pc->brace_level++;
-   }
-
-   return(br_open);
-} // mod_case_brace_add
-
-
-static void mod_case_brace(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-      if (next == nullptr)
-      {
-         return;
-      }
-      log_rule_B("mod_case_brace");
-
-      if (  options::mod_case_brace() == IARF_REMOVE
-         && chunk_is_token(pc, CT_BRACE_OPEN)
-         && get_chunk_parent_type(pc) == CT_CASE)
-      {
-         pc = mod_case_brace_remove(pc);
-      }
-      else if (  (options::mod_case_brace() & IARF_ADD)
-              && chunk_is_token(pc, CT_CASE_COLON)
-              && chunk_is_not_token(next, CT_BRACE_OPEN)
-              && chunk_is_not_token(next, CT_BRACE_CLOSE)
-              && chunk_is_not_token(next, CT_CASE))
-      {
-         log_rule_B("mod_case_brace");
-         pc = mod_case_brace_add(pc);
-      }
-      else
-      {
-         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      }
-   }
-}
-
-
-static void process_if_chain(chunk_t *br_start)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LBRCH, "%s(%d): if starts on line %zu, orig_col is %zu.\n",
-           __func__, __LINE__, br_start->orig_line, br_start->orig_col);
-
-   vector<chunk_t *> braces;
-
-   braces.reserve(16);
-
-   bool    must_have_braces = false;
-
-   chunk_t *pc = br_start;
-
-   while (pc != nullptr)
-   {
-      LOG_FMT(LBRCH, "%s(%d): pc->text() is '%s', orig_line is %zu, orig_col is %zu.\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
-      {
-         const bool tmp = can_remove_braces(pc);
-         LOG_FMT(LBRCH, "%s(%d): braces.size() is %zu, line is %zu, - can%s remove %s\n",
-                 __func__, __LINE__, braces.size(), pc->orig_line, tmp ? "" : "not",
-                 get_token_name(pc->type));
-
-         if (!tmp)
-         {
-            must_have_braces = true;
-         }
-      }
-      else
-      {
-         const bool tmp = should_add_braces(pc);
-
-         if (tmp)
-         {
-            must_have_braces = true;
-         }
-         LOG_FMT(LBRCH, "%s(%d): braces.size() is %zu, line is %zu, - %s %s\n",
-                 __func__, __LINE__, braces.size(), pc->orig_line, tmp ? "should add" : "ignore",
-                 get_token_name(pc->type));
-      }
-      braces.push_back(pc);
-      chunk_t *br_close = chunk_skip_to_match(pc, scope_e::PREPROC);
-
-      if (br_close == nullptr)
-      {
-         break;
-      }
-      braces.push_back(br_close);
-
-      pc = chunk_get_next_ncnnl(br_close, scope_e::PREPROC);
-
-      if (  pc == nullptr
-         || chunk_is_not_token(pc, CT_ELSE))
-      {
-         break;
-      }
-      log_rule_B("mod_full_brace_if_chain_only");
-
-      if (options::mod_full_brace_if_chain_only())
-      {
-         // There is an 'else' - we want full braces.
-         must_have_braces = true;
-      }
-      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-      if (chunk_is_token(pc, CT_ELSEIF))
-      {
-         while (  chunk_is_not_token(pc, CT_VBRACE_OPEN)
-               && chunk_is_not_token(pc, CT_BRACE_OPEN))
-         {
-            pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-         }
-      }
-
-      if (pc == nullptr)
-      {
-         break;
-      }
-
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && chunk_is_not_token(pc, CT_VBRACE_OPEN))
-      {
-         break;
-      }
-   }
-
-   if (must_have_braces)
-   {
-      LOG_FMT(LBRCH, "%s(%d): add braces on lines[%zu]:",
-              __func__, __LINE__, braces.size());
-
-      const auto ite = braces.rend();
-
-      for (auto itc = braces.rbegin(); itc != ite; ++itc)
-      {
-         const auto brace = *itc;
-
-         chunk_flags_set(brace, PCF_KEEP_BRACE);
-
-         if (  chunk_is_token(brace, CT_VBRACE_OPEN)
-            || chunk_is_token(brace, CT_VBRACE_CLOSE))
-         {
-            LOG_FMT(LBRCH, "%s(%d):  %zu",
-                    __func__, __LINE__, brace->orig_line);
-            convert_vbrace(brace);
-         }
-         else
-         {
-            LOG_FMT(LBRCH, "%s(%d):  {%zu}",
-                    __func__, __LINE__, brace->orig_line);
-         }
-      }
-
-      LOG_FMT(LBRCH, "\n");
-   }
-   else if (options::mod_full_brace_if_chain())
-   {
-      log_rule_B("mod_full_brace_if_chain");
-      LOG_FMT(LBRCH, "%s(%d): remove braces on lines[%zu]:\n",
-              __func__, __LINE__, braces.size());
-
-      /*
-       * This might run because either
-       * mod_full_brace_if_chain or mod_full_brace_if_chain_only
-       * is used.
-       * We only want to remove braces if the first one is active.
-       */
-      log_rule_B("mod_full_brace_nl_block_rem_mlcond");
-      const auto multiline_block = options::mod_full_brace_nl_block_rem_mlcond();
-
-      LOG_FMT(LBRCH, "%s(%d): remove braces on lines:\n", __func__, __LINE__);
-
-      // Issue #2229
-      const auto ite = braces.end();
-
-      for (auto itc = braces.begin(); itc != ite; ++itc)
-      {
-         const auto brace = *itc;
-
-         if (  (  chunk_is_token(brace, CT_BRACE_OPEN)
-               || chunk_is_token(brace, CT_BRACE_CLOSE))
-            && (get_chunk_parent_type(brace) != CT_BRACED_INIT_LIST)
-            && (multiline_block ? !paren_multiline_before_brace(brace) : true))
-         {
-            LOG_FMT(LBRCH, "%s(%d): brace->orig_line is %zu, brace->orig_col is %zu\n",
-                    __func__, __LINE__, brace->orig_line, brace->orig_col);
-            convert_brace(brace);
-         }
-         else
-         {
-            LOG_FMT(LBRCH, "%s(%d): brace->orig_line is %zu, brace->orig_col is %zu\n",
-                    __func__, __LINE__, brace->orig_line, brace->orig_col);
-         }
-      }
-   }
-} // process_if_chain
-
-
-static void mod_full_brace_if_chain(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (  (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_token(pc, CT_VBRACE_OPEN))
-         && get_chunk_parent_type(pc) == CT_IF)
-      {
-         process_if_chain(pc);
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.h
deleted file mode 100644
index d48f4014..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file braces.h
- * prototypes for braces.cpp
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef BRACES_H_INCLUDED
-#define BRACES_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-//! Change virtual braces into real braces
-void do_braces(void);
-
-/**
- * See the preprocessor counterpart:
- *   add_long_preprocessor_conditional_block_comment
- * in output.cpp
- */
-void add_long_closebrace_comment(void);
-
-
-/**
- * Adds a comment after the ref chunk
- * Returns the added chunk or nullptr
- */
-chunk_t *insert_comment_after(chunk_t *ref, c_token_t cmt_type, const unc_text &cmt_text);
-
-
-#endif /* BRACES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.cpp
deleted file mode 100644
index a52ab017..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * @file calculate_closing_brace_position.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "calculate_closing_brace_position.h"
-
-#include "chunk_list.h"
-
-using namespace uncrustify;
-
-
-chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
-{
-   LOG_FMT(LMCB, "%s(%d): cl_colon->text() is '%s', orig_line %zu, orig_col is %zu, level is %zu\n",
-           __func__, __LINE__, cl_colon->text(), cl_colon->orig_line, cl_colon->orig_col, cl_colon->level);
-   LOG_FMT(LMCB, "%s(%d): pc->text()       is '%s', orig_line %zu, orig_col is %zu, level is %zu\n",
-           __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level);
-   // end of block is reached
-   // look back over newline, preprocessor BUT NOT #endif
-
-   // Issue #3058
-
-   // examine going back the tokens: look for a "brace closing" or a "semi colon" until the colon
-   // look back over comment, newline, preprocessor BUT NOT #endif
-
-   size_t check_level = 0;
-
-   if (chunk_is_token(pc, CT_BRACE_CLOSE))
-   {
-      check_level = pc->level + 1;
-   }
-   else
-   {
-      check_level = pc->level;
-   }
-   size_t  erst_found      = 0;
-   chunk_t *is_brace_close = nullptr;
-   chunk_t *is_semicolon   = nullptr;
-   chunk_t *is_comment     = nullptr;
-   chunk_t *back           = chunk_get_prev_nnl(pc);
-
-   while (back != nullptr)
-   {
-      if (back == cl_colon)
-      {
-         break;
-      }
-
-      if (erst_found != 0)
-      {
-         break;
-      }
-
-      if (back->level == check_level)
-      {
-         if (  chunk_is_token(back, CT_BRACE_CLOSE)
-            || chunk_is_token(back, CT_VBRACE_CLOSE))
-         {
-            // brace_close found
-            is_brace_close = back;
-            LOG_FMT(LMCB, "%s(%d): BRACE_CLOSE: line is %zu, col is %zu, level is %zu\n",
-                    __func__, __LINE__, is_brace_close->orig_line, is_brace_close->orig_col, is_brace_close->level);
-            erst_found = 3;
-         }
-
-         if (chunk_is_token(back, CT_SEMICOLON))
-         {
-            // semicolon found
-            is_semicolon = back;
-            LOG_FMT(LMCB, "%s(%d): SEMICOLON:   line is %zu, col is %zu, level is %zu\n",
-                    __func__, __LINE__, is_semicolon->orig_line, is_semicolon->orig_col, is_semicolon->level);
-            erst_found = 4;
-         }
-
-         if (chunk_is_comment(back))
-         {
-            // comment found
-            is_comment = back;
-            LOG_FMT(LMCB, "%s(%d): COMMENT:     line is %zu, col is %zu, level is %zu\n",
-                    __func__, __LINE__, back->orig_line, back->orig_col, back->level);
-         }
-      }
-      back = chunk_get_prev(back);
-   }
-   LOG_FMT(LMCB, "%s(%d): erst_found is %zu\n",
-           __func__, __LINE__, erst_found);
-   chunk_t *last = nullptr;
-
-   if (  erst_found == 3
-      || erst_found == 4)
-   {
-      if (is_comment != nullptr)
-      {
-         chunk_t *second = nullptr;
-
-         if (erst_found == 3)
-         {
-            second = is_brace_close;
-         }
-         else
-         {
-            // erst_found == 4
-            second = is_semicolon;
-         }
-
-         if (second != nullptr)
-         {
-            if (is_comment->orig_line == second->orig_line)
-            {
-               last = is_comment;
-
-               if (cl_colon->orig_line == is_comment->orig_line)
-               {
-                  last = chunk_get_next(is_comment);
-               }
-            }
-            else
-            {
-               last = chunk_get_prev_ncnnl(pc);
-            }
-         }
-         else
-         {
-            LOG_FMT(LMCB, "\n\n%s(%d):\n", __func__, __LINE__);
-            fprintf(stderr, "FATAL: second is nullptr\n");
-            fprintf(stderr, "Please make a report.\n");
-            exit(EX_SOFTWARE);
-         }
-      }
-      else
-      {
-         last = chunk_get_prev_ncnnl(pc);
-      }
-   }
-   else
-   {
-      LOG_FMT(LMCB, "\n\n%s(%d):\n", __func__, __LINE__);
-      fprintf(stderr, "FATAL: erst_found is not 3 or 4\n");
-      fprintf(stderr, "Please make a report.\n");
-      exit(EX_SOFTWARE);
-   }
-
-   if (chunk_is_token(last, CT_COMMENT_CPP))         // Issue #3058
-   {
-      last = chunk_get_next(last);
-   }
-   LOG_FMT(LMCB, "%s(%d): last->text()     is '%s', orig_line %zu, orig_col is %zu\n",
-           __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
-
-   if (chunk_is_preproc(last))
-   {
-      // we have a preprocessor token
-      while (last != nullptr)
-      {
-         LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
-
-         if (chunk_is_token(last, CT_PP_ENDIF))
-         {
-            // look for the parent
-            chunk_t *parent_last = last->parent;
-            // compare the positions
-            int     comp = chunk_compare_position(parent_last, cl_colon);
-            LOG_FMT(LMCB, "%s(%d): comp is %d\n",
-                    __func__, __LINE__, comp);
-
-            if (comp == -1)
-            {
-               // cl_colon is after parent_last ==>
-               // the closing brace will be set before #endif
-               chunk_t *pp_start = chunk_get_pp_start(last);
-               last = chunk_get_prev_nnl(pp_start);
-               LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
-            }
-            else if (comp == 1)
-            {
-               // cl_colon is before parent_last ==>
-               // the closing brace will be set after #endif
-               LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
-            }
-            break;
-         }
-         last = chunk_get_prev_ncnnl(last);
-         LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
-
-         if (!chunk_is_preproc(last))
-         {
-            break;
-         }
-      }
-   }
-   return(last);
-} // calculate_closing_brace_position
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.h
deleted file mode 100644
index c82f4ace..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file calculate_closing_brace_position.h
- * prototype for calculate_closing_brace_position.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#ifndef CALCULATE_CLOSING_BRACE_POSITION_H_INCLUDED
-#define CALCULATE_CLOSING_BRACE_POSITION_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc);
-
-
-#endif /* CALCULATE_CLOSING_BRACE_POSITION_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/char_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/char_table.h
deleted file mode 100644
index 3fa23a54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/char_table.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * @file char_table.h
- * A simple table to help tokenize stuff.
- * Used to parse strings (paired char) and words.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef CHAR_TABLE_H_INCLUDED
-#define CHAR_TABLE_H_INCLUDED
-
-/**
- * bit0-7 = paired char
- * bit8 = OK for keyword 1st char
- * bit9 = OK for keyword 2+ char
- */
-struct CharTable
-{
-   static size_t chars[128];
-
-   enum
-   {
-      KW1 = 0x0100,
-      KW2 = 0x0200,
-   };
-
-
-   static inline size_t Get(size_t ch)
-   {
-      if (ch < ARRAY_SIZE(chars))
-      {
-         return(chars[ch]);
-      }
-      /*
-       * HACK: If the top bit is set, then we are likely dealing with UTF-8,
-       * and since that is only allowed in identifiers, then assume that is
-       * what this is. This only prevents corruption, it does not properly
-       * handle UTF-8 because the byte length and screen size are assumed to be
-       * the same.
-       */
-      return(KW1 | KW2);
-   }
-
-
-   static inline bool IsKw1(size_t ch)
-   {
-      return((Get(ch) & KW1) != 0);
-   }
-
-
-   static inline bool IsKw2(size_t ch)
-   {
-      return((Get(ch) & KW2) != 0);
-   }
-};
-
-#ifdef DEFINE_CHAR_TABLE
-size_t CharTable::chars[128] =
-{
-   0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,   // [........]
-   0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,   // [........]
-   0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,   // [........]
-   0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,   // [........]
-   0x000, 0x000, 0x022, 0x000, 0x300, 0x000, 0x000, 0x027,   // [ !"#$%&']
-   0x029, 0x028, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,   // [()*+,-./]
-   0x200, 0x200, 0x200, 0x200, 0x200, 0x200, 0x200, 0x200,   // [01234567]
-   0x200, 0x200, 0x000, 0x000, 0x03e, 0x000, 0x03c, 0x000,   // [89:;<=>?]
-   0x200, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300,   // [@ABCDEFG]
-   0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300,   // [HIJKLMNO]
-   0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300,   // [PQRSTUVW]
-   0x300, 0x300, 0x300, 0x05d, 0x000, 0x05b, 0x000, 0x300,   // [XYZ[\]^_]
-   0x060, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300,   // [`abcdefg]
-   0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300,   // [hijklmno]
-   0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300,   // [pqrstuvw]
-   0x300, 0x300, 0x300, 0x07d, 0x000, 0x07b, 0x000, 0x000,   // [xyz{|}~.]
-};
-#endif /* DEFINE_CHAR_TABLE */
-
-
-#endif /* CHAR_TABLE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.cpp
deleted file mode 100644
index fcaa7be9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.cpp
+++ /dev/null
@@ -1,1159 +0,0 @@
-/**
- * @file chunk_list.cpp
- * Manages and navigates the list of chunks.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "chunk_list.h"
-
-#include "ListManager.h"
-#include "prototypes.h"
-#include "space.h"
-
-typedef ListManager<chunk_t> ChunkList_t;
-
-
-/**
- * use this enum to define in what direction or location an
- * operation shall be performed.
- */
-enum class direction_e : unsigned int
-{
-   FORWARD,
-   BACKWARD
-};
-
-
-/**
- * @brief prototype for a function that checks a chunk to have a given type
- *
- * @note this typedef defines the function type "check_t"
- * for a function pointer of type
- * bool function(chunk_t *pc)
- */
-typedef bool (*check_t)(chunk_t *pc);
-
-
-/**
- * @brief prototype for a function that searches through a chunk list
- *
- * @note this typedef defines the function type "search_t"
- * for a function pointer of type
- * chunk_t *function(chunk_t *cur, nav_t scope)
- */
-typedef chunk_t * (*search_t)(chunk_t *cur, scope_e scope);
-
-
-/**
- * @brief search for a chunk that satisfies a condition in a chunk list
- *
- * A generic function that traverses a chunks list either
- * in forward or reverse direction. The traversal continues until a
- * chunk satisfies the condition defined by the compare function.
- * Depending on the parameter cond the condition will either be
- * checked to be true or false.
- *
- * Whenever a chunk list traversal is to be performed this function
- * shall be used. This keeps the code clear and easy to understand.
- *
- * If there are performance issues this function might be worth to
- * be optimized as it is heavily used.
- *
- * @param  cur        chunk to start search at
- * @param  check_fct  compare function
- * @param  scope      code parts to consider for search
- * @param  dir        search direction
- * @param  cond       success condition
- *
- * @retval nullptr  no requested chunk was found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD, const bool cond = true);
-
-
-/**
- * @brief search for a chunk that satisfies a condition in a chunk list.
- *
- * This function is similar to chunk_search, except that it is tweaked to
- * handle searches inside of preprocessor directives. Specifically, if the
- * starting token is inside a preprocessor directive, it will ignore a line
- * continuation, and will abort the search if it reaches the end of the
- * directive. This function only searches forward.
- *
- * @param  cur        chunk to start search at
- * @param  check_fct  compare function
- * @param  scope      code parts to consider for search
- * @param  cond       success condition
- *
- * @retval nullptr  no requested chunk was found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk or pointer to the chunk at the
- *                  end of the preprocessor directive
- */
-static chunk_t *chunk_ppa_search(chunk_t *cur, const check_t check_fct, const bool cond = true);
-
-
-static void chunk_log(chunk_t *pc, const char *text);
-
-
-/*
- * TODO: if we use C++ we can overload the following two functions
- * and thus name them equally
- */
-
-/**
- * @brief search a chunk of a given category in a chunk list
- *
- * traverses a chunk list either in forward or backward direction.
- * The traversal continues until a chunk of a given category is found.
- *
- * This function is a specialization of chunk_search.
- *
- * @param cur    chunk to start search at
- * @param type   category to search for
- * @param scope  code parts to consider for search
- * @param dir    search direction
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD);
-
-
-/**
- * @brief search a chunk of a given type and level
- *
- * Traverses a chunk list in the specified direction until a chunk of a given type
- * is found.
- *
- * This function is a specialization of chunk_search.
- *
- * @param cur    chunk to start search at
- * @param type   category to search for
- * @param scope  code parts to consider for search
- * @param dir    search direction
- * @param level  nesting level to match or -1 / ANY_LEVEL
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope = scope_e::ALL, direction_e dir = direction_e::FORWARD, int level = -1);
-
-
-/**
- * @brief searches a chunk that is non-NEWLINE, non-comment and non-preprocessor
- *
- * Traverses a chunk list either in forward or backward direction.
- * The traversal continues until a chunk of a given category is found.
- *
- * @param cur    chunk to start search at
- * @param scope  code parts to consider for search
- * @param dir    search direction
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD);
-
-
-/**
- * @brief searches a chunk that holds a specific string
- *
- * Traverses a chunk list either in forward or backward direction until a chunk
- * with the provided string was found. Additionally a nesting level can be
- * provided to narrow down the search.
- *
- * @param  cur    chunk to start search at
- * @param  str    string that searched chunk needs to have
- * @param  len    length of the string
- * @param  scope  code parts to consider for search
- * @param  dir    search direction
- * @param  level  nesting level of the searched chunk, ignored when negative
- *
- * @retval NULL     no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level);
-
-
-/**
- * @brief Add a new chunk before/after the given position in a chunk list
- *
- * If ref is nullptr, add either at the head or tail based on the specified pos
- *
- * @param  pc_in  chunk to add to list
- * @param  ref    insert position in list
- * @param  pos    insert before or after
- *
- * @return chunk_t  pointer to the added chunk
- */
-static chunk_t *chunk_add(const chunk_t *pc_in, chunk_t *ref, const direction_e pos = direction_e::FORWARD);
-
-
-/**
- * @brief Determines which chunk search function to use
- *
- * Depending on the required search direction return a pointer
- * to the corresponding chunk search function.
- *
- * @param dir  search direction
- *
- * @return pointer to chunk search function
- */
-static search_t select_search_fct(const direction_e dir = direction_e::FORWARD);
-
-
-ChunkList_t g_cl; //! global chunk list
-
-
-chunk_t *chunk_get_head(void)
-{
-   return(g_cl.GetHead());
-}
-
-
-chunk_t *chunk_get_tail(void)
-{
-   return(g_cl.GetTail());
-}
-
-
-static search_t select_search_fct(const direction_e dir)
-{
-   return((dir == direction_e::FORWARD) ? chunk_get_next : chunk_get_prev);
-}
-
-
-chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat)
-{
-   return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::BACKWARD));
-}
-
-
-chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat)
-{
-   return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::FORWARD));
-}
-
-
-bool are_chunks_in_same_line(chunk_t *start, chunk_t *end)
-{
-   chunk_t *tmp;
-
-   if (start != nullptr)
-   {
-      tmp = chunk_get_next(start);
-   }
-   else
-   {
-      return(false);
-   }
-
-   while (  tmp != nullptr
-         && tmp != end)
-   {
-      if (chunk_is_token(tmp, CT_NEWLINE))
-      {
-         return(false);
-      }
-      tmp = chunk_get_next(tmp);
-   }
-   return(true);
-}
-
-
-static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type,
-                                  const scope_e scope, const direction_e dir)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction
-    */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                  // loop over the chunk list
-   {
-      pc = search_function(pc, scope); // in either direction while
-   } while (  pc != nullptr            // the end of the list was not reached yet
-           && pc->type != type);       // and the demanded chunk was not found either
-
-   return(pc);                         // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope, direction_e dir, int level)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction
-    */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                  // loop over the chunk list
-   {
-      pc = search_function(pc, scope); // in either direction while
-   } while (  pc != nullptr            // the end of the list was not reached yet
-           && (!is_expected_type_and_level(pc, type, level)));
-
-   return(pc);                         // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                  // loop over the chunk list
-   {
-      pc = search_function(pc, scope); // in either direction while
-   } while (  pc != nullptr            // the end of the list was not reached yet
-           && (!is_expected_string_and_level(pc, str, level, len)));
-
-   return(pc);                         // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope,
-                             const direction_e dir, const bool cond)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                   // loop over the chunk list
-   {
-      pc = search_function(pc, scope);  // in either direction while
-   } while (  pc != nullptr             // the end of the list was not reached yet
-           && (check_fct(pc) != cond)); // and the demanded chunk was not found either
-
-   return(pc);                          // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_ppa_search(chunk_t *cur, const check_t check_fct, const bool cond)
-{
-   if (  cur != nullptr
-      && !cur->flags.test(PCF_IN_PREPROC))
-   {
-      // if not in preprocessor, do a regular search
-      return(chunk_search(cur, check_fct, scope_e::ALL,
-                          direction_e::FORWARD, cond));
-   }
-   chunk_t *pc = cur;
-
-   while (  pc != nullptr
-         && (pc = pc->next) != nullptr)
-   {
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         // Bail if we run off the end of the preprocessor directive, but
-         // return the next token, NOT nullptr, because the caller may need to
-         // know where the search ended
-         assert(chunk_is_token(pc, CT_NEWLINE));
-         return(pc);
-      }
-
-      if (chunk_is_token(pc, CT_NL_CONT))
-      {
-         // Skip line continuation
-         continue;
-      }
-
-      if (check_fct(pc) == cond)
-      {
-         // Requested token was found
-         return(pc);
-      }
-   }
-   // Ran out of tokens
-   return(nullptr);
-}
-
-
-/* @todo maybe it is better to combine chunk_get_next and chunk_get_prev
- * into a common function However this should be done with the preprocessor
- * to avoid addition check conditions that would be evaluated in the
- * while loop of the calling function */
-chunk_t *chunk_get_next(chunk_t *cur, scope_e scope)
-{
-   if (cur == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk_t *pc = g_cl.GetNext(cur);
-
-   if (  pc == nullptr
-      || scope == scope_e::ALL)
-   {
-      return(pc);
-   }
-
-   if (cur->flags.test(PCF_IN_PREPROC))
-   {
-      // If in a preproc, return nullptr if trying to leave
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         return(nullptr);
-      }
-      return(pc);
-   }
-
-   // Not in a preproc, skip any preproc
-   while (  pc != nullptr
-         && pc->flags.test(PCF_IN_PREPROC))
-   {
-      pc = g_cl.GetNext(pc);
-   }
-   return(pc);
-}
-
-
-chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope)
-{
-   if (cur == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk_t *pc = g_cl.GetPrev(cur);
-
-   if (  pc == nullptr
-      || scope == scope_e::ALL)
-   {
-      return(pc);
-   }
-
-   if (cur->flags.test(PCF_IN_PREPROC))
-   {
-      // If in a preproc, return NULL if trying to leave
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         return(nullptr);
-      }
-      return(pc);
-   }
-
-   // Not in a preproc, skip any preproc
-   while (  pc != nullptr
-         && pc->flags.test(PCF_IN_PREPROC))
-   {
-      pc = g_cl.GetPrev(pc);
-   }
-   return(pc);
-}
-
-
-chunk_t *chunk_dup(const chunk_t *pc_in)
-{
-   chunk_t *pc = new chunk_t; // Allocate a new chunk
-
-   if (pc == nullptr)
-   {
-      // @todo clean up properly before crashing
-      LOG_FMT(LERR, "Failed to allocate memory\n");
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EXIT_FAILURE);
-   }
-   // Copy all fields and then init the entry
-   *pc = *pc_in; // TODO: what happens if pc_in == nullptr?
-   g_cl.InitEntry(pc);
-
-   return(pc);
-}
-
-
-static void chunk_log_msg(chunk_t *chunk, const log_sev_t log, const char *str)
-{
-   LOG_FMT(log, "%s orig_line is %zu, orig_col is %zu, ",
-           str, chunk->orig_line, chunk->orig_col);
-
-   if (chunk_is_token(chunk, CT_NEWLINE))
-   {
-      LOG_FMT(log, "<Newline>,\n");
-   }
-   else if (chunk_is_token(chunk, CT_VBRACE_OPEN))
-   {
-      LOG_FMT(log, "<VBRACE_OPEN>,\n");
-   }
-   else if (chunk_is_token(chunk, CT_VBRACE_CLOSE))
-   {
-      LOG_FMT(log, "<VBRACE_CLOSE>,\n");
-   }
-   else
-   {
-      LOG_FMT(log, "text() is '%s', type is %s,\n", chunk->text(), get_token_name(chunk->type));
-   }
-}
-
-
-static void chunk_log(chunk_t *pc, const char *text)
-{
-   if (  pc != nullptr
-      && (cpd.unc_stage != unc_stage_e::TOKENIZE)
-      && (cpd.unc_stage != unc_stage_e::CLEANUP))
-   {
-      const log_sev_t log   = LCHUNK;
-      chunk_t         *prev = chunk_get_prev(pc);
-      chunk_t         *next = chunk_get_next(pc);
-
-      chunk_log_msg(pc, log, text);
-
-      if (  prev != nullptr
-         && next != nullptr)
-      {
-         chunk_log_msg(prev, log, "   @ between");
-         chunk_log_msg(next, log, "   and");
-      }
-      else if (next != nullptr)
-      {
-         chunk_log_msg(next, log, "   @ before");
-      }
-      else if (prev != nullptr)
-      {
-         chunk_log_msg(prev, log, "   @ after");
-      }
-      LOG_FMT(log, "   stage is %s",                             // Issue #3034
-              get_unc_stage_name(cpd.unc_stage));
-      log_func_stack_inline(log);
-   }
-}
-
-
-chunk_t *chunk_add_after(const chunk_t *pc_in, chunk_t *ref)
-{
-   return(chunk_add(pc_in, ref, direction_e::FORWARD));
-}
-
-
-chunk_t *chunk_add_before(const chunk_t *pc_in, chunk_t *ref)
-{
-   return(chunk_add(pc_in, ref, direction_e::BACKWARD));
-}
-
-
-void chunk_del(chunk_t * &pc)
-{
-   g_cl.Pop(pc);
-   delete pc;
-   pc = nullptr;
-}
-
-
-void chunk_move_after(chunk_t *pc_in, chunk_t *ref)
-{
-   LOG_FUNC_ENTRY();
-   g_cl.Pop(pc_in);
-   g_cl.AddAfter(pc_in, ref);
-
-   // HACK: Adjust the original column
-   pc_in->column       = ref->column + space_col_align(ref, pc_in);
-   pc_in->orig_col     = pc_in->column;
-   pc_in->orig_col_end = pc_in->orig_col + pc_in->len();
-}
-
-
-chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, true));
-}
-
-
-chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, true));
-}
-
-
-chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_ncnnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_next_ncnnlnp(chunk_t *cur, scope_e scope)
-{
-   return(chunk_get_ncnlnp(cur, scope, direction_e::FORWARD));
-}
-
-
-chunk_t *chunk_ppa_get_next_ncnnl(chunk_t *cur)
-{
-   return(chunk_ppa_search(cur, chunk_is_comment_or_newline, false));
-}
-
-
-chunk_t *chunk_get_prev_ncnnlnp(chunk_t *cur, scope_e scope)
-{
-   return(chunk_get_ncnlnp(cur, scope, direction_e::BACKWARD));
-}
-
-
-chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_balanced_square, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_ncnnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_ncnnlni(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline_or_ignored, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope)
-{
-   return(chunk_search_typelevel(cur, type, scope, direction_e::FORWARD, level));
-}
-
-
-chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope)
-{
-   return(chunk_search_str(cur, str, len, scope, direction_e::FORWARD, level));
-}
-
-
-chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope)
-{
-   return(chunk_search_typelevel(cur, type, scope, direction_e::BACKWARD, level));
-}
-
-
-chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope)
-{
-   return(chunk_search_str(cur, str, len, scope, direction_e::BACKWARD, level));
-}
-
-
-bool chunk_is_newline_between(chunk_t *start, chunk_t *end)
-{
-   for (chunk_t *pc = start; pc != end; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_newline(pc))
-      {
-         return(true);
-      }
-   }
-
-   return(false);
-}
-
-
-void chunk_swap(chunk_t *pc1, chunk_t *pc2)
-{
-   g_cl.Swap(pc1, pc2);
-}
-
-
-// TODO: the following function shall be made similar to the search functions
-chunk_t *chunk_first_on_line(chunk_t *pc)
-{
-   chunk_t *first = pc;
-
-   while (  (pc = chunk_get_prev(pc)) != nullptr
-         && !chunk_is_newline(pc))
-   {
-      first = pc;
-   }
-   return(first);
-}
-
-
-bool chunk_is_last_on_line(chunk_t &pc)  //TODO: pc should be const here
-{
-   // check if pc is the very last chunk of the file
-   const auto *end = chunk_get_tail();
-
-   if (&pc == end)
-   {
-      return(true);
-   }
-   // if the next chunk is a newline then pc is the last chunk on its line
-   const auto *next = chunk_get_next(&pc);
-
-   if (chunk_is_token(next, CT_NEWLINE))
-   {
-      return(true);
-   }
-   return(false);
-}
-
-
-// TODO: this function needs some cleanup
-void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2)
-{
-   // to swap lines we need to find the first chunk of the lines
-   pc1 = chunk_first_on_line(pc1);
-   pc2 = chunk_first_on_line(pc2);
-
-   if (  pc1 == nullptr
-      || pc2 == nullptr
-      || pc1 == pc2)
-   {
-      return;
-   }
-   /*
-    * Example start:
-    * ? - start1 - a1 - b1 - nl1 - ? - ref2 - start2 - a2 - b2 - nl2 - ?
-    *      ^- pc1                              ^- pc2
-    */
-   chunk_t *ref2 = chunk_get_prev(pc2);
-
-   // Move the line started at pc2 before pc1
-   while (  pc2 != nullptr
-         && !chunk_is_newline(pc2))
-   {
-      chunk_t *tmp = chunk_get_next(pc2);
-      g_cl.Pop(pc2);
-      g_cl.AddBefore(pc2, pc1);
-      pc2 = tmp;
-   }
-   /*
-    * Should now be:
-    * ? - start2 - a2 - b2 - start1 - a1 - b1 - nl1 - ? - ref2 - nl2 - ?
-    *                         ^- pc1                              ^- pc2
-    */
-
-   // Now move the line started at pc1 after ref2
-   while (  pc1 != nullptr
-         && !chunk_is_newline(pc1))
-   {
-      chunk_t *tmp = chunk_get_next(pc1);
-      g_cl.Pop(pc1);
-
-      if (ref2 != nullptr)
-      {
-         g_cl.AddAfter(pc1, ref2);
-      }
-      else
-      {
-         g_cl.AddHead(pc1);
-      }
-      ref2 = pc1;
-      pc1  = tmp;
-   }
-   /*
-    * Should now be:
-    * ? - start2 - a2 - b2 - nl1 - ? - ref2 - start1 - a1 - b1 - nl2 - ?
-    *                         ^- pc1                              ^- pc2
-    */
-
-   /*
-    * pc1 and pc2 should be the newlines for their lines.
-    * swap the chunks and the nl_count so that the spacing remains the same.
-    */
-   if (  pc1 != nullptr
-      && pc2 != nullptr)
-   {
-      size_t nl_count = pc1->nl_count;
-
-      pc1->nl_count = pc2->nl_count;
-      pc2->nl_count = nl_count;
-
-      chunk_swap(pc1, pc2);
-   }
-} // chunk_swap_lines
-
-
-chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::BACKWARD, false));
-}
-
-
-void chunk_flags_set_real(chunk_t *pc, pcf_flags_t clr_bits, pcf_flags_t set_bits)
-{
-   if (pc != nullptr)
-   {
-      LOG_FUNC_ENTRY();
-      auto const nflags = (pc->flags & ~clr_bits) | set_bits;
-
-      if (pc->flags != nflags)
-      {
-         LOG_FMT(LSETFLG,
-                 "%s(%d): %016llx^%016llx=%016llx\n"
-                 "   orig_line is %zu, orig_col is %zu, text() '%s', type is %s,",
-                 __func__, __LINE__,
-                 static_cast<pcf_flags_t::int_t>(pc->flags),
-                 static_cast<pcf_flags_t::int_t>(pc->flags ^ nflags),
-                 static_cast<pcf_flags_t::int_t>(nflags),
-                 pc->orig_line, pc->orig_col, pc->text(),
-                 get_token_name(pc->type));
-         LOG_FMT(LSETFLG, " parent_type is %s,\n  ",
-                 get_token_name(get_chunk_parent_type(pc)));
-         log_func_stack_inline(LSETFLG);
-         pc->flags = nflags;
-      }
-   }
-}
-
-
-void set_chunk_type_real(chunk_t *pc, c_token_t token, const char *func, int line)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc == nullptr
-      || pc->type == token)
-   {
-      return;
-   }
-   LOG_FMT(LSETTYP, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() ",
-           func, line, pc->orig_line, pc->orig_col);
-
-   if (token == CT_NEWLINE)
-   {
-      LOG_FMT(LSETTYP, "<Newline>\n");
-   }
-   else
-   {
-      LOG_FMT(LSETTYP, "'%s'\n", pc->text());
-   }
-   LOG_FMT(LSETTYP, "   pc->type is %s, pc->parent_type is %s => *type is %s, *parent_type is %s\n",
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           get_token_name(token), get_token_name(get_chunk_parent_type(pc)));
-   pc->type = token;
-} // set_chunk_type_real
-
-
-void set_chunk_parent_real(chunk_t *pc, c_token_t token, const char *func, int line)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc == nullptr
-      || get_chunk_parent_type(pc) == token)
-   {
-      return;
-   }
-   LOG_FMT(LSETPAR, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() ",
-           func, line, pc->orig_line, pc->orig_col);
-
-   if (token == CT_NEWLINE)
-   {
-      LOG_FMT(LSETPAR, "<Newline>\n");
-   }
-   else
-   {
-      char copy[1000];
-      LOG_FMT(LSETPAR, "'%s'\n", pc->elided_text(copy));
-   }
-   LOG_FMT(LSETPAR, "   pc->type is %s, pc->parent_type is %s => *type is %s, *parent_type is %s\n",
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           get_token_name(token), get_token_name(get_chunk_parent_type(pc)));
-   pc->parent_type = token;
-} // set_chunk_parent_real
-
-
-c_token_t get_chunk_parent_type(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return(CT_NONE);
-   }
-   return(pc->parent_type);
-} // get_chunk_parent_type
-
-
-static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope, const direction_e dir)
-{
-   chunk_t *pc = cur;
-
-   pc = chunk_is_preproc(pc) ?
-        chunk_search(pc, chunk_is_comment_or_newline_in_preproc, scope, dir, false) :
-        chunk_search(pc, chunk_is_comment_newline_or_preproc, scope, dir, false);
-   return(pc);
-}
-
-
-static chunk_t *chunk_add(const chunk_t *pc_in, chunk_t *ref, const direction_e pos)
-{
-#ifdef DEBUG
-   // test if the pc_in chunk is properly set
-   if (pc_in->pp_level == 999)
-   {
-      fprintf(stderr, "%s(%d): pp_level is not set\n", __func__, __LINE__);
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-
-   if (pc_in->orig_line == 0)
-   {
-      fprintf(stderr, "%s(%d): no line number\n", __func__, __LINE__);
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-
-   if (pc_in->orig_col == 0)
-   {
-      fprintf(stderr, "%s(%d): no column number\n", __func__, __LINE__);
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-#endif /* DEBUG */
-
-   chunk_t *pc = chunk_dup(pc_in);
-
-   if (pc != nullptr)
-   {
-      if (ref != nullptr) // ref is a valid chunk
-      {
-         (pos == direction_e::FORWARD) ? g_cl.AddAfter(pc, ref) : g_cl.AddBefore(pc, ref);
-      }
-      else // ref == NULL
-      {
-         (pos == direction_e::FORWARD) ? g_cl.AddHead(pc) : g_cl.AddTail(pc);
-      }
-      chunk_log(pc, "chunk_add(A):");
-   }
-   return(pc);
-} // chunk_add
-
-
-chunk_t *chunk_get_next_ssq(chunk_t *cur)
-{
-   while (  chunk_is_token(cur, CT_TSQUARE)
-         || chunk_is_token(cur, CT_SQUARE_OPEN))
-   {
-      if (chunk_is_token(cur, CT_SQUARE_OPEN))
-      {
-         cur = chunk_skip_to_match(cur);
-      }
-      cur = chunk_get_next_ncnnl(cur);
-   }
-   return(cur);
-}
-
-
-chunk_t *chunk_get_prev_ssq(chunk_t *cur)
-{
-   while (  chunk_is_token(cur, CT_TSQUARE)
-         || chunk_is_token(cur, CT_SQUARE_CLOSE))
-   {
-      if (chunk_is_token(cur, CT_SQUARE_CLOSE))
-      {
-         cur = chunk_skip_to_match_rev(cur);
-      }
-      cur = chunk_get_prev_ncnnl(cur);
-   }
-   return(cur);
-}
-
-
-chunk_t *chunk_get_pp_start(chunk_t *cur)
-{
-   if (!chunk_is_preproc(cur))
-   {
-      return(nullptr);
-   }
-
-   while (!chunk_is_token(cur, CT_PREPROC))
-   {
-      cur = chunk_get_prev(cur, scope_e::PREPROC);
-   }
-   return(cur);
-}
-
-
-//! skip to the final word/type in a :: chain
-static chunk_t *chunk_skip_dc_member(chunk_t *start, scope_e scope, direction_e dir)
-{
-   LOG_FUNC_ENTRY();
-
-   if (start == nullptr)
-   {
-      return(nullptr);
-   }
-   const auto step_fcn = (dir == direction_e::FORWARD)
-                         ? chunk_get_next_ncnnl : chunk_get_prev_ncnnl;
-
-   chunk_t *pc   = start;
-   chunk_t *next = chunk_is_token(pc, CT_DC_MEMBER) ? pc : step_fcn(pc, scope);
-
-   while (chunk_is_token(next, CT_DC_MEMBER))
-   {
-      pc = step_fcn(next, scope);
-
-      if (pc == nullptr)
-      {
-         return(nullptr);
-      }
-      next = step_fcn(pc, scope);
-   }
-   return(pc);
-}
-
-
-chunk_t *chunk_skip_dc_member(chunk_t *start, scope_e scope)
-{
-   return(chunk_skip_dc_member(start, scope, direction_e::FORWARD));
-}
-
-
-chunk_t *chunk_skip_dc_member_rev(chunk_t *start, scope_e scope)
-{
-   return(chunk_skip_dc_member(start, scope, direction_e::BACKWARD));
-}
-
-
-// set parent member
-void chunk_set_parent(chunk_t *pc, chunk_t *parent)
-{
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   if (parent == nullptr)
-   {
-      return;
-   }
-
-   if (pc == parent)
-   {
-      return;
-   }
-   pc->parent = parent;
-}
-
-
-c_token_t get_type_of_the_parent(chunk_t *pc)
-{
-   if (pc == nullptr)
-   {
-      return(CT_UNKNOWN);
-   }
-
-   if (pc->parent == nullptr)
-   {
-      return(CT_PARENT_NOT_SET);
-   }
-   return(pc->parent->type);
-}
-
-
-bool chunk_is_attribute_or_declspec(chunk_t *pc)
-{
-   return(  language_is_set(LANG_CPP)
-         && (  chunk_is_token(pc, CT_ATTRIBUTE)
-            || chunk_is_token(pc, CT_DECLSPEC)));
-}
-
-
-bool chunk_is_class_enum_struct_union(chunk_t *pc)
-{
-   return(  chunk_is_class_or_struct(pc)
-         || chunk_is_enum(pc)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-bool chunk_is_class_or_struct(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_CLASS)
-         || chunk_is_token(pc, CT_STRUCT));
-}
-
-
-bool chunk_is_class_struct_union(chunk_t *pc)
-{
-   return(  chunk_is_class_or_struct(pc)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-bool chunk_is_enum(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_ENUM)
-         || chunk_is_token(pc, CT_ENUM_CLASS));
-}
-
-
-int chunk_compare_position(const chunk_t *A_token, const chunk_t *B_token)
-{
-   if (A_token == nullptr)
-   {
-      assert(A_token);
-   }
-
-   if (B_token == nullptr)
-   {
-      assert(B_token);
-   }
-
-   if (A_token->orig_line < B_token->orig_line)
-   {
-      return(-1);
-   }
-   else if (A_token->orig_line == B_token->orig_line)
-   {
-      if (A_token->orig_col < B_token->orig_col)
-      {
-         return(-1);
-      }
-      else if (A_token->orig_col == B_token->orig_col)
-      {
-         return(0);
-      }
-   }
-   return(1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.h
deleted file mode 100644
index 7a79474d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.h
+++ /dev/null
@@ -1,1014 +0,0 @@
-/**
- * @file chunk_list.h
- * Manages and navigates the list of chunks.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef CHUNK_LIST_H_INCLUDED
-#define CHUNK_LIST_H_INCLUDED
-
-#include "uncrustify_types.h"
-// necessary to not sort it
-#include "char_table.h"
-#include "language_tools.h"
-
-
-/*
- * TODO: better use a namespace for all chunk related operations.
- * The function "chunk_is_comment()" would for instance
- * become "chunk::is_comment()". This makes the usage of the chunks easier
- * and more intuitive.
- */
-
-
-static constexpr int ANY_LEVEL = -1;
-
-
-/**
- * Specifies which chunks should/should not be found.
- * ALL (default)
- *  - return the true next/prev
- *
- * PREPROC
- *  - If not in a preprocessor, skip over any encountered preprocessor stuff
- *  - If in a preprocessor, fail to leave (return nullptr)
- */
-enum class scope_e : unsigned int
-{
-   ALL,      //! search in all kind of chunks
-   PREPROC,  //! search only in preprocessor chunks
-};
-
-
-/**
- * duplicate a chunk in a chunk list
- *
- * @param pc_in  chunk to duplicate
- */
-chunk_t *chunk_dup(const chunk_t *pc_in);
-
-
-/**
- * @brief Add a copy of a chunk to a chunk list after the given position.
- *
- * @note If ref is nullptr, add at the tail of the chunk list
- *
- * @todo is ref=nullptr really useful ?
- *
- * @param pc_in  pointer to chunk to add to list
- * @param ref    position where insertion takes place
- *
- * @return pointer to the added chunk
- */
-chunk_t *chunk_add_after(const chunk_t *pc_in, chunk_t *ref);
-
-
-/**
- * @brief Add a copy of a chunk to a chunk list before the given position
- *
- * @note If ref is nullptr, add at the head of the chunk list
- *
- * @todo is ref=nullptr really useful ?
- *
- * \bug code adds it before the tail, either code or comment is wrong
- *
- * @param pc_in  pointer to chunk to add to list
- * @param ref    position where insertion takes place
- *
- * @retval pointer to the added chunk
- */
-chunk_t *chunk_add_before(const chunk_t *pc_in, chunk_t *ref);
-
-
-/**
- * delete a chunk from a chunk list
- *
- * @param pc  chunk to delete
- */
-void chunk_del(chunk_t * &pc);
-
-
-/**
- * move a chunk to after the reference position in a chunk list
- *
- * @param pc_in  chunk to move
- * @param ref    chunk after which to move
- */
-void chunk_move_after(chunk_t *pc_in, chunk_t *ref);
-
-
-/**
- * @brief returns the head of a chunk list
- *
- * @return pointer to the first chunk
- */
-chunk_t *chunk_get_head(void);
-
-
-//! get the last chunk in a chunk list
-chunk_t *chunk_get_tail(void);
-
-
-/**
- * @brief returns the next chunk in a list of chunks
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- *
- * @return pointer to next chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_next(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief returns the previous chunk in a list of chunks
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- *
- * @return pointer to previous chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Swaps two chunks
- *
- * @param pc1  The first chunk
- * @param pc2  The second chunk
- */
-void chunk_swap(chunk_t *pc1, chunk_t *pc2);
-
-
-/**
- * Swaps two lines that are started with the specified chunks.
- *
- * @param pc1  The first chunk of line 1
- * @param pc2  The first chunk of line 2
- */
-void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2);
-
-
-/**
- * Finds the first chunk on the line that pc is on.
- * This just backs up until a newline or nullptr is hit.
- *
- * given: [ a - b - c - n1 - d - e - n2 ]
- * input: [ a | b | c | n1 ] => a
- * input: [ d | e | n2 ]     => d
- *
- * @param pc  chunk to start with
- */
-chunk_t *chunk_first_on_line(chunk_t *pc);
-
-
-//! check if a given chunk is the last on its line
-bool chunk_is_last_on_line(chunk_t &pc);
-
-
-/**
- * Gets the next NEWLINE chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE and non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_ncnnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE and non-comment chunk, non-preprocessor chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_ncnnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE and non-comment chunk (preprocessor aware).
- * Unlike chunk_get_next_ncnnl, this will also ignore a line continuation if
- * the starting chunk is in a preprocessor directive, and may return a newline
- * if the search reaches the end of a preprocessor directive.
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_ppa_get_next_ncnnl(chunk_t *cur);
-
-
-/**
- * Gets the next chunk not in or part of balanced square
- * brackets. This handles stacked [] instances to accommodate
- * multi-dimensional array declarations
- *
- * @param  cur    chunk to use as start point
- * @param  scope  code region to search in
- *
- * @return nullptr or the next chunk not in or part of square brackets
- */
-chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-blank chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-blank chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev NEWLINE chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE and non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_ncnnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE and non-comment and non-ignored chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_ncnnlni(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE and non-comment chunk, non-preprocessor chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_ncnnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Grabs the next chunk of the given type at the level.
- *
- * @param cur    chunk to use as start point
- * @param type   the type to look for
- * @param level  -1 or ANY_LEVEL (any level) or the level to match
- * @param scope  code region to search in
- *
- * @return nullptr or the match
- */
-chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * Grabs the prev chunk of the given type at the level.
- *
- * @param cur    chunk to use as start point
- * @param type   The type to look for
- * @param level  -1 or ANY_LEVEL (any level) or the level to match
- * @param scope  code region to search in
- *
- * @return nullptr or the match
- */
-chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief find a chunk that holds a given string
- *
- * Traverses a chunk list in forward direction until a chunk of a given category is found.
- *
- * @param cur    chunk to use as start point
- * @param str    string to search for
- * @param len    length of string
- * @param level  the level to match or -1 or ANY_LEVEL
- * @param scope  code region to search in
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief find a chunk that holds a given string
- *
- * Traverses a chunk list in backward direction until a chunk of a given category is found.
- *
- * @param cur    chunk to use as start point
- * @param str    string to search for
- * @param len    length of string
- * @param level  the level to match or -1 or ANY_LEVEL
- * @param scope  code region to search in
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief Gets the next non-vbrace chunk
- *
- * @param  cur    chunk to start search
- * @param  scope  chunk section to consider
- *
- * @return pointer to found chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief Gets the previous non-vbrace chunk
- *
- * @param  cur    chunk to start search
- * @param  scope  chunk section to consider
- *
- * @return pointer to found chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next chunk not in or part of balanced square
- * brackets.This handles stacked[] instances to accommodate
- * multi - dimensional array declarations
- *
- * @param  cur    chunk to use as start point
- *
- * @return nullptr or the next chunk not in or part of square brackets
- */
-chunk_t *chunk_get_next_ssq(chunk_t *cur);
-
-/**
- * Gets the prev chunk not in or part of balanced square
- * brackets.This handles stacked[] instances to accommodate
- * multi - dimensional array declarations
- *
- * @param  cur    chunk to use as start point
- *
- * @return nullptr or the prev chunk not in or part of square brackets
- */
-chunk_t *chunk_get_prev_ssq(chunk_t *cur);
-
-/**
- * Gets the corresponding start chunk if the given chunk is within a
- * preprocessor directive, or nullptr otherwise.
- *
- * @param  cur    chunk to use as start point
- *
- * @return nullptr or start chunk of the preprocessor directive
- */
-chunk_t *chunk_get_pp_start(chunk_t *cur);
-
-/**
- * @brief reverse search a chunk of a given category in a chunk list
- *
- * @param  pc   chunk list to search in
- * @param  cat  category to search for
- *
- * @retval nullptr  no object found, or invalid parameters provided
- * @retval chunk_t  pointer to the found object
- */
-chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat);
-
-
-/**
- * @brief forward search a chunk of a given category in a chunk list
- *
- * @param  pc   chunk list to search in
- * @param  cat  category to search for
- *
- * @retval nullptr  no object found, or invalid parameters provided
- * @retval chunk_t  pointer to the found object
- */
-chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat);
-
-/**
- * @brief checks wether two chunks are in same line
- *
- * @param  start
- * @param  end
- *
- * @return true if there is no newline between start and end chunks
- */
-bool are_chunks_in_same_line(chunk_t *start, chunk_t *end);
-
-/*
- * TODO: better move the function implementations to the source file.
- * No need to make the implementation public.
- */
-
-
-/*
- * TODO: I doubt that inline is required for the functions below.
- * The compiler should know how to optimize the code itself.
- * To clarify do a profiling run with and without inline
- */
-static inline bool is_expected_type_and_level(chunk_t *pc, c_token_t type, int level)
-{
-   // we don't care about the level (if it is negative) or it is as expected
-   // and the type is as expected
-   return(  (  level < 0
-            || pc->level == static_cast<size_t>(level))
-         && pc->type == type);
-}
-
-
-static inline bool is_expected_string_and_level(chunk_t *pc, const char *str, int level, size_t len)
-{
-   // we don't care about the level (if it is negative) or it is as expected
-   return(  (  level < 0
-            || pc->level == static_cast<size_t>(level))
-         && pc->len() == len                       // and the length is as expected
-         && memcmp(str, pc->text(), len) == 0);    // and the strings are equal
-}
-
-
-static inline bool chunk_is_token(const chunk_t *pc, c_token_t c_token)
-{
-   return(  pc != nullptr
-         && pc->type == c_token);
-}
-
-
-static inline bool chunk_is_not_token(const chunk_t *pc, c_token_t c_token)
-{
-   return(  pc != nullptr
-         && pc->type != c_token);
-}
-
-
-/**
- * Skips to the closing match for the current paren/brace/square.
- *
- * @param  cur    The opening or closing paren/brace/square
- * @param  scope  chunk section to consider
- *
- * @return nullptr or the matching paren/brace/square
- */
-static inline chunk_t *chunk_skip_to_match(chunk_t *cur, scope_e scope = scope_e::ALL)
-{
-   if (  chunk_is_token(cur, CT_PAREN_OPEN)
-      || chunk_is_token(cur, CT_SPAREN_OPEN)
-      || chunk_is_token(cur, CT_FPAREN_OPEN)
-      || chunk_is_token(cur, CT_TPAREN_OPEN)
-      || chunk_is_token(cur, CT_BRACE_OPEN)
-      || chunk_is_token(cur, CT_VBRACE_OPEN)
-      || chunk_is_token(cur, CT_ANGLE_OPEN)
-      || chunk_is_token(cur, CT_SQUARE_OPEN))
-   {
-      return(chunk_get_next_type(cur, (c_token_t)(cur->type + 1), cur->level, scope));
-   }
-   return(cur);
-}
-
-
-static inline chunk_t *chunk_skip_to_match_rev(chunk_t *cur, scope_e scope = scope_e::ALL)
-{
-   if (  chunk_is_token(cur, CT_PAREN_CLOSE)
-      || chunk_is_token(cur, CT_SPAREN_CLOSE)
-      || chunk_is_token(cur, CT_FPAREN_CLOSE)
-      || chunk_is_token(cur, CT_TPAREN_CLOSE)
-      || chunk_is_token(cur, CT_BRACE_CLOSE)
-      || chunk_is_token(cur, CT_VBRACE_CLOSE)
-      || chunk_is_token(cur, CT_ANGLE_CLOSE)
-      || chunk_is_token(cur, CT_SQUARE_CLOSE))
-   {
-      return(chunk_get_prev_type(cur, (c_token_t)(cur->type - 1), cur->level, scope));
-   }
-   return(cur);
-}
-
-
-//! skip to the final word/type in a :: chain
-chunk_t *chunk_skip_dc_member(chunk_t *start, scope_e scope = scope_e::ALL);
-chunk_t *chunk_skip_dc_member_rev(chunk_t *start, scope_e scope = scope_e::ALL);
-
-
-/**
- * checks if a chunk is valid and is a comment
- *
- * comment means any kind of
- * - single line comment
- * - multiline comment
- * - C comment
- * - C++ comment
- */
-static inline bool chunk_is_comment(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_COMMENT)
-         || chunk_is_token(pc, CT_COMMENT_MULTI)
-         || chunk_is_token(pc, CT_COMMENT_CPP));
-}
-
-
-/**
- * Returns true if the chunk under test is an inheritance access specifier
- */
-static inline bool chunk_is_cpp_inheritance_access_specifier(chunk_t *pc)
-{
-   return(  language_is_set(LANG_CPP)
-         && (  chunk_is_token(pc, CT_ACCESS)
-            || chunk_is_token(pc, CT_QUALIFIER))
-         && (  std::strncmp(pc->str.c_str(), "private", 7) == 0
-            || std::strncmp(pc->str.c_str(), "protected", 9) == 0
-            || std::strncmp(pc->str.c_str(), "public", 6) == 0));
-} // chunk_is_cpp_inheritance_access_specifier
-
-
-static inline bool chunk_is_colon(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_ACCESS_COLON)
-         || chunk_is_token(pc, CT_ASM_COLON)
-         || chunk_is_token(pc, CT_BIT_COLON)
-         || chunk_is_token(pc, CT_CASE_COLON)
-         || chunk_is_token(pc, CT_CLASS_COLON)
-         || chunk_is_token(pc, CT_COLON)
-         || chunk_is_token(pc, CT_COND_COLON)
-         || chunk_is_token(pc, CT_CONSTR_COLON)
-         || chunk_is_token(pc, CT_CS_SQ_COLON)
-         || chunk_is_token(pc, CT_D_ARRAY_COLON)
-         || chunk_is_token(pc, CT_FOR_COLON)
-         || chunk_is_token(pc, CT_LABEL_COLON)
-         || chunk_is_token(pc, CT_OC_COLON)
-         || chunk_is_token(pc, CT_OC_DICT_COLON)
-         || chunk_is_token(pc, CT_TAG_COLON)
-         || chunk_is_token(pc, CT_WHERE_COLON));
-}
-
-
-static inline bool chunk_is_single_line_comment(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_COMMENT)
-         || chunk_is_token(pc, CT_COMMENT_CPP));
-}
-
-
-static inline bool chunk_is_newline(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_NEWLINE)
-         || chunk_is_token(pc, CT_NL_CONT));
-}
-
-
-static inline bool chunk_is_semicolon(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_SEMICOLON)
-         || chunk_is_token(pc, CT_VSEMICOLON));
-}
-
-
-/**
- * checks if a chunk is valid and is a blank character
- *
- * @note check compares if len == 0
- *
- * @todo rename function: blank is a space not an empty string
- */
-static inline bool chunk_is_blank(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && (pc->len() == 0));
-}
-
-
-//! checks if a chunk is valid and either a comment or newline
-static inline bool chunk_is_comment_or_newline(chunk_t *pc)
-{
-   return(  chunk_is_comment(pc)
-         || chunk_is_newline(pc));
-}
-
-
-//! checks if a chunk is valid and either a comment or newline or ignored
-static inline bool chunk_is_comment_or_newline_or_ignored(chunk_t *pc)
-{
-   return(  chunk_is_comment(pc)
-         || chunk_is_newline(pc)
-         || chunk_is_token(pc, CT_IGNORED));
-}
-
-
-static inline bool chunk_is_balanced_square(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_SQUARE_OPEN)
-         || chunk_is_token(pc, CT_TSQUARE)
-         || chunk_is_token(pc, CT_SQUARE_CLOSE));
-}
-
-
-static inline bool chunk_is_preproc(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && pc->flags.test(PCF_IN_PREPROC));
-}
-
-
-static inline bool chunk_is_comment_or_newline_in_preproc(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && chunk_is_preproc(pc)
-         && (  chunk_is_comment(pc)
-            || chunk_is_newline(pc)));
-}
-
-
-static inline bool chunk_is_comment_newline_or_preproc(chunk_t *pc)
-{
-   return(  chunk_is_comment(pc)
-         || chunk_is_newline(pc)
-         || chunk_is_preproc(pc));
-}
-
-
-static inline bool chunk_is_comment_newline_or_blank(chunk_t *pc)
-{
-   return(  chunk_is_comment_or_newline(pc)
-         || chunk_is_blank(pc));
-}
-
-
-static inline bool chunk_is_Doxygen_comment(chunk_t *pc)
-{
-   if (!chunk_is_comment(pc))
-   {
-      return(false);
-   }
-   // check the third character
-   const char   *sComment = pc->text();
-   const size_t len       = strlen(sComment);
-
-   if (len < 3)
-   {
-      return(false);
-   }
-   return(  (sComment[2] == '/')
-         || (sComment[2] == '!')
-         || (sComment[2] == '@'));
-}
-
-
-static inline bool chunk_is_type(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_PTR_TYPE)
-         || chunk_is_token(pc, CT_BYREF)
-         || chunk_is_token(pc, CT_DC_MEMBER)
-         || chunk_is_token(pc, CT_QUALIFIER)
-         || chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_ENUM)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-static inline bool chunk_is_str(chunk_t *pc, const char *str, size_t len)
-{
-   return(  pc != nullptr                         // valid pc pointer
-         && (pc->len() == len)                    // token size equals size parameter
-         && (memcmp(pc->text(), str, len) == 0)); // token name is the same as str parameter
-
-   /*
-    * TODO: possible access beyond array for memcmp, check this
-    * why not use strncmp here?
-    */
-}
-
-
-static inline bool chunk_is_str_case(chunk_t *pc, const char *str, size_t len)
-{
-   return(  pc != nullptr
-         && (pc->len() == len)
-         && (strncasecmp(pc->text(), str, len) == 0));
-}
-
-
-static inline bool chunk_is_word(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && (pc->len() >= 1)
-         && CharTable::IsKw1(pc->str[0]));
-}
-
-
-static inline bool chunk_is_star(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && (pc->len() == 1)
-         && (pc->str[0] == '*')
-         && pc->type != CT_OPERATOR_VAL);
-}
-
-
-static inline bool chunk_is_nullable(chunk_t *pc)
-{
-   return(  language_is_set(LANG_CS)
-         && (pc != nullptr)
-         && (pc->len() == 1)
-         && (pc->str[0] == '?'));
-}
-
-
-static inline bool chunk_is_addr(chunk_t *pc)
-{
-   if (  chunk_is_token(pc, CT_BYREF)
-      || (  (pc->len() == 1)
-         && (pc->str[0] == '&')
-         && pc->type != CT_OPERATOR_VAL))
-   {
-      chunk_t *prev = chunk_get_prev(pc);
-
-      if (  pc->flags.test(PCF_IN_TEMPLATE)
-         && (  chunk_is_token(prev, CT_COMMA)
-            || chunk_is_token(prev, CT_ANGLE_OPEN)))
-      {
-         return(false);
-      }
-      return(true);
-   }
-   return(false);
-}
-
-
-static inline bool chunk_is_msref(chunk_t *pc) // ms compilers for C++/CLI and WinRT use '^' instead of '*' for marking up reference types vs pointer types
-{
-   return(  language_is_set(LANG_CPP)
-         && (  pc != nullptr
-            && (pc->len() == 1)
-            && (pc->str[0] == '^')
-            && pc->type != CT_OPERATOR_VAL));
-}
-
-
-static inline bool chunk_is_ptr_operator(chunk_t *pc)
-{
-   return(  (  chunk_is_star(pc)
-            || chunk_is_addr(pc)
-            || chunk_is_msref(pc))
-         || chunk_is_nullable(pc));
-}
-
-
-static inline bool chunk_is_pointer_or_reference(chunk_t *pc)
-{
-   return(  chunk_is_ptr_operator(pc)
-         || chunk_is_token(pc, CT_BYREF));
-}
-
-
-//! Check to see if there is a newline between the two chunks
-bool chunk_is_newline_between(chunk_t *start, chunk_t *end);
-
-
-static inline bool chunk_is_closing_brace(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE));
-}
-
-
-static inline bool chunk_is_opening_brace(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_OPEN));
-}
-
-
-static inline bool chunk_is_vbrace(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_VBRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_OPEN));
-}
-
-
-static inline bool chunk_is_paren_open(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_PAREN_OPEN)
-         || chunk_is_token(pc, CT_SPAREN_OPEN)
-         || chunk_is_token(pc, CT_TPAREN_OPEN)
-         || chunk_is_token(pc, CT_FPAREN_OPEN)
-         || chunk_is_token(pc, CT_LPAREN_OPEN));
-}
-
-
-static inline bool chunk_is_paren_close(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_PAREN_CLOSE)
-         || chunk_is_token(pc, CT_SPAREN_CLOSE)
-         || chunk_is_token(pc, CT_TPAREN_CLOSE)
-         || chunk_is_token(pc, CT_FPAREN_CLOSE));
-}
-
-
-/**
- * Returns true if either chunk is null or both have the same preproc flags.
- * If this is true, you can remove a newline/nl_cont between the two.
- */
-static inline bool chunk_same_preproc(chunk_t *pc1, chunk_t *pc2)
-{
-   return(  pc1 == nullptr
-         || pc2 == nullptr
-         || ((pc1->flags & PCF_IN_PREPROC) == (pc2->flags & PCF_IN_PREPROC)));
-}
-
-
-/**
- * Returns true if it is safe to delete the newline token.
- * The prev and next chunks must have the same PCF_IN_PREPROC flag AND
- * the newline can't be after a C++ comment.
- */
-static inline bool chunk_safe_to_del_nl(chunk_t *nl)
-{
-   chunk_t *tmp = chunk_get_prev(nl);
-
-   if (chunk_is_token(tmp, CT_COMMENT_CPP))
-   {
-      return(false);
-   }
-   return(chunk_same_preproc(chunk_get_prev(nl), chunk_get_next(nl)));
-}
-
-
-/**
- * Checks if a chunk points to the opening parenthese of a
- * for(...in...) loop in Objective-C.
- *
- * @return true  - the chunk is the opening parentheses of a for in loop
- */
-static inline bool chunk_is_forin(chunk_t *pc)
-{
-   if (  language_is_set(LANG_OC)
-      && chunk_is_token(pc, CT_SPAREN_OPEN))
-   {
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-      if (chunk_is_token(prev, CT_FOR))
-      {
-         chunk_t *next = pc;
-
-         while (  next != nullptr
-               && next->type != CT_SPAREN_CLOSE
-               && next->type != CT_IN)
-         {
-            next = chunk_get_next_ncnnl(next);
-         }
-
-         if (chunk_is_token(next, CT_IN))
-         {
-            return(true);
-         }
-      }
-   }
-   return(false);
-}
-
-
-/**
- * Returns true if pc is an CT_ATTRIBUTE or CT_DECLSPEC
- */
-bool chunk_is_attribute_or_declspec(chunk_t *pc);
-
-
-/**
- * Returns true if pc is one of CT_CLASS, CT_ENUM, CT_ENUM_CLASS, CT_STRUCT or CT_UNION
- */
-bool chunk_is_class_enum_struct_union(chunk_t *pc);
-
-
-/**
- * Returns true if pc is a CT_CLASS or CT_STRUCT
- */
-bool chunk_is_class_or_struct(chunk_t *pc);
-
-
-/**
- * Returns true if pc is one of CT_CLASS, CT_STRUCT or CT_UNION
- */
-bool chunk_is_class_struct_union(chunk_t *pc);
-
-
-/**
- * Returns true if pc is a CT_ENUM or CT_ENUM_CLASS
- */
-bool chunk_is_enum(chunk_t *pc);
-
-
-void set_chunk_type_real(chunk_t *pc, c_token_t tt, const char *func, int line);
-
-
-void set_chunk_parent_real(chunk_t *pc, c_token_t tt, const char *func, int line);
-
-
-#define set_chunk_type(pc, tt)      do {                               \
-      set_chunk_type_real((pc), (tt), __unqualified_func__, __LINE__); \
-} while (false)
-
-#define set_chunk_parent(pc, tt)    do {                                 \
-      set_chunk_parent_real((pc), (tt), __unqualified_func__, __LINE__); \
-} while (false)
-
-
-c_token_t get_chunk_parent_type(chunk_t *pc);
-
-
-void chunk_flags_set_real(chunk_t *pc, pcf_flags_t clr_bits, pcf_flags_t set_bits);
-
-
-#define chunk_flags_upd(pc, cc, ss)    do {   \
-      chunk_flags_set_real((pc), (cc), (ss)); \
-} while (false)
-
-#define chunk_flags_set(pc, ss)        do { \
-      chunk_flags_set_real((pc), {}, (ss)); \
-} while (false)
-
-#define chunk_flags_clr(pc, cc)        do { \
-      chunk_flags_set_real((pc), (cc), {}); \
-} while (false)
-
-
-void chunk_set_parent(chunk_t *pc, chunk_t *parent);
-
-
-c_token_t get_type_of_the_parent(chunk_t *pc);
-
-
-/**
- * @brief compare the positions of two tokens in a file.
- *
- * The function compares the two positions of two tokens.
- *
- * @param A_token
- * @param B_token
- *
- * @return returns an integer less than, equal to, or greater than zero
- *         if A_token is found, respectively, to be less/before than, to
- *         match, or be greater/after than B_token.
- */
-int chunk_compare_position(const chunk_t *A_token, const chunk_t *B_token);
-
-
-#endif /* CHUNK_LIST_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.cpp
deleted file mode 100644
index 920a27db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.cpp
+++ /dev/null
@@ -1,3815 +0,0 @@
-/**
- * @file combine.cpp
- * Labels the chunks as needed.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "combine.h"
-
-#include "combine_fix_mark.h"
-#include "combine_skip.h"
-#include "combine_tools.h"
-#include "EnumStructUnionParser.h"
-#include "flag_braced_init_list.h"
-#include "flag_parens.h"
-#include "lang_pawn.h"
-#include "newlines.h"
-#include "prototypes.h"
-#include "tokenize_cleanup.h"
-
-#include <limits>
-
-constexpr static auto LCURRENT = LCOMBINE;
-
-using namespace std;
-using namespace uncrustify;
-
-
-/**
- * Mark the parens and colons in:
- *   asm volatile ( "xx" : "xx" (l), "yy"(h) : ...  );
- *
- * @param pc  the CT_ASM item
- */
-static void flag_asm(chunk_t *pc);
-
-
-/**
- * Skips the list of class/struct parent types.
- */
-chunk_t *skip_parent_types(chunk_t *colon);
-
-
-/**
- * Combines two tokens into {{ and }} if inside parens and nothing is between
- * either pair.
- */
-static void check_double_brace_init(chunk_t *bo1);
-
-
-static void process_returns(void);
-
-
-/**
- * Processes a return statement, labeling the parens and marking the parent.
- * May remove or add parens around the return statement
- *
- * @param pc  Pointer to the return chunk
- */
-static chunk_t *process_return(chunk_t *pc);
-
-
-/**
- * Process an ObjC 'class'
- * pc is the chunk after '@implementation' or '@interface' or '@protocol'.
- * Change colons, etc. Processes stuff until '@end'.
- * Skips anything in braces.
- */
-static void handle_oc_class(chunk_t *pc);
-
-
-/**
- *  Mark Objective-C blocks (aka lambdas or closures)
- *  The syntax and usage is exactly like C function pointers
- *  but instead of an asterisk they have a caret as pointer symbol.
- *  Although it may look expensive this functions is only triggered
- *  on appearance of an OC_BLOCK_CARET for LANG_OC.
- *  repeat(10, ^{ putc('0'+d); });
- *  typedef void (^workBlk_t)(void);
- *
- * @param pc  points to the '^'
- */
-static void handle_oc_block_literal(chunk_t *pc);
-
-
-/**
- * Mark Objective-C block types.
- * The syntax and usage is exactly like C function pointers
- * but instead of an asterisk they have a caret as pointer symbol.
- *  typedef void (^workBlk_t)(void);
- *  const char * (^workVar)(void);
- *  -(void)Foo:(void(^)())blk { }
- *
- * This is triggered when the sequence '(' '^' is found.
- *
- * @param pc  points to the '^'
- */
-static void handle_oc_block_type(chunk_t *pc);
-
-
-/**
- * Process an ObjC message spec/dec
- *
- * Specs:
- * -(void) foo ARGS;
- *
- * Declaration:
- * -(void) foo ARGS {  }
- *
- * LABEL : (ARGTYPE) ARGNAME
- *
- * ARGS is ': (ARGTYPE) ARGNAME [MOREARGS...]'
- * MOREARGS is ' [ LABEL] : (ARGTYPE) ARGNAME '
- * -(void) foo: (int) arg: {  }
- * -(void) foo: (int) arg: {  }
- * -(void) insertObject:(id)anObject atIndex:(int)index
- */
-static void handle_oc_message_decl(chunk_t *pc);
-
-
-/**
- * Process an ObjC message send statement:
- * [ class func: val1 name2: val2 name3: val3] ; // named params
- * [ class func: val1      : val2      : val3] ; // unnamed params
- * [ class <proto> self method ] ; // with protocol
- * [[NSMutableString alloc] initWithString: @"" ] // class from msg
- * [func(a,b,c) lastObject ] // class from func
- *
- * Mainly find the matching ']' and ';' and mark the colons.
- *
- * @param pc  points to the open square '['
- */
-static void handle_oc_message_send(chunk_t *pc);
-
-
-//! Process @Property values and re-arrange them if necessary
-static void handle_oc_property_decl(chunk_t *pc);
-
-//! Process @available annotation
-static void handle_oc_available(chunk_t *pc);
-
-/**
- * Process a type that is enclosed in parens in message declarations.
- * TODO: handle block types, which get special formatting
- *
- * @param pc  points to the open paren
- *
- * @return the chunk after the type
- */
-static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flags_t flags, bool &did_it);
-
-/**
- * Process an C# [] thingy:
- *    [assembly: xxx]
- *    [AttributeUsage()]
- *    [@X]
- *
- * Set the next chunk to a statement start after the close ']'
- *
- * @param pc  points to the open square '['
- */
-static void handle_cs_square_stmt(chunk_t *pc);
-
-
-/**
- * We are on a brace open that is preceded by a word or square close.
- * Set the brace parent to CT_CS_PROPERTY and find the first item in the
- * property and set its parent, too.
- */
-static void handle_cs_property(chunk_t *pc);
-
-
-/**
- * We hit a ']' followed by a WORD. This may be a multidimensional array type.
- * Example: int[,,] x;
- * If there is nothing but commas between the open and close, then mark it.
- */
-static void handle_cs_array_type(chunk_t *pc);
-
-
-/**
- * We are on the C++ 'template' keyword.
- * What follows should be the following:
- *
- * template <class identifier> function_declaration;
- * template <typename identifier> function_declaration;
- * template <class identifier> class class_declaration;
- * template <typename identifier> class class_declaration;
- *
- * Change the 'class' inside the <> to CT_TYPE.
- * Set the parent to the class after the <> to CT_TEMPLATE.
- * Set the parent of the semicolon to CT_TEMPLATE.
- */
-static void handle_cpp_template(chunk_t *pc);
-
-
-/**
- * Verify and then mark C++ lambda expressions.
- * The expected format is '[...](...){...}' or '[...](...) -> type {...}'
- * sq_o is '[' CT_SQUARE_OPEN or '[]' CT_TSQUARE
- * Split the '[]' so we can control the space
- */
-static void handle_cpp_lambda(chunk_t *pc);
-
-
-/**
- * We are on the D 'template' keyword.
- * What follows should be the following:
- *
- * template NAME ( TYPELIST ) { BODY }
- *
- * Set the parent of NAME to template, change NAME to CT_TYPE.
- * Set the parent of the parens and braces to CT_TEMPLATE.
- * Scan the body for each type in TYPELIST and change the type to CT_TYPE.
- */
-static void handle_d_template(chunk_t *pc);
-
-
-/**
- * A func wrap chunk and what follows should be treated as a function name.
- * Create new text for the chunk and call it a CT_FUNCTION.
- *
- * A type wrap chunk and what follows should be treated as a simple type.
- * Create new text for the chunk and call it a CT_TYPE.
- */
-static void handle_wrap(chunk_t *pc);
-
-
-/**
- * A proto wrap chunk and what follows should be treated as a function proto.
- *
- * RETTYPE PROTO_WRAP( NAME, PARAMS ); or RETTYPE PROTO_WRAP( NAME, (PARAMS) );
- * RETTYPE gets changed with make_type().
- * PROTO_WRAP is marked as CT_FUNC_PROTO or CT_FUNC_DEF.
- * NAME is marked as CT_WORD.
- * PARAMS is all marked as prototype parameters.
- */
-static void handle_proto_wrap(chunk_t *pc);
-
-
-static bool is_oc_block(chunk_t *pc);
-
-
-/**
- * Java assert statements are: "assert EXP1 [: EXP2] ;"
- * Mark the parent of the colon and semicolon
- */
-static void handle_java_assert(chunk_t *pc);
-
-
-static void flag_asm(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *tmp = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-   if (chunk_is_not_token(tmp, CT_QUALIFIER))
-   {
-      return;
-   }
-   chunk_t *po = chunk_get_next_ncnnl(tmp, scope_e::PREPROC);
-
-   if (!chunk_is_paren_open(po))
-   {
-      return;
-   }
-   chunk_t *end = chunk_skip_to_match(po, scope_e::PREPROC);
-
-   if (end == nullptr)
-   {
-      return;
-   }
-   set_chunk_parent(po, CT_ASM);
-   set_chunk_parent(end, CT_ASM);
-
-   for (  tmp = chunk_get_next_ncnnl(po, scope_e::PREPROC);
-          tmp != nullptr
-       && tmp != end;
-          tmp = chunk_get_next_ncnnl(tmp, scope_e::PREPROC))
-   {
-      if (chunk_is_token(tmp, CT_COLON))
-      {
-         set_chunk_type(tmp, CT_ASM_COLON);
-      }
-      else if (chunk_is_token(tmp, CT_DC_MEMBER))
-      {
-         // if there is a string on both sides, then this is two ASM_COLONs
-         if (  chunk_is_token(chunk_get_next_ncnnl(tmp, scope_e::PREPROC), CT_STRING)
-            && chunk_is_token(chunk_get_prev_ncnnlni(tmp, scope_e::PREPROC), CT_STRING)) // Issue #2279
-         {
-            chunk_t nc;
-
-            nc = *tmp;
-
-            tmp->str.resize(1);
-            tmp->orig_col_end = tmp->orig_col + 1;
-            set_chunk_type(tmp, CT_ASM_COLON);
-
-            set_chunk_type(&nc, tmp->type);
-            nc.str.pop_front();
-            nc.orig_col++;
-            nc.column++;
-            chunk_add_after(&nc, tmp);
-         }
-      }
-   }
-
-   tmp = chunk_get_next_ncnnl(end, scope_e::PREPROC);
-
-   if (tmp == nullptr)
-   {
-      return;
-   }
-
-   if (chunk_is_token(tmp, CT_SEMICOLON))
-   {
-      set_chunk_parent(tmp, CT_ASM);
-   }
-} // flag_asm
-
-
-void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
-{
-   LOG_FUNC_ENTRY();
-
-   // separate the uses of CT_ASSIGN sign '='
-   // into CT_ASSIGN_DEFAULT_ARG, CT_ASSIGN_FUNC_PROTO
-   if (  chunk_is_token(pc, CT_ASSIGN)
-      && get_chunk_parent_type(pc) == CT_FUNC_PROTO
-      && (  pc->flags.test(PCF_IN_FCN_DEF)                            // Issue #2236
-         || pc->flags.test(PCF_IN_CONST_ARGS)))
-   {
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      log_pcf_flags(LFCNR, pc->flags);
-      set_chunk_type(pc, CT_ASSIGN_DEFAULT_ARG);
-   }
-
-   if (  (  chunk_is_token(prev, CT_FPAREN_CLOSE)
-         || (  (  chunk_is_str(prev, "const", 5)
-               || chunk_is_str(prev, "override", 8))
-            && chunk_is_token(prev->prev, CT_FPAREN_CLOSE)))
-      && chunk_is_token(pc, CT_ASSIGN)
-      && (  chunk_is_token(next, CT_DEFAULT)
-         || chunk_is_token(next, CT_DELETE)
-         || chunk_is_str(next, "0", 1)))
-   {
-      set_chunk_type(pc, CT_ASSIGN_FUNC_PROTO);
-   }
-
-   if (chunk_is_token(pc, CT_OC_AT))
-   {
-      if (  chunk_is_token(next, CT_PAREN_OPEN)
-         || chunk_is_token(next, CT_BRACE_OPEN)
-         || chunk_is_token(next, CT_SQUARE_OPEN))
-      {
-         flag_parens(next, PCF_OC_BOXED, next->type, CT_OC_AT, false);
-      }
-      else
-      {
-         set_chunk_parent(next, CT_OC_AT);
-      }
-   }
-
-   // D stuff
-   if (  language_is_set(LANG_D)
-      && chunk_is_token(pc, CT_QUALIFIER)
-      && chunk_is_str(pc, "const", 5)
-      && chunk_is_token(next, CT_PAREN_OPEN))
-   {
-      set_chunk_type(pc, CT_D_CAST);
-      set_paren_parent(next, pc->type);
-   }
-
-   if (  chunk_is_token(next, CT_PAREN_OPEN)
-      && (  chunk_is_token(pc, CT_D_CAST)
-         || chunk_is_token(pc, CT_DELEGATE)
-         || chunk_is_token(pc, CT_ALIGN)))
-   {
-      // mark the parenthesis parent
-      chunk_t *tmp = set_paren_parent(next, pc->type);
-
-      // For a D cast - convert the next item
-      if (  chunk_is_token(pc, CT_D_CAST)
-         && tmp != nullptr)
-      {
-         if (chunk_is_token(tmp, CT_STAR))
-         {
-            set_chunk_type(tmp, CT_DEREF);
-         }
-         else if (chunk_is_token(tmp, CT_AMP))
-         {
-            set_chunk_type(tmp, CT_ADDR);
-         }
-         else if (chunk_is_token(tmp, CT_MINUS))
-         {
-            set_chunk_type(tmp, CT_NEG);
-         }
-         else if (chunk_is_token(tmp, CT_PLUS))
-         {
-            set_chunk_type(tmp, CT_POS);
-         }
-      }
-
-      /*
-       * For a delegate, mark previous words as types and the item after the
-       * close paren as a variable def
-       */
-      if (chunk_is_token(pc, CT_DELEGATE))
-      {
-         if (tmp != nullptr)
-         {
-            set_chunk_parent(tmp, CT_DELEGATE);
-
-            if (tmp->level == tmp->brace_level)
-            {
-               chunk_flags_set(tmp, PCF_VAR_1ST_DEF);
-            }
-         }
-
-         for (tmp = chunk_get_prev_ncnnlni(pc); tmp != nullptr; tmp = chunk_get_prev_ncnnlni(tmp)) // Issue #2279
-         {
-            if (  chunk_is_semicolon(tmp)
-               || chunk_is_token(tmp, CT_BRACE_OPEN)
-               || chunk_is_token(tmp, CT_VBRACE_OPEN))
-            {
-               break;
-            }
-            make_type(tmp);
-         }
-      }
-
-      if (  chunk_is_token(pc, CT_ALIGN)
-         && tmp != nullptr)
-      {
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
-         {
-            set_paren_parent(tmp, pc->type);
-         }
-         else if (chunk_is_token(tmp, CT_COLON))
-         {
-            set_chunk_parent(tmp, pc->type);
-         }
-      }
-   } // paren open + cast/align/delegate
-
-   if (chunk_is_token(pc, CT_INVARIANT))
-   {
-      if (chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         set_chunk_parent(next, pc->type);
-         chunk_t *tmp = chunk_get_next(next);
-
-         while (tmp != nullptr)
-         {
-            if (chunk_is_token(tmp, CT_PAREN_CLOSE))
-            {
-               set_chunk_parent(tmp, pc->type);
-               break;
-            }
-            make_type(tmp);
-            tmp = chunk_get_next(tmp);
-         }
-      }
-      else
-      {
-         set_chunk_type(pc, CT_QUALIFIER);
-      }
-   }
-
-   if (  chunk_is_token(prev, CT_BRACE_OPEN)
-      && get_chunk_parent_type(prev) != CT_CS_PROPERTY
-      && (  chunk_is_token(pc, CT_GETSET)
-         || chunk_is_token(pc, CT_GETSET_EMPTY)))
-   {
-      flag_parens(prev, PCF_NONE, CT_NONE, CT_GETSET, false);
-   }
-
-   if (chunk_is_token(pc, CT_ASM))
-   {
-      flag_asm(pc);
-   }
-
-   // clang stuff - A new derived type is introduced to C and, by extension, Objective-C, C++, and Objective-C++
-   if (language_is_set(LANG_C | LANG_CPP | LANG_OC))
-   {
-      if (chunk_is_token(pc, CT_CARET))
-      {
-         if (  pc->flags.test(PCF_EXPR_START)
-            || pc->flags.test(PCF_IN_PREPROC))
-         {
-            handle_oc_block_literal(pc);
-         }
-      }
-   }
-
-   // Objective C stuff
-   if (language_is_set(LANG_OC))
-   {
-      // Check for message declarations
-      if (pc->flags.test(PCF_STMT_START))
-      {
-         if (  (  chunk_is_str(pc, "-", 1)
-               || chunk_is_str(pc, "+", 1))
-            && chunk_is_str(next, "(", 1))
-         {
-            handle_oc_message_decl(pc);
-         }
-      }
-
-      if (  pc->flags.test(PCF_EXPR_START)
-         || pc->flags.test(PCF_IN_PREPROC))
-      {
-         if (chunk_is_token(pc, CT_SQUARE_OPEN))
-         {
-            handle_oc_message_send(pc);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_OC_PROPERTY))
-      {
-         handle_oc_property_decl(pc);
-      }
-
-      if (chunk_is_token(pc, CT_OC_AVAILABLE))
-      {
-         handle_oc_available(pc);
-      }
-   }
-
-   // C# stuff
-   if (language_is_set(LANG_CS))
-   {
-      // '[assembly: xxx]' stuff
-      if (  pc->flags.test(PCF_EXPR_START)
-         && chunk_is_token(pc, CT_SQUARE_OPEN))
-      {
-         handle_cs_square_stmt(pc);
-      }
-
-      if (  chunk_is_token(next, CT_BRACE_OPEN)
-         && get_chunk_parent_type(next) == CT_NONE
-         && (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-            || chunk_is_token(pc, CT_ANGLE_CLOSE)
-            || chunk_is_token(pc, CT_WORD)))
-      {
-         handle_cs_property(next);
-      }
-
-      if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-         && chunk_is_token(next, CT_WORD))
-      {
-         handle_cs_array_type(pc);
-      }
-
-      if (  (  chunk_is_token(pc, CT_LAMBDA)
-            || chunk_is_token(pc, CT_DELEGATE))
-         && chunk_is_token(next, CT_BRACE_OPEN))
-      {
-         set_paren_parent(next, pc->type);
-      }
-
-      if (  chunk_is_token(pc, CT_WHEN)
-         && pc->next != nullptr
-         && pc->next->type != CT_SPAREN_OPEN)
-      {
-         set_chunk_type(pc, CT_WORD);
-      }
-   }
-
-   if (  language_is_set(LANG_JAVA)
-      && chunk_is_token(pc, CT_LAMBDA)
-      && chunk_is_token(next, CT_BRACE_OPEN))
-   {
-      set_paren_parent(next, pc->type);
-   }
-
-   if (chunk_is_token(pc, CT_NEW))
-   {
-      chunk_t *ts  = nullptr;
-      chunk_t *tmp = next;
-
-      if (chunk_is_token(tmp, CT_TSQUARE))
-      {
-         ts  = tmp;
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         || chunk_is_token(tmp, CT_PAREN_OPEN))
-      {
-         set_paren_parent(tmp, pc->type);
-
-         if (ts != nullptr)
-         {
-            set_chunk_parent(ts, pc->type);
-         }
-      }
-   }
-
-   // C++11 Lambda stuff
-   if (  language_is_set(LANG_CPP)
-      && (  chunk_is_token(pc, CT_SQUARE_OPEN)
-         || chunk_is_token(pc, CT_TSQUARE)))
-   {
-      handle_cpp_lambda(pc);
-   }
-
-   // FIXME: which language does this apply to?
-   // Issue #2432
-   if (!language_is_set(LANG_OC))
-   {
-      if (  chunk_is_token(pc, CT_ASSIGN)
-         && chunk_is_token(next, CT_SQUARE_OPEN))
-      {
-         set_paren_parent(next, CT_ASSIGN);
-
-         // Mark one-liner assignment
-         chunk_t *tmp = next;
-
-         while ((tmp = chunk_get_next_nc(tmp)) != nullptr)
-         {
-            if (chunk_is_newline(tmp))
-            {
-               break;
-            }
-
-            if (  chunk_is_token(tmp, CT_SQUARE_CLOSE)
-               && next->level == tmp->level)
-            {
-               chunk_flags_set(tmp, PCF_ONE_LINER);
-               chunk_flags_set(next, PCF_ONE_LINER);
-               break;
-            }
-         }
-      }
-   }
-
-   if (chunk_is_token(pc, CT_ASSERT))
-   {
-      handle_java_assert(pc);
-   }
-
-   if (chunk_is_token(pc, CT_ANNOTATION))
-   {
-      chunk_t *tmp = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_paren_open(tmp))
-      {
-         set_paren_parent(tmp, CT_ANNOTATION);
-      }
-   }
-
-   if (  chunk_is_token(pc, CT_SIZEOF)
-      && language_is_set(LANG_ALLC))
-   {
-      chunk_t *tmp = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_token(tmp, CT_ELLIPSIS))
-      {
-         set_chunk_parent(tmp, CT_SIZEOF);
-      }
-   }
-
-   if (  chunk_is_token(pc, CT_DECLTYPE)
-      && pc->parent_type != CT_FUNC_DEF)
-   {
-      chunk_t *tmp = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_paren_open(tmp))
-      {
-         // decltype may be followed by a braced-init-list
-         tmp = set_paren_parent(tmp, CT_DECLTYPE);
-
-         if (chunk_is_opening_brace(tmp) && !pc->flags.test(PCF_IN_LAMBDA))
-         {
-            tmp = set_paren_parent(tmp, CT_BRACED_INIT_LIST);
-
-            if (tmp)
-            {
-               chunk_flags_clr(tmp, PCF_EXPR_START | PCF_STMT_START);
-            }
-         }
-         else
-         {
-            if (chunk_is_token(tmp, CT_WORD))
-            {
-               chunk_flags_set(tmp, PCF_VAR_1ST_DEF);
-            }
-         }
-      }
-   }
-
-   // A [] in C# and D only follows a type
-   if (  chunk_is_token(pc, CT_TSQUARE)
-      && language_is_set(LANG_D | LANG_CS | LANG_VALA))
-   {
-      if (chunk_is_token(prev, CT_WORD))
-      {
-         set_chunk_type(prev, CT_TYPE);
-      }
-
-      if (chunk_is_token(next, CT_WORD))
-      {
-         chunk_flags_set(next, PCF_VAR_1ST_DEF);
-      }
-   }
-
-   if (  chunk_is_token(pc, CT_SQL_EXEC)
-      || chunk_is_token(pc, CT_SQL_BEGIN)
-      || chunk_is_token(pc, CT_SQL_END))
-   {
-      mark_exec_sql(pc);
-   }
-
-   if (chunk_is_token(pc, CT_PROTO_WRAP))
-   {
-      handle_proto_wrap(pc);
-   }
-
-   // Handle the typedef
-   if (chunk_is_token(pc, CT_TYPEDEF))
-   {
-      fix_typedef(pc);
-   }
-
-   if (  chunk_is_class_enum_struct_union(pc)
-      && chunk_is_not_token(prev, CT_TYPEDEF))
-   {
-      EnumStructUnionParser parser;
-      parser.parse(pc);
-   }
-
-   if (chunk_is_token(pc, CT_EXTERN))
-   {
-      if (chunk_is_paren_open(next))
-      {
-         chunk_t *tmp = flag_parens(next, PCF_NONE, CT_NONE, CT_EXTERN, true);
-
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
-         {
-            set_paren_parent(tmp, CT_EXTERN);
-         }
-      }
-      else
-      {
-         // next likely is a string (see tokenize_cleanup.cpp)
-         set_chunk_parent(next, CT_EXTERN);
-         chunk_t *tmp = chunk_get_next_ncnnl(next);
-
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
-         {
-            set_paren_parent(tmp, CT_EXTERN);
-         }
-      }
-   }
-
-   if (chunk_is_token(pc, CT_TEMPLATE))
-   {
-      if (language_is_set(LANG_D))
-      {
-         handle_d_template(pc);
-      }
-      else
-      {
-         handle_cpp_template(pc);
-      }
-   }
-
-   if (  chunk_is_token(pc, CT_WORD)
-      && chunk_is_token(next, CT_ANGLE_OPEN)
-      && get_chunk_parent_type(next) == CT_TEMPLATE)
-   {
-      mark_template_func(pc, next);
-   }
-
-   if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-      && chunk_is_token(next, CT_PAREN_OPEN))
-   {
-      flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, CT_NONE, false);
-   }
-
-   if (chunk_is_token(pc, CT_TYPE_CAST))
-   {
-      fix_type_cast(pc);
-   }
-
-   if (  get_chunk_parent_type(pc) == CT_ASSIGN
-      && (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_SQUARE_OPEN)))
-   {
-      // Mark everything in here as in assign
-      flag_parens(pc, PCF_IN_ARRAY_ASSIGN, pc->type, CT_NONE, false);
-   }
-
-   if (chunk_is_token(pc, CT_D_TEMPLATE))
-   {
-      set_paren_parent(next, pc->type);
-   }
-
-   /*
-    * A word before an open paren is a function call or definition.
-    * CT_WORD => CT_FUNC_CALL or CT_FUNC_DEF
-    */
-   if (chunk_is_token(next, CT_PAREN_OPEN))
-   {
-      chunk_t *tmp = chunk_get_next_ncnnl(next);
-
-      if (  language_is_set(LANG_C | LANG_CPP | LANG_OC)
-         && chunk_is_token(tmp, CT_CARET))
-      {
-         handle_oc_block_type(tmp);
-
-         // This is the case where a block literal is passed as the first argument of a C-style method invocation.
-         if (  (  chunk_is_token(tmp, CT_OC_BLOCK_CARET)
-               || chunk_is_token(tmp, CT_CARET))
-            && chunk_is_token(pc, CT_WORD))
-         {
-            LOG_FMT(LFCN, "%s(%d): (1) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-            set_chunk_type(pc, CT_FUNC_CALL);
-         }
-      }
-      else if (  chunk_is_token(pc, CT_WORD)
-              || chunk_is_token(pc, CT_OPERATOR_VAL))
-      {
-         set_chunk_type(pc, CT_FUNCTION);
-      }
-      else if (chunk_is_token(pc, CT_FIXED))
-      {
-         set_chunk_type(pc, CT_FUNCTION);
-         set_chunk_parent(pc, CT_FIXED);
-      }
-      else if (chunk_is_token(pc, CT_TYPE))
-      {
-         /*
-          * If we are on a type, then we are either on a C++ style cast, an
-          * array reference, a function or we are on a function type.
-          * The only way to tell for sure is to find the close paren and see
-          * if it is followed by an open paren.
-          * "int(5.6)"
-          * "int()"
-          * "int(foo)(void)"
-          *
-          * FIXME: this check can be done better...
-          */
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-
-         bool is_byref_array = false;
-
-         if (language_is_set(LANG_CPP))
-         {
-            // If the open paren is followed by an ampersand, an optional word,
-            // a close parenthesis, and an open square bracket, then it is an
-            // array being passed by reference, not a cast
-            tmp = chunk_get_next_ncnnl(next);
-
-            if (chunk_is_token(tmp, CT_AMP))
-            {
-               auto tmp2 = chunk_get_next_ncnnl(tmp);
-
-               if (chunk_is_token(tmp2, CT_WORD))
-               {
-                  tmp2 = chunk_get_next_ncnnl(tmp2);
-               }
-
-               if (chunk_is_token(tmp2, CT_PAREN_CLOSE))
-               {
-                  tmp2 = chunk_get_next_ncnnl(tmp2);
-
-                  if (chunk_is_token(tmp2, CT_SQUARE_OPEN))
-                  {
-                     is_byref_array = true;
-                     set_chunk_type(tmp, CT_BYREF);
-                  }
-               }
-            }
-         }
-
-         if (!is_byref_array)
-         {
-            tmp = chunk_get_next_type(next, CT_PAREN_CLOSE, next->level);
-
-            if (tmp != nullptr)
-            {
-               tmp = chunk_get_next(tmp);
-
-               if (chunk_is_token(tmp, CT_PAREN_OPEN))
-               {
-                  set_chunk_type(pc, CT_FUNCTION);
-               }
-               else
-               {
-                  if (  get_chunk_parent_type(pc) == CT_NONE
-                     && !pc->flags.test(PCF_IN_TYPEDEF))
-                  {
-                     tmp = chunk_get_next_ncnnl(next);
-
-                     if (chunk_is_token(tmp, CT_PAREN_CLOSE))
-                     {
-                        // we have TYPE()
-                        set_chunk_type(pc, CT_FUNCTION);
-                     }
-                     else
-                     {
-                        // we have TYPE(...)
-                        set_chunk_type(pc, CT_CPP_CAST);
-                        set_paren_parent(next, CT_CPP_CAST);
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-
-   if (language_is_set(LANG_PAWN))
-   {
-      if (  chunk_is_token(pc, CT_FUNCTION)
-         && pc->brace_level > 0)
-      {
-         LOG_FMT(LFCN, "%s(%d): (2) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         set_chunk_type(pc, CT_FUNC_CALL);
-      }
-
-      if (  chunk_is_token(pc, CT_STATE)
-         && chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         set_paren_parent(next, pc->type);
-      }
-   }
-   else
-   {
-      if (  (  chunk_is_token(pc, CT_FUNCTION)
-            || chunk_is_token(pc, CT_FUNC_DEF))
-         && (  (get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR)
-            || !is_oc_block(pc)))
-      {
-         mark_function(pc);
-      }
-   }
-
-   // Detect C99 member stuff
-   if (  chunk_is_token(pc, CT_MEMBER)
-      && (  chunk_is_token(prev, CT_COMMA)
-         || chunk_is_token(prev, CT_BRACE_OPEN)))
-   {
-      set_chunk_type(pc, CT_C99_MEMBER);
-      set_chunk_parent(next, CT_C99_MEMBER);
-   }
-
-   // Mark function parens and braces
-   if (  chunk_is_token(pc, CT_FUNC_DEF)
-      || chunk_is_token(pc, CT_FUNC_CALL)
-      || chunk_is_token(pc, CT_FUNC_CALL_USER)
-      || chunk_is_token(pc, CT_FUNC_PROTO))
-   {
-      chunk_t *tmp = next;
-
-      if (chunk_is_token(tmp, CT_SQUARE_OPEN))
-      {
-         tmp = set_paren_parent(tmp, pc->type);
-      }
-      else if (  chunk_is_token(tmp, CT_TSQUARE)
-              || get_chunk_parent_type(tmp) == CT_OPERATOR)
-      {
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-
-      if (tmp != nullptr)
-      {
-         if (chunk_is_paren_open(tmp))
-         {
-            tmp = flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, pc->type, false);
-
-            if (tmp != nullptr)
-            {
-               if (chunk_is_token(tmp, CT_BRACE_OPEN))
-               {
-                  if (  get_chunk_parent_type(tmp) != CT_DOUBLE_BRACE
-                     && !pc->flags.test(PCF_IN_CONST_ARGS))
-                  {
-                     set_paren_parent(tmp, pc->type);
-                  }
-               }
-               else if (  chunk_is_semicolon(tmp)
-                       && chunk_is_token(pc, CT_FUNC_PROTO))
-               {
-                  set_chunk_parent(tmp, pc->type);
-               }
-            }
-         }
-      }
-   }
-
-   // Mark the parameters in catch()
-   if (  chunk_is_token(pc, CT_CATCH)
-      && chunk_is_token(next, CT_SPAREN_OPEN))
-   {
-      fix_fcn_def_params(next);
-   }
-
-   if (  chunk_is_token(pc, CT_THROW)
-      && chunk_is_token(prev, CT_FPAREN_CLOSE))
-   {
-      set_chunk_parent(pc, get_chunk_parent_type(prev));
-
-      if (chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         set_paren_parent(next, CT_THROW);
-      }
-   }
-
-   // Mark the braces in: "for_each_entry(xxx) { }"
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      && get_chunk_parent_type(pc) != CT_DOUBLE_BRACE
-      && chunk_is_token(prev, CT_FPAREN_CLOSE)
-      && (  get_chunk_parent_type(prev) == CT_FUNC_CALL
-         || get_chunk_parent_type(prev) == CT_FUNC_CALL_USER)
-      && !pc->flags.test(PCF_IN_CONST_ARGS))
-   {
-      LOG_FMT(LFCN, "%s(%d): (3) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      set_paren_parent(pc, CT_FUNC_CALL);
-   }
-
-   /*
-    * Check for a close parenthesis followed by an open parenthesis,
-    * which means that we are on a function type declaration (C/C++ only?).
-    * Note that typedefs are already taken care of.
-    */
-   if (  !pc->flags.test_any(PCF_IN_TYPEDEF | PCF_IN_TEMPLATE)
-      && get_chunk_parent_type(pc) != CT_CPP_CAST
-      && get_chunk_parent_type(pc) != CT_C_CAST
-      && !pc->flags.test(PCF_IN_PREPROC)
-      && !is_oc_block(pc)
-      && get_chunk_parent_type(pc) != CT_OC_MSG_DECL
-      && get_chunk_parent_type(pc) != CT_OC_MSG_SPEC
-      && chunk_is_str(pc, ")", 1)
-      && chunk_is_str(next, "(", 1))
-   {
-      if (language_is_set(LANG_D))
-      {
-         flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
-      }
-      else
-      {
-         mark_function_type(pc);
-      }
-   }
-
-   if (chunk_is_token(pc, CT_OC_CLASS))
-   {
-      handle_oc_class(pc);
-   }
-   // TODO: Check for stuff that can only occur at the start of an statement
-
-   if (!language_is_set(LANG_D))
-   {
-      /*
-       * Check a parenthesis pair to see if it is a cast.
-       * Note that SPAREN and FPAREN have already been marked.
-       */
-      if (  chunk_is_token(pc, CT_PAREN_OPEN)
-         && (  get_chunk_parent_type(pc) == CT_NONE
-            || get_chunk_parent_type(pc) == CT_OC_MSG
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR
-            || get_chunk_parent_type(pc) == CT_CS_SQ_STMT)           // Issue # 1256
-         && (  chunk_is_token(next, CT_WORD)
-            || chunk_is_token(next, CT_TYPE)
-            || chunk_is_token(next, CT_STRUCT)
-            || chunk_is_token(next, CT_QUALIFIER)
-            || chunk_is_token(next, CT_MEMBER)
-            || chunk_is_token(next, CT_DC_MEMBER)
-            || chunk_is_token(next, CT_ENUM)
-            || chunk_is_token(next, CT_UNION))
-         && chunk_is_not_token(prev, CT_DECLTYPE)
-         && chunk_is_not_token(prev, CT_SIZEOF)
-         && get_chunk_parent_type(prev) != CT_SIZEOF
-         && get_chunk_parent_type(prev) != CT_OPERATOR
-         && !pc->flags.test(PCF_IN_TYPEDEF))
-      {
-         fix_casts(pc);
-      }
-   }
-
-   if (language_is_set(LANG_CPP))
-   {
-      chunk_t *nnext = chunk_get_next_ncnnl(next);
-
-      // handle parent_type of assigns in special functions (ro5 + pure virtual)
-      if (  pc->flags.test_any(PCF_IN_STRUCT | PCF_IN_CLASS)
-         && chunk_is_token(pc, CT_ASSIGN)
-         && chunk_is_token(nnext, CT_SEMICOLON)
-         && (  chunk_is_token(next, CT_DEFAULT)
-            || chunk_is_token(next, CT_DELETE)
-            || (  chunk_is_token(next, CT_NUMBER)
-               && chunk_is_str(next, "0", 1))))
-      {
-         const size_t level        = pc->level;
-         bool         found_status = false;
-         chunk_t      *pprev       = chunk_get_prev(pc);
-
-         for ( ; (  pprev != nullptr
-                 && pprev->level >= level
-                 && chunk_is_not_token(pprev, CT_SEMICOLON)
-                 && chunk_is_not_token(pprev, CT_ACCESS_COLON))
-               ; pprev = chunk_get_prev(pprev))
-         {
-            if (pprev->level != level)
-            {
-               continue;
-            }
-
-            if (chunk_is_token(next, CT_NUMBER))
-            {
-               if (  chunk_is_token(pprev, CT_QUALIFIER)
-                  && chunk_is_str(pprev, "virtual", 7))
-               {
-                  found_status = true;
-                  break;
-               }
-            }
-            else
-            {
-               if (  chunk_is_token(pprev, CT_FUNC_CLASS_PROTO)  // ctor/dtor
-                  || chunk_is_token(pprev, CT_FUNC_PROTO))       // normal function
-               {
-                  found_status = true;
-                  break;
-               }
-            }
-         }
-
-         if (found_status)
-         {
-            set_chunk_parent(pc, pprev->type);
-         }
-      }
-
-      if (detect_cpp_braced_init_list(pc, next))
-      {
-         flag_cpp_braced_init_list(pc, next);
-      }
-   }
-
-   // Check for stuff that can only occur at the start of an expression
-   if (  pc->flags.test(PCF_EXPR_START)
-      || (  prev->flags.test(PCF_EXPR_START)
-         && get_chunk_parent_type(pc) == CT_OC_AT))
-   {
-      // Change STAR, MINUS, and PLUS in the easy cases
-      if (chunk_is_token(pc, CT_STAR))
-      {
-         // issue #596
-         // [0x100062020:IN_SPAREN,IN_FOR,STMT_START,EXPR_START,PUNCTUATOR]
-         // prev->type is CT_COLON ==> CT_DEREF
-         if (chunk_is_token(prev, CT_ANGLE_CLOSE))
-         {
-            set_chunk_type(pc, CT_PTR_TYPE);
-         }
-         else if (chunk_is_token(prev, CT_COLON))
-         {
-            set_chunk_type(pc, CT_DEREF);
-         }
-         else
-         {
-            set_chunk_type(pc, CT_DEREF);
-         }
-      }
-
-      if (  language_is_set(LANG_CPP)
-         && chunk_is_token(pc, CT_CARET)
-         && chunk_is_token(prev, CT_ANGLE_CLOSE))
-      {
-         set_chunk_type(pc, CT_PTR_TYPE);
-      }
-
-      if (  language_is_set(LANG_CS)
-         && chunk_is_token(pc, CT_QUESTION)
-         && chunk_is_token(prev, CT_ANGLE_CLOSE))
-      {
-         set_chunk_type(pc, CT_PTR_TYPE);
-      }
-
-      if (chunk_is_token(pc, CT_MINUS))
-      {
-         set_chunk_type(pc, CT_NEG);
-      }
-
-      if (chunk_is_token(pc, CT_PLUS))
-      {
-         set_chunk_type(pc, CT_POS);
-      }
-
-      if (chunk_is_token(pc, CT_INCDEC_AFTER))
-      {
-         set_chunk_type(pc, CT_INCDEC_BEFORE);
-      }
-
-      if (chunk_is_token(pc, CT_AMP))
-      {
-         if (chunk_is_token(prev, CT_ANGLE_CLOSE))             // Issue #2324
-         {
-            set_chunk_type(pc, CT_BYREF);
-         }
-         else
-         {
-            set_chunk_type(pc, CT_ADDR);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_CARET))
-      {
-         if (language_is_set(LANG_C | LANG_CPP | LANG_OC))
-         {
-            // This is likely the start of a block literal
-            handle_oc_block_literal(pc);
-         }
-      }
-   }
-
-   /*
-    * Change the parenthesis pair after a function/macro-function
-    * CT_PAREN_OPEN => CT_FPAREN_OPEN
-    */
-   if (chunk_is_token(pc, CT_MACRO_FUNC))
-   {
-      flag_parens(next, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_MACRO_FUNC, false);
-   }
-
-   if (  chunk_is_token(pc, CT_MACRO_OPEN)
-      || chunk_is_token(pc, CT_MACRO_ELSE)
-      || chunk_is_token(pc, CT_MACRO_CLOSE))
-   {
-      if (chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, pc->type, false);
-      }
-   }
-
-   if (  chunk_is_token(pc, CT_DELETE)
-      && chunk_is_token(next, CT_TSQUARE))
-   {
-      set_chunk_parent(next, CT_DELETE);
-   }
-
-   // Change CT_STAR to CT_PTR_TYPE or CT_ARITH or CT_DEREF
-   if (  chunk_is_token(pc, CT_STAR)
-      || (  language_is_set(LANG_CPP)
-         && chunk_is_token(pc, CT_CARET)))
-   {
-      if (  chunk_is_paren_close(next)
-         || chunk_is_token(next, CT_COMMA))
-      {
-         set_chunk_type(pc, CT_PTR_TYPE);
-      }
-      else if (  language_is_set(LANG_OC)
-              && chunk_is_token(next, CT_STAR))
-      {
-         /*
-          * Change pointer-to-pointer types in OC_MSG_DECLs
-          * from ARITH <===> DEREF to PTR_TYPE <===> PTR_TYPE
-          */
-         set_chunk_type(pc, CT_PTR_TYPE);
-         set_chunk_parent(pc, get_chunk_parent_type(prev));
-
-         set_chunk_type(next, CT_PTR_TYPE);
-         set_chunk_parent(next, get_chunk_parent_type(pc));
-      }
-      else if (  chunk_is_token(pc, CT_STAR)
-              && (  chunk_is_token(prev, CT_DECLTYPE)
-                 || chunk_is_token(prev, CT_SIZEOF)
-                 || chunk_is_token(prev, CT_DELETE)
-                 || get_chunk_parent_type(pc) == CT_SIZEOF))
-      {
-         set_chunk_type(pc, CT_DEREF);
-      }
-      else if (  (  chunk_is_token(prev, CT_WORD)
-                 && chunk_ends_type(prev)
-                 && !prev->flags.test(PCF_IN_FCN_CTOR))
-              || chunk_is_token(prev, CT_DC_MEMBER)
-              || chunk_is_token(prev, CT_PTR_TYPE))
-      {
-         LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n   ",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         log_pcf_flags(LFCNR, pc->flags);
-         set_chunk_type(pc, CT_PTR_TYPE);
-      }
-      else if (  chunk_is_token(next, CT_SQUARE_OPEN)
-              && !language_is_set(LANG_OC))  // Issue #408
-      {
-         set_chunk_type(pc, CT_PTR_TYPE);
-      }
-      else if (chunk_is_token(pc, CT_STAR))
-      {
-         // Add check for CT_DC_MEMBER CT_WORD CT_STAR sequence
-         // to convert CT_WORD into CT_TYPE
-         // and CT_STAR into CT_PTR_TYPE
-         // look for an assign backward, fuction call, return to distinguish between
-         //    double result = Constants::PI * factor;
-         // and
-         //    ::some::name * foo;
-         if (  chunk_is_token(prev, CT_WORD)
-            && chunk_is_token(prev->prev, CT_DC_MEMBER)
-            && language_is_set(LANG_CPP))
-         {
-            // Issue 1402
-            bool    is_multiplication = false;
-            chunk_t *tmp              = pc;
-
-            while (tmp != nullptr)
-            {
-               if (  chunk_is_token(tmp, CT_SEMICOLON)
-                  || get_chunk_parent_type(tmp) == CT_CLASS)
-               {
-                  break;
-               }
-               else if (  chunk_is_token(tmp, CT_ASSIGN)
-                       || chunk_is_token(tmp, CT_FUNC_CALL)
-                       || chunk_is_token(tmp, CT_RETURN))
-               {
-                  is_multiplication = true;
-                  break;
-               }
-               tmp = chunk_get_prev_ncnnlni(tmp); // Issue #2279
-            }
-
-            if (is_multiplication)
-            {
-               // double result = Constants::PI * factor;
-               set_chunk_type(pc, CT_ARITH);
-            }
-            else
-            {
-               //    ::some::name * foo;
-               set_chunk_type(prev, CT_TYPE);
-               set_chunk_type(pc, CT_PTR_TYPE);
-            }
-         }
-
-         /*
-          * A star can have three meanings
-          * 1. CT_DEREF    = pointer dereferencing
-          * 2. CT_PTR_TYPE = pointer definition
-          * 3. CT_ARITH    = arithmetic multiplication
-          *
-          * most PCF_PUNCTUATOR chunks except a paren close would make this
-          * a deref. A paren close may end a cast or may be part of a macro fcn.
-          */
-         if (chunk_is_token(prev, CT_TYPE))
-         {
-            set_chunk_type(pc, CT_PTR_TYPE);
-         }
-         else if (  chunk_is_token(pc->next, CT_SEMICOLON)      // Issue #2319
-                 || (  chunk_is_token(pc->next, CT_STAR)
-                    && chunk_is_token(pc->next->next, CT_SEMICOLON)))
-         {
-            // example:
-            //    using AbstractLinkPtr = AbstractLink*;
-            //    using AbstractLinkPtrPtr = AbstractLink**;
-            set_chunk_type(pc, CT_PTR_TYPE);
-         }
-         else if (  (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-                    && (  chunk_is_opening_brace(next)
-                       || chunk_is_star(pc->next)))
-                 || chunk_is_token(next, CT_QUALIFIER))               // Issue #2648
-         {
-            // example:
-            // auto getComponent(Color *color) -> Component * {
-            // auto getComponent(Color *color) -> Component ** {
-            // auto getComponent(Color *color) -> Component * _Nonnull
-            set_chunk_type(pc, CT_PTR_TYPE);
-         }
-         else if (  chunk_is_token(pc->next, CT_SEMICOLON)      // Issue #2319
-                 || (  chunk_is_token(pc->next, CT_STAR)
-                    && chunk_is_token(pc->next->next, CT_STAR)))
-         {
-            // more pointers are NOT yet possible
-            fprintf(stderr, "Too many pointers\n");
-            fprintf(stderr, "at line %zu, column %zu.\n", pc->orig_line, pc->orig_col);
-            fprintf(stderr, "Please make a report.\n");
-            log_flush(true);
-            exit(EX_SOFTWARE);
-         }
-         else
-         {
-            // Issue 1402
-            set_chunk_type(pc,
-                           (  prev->flags.test(PCF_PUNCTUATOR)
-                           && (  !chunk_is_paren_close(prev)
-                              || chunk_is_token(prev, CT_SPAREN_CLOSE)
-                              || get_chunk_parent_type(prev) == CT_MACRO_FUNC)
-                           && chunk_is_not_token(prev, CT_SQUARE_CLOSE)
-                           && chunk_is_not_token(prev, CT_DC_MEMBER)) ? CT_DEREF : CT_ARITH);
-         }
-
-         if (pc->flags.test(PCF_IN_TYPEDEF))  // Issue #1255/#633
-         {
-            chunk_t *tmp = pc;
-
-            while (tmp != nullptr)
-            {
-               if (  chunk_is_token(tmp, CT_SEMICOLON)
-                  || chunk_is_token(tmp, CT_BRACE_OPEN))
-               {
-                  break;
-               }
-               else if (chunk_is_token(tmp, CT_TYPEDEF))
-               {
-                  set_chunk_type(pc, CT_PTR_TYPE);
-               }
-               tmp = chunk_get_prev_ncnnlni(tmp); // Issue #2279
-            }
-         }
-      }
-   }
-
-   if (chunk_is_token(pc, CT_AMP))
-   {
-      if (chunk_is_token(prev, CT_DELETE))
-      {
-         set_chunk_type(pc, CT_ADDR);
-      }
-      else if (  chunk_is_token(prev, CT_TYPE)
-              || chunk_is_token(prev, CT_QUALIFIER))
-      {
-         set_chunk_type(pc, CT_BYREF);
-      }
-      else if (  chunk_is_token(next, CT_FPAREN_CLOSE)
-              || chunk_is_token(next, CT_COMMA))
-      {
-         // fix the bug #654
-         // connect(&mapper, SIGNAL(mapped(QString &)), this, SLOT(onSomeEvent(QString &)));
-         set_chunk_type(pc, CT_BYREF);
-      }
-      else if (get_chunk_parent_type(pc) == CT_USING_ALIAS)
-      {
-         // fix the Issue # 1689
-         // using reference = value_type &;
-         set_chunk_type(pc->prev, CT_TYPE);
-         set_chunk_type(pc, CT_BYREF);
-      }
-      else
-      {
-         // Issue # 1398
-         if (  pc->flags.test(PCF_IN_FCN_DEF)
-            && chunk_is_token(prev, CT_WORD)
-            && chunk_is_token(pc, CT_AMP)
-            && chunk_is_token(next, CT_WORD))
-         {
-            /*
-             * Change CT_WORD before CT_AMP before CT_WORD to CT_TYPE
-             */
-            set_chunk_type(prev, CT_TYPE);
-         }
-         else
-         {
-            set_chunk_type(pc, CT_ARITH);
-
-            if (chunk_is_token(prev, CT_WORD))
-            {
-               chunk_t *tmp = chunk_get_prev_ncnnlni(prev); // Issue #2279
-
-               if (tmp != nullptr)
-               {
-                  if (  chunk_is_semicolon(tmp)
-                     || chunk_is_token(tmp, CT_BRACE_OPEN)
-                     || chunk_is_token(tmp, CT_QUALIFIER))
-                  {
-                     set_chunk_type(pc, CT_BYREF);
-                     set_chunk_type(prev, CT_TYPE);
-
-                     if (!(  chunk_is_token(next, CT_OPERATOR)
-                          || chunk_is_token(next, CT_TYPE)
-                          || chunk_is_token(next, CT_DC_MEMBER)))
-                     {
-                        LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', set PCF_VAR_1ST\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-                        chunk_flags_set(next, PCF_VAR_1ST);
-                     }
-                  }
-                  else if (chunk_is_token(tmp, CT_DC_MEMBER))
-                  {
-                     set_chunk_type(prev, CT_TYPE);
-
-                     if (chunk_is_not_token(next, CT_TYPE))            // Issue #2103
-                     {
-                        set_chunk_type(pc, CT_BYREF);
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-
-   if (  chunk_is_token(pc, CT_MINUS)
-      || chunk_is_token(pc, CT_PLUS))
-   {
-      if (  chunk_is_token(prev, CT_POS)
-         || chunk_is_token(prev, CT_NEG)
-         || chunk_is_token(prev, CT_ARITH)
-         || chunk_is_token(prev, CT_SHIFT))
-      {
-         set_chunk_type(pc, chunk_is_token(pc, CT_MINUS) ? CT_NEG : CT_POS);
-      }
-      else if (chunk_is_token(prev, CT_OC_CLASS))
-      {
-         set_chunk_type(pc, (chunk_is_token(pc, CT_MINUS)) ? CT_NEG : CT_POS);
-      }
-      else
-      {
-         set_chunk_type(pc, CT_ARITH);
-      }
-   }
-
-   /*
-    * Bug # 634
-    * Check for extern "C" NSString* i;
-    * NSString is a type
-    * change CT_WORD => CT_TYPE     for pc
-    * change CT_STAR => CT_PTR_TYPE for pc-next
-    */
-   if (chunk_is_token(pc, CT_WORD))     // here NSString
-   {
-      if (pc->next != nullptr)          // here *
-      {
-         if (pc->next->type == CT_STAR) // here *
-         {
-            // compare text with "C" to find extern "C" instructions
-            if (pc->prev != nullptr)
-            {
-               if (pc->prev->type == CT_STRING)
-               {
-                  if (unc_text::compare(pc->prev->text(), "\"C\"") == 0)
-                  {
-                     if (pc->prev->prev->type == CT_EXTERN)
-                     {
-                        set_chunk_type(pc, CT_TYPE);            // change CT_WORD => CT_TYPE
-                        set_chunk_type(pc->next, CT_PTR_TYPE);  // change CT_STAR => CT_PTR_TYPE
-                     }
-                  }
-               }
-            }
-
-            // Issue #322 STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
-            if (  (pc->next->next != nullptr)
-               && pc->next->next->type == CT_STAR
-               && pc->flags.test(PCF_IN_CONST_ARGS))
-            {
-               // change CT_STAR => CT_PTR_TYPE
-               set_chunk_type(pc->next, CT_PTR_TYPE);
-               set_chunk_type(pc->next->next, CT_PTR_TYPE);
-            }
-
-            // Issue #222 whatever3 *(func_ptr)( whatever4 *foo2, ...
-            if (  (pc->next->next != nullptr)
-               && pc->next->next->type == CT_WORD
-               && pc->flags.test(PCF_IN_FCN_DEF))
-            {
-               // look for the opening parenthesis
-               // Issue 1403
-               chunk_t *tmp = chunk_get_prev_type(pc, CT_FPAREN_OPEN, pc->level - 1);
-
-               if (  tmp != nullptr
-                  && get_chunk_parent_type(tmp) != CT_FUNC_CTOR_VAR)
-               {
-                  set_chunk_type(pc->next, CT_PTR_TYPE);
-               }
-            }
-         }
-      }
-   }
-
-   /*
-    * Bug # 634
-    * Check for __attribute__((visibility ("default"))) NSString* i;
-    * NSString is a type
-    * change CT_WORD => CT_TYPE     for pc
-    * change CT_STAR => CT_PTR_TYPE for pc-next
-    */
-   if (chunk_is_token(pc, CT_WORD))     // here NSString
-   {
-      if (pc->next != nullptr)          // here *
-      {
-         if (pc->next->type == CT_STAR) // here *
-         {
-            chunk_t *tmp = pc;
-
-            while ((tmp != nullptr))
-            {
-               if (chunk_is_token(tmp, CT_ATTRIBUTE))
-               {
-                  LOG_FMT(LFCNR, "%s(%d): ATTRIBUTE found, type is %s, text() '%s'\n",
-                          __func__, __LINE__, get_token_name(tmp->type), tmp->text());
-                  LOG_FMT(LFCNR, "for token, type is %s, text() '%s'\n", get_token_name(pc->type), pc->text());
-                  // change CT_WORD => CT_TYPE
-                  set_chunk_type(pc, CT_TYPE);
-                  // change CT_STAR => CT_PTR_TYPE
-                  set_chunk_type(pc->next, CT_PTR_TYPE);
-               }
-
-               if (tmp->flags.test(PCF_STMT_START))
-               {
-                  // we are at beginning of the line
-                  break;
-               }
-               tmp = chunk_get_prev(tmp);
-            }
-         }
-      }
-   }
-
-   /*
-    * Issue # 1689
-    * Check for using reference = value_type&;
-    * is it a Type alias, alias template?
-    */
-   if (chunk_is_token(pc, CT_USING))
-   {
-      // look for CT_ASSIGN before CT_SEMICOLON at the end of the statement
-
-      bool       is_preproc = pc->flags.test(PCF_IN_PREPROC);
-
-      auto const search_assign = [&pc, &is_preproc]()
-      {
-         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnnl(temp))
-         {
-            LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                    __func__, __LINE__, temp->orig_line, temp->orig_col,
-                    temp->text(), get_token_name(temp->type));
-
-            if (chunk_is_token(temp, CT_ASSIGN))
-            {
-               return(true);
-            }
-
-            if (  chunk_is_token(temp, CT_SEMICOLON)
-               || (  is_preproc
-                  && (  !temp->flags.test(PCF_IN_PREPROC)
-                     || chunk_is_token(temp, CT_PREPROC))))
-            {
-               return(false);
-            }
-         }
-
-         return(false);
-      };
-
-      const bool assign_found = language_is_set(LANG_D) || search_assign();
-
-      if (assign_found)
-      {
-         // it is a Type alias, alias template
-         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnnl(temp))
-         {
-            if (get_chunk_parent_type(temp) == CT_NONE)
-            {
-               set_chunk_parent(temp, CT_USING_ALIAS);
-            }
-
-            if (  chunk_is_token(temp, CT_SEMICOLON)
-               || (  is_preproc
-                  && (  !temp->flags.test(PCF_IN_PREPROC)
-                     || chunk_is_token(temp, CT_PREPROC))))
-            {
-               break;
-            }
-         }
-      }
-   }
-
-   // Issue #548: inline T && someFunc(foo * *p, bar && q) { }
-   if (  chunk_is_token(pc, CT_BOOL)
-      && !pc->flags.test(PCF_IN_PREPROC)
-      && chunk_is_str(pc, "&&", 2)
-      && chunk_ends_type(pc->prev))
-   {
-      chunk_t *tmp = chunk_get_prev(pc);                 // Issue #2688
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-              __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-              tmp->text(), get_token_name(tmp->type));
-      log_pcf_flags(LFCNR, tmp->flags);
-      // look for a type
-
-      if (chunk_is_token(tmp, CT_TYPE))
-      {
-         log_pcf_flags(LFCNR, pc->flags);
-         set_chunk_type(pc, CT_BYREF);
-      }
-      // look next, is there a "assign" before the ";"
-      chunk_t *semi = chunk_get_next_type(pc, CT_SEMICOLON, pc->level);                // Issue #2688
-
-      if (semi != nullptr)
-      {
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                 __func__, __LINE__, semi->orig_line, semi->orig_col,
-                 semi->text(), get_token_name(semi->type));
-
-         for (chunk_t *test_it = pc; test_it != semi; test_it = chunk_get_next(test_it))
-         {
-            LOG_FMT(LFCNR, "%s(%d): test_it->orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                    __func__, __LINE__, test_it->orig_line, test_it->orig_col,
-                    test_it->text(), get_token_name(test_it->type));
-
-            if (chunk_is_token(test_it, CT_ASSIGN))
-            {
-               // the statement is an assigment
-               // && is before assign
-               set_chunk_type(pc, CT_BYREF);
-               break;
-            }
-         }
-      }
-   }
-
-   // Issue #1704
-   if (  chunk_is_token(pc, CT_INCDEC_AFTER)
-      && pc->flags.test(PCF_IN_PREPROC))
-   {
-      chunk_t *tmp_2 = chunk_get_next(pc);
-      log_pcf_flags(LFTYPE, pc->flags);
-
-      if (chunk_is_token(tmp_2, CT_WORD))
-      {
-         set_chunk_type(pc, CT_INCDEC_BEFORE);
-      }
-   }
-} // do_symbol_check
-
-
-static void check_double_brace_init(chunk_t *bo1)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LJDBI, "%s(%d): orig_line is %zu, orig_col is %zu", __func__, __LINE__, bo1->orig_line, bo1->orig_col);
-   chunk_t *pc = chunk_get_prev_ncnnlni(bo1);   // Issue #2279
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   if (chunk_is_paren_close(pc))
-   {
-      chunk_t *bo2 = chunk_get_next(bo1);
-
-      if (bo2 == nullptr)
-      {
-         return;
-      }
-
-      if (chunk_is_token(bo2, CT_BRACE_OPEN))
-      {
-         // found a potential double brace
-         chunk_t *bc2 = chunk_skip_to_match(bo2);
-
-         if (bc2 == nullptr)
-         {
-            return;
-         }
-         chunk_t *bc1 = chunk_get_next(bc2);
-
-         if (bc1 == nullptr)
-         {
-            return;
-         }
-
-         if (chunk_is_token(bc1, CT_BRACE_CLOSE))
-         {
-            LOG_FMT(LJDBI, " - end, orig_line is %zu, orig_col is %zu\n", bc2->orig_line, bc2->orig_col);
-            // delete bo2 and bc1
-            bo1->str         += bo2->str;
-            bo1->orig_col_end = bo2->orig_col_end;
-            chunk_del(bo2);
-            set_chunk_parent(bo1, CT_DOUBLE_BRACE);
-
-            bc2->str         += bc1->str;
-            bc2->orig_col_end = bc1->orig_col_end;
-            chunk_del(bc1);
-            set_chunk_parent(bc2, CT_DOUBLE_BRACE);
-            return;
-         }
-      }
-   }
-   LOG_FMT(LJDBI, " - no\n");
-} // check_double_brace_init
-
-
-void fix_symbols(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc;
-   chunk_t dummy;
-
-   cpd.unc_stage = unc_stage_e::FIX_SYMBOLS;
-
-   mark_define_expressions();
-
-   bool is_cpp  = language_is_set(LANG_CPP);
-   bool is_java = language_is_set(LANG_JAVA);
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (  chunk_is_token(pc, CT_FUNC_WRAP)
-         || chunk_is_token(pc, CT_TYPE_WRAP))
-      {
-         handle_wrap(pc);
-      }
-
-      if (chunk_is_token(pc, CT_ASSIGN))
-      {
-         mark_lvalue(pc);
-      }
-      // a brace immediately preceded by word in C++11 is an initializer list though it may also
-      // by a type casting initializer list if the word is really a type; sadly uncrustify knows
-      // only built-in types and knows nothing of user-defined types
-      chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-
-      if (  is_cpp
-         && chunk_is_token(pc, CT_BRACE_OPEN)
-         && (  chunk_is_token(prev, CT_WORD)
-            || chunk_is_token(prev, CT_TYPE)))
-      {
-         mark_lvalue(pc);
-      }
-
-      if (  is_java
-         && chunk_is_token(pc, CT_BRACE_OPEN))
-      {
-         check_double_brace_init(pc);
-      }
-
-      if (chunk_is_token(pc, CT_ATTRIBUTE))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-         if (  next != nullptr
-            && chunk_is_token(next, CT_PAREN_OPEN))
-         {
-            flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, CT_ATTRIBUTE, false);
-         }
-      }
-   }
-
-   pc = chunk_get_head();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   if (  chunk_is_newline(pc)
-      || chunk_is_comment(pc))
-   {
-      pc = chunk_get_next_ncnnl(pc);
-   }
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_token(pc, CT_IGNORED))
-      {
-         pc = chunk_get_next_ncnnl(pc);
-         continue;
-      }
-      LOG_FMT(LFCNR, "%s(%d): pc->orig_line       is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      chunk_t *prev = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);   // Issue #2279
-
-      if (prev == nullptr)
-      {
-         prev = &dummy;
-      }
-      else
-      {
-         // Issue #2279
-         LOG_FMT(LFCNR, "%s(%d): prev(ni)->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text(), get_token_name(prev->type));
-      }
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-      if (next == nullptr)
-      {
-         next = &dummy;
-      }
-      else
-      {
-         // Issue #2279
-         LOG_FMT(LFCNR, "%s(%d): next->orig_line     is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->text(), get_token_name(next->type));
-      }
-      LOG_FMT(LFCNR, "%s(%d): do_symbol_check(%s, %s, %s)\n",
-              __func__, __LINE__, prev->text(), pc->text(), next->text());
-      do_symbol_check(prev, pc, next);
-      pc = chunk_get_next_ncnnl(pc);
-   }
-   pawn_add_virtual_semicolons();
-   process_returns();
-
-   /*
-    * 2nd pass - handle variable definitions
-    * REVISIT: We need function params marked to do this (?)
-    */
-   pc = chunk_get_head();
-   int square_level = -1;
-
-   while (pc != nullptr)
-   {
-      char copy[1000];
-      LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type), get_token_name(pc->parent_type));
-
-      // Can't have a variable definition inside [ ]
-      if (square_level < 0)
-      {
-         if (chunk_is_token(pc, CT_SQUARE_OPEN))
-         {
-            square_level = pc->level;
-         }
-      }
-      else
-      {
-         if (pc->level <= static_cast<size_t>(square_level))
-         {
-            square_level = -1;
-         }
-      }
-
-      if (  chunk_is_token(pc, CT_EXTERN)
-         && language_is_set(LANG_ALLC))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(next, CT_STRING))
-         {
-            chunk_t *tmp = chunk_get_next_ncnnl(next);
-
-            while (tmp != nullptr)
-            {
-               if (  chunk_is_token(tmp, CT_TYPE)
-                  || chunk_is_token(tmp, CT_BRACE_OPEN)
-                  || chunk_is_token(tmp, CT_ATTRIBUTE))
-               {
-                  break;
-               }
-
-               if (chunk_is_token(tmp, CT_WORD))
-               {
-                  chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
-                  break;
-               }
-               tmp = chunk_get_next_ncnnl(tmp);
-            }
-         }
-      }
-
-      if (  chunk_is_token(pc, CT_ATTRIBUTE)
-         && language_is_set(LANG_ALLC))
-      {
-         chunk_t *tmp = skip_attribute_next(pc);
-
-         if (chunk_is_token(tmp, CT_WORD))
-         {
-            chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
-         }
-      }
-
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)                       // Issue #2332
-         && get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)
-      {
-         LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', look for CT_BRACE_OPEN\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         pc = chunk_get_next_type(pc, CT_BRACE_CLOSE, pc->level);
-      }
-      /*
-       * A variable definition is possible after at the start of a statement
-       * that starts with: DC_MEMBER, QUALIFIER, TYPE, or WORD
-       */
-      // Issue #2279
-      // Issue #2478
-      LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, parent_type is %s\n   ",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type), get_token_name(pc->parent_type));
-      log_pcf_flags(LFCNR, pc->flags);
-
-      if (  (square_level < 0)
-         && pc->flags.test(PCF_STMT_START)
-         && (  chunk_is_token(pc, CT_QUALIFIER)
-            || chunk_is_token(pc, CT_TYPE)
-            || chunk_is_token(pc, CT_TYPENAME)
-            || chunk_is_token(pc, CT_DC_MEMBER)                         // Issue #2478
-            || chunk_is_token(pc, CT_WORD))
-         && get_chunk_parent_type(pc) != CT_BIT_COLON
-         && get_chunk_parent_type(pc) != CT_ENUM
-         && !pc->flags.test(PCF_IN_CLASS_BASE)
-         && !pc->flags.test(PCF_IN_ENUM))
-      {
-         pc = fix_variable_definition(pc);
-      }
-      else
-      {
-         pc = chunk_get_next_ncnnl(pc);
-      }
-   }
-} // fix_symbols
-
-
-static void process_returns(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc;
-
-   pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_not_token(pc, CT_RETURN))
-      {
-         pc = chunk_get_next_type(pc, CT_RETURN, -1);
-         continue;
-      }
-      pc = process_return(pc);
-   }
-}
-
-
-static chunk_t *process_return(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *next;
-   chunk_t *temp;
-   chunk_t *semi;
-   chunk_t *cpar;
-   chunk_t chunk;
-
-   // grab next and bail if it is a semicolon
-   next = chunk_ppa_get_next_ncnnl(pc);
-
-   if (  next == nullptr
-      || chunk_is_semicolon(next)
-      || chunk_is_token(next, CT_NEWLINE))
-   {
-      return(next);
-   }
-   log_rule_B("nl_return_expr");
-
-   if (  options::nl_return_expr() != IARF_IGNORE
-      && !pc->flags.test(PCF_IN_PREPROC))
-   {
-      newline_iarf(pc, options::nl_return_expr());
-   }
-
-   if (chunk_is_token(next, CT_PAREN_OPEN))
-   {
-      // See if the return is fully paren'd
-      cpar = chunk_get_next_type(next, CT_PAREN_CLOSE, next->level);
-
-      if (cpar == nullptr)
-      {
-         return(nullptr);
-      }
-      semi = chunk_ppa_get_next_ncnnl(cpar);
-
-      if (semi == nullptr)
-      {
-         return(nullptr);
-      }
-
-      if (  chunk_is_token(semi, CT_NEWLINE)
-         || chunk_is_semicolon(semi))
-      {
-         log_rule_B("mod_paren_on_return");
-
-         if (options::mod_paren_on_return() == IARF_REMOVE)
-         {
-            LOG_FMT(LRETURN, "%s(%d): removing parens on orig_line %zu\n",
-                    __func__, __LINE__, pc->orig_line);
-
-            // lower the level of everything
-            for (temp = next; temp != cpar; temp = chunk_get_next(temp))
-            {
-               if (temp->level == 0)
-               {
-                  fprintf(stderr, "%s(%d): temp->level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, temp->orig_line, temp->orig_col);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
-               temp->level--;
-            }
-
-            // delete the parenthesis
-            chunk_del(next);
-            chunk_del(cpar);
-
-            // back up following chunks
-            temp = semi;
-
-            while (  temp != nullptr
-                  && chunk_is_not_token(temp, CT_NEWLINE))
-            {
-               temp->column       = temp->column - 2;
-               temp->orig_col     = temp->orig_col - 2;
-               temp->orig_col_end = temp->orig_col_end - 2;
-               temp               = chunk_get_next(temp);
-            }
-         }
-         else
-         {
-            LOG_FMT(LRETURN, "%s(%d): keeping parens on orig_line %zu\n",
-                    __func__, __LINE__, pc->orig_line);
-
-            // mark & keep them
-            set_chunk_parent(next, CT_RETURN);
-            set_chunk_parent(cpar, CT_RETURN);
-         }
-         return(semi);
-      }
-   }
-   // We don't have a fully paren'd return. Should we add some?
-   log_rule_B("mod_paren_on_return");
-
-   if (!(options::mod_paren_on_return() & IARF_ADD))
-   {
-      return(next);
-   }
-
-   // Issue #1917
-   // Never add parens to a braced init list; that breaks the code
-   //   return {args...};    // C++11 type elision; okay
-   //   return ({args...});  // ill-formed
-   if (  language_is_set(LANG_CPP)
-      && chunk_is_token(next, CT_BRACE_OPEN)
-      && get_chunk_parent_type(next) == CT_BRACED_INIT_LIST)
-   {
-      LOG_FMT(LRETURN, "%s(%d): not adding parens around braced initializer"
-              " on orig_line %zd\n",
-              __func__, __LINE__, pc->orig_line);
-      return(next);
-   }
-   // find the next semicolon on the same level
-   semi = next;
-
-   if (pc->flags.test(PCF_IN_PREPROC))
-   {
-      while ((semi = semi->next) != nullptr)
-      {
-         if (!semi->flags.test(PCF_IN_PREPROC))
-         {
-            break;
-         }
-
-         if (semi->level < pc->level)
-         {
-            return(semi);
-         }
-
-         if (  chunk_is_semicolon(semi)
-            && pc->level == semi->level)
-         {
-            break;
-         }
-      }
-   }
-   else
-   {
-      while ((semi = chunk_get_next(semi)) != nullptr)
-      {
-         if (semi->level < pc->level)
-         {
-            return(semi);
-         }
-
-         if (  chunk_is_semicolon(semi)
-            && pc->level == semi->level)
-         {
-            break;
-         }
-      }
-   }
-
-   if (semi)
-   {
-      // add the parenthesis
-      set_chunk_type(&chunk, CT_PAREN_OPEN);
-      set_chunk_parent(&chunk, CT_RETURN);
-      chunk.str         = "(";
-      chunk.level       = pc->level;
-      chunk.pp_level    = pc->pp_level;
-      chunk.brace_level = pc->brace_level;
-      chunk.orig_line   = pc->orig_line;
-      chunk.orig_col    = next->orig_col - 1;
-      chunk.flags       = pc->flags & PCF_COPY_FLAGS;
-      chunk_add_before(&chunk, next);
-
-      set_chunk_type(&chunk, CT_PAREN_CLOSE);
-      chunk.str       = ")";
-      chunk.orig_line = semi->orig_line;
-      chunk.orig_col  = semi->orig_col - 1;
-      cpar            = chunk_add_before(&chunk, semi);
-
-      LOG_FMT(LRETURN, "%s(%d): added parens on orig_line %zu\n",
-              __func__, __LINE__, pc->orig_line);
-
-      for (temp = next; temp != cpar; temp = chunk_get_next(temp))
-      {
-         temp->level++;
-      }
-   }
-   return(semi);
-} // process_return
-
-
-static bool is_oc_block(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && (  get_chunk_parent_type(pc) == CT_OC_BLOCK_TYPE
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK_ARG
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK
-            || chunk_is_token(pc, CT_OC_BLOCK_CARET)
-            || (  pc->next != nullptr
-               && pc->next->type == CT_OC_BLOCK_CARET)
-            || (  pc->prev != nullptr
-               && pc->prev->type == CT_OC_BLOCK_CARET)));
-}
-
-
-void mark_comments(void)
-{
-   LOG_FUNC_ENTRY();
-
-   cpd.unc_stage = unc_stage_e::MARK_COMMENTS;
-
-   bool    prev_nl = true;
-   chunk_t *cur    = chunk_get_head();
-
-   while (cur != nullptr)
-   {
-      chunk_t *next   = chunk_get_next_nvb(cur);
-      bool    next_nl = (next == nullptr) || chunk_is_newline(next);
-
-      if (chunk_is_comment(cur))
-      {
-         if (  next_nl
-            && prev_nl)
-         {
-            set_chunk_parent(cur, CT_COMMENT_WHOLE);
-         }
-         else if (next_nl)
-         {
-            set_chunk_parent(cur, CT_COMMENT_END);
-         }
-         else if (prev_nl)
-         {
-            set_chunk_parent(cur, CT_COMMENT_START);
-         }
-         else
-         {
-            set_chunk_parent(cur, CT_COMMENT_EMBED);
-         }
-      }
-      prev_nl = chunk_is_newline(cur);
-      cur     = next;
-   }
-}
-
-
-static void handle_cpp_template(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *tmp = chunk_get_next_ncnnl(pc);
-
-   if (chunk_is_not_token(tmp, CT_ANGLE_OPEN))
-   {
-      return;
-   }
-   set_chunk_parent(tmp, CT_TEMPLATE);
-
-   size_t level = tmp->level;
-
-   while ((tmp = chunk_get_next(tmp)) != nullptr)
-   {
-      if (  chunk_is_token(tmp, CT_CLASS)
-         || chunk_is_token(tmp, CT_STRUCT))
-      {
-         set_chunk_type(tmp, CT_TYPE);
-      }
-      else if (  chunk_is_token(tmp, CT_ANGLE_CLOSE)
-              && tmp->level == level)
-      {
-         set_chunk_parent(tmp, CT_TEMPLATE);
-         break;
-      }
-   }
-
-   if (tmp != nullptr)
-   {
-      tmp = chunk_get_next_ncnnl(tmp);
-
-      if (chunk_is_token(tmp, CT_FRIEND))
-      {
-         // Account for a template friend declaration
-         set_chunk_parent(tmp, CT_TEMPLATE);
-
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-
-      if (  chunk_is_token(tmp, CT_CLASS)
-         || chunk_is_token(tmp, CT_STRUCT))
-      {
-         set_chunk_parent(tmp, CT_TEMPLATE);
-
-         // REVISIT: This may be a bit risky - might need to track the { };
-         tmp = chunk_get_next_type(tmp, CT_SEMICOLON, tmp->level);
-
-         if (tmp != nullptr)
-         {
-            set_chunk_parent(tmp, CT_TEMPLATE);
-         }
-      }
-   }
-} // handle_cpp_template
-
-
-static void handle_cpp_lambda(chunk_t *sq_o)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *ret = nullptr;
-
-   // abort if type of the previous token is not contained in this whitelist
-   chunk_t *prev = chunk_get_prev_ncnnlni(sq_o);   // Issue #2279
-
-   if (  prev == nullptr
-      || (  chunk_is_not_token(prev, CT_ASSIGN)
-         && chunk_is_not_token(prev, CT_COMMA)
-         && chunk_is_not_token(prev, CT_PAREN_OPEN)   // allow Js like self invoking lambda syntax: ([](){})();
-         && chunk_is_not_token(prev, CT_FPAREN_OPEN)
-         && chunk_is_not_token(prev, CT_SQUARE_OPEN)
-         && chunk_is_not_token(prev, CT_BRACE_OPEN)
-         && chunk_is_not_token(prev, CT_SEMICOLON)
-         && chunk_is_not_token(prev, CT_RETURN)))
-   {
-      return;
-   }
-   chunk_t *sq_c = sq_o; // assuming '[]'
-
-   if (chunk_is_token(sq_o, CT_SQUARE_OPEN))
-   {
-      // make sure there is a ']'
-      sq_c = chunk_skip_to_match(sq_o);
-
-      if (sq_c == nullptr)
-      {
-         return;
-      }
-   }
-   chunk_t *pa_o = chunk_get_next_ncnnl(sq_c);
-
-   // check to see if there is a lambda-specifier in the pa_o chunk;
-   // assuming chunk is CT_EXECUTION_CONTEXT, ignore lambda-specifier
-   while (chunk_is_token(pa_o, CT_EXECUTION_CONTEXT))
-   {
-      // set pa_o to next chunk after this specifier
-      pa_o = chunk_get_next_ncnnl(pa_o);
-   }
-
-   if (pa_o == nullptr)
-   {
-      return;
-   }
-   chunk_t *pa_c = nullptr;
-
-   // lambda-declarator '( params )' is optional
-   if (chunk_is_token(pa_o, CT_PAREN_OPEN))
-   {
-      // and now find the ')'
-      pa_c = chunk_skip_to_match(pa_o);
-
-      if (pa_c == nullptr)
-      {
-         return;
-      }
-   }
-   // Check for 'mutable' keyword: '[]() mutable {}' or []() mutable -> ret {}
-   chunk_t *br_o = pa_c ? chunk_get_next_ncnnl(pa_c) : pa_o;
-
-   if (chunk_is_str(br_o, "mutable", 7))
-   {
-      br_o = chunk_get_next_ncnnl(br_o);
-   }
-   //TODO: also check for exception and attribute between [] ... {}
-
-   // skip possible arrow syntax: '-> ret'
-   if (chunk_is_str(br_o, "->", 2))
-   {
-      ret = br_o;
-      // REVISIT: really should check the stuff we are skipping
-      br_o = chunk_get_next_type(br_o, CT_BRACE_OPEN, br_o->level);
-   }
-
-   if (  br_o == nullptr
-      || chunk_is_not_token(br_o, CT_BRACE_OPEN))
-   {
-      return;
-   }
-   // and now find the '}'
-   chunk_t *br_c = chunk_skip_to_match(br_o);
-
-   if (br_c == nullptr)
-   {
-      return;
-   }
-
-   // This looks like a lambda expression
-   if (chunk_is_token(sq_o, CT_TSQUARE))
-   {
-      // split into two chunks
-      chunk_t nc;
-
-      nc = *sq_o;
-      set_chunk_type(sq_o, CT_SQUARE_OPEN);
-      sq_o->str.resize(1);
-      /*
-       * bug # 664
-       *
-       * The original orig_col of CT_SQUARE_CLOSE is stored at orig_col_end
-       * of CT_TSQUARE. CT_SQUARE_CLOSE orig_col and orig_col_end values
-       * are calculate from orig_col_end of CT_TSQUARE.
-       */
-      nc.orig_col        = sq_o->orig_col_end - 1;
-      nc.column          = static_cast<int>(nc.orig_col);
-      nc.orig_col_end    = sq_o->orig_col_end;
-      sq_o->orig_col_end = sq_o->orig_col + 1;
-
-      set_chunk_type(&nc, CT_SQUARE_CLOSE);
-      nc.str.pop_front();
-      sq_c = chunk_add_after(&nc, sq_o);
-   }
-   set_chunk_parent(sq_o, CT_CPP_LAMBDA);
-   set_chunk_parent(sq_c, CT_CPP_LAMBDA);
-
-   if (pa_c != nullptr)
-   {
-      set_chunk_type(pa_o, CT_LPAREN_OPEN);                    // Issue #3054
-      set_chunk_parent(pa_o, CT_CPP_LAMBDA);
-      chunk_set_parent(pa_o, sq_o);
-      chunk_set_parent(br_o, sq_o);
-      set_chunk_type(pa_c, CT_LPAREN_CLOSE);
-      set_chunk_parent(pa_c, CT_CPP_LAMBDA);
-      chunk_set_parent(pa_c, sq_o);
-      chunk_set_parent(br_c, sq_o);
-   }
-   set_chunk_parent(br_o, CT_CPP_LAMBDA);
-   set_chunk_parent(br_c, CT_CPP_LAMBDA);
-
-   if (ret != nullptr)
-   {
-      set_chunk_type(ret, CT_CPP_LAMBDA_RET);
-      ret = chunk_get_next_ncnnl(ret);
-
-      while (ret != br_o)
-      {
-         make_type(ret);
-         ret = chunk_get_next_ncnnl(ret);
-      }
-   }
-
-   if (pa_c != nullptr)
-   {
-      fix_fcn_def_params(pa_o);
-   }
-   //handle self calling lambda paren
-   chunk_t *call_pa_o = chunk_get_next_ncnnl(br_c);
-
-   if (chunk_is_token(call_pa_o, CT_PAREN_OPEN))
-   {
-      chunk_t *call_pa_c = chunk_skip_to_match(call_pa_o);
-
-      if (call_pa_c != nullptr)
-      {
-         set_chunk_type(call_pa_o, CT_FPAREN_OPEN);
-         set_chunk_parent(call_pa_o, CT_FUNC_CALL);
-         set_chunk_type(call_pa_c, CT_FPAREN_CLOSE);
-         set_chunk_parent(call_pa_c, CT_FUNC_CALL);
-      }
-   }
-   mark_cpp_lambda(sq_o);
-} // handle_cpp_lambda
-
-
-static void handle_d_template(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *name = chunk_get_next_ncnnl(pc);
-   chunk_t *po   = chunk_get_next_ncnnl(name);
-
-   //if (!name || (name->type != CT_WORD && name->type != CT_WORD))  Coverity CID 76000 Same on both sides, 2016-03-16
-   if (  name == nullptr
-      || chunk_is_not_token(name, CT_WORD))
-   {
-      // TODO: log an error, expected NAME
-      return;
-   }
-
-   if (  po == nullptr
-      || chunk_is_not_token(po, CT_PAREN_OPEN))
-   {
-      // TODO: log an error, expected '('
-      return;
-   }
-   set_chunk_type(name, CT_TYPE);
-   set_chunk_parent(name, CT_TEMPLATE);
-   set_chunk_parent(po, CT_TEMPLATE);
-
-   ChunkStack cs;
-   chunk_t    *tmp = get_d_template_types(cs, po);
-
-   if (  tmp == nullptr
-      || chunk_is_not_token(tmp, CT_PAREN_CLOSE))
-   {
-      // TODO: log an error, expected ')'
-      return;
-   }
-   set_chunk_parent(tmp, CT_TEMPLATE);
-
-   tmp = chunk_get_next_ncnnl(tmp);
-
-   if (chunk_is_not_token(tmp, CT_BRACE_OPEN))
-   {
-      // TODO: log an error, expected '{'
-      return;
-   }
-   set_chunk_parent(tmp, CT_TEMPLATE);
-   po = tmp;
-
-   tmp = po;
-
-   while (  ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
-         && tmp->level > po->level)
-   {
-      if (  chunk_is_token(tmp, CT_WORD)
-         && chunkstack_match(cs, tmp))
-      {
-         set_chunk_type(tmp, CT_TYPE);
-      }
-   }
-//   if (!chunk_is_token(tmp, CT_BRACE_CLOSE))
-//   {
-//      // TODO: log an error, expected '}'
-//   }
-   set_chunk_parent(tmp, CT_TEMPLATE);
-} // handle_d_template
-
-
-chunk_t *skip_template_next(chunk_t *ang_open)
-{
-   if (chunk_is_token(ang_open, CT_ANGLE_OPEN))
-   {
-      chunk_t *pc = chunk_get_next_type(ang_open, CT_ANGLE_CLOSE, ang_open->level);
-      return(chunk_get_next_ncnnl(pc));
-   }
-   return(ang_open);
-}
-
-
-static void handle_oc_class(chunk_t *pc)
-{
-   enum class angle_state_e : unsigned int
-   {
-      NONE  = 0,
-      OPEN  = 1, // '<' found
-      CLOSE = 2, // '>' found
-   };
-
-   LOG_FUNC_ENTRY();
-   chunk_t       *tmp;
-   bool          hit_scope     = false;
-   bool          passed_name   = false; // Did we pass the name of the class and now there can be only protocols, not generics
-   int           generic_level = 0;     // level of depth of generic
-   angle_state_e as            = angle_state_e::NONE;
-
-   LOG_FMT(LOCCLASS, "%s(%d): start [%s] [%s] line %zu\n",
-           __func__, __LINE__, pc->text(), get_token_name(get_chunk_parent_type(pc)), pc->orig_line);
-
-   if (get_chunk_parent_type(pc) == CT_OC_PROTOCOL)
-   {
-      tmp = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_semicolon(tmp))
-      {
-         set_chunk_parent(tmp, get_chunk_parent_type(pc));
-         LOG_FMT(LOCCLASS, "%s(%d):   bail on semicolon\n", __func__, __LINE__);
-         return;
-      }
-   }
-   tmp = pc;
-
-   while ((tmp = chunk_get_next_nnl(tmp)) != nullptr)
-   {
-      LOG_FMT(LOCCLASS, "%s(%d):       orig_line is %zu, [%s]\n",
-              __func__, __LINE__, tmp->orig_line, tmp->text());
-
-      if (chunk_is_token(tmp, CT_OC_END))
-      {
-         break;
-      }
-
-      if (chunk_is_token(tmp, CT_PAREN_OPEN))
-      {
-         passed_name = true;
-      }
-
-      if (chunk_is_str(tmp, "<", 1))
-      {
-         set_chunk_type(tmp, CT_ANGLE_OPEN);
-
-         if (passed_name)
-         {
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
-         }
-         else
-         {
-            set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
-            generic_level++;
-         }
-         as = angle_state_e::OPEN;
-      }
-
-      if (chunk_is_str(tmp, ">", 1))
-      {
-         set_chunk_type(tmp, CT_ANGLE_CLOSE);
-
-         if (passed_name)
-         {
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
-            as = angle_state_e::CLOSE;
-         }
-         else
-         {
-            set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
-
-            if (generic_level == 0)
-            {
-               fprintf(stderr, "%s(%d): generic_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            generic_level--;
-
-            if (generic_level == 0)
-            {
-               as = angle_state_e::CLOSE;
-            }
-         }
-      }
-
-      if (chunk_is_str(tmp, ">>", 2))
-      {
-         set_chunk_type(tmp, CT_ANGLE_CLOSE);
-         set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
-         split_off_angle_close(tmp);
-         generic_level -= 1;
-
-         if (generic_level == 0)
-         {
-            as = angle_state_e::CLOSE;
-         }
-      }
-
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         && get_chunk_parent_type(tmp) != CT_ASSIGN)
-      {
-         as = angle_state_e::CLOSE;
-         set_chunk_parent(tmp, CT_OC_CLASS);
-         tmp = chunk_get_next_type(tmp, CT_BRACE_CLOSE, tmp->level);
-
-         if (  tmp != nullptr
-            && get_chunk_parent_type(tmp) != CT_ASSIGN)
-         {
-            set_chunk_parent(tmp, CT_OC_CLASS);
-         }
-      }
-      else if (chunk_is_token(tmp, CT_COLON))
-      {
-         if (as != angle_state_e::OPEN)
-         {
-            passed_name = true;
-         }
-         set_chunk_type(tmp, hit_scope ? CT_OC_COLON : CT_CLASS_COLON);
-
-         if (chunk_is_token(tmp, CT_CLASS_COLON))
-         {
-            set_chunk_parent(tmp, CT_OC_CLASS);
-         }
-      }
-      else if (  chunk_is_str(tmp, "-", 1)
-              || chunk_is_str(tmp, "+", 1))
-      {
-         as = angle_state_e::CLOSE;
-
-         if (chunk_is_newline(chunk_get_prev(tmp)))
-         {
-            set_chunk_type(tmp, CT_OC_SCOPE);
-            chunk_flags_set(tmp, PCF_STMT_START);
-            hit_scope = true;
-         }
-      }
-
-      if (as == angle_state_e::OPEN)
-      {
-         if (passed_name)
-         {
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
-         }
-         else
-         {
-            set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
-         }
-      }
-   }
-
-   if (chunk_is_token(tmp, CT_BRACE_OPEN))
-   {
-      tmp = chunk_get_next_type(tmp, CT_BRACE_CLOSE, tmp->level);
-
-      if (tmp != nullptr)
-      {
-         set_chunk_parent(tmp, CT_OC_CLASS);
-      }
-   }
-} // handle_oc_class
-
-
-static void handle_oc_block_literal(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-   chunk_t *next = chunk_get_next_ncnnl(pc);
-
-   if (  pc == nullptr
-      || prev == nullptr
-      || next == nullptr)
-   {
-      return; // let's be paranoid
-   }
-   /*
-    * block literal: '^ RTYPE ( ARGS ) { }'
-    * RTYPE and ARGS are optional
-    */
-   LOG_FMT(LOCBLK, "%s(%d): block literal @ orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
-
-   chunk_t *apo = nullptr; // arg paren open
-   chunk_t *bbo = nullptr; // block brace open
-   chunk_t *bbc;           // block brace close
-
-   LOG_FMT(LOCBLK, "%s(%d):  + scan", __func__, __LINE__);
-   chunk_t *tmp;
-
-   for (tmp = next; tmp; tmp = chunk_get_next_ncnnl(tmp))
-   {
-      /* handle '< protocol >' */
-      if (chunk_is_str(tmp, "<", 1))
-      {
-         chunk_t *ao = tmp;
-         chunk_t *ac = chunk_get_next_str(ao, ">", 1, ao->level);
-
-         if (ac)
-         {
-            set_chunk_type(ao, CT_ANGLE_OPEN);
-            set_chunk_parent(ao, CT_OC_PROTO_LIST);
-            set_chunk_type(ac, CT_ANGLE_CLOSE);
-            set_chunk_parent(ac, CT_OC_PROTO_LIST);
-
-            for (tmp = chunk_get_next(ao); tmp != ac; tmp = chunk_get_next(tmp))
-            {
-               tmp->level += 1;
-               set_chunk_parent(tmp, CT_OC_PROTO_LIST);
-            }
-         }
-         tmp = chunk_get_next_ncnnl(ac);
-      }
-      LOG_FMT(LOCBLK, " '%s'", tmp->text());
-
-      if (  tmp->level < pc->level
-         || chunk_is_token(tmp, CT_SEMICOLON))
-      {
-         LOG_FMT(LOCBLK, "[DONE]");
-         break;
-      }
-
-      if (tmp->level == pc->level)
-      {
-         if (chunk_is_paren_open(tmp))
-         {
-            apo = tmp;
-            LOG_FMT(LOCBLK, "[PAREN]");
-         }
-
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
-         {
-            LOG_FMT(LOCBLK, "[BRACE]");
-            bbo = tmp;
-            break;
-         }
-      }
-   }
-
-   // make sure we have braces
-   bbc = chunk_skip_to_match(bbo);
-
-   if (  bbo == nullptr
-      || bbc == nullptr)
-   {
-      LOG_FMT(LOCBLK, " -- no braces found\n");
-      return;
-   }
-   LOG_FMT(LOCBLK, "\n");
-
-   // we are on a block literal for sure
-   set_chunk_type(pc, CT_OC_BLOCK_CARET);
-   set_chunk_parent(pc, CT_OC_BLOCK_EXPR);
-
-   // handle the optional args
-   chunk_t *lbp; // last before paren - end of return type, if any
-
-   if (apo)
-   {
-      chunk_t *apc = chunk_skip_to_match(apo);  // arg parenthesis close
-
-      if (chunk_is_paren_close(apc))
-      {
-         LOG_FMT(LOCBLK, " -- marking parens @ apo->orig_line is %zu, apo->orig_col is %zu and apc->orig_line is %zu, apc->orig_col is %zu\n",
-                 apo->orig_line, apo->orig_col, apc->orig_line, apc->orig_col);
-         flag_parens(apo, PCF_OC_ATYPE, CT_FPAREN_OPEN, CT_OC_BLOCK_EXPR, true);
-         fix_fcn_def_params(apo);
-      }
-      lbp = chunk_get_prev_ncnnlni(apo);   // Issue #2279
-   }
-   else
-   {
-      lbp = chunk_get_prev_ncnnlni(bbo);   // Issue #2279
-   }
-
-   // mark the return type, if any
-   while (lbp != pc)
-   {
-      LOG_FMT(LOCBLK, " -- lbp %s[%s]\n", lbp->text(), get_token_name(lbp->type));
-      make_type(lbp);
-      chunk_flags_set(lbp, PCF_OC_RTYPE);
-      set_chunk_parent(lbp, CT_OC_BLOCK_EXPR);
-      lbp = chunk_get_prev_ncnnlni(lbp);   // Issue #2279
-   }
-   // mark the braces
-   set_chunk_parent(bbo, CT_OC_BLOCK_EXPR);
-   set_chunk_parent(bbc, CT_OC_BLOCK_EXPR);
-} // handle_oc_block_literal
-
-
-static void handle_oc_block_type(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   if (pc->flags.test(PCF_IN_TYPEDEF))
-   {
-      LOG_FMT(LOCBLK, "%s(%d): skip block type @ orig_line is %zu, orig_col is %zu, -- in typedef\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col);
-      return;
-   }
-   // make sure we have '( ^'
-   chunk_t *tpo = chunk_get_prev_ncnnlni(pc); // type paren open   Issue #2279
-
-   if (chunk_is_paren_open(tpo))
-   {
-      /*
-       * block type: 'RTYPE (^LABEL)(ARGS)'
-       * LABEL is optional.
-       */
-      chunk_t *tpc = chunk_skip_to_match(tpo);    // type close paren (after '^')
-      chunk_t *nam = chunk_get_prev_ncnnlni(tpc); // name (if any) or '^'   Issue #2279
-      chunk_t *apo = chunk_get_next_ncnnl(tpc);   // arg open paren
-      chunk_t *apc = chunk_skip_to_match(apo);    // arg close paren
-
-      /*
-       * If this is a block literal instead of a block type, 'nam'
-       * will actually be the closing bracket of the block. We run into
-       * this situation if a block literal is enclosed in parentheses.
-       */
-      if (chunk_is_closing_brace(nam))
-      {
-         return(handle_oc_block_literal(pc));
-      }
-
-      // Check apo is '(' or else this might be a block literal. Issue 2643.
-      if (!chunk_is_paren_open(apo))
-      {
-         return(handle_oc_block_literal(pc));
-      }
-
-      if (chunk_is_paren_close(apc))
-      {
-         chunk_t   *aft = chunk_get_next_ncnnl(apc);
-         c_token_t pt;
-
-         if (chunk_is_str(nam, "^", 1))
-         {
-            set_chunk_type(nam, CT_PTR_TYPE);
-            pt = CT_FUNC_TYPE;
-         }
-         else if (  chunk_is_token(aft, CT_ASSIGN)
-                 || chunk_is_token(aft, CT_SEMICOLON))
-         {
-            set_chunk_type(nam, CT_FUNC_VAR);
-            pt = CT_FUNC_VAR;
-         }
-         else
-         {
-            set_chunk_type(nam, CT_FUNC_TYPE);
-            pt = CT_FUNC_TYPE;
-         }
-         LOG_FMT(LOCBLK, "%s(%d): block type @ orig_line is %zu, orig_col is %zu, text() '%s'[%s]\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, nam->text(), get_token_name(nam->type));
-         set_chunk_type(pc, CT_PTR_TYPE);
-         set_chunk_parent(pc, pt);  //CT_OC_BLOCK_TYPE;
-         set_chunk_type(tpo, CT_TPAREN_OPEN);
-         set_chunk_parent(tpo, pt); //CT_OC_BLOCK_TYPE;
-         set_chunk_type(tpc, CT_TPAREN_CLOSE);
-         set_chunk_parent(tpc, pt); //CT_OC_BLOCK_TYPE;
-         set_chunk_type(apo, CT_FPAREN_OPEN);
-         set_chunk_parent(apo, CT_FUNC_PROTO);
-         set_chunk_type(apc, CT_FPAREN_CLOSE);
-         set_chunk_parent(apc, CT_FUNC_PROTO);
-         fix_fcn_def_params(apo);
-         mark_function_return_type(nam, chunk_get_prev_ncnnlni(tpo), pt);   // Issue #2279
-      }
-   }
-} // handle_oc_block_type
-
-
-static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flags_t flags, bool &did_it)
-{
-   chunk_t *paren_close;
-
-   if (  !chunk_is_paren_open(paren_open)
-      || ((paren_close = chunk_skip_to_match(paren_open)) == nullptr))
-   {
-      did_it = false;
-      return(paren_open);
-   }
-   did_it = true;
-
-   set_chunk_parent(paren_open, ptype);
-   chunk_flags_set(paren_open, flags);
-   set_chunk_parent(paren_close, ptype);
-   chunk_flags_set(paren_close, flags);
-
-   for (chunk_t *cur = chunk_get_next_ncnnl(paren_open);
-        cur != paren_close;
-        cur = chunk_get_next_ncnnl(cur))
-   {
-      LOG_FMT(LOCMSGD, " <%s|%s>", cur->text(), get_token_name(cur->type));
-      chunk_flags_set(cur, flags);
-      make_type(cur);
-   }
-
-   // returning the chunk after the paren close
-   return(chunk_get_next_ncnnl(paren_close));
-}
-
-
-static void handle_oc_message_decl(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   bool did_it;
-   //bool      in_paren  = false;
-   //int       paren_cnt = 0;
-   //int       arg_cnt   = 0;
-
-   // Figure out if this is a spec or decl
-   chunk_t *tmp = pc;
-
-   while ((tmp = chunk_get_next(tmp)) != nullptr)
-   {
-      if (tmp->level < pc->level)
-      {
-         // should not happen
-         return;
-      }
-
-      if (  chunk_is_token(tmp, CT_SEMICOLON)
-         || chunk_is_token(tmp, CT_BRACE_OPEN))
-      {
-         break;
-      }
-   }
-
-   if (tmp == nullptr)
-   {
-      return;
-   }
-   c_token_t pt = chunk_is_token(tmp, CT_SEMICOLON) ? CT_OC_MSG_SPEC : CT_OC_MSG_DECL;
-
-   set_chunk_type(pc, CT_OC_SCOPE);
-   set_chunk_parent(pc, pt);
-
-   LOG_FMT(LOCMSGD, "%s(%d): %s @ orig_line is %zu, orig_col is %zu -",
-           __func__, __LINE__, get_token_name(pt), pc->orig_line, pc->orig_col);
-
-   // format: -(TYPE) NAME [: (TYPE)NAME
-
-   // handle the return type
-   tmp = handle_oc_md_type(chunk_get_next_ncnnl(pc), pt, PCF_OC_RTYPE, did_it);
-
-   if (!did_it)
-   {
-      LOG_FMT(LOCMSGD, " -- missing type parens\n");
-      return;
-   }
-
-   // expect the method name/label
-   if (chunk_is_not_token(tmp, CT_WORD))
-   {
-      LOG_FMT(LOCMSGD, " -- missing method name\n");
-      return;
-   }  // expect the method name/label
-
-   chunk_t *label = tmp;
-
-   set_chunk_type(tmp, pt);
-   set_chunk_parent(tmp, pt);
-   pc = chunk_get_next_ncnnl(tmp);
-
-   LOG_FMT(LOCMSGD, " [%s]%s", pc->text(), get_token_name(pc->type));
-
-   // if we have a colon next, we have args
-   if (  chunk_is_token(pc, CT_COLON)
-      || chunk_is_token(pc, CT_OC_COLON))
-   {
-      pc = label;
-
-      while (true)
-      {
-         // skip optional label
-         if (  chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, pt))
-         {
-            set_chunk_parent(pc, pt);
-            pc = chunk_get_next_ncnnl(pc);
-         }
-
-         // a colon must be next
-         if (!chunk_is_str(pc, ":", 1))
-         {
-            break;
-         }
-         set_chunk_type(pc, CT_OC_COLON);
-         set_chunk_parent(pc, pt);
-         pc = chunk_get_next_ncnnl(pc);
-
-         // next is the type in parens
-         LOG_FMT(LOCMSGD, "  (%s)", pc->text());
-         tmp = handle_oc_md_type(pc, pt, PCF_OC_ATYPE, did_it);
-
-         if (!did_it)
-         {
-            LOG_FMT(LWARN, "%s(%d): orig_line is %zu, orig_col is %zu expected type\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
-            break;
-         }
-         // attributes for a method parameter sit between the parameter type and the parameter name
-         pc = skip_attribute_next(tmp);
-         // we should now be on the arg name
-         chunk_flags_set(pc, PCF_VAR_DEF);
-         LOG_FMT(LOCMSGD, " arg[%s]", pc->text());
-         pc = chunk_get_next_ncnnl(pc);
-      }
-   }
-   LOG_FMT(LOCMSGD, " end[%s]", pc->text());
-
-   if (chunk_is_token(pc, CT_BRACE_OPEN))
-   {
-      set_chunk_parent(pc, pt);
-      pc = chunk_skip_to_match(pc);
-
-      if (pc != nullptr)
-      {
-         set_chunk_parent(pc, pt);
-      }
-   }
-   else if (chunk_is_token(pc, CT_SEMICOLON))
-   {
-      set_chunk_parent(pc, pt);
-   }
-   LOG_FMT(LOCMSGD, "\n");
-} // handle_oc_message_decl
-
-
-static void handle_oc_message_send(chunk_t *os)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *cs = chunk_get_next(os);
-
-   while (  cs != nullptr
-         && cs->level > os->level)
-   {
-      cs = chunk_get_next(cs);
-   }
-
-   if (  cs == nullptr
-      || chunk_is_not_token(cs, CT_SQUARE_CLOSE))
-   {
-      return;
-   }
-   LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, os->orig_line, os->orig_col);
-
-   chunk_t *tmp = chunk_get_next_ncnnl(cs);
-
-   if (chunk_is_semicolon(tmp))
-   {
-      set_chunk_parent(tmp, CT_OC_MSG);
-   }
-   // expect a word first thing or [...]
-   tmp = chunk_get_next_ncnnl(os);
-
-   if (  chunk_is_token(tmp, CT_SQUARE_OPEN)
-      || chunk_is_token(tmp, CT_PAREN_OPEN)
-      || chunk_is_token(tmp, CT_OC_AT))
-   {
-      chunk_t *tt = chunk_get_next_ncnnl(tmp);
-
-      if (  chunk_is_token(tmp, CT_OC_AT)
-         && tt != nullptr)
-      {
-         if (  chunk_is_token(tt, CT_PAREN_OPEN)
-            || chunk_is_token(tt, CT_BRACE_OPEN)
-            || chunk_is_token(tt, CT_SQUARE_OPEN))
-         {
-            tmp = tt;
-         }
-         else
-         {
-            LOG_FMT(LOCMSG, "%s(%d): tmp->orig_line is %zu, tmp->orig_col is %zu, expected identifier, not '%s' [%s]\n",
-                    __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-                    tmp->text(), get_token_name(tmp->type));
-            return;
-         }
-      }
-      tmp = chunk_skip_to_match(tmp);
-   }
-   else if (  chunk_is_not_token(tmp, CT_WORD)
-           && chunk_is_not_token(tmp, CT_TYPE)
-           && chunk_is_not_token(tmp, CT_THIS)
-           && chunk_is_not_token(tmp, CT_STAR)
-           && chunk_is_not_token(tmp, CT_STRING))
-   {
-      LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu, expected identifier, not '%s' [%s]\n",
-              __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-              tmp->text(), get_token_name(tmp->type));
-      return;
-   }
-   else
-   {
-      if (chunk_is_star(tmp)) // Issue #2722
-      {
-         set_chunk_type(tmp, CT_PTR_TYPE);
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-      chunk_t *tt = chunk_get_next_ncnnl(tmp);
-
-      if (chunk_is_paren_open(tt))
-      {
-         LOG_FMT(LFCN, "%s(%d): (18) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-         set_chunk_type(tmp, CT_FUNC_CALL);
-         tmp = chunk_get_prev_ncnnlni(set_paren_parent(tt, CT_FUNC_CALL));   // Issue #2279
-      }
-      else
-      {
-         set_chunk_type(tmp, CT_OC_MSG_CLASS);
-      }
-   }
-   set_chunk_parent(os, CT_OC_MSG);
-   chunk_flags_set(os, PCF_IN_OC_MSG);
-   set_chunk_parent(cs, CT_OC_MSG);
-   chunk_flags_set(cs, PCF_IN_OC_MSG);
-
-   // handle '< protocol >'
-   tmp = chunk_get_next_ncnnl(tmp);
-
-   if (chunk_is_str(tmp, "<", 1))
-   {
-      chunk_t *ao = tmp;
-      chunk_t *ac = chunk_get_next_str(ao, ">", 1, ao->level);
-
-      if (ac)
-      {
-         set_chunk_type(ao, CT_ANGLE_OPEN);
-         set_chunk_parent(ao, CT_OC_PROTO_LIST);
-         set_chunk_type(ac, CT_ANGLE_CLOSE);
-         set_chunk_parent(ac, CT_OC_PROTO_LIST);
-
-         for (tmp = chunk_get_next(ao); tmp != ac; tmp = chunk_get_next(tmp))
-         {
-            tmp->level += 1;
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
-         }
-      }
-      tmp = chunk_get_next_ncnnl(ac);
-   }
-   // handle 'object.property' and 'collection[index]'
-   else
-   {
-      while (tmp)
-      {
-         if (chunk_is_token(tmp, CT_MEMBER))  // move past [object.prop1.prop2
-         {
-            chunk_t *typ = chunk_get_next_ncnnl(tmp);
-
-            if (  chunk_is_token(typ, CT_WORD)
-               || chunk_is_token(typ, CT_TYPE))
-            {
-               tmp = chunk_get_next_ncnnl(typ);
-            }
-            else
-            {
-               break;
-            }
-         }
-         else if (chunk_is_token(tmp, CT_SQUARE_OPEN))  // move past [collection[index]
-         {
-            chunk_t *tcs = chunk_get_next_ncnnl(tmp);
-
-            while (  tcs != nullptr
-                  && tcs->level > tmp->level)
-            {
-               tcs = chunk_get_next_ncnnl(tcs);
-            }
-
-            if (chunk_is_token(tcs, CT_SQUARE_CLOSE))
-            {
-               tmp = chunk_get_next_ncnnl(tcs);
-            }
-            else
-            {
-               break;
-            }
-         }
-         else
-         {
-            break;
-         }
-      }
-   }
-
-   // [(self.foo.bar) method]
-   if (chunk_is_paren_open(tmp))
-   {
-      tmp = chunk_get_next_ncnnl(chunk_skip_to_match(tmp));
-   }
-
-   if (  chunk_is_token(tmp, CT_WORD)
-      || chunk_is_token(tmp, CT_TYPE))
-   {
-      set_chunk_type(tmp, CT_OC_MSG_FUNC);
-   }
-   chunk_t *prev = nullptr;
-
-   for (tmp = chunk_get_next(os); tmp != cs; tmp = chunk_get_next(tmp))
-   {
-      chunk_flags_set(tmp, PCF_IN_OC_MSG);
-
-      if (tmp->level == cs->level + 1)
-      {
-         if (chunk_is_token(tmp, CT_COLON))
-         {
-            set_chunk_type(tmp, CT_OC_COLON);
-
-            if (  chunk_is_token(prev, CT_WORD)
-               || chunk_is_token(prev, CT_TYPE))
-            {
-               // Might be a named param, check previous block
-               chunk_t *pp = chunk_get_prev(prev);
-
-               if (  pp != nullptr
-                  && chunk_is_not_token(pp, CT_OC_COLON)
-                  && chunk_is_not_token(pp, CT_ARITH)
-                  && chunk_is_not_token(pp, CT_SHIFT)
-                  && chunk_is_not_token(pp, CT_CARET))
-               {
-                  set_chunk_type(prev, CT_OC_MSG_NAME);
-                  set_chunk_parent(tmp, CT_OC_MSG_NAME);
-               }
-            }
-         }
-      }
-      prev = tmp;
-   }
-} // handle_oc_message_send
-
-
-static void handle_oc_available(chunk_t *os)
-{
-   os = chunk_get_next(os);
-
-   while (os != nullptr)
-   {
-      c_token_t origType = os->type;
-      set_chunk_type(os, CT_OC_AVAILABLE_VALUE);
-
-      if (origType == CT_PAREN_CLOSE)
-      {
-         break;
-      }
-      os = chunk_get_next(os);
-   }
-}
-
-
-static void handle_oc_property_decl(chunk_t *os)
-{
-   log_rule_B("mod_sort_oc_properties");
-
-   if (options::mod_sort_oc_properties())
-   {
-      typedef std::vector<chunk_t *> ChunkGroup;
-
-      chunk_t                 *next       = chunk_get_next(os);
-      chunk_t                 *open_paren = nullptr;
-
-      std::vector<ChunkGroup> class_chunks;       // class
-      std::vector<ChunkGroup> thread_chunks;      // atomic, nonatomic
-      std::vector<ChunkGroup> readwrite_chunks;   // readwrite, readonly
-      std::vector<ChunkGroup> ref_chunks;         // retain, copy, assign, weak, strong, unsafe_unretained
-      std::vector<ChunkGroup> getter_chunks;      // getter
-      std::vector<ChunkGroup> setter_chunks;      // setter
-      std::vector<ChunkGroup> nullability_chunks; // nonnull, nullable, null_unspecified, null_resettable
-      std::vector<ChunkGroup> other_chunks;       // any words other than above
-
-      if (chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         open_paren = next;
-         next       = chunk_get_next(next);
-
-         /*
-          * Determine location of the property attributes
-          * NOTE: Did not do this in the combine.cpp do_symbol_check as
-          * I was not sure what the ramifications of adding a new type
-          * for each of the below types would be. It did break some items
-          * when I attempted to add them so this is my hack for now.
-          */
-         while (  next != nullptr
-               && chunk_is_not_token(next, CT_PAREN_CLOSE))
-         {
-            if (chunk_is_token(next, CT_OC_PROPERTY_ATTR))
-            {
-               if (  chunk_is_str(next, "atomic", 6)
-                  || chunk_is_str(next, "nonatomic", 9))
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  thread_chunks.push_back(chunkGroup);
-               }
-               else if (  chunk_is_str(next, "readonly", 8)
-                       || chunk_is_str(next, "readwrite", 9))
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  readwrite_chunks.push_back(chunkGroup);
-               }
-               else if (  chunk_is_str(next, "assign", 6)
-                       || chunk_is_str(next, "retain", 6)
-                       || chunk_is_str(next, "copy", 4)
-                       || chunk_is_str(next, "strong", 6)
-                       || chunk_is_str(next, "weak", 4)
-                       || chunk_is_str(next, "unsafe_unretained", 17))
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  ref_chunks.push_back(chunkGroup);
-               }
-               else if (chunk_is_str(next, "getter", 6))
-               {
-                  ChunkGroup chunkGroup;
-
-                  do
-                  {
-                     chunkGroup.push_back(next);
-                     next = chunk_get_next(next);
-                  } while (  next
-                          && chunk_is_not_token(next, CT_COMMA)
-                          && chunk_is_not_token(next, CT_PAREN_CLOSE));
-
-                  next = next->prev;
-
-                  // coverity CID 160946
-                  if (next == nullptr)
-                  {
-                     break;
-                  }
-                  getter_chunks.push_back(chunkGroup);
-               }
-               else if (chunk_is_str(next, "setter", 6))
-               {
-                  ChunkGroup chunkGroup;
-
-                  do
-                  {
-                     chunkGroup.push_back(next);
-                     next = chunk_get_next(next);
-                  } while (  next
-                          && chunk_is_not_token(next, CT_COMMA)
-                          && chunk_is_not_token(next, CT_PAREN_CLOSE));
-
-                  next = chunk_get_prev(next);
-
-                  if (next == nullptr)
-                  {
-                     break;
-                  }
-                  setter_chunks.push_back(chunkGroup);
-               }
-               else if (  chunk_is_str(next, "nullable", 8)
-                       || chunk_is_str(next, "nonnull", 7)
-                       || chunk_is_str(next, "null_resettable", 15)
-                       || chunk_is_str(next, "null_unspecified", 16))
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  nullability_chunks.push_back(chunkGroup);
-               }
-               else if (chunk_is_str(next, "class", 5))
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  class_chunks.push_back(chunkGroup);
-               }
-               else
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  other_chunks.push_back(chunkGroup);
-               }
-            }
-            else if (chunk_is_word(next))
-            {
-               if (chunk_is_str(next, "class", 5))
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  class_chunks.push_back(chunkGroup);
-               }
-               else
-               {
-                  ChunkGroup chunkGroup;
-                  chunkGroup.push_back(next);
-                  other_chunks.push_back(chunkGroup);
-               }
-            }
-            next = chunk_get_next(next);
-         }
-         log_rule_B("mod_sort_oc_property_class_weight");
-         int class_w = options::mod_sort_oc_property_class_weight();
-         log_rule_B("mod_sort_oc_property_thread_safe_weight");
-         int thread_w = options::mod_sort_oc_property_thread_safe_weight();
-         log_rule_B("mod_sort_oc_property_readwrite_weight");
-         int readwrite_w = options::mod_sort_oc_property_readwrite_weight();
-         log_rule_B("mod_sort_oc_property_reference_weight");
-         int ref_w = options::mod_sort_oc_property_reference_weight();
-         log_rule_B("mod_sort_oc_property_getter_weight");
-         int getter_w = options::mod_sort_oc_property_getter_weight();
-         log_rule_B("mod_sort_oc_property_setter_weight");
-         int setter_w = options::mod_sort_oc_property_setter_weight();
-         log_rule_B("mod_sort_oc_property_nullability_weight");
-         int nullability_w = options::mod_sort_oc_property_nullability_weight();
-
-         //
-         std::multimap<int, std::vector<ChunkGroup> > sorted_chunk_map;
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(class_w, class_chunks));
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(thread_w, thread_chunks));
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(readwrite_w, readwrite_chunks));
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(ref_w, ref_chunks));
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(getter_w, getter_chunks));
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(setter_w, setter_chunks));
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(nullability_w, nullability_chunks));
-         sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(std::numeric_limits<int>::min(), other_chunks));
-
-         chunk_t *curr_chunk = open_paren;
-
-         for (multimap<int, std::vector<ChunkGroup> >::reverse_iterator it = sorted_chunk_map.rbegin(); it != sorted_chunk_map.rend(); ++it)
-         {
-            std::vector<ChunkGroup> chunk_groups = (*it).second;
-
-            for (auto chunk_group : chunk_groups)
-            {
-               for (auto chunk : chunk_group)
-               {
-                  chunk->orig_prev_sp = 0;
-
-                  if (chunk != curr_chunk)
-                  {
-                     chunk_move_after(chunk, curr_chunk);
-                     curr_chunk = chunk;
-                  }
-                  else
-                  {
-                     curr_chunk = chunk_get_next(curr_chunk);
-                  }
-               }
-
-               // add the parenthesis
-               chunk_t endchunk;
-               set_chunk_type(&endchunk, CT_COMMA);
-               set_chunk_parent(&endchunk, get_chunk_parent_type(curr_chunk));
-               endchunk.str         = ",";
-               endchunk.level       = curr_chunk->level;
-               endchunk.pp_level    = curr_chunk->pp_level;
-               endchunk.brace_level = curr_chunk->brace_level;
-               endchunk.orig_line   = curr_chunk->orig_line;
-               endchunk.orig_col    = curr_chunk->orig_col;
-               endchunk.column      = curr_chunk->orig_col_end + 1;
-               endchunk.flags       = curr_chunk->flags & PCF_COPY_FLAGS;
-               chunk_add_after(&endchunk, curr_chunk);
-               curr_chunk = curr_chunk->next;
-            }
-         }
-
-         // Remove the extra comma's that we did not move
-         while (  curr_chunk != nullptr
-               && chunk_is_not_token(curr_chunk, CT_PAREN_CLOSE))
-         {
-            chunk_t *rm_chunk = curr_chunk;
-            curr_chunk = chunk_get_next(curr_chunk);
-            chunk_del(rm_chunk);
-         }
-      }
-   }
-   chunk_t *tmp = chunk_get_next_ncnnl(os);
-
-   if (chunk_is_paren_open(tmp))
-   {
-      tmp = chunk_get_next_ncnnl(chunk_skip_to_match(tmp));
-   }
-   fix_variable_definition(tmp);
-} // handle_oc_property_decl
-
-
-static void handle_cs_square_stmt(chunk_t *os)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *cs = chunk_get_next(os);
-
-   while (  cs != nullptr
-         && cs->level > os->level)
-   {
-      cs = chunk_get_next(cs);
-   }
-
-   if (  cs == nullptr
-      || chunk_is_not_token(cs, CT_SQUARE_CLOSE))
-   {
-      return;
-   }
-   set_chunk_parent(os, CT_CS_SQ_STMT);
-   set_chunk_parent(cs, CT_CS_SQ_STMT);
-
-   chunk_t *tmp;
-
-   for (tmp = chunk_get_next(os); tmp != cs; tmp = chunk_get_next(tmp))
-   {
-      set_chunk_parent(tmp, CT_CS_SQ_STMT);
-
-      if (chunk_is_token(tmp, CT_COLON))
-      {
-         set_chunk_type(tmp, CT_CS_SQ_COLON);
-      }
-   }
-
-   tmp = chunk_get_next_ncnnl(cs);
-
-   if (tmp != nullptr)
-   {
-      chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
-   }
-}
-
-
-static void handle_cs_property(chunk_t *bro)
-{
-   LOG_FUNC_ENTRY();
-
-   set_paren_parent(bro, CT_CS_PROPERTY);
-
-   bool    did_prop = false;
-   chunk_t *pc      = bro;
-
-   while ((pc = chunk_get_prev_ncnnlni(pc)) != nullptr)   // Issue #2279
-   {
-      if (pc->level == bro->level)
-      {
-         //prevent scanning back past 'new' in expressions like new List<int> {1,2,3}
-         // Issue # 1620, UNI-24090.cs
-         if (chunk_is_token(pc, CT_NEW))
-         {
-            break;
-         }
-
-         if (  !did_prop
-            && (  chunk_is_token(pc, CT_WORD)
-               || chunk_is_token(pc, CT_THIS)))
-         {
-            set_chunk_type(pc, CT_CS_PROPERTY);
-            did_prop = true;
-         }
-         else
-         {
-            set_chunk_parent(pc, CT_CS_PROPERTY);
-            make_type(pc);
-         }
-
-         if (pc->flags.test(PCF_STMT_START))
-         {
-            break;
-         }
-      }
-   }
-}
-
-
-static void handle_cs_array_type(chunk_t *pc)
-{
-   chunk_t *prev;
-
-   for (prev = chunk_get_prev(pc);
-        chunk_is_token(prev, CT_COMMA);
-        prev = chunk_get_prev(prev))
-   {
-      // empty
-   }
-
-   if (chunk_is_token(prev, CT_SQUARE_OPEN))
-   {
-      while (pc != prev)
-      {
-         set_chunk_parent(pc, CT_TYPE);
-         pc = chunk_get_prev(pc);
-      }
-      set_chunk_parent(prev, CT_TYPE);
-   }
-}
-
-
-static void handle_wrap(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *opp  = chunk_get_next(pc);
-   chunk_t *name = chunk_get_next(opp);
-   chunk_t *clp  = chunk_get_next(name);
-
-   log_rule_B("sp_func_call_paren");
-   log_rule_B("sp_cpp_cast_paren");
-   iarf_e pav = chunk_is_token(pc, CT_FUNC_WRAP) ?
-                options::sp_func_call_paren() :
-                options::sp_cpp_cast_paren();
-
-   log_rule_B("sp_inside_fparen");
-   log_rule_B("sp_inside_paren_cast");
-   iarf_e av = chunk_is_token(pc, CT_FUNC_WRAP) ?
-               options::sp_inside_fparen() :
-               options::sp_inside_paren_cast();
-
-   if (  chunk_is_token(clp, CT_PAREN_CLOSE)
-      && chunk_is_token(opp, CT_PAREN_OPEN)
-      && (  chunk_is_token(name, CT_WORD)
-         || chunk_is_token(name, CT_TYPE)))
-   {
-      const char *psp = (pav & IARF_ADD) ? " " : "";
-      const char *fsp = (av & IARF_ADD) ? " " : "";
-
-      pc->str.append(psp);
-      pc->str.append("(");
-      pc->str.append(fsp);
-      pc->str.append(name->str);
-      pc->str.append(fsp);
-      pc->str.append(")");
-
-      set_chunk_type(pc, chunk_is_token(pc, CT_FUNC_WRAP) ? CT_FUNCTION : CT_TYPE);
-
-      pc->orig_col_end = pc->orig_col + pc->len();
-
-      chunk_del(opp);
-      chunk_del(name);
-      chunk_del(clp);
-   }
-} // handle_wrap
-
-
-static void handle_proto_wrap(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *opp  = chunk_get_next_ncnnl(pc);
-   chunk_t *name = chunk_get_next_ncnnl(opp);
-   chunk_t *tmp  = chunk_get_next_ncnnl(chunk_get_next_ncnnl(name));
-   chunk_t *clp  = chunk_skip_to_match(opp);
-   chunk_t *cma  = chunk_get_next_ncnnl(clp);
-
-   if (  opp == nullptr
-      || name == nullptr
-      || tmp == nullptr
-      || clp == nullptr
-      || cma == nullptr
-      || (  chunk_is_not_token(name, CT_WORD)
-         && chunk_is_not_token(name, CT_TYPE))
-      || chunk_is_not_token(opp, CT_PAREN_OPEN))
-   {
-      return;
-   }
-
-   if (chunk_is_token(cma, CT_SEMICOLON))
-   {
-      set_chunk_type(pc, CT_FUNC_PROTO);
-   }
-   else if (chunk_is_token(cma, CT_BRACE_OPEN))
-   {
-      LOG_FMT(LFCN, "%s(%d): (19) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      set_chunk_type(pc, CT_FUNC_DEF);
-   }
-   else
-   {
-      return;
-   }
-   set_chunk_parent(opp, pc->type);
-   set_chunk_parent(clp, pc->type);
-
-   set_chunk_parent(tmp, CT_PROTO_WRAP);
-
-   if (chunk_is_token(tmp, CT_PAREN_OPEN))
-   {
-      fix_fcn_def_params(tmp);
-   }
-   else
-   {
-      fix_fcn_def_params(opp);
-      set_chunk_type(name, CT_WORD);
-   }
-   tmp = chunk_skip_to_match(tmp);
-
-   if (tmp)
-   {
-      set_chunk_parent(tmp, CT_PROTO_WRAP);
-   }
-   // Mark return type (TODO: move to own function)
-   tmp = pc;
-
-   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
-   {
-      if (  !chunk_is_type(tmp)
-         && chunk_is_not_token(tmp, CT_OPERATOR)
-         && chunk_is_not_token(tmp, CT_WORD)
-         && chunk_is_not_token(tmp, CT_ADDR))
-      {
-         break;
-      }
-      set_chunk_parent(tmp, pc->type);
-      make_type(tmp);
-   }
-} // handle_proto_wrap
-
-
-/**
- * Java assert statements are: "assert EXP1 [: EXP2] ;"
- * Mark the parent of the colon and semicolon
- */
-static void handle_java_assert(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   bool    did_colon = false;
-   chunk_t *tmp      = pc;
-
-   while ((tmp = chunk_get_next(tmp)) != nullptr)
-   {
-      if (tmp->level == pc->level)
-      {
-         if (  !did_colon
-            && chunk_is_token(tmp, CT_COLON))
-         {
-            did_colon = true;
-            set_chunk_parent(tmp, pc->type);
-         }
-
-         if (chunk_is_token(tmp, CT_SEMICOLON))
-         {
-            set_chunk_parent(tmp, pc->type);
-            break;
-         }
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.h
deleted file mode 100644
index a34bf724..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @file combine.h
- * prototypes for combine.cpp
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef COMBINE_H_INCLUDED
-#define COMBINE_H_INCLUDED
-
-#include "chunk_list.h"
-#include "uncrustify_types.h"
-
-
-/**
- * Change CT_INCDEC_AFTER + WORD to CT_INCDEC_BEFORE
- * Change number/word + CT_ADDR to CT_ARITH
- * Change number/word + CT_STAR to CT_ARITH
- * Change number/word + CT_NEG to CT_ARITH
- * Change word + ( to a CT_FUNCTION
- * Change struct/union/enum + CT_WORD => CT_TYPE
- * Force parens on return.
- *
- * TODO: This could be done earlier.
- *
- * Patterns detected:
- *   STRUCT/ENUM/UNION + WORD :: WORD => TYPE
- *   WORD + '('               :: WORD => FUNCTION
- */
-void fix_symbols(void);
-
-
-/**
- * Examines the whole file and changes CT_COLON to
- * CT_Q_COLON, CT_LABEL_COLON, or CT_CASE_COLON.
- * It also changes the CT_WORD before CT_LABEL_COLON into CT_LABEL.
- */
-void combine_labels(void);
-
-
-//! help function for mark_variable_definition...
-bool go_on(chunk_t *pc, chunk_t *start);
-
-
-//! Sets the parent for comments.
-void mark_comments(void);
-
-
-void make_type(chunk_t *pc);
-
-
-/**
- * Sets the parent of the open paren/brace/square/angle and the closing.
- * Note - it is assumed that pc really does point to an open item and the
- * close must be open + 1.
- *
- * @param start   The open paren
- * @param parent  The type to assign as the parent
- *
- * @return The chunk after the close paren
- */
-chunk_t *set_paren_parent(chunk_t *start, c_token_t parent);
-
-
-/**
- * This is called on every chunk.
- * First on all non-preprocessor chunks and then on each preprocessor chunk.
- * It does all the detection and classifying.
- * This is only called by fix_symbols.
- * The three parameters never get the value nullptr.
- * it is not necessary to test.
- */
-void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next);
-
-
-#endif /* COMBINE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.cpp
deleted file mode 100644
index 194f807e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.cpp
+++ /dev/null
@@ -1,2574 +0,0 @@
-/**
- * @file combine_fix_mark.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract fom combine.cpp
- */
-
-#include "combine_fix_mark.h"
-
-#include "combine_skip.h"
-#include "combine_tools.h"
-#include "flag_parens.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LCOMBINE;
-
-
-void fix_casts(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t    *pc;
-   chunk_t    *prev;
-   chunk_t    *first;
-   chunk_t    *after;
-   chunk_t    *last = nullptr;
-   chunk_t    *paren_close;
-   const char *verb      = "likely";
-   const char *detail    = "";
-   size_t     count      = 0;
-   int        word_count = 0;
-   bool       nope;
-   bool       doubtful_cast = false;
-
-
-   LOG_FMT(LCASTS, "%s(%d): start->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->orig_col);
-
-   prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
-
-   if (prev == nullptr)
-   {
-      return;
-   }
-
-   if (chunk_is_token(prev, CT_PP_DEFINED))
-   {
-      LOG_FMT(LCASTS, "%s(%d):  -- not a cast - after defined\n",
-              __func__, __LINE__);
-      return;
-   }
-
-   if (chunk_is_token(prev, CT_ANGLE_CLOSE))
-   {
-      LOG_FMT(LCASTS, "%s(%d):  -- not a cast - after > (template)\n",
-              __func__, __LINE__);
-      return;
-   }
-   // Make sure there is only WORD, TYPE, and '*' or '^' before the close paren
-   pc    = chunk_get_next_ncnnl(start);
-   first = pc;
-
-   while (  pc != nullptr
-         && (  chunk_is_type(pc)
-            || chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, CT_QUALIFIER)
-            || chunk_is_token(pc, CT_DC_MEMBER)
-            || chunk_is_token(pc, CT_PP)
-            || chunk_is_token(pc, CT_STAR)
-            || chunk_is_token(pc, CT_QUESTION)
-            || chunk_is_token(pc, CT_CARET)
-            || chunk_is_token(pc, CT_TSQUARE)
-            || (  (  chunk_is_token(pc, CT_ANGLE_OPEN)
-                  || chunk_is_token(pc, CT_ANGLE_CLOSE))
-               && language_is_set(LANG_OC | LANG_JAVA))
-            || (  (  chunk_is_token(pc, CT_QUESTION)
-                  || chunk_is_token(pc, CT_COMMA)
-                  || chunk_is_token(pc, CT_MEMBER))
-               && language_is_set(LANG_JAVA))
-            || chunk_is_token(pc, CT_AMP)))
-   {
-      LOG_FMT(LCASTS, "%s(%d): pc->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-
-      if (  chunk_is_token(pc, CT_WORD)
-         || (  chunk_is_token(last, CT_ANGLE_CLOSE)
-            && chunk_is_token(pc, CT_DC_MEMBER)))
-      {
-         word_count++;
-      }
-      else if (  chunk_is_token(pc, CT_DC_MEMBER)
-              || chunk_is_token(pc, CT_MEMBER)
-              || chunk_is_token(pc, CT_PP))
-      {
-         // might be negativ, such as with:
-         // a = val + (CFoo::bar_t)7;
-         word_count--;
-      }
-      last = pc;
-      pc   = chunk_get_next_ncnnl(pc);
-      count++;
-   }
-
-   if (  pc == nullptr
-      || chunk_is_not_token(pc, CT_PAREN_CLOSE)
-      || chunk_is_token(prev, CT_OC_CLASS))
-   {
-      LOG_FMT(LCASTS, "%s(%d):  -- not a cast, hit type is %s\n",
-              __func__, __LINE__, pc == nullptr ? "NULL" : get_token_name(pc->type));
-      return;
-   }
-
-   if (word_count > 1)
-   {
-      LOG_FMT(LCASTS, "%s(%d):  -- too many words: %d\n",
-              __func__, __LINE__, word_count);
-      return;
-   }
-   paren_close = pc;
-
-   // If last is a type or star/caret, we have a cast for sure
-   if (  chunk_is_token(last, CT_STAR)
-      || chunk_is_token(last, CT_CARET)
-      || chunk_is_token(last, CT_PTR_TYPE)
-      || chunk_is_token(last, CT_TYPE)
-      || (  chunk_is_token(last, CT_ANGLE_CLOSE)
-         && language_is_set(LANG_OC | LANG_JAVA)))
-   {
-      verb = "for sure";
-   }
-   else if (count == 1)
-   {
-      /*
-       * We are on a potential cast of the form "(word)".
-       * We don't know if the word is a type. So lets guess based on some
-       * simple rules:
-       *  - if all caps, likely a type
-       *  - if it ends in _t, likely a type
-       *  - if it's objective-c and the type is id, likely valid
-       */
-      verb = "guessed";
-
-      if (  (last->len() > 3)
-         && (last->str[last->len() - 2] == '_')
-         && (last->str[last->len() - 1] == 't'))
-      {
-         detail = " -- '_t'";
-      }
-      else if (is_ucase_str(last->text(), last->len()))
-      {
-         detail = " -- upper case";
-      }
-      else if (  language_is_set(LANG_OC)
-              && chunk_is_str(last, "id", 2))
-      {
-         detail = " -- Objective-C id";
-      }
-      else
-      {
-         // If we can't tell for sure whether this is a cast, decide against it
-         detail        = " -- mixed case";
-         doubtful_cast = true;
-      }
-      /*
-       * If the next item is a * or &, the next item after that can't be a
-       * number or string.
-       *
-       * If the next item is a +, the next item has to be a number.
-       *
-       * If the next item is a -, the next item can't be a string.
-       *
-       * For this to be a cast, the close paren must be followed by:
-       *  - constant (number or string)
-       *  - paren open
-       *  - word
-       *
-       * Find the next non-open paren item.
-       */
-      pc    = chunk_get_next_ncnnl(paren_close);
-      after = pc;
-
-      do
-      {
-         after = chunk_get_next_ncnnl(after);
-      } while (chunk_is_token(after, CT_PAREN_OPEN));
-
-      if (after == nullptr)
-      {
-         LOG_FMT(LCASTS, "%s(%d):  -- not a cast - hit NULL\n",
-                 __func__, __LINE__);
-         return;
-      }
-      nope = false;
-
-      if (chunk_is_ptr_operator(pc))
-      {
-         // star (*) and address (&) are ambiguous
-         if (  chunk_is_token(after, CT_NUMBER_FP)
-            || chunk_is_token(after, CT_NUMBER)
-            || chunk_is_token(after, CT_STRING)
-            || doubtful_cast)
-         {
-            nope = true;
-         }
-      }
-      else if (chunk_is_token(pc, CT_MINUS))
-      {
-         // (UINT8)-1 or (foo)-1 or (FOO)-'a'
-         if (  chunk_is_token(after, CT_STRING)
-            || doubtful_cast)
-         {
-            nope = true;
-         }
-      }
-      else if (chunk_is_token(pc, CT_PLUS))
-      {
-         // (UINT8)+1 or (foo)+1
-         if (  (  chunk_is_not_token(after, CT_NUMBER)
-               && chunk_is_not_token(after, CT_NUMBER_FP))
-            || doubtful_cast)
-         {
-            nope = true;
-         }
-      }
-      else if (  chunk_is_not_token(pc, CT_NUMBER_FP)
-              && chunk_is_not_token(pc, CT_NUMBER)
-              && chunk_is_not_token(pc, CT_WORD)
-              && chunk_is_not_token(pc, CT_THIS)
-              && chunk_is_not_token(pc, CT_TYPE)
-              && chunk_is_not_token(pc, CT_PAREN_OPEN)
-              && chunk_is_not_token(pc, CT_STRING)
-              && chunk_is_not_token(pc, CT_DECLTYPE)
-              && chunk_is_not_token(pc, CT_SIZEOF)
-              && get_chunk_parent_type(pc) != CT_SIZEOF
-              && chunk_is_not_token(pc, CT_FUNC_CALL)
-              && chunk_is_not_token(pc, CT_FUNC_CALL_USER)
-              && chunk_is_not_token(pc, CT_FUNCTION)
-              && chunk_is_not_token(pc, CT_BRACE_OPEN)
-              && (!(  chunk_is_token(pc, CT_SQUARE_OPEN)
-                   && language_is_set(LANG_OC))))
-      {
-         LOG_FMT(LCASTS, "%s(%d):  -- not a cast - followed by text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
-         return;
-      }
-
-      if (nope)
-      {
-         LOG_FMT(LCASTS, "%s(%d):  -- not a cast - text() '%s' followed by type %s\n",
-                 __func__, __LINE__, pc->text(), get_token_name(after->type));
-         return;
-      }
-   }
-   // if the 'cast' is followed by a semicolon, comma, bool or close parenthesis, it isn't
-   pc = chunk_get_next_ncnnl(paren_close);
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   if (  chunk_is_semicolon(pc)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_BOOL)               // Issue #2151
-      || chunk_is_paren_close(pc))
-   {
-      LOG_FMT(LCASTS, "%s(%d):  -- not a cast - followed by type %s\n",
-              __func__, __LINE__, get_token_name(pc->type));
-      return;
-   }
-   set_chunk_parent(start, CT_C_CAST);
-   set_chunk_parent(paren_close, CT_C_CAST);
-
-   LOG_FMT(LCASTS, "%s(%d):  -- %s c-cast: (",
-           __func__, __LINE__, verb);
-
-   for (pc = first;
-        pc != nullptr && pc != paren_close;
-        pc = chunk_get_next_ncnnl(pc))
-   {
-      set_chunk_parent(pc, CT_C_CAST);
-      make_type(pc);
-      LOG_FMT(LCASTS, " %s", pc->text());
-   }
-
-   LOG_FMT(LCASTS, " )%s\n", detail);
-
-   // Mark the next item as an expression start
-   pc = chunk_get_next_ncnnl(paren_close);
-
-   if (pc != nullptr)
-   {
-      chunk_flags_set(pc, PCF_EXPR_START);
-
-      if (chunk_is_opening_brace(pc))
-      {
-         set_paren_parent(pc, get_chunk_parent_type(start));
-      }
-   }
-} // fix_casts
-
-
-void fix_fcn_def_params(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (start == nullptr)
-   {
-      return;
-   }
-   LOG_FMT(LFCNP, "%s(%d): text() '%s', type is %s, on orig_line %zu, level is %zu\n",
-           __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line, start->level);
-
-   while (  start != nullptr
-         && !chunk_is_paren_open(start))
-   {
-      start = chunk_get_next_ncnnl(start);
-   }
-
-   if (start == nullptr)// Coverity CID 76003, 1100782
-   {
-      return;
-   }
-   // ensure start chunk holds a single '(' character
-   assert(  (start->len() == 1)
-         && (start->str[0] == '('));
-
-   ChunkStack cs;
-   size_t     level = start->level + 1;
-   chunk_t    *pc   = start;
-
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-   {
-      if (  (  (start->len() == 1)
-            && (start->str[0] == ')'))
-         || pc->level < level)
-      {
-         LOG_FMT(LFCNP, "%s(%d): bailed on text() '%s', on orig_line %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line);
-         break;
-      }
-      LOG_FMT(LFCNP, "%s(%d): %s, text() '%s' on orig_line %zu, level %zu\n",
-              __func__, __LINE__, (pc->level > level) ? "skipping" : "looking at",
-              pc->text(), pc->orig_line, pc->level);
-
-      if (pc->level > level)
-      {
-         continue;
-      }
-
-      if (  chunk_is_star(pc)
-         || chunk_is_msref(pc)
-         || chunk_is_nullable(pc))
-      {
-         set_chunk_type(pc, CT_PTR_TYPE);
-         cs.Push_Back(pc);
-      }
-      else if (  chunk_is_token(pc, CT_AMP)
-              || (  language_is_set(LANG_CPP)
-                 && chunk_is_str(pc, "&&", 2)))
-      {
-         set_chunk_type(pc, CT_BYREF);
-         cs.Push_Back(pc);
-      }
-      else if (chunk_is_token(pc, CT_TYPE_WRAP))
-      {
-         cs.Push_Back(pc);
-      }
-      else if (  chunk_is_token(pc, CT_WORD)
-              || chunk_is_token(pc, CT_TYPE))
-      {
-         cs.Push_Back(pc);
-      }
-      else if (  chunk_is_token(pc, CT_COMMA)
-              || chunk_is_token(pc, CT_ASSIGN))
-      {
-         mark_variable_stack(cs, LFCNP);
-
-         if (chunk_is_token(pc, CT_ASSIGN))
-         {
-            // Mark assignment for default param spacing
-            set_chunk_parent(pc, CT_FUNC_PROTO);
-         }
-      }
-   }
-   mark_variable_stack(cs, LFCNP);
-} // fix_fcn_def_params
-
-
-void fix_type_cast(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc;
-
-   pc = chunk_get_next_ncnnl(start);
-
-   if (  pc == nullptr
-      || chunk_is_not_token(pc, CT_ANGLE_OPEN))
-   {
-      return;
-   }
-
-   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-         && pc->level >= start->level)
-   {
-      if (  pc->level == start->level
-         && chunk_is_token(pc, CT_ANGLE_CLOSE))
-      {
-         pc = chunk_get_next_ncnnl(pc);
-
-         if (pc == nullptr)
-         {
-            return;
-         }
-
-         if (chunk_is_str(pc, "(", 1))
-         {
-            set_paren_parent(pc, CT_TYPE_CAST);
-         }
-         return;
-      }
-      make_type(pc);
-   }
-} // fix_type_cast
-
-
-void fix_typedef(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (start == nullptr)
-   {
-      return;
-   }
-   LOG_FMT(LTYPEDEF, "%s(%d): typedef @ orig_line %zu, orig_col %zu\n",
-           __func__, __LINE__, start->orig_line, start->orig_col);
-
-   chunk_t *the_type = nullptr;
-   chunk_t *last_op  = nullptr;
-
-   /*
-    * Mark everything in the typedef and scan for ")(", which makes it a
-    * function type
-    */
-   for (chunk_t *next = chunk_get_next_ncnnl(start, scope_e::PREPROC)
-        ; next != nullptr && next->level >= start->level
-        ; next = chunk_get_next_ncnnl(next, scope_e::PREPROC))
-   {
-      chunk_flags_set(next, PCF_IN_TYPEDEF);
-
-      if (start->level == next->level)
-      {
-         if (chunk_is_semicolon(next))
-         {
-            set_chunk_parent(next, CT_TYPEDEF);
-            break;
-         }
-
-         if (chunk_is_token(next, CT_ATTRIBUTE))
-         {
-            break;
-         }
-
-         if (  language_is_set(LANG_D)
-            && chunk_is_token(next, CT_ASSIGN))
-         {
-            set_chunk_parent(next, CT_TYPEDEF);
-            break;
-         }
-         make_type(next);
-
-         if (chunk_is_token(next, CT_TYPE))
-         {
-            the_type = next;
-         }
-         chunk_flags_clr(next, PCF_VAR_1ST_DEF);
-
-         if (*next->str.c_str() == '(')
-         {
-            last_op = next;
-         }
-      }
-   }
-
-   // avoid interpreting typedef NS_ENUM (NSInteger, MyEnum) as a function def
-   if (  last_op != nullptr
-      && !(  language_is_set(LANG_OC)
-          && get_chunk_parent_type(last_op) == CT_ENUM))
-   {
-      flag_parens(last_op, PCF_NONE, CT_FPAREN_OPEN, CT_TYPEDEF, false);
-      fix_fcn_def_params(last_op);
-
-      the_type = chunk_get_prev_ncnnlni(last_op, scope_e::PREPROC);   // Issue #2279
-
-      if (the_type == nullptr)
-      {
-         return;
-      }
-      chunk_t *open_paren = nullptr;
-
-      if (chunk_is_paren_close(the_type))
-      {
-         open_paren = chunk_skip_to_match_rev(the_type);
-         mark_function_type(the_type);
-         the_type = chunk_get_prev_ncnnlni(the_type, scope_e::PREPROC);   // Issue #2279
-
-         if (the_type == nullptr)
-         {
-            return;
-         }
-      }
-      else
-      {
-         // must be: "typedef <return type>func(params);"
-         set_chunk_type(the_type, CT_FUNC_TYPE);
-      }
-      set_chunk_parent(the_type, CT_TYPEDEF);
-
-      LOG_FMT(LTYPEDEF, "%s(%d): fcn typedef text() '%s', on orig_line %zu\n",
-              __func__, __LINE__, the_type->text(), the_type->orig_line);
-
-      // If we are aligning on the open parenthesis, grab that instead
-      log_rule_B("align_typedef_func");
-
-      if (  open_paren != nullptr
-         && options::align_typedef_func() == 1)
-      {
-         the_type = open_paren;
-      }
-      log_rule_B("align_typedef_func");
-
-      if (options::align_typedef_func() != 0)
-      {
-         LOG_FMT(LTYPEDEF, "%s(%d):  -- align anchor on text() %s, @ orig_line %zu, orig_col %zu\n",
-                 __func__, __LINE__, the_type->text(), the_type->orig_line, the_type->orig_col);
-         chunk_flags_set(the_type, PCF_ANCHOR);
-      }
-      // already did everything we need to do
-      return;
-   }
-   /*
-    * Skip over enum/struct/union stuff, as we know it isn't a return type
-    * for a function type
-    */
-   chunk_t *after = chunk_get_next_ncnnl(start, scope_e::PREPROC);
-
-   if (after == nullptr)
-   {
-      return;
-   }
-
-   if (  chunk_is_not_token(after, CT_ENUM)
-      && chunk_is_not_token(after, CT_STRUCT)
-      && chunk_is_not_token(after, CT_UNION))
-   {
-      if (the_type != nullptr)
-      {
-         // We have just a regular typedef
-         LOG_FMT(LTYPEDEF, "%s(%d): regular typedef text() %s, on orig_line %zu\n",
-                 __func__, __LINE__, the_type->text(), the_type->orig_line);
-         chunk_flags_set(the_type, PCF_ANCHOR);
-      }
-      return;
-   }
-   // We have a struct/union/enum, next should be either a type or {
-   chunk_t *next = chunk_get_next_ncnnl(after, scope_e::PREPROC);
-
-   if (next == nullptr)
-   {
-      return;
-   }
-
-   if (chunk_is_token(next, CT_TYPE))
-   {
-      next = chunk_get_next_ncnnl(next, scope_e::PREPROC);
-
-      if (next == nullptr)
-      {
-         return;
-      }
-   }
-
-   if (chunk_is_token(next, CT_BRACE_OPEN))
-   {
-      // Skip to the closing brace
-      chunk_t *br_c = chunk_get_next_type(next, CT_BRACE_CLOSE, next->level, scope_e::PREPROC);
-
-      if (br_c != nullptr)
-      {
-         const c_token_t tag = after->type;
-         set_chunk_parent(next, tag);
-         set_chunk_parent(br_c, tag);
-
-         if (tag == CT_ENUM)
-         {
-            flag_series(after, br_c, PCF_IN_ENUM);
-         }
-         else if (tag == CT_STRUCT)
-         {
-            flag_series(after, br_c, PCF_IN_STRUCT);
-         }
-      }
-   }
-
-   if (the_type != nullptr)
-   {
-      LOG_FMT(LTYPEDEF, "%s(%d): %s typedef text() %s, on orig_line %zu\n",
-              __func__, __LINE__, get_token_name(after->type), the_type->text(),
-              the_type->orig_line);
-      chunk_flags_set(the_type, PCF_ANCHOR);
-   }
-} // fix_typedef
-
-
-chunk_t *fix_variable_definition(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t    *pc = start;
-   chunk_t    *end;
-   chunk_t    *tmp_pc;
-   ChunkStack cs;
-   int        idx;
-   int        ref_idx;
-
-   LOG_FMT(LFVD, "%s(%d): start at pc->orig_line is %zu, pc->orig_col is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
-
-   // Scan for words and types and stars oh my!
-   while (  chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_QUALIFIER)
-         || chunk_is_token(pc, CT_TYPENAME)
-         || chunk_is_token(pc, CT_DC_MEMBER)
-         || chunk_is_token(pc, CT_MEMBER)
-         || chunk_is_ptr_operator(pc))
-   {
-      LOG_FMT(LFVD, "%s(%d):   1:pc->text() '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
-      cs.Push_Back(pc);
-      pc = chunk_get_next_ncnnl(pc);
-
-      if (pc == nullptr)
-      {
-         LOG_FMT(LFVD, "%s(%d): pc is nullptr\n", __func__, __LINE__);
-         return(nullptr);
-      }
-      LOG_FMT(LFVD, "%s(%d):   2:pc->text() '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
-
-      // Skip templates and attributes
-      pc = skip_template_next(pc);
-
-      if (pc == nullptr)
-      {
-         LOG_FMT(LFVD, "%s(%d): pc is nullptr\n", __func__, __LINE__);
-         return(nullptr);
-      }
-      LOG_FMT(LFVD, "%s(%d):   3:pc->text() '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
-
-      pc = skip_attribute_next(pc);
-
-      if (pc == nullptr)
-      {
-         LOG_FMT(LFVD, "%s(%d): pc is nullptr\n", __func__, __LINE__);
-         return(nullptr);
-      }
-      LOG_FMT(LFVD, "%s(%d):   4:pc->text() '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
-
-      if (language_is_set(LANG_JAVA))
-      {
-         pc = skip_tsquare_next(pc);
-         LOG_FMT(LFVD, "%s(%d):   5:pc->text() '%s', type is %s\n", __func__, __LINE__, pc->text(), get_token_name(pc->type));
-      }
-   }
-   end = pc;
-
-   if (end == nullptr)
-   {
-      LOG_FMT(LFVD, "%s(%d): end is nullptr\n", __func__, __LINE__);
-      return(nullptr);
-   }
-   LOG_FMT(LFVD, "%s(%d): end->type is %s\n", __func__, __LINE__, get_token_name(end->type));
-
-   if (chunk_is_token(end, CT_FUNC_CTOR_VAR))                // Issue #3010
-   {
-      return(end);
-   }
-
-   if (  cs.Len() == 1
-      && chunk_is_token(end, CT_BRACE_OPEN)
-      && get_chunk_parent_type(end) == CT_BRACED_INIT_LIST)
-   {
-      set_chunk_type(cs.Get(0)->m_pc, CT_TYPE);
-   }
-
-   // Function defs are handled elsewhere
-   if (  (cs.Len() <= 1)
-      || chunk_is_token(end, CT_FUNC_DEF)
-      || chunk_is_token(end, CT_FUNC_PROTO)
-      || chunk_is_token(end, CT_FUNC_CLASS_DEF)
-      || chunk_is_token(end, CT_FUNC_CLASS_PROTO)
-      || chunk_is_token(end, CT_OPERATOR))
-   {
-      return(skip_to_next_statement(end));
-   }
-   // ref_idx points to the alignable part of the variable definition
-   ref_idx = cs.Len() - 1;
-
-   // Check for the '::' stuff: "char *Engine::name"
-   if (  (cs.Len() >= 3)
-      && (  (cs.Get(cs.Len() - 2)->m_pc->type == CT_MEMBER)
-         || (cs.Get(cs.Len() - 2)->m_pc->type == CT_DC_MEMBER)))
-   {
-      idx = cs.Len() - 2;
-
-      while (idx > 0)
-      {
-         tmp_pc = cs.Get(idx)->m_pc;
-
-         if (  chunk_is_not_token(tmp_pc, CT_DC_MEMBER)
-            && chunk_is_not_token(tmp_pc, CT_MEMBER))
-         {
-            break;
-         }
-
-         if (idx == 0)
-         {
-            fprintf(stderr, "%s(%d): idx is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                    __func__, __LINE__, tmp_pc->orig_line, tmp_pc->orig_col);
-            log_flush(true);
-            exit(EX_SOFTWARE);
-         }
-         idx--;
-         tmp_pc = cs.Get(idx)->m_pc;
-
-         if (  chunk_is_not_token(tmp_pc, CT_WORD)
-            && chunk_is_not_token(tmp_pc, CT_TYPE))
-         {
-            break;
-         }
-         make_type(tmp_pc);
-         idx--;
-      }
-      ref_idx = idx + 1;
-   }
-   tmp_pc = cs.Get(ref_idx)->m_pc;
-   LOG_FMT(LFVD, "%s(%d): ref_idx(%d) is '%s'\n", __func__, __LINE__, ref_idx, tmp_pc->text());
-
-   // No type part found!
-   if (ref_idx <= 0)
-   {
-      return(skip_to_next_statement(end));
-   }
-   LOG_FMT(LFVD2, "%s(%d): orig_line is %zu, TYPE : ", __func__, __LINE__, start->orig_line);
-
-   for (size_t idxForCs = 0; idxForCs < cs.Len() - 1; idxForCs++)
-   {
-      tmp_pc = cs.Get(idxForCs)->m_pc;
-      make_type(tmp_pc);
-      chunk_flags_set(tmp_pc, PCF_VAR_TYPE);
-      LOG_FMT(LFVD2, " text() is '%s', type is %s", tmp_pc->text(), get_token_name(tmp_pc->type));
-   }
-
-   LOG_FMT(LFVD2, "\n");
-
-   // OK we have two or more items, mark types up to the end.
-   LOG_FMT(LFVD, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
-   mark_variable_definition(cs.Get(cs.Len() - 1)->m_pc);
-
-   if (chunk_is_token(end, CT_COMMA))
-   {
-      return(chunk_get_next_ncnnl(end));
-   }
-   return(skip_to_next_statement(end));
-} // fix_variable_definition
-
-
-void mark_cpp_constructor(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *paren_open;
-   chunk_t *tmp;
-   chunk_t *after;
-   chunk_t *var;
-   bool    is_destr = false;
-
-   tmp = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-
-   if (  chunk_is_token(tmp, CT_INV)
-      || chunk_is_token(tmp, CT_DESTRUCTOR))
-   {
-      set_chunk_type(tmp, CT_DESTRUCTOR);
-      set_chunk_parent(pc, CT_DESTRUCTOR);
-      is_destr = true;
-   }
-   LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, FOUND %sSTRUCTOR for '%s'[%s] prev '%s'[%s]\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col,
-           is_destr ? "DE" : "CON",
-           pc->text(), get_token_name(pc->type),
-           tmp->text(), get_token_name(tmp->type));
-
-   paren_open = skip_template_next(chunk_get_next_ncnnl(pc));
-
-   if (!chunk_is_str(paren_open, "(", 1))
-   {
-      LOG_FMT(LWARN, "%s:%zu Expected '(', got: [%s]\n",
-              cpd.filename.c_str(), paren_open->orig_line,
-              paren_open->text());
-      return;
-   }
-   // Mark parameters
-   fix_fcn_def_params(paren_open);
-   after = flag_parens(paren_open, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CLASS_PROTO, false);
-
-   LOG_FMT(LFTOR, "%s(%d): text() '%s'\n", __func__, __LINE__, after->text());
-
-   // Scan until the brace open, mark everything
-   tmp = paren_open;
-   bool hit_colon = false;
-
-   while (  tmp != nullptr
-         && (  chunk_is_not_token(tmp, CT_BRACE_OPEN)
-            || tmp->level != paren_open->level)
-         && !chunk_is_semicolon(tmp))
-   {
-      LOG_FMT(LFTOR, "%s(%d): tmp is '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col);
-      chunk_flags_set(tmp, PCF_IN_CONST_ARGS);
-      tmp = chunk_get_next_ncnnl(tmp);
-
-      if (  chunk_is_str(tmp, ":", 1)
-         && tmp->level == paren_open->level)
-      {
-         set_chunk_type(tmp, CT_CONSTR_COLON);
-         hit_colon = true;
-      }
-
-      if (  hit_colon
-         && (  chunk_is_paren_open(tmp)
-            || chunk_is_opening_brace(tmp))
-         && tmp->level == paren_open->level)
-      {
-         var = skip_template_prev(chunk_get_prev_ncnnlni(tmp));   // Issue #2279
-
-         if (  chunk_is_token(var, CT_TYPE)
-            || chunk_is_token(var, CT_WORD))
-         {
-            set_chunk_type(var, CT_FUNC_CTOR_VAR);
-            flag_parens(tmp, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CTOR_VAR, false);
-         }
-      }
-   }
-
-   if (chunk_is_token(tmp, CT_BRACE_OPEN))
-   {
-      set_paren_parent(paren_open, CT_FUNC_CLASS_DEF);
-      set_paren_parent(tmp, CT_FUNC_CLASS_DEF);
-      LOG_FMT(LFCN, "%s(%d):  Marked '%s' as FUNC_CLASS_DEF on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-   }
-   else
-   {
-      set_chunk_parent(tmp, CT_FUNC_CLASS_PROTO);
-      set_chunk_type(pc, CT_FUNC_CLASS_PROTO);
-      LOG_FMT(LFCN, "%s(%d):  Marked '%s' as FUNC_CLASS_PROTO on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-   }
-   tmp = chunk_get_prev_ncnnlni(pc); // Issue #2907
-
-   if (chunk_is_token(tmp, CT_DESTRUCTOR))
-   {
-      set_chunk_parent(tmp, pc->type);
-      tmp = chunk_get_prev_ncnnlni(tmp);
-   }
-
-   while (chunk_is_token(tmp, CT_QUALIFIER))
-   {
-      set_chunk_parent(tmp, pc->type);
-      tmp = chunk_get_prev_ncnnlni(tmp);
-   }
-} // mark_cpp_constructor
-
-
-void mark_cpp_lambda(chunk_t *square_open)
-{
-   if (  chunk_is_token(square_open, CT_SQUARE_OPEN)
-      && get_chunk_parent_type(square_open) == CT_CPP_LAMBDA)
-   {
-      auto *brace_close = chunk_get_next_type(square_open, CT_BRACE_CLOSE, square_open->level);
-
-      if (get_chunk_parent_type(brace_close) == CT_CPP_LAMBDA)
-      {
-         for (auto *pc = square_open; pc != brace_close; pc = chunk_get_next_ncnnl(pc))
-         {
-            chunk_flags_set(pc, PCF_IN_LAMBDA);
-         }
-      }
-   }
-} // mark_cpp_lambda
-
-
-void mark_define_expressions(void)
-{
-   LOG_FUNC_ENTRY();
-
-   bool    in_define = false;
-   bool    first     = true;
-   chunk_t *pc       = chunk_get_head();
-   chunk_t *prev     = pc;
-
-   while (pc != nullptr)
-   {
-      if (!in_define)
-      {
-         if (  chunk_is_token(pc, CT_PP_DEFINE)
-            || chunk_is_token(pc, CT_PP_IF)
-            || chunk_is_token(pc, CT_PP_ELSE))
-         {
-            in_define = true;
-            first     = true;
-         }
-      }
-      else
-      {
-         if (  !pc->flags.test(PCF_IN_PREPROC)
-            || chunk_is_token(pc, CT_PREPROC))
-         {
-            in_define = false;
-         }
-         else
-         {
-            if (  chunk_is_not_token(pc, CT_MACRO)
-               && (  first
-                  || chunk_is_token(prev, CT_PAREN_OPEN)
-                  || chunk_is_token(prev, CT_ARITH)
-                  || chunk_is_token(prev, CT_SHIFT)
-                  || chunk_is_token(prev, CT_CARET)
-                  || chunk_is_token(prev, CT_ASSIGN)
-                  || chunk_is_token(prev, CT_COMPARE)
-                  || chunk_is_token(prev, CT_RETURN)
-                  || chunk_is_token(prev, CT_GOTO)
-                  || chunk_is_token(prev, CT_CONTINUE)
-                  || chunk_is_token(prev, CT_FPAREN_OPEN)
-                  || chunk_is_token(prev, CT_SPAREN_OPEN)
-                  || chunk_is_token(prev, CT_BRACE_OPEN)
-                  || chunk_is_semicolon(prev)
-                  || chunk_is_token(prev, CT_COMMA)
-                  || chunk_is_token(prev, CT_COLON)
-                  || chunk_is_token(prev, CT_QUESTION)))
-            {
-               chunk_flags_set(pc, PCF_EXPR_START);
-               first = false;
-            }
-         }
-      }
-      prev = pc;
-      pc   = chunk_get_next(pc);
-   }
-} // mark_define_expressions
-
-
-void mark_exec_sql(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *tmp;
-
-   // Change CT_WORD to CT_SQL_WORD
-   for (tmp = chunk_get_next(pc); tmp != nullptr; tmp = chunk_get_next(tmp))
-   {
-      set_chunk_parent(tmp, pc->type);
-
-      if (chunk_is_token(tmp, CT_WORD))
-      {
-         set_chunk_type(tmp, CT_SQL_WORD);
-      }
-
-      if (chunk_is_token(tmp, CT_SEMICOLON))
-      {
-         break;
-      }
-   }
-
-   if (  chunk_is_not_token(pc, CT_SQL_BEGIN)
-      || tmp == nullptr
-      || chunk_is_not_token(tmp, CT_SEMICOLON))
-   {
-      return;
-   }
-
-   for (tmp = chunk_get_next(tmp);
-        tmp != nullptr && chunk_is_not_token(tmp, CT_SQL_END);
-        tmp = chunk_get_next(tmp))
-   {
-      tmp->level++;
-   }
-} // mark_exec_sql
-
-
-void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_type)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc = start;
-
-   if (pc != nullptr)
-   {
-      // Step backwards from pc and mark the parent of the return type
-      LOG_FMT(LFCNR, "%s(%d): (backwards) return type for '%s' @ orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, fname->text(), fname->orig_line, fname->orig_col);
-
-      chunk_t *first = pc;
-
-      while (pc != nullptr)
-      {
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s, ",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         log_pcf_flags(LFCNR, pc->flags);
-
-         if (chunk_is_token(pc, CT_ANGLE_CLOSE))
-         {
-            pc = skip_template_prev(pc);
-
-            if (  pc == nullptr
-               || chunk_is_token(pc, CT_TEMPLATE))
-            {
-               //either expression is not complete or this is smth like 'template<T> void func()'
-               //  - we are not interested in 'template<T>' part
-               break;
-            }
-            else
-            {
-               //this is smth like 'vector<int> func()' and 'pc' is currently on 'vector' - just proceed
-            }
-         }
-
-         if (  (  !chunk_is_type(pc)
-               && chunk_is_not_token(pc, CT_OPERATOR)
-               && chunk_is_not_token(pc, CT_WORD)
-               && chunk_is_not_token(pc, CT_ADDR))
-            || pc->flags.test(PCF_IN_PREPROC))
-         {
-            break;
-         }
-
-         if (!chunk_is_ptr_operator(pc))
-         {
-            first = pc;
-         }
-         pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-      }
-      LOG_FMT(LFCNR, "%s(%d): marking returns...", __func__, __LINE__);
-
-      // Changing words to types into tuple return types in CS.
-      bool is_return_tuple = false;
-
-      if (  chunk_is_token(pc, CT_PAREN_CLOSE)
-         && !pc->flags.test(PCF_IN_PREPROC))
-      {
-         first           = chunk_skip_to_match_rev(pc);
-         is_return_tuple = true;
-      }
-      pc = first;
-
-      while (pc != nullptr)
-      {
-         LOG_FMT(LFCNR, " text() '%s', type is %s", pc->text(), get_token_name(pc->type));
-
-         if (parent_type != CT_NONE)
-         {
-            set_chunk_parent(pc, parent_type);
-         }
-         chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-
-         if (  !is_return_tuple
-            || chunk_is_not_token(pc, CT_WORD)
-            || (  prev != nullptr
-               && chunk_is_not_token(prev, CT_TYPE)))
-         {
-            make_type(pc);
-         }
-
-         if (pc == start)
-         {
-            break;
-         }
-         pc = chunk_get_next_ncnnl(pc);
-
-         //template angles should keep parent type CT_TEMPLATE
-         if (chunk_is_token(pc, CT_ANGLE_OPEN))
-         {
-            pc = chunk_get_next_type(pc, CT_ANGLE_CLOSE, pc->level);
-
-            if (pc == start)
-            {
-               break;
-            }
-            pc = chunk_get_next_ncnnl(pc);
-         }
-      }
-      LOG_FMT(LFCNR, "\n");
-
-      // Back up and mark parent type on friend declarations
-      if (  parent_type != CT_NONE
-         && first
-         && first->flags.test(PCF_IN_CLASS))
-      {
-         pc = chunk_get_prev_ncnnlni(first);   // Issue #2279
-
-         if (chunk_is_token(pc, CT_FRIEND))
-         {
-            LOG_FMT(LFCNR, "%s(%d): marking friend\n", __func__, __LINE__);
-            set_chunk_parent(pc, parent_type);
-            // A friend might be preceded by a template specification, as in:
-            //   template <...> friend type func(...);
-            // If so, we need to mark that also
-            pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-
-            if (chunk_is_token(pc, CT_ANGLE_CLOSE))
-            {
-               pc = skip_template_prev(pc);
-
-               if (chunk_is_token(pc, CT_TEMPLATE))
-               {
-                  LOG_FMT(LFCNR, "%s(%d): marking friend template\n",
-                          __func__, __LINE__);
-                  set_chunk_parent(pc, parent_type);
-               }
-            }
-         }
-      }
-   }
-} // mark_function_return_type
-
-
-void mark_function(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-   LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-   chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-   chunk_t *next = chunk_get_next_ncnnlnp(pc);
-
-   if (next == nullptr)
-   {
-      return;
-   }
-   chunk_t *tmp;
-   chunk_t *semi = nullptr;
-   chunk_t *paren_open;
-   chunk_t *paren_close;
-
-   // Find out what is before the operator
-   if (get_chunk_parent_type(pc) == CT_OPERATOR)
-   {
-      LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      log_pcf_flags(LGUY, pc->flags);
-      chunk_t *pc_op = chunk_get_prev_type(pc, CT_OPERATOR, pc->level);
-
-      if (  pc_op != nullptr
-         && pc_op->flags.test(PCF_EXPR_START))
-      {
-         LOG_FMT(LFCN, "%s(%d): (4) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         set_chunk_type(pc, CT_FUNC_CALL);
-      }
-
-      if (language_is_set(LANG_CPP))
-      {
-         tmp = pc;
-
-         while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
-         {
-            if (  chunk_is_token(tmp, CT_BRACE_CLOSE)
-               || chunk_is_token(tmp, CT_BRACE_OPEN)             // Issue 575
-               || chunk_is_token(tmp, CT_SEMICOLON))
-            {
-               break;
-            }
-
-            if (  chunk_is_paren_open(tmp)
-               && !pc->flags.test(PCF_IN_PREPROC))               // Issue #2703
-            {
-               LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-               LOG_FMT(LFCN, "%s(%d): (5) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-               set_chunk_type(pc, CT_FUNC_CALL);
-               break;
-            }
-
-            if (chunk_is_token(tmp, CT_ASSIGN))
-            {
-               LOG_FMT(LFCN, "%s(%d): (6) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-               set_chunk_type(pc, CT_FUNC_CALL);
-               break;
-            }
-
-            if (chunk_is_token(tmp, CT_TEMPLATE))
-            {
-               LOG_FMT(LFCN, "%s(%d): (7) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-               set_chunk_type(pc, CT_FUNC_DEF);
-               break;
-            }
-
-            if (chunk_is_token(tmp, CT_BRACE_OPEN))
-            {
-               if (get_chunk_parent_type(tmp) == CT_FUNC_DEF)
-               {
-                  LOG_FMT(LFCN, "%s(%d): (8) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-                  set_chunk_type(pc, CT_FUNC_CALL);
-               }
-
-               if (  get_chunk_parent_type(tmp) == CT_CLASS
-                  || get_chunk_parent_type(tmp) == CT_STRUCT)
-               {
-                  LOG_FMT(LFCN, "%s(%d): (9) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-                  set_chunk_type(pc, CT_FUNC_DEF);
-               }
-               break;
-            }
-         }
-
-         if (  tmp != nullptr
-            && chunk_is_not_token(pc, CT_FUNC_CALL))
-         {
-            // Mark the return type
-            while (  (tmp = chunk_get_next_ncnnl(tmp)) != pc
-                  && tmp != nullptr)
-            {
-               make_type(tmp); // Mark the return type
-            }
-         }
-      }
-   }
-
-   if (chunk_is_ptr_operator(next))
-   {
-      next = chunk_get_next_ncnnlnp(next);
-
-      if (next == nullptr)
-      {
-         return;
-      }
-   }
-   LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s, type is %s, parent_type is %s\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
-   LOG_FMT(LFCN, "   level is %zu, brace_level is %zu, next->text() '%s', next->type is %s, next->level is %zu\n",
-           pc->level, pc->brace_level,
-           next->text(), get_token_name(next->type), next->level);
-
-   if (pc->flags.test(PCF_IN_CONST_ARGS))
-   {
-      set_chunk_type(pc, CT_FUNC_CTOR_VAR);
-      LOG_FMT(LFCN, "%s(%d):   1) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-      next = skip_template_next(next);
-
-      if (next == nullptr)
-      {
-         return;
-      }
-      flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, pc->type, true);
-      return;
-   }
-   // Skip over any template and attribute madness
-   next = skip_template_next(next);
-
-   if (next == nullptr)
-   {
-      return;
-   }
-   next = skip_attribute_next(next);
-
-   if (next == nullptr)
-   {
-      return;
-   }
-   // Find the open and close parenthesis
-   paren_open  = chunk_get_next_str(pc, "(", 1, pc->level);
-   paren_close = chunk_get_next_str(paren_open, ")", 1, pc->level);
-
-   if (  paren_open == nullptr
-      || paren_close == nullptr)
-   {
-      LOG_FMT(LFCN, "%s(%d): No parens found for [%s] on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-      return;
-   }
-   /*
-    * This part detects either chained function calls or a function ptr definition.
-    * MYTYPE (*func)(void);
-    * mWriter( "class Clst_"c )( somestr.getText() )( " : Cluster {"c ).newline;
-    *
-    * For it to be a function variable def, there must be a '*' followed by a
-    * single word.
-    *
-    * Otherwise, it must be chained function calls.
-    */
-   tmp = chunk_get_next_ncnnl(paren_close);
-
-   if (  tmp != nullptr
-      && chunk_is_str(tmp, "(", 1))
-   {
-      chunk_t *tmp1;
-      chunk_t *tmp2;
-      chunk_t *tmp3;
-
-      // skip over any leading class/namespace in: "T(F::*A)();"
-      tmp1 = chunk_get_next_ncnnl(next);
-
-      while (tmp1 != nullptr)
-      {
-         tmp2 = chunk_get_next_ncnnl(tmp1);
-
-         if (  !chunk_is_word(tmp1)
-            || chunk_is_not_token(tmp2, CT_DC_MEMBER))
-         {
-            break;
-         }
-         tmp1 = chunk_get_next_ncnnl(tmp2);
-      }
-      tmp2 = chunk_get_next_ncnnl(tmp1);
-
-      if (chunk_is_str(tmp2, ")", 1))
-      {
-         tmp3 = tmp2;
-         tmp2 = nullptr;
-      }
-      else
-      {
-         tmp3 = chunk_get_next_ncnnl(tmp2);
-      }
-      tmp3 = chunk_get_next_ssq(tmp3);
-
-      if (  chunk_is_str(tmp3, ")", 1)
-         && (  chunk_is_star(tmp1)
-            || chunk_is_msref(tmp1)
-            || (  language_is_set(LANG_OC)
-               && chunk_is_token(tmp1, CT_CARET)))
-         && (  tmp2 == nullptr
-            || chunk_is_token(tmp2, CT_WORD)))
-      {
-         if (tmp2)
-         {
-            LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, function variable '%s', changing '%s' into a type\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, tmp2->text(), pc->text());
-            set_chunk_type(tmp2, CT_FUNC_VAR);
-            flag_parens(paren_open, PCF_NONE, CT_PAREN_OPEN, CT_FUNC_VAR, false);
-
-            LOG_FMT(LFCN, "%s(%d): paren open @ orig_line %zu, orig_col %zu\n",
-                    __func__, __LINE__, paren_open->orig_line, paren_open->orig_col);
-         }
-         else
-         {
-            LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, function type, changing '%s' into a type\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-
-            if (tmp2)
-            {
-               set_chunk_type(tmp2, CT_FUNC_TYPE);
-            }
-            flag_parens(paren_open, PCF_NONE, CT_PAREN_OPEN, CT_FUNC_TYPE, false);
-         }
-         set_chunk_type(pc, CT_TYPE);
-         set_chunk_type(tmp1, CT_PTR_TYPE);
-         chunk_flags_clr(pc, PCF_VAR_1ST_DEF);
-
-         if (tmp2 != nullptr)
-         {
-            chunk_flags_set(tmp2, PCF_VAR_1ST_DEF);
-         }
-         flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, CT_FUNC_PROTO, false);
-         fix_fcn_def_params(tmp);
-         return;
-      }
-      LOG_FMT(LFCN, "%s(%d): chained function calls? text() is '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-   }
-
-   // Assume it is a function call if not already labeled
-   if (chunk_is_token(pc, CT_FUNCTION))
-   {
-      LOG_FMT(LFCN, "%s(%d): examine: text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-      // look for an assigment. Issue #575
-      chunk_t *temp = chunk_get_next_type(pc, CT_ASSIGN, pc->level);
-
-      if (temp != nullptr)
-      {
-         LOG_FMT(LFCN, "%s(%d): assigment found, orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, temp->orig_line, temp->orig_col, temp->text());
-         LOG_FMT(LFCN, "%s(%d): (10) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         set_chunk_type(pc, CT_FUNC_CALL);
-      }
-      else
-      {
-         LOG_FMT(LFCN, "%s(%d): (11) SET TO %s: orig_line is %zu, orig_col is %zu, text() '%s'",
-                 __func__, __LINE__, (get_chunk_parent_type(pc) == CT_OPERATOR) ? "CT_FUNC_DEF" : "CT_FUNC_CALL",
-                 pc->orig_line, pc->orig_col, pc->text());
-         set_chunk_type(pc, (get_chunk_parent_type(pc) == CT_OPERATOR) ? CT_FUNC_DEF : CT_FUNC_CALL);
-      }
-   }
-   LOG_FMT(LFCN, "%s(%d): Check for C++ function def, text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-           __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-
-   if (prev != nullptr)
-   {
-      LOG_FMT(LFCN, "%s(%d): prev->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-              __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col, get_token_name(prev->type));
-   }
-
-   // Check for C++ function def
-   if (  chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-      || (  prev != nullptr
-         && (  chunk_is_token(prev, CT_INV)
-            || chunk_is_token(prev, CT_DC_MEMBER))))
-   {
-      chunk_t *destr = nullptr;
-
-      if (chunk_is_token(prev, CT_INV))
-      {
-         // TODO: do we care that this is the destructor?
-         set_chunk_type(prev, CT_DESTRUCTOR);
-         set_chunk_type(pc, CT_FUNC_CLASS_DEF);
-
-         set_chunk_parent(pc, CT_DESTRUCTOR);
-
-         destr = prev;
-         // Point to the item previous to the class name
-         prev = chunk_get_prev_ncnnlnp(prev);
-      }
-
-      if (chunk_is_token(prev, CT_DC_MEMBER))
-      {
-         prev = chunk_get_prev_ncnnlnp(prev);
-         LOG_FMT(LFCN, "%s(%d): prev->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                 __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
-                 get_token_name(prev->type));
-         prev = skip_template_prev(prev);
-         LOG_FMT(LFCN, "%s(%d): prev->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                 __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
-                 get_token_name(prev->type));
-         prev = skip_attribute_prev(prev);
-         LOG_FMT(LFCN, "%s(%d): prev->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                 __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
-                 get_token_name(prev->type));
-
-         if (  chunk_is_token(prev, CT_WORD)
-            || chunk_is_token(prev, CT_TYPE))
-         {
-            if (pc->str.equals(prev->str))
-            {
-               LOG_FMT(LFCN, "%s(%d): pc->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col,
-                       get_token_name(prev->type));
-               set_chunk_type(pc, CT_FUNC_CLASS_DEF);
-               LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu - FOUND %sSTRUCTOR for '%s', type is %s\n",
-                       __func__, __LINE__,
-                       prev->orig_line, prev->orig_col,
-                       (destr != nullptr) ? "DE" : "CON",
-                       prev->text(), get_token_name(prev->type));
-
-               mark_cpp_constructor(pc);
-               return;
-            }
-            // Point to the item previous to the class name
-            prev = chunk_get_prev_ncnnlnp(prev);
-         }
-      }
-   }
-
-   /*
-    * Determine if this is a function call or a function def/proto
-    * We check for level==1 to allow the case that a function prototype is
-    * wrapped in a macro: "MACRO(void foo(void));"
-    */
-   if (  chunk_is_token(pc, CT_FUNC_CALL)
-      && (  pc->level == pc->brace_level
-         || pc->level == 1)
-      && !pc->flags.test(PCF_IN_ARRAY_ASSIGN))
-   {
-      bool isa_def  = false;
-      bool hit_star = false;
-      LOG_FMT(LFCN, "%s(%d): pc->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col,
-              get_token_name(pc->type));
-
-      if (prev == nullptr)
-      {
-         LOG_FMT(LFCN, "%s(%d): Checking func call: prev is NULL\n",
-                 __func__, __LINE__);
-      }
-      else
-      {
-         LOG_FMT(LFCN, "%s(%d): Checking func call: prev->text() '%s', prev->type is %s\n",
-                 __func__, __LINE__, prev->text(), get_token_name(prev->type));
-      }
-      // if (!chunk_ends_type(prev))
-      // {
-      //    goto bad_ret_type;
-      // }
-
-      /*
-       * REVISIT:
-       * a function def can only occur at brace level, but not inside an
-       * assignment, structure, enum, or union.
-       * The close paren must be followed by an open brace, with an optional
-       * qualifier (const) in between.
-       * There can be all sorts of template stuff and/or '[]' in the type.
-       * This hack mostly checks that.
-       *
-       * Examples:
-       * foo->bar(maid);                   -- fcn call
-       * FOO * bar();                      -- fcn proto or class variable
-       * FOO foo();                        -- fcn proto or class variable
-       * FOO foo(1);                       -- class variable
-       * a = FOO * bar();                  -- fcn call
-       * a.y = foo() * bar();              -- fcn call
-       * static const char * const fizz(); -- fcn def
-       */
-      while (prev != nullptr)
-      {
-         LOG_FMT(LFCN, "%s(%d): next step with: prev->orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text());
-
-         if (get_chunk_parent_type(pc) == CT_FIXED)
-         {
-            isa_def = true;
-         }
-
-         if (prev->flags.test(PCF_IN_PREPROC))
-         {
-            prev = chunk_get_prev_ncnnlnp(prev);
-            continue;
-         }
-
-         // Some code slips an attribute between the type and function
-         if (  chunk_is_token(prev, CT_FPAREN_CLOSE)
-            && get_chunk_parent_type(prev) == CT_ATTRIBUTE)
-         {
-            prev = skip_attribute_prev(prev);
-            continue;
-         }
-
-         // skip const(TYPE)
-         if (  chunk_is_token(prev, CT_PAREN_CLOSE)
-            && get_chunk_parent_type(prev) == CT_D_CAST)
-         {
-            LOG_FMT(LFCN, "%s(%d): --> For sure a prototype or definition\n",
-                    __func__, __LINE__);
-            isa_def = true;
-            break;
-         }
-
-         if (get_chunk_parent_type(prev) == CT_DECLSPEC)  // Issue 1289
-         {
-            prev = chunk_skip_to_match_rev(prev);
-            prev = chunk_get_prev(prev);
-
-            if (chunk_is_token(prev, CT_DECLSPEC))
-            {
-               prev = chunk_get_prev(prev);
-            }
-         }
-
-         // if it was determined that this could be a function definition
-         // but one of the preceding tokens is a CT_MEMBER than this is not a
-         // fcn def, issue #1466
-         if (  isa_def
-            && chunk_is_token(prev, CT_MEMBER))
-         {
-            isa_def = false;
-         }
-
-         // get first chunk before: A::B::pc | this.B.pc | this->B->pc
-         if (  chunk_is_token(prev, CT_DC_MEMBER)
-            || chunk_is_token(prev, CT_MEMBER))
-         {
-            while (  chunk_is_token(prev, CT_DC_MEMBER)
-                  || chunk_is_token(prev, CT_MEMBER))
-            {
-               prev = chunk_get_prev_ncnnlnp(prev);
-
-               if (  prev == nullptr
-                  || (  chunk_is_not_token(prev, CT_WORD)
-                     && chunk_is_not_token(prev, CT_TYPE)
-                     && chunk_is_not_token(prev, CT_THIS)))
-               {
-                  LOG_FMT(LFCN, "%s(%d): --? skipped MEMBER and landed on %s\n",
-                          __func__, __LINE__, (prev == nullptr) ? "<null>" : get_token_name(prev->type));
-                  break;
-               }
-               LOG_FMT(LFCN, "%s(%d): <skip> '%s'\n",
-                       __func__, __LINE__, prev->text());
-
-               // Issue #1112
-               // clarification: this will skip the CT_WORD, CT_TYPE or CT_THIS landing on either
-               // another CT_DC_MEMBER or CT_MEMBER or a token that indicates the context of the
-               // token in question; therefore, exit loop when not a CT_DC_MEMBER or CT_MEMBER
-               prev = chunk_get_prev_ncnnlnp(prev);
-
-               if (prev == nullptr)
-               {
-                  LOG_FMT(LFCN, "%s(%d): prev is nullptr\n",
-                          __func__, __LINE__);
-               }
-               else
-               {
-                  LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                          __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text());
-               }
-            }
-
-            if (prev == nullptr)
-            {
-               break;
-            }
-         }
-
-         // If we are on a TYPE or WORD, then this could be a proto or def
-         if (  chunk_is_token(prev, CT_TYPE)
-            || chunk_is_token(prev, CT_WORD))
-         {
-            if (!hit_star)
-            {
-               LOG_FMT(LFCN, "%s(%d):   --> For sure a prototype or definition\n",
-                       __func__, __LINE__);
-               isa_def = true;
-               break;
-            }
-            chunk_t *prev_prev = chunk_get_prev_ncnnlnp(prev);
-
-            if (!chunk_is_token(prev_prev, CT_QUESTION))               // Issue #1753
-            {
-               LOG_FMT(LFCN, "%s(%d):   --> maybe a proto/def\n",
-                       __func__, __LINE__);
-
-               LOG_FMT(LFCN, "%s(%d): prev is '%s', orig_line is %zu, orig_col is %zu, type is %s, parent_type is %s\n",
-                       __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
-                       get_token_name(prev->type), get_token_name(get_chunk_parent_type(prev)));
-               log_pcf_flags(LFCN, pc->flags);
-               isa_def = true;
-            }
-         }
-
-         if (chunk_is_ptr_operator(prev))
-         {
-            hit_star = true;
-         }
-
-         if (  chunk_is_not_token(prev, CT_OPERATOR)
-            && chunk_is_not_token(prev, CT_TSQUARE)
-            && chunk_is_not_token(prev, CT_ANGLE_CLOSE)
-            && chunk_is_not_token(prev, CT_QUALIFIER)
-            && chunk_is_not_token(prev, CT_TYPE)
-            && chunk_is_not_token(prev, CT_WORD)
-            && !chunk_is_ptr_operator(prev))
-         {
-            LOG_FMT(LFCN, "%s(%d):  --> Stopping on prev is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                    __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col, get_token_name(prev->type));
-
-            // certain tokens are unlikely to precede a prototype or definition
-            if (  chunk_is_token(prev, CT_ARITH)
-               || chunk_is_token(prev, CT_SHIFT)
-               || chunk_is_token(prev, CT_ASSIGN)
-               || chunk_is_token(prev, CT_COMMA)
-               || (  chunk_is_token(prev, CT_STRING)
-                  && get_chunk_parent_type(prev) != CT_EXTERN)  // fixes issue 1259
-               || chunk_is_token(prev, CT_STRING_MULTI)
-               || chunk_is_token(prev, CT_NUMBER)
-               || chunk_is_token(prev, CT_NUMBER_FP)
-               || chunk_is_token(prev, CT_FPAREN_OPEN)) // issue #1464
-            {
-               isa_def = false;
-            }
-            break;
-         }
-
-         // Skip over template and attribute stuff
-         if (chunk_is_token(prev, CT_ANGLE_CLOSE))
-         {
-            prev = skip_template_prev(prev);
-         }
-         else
-         {
-            prev = chunk_get_prev_ncnnlnp(prev);
-         }
-      }
-      //LOG_FMT(LFCN, " -- stopped on %s [%s]\n",
-      //        prev->text(), get_token_name(prev->type));
-
-      // Fixes issue #1634
-      if (chunk_is_paren_close(prev))
-      {
-         chunk_t *preproc = chunk_get_next_ncnnl(prev);
-
-         if (chunk_is_token(preproc, CT_PREPROC))
-         {
-            size_t pp_level = preproc->pp_level;
-
-            if (chunk_is_token(chunk_get_next_ncnnl(preproc), CT_PP_ELSE))
-            {
-               do
-               {
-                  preproc = chunk_get_prev_ncnnlni(preproc);      // Issue #2279
-
-                  if (chunk_is_token(preproc, CT_PP_IF))
-                  {
-                     preproc = chunk_get_prev_ncnnlni(preproc);   // Issue #2279
-
-                     if (preproc->pp_level == pp_level)
-                     {
-                        prev = chunk_get_prev_ncnnlnp(preproc);
-                        break;
-                     }
-                  }
-               } while (preproc != nullptr);
-            }
-         }
-      }
-
-      if (  isa_def
-         && prev != nullptr
-         && (  (  chunk_is_paren_close(prev)
-               && get_chunk_parent_type(prev) != CT_D_CAST
-               && get_chunk_parent_type(prev) != CT_MACRO_OPEN  // Issue #2726
-               && get_chunk_parent_type(prev) != CT_MACRO_CLOSE)
-            || chunk_is_token(prev, CT_ASSIGN)
-            || chunk_is_token(prev, CT_RETURN)))
-      {
-         LOG_FMT(LFCN, "%s(%d): -- overriding DEF due to prev is '%s', type is %s\n",
-                 __func__, __LINE__, prev->text(), get_token_name(prev->type));
-         isa_def = false;
-      }
-
-      // Fixes issue #1266, identification of a tuple return type in CS.
-      if (  !isa_def
-         && chunk_is_token(prev, CT_PAREN_CLOSE)
-         && chunk_get_next_ncnnl(prev) == pc)
-      {
-         tmp = chunk_skip_to_match_rev(prev);
-
-         while (  tmp != nullptr                     // Issue #2315
-               && tmp != prev)
-         {
-            if (  chunk_is_token(tmp, CT_COMMA)
-               && tmp->level == prev->level + 1)
-            {
-               LOG_FMT(LFCN, "%s(%d): -- overriding call due to tuple return type -- prev is '%s', type is %s\n",
-                       __func__, __LINE__, prev->text(), get_token_name(prev->type));
-               isa_def = true;
-               break;
-            }
-            tmp = chunk_get_next_ncnnl(tmp);
-         }
-      }
-
-      if (isa_def)
-      {
-         LOG_FMT(LFCN, "%s(%d): pc is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-         LOG_FMT(LFCN, "%s(%d): (12) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         set_chunk_type(pc, CT_FUNC_DEF);
-
-         if (prev == nullptr)
-         {
-            prev = chunk_get_head();
-         }
-
-         for (  tmp = prev; (tmp != nullptr)
-             && tmp != pc; tmp = chunk_get_next_ncnnlnp(tmp))
-         {
-            LOG_FMT(LFCN, "%s(%d): text() is '%s', type is %s\n",
-                    __func__, __LINE__, tmp->text(), get_token_name(tmp->type));
-            make_type(tmp);
-         }
-      }
-   }
-
-   if (chunk_is_not_token(pc, CT_FUNC_DEF))
-   {
-      LOG_FMT(LFCN, "%s(%d):  Detected type %s, text() is '%s', on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, get_token_name(pc->type),
-              pc->text(), pc->orig_line, pc->orig_col);
-
-      tmp = flag_parens(next, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
-
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         && get_chunk_parent_type(tmp) != CT_DOUBLE_BRACE)
-      {
-         set_paren_parent(tmp, pc->type);
-      }
-      return;
-   }
-   /*
-    * We have a function definition or prototype
-    * Look for a semicolon or a brace open after the close parenthesis to figure
-    * out whether this is a prototype or definition
-    */
-
-   // See if this is a prototype or implementation
-
-   // FIXME: this doesn't take the old K&R parameter definitions into account
-
-   // Scan tokens until we hit a brace open (def) or semicolon (proto)
-   tmp = paren_close;
-
-   while ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
-   {
-      // Only care about brace or semicolon on the same level
-      if (tmp->level < pc->level)
-      {
-         // No semicolon - guess that it is a prototype
-         chunk_flags_clr(pc, PCF_VAR_1ST_DEF);
-         set_chunk_type(pc, CT_FUNC_PROTO);
-         break;
-      }
-      else if (tmp->level == pc->level)
-      {
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
-         {
-            // its a function def for sure
-            break;
-         }
-         else if (chunk_is_semicolon(tmp))
-         {
-            // Set the parent for the semicolon for later
-            semi = tmp;
-            chunk_flags_clr(pc, PCF_VAR_1ST_DEF);
-            set_chunk_type(pc, CT_FUNC_PROTO);
-            LOG_FMT(LFCN, "%s(%d):   2) Marked text() is '%s', as FUNC_PROTO on orig_line %zu, orig_col %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-            break;
-         }
-         else if (chunk_is_token(pc, CT_COMMA))
-         {
-            set_chunk_type(pc, CT_FUNC_CTOR_VAR);
-            LOG_FMT(LFCN, "%s(%d):   2) Marked text() is '%s', as FUNC_CTOR_VAR on orig_line %zu, orig_col %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-            break;
-         }
-      }
-   }
-
-   /*
-    * C++ syntax is wacky. We need to check to see if a prototype is really a
-    * variable definition with parameters passed into the constructor.
-    * Unfortunately, without being able to accurately determine if an
-    * identifier is a type (which would require us to more or less be a full
-    * compiler), the only mostly reliable way to do so is to guess that it is
-    * a constructor variable if inside a function body and scan the 'parameter
-    * list' for items that are not allowed in a prototype. We search backwards
-    * and checking the parent of the containing open braces. If the parent is a
-    * class or namespace, then it probably is a prototype.
-    */
-   if (  language_is_set(LANG_CPP)
-      && chunk_is_token(pc, CT_FUNC_PROTO)
-      && get_chunk_parent_type(pc) != CT_OPERATOR)
-   {
-      LOG_FMT(LFPARAM, "%s(%d):", __func__, __LINE__);
-      LOG_FMT(LFPARAM, "  checking '%s' for constructor variable %s %s\n",
-              pc->text(),
-              get_token_name(paren_open->type),
-              get_token_name(paren_close->type));
-
-      /*
-       * Check the token at the start of the statement. If it's 'extern', we
-       * definitely have a function prototype.
-       */
-      tmp = pc;
-
-      while (  tmp != nullptr
-            && !tmp->flags.test(PCF_STMT_START))
-      {
-         tmp = chunk_get_prev_ncnnlni(tmp);   // Issue #2279
-      }
-      const bool is_extern = (  tmp != nullptr
-                             && tmp->str.equals("extern"));
-
-      /*
-       * Scan the parameters looking for:
-       *  - constant strings
-       *  - numbers
-       *  - non-type fields
-       *  - function calls
-       */
-      chunk_t *ref = chunk_get_next_ncnnl(paren_open);
-      chunk_t *tmp2;
-      bool    is_param = true;
-      tmp = ref;
-
-      while (tmp != paren_close)
-      {
-         tmp2 = chunk_get_next_ncnnl(tmp);
-
-         if (  chunk_is_token(tmp, CT_COMMA)
-            && (tmp->level == (paren_open->level + 1)))
-         {
-            if (!can_be_full_param(ref, tmp))
-            {
-               is_param = false;
-               break;
-            }
-            ref = tmp2;
-         }
-         tmp = tmp2;
-      }
-
-      if (  !is_extern
-         && is_param
-         && ref != tmp)
-      {
-         if (!can_be_full_param(ref, tmp))
-         {
-            is_param = false;
-         }
-      }
-
-      if (  !is_extern
-         && !is_param)
-      {
-         set_chunk_type(pc, CT_FUNC_CTOR_VAR);
-         LOG_FMT(LFCN, "%s(%d):   3) Marked text() '%s' as FUNC_CTOR_VAR on orig_line %zu, orig_col %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-      }
-      else if (pc->brace_level > 0)
-      {
-         chunk_t *br_open = chunk_get_prev_type(pc, CT_BRACE_OPEN, pc->brace_level - 1);
-
-         if (  br_open != nullptr
-            && get_chunk_parent_type(br_open) != CT_EXTERN
-            && get_chunk_parent_type(br_open) != CT_NAMESPACE)
-         {
-            // Do a check to see if the level is right
-            prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-
-            if (  !chunk_is_str(prev, "*", 1)
-               && !chunk_is_str(prev, "&", 1))
-            {
-               chunk_t *p_op = chunk_get_prev_type(pc, CT_BRACE_OPEN, pc->brace_level - 1);
-
-               if (  p_op != nullptr
-                  && get_chunk_parent_type(p_op) != CT_CLASS
-                  && get_chunk_parent_type(p_op) != CT_STRUCT
-                  && get_chunk_parent_type(p_op) != CT_NAMESPACE)
-               {
-                  set_chunk_type(pc, CT_FUNC_CTOR_VAR);
-                  LOG_FMT(LFCN, "%s(%d):   4) Marked text() is'%s', as FUNC_CTOR_VAR on orig_line %zu, orig_col %zu\n",
-                          __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-               }
-            }
-         }
-      }
-   }
-
-   if (semi != nullptr)
-   {
-      set_chunk_parent(semi, pc->type);
-   }
-
-   // Issue # 1403, 2152
-   if (chunk_is_token(paren_open->prev, CT_FUNC_CTOR_VAR))
-   {
-      flag_parens(paren_open, PCF_IN_FCN_CTOR, CT_FPAREN_OPEN, pc->type, false);
-   }
-   else
-   {
-      flag_parens(paren_open, PCF_IN_FCN_DEF, CT_FPAREN_OPEN, pc->type, false);
-   }
-   //flag_parens(paren_open, PCF_IN_FCN_DEF, CT_FPAREN_OPEN, pc->type, true);
-
-   if (chunk_is_token(pc, CT_FUNC_CTOR_VAR))
-   {
-      chunk_flags_set(pc, PCF_VAR_1ST_DEF);
-      return;
-   }
-
-   if (chunk_is_token(next, CT_TSQUARE))
-   {
-      next = chunk_get_next_ncnnl(next);
-
-      if (next == nullptr)
-      {
-         return;
-      }
-   }
-   // Mark parameters and return type
-   fix_fcn_def_params(next);
-   mark_function_return_type(pc, chunk_get_prev_ncnnlni(pc), pc->type);   // Issue #2279
-
-   /* mark C# where chunk */
-   if (  language_is_set(LANG_CS)
-      && (  (chunk_is_token(pc, CT_FUNC_DEF))
-         || (chunk_is_token(pc, CT_FUNC_PROTO))))
-   {
-      tmp = chunk_get_next_ncnnl(paren_close);
-      pcf_flags_t in_where_spec_flags = PCF_NONE;
-
-      while (  tmp != nullptr
-            && chunk_is_not_token(tmp, CT_BRACE_OPEN)
-            && chunk_is_not_token(tmp, CT_SEMICOLON))
-      {
-         mark_where_chunk(tmp, pc->type, tmp->flags | in_where_spec_flags);
-         in_where_spec_flags = tmp->flags & PCF_IN_WHERE_SPEC;
-
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-   }
-
-   // Find the brace pair and set the parent
-   if (chunk_is_token(pc, CT_FUNC_DEF))
-   {
-      tmp = chunk_get_next_ncnnl(paren_close);
-
-      while (  tmp != nullptr
-            && chunk_is_not_token(tmp, CT_BRACE_OPEN))
-      {
-         LOG_FMT(LFCN, "%s(%d): (13) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-         set_chunk_parent(tmp, CT_FUNC_DEF);
-
-         if (!chunk_is_semicolon(tmp))
-         {
-            chunk_flags_set(tmp, PCF_OLD_FCN_PARAMS);
-         }
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-
-      if (chunk_is_token(tmp, CT_BRACE_OPEN))
-      {
-         LOG_FMT(LFCN, "%s(%d): (14) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-         set_chunk_parent(tmp, CT_FUNC_DEF);
-         tmp = chunk_skip_to_match(tmp);
-
-         if (tmp != nullptr)
-         {
-            LOG_FMT(LFCN, "%s(%d): (15) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                    __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-            set_chunk_parent(tmp, CT_FUNC_DEF);
-         }
-      }
-   }
-} // mark_function
-
-
-bool mark_function_type(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LFTYPE, "%s(%d): type is %s, text() '%s' @ orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, get_token_name(pc->type), pc->text(),
-           pc->orig_line, pc->orig_col);
-
-   size_t    star_count = 0;
-   size_t    word_count = 0;
-   chunk_t   *ptrcnk    = nullptr;
-   chunk_t   *tmp;
-   chunk_t   *apo;
-   chunk_t   *apc;
-   chunk_t   *aft;
-   bool      anon = false;
-   c_token_t pt, ptp;
-
-   // Scan backwards across the name, which can only be a word and single star
-   chunk_t *varcnk = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-
-   varcnk = chunk_get_prev_ssq(varcnk);
-
-   if (  varcnk != nullptr
-      && !chunk_is_word(varcnk))
-   {
-      if (  language_is_set(LANG_OC)
-         && chunk_is_str(varcnk, "^", 1)
-         && chunk_is_paren_open(chunk_get_prev_ncnnlni(varcnk)))   // Issue #2279
-      {
-         // anonymous ObjC block type -- RTYPE (^)(ARGS)
-         anon = true;
-      }
-      else
-      {
-         LOG_FMT(LFTYPE, "%s(%d): not a word: text() '%s', type is %s, @ orig_line is %zu:, orig_col is %zu\n",
-                 __func__, __LINE__, varcnk->text(), get_token_name(varcnk->type),
-                 varcnk->orig_line, varcnk->orig_col);
-         goto nogo_exit;
-      }
-   }
-   apo = chunk_get_next_ncnnl(pc);
-
-   if (apo == nullptr)
-   {
-      return(false);
-   }
-   apc = chunk_skip_to_match(apo);
-
-   if (  apc != nullptr
-      && (  !chunk_is_paren_open(apo)
-         || ((apc = chunk_skip_to_match(apo)) == nullptr)))
-   {
-      LOG_FMT(LFTYPE, "%s(%d): not followed by parens\n", __func__, __LINE__);
-      goto nogo_exit;
-   }
-   aft = chunk_get_next_ncnnl(apc);
-
-   if (chunk_is_token(aft, CT_BRACE_OPEN))
-   {
-      pt = CT_FUNC_DEF;
-   }
-   else if (  chunk_is_token(aft, CT_SEMICOLON)
-           || chunk_is_token(aft, CT_ASSIGN))
-   {
-      pt = CT_FUNC_PROTO;
-   }
-   else
-   {
-      LOG_FMT(LFTYPE, "%s(%d): not followed by '{' or ';'\n", __func__, __LINE__);
-      goto nogo_exit;
-   }
-   ptp = pc->flags.test(PCF_IN_TYPEDEF) ? CT_FUNC_TYPE : CT_FUNC_VAR;
-
-   tmp = pc;
-
-   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
-   {
-      tmp = chunk_get_prev_ssq(tmp);
-
-      LOG_FMT(LFTYPE, " -- type is %s, %s on orig_line %zu, orig_col is %zu",
-              get_token_name(tmp->type), tmp->text(),
-              tmp->orig_line, tmp->orig_col);
-
-      if (  chunk_is_star(tmp)
-         || chunk_is_token(tmp, CT_PTR_TYPE)
-         || chunk_is_token(tmp, CT_CARET))
-      {
-         star_count++;
-         ptrcnk = tmp;
-         LOG_FMT(LFTYPE, " -- PTR_TYPE\n");
-      }
-      else if (  chunk_is_word(tmp)
-              || chunk_is_token(tmp, CT_WORD)
-              || chunk_is_token(tmp, CT_TYPE))
-      {
-         word_count++;
-         LOG_FMT(LFTYPE, " -- TYPE(%s)\n", tmp->text());
-      }
-      else if (chunk_is_token(tmp, CT_DC_MEMBER))
-      {
-         word_count = 0;
-         LOG_FMT(LFTYPE, " -- :: reset word_count\n");
-      }
-      else if (chunk_is_str(tmp, "(", 1))
-      {
-         LOG_FMT(LFTYPE, " -- open paren (break)\n");
-         break;
-      }
-      else
-      {
-         LOG_FMT(LFTYPE, " --  unexpected token: type is %s, text() '%s', on orig_line %zu, orig_col %zu\n",
-                 get_token_name(tmp->type), tmp->text(),
-                 tmp->orig_line, tmp->orig_col);
-         goto nogo_exit;
-      }
-   }
-
-   // Fixes #issue 1577
-   // Allow word count 2 incase of function pointer declaration.
-   // Ex: bool (__stdcall* funcptr)(int, int);
-   if (  star_count > 1
-      || (  word_count > 1
-         && !(  word_count == 2
-             && ptp == CT_FUNC_VAR))
-      || ((star_count + word_count) == 0))
-   {
-      LOG_FMT(LFTYPE, "%s(%d): bad counts word: %zu, star: %zu\n",
-              __func__, __LINE__, word_count, star_count);
-      goto nogo_exit;
-   }
-
-   // make sure what appears before the first open paren can be a return type
-   if (!chunk_ends_type(chunk_get_prev_ncnnlni(tmp)))   // Issue #2279
-   {
-      goto nogo_exit;
-   }
-
-   if (ptrcnk)
-   {
-      set_chunk_type(ptrcnk, CT_PTR_TYPE);
-   }
-
-   if (!anon)
-   {
-      if (pc->flags.test(PCF_IN_TYPEDEF))
-      {
-         set_chunk_type(varcnk, CT_TYPE);
-      }
-      else
-      {
-         set_chunk_type(varcnk, CT_FUNC_VAR);
-         chunk_flags_set(varcnk, PCF_VAR_1ST_DEF);
-      }
-   }
-   set_chunk_type(pc, CT_TPAREN_CLOSE);
-   set_chunk_parent(pc, ptp);
-
-   set_chunk_type(apo, CT_FPAREN_OPEN);
-   set_chunk_parent(apo, pt);
-   set_chunk_type(apc, CT_FPAREN_CLOSE);
-   set_chunk_parent(apc, pt);
-   fix_fcn_def_params(apo);
-
-   if (chunk_is_semicolon(aft))
-   {
-      set_chunk_parent(aft, aft->flags.test(PCF_IN_TYPEDEF) ? CT_TYPEDEF : CT_FUNC_VAR);
-   }
-   else if (chunk_is_token(aft, CT_BRACE_OPEN))
-   {
-      flag_parens(aft, PCF_NONE, CT_NONE, pt, false);
-   }
-   // Step backwards to the previous open paren and mark everything a
-   tmp = pc;
-
-   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
-   {
-      LOG_FMT(LFTYPE, " ++ type is %s, text() '%s', on orig_line %zu, orig_col %zu\n",
-              get_token_name(tmp->type), tmp->text(),
-              tmp->orig_line, tmp->orig_col);
-
-      if (*tmp->str.c_str() == '(')
-      {
-         if (!pc->flags.test(PCF_IN_TYPEDEF))
-         {
-            chunk_flags_set(tmp, PCF_VAR_1ST_DEF);
-         }
-         set_chunk_type(tmp, CT_TPAREN_OPEN);
-         set_chunk_parent(tmp, ptp);
-
-         tmp = chunk_get_prev_ncnnlni(tmp);   // Issue #2279
-
-         if (  chunk_is_token(tmp, CT_FUNCTION)
-            || chunk_is_token(tmp, CT_FUNC_CALL)
-            || chunk_is_token(tmp, CT_FUNC_CALL_USER)
-            || chunk_is_token(tmp, CT_FUNC_DEF)
-            || chunk_is_token(tmp, CT_FUNC_PROTO))
-         {
-            set_chunk_type(tmp, CT_TYPE);
-            chunk_flags_clr(tmp, PCF_VAR_1ST_DEF);
-         }
-         mark_function_return_type(varcnk, tmp, ptp);
-         break;
-      }
-   }
-   return(true);
-
-nogo_exit:
-   tmp = chunk_get_next_ncnnl(pc);
-
-   if (chunk_is_paren_open(tmp))
-   {
-      LOG_FMT(LFTYPE, "%s(%d): setting FUNC_CALL on orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, tmp->orig_line, tmp->orig_col);
-      flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
-   }
-   return(false);
-} // mark_function_type
-
-
-void mark_lvalue(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *prev;
-
-   if (pc->flags.test(PCF_IN_PREPROC))
-   {
-      return;
-   }
-
-   for (prev = chunk_get_prev_ncnnlni(pc);     // Issue #2279
-        prev != nullptr;
-        prev = chunk_get_prev_ncnnlni(prev))   // Issue #2279
-   {
-      if (  prev->level < pc->level
-         || chunk_is_token(prev, CT_ACCESS_COLON)
-         || chunk_is_token(prev, CT_ASSIGN)
-         || chunk_is_token(prev, CT_BOOL)
-         || chunk_is_token(prev, CT_COMMA)
-         || chunk_is_cpp_inheritance_access_specifier(prev)
-         || chunk_is_semicolon(prev)
-         || chunk_is_str(prev, "(", 1)
-         || chunk_is_str(prev, "{", 1)
-         || chunk_is_str(prev, "[", 1)
-         || prev->flags.test(PCF_IN_PREPROC)
-         || get_chunk_parent_type(prev) == CT_NAMESPACE
-         || get_chunk_parent_type(prev) == CT_TEMPLATE)
-      {
-         break;
-      }
-      chunk_flags_set(prev, PCF_LVALUE);
-
-      if (  prev->level == pc->level
-         && chunk_is_str(prev, "&", 1))
-      {
-         make_type(prev);
-      }
-   }
-} // mark_lvalue
-
-
-void mark_struct_union_body(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc = start;
-
-   while (  pc != nullptr
-         && pc->level >= start->level
-         && !(  pc->level == start->level
-             && chunk_is_token(pc, CT_BRACE_CLOSE)))
-   {
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_SEMICOLON))
-      {
-         pc = chunk_get_next_ncnnl(pc);
-
-         if (pc == nullptr)
-         {
-            break;
-         }
-      }
-
-      if (chunk_is_token(pc, CT_ALIGN))
-      {
-         pc = skip_align(pc); // "align(x)" or "align(x):"
-
-         if (pc == nullptr)
-         {
-            break;
-         }
-      }
-      else
-      {
-         pc = fix_variable_definition(pc);
-
-         if (pc == nullptr)
-         {
-            break;
-         }
-      }
-   }
-} // mark_struct_union_body
-
-
-void mark_template_func(chunk_t *pc, chunk_t *pc_next)
-{
-   LOG_FUNC_ENTRY();
-
-   // We know angle_close must be there...
-   chunk_t *angle_close = chunk_get_next_type(pc_next, CT_ANGLE_CLOSE, pc->level);
-   chunk_t *after       = chunk_get_next_ncnnl(angle_close);
-
-   if (after != nullptr)
-   {
-      if (chunk_is_str(after, "(", 1))
-      {
-         if (angle_close->flags.test(PCF_IN_FCN_CALL))
-         {
-            LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line);
-            LOG_FMT(LFCN, "%s(%d): (16) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-            set_chunk_type(pc, CT_FUNC_CALL);
-            flag_parens(after, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
-         }
-         else
-         {
-            /*
-             * Might be a function def. Must check what is before the template:
-             * Func call:
-             *   BTree.Insert(std::pair<int, double>(*it, double(*it) + 1.0));
-             *   a = Test<int>(j);
-             *   std::pair<int, double>(*it, double(*it) + 1.0));
-             */
-
-            LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL 2\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line);
-            // its a function!!!
-            LOG_FMT(LFCN, "%s(%d): (17) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-            set_chunk_type(pc, CT_FUNC_CALL);
-            mark_function(pc);
-         }
-      }
-      else if (chunk_is_token(after, CT_WORD))
-      {
-         // its a type!
-         set_chunk_type(pc, CT_TYPE);
-         chunk_flags_set(pc, PCF_VAR_TYPE);
-         chunk_flags_set(after, PCF_VAR_DEF);
-      }
-   }
-} // mark_template_func
-
-
-chunk_t *mark_variable_definition(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (start == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk_t     *pc   = start;
-   pcf_flags_t flags = PCF_VAR_1ST_DEF;
-
-   LOG_FMT(LVARDEF, "%s(%d): orig_line %zu, orig_col %zu, text() '%s', type is %s\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-           get_token_name(pc->type));
-
-   // Issue #596
-   bool bit_field_colon_is_present = false;
-
-   while (go_on(pc, start))
-   {
-      if (  chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_FUNC_CTOR_VAR))
-      {
-         auto const orig_flags = pc->flags;
-
-         if (!pc->flags.test(PCF_IN_ENUM))
-         {
-            chunk_flags_set(pc, flags);
-         }
-         flags &= ~PCF_VAR_1ST;
-         LOG_FMT(LVARDEF, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', set PCF_VAR_1ST\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-
-         LOG_FMT(LVARDEF,
-                 "%s(%d): orig_line is %zu, marked text() '%s'[%s]\n"
-                 "   in orig_col %zu, flags: %s -> %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->text(),
-                 get_token_name(pc->type), pc->orig_col,
-                 pcf_flags_str(orig_flags).c_str(),
-                 pcf_flags_str(pc->flags).c_str());
-      }
-      else if (  !bit_field_colon_is_present                      // Issue #2689
-              && (  chunk_is_star(pc)
-                 || chunk_is_msref(pc)))
-      {
-         set_chunk_type(pc, CT_PTR_TYPE);
-      }
-      else if (chunk_is_addr(pc))
-      {
-         set_chunk_type(pc, CT_BYREF);
-      }
-      else if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-              || chunk_is_token(pc, CT_ASSIGN))
-      {
-         pc = skip_expression(pc);
-         continue;
-      }
-      else if (chunk_is_token(pc, CT_COLON))
-      {
-         bit_field_colon_is_present = true;                    // Issue #2689
-      }
-      pc = chunk_get_next_ncnnl(pc);
-   }
-   return(pc);
-} // mark_variable_definition
-
-
-void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
-{
-   UNUSED(sev);
-   LOG_FUNC_ENTRY();
-
-   // throw out the last word and mark the rest
-   chunk_t *var_name = cs.Pop_Back();
-
-   if (  var_name != nullptr
-      && var_name->prev != nullptr
-      && var_name->prev->type == CT_DC_MEMBER)
-   {
-      cs.Push_Back(var_name);
-   }
-
-   if (var_name != nullptr)
-   {
-      LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu:\n",
-              __func__, __LINE__, var_name->orig_line, var_name->orig_col);
-
-      size_t  word_cnt = 0;
-      chunk_t *word_type;
-
-      while ((word_type = cs.Pop_Back()) != nullptr)
-      {
-         if (  chunk_is_token(word_type, CT_WORD)
-            || chunk_is_token(word_type, CT_TYPE))
-         {
-            LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu: <%s> as TYPE\n",
-                    __func__, __LINE__, var_name->orig_line, var_name->orig_col, word_type->text());
-            set_chunk_type(word_type, CT_TYPE);
-            chunk_flags_set(word_type, PCF_VAR_TYPE);
-         }
-         word_cnt++;
-      }
-
-      if (chunk_is_token(var_name, CT_WORD))
-      {
-         if (word_cnt > 0)
-         {
-            LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu: <%s> as VAR\n",
-                    __func__, __LINE__, var_name->orig_line, var_name->orig_col, var_name->text());
-            chunk_flags_set(var_name, PCF_VAR_DEF);
-         }
-         else
-         {
-            LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu: <%s> as TYPE\n",
-                    __func__, __LINE__, var_name->orig_line, var_name->orig_col, var_name->text());
-            set_chunk_type(var_name, CT_TYPE);
-            chunk_flags_set(var_name, PCF_VAR_TYPE);
-         }
-      }
-   }
-} // mark_variable_stack
-
-
-pcf_flags_t mark_where_chunk(chunk_t *pc, c_token_t parent_type, pcf_flags_t flags)
-{
-   /* TODO: should have options to control spacing around the ':' as well as newline ability for the
-    * constraint clauses (should it break up a 'where A : B where C : D' on the same line? wrap? etc.) */
-
-   if (chunk_is_token(pc, CT_WHERE))
-   {
-      set_chunk_type(pc, CT_WHERE_SPEC);
-      set_chunk_parent(pc, parent_type);
-      flags |= PCF_IN_WHERE_SPEC;
-      LOG_FMT(LFTOR, "%s: where-spec on line %zu\n",
-              __func__, pc->orig_line);
-   }
-   else if (flags.test(PCF_IN_WHERE_SPEC))
-   {
-      if (chunk_is_str(pc, ":", 1))
-      {
-         set_chunk_type(pc, CT_WHERE_COLON);
-         LOG_FMT(LFTOR, "%s: where-spec colon on line %zu\n",
-                 __func__, pc->orig_line);
-      }
-      else if (  (chunk_is_token(pc, CT_STRUCT))
-              || (chunk_is_token(pc, CT_CLASS)))
-      {
-         /* class/struct inside of a where-clause confuses parser for indentation; set it as a word so it looks like the rest */
-         set_chunk_type(pc, CT_WORD);
-      }
-   }
-
-   if (flags.test(PCF_IN_WHERE_SPEC))
-   {
-      chunk_flags_set(pc, PCF_IN_WHERE_SPEC);
-   }
-   return(flags);
-} // mark_where_chunk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.h
deleted file mode 100644
index c0e724dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * @file combine_fix_mark.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#ifndef COMBINE_FIX_MARK_H_INCLUDED
-#define COMBINE_FIX_MARK_H_INCLUDED
-
-#include "ChunkStack.h"
-
-
-/**
- * Checks to see if the current paren is part of a cast.
- * We already verified that this doesn't follow function, TYPE, IF, FOR,
- * SWITCH, or WHILE and is followed by WORD, TYPE, STRUCT, ENUM, or UNION.
- *
- * @param start  Pointer to the open paren
- */
-void fix_casts(chunk_t *start);
-
-
-/**
- * Simply change any STAR to PTR_TYPE and WORD to TYPE
- *
- * @param start  points to the open paren
- */
-void fix_fcn_def_params(chunk_t *start);
-
-
-/**
- * CT_TYPE_CAST follows this pattern:
- * dynamic_cast<...>(...)
- *
- * Mark everything between the <> as a type and set the paren parent
- */
-void fix_type_cast(chunk_t *start);
-
-
-/**
- * We are on a typedef.
- * If the next word is not enum/union/struct, then the last word before the
- * next ',' or ';' or '__attribute__' is a type.
- *
- * typedef [type...] [*] type [, [*]type] ;
- * typedef <return type>([*]func)();
- * typedef <return type>([*]func)(params);
- * typedef <return type>(__stdcall *func)(); Bug # 633    MS-specific extension
- *                                           include the config-file "test/config/MS-calling_conventions.cfg"
- * typedef <return type>func(params);
- * typedef <enum/struct/union> [type] [*] type [, [*]type] ;
- * typedef <enum/struct/union> [type] { ... } [*] type [, [*]type] ;
- */
-void fix_typedef(chunk_t *start);
-
-
-/**
- * We are on the start of a sequence that could be a variable definition
- *  - FPAREN_OPEN (parent == CT_FOR)
- *  - BRACE_OPEN
- *  - SEMICOLON
- */
-chunk_t *fix_variable_definition(chunk_t *start);
-
-
-void mark_cpp_constructor(chunk_t *pc);
-
-
-/**
- * Mark all chunks belonging to a C++ lambda expression
- *
- * @param square_open points to a chunk of type CT_SQUARE_OPEN, and the parent type is
- *                    assumed to have already been assigned the value CT_CPP_LAMBDA;
- *                    under this assumption, the function marks all chunks as PCF_IN_LAMBDA
- *                    until the corresponding closing CT_BRACE_CLOSE (with parent type
- *                    CT_CPP_LAMBDA) is encountered
- */
-void mark_cpp_lambda(chunk_t *square_open);
-
-
-/**
- * Marks statement starts in a macro body.
- * REVISIT: this may already be done
- */
-void mark_define_expressions(void);
-
-
-/**
- * Just mark every CT_WORD until a semicolon as CT_SQL_WORD.
- * Adjust the levels if pc is CT_SQL_BEGIN
- */
-void mark_exec_sql(chunk_t *pc);
-
-
-/**
- * Changes the return type to type and set the parent.
- *
- * @param pc           the last chunk of the return type
- * @param parent_type  CT_NONE (no change) or the new parent type
- */
-void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_type);
-
-
-/**
- * We are on a function word. we need to:
- *  - find out if this is a call or prototype or implementation
- *  - mark return type
- *  - mark parameter types
- *  - mark brace pair
- *
- * REVISIT:
- * This whole function is a mess.
- * It needs to be reworked to eliminate duplicate logic and determine the
- * function type more directly.
- *  1. Skip to the close paren and see what is after.
- *     a. semicolon - function call or function proto
- *     b. open brace - function call (ie, list_for_each) or function def
- *     c. open paren - function type or chained function call
- *     d. qualifier - function def or proto, continue to semicolon or open brace
- *  2. Examine the 'parameters' to see if it can be a proto/def
- *  3. Examine what is before the function name to see if it is a proto or call
- * Constructor/destructor detection should have already been done when the
- * 'class' token was encountered (see mark_class_ctor).
- */
-void mark_function(chunk_t *pc);
-
-
-/**
- * Process a function type that is not in a typedef.
- * pc points to the first close paren.
- *
- * void (*func)(params);
- * const char * (*func)(params);
- * const char * (^func)(params);   -- Objective C
- *
- * @param pc  Points to the first closing paren
- *
- * @return whether a function type was processed
- */
-bool mark_function_type(chunk_t *pc);
-
-
-/**
- *  Just hit an assign. Go backwards until we hit an open brace/paren/square or
- * semicolon (TODO: other limiter?) and mark as a LValue.
- */
-void mark_lvalue(chunk_t *pc);
-
-
-/**
- * Examines the stuff between braces { }.
- * There should only be variable definitions and methods.
- * Skip the methods, as they will get handled elsewhere.
- */
-void mark_struct_union_body(chunk_t *start);
-
-
-/**
- * We are on a word followed by a angle open which is part of a template.
- * If the angle close is followed by a open paren, then we are on a template
- * function def or a template function call:
- *   Vector2<float>(...) [: ...[, ...]] { ... }
- * Or we could be on a variable def if it's followed by a word:
- *   Renderer<rgb32> rend;
- */
-void mark_template_func(chunk_t *pc, chunk_t *pc_next);
-
-
-/**
- * We are on the first word of a variable definition.
- * Mark all the variable names with PCF_VAR_1ST and PCF_VAR_DEF as appropriate.
- * Also mark any '*' encountered as a CT_PTR_TYPE.
- * Skip over []. Go until a ';' is hit.
- *
- * Example input:
- * int   a = 3, b, c = 2;              ## called with 'a'
- * foo_t f = {1, 2, 3}, g = {5, 6, 7}; ## called with 'f'
- * struct {...} *a, *b;                ## called with 'a' or '*'
- * myclass a(4);
- */
-chunk_t *mark_variable_definition(chunk_t *start);
-
-
-void mark_variable_stack(ChunkStack &cs, log_sev_t sev);
-
-
-/**
- * TODO: add doc cmt
- *
- */
-pcf_flags_t mark_where_chunk(chunk_t *pc, c_token_t parent_type, pcf_flags_t flags);
-
-
-#endif /* COMBINE_FIX_MARK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.cpp
deleted file mode 100644
index 9abebc4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-/**
- * @file combine_labels.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.h
- */
-
-#include "combine_labels.h"
-
-#include "chunk_list.h"
-#include "cs_top_is_question.h"
-#include "uncrustify.h"
-
-
-chunk_t *chunk_get_next_local(chunk_t *pc, scope_e scope = scope_e::ALL)
-{
-   chunk_t *tmp = pc;
-
-   do
-   {
-      tmp = chunk_get_next(tmp, scope);
-   } while (  tmp != nullptr
-           && (  chunk_is_comment(tmp)
-              || chunk_is_token(tmp, CT_NOEXCEPT)));
-
-   return(tmp);
-}
-
-
-chunk_t *chunk_get_prev_local(chunk_t *pc, scope_e scope = scope_e::ALL)
-{
-   chunk_t *tmp = pc;
-
-   do
-   {
-      tmp = chunk_get_prev(tmp, scope);
-   } while (  tmp != nullptr
-           && (  chunk_is_comment(tmp)
-              || chunk_is_newline(tmp)
-              || chunk_is_token(tmp, CT_NOEXCEPT)));
-
-   return(tmp);
-}
-
-
-void combine_labels(void)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *cur;
-   chunk_t *prev;
-   chunk_t *next;
-   bool    hit_case  = false;
-   bool    hit_class = false;
-
-   cpd.unc_stage = unc_stage_e::COMBINE_LABELS;
-
-   // stack to handle nesting inside of OC messages, which reset the scope
-   ChunkStack cs;
-
-   prev = chunk_get_head();
-
-   if (prev == nullptr)
-   {
-      return;
-   }
-   cur = chunk_get_next_nc(prev);
-
-   if (cur == nullptr)
-   {
-      return;
-   }
-   next = chunk_get_next_nc(cur);
-
-   // unlikely that the file will start with a label...
-   // prev cur next
-   while (next != nullptr)
-   {
-      if (chunk_is_token(next, CT_NEWLINE))
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->nl_count);
-      }
-      else if (chunk_is_token(next, CT_VBRACE_OPEN))
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, VBRACE_OPEN\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col);
-      }
-      else if (chunk_is_token(next, CT_VBRACE_CLOSE))
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, VBRACE_CLOSE\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col);
-      }
-      else
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->text());
-      }
-
-      if (  !next->flags.test(PCF_IN_OC_MSG) // filter OC case of [self class] msg send
-         && (  chunk_is_token(next, CT_CLASS)
-            || chunk_is_token(next, CT_OC_CLASS)
-            || chunk_is_token(next, CT_TEMPLATE)))
-      {
-         hit_class = true;
-      }
-
-      if (  chunk_is_semicolon(next)
-         || chunk_is_token(next, CT_BRACE_OPEN))
-      {
-         hit_class = false;
-      }
-
-      if (  chunk_is_token(prev, CT_SQUARE_OPEN)
-         && get_chunk_parent_type(prev) == CT_OC_MSG)
-      {
-         cs.Push_Back(prev);
-      }
-      else if (  chunk_is_token(next, CT_SQUARE_CLOSE)
-              && get_chunk_parent_type(next) == CT_OC_MSG)
-      {
-         // pop until we hit '['
-         while (!cs.Empty())
-         {
-            chunk_t *t2 = cs.Top()->m_pc;
-            cs.Pop_Back();
-
-            if (chunk_is_token(t2, CT_SQUARE_OPEN))
-            {
-               break;
-            }
-         }
-      }
-
-      if (  chunk_is_token(next, CT_QUESTION)
-         && !next->flags.test(PCF_IN_TEMPLATE))
-      {
-         cs.Push_Back(next);
-      }
-      else if (chunk_is_token(next, CT_CASE))
-      {
-         if (chunk_is_token(cur, CT_GOTO))
-         {
-            // handle "goto case x;"
-            set_chunk_type(next, CT_QUALIFIER);
-         }
-         else
-         {
-            hit_case = true;
-         }
-      }
-      else if (  chunk_is_token(next, CT_COLON)
-              || (  chunk_is_token(next, CT_OC_COLON)
-                 && cs_top_is_question(cs, next->level)))
-      {
-         if (chunk_is_token(cur, CT_DEFAULT))
-         {
-            set_chunk_type(cur, CT_CASE);
-            hit_case = true;
-         }
-
-         if (cs_top_is_question(cs, next->level))
-         {
-            set_chunk_type(next, CT_COND_COLON);
-            cs.Pop_Back();
-         }
-         else if (hit_case)
-         {
-            hit_case = false;
-            set_chunk_type(next, CT_CASE_COLON);
-            chunk_t *tmp = chunk_get_next_ncnnlnp(next);                // Issue #2150
-
-            if (chunk_is_token(tmp, CT_BRACE_OPEN))
-            {
-               set_chunk_parent(tmp, CT_CASE);
-               tmp = chunk_get_next_type(tmp, CT_BRACE_CLOSE, tmp->level);
-
-               if (tmp != nullptr)
-               {
-                  set_chunk_parent(tmp, CT_CASE);
-               }
-            }
-
-            if (  chunk_is_token(cur, CT_NUMBER)
-               && chunk_is_token(prev, CT_ELLIPSIS))
-            {
-               chunk_t *pre_elipsis = chunk_get_prev_ncnnlnp(prev);
-
-               if (chunk_is_token(pre_elipsis, CT_NUMBER))
-               {
-                  set_chunk_type(prev, CT_CASE_ELLIPSIS);
-               }
-            }
-         }
-         else if (cur->flags.test(PCF_IN_WHERE_SPEC))
-         {
-            /* leave colons in where-constraint clauses alone */
-         }
-         else
-         {
-            LOG_FMT(LFCN, "%s(%d): prev->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                    __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col);
-            LOG_FMT(LFCN, "%s(%d): cur->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                    __func__, __LINE__, cur->text(), cur->orig_line, cur->orig_col);
-            LOG_FMT(LFCN, "%s(%d): next->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                    __func__, __LINE__, next->text(), next->orig_line, next->orig_col);
-            chunk_t *nextprev = chunk_get_prev_local(next);   // Issue #2279
-
-            if (nextprev == nullptr)
-            {
-               return;
-            }
-
-            if (language_is_set(LANG_PAWN))
-            {
-               if (  chunk_is_token(cur, CT_WORD)
-                  || chunk_is_token(cur, CT_BRACE_CLOSE))
-               {
-                  c_token_t new_type = CT_TAG;
-
-                  chunk_t   *tmp = chunk_get_next_nc(next);
-
-                  if (tmp == nullptr)
-                  {
-                     return;
-                  }
-
-                  if (  chunk_is_newline(prev)
-                     && chunk_is_newline(tmp))
-                  {
-                     new_type = CT_LABEL;
-                     set_chunk_type(next, CT_LABEL_COLON);
-                  }
-                  else
-                  {
-                     set_chunk_type(next, CT_TAG_COLON);
-                  }
-
-                  if (chunk_is_token(cur, CT_WORD))
-                  {
-                     set_chunk_type(cur, new_type);
-                  }
-               }
-            }
-            else if (next->flags.test(PCF_IN_ARRAY_ASSIGN))
-            {
-               set_chunk_type(next, CT_D_ARRAY_COLON);
-            }
-            else if (next->flags.test(PCF_IN_FOR))
-            {
-               set_chunk_type(next, CT_FOR_COLON);
-            }
-            else if (next->flags.test(PCF_OC_BOXED))
-            {
-               set_chunk_type(next, CT_OC_DICT_COLON);
-            }
-            else if (chunk_is_token(cur, CT_WORD))
-            {
-               chunk_t *tmp = chunk_get_next_nc(next, scope_e::PREPROC);
-
-               // Issue #1187
-               if (tmp == nullptr)
-               {
-                  return;
-               }
-               LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, tmp '%s': ",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-                       (chunk_is_token(tmp, CT_NEWLINE)) ? "<Newline>" : tmp->text());
-               log_pcf_flags(LGUY, tmp->flags);
-
-               if (next->flags.test(PCF_IN_FCN_CALL))
-               {
-                  // Must be a macro thingy, assume some sort of label
-                  set_chunk_type(next, CT_LABEL_COLON);
-               }
-               else if (  tmp == nullptr
-                       || (  chunk_is_not_token(tmp, CT_NUMBER)
-                          && chunk_is_not_token(tmp, CT_DECLTYPE)
-                          && chunk_is_not_token(tmp, CT_SIZEOF)
-                          && get_chunk_parent_type(tmp) != CT_SIZEOF
-                          && !tmp->flags.test_any(PCF_IN_STRUCT | PCF_IN_CLASS))
-                       || chunk_is_token(tmp, CT_NEWLINE))
-               {
-                  /*
-                   * the CT_SIZEOF isn't great - test 31720 happens to use a sizeof expr,
-                   * but this really should be able to handle any constant expr
-                   */
-                  // Fix for #1242
-                  // For MIDL_INTERFACE classes class name is tokenized as Label.
-                  // Corrected the identification of Label in c style languages.
-                  if (  language_is_set(LANG_C | LANG_CPP | LANG_CS)
-                     && (!language_is_set(LANG_OC)))
-                  {
-                     chunk_t *labelPrev = prev;
-
-                     if (chunk_is_token(labelPrev, CT_NEWLINE))
-                     {
-                        labelPrev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
-                     }
-
-                     if (  labelPrev != nullptr
-                        && chunk_is_not_token(labelPrev, CT_FPAREN_CLOSE))
-                     {
-                        set_chunk_type(cur, CT_LABEL);
-                        set_chunk_type(next, CT_LABEL_COLON);
-                     }
-                  }
-                  else
-                  {
-                     set_chunk_type(cur, CT_LABEL);
-                     set_chunk_type(next, CT_LABEL_COLON);
-                  }
-               }
-               else if (next->flags.test_any(PCF_IN_STRUCT | PCF_IN_CLASS | PCF_IN_TYPEDEF))
-               {
-                  set_chunk_type(next, CT_BIT_COLON);
-
-                  chunk_t *nnext = chunk_get_next(next);
-
-                  if (nnext == nullptr)
-                  {
-                     return;
-                  }
-
-                  while ((nnext = chunk_get_next(nnext)) != nullptr)
-                  {
-                     if (chunk_is_token(nnext, CT_SEMICOLON))
-                     {
-                        break;
-                     }
-
-                     if (chunk_is_token(nnext, CT_COLON))
-                     {
-                        set_chunk_type(nnext, CT_BIT_COLON);
-                     }
-                  }
-               }
-            }
-            else if (chunk_is_token(nextprev, CT_FPAREN_CLOSE))
-            {
-               LOG_FMT(LFCN, "%s(%d): nextprev->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                       __func__, __LINE__, nextprev->text(), nextprev->orig_line, nextprev->orig_col,
-                       get_token_name(nextprev->type));
-               LOG_FMT(LFCN, "%s(%d): next->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                       __func__, __LINE__, next->text(), next->orig_line, next->orig_col,
-                       get_token_name(next->type));
-
-               // Issue #2172
-               if (get_chunk_parent_type(next) == CT_FUNC_DEF)
-               {
-                  LOG_FMT(LFCN, "%s(%d): it's a construct colon\n", __func__, __LINE__);
-                  // it's a construct colon
-                  set_chunk_type(next, CT_CONSTR_COLON);
-               }
-               else
-               {
-                  LOG_FMT(LFCN, "%s(%d): it's a class colon\n", __func__, __LINE__);
-                  // it's a class colon
-                  set_chunk_type(next, CT_CLASS_COLON);
-               }
-            }
-            else if (next->level > next->brace_level)
-            {
-               // ignore it, as it is inside a paren
-            }
-            else if (  chunk_is_token(cur, CT_TYPE)
-                    || chunk_is_token(cur, CT_ENUM)       // Issue #2584
-                    || chunk_is_token(nextprev, CT_TYPE)
-                    || chunk_is_token(nextprev, CT_ENUM)) // Issue #2584
-            {
-               set_chunk_type(next, CT_BIT_COLON);
-            }
-            else if (  chunk_is_token(cur, CT_ENUM)
-                    || chunk_is_token(cur, CT_ACCESS)
-                    || chunk_is_token(cur, CT_QUALIFIER)
-                    || get_chunk_parent_type(cur) == CT_ALIGN)
-            {
-               // ignore it - bit field, align or public/private, etc
-            }
-            else if (  chunk_is_token(cur, CT_ANGLE_CLOSE)
-                    || hit_class)
-            {
-               // ignore it - template thingy
-            }
-            else if (get_chunk_parent_type(cur) == CT_SQL_EXEC)
-            {
-               // ignore it - SQL variable name
-            }
-            else if (get_chunk_parent_type(next) == CT_ASSERT)
-            {
-               // ignore it - Java assert thing
-            }
-            else if (get_chunk_parent_type(next) == CT_STRUCT)
-            {
-               // ignore it
-            }
-            else
-            {
-               chunk_t *tmp = chunk_get_next_ncnnl(next);
-
-               //tmp = chunk_get_next_local(next);
-               if (tmp != nullptr)
-
-               {
-                  LOG_FMT(LFCN, "%s(%d): tmp->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                          __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col,
-                          get_token_name(tmp->type));
-
-                  if (  chunk_is_token(tmp, CT_BASE)
-                     || chunk_is_token(tmp, CT_THIS))
-                  {
-                     // ignore it, as it is a C# base thingy
-                  }
-                  else if (language_is_set(LANG_CS | LANG_D))
-                  {
-                     // there should be a better solution for that
-                  }
-                  else
-                  {
-                     LOG_FMT(LWARN, "%s(%d): %s:%zu unexpected colon in col %zu n-parent=%s c-parent=%s l=%zu bl=%zu\n",
-                             __func__, __LINE__,
-                             cpd.filename.c_str(), next->orig_line, next->orig_col,
-                             get_token_name(get_chunk_parent_type(next)),
-                             get_token_name(get_chunk_parent_type(cur)),
-                             next->level, next->brace_level);
-                     cpd.error_count++;
-                  }
-               }
-            }
-         }
-      }
-      prev = cur;
-      cur  = next;
-      next = chunk_get_next_local(next);
-   }
-} // combine_labels
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.h
deleted file mode 100644
index 4a273d0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file combine_labels.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.h
- */
-
-#ifndef COMBINE_LABELS_H_INCLUDED
-#define COMBINE_LABELS_H_INCLUDED
-
-
-/**
- * Examines the whole file and changes CT_COLON to
- * CT_Q_COLON, CT_LABEL_COLON, or CT_CASE_COLON.
- * It also changes the CT_WORD before CT_LABEL_COLON into CT_LABEL.
- */
-void combine_labels(void);
-
-
-#endif /* COMBINE_LABELS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.cpp
deleted file mode 100644
index 25194498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/**
- * @file combine_skip.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#include "combine_skip.h"
-
-#include "combine_tools.h"
-
-
-chunk_t *skip_align(chunk_t *start)
-{
-   chunk_t *pc = start;
-
-   if (chunk_is_token(pc, CT_ALIGN))
-   {
-      pc = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         pc = chunk_get_next_type(pc, CT_PAREN_CLOSE, pc->level);
-         pc = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(pc, CT_COLON))
-         {
-            pc = chunk_get_next_ncnnl(pc);
-         }
-      }
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_expression(chunk_t *pc)
-{
-   return(chunk_get_next_ncnnl(skip_to_expression_end(pc)));
-}
-
-
-chunk_t *skip_expression_rev(chunk_t *pc)
-{
-   return(chunk_get_prev_ncnnlni(skip_to_expression_start(pc)));
-}
-
-
-static chunk_t *skip_to_expression_edge(chunk_t *pc, chunk_t *(*chunk_get_next)(chunk_t *cur, scope_e scope))
-{
-   chunk_t *prev = pc;
-
-   if (  prev != nullptr
-      && chunk_get_next != nullptr)
-   {
-      std::size_t level         = prev->level;
-      chunk_t     *next         = prev;
-      std::size_t template_nest = get_cpp_template_angle_nest_level(prev);
-
-      while (  next != nullptr
-            && next->level >= level)
-      {
-         /**
-          * if we encounter a comma or semicolon at the level of the starting chunk,
-          * return the current chunk
-          */
-         if (  next->level == level
-            && (  chunk_is_token(next, CT_COMMA)
-               || chunk_is_semicolon(next)))
-         {
-            break;
-         }
-         /**
-          * check the template nest level; if the current chunk's nest level
-          * is less than that of the starting chunk, return the current chunk
-          */
-         auto next_template_nest = get_cpp_template_angle_nest_level(next);
-
-         if (template_nest > next_template_nest)
-         {
-            break;
-         }
-         prev = next;
-         next = (*chunk_get_next)(next, scope_e::PREPROC);
-      }
-   }
-   return(prev);
-}
-
-
-chunk_t *skip_to_expression_end(chunk_t *pc)
-{
-   return(skip_to_expression_edge(pc, chunk_get_next_ncnnl));
-}
-
-
-chunk_t *skip_to_expression_start(chunk_t *pc)
-{
-   return(skip_to_expression_edge(pc, chunk_get_prev_ncnnlni));
-}
-
-
-chunk_t *skip_to_next_statement(chunk_t *pc)
-{
-   while (  pc != nullptr
-         && !chunk_is_semicolon(pc)
-         && chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && chunk_is_not_token(pc, CT_BRACE_CLOSE))
-   {
-      pc = chunk_get_next_ncnnl(pc);
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_parent_types(chunk_t *colon)
-{
-   auto pc = chunk_get_next_ncnnlnp(colon);
-
-   while (pc)
-   {
-      // Skip access specifier
-      if (chunk_is_token(pc, CT_ACCESS))
-      {
-         pc = chunk_get_next_ncnnlnp(pc);
-         continue;
-      }
-
-      // Check for a type name
-      if (!(  chunk_is_token(pc, CT_WORD)
-           || chunk_is_token(pc, CT_TYPE)))
-      {
-         LOG_FMT(LPCU,
-                 "%s is confused; expected a word at %zu:%zu "
-                 "following type list at %zu:%zu\n", __func__,
-                 colon->orig_line, colon->orig_col,
-                 pc->orig_line, pc->orig_col);
-         return(colon);
-      }
-      // Get next token
-      auto next = skip_template_next(chunk_get_next_ncnnlnp(pc));
-
-      if (  chunk_is_token(next, CT_DC_MEMBER)
-         || chunk_is_token(next, CT_COMMA))
-      {
-         pc = chunk_get_next_ncnnlnp(next);
-      }
-      else if (next)
-      {
-         LOG_FMT(LPCU, "%s -> %zu:%zu ('%s')\n", __func__,
-                 next->orig_line, next->orig_col, next->text());
-         return(next);
-      }
-      else
-      {
-         break;
-      }
-   }
-   LOG_FMT(LPCU, "%s: did not find end of type list (start was %zu:%zu)\n",
-           __func__, colon->orig_line, colon->orig_col);
-   return(colon);
-} // skip_parent_types
-
-
-chunk_t *skip_template_prev(chunk_t *ang_close)
-{
-   if (chunk_is_token(ang_close, CT_ANGLE_CLOSE))
-   {
-      chunk_t *pc = chunk_get_prev_type(ang_close, CT_ANGLE_OPEN, ang_close->level);
-      return(chunk_get_prev_ncnnlni(pc));   // Issue #2279
-   }
-   return(ang_close);
-}
-
-
-chunk_t *skip_tsquare_next(chunk_t *ary_def)
-{
-   if (  chunk_is_token(ary_def, CT_SQUARE_OPEN)
-      || chunk_is_token(ary_def, CT_TSQUARE))
-   {
-      return(chunk_get_next_nisq(ary_def));
-   }
-   return(ary_def);
-}
-
-
-chunk_t *skip_attribute(chunk_t *attr)
-{
-   chunk_t *pc = attr;
-
-   while (chunk_is_token(pc, CT_ATTRIBUTE))
-   {
-      pc = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_token(pc, CT_FPAREN_OPEN))
-      {
-         pc = chunk_get_next_type(pc, CT_FPAREN_CLOSE, pc->level);
-      }
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_attribute_next(chunk_t *attr)
-{
-   chunk_t *next = skip_attribute(attr);
-
-   if (  next != attr
-      && chunk_is_token(next, CT_FPAREN_CLOSE))
-   {
-      attr = chunk_get_next_ncnnl(next);
-   }
-   return(attr);
-}
-
-
-chunk_t *skip_attribute_prev(chunk_t *fp_close)
-{
-   chunk_t *pc = fp_close;
-
-   while (true)
-   {
-      if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-         && get_chunk_parent_type(pc) == CT_ATTRIBUTE)
-      {
-         pc = chunk_get_prev_type(pc, CT_ATTRIBUTE, pc->level);
-      }
-      else if (chunk_is_not_token(pc, CT_ATTRIBUTE))
-      {
-         break;
-      }
-      pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_declspec(chunk_t *pc)
-{
-   if (chunk_is_token(pc, CT_DECLSPEC))
-   {
-      pc = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         pc = chunk_skip_to_match(pc);
-      }
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_declspec_next(chunk_t *pc)
-{
-   chunk_t *next = skip_declspec(pc);
-
-   if (  next != pc
-      && chunk_is_token(next, CT_PAREN_CLOSE))
-   {
-      pc = chunk_get_next_ncnnl(next);
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_declspec_prev(chunk_t *pc)
-{
-   if (  chunk_is_token(pc, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(pc) == CT_DECLSPEC)
-   {
-      pc = chunk_skip_to_match_rev(pc);
-      pc = chunk_get_prev_ncnnlni(pc);
-
-      if (chunk_is_token(pc, CT_DECLSPEC))
-      {
-         pc = chunk_get_prev_ncnnlni(pc);
-      }
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *pc)
-{
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_SQUARE_OPEN))
-   {
-      pc = chunk_skip_to_match(pc);
-
-      if (pc != nullptr)
-      {
-         /**
-          * a matching brace, square bracket, or paren was found;
-          * retrieve the subsequent chunk
-          */
-
-         pc = chunk_get_next_ncnnl(pc);
-      }
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_to_chunk_before_matching_brace_bracket_paren_rev(chunk_t *pc)
-{
-   if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-      || chunk_is_token(pc, CT_PAREN_CLOSE)
-      || chunk_is_token(pc, CT_SQUARE_CLOSE))
-   {
-      pc = chunk_skip_to_match_rev(pc);
-
-      if (pc != nullptr)
-      {
-         /**
-          * a matching brace, square bracket, or paren was found;
-          * retrieve the preceding chunk
-          */
-
-         pc = chunk_get_prev_ncnnlni(pc);
-      }
-   }
-   return(pc);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.h
deleted file mode 100644
index d31d1792..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @file combine_skip.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#ifndef COMBINE_SKIP_H_INCLUDED
-#define COMBINE_SKIP_H_INCLUDED
-
-#include "chunk_list.h"
-
-
-/**
- * Skips the D 'align()' statement and the colon, if present.
- *    align(2) int foo;  -- returns 'int'
- *    align(4):          -- returns 'int'
- *    int bar;
- */
-chunk_t *skip_align(chunk_t *start);
-
-
-/**
- * Skips chunks in the forward direction and attempts to find the
- * chunk associated with the end of the current expression; returns
- * the first chunk to satisfy one of the following:
- * 1) Chunk is a comma or semicolon at the level of the starting chunk
- * 2) Preceding chunk is at higher template nest level relative to the
- *    current chunk under test
- */
-chunk_t *skip_expression(chunk_t *pc);
-
-
-/**
- * Skips chunks in the reverse direction and attempts to find the
- * chunk associated with the start of the current expression; returns
- * the first chunk to satisfy one of the following:
- * 1) Chunk is a comma or semicolon at the level of the starting chunk
- * 2) Preceding chunk is at lower template nest level relative to the
- *    current chunk under test
- */
-chunk_t *skip_expression_rev(chunk_t *pc);
-
-
-/**
- * Skips chunks in the forward direction and attempts to find the
- * chunk associated with the end of the current expression; specifically,
- * the function returns that which immediately precedes a chunk
- * satisfying one of the following:
- * 1) Next chunk is a comma or semicolon at the level of the starting chunk
- * 2) Preceding chunk is at a higher template nest level relative to the
- *    subsequent chunk
- */
-chunk_t *skip_to_expression_end(chunk_t *pc);
-
-
-/**
- * Skips chunks in the reverse direction and attempts to find the chunk
- * associated with the start of the current expression; specifically,
- * the function returns that which immediately follows a chunk
- * satisfying one of the following:
- * 1) Prior chunk is a comma or semicolon at the level of the starting chunk
- * 2) Preceding chunk is at a lower template nest level relative to the
- *    subsequent chunk
- */
-chunk_t *skip_to_expression_start(chunk_t *pc);
-
-
-/**
- * Skips the list of class/struct parent types.
- */
-chunk_t *skip_parent_types(chunk_t *colon);
-
-
-/**
- * Skips over the rest of the template if ang_open is indeed a CT_ANGLE_OPEN.
- * Points to the chunk after the CT_ANGLE_CLOSE.
- * If the chunk isn't an CT_ANGLE_OPEN, then it is returned.
- */
-chunk_t *skip_template_next(chunk_t *ang_open);
-
-
-/**
- * Skips over the rest of the template if ang_close is indeed a CT_ANGLE_CLOSE.
- * Points to the chunk before the CT_ANGLE_OPEN
- * If the chunk isn't an CT_ANGLE_CLOSE, then it is returned.
- */
-chunk_t *skip_template_prev(chunk_t *ang_close);
-
-
-//! Skips to the start of the next statement.
-chunk_t *skip_to_next_statement(chunk_t *pc);
-
-
-/**
- * Skips the rest of the array definitions if ary_def is indeed a
- * CT_TSQUARE or CT_SQUARE_OPEN
- */
-chunk_t *skip_tsquare_next(chunk_t *ary_def);
-
-
-/**
- * If pc is CT_ATTRIBUTE, then skip it and everything preceding the closing
- * paren; return the chunk marked CT_FPAREN_CLOSE
- * If the chunk isn't a CT_ATTRIBUTE, then it is returned.
- */
-chunk_t *skip_attribute(chunk_t *attr);
-
-
-/**
- * If attr is CT_ATTRIBUTE, then skip it and the parens and return the chunk
- * after the CT_FPAREN_CLOSE.
- * If the chunk isn't an CT_ATTRIBUTE, then it is returned.
- */
-chunk_t *skip_attribute_next(chunk_t *attr);
-
-
-/**
- * If fp_close is a CT_FPAREN_CLOSE with a parent of CT_ATTRIBUTE, then skip it
- * and the '__attribute__' thingy and return the chunk before CT_ATTRIBUTE.
- * Otherwise return fp_close.
- */
-chunk_t *skip_attribute_prev(chunk_t *fp_close);
-
-
-/**
- * If pc is CT_DECLSPEC, then skip it and everything preceding the closing
- * paren; return the chunk marked CT_FPAREN_CLOSE
- * If the chunk isn't a CT_DECLSPEC, then it is returned.
- */
-chunk_t *skip_declspec(chunk_t *pc);
-
-
-/**
- * If pc is CT_DECLSPEC, then skip it and the parens and return the chunk
- * after the CT_FPAREN_CLOSE.
- * If the chunk isn't a CT_DECLSPEC, then it is returned.
- */
-chunk_t *skip_declspec_next(chunk_t *pc);
-
-
-/**
- * If pc is a CT_FPAREN_CLOSE with a parent of CT_DECLSPEC, then skip it
- * and the '__declspec' keyword and return the chunk before CT_DECLSPEC.
- * Otherwise return pc.
- */
-chunk_t *skip_declspec_prev(chunk_t *pc);
-
-
-/**
- * If pc is a CT_BRACE_OPEN, CT_PAREN_OPEN or CT_SQUARE_OPEN, then skip
- * forward to the next non-comment/non-newline chunk following the matching
- * CT_BRACE_CLOSE, CT_PAREN_CLOSE or CT_SQUARE_CLOSE; if pc is none of these
- * upon calling this function, then pc is returned.
- */
-chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *pc);
-
-
-/**
- * If pc is a CT_BRACE_CLOSE, CT_PAREN_CLOSE or CT_SQUARE_CLOSE, then skip
- * in reverse to the first non-comment/non-newline chunk preceding the matching
- * CT_BRACE_OPEN, CT_PAREN_OPEN or CT_SQUARE_OPEN; if pc is none of these upon
- * calling this function, then pc is returned.
- */
-chunk_t *skip_to_chunk_before_matching_brace_bracket_paren_rev(chunk_t *pc);
-
-
-#endif /* COMBINE_SKIP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.cpp
deleted file mode 100644
index 18450cd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.cpp
+++ /dev/null
@@ -1,565 +0,0 @@
-/**
- * @file combine_tools.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#include "combine_tools.h"
-
-#include "unc_ctype.h"
-#include "uncrustify.h"
-
-
-bool can_be_full_param(chunk_t *start, chunk_t *end)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LFPARAM, "%s(%d): start->text() is '%s', type is %s\n",
-           __func__, __LINE__, start->text(), get_token_name(start->type));
-   LOG_FMT(LFPARAM, "%s(%d): end->text()   is '%s', type is %s\n",
-           __func__, __LINE__, end->text(), get_token_name(end->type));
-
-   int     word_count     = 0;
-   int     type_count     = 0;
-   chunk_t *pc            = nullptr;
-   chunk_t *first_word    = nullptr;
-   bool    first_word_set = false;
-
-   for (pc = start;
-        pc != nullptr && pc != end;
-        pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
-   {
-      LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
-
-      if (  chunk_is_token(pc, CT_QUALIFIER)
-         || chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_ENUM)
-         || chunk_is_token(pc, CT_UNION)
-         || chunk_is_token(pc, CT_TYPENAME))
-      {
-         LOG_FMT(LFPARAM, "%s(%d): <== %s! (yes)\n",
-                 __func__, __LINE__, get_token_name(pc->type));
-         return(true);
-      }
-
-      if (  chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_TYPE))
-      {
-         ++word_count;
-
-         if (!first_word_set)
-         {
-            first_word     = pc;
-            first_word_set = true;
-         }
-
-         if (chunk_is_token(pc, CT_TYPE))
-         {
-            ++type_count;
-         }
-      }
-      else if (  chunk_is_token(pc, CT_MEMBER)
-              || chunk_is_token(pc, CT_DC_MEMBER))
-      {
-         if (word_count > 0)
-         {
-            --word_count;
-         }
-      }
-      else if (  pc != start
-              && chunk_is_ptr_operator(pc))
-      {
-         // chunk is OK
-      }
-      else if (chunk_is_token(pc, CT_ASSIGN))
-      {
-         // chunk is OK (default values)
-         break;
-      }
-      else if (chunk_is_token(pc, CT_ANGLE_OPEN))
-      {
-         LOG_FMT(LFPARAM, "%s(%d): <== template\n",
-                 __func__, __LINE__);
-
-         return(true);
-      }
-      else if (chunk_is_token(pc, CT_ELLIPSIS))
-      {
-         LOG_FMT(LFPARAM, "%s(%d): <== elipses\n",
-                 __func__, __LINE__);
-
-         return(true);
-      }
-      else if (  word_count == 0
-              && chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         // Check for old-school func proto param '(type)'
-         chunk_t *tmp1 = chunk_skip_to_match(pc, scope_e::PREPROC);
-
-         if (tmp1 == nullptr)
-         {
-            return(false);
-         }
-         chunk_t *tmp2 = chunk_get_next_ncnnl(tmp1, scope_e::PREPROC);
-
-         if (tmp2 == nullptr)
-         {
-            return(false);
-         }
-
-         if (  chunk_is_token(tmp2, CT_COMMA)
-            || chunk_is_paren_close(tmp2))
-         {
-            do
-            {
-               pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-               if (pc == nullptr)
-               {
-                  return(false);
-               }
-               LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->text(), get_token_name(pc->type));
-            } while (pc != tmp1);
-
-            // reset some vars to allow [] after parens
-            word_count = 1;
-            type_count = 1;
-         }
-         else
-         {
-            LOG_FMT(LFPARAM, "%s(%d): <== '%s' not fcn type!\n",
-                    __func__, __LINE__, get_token_name(pc->type));
-            return(false);
-         }
-      }
-      else if (  (  word_count == 1
-                 || (word_count == type_count))
-              && chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         // Check for func proto param 'void (*name)' or 'void (*name)(params)' or 'void (^name)(params)'
-         // <name> can be optional
-         chunk_t *tmp1 = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-         if (tmp1 == nullptr)
-         {
-            return(false);
-         }
-         chunk_t *tmp2 = chunk_get_next_ncnnl(tmp1, scope_e::PREPROC);
-
-         if (tmp2 == nullptr)
-         {
-            return(false);
-         }
-         chunk_t *tmp3 = (chunk_is_str(tmp2, ")", 1)) ? tmp2 : chunk_get_next_ncnnl(tmp2, scope_e::PREPROC);
-
-         if (tmp3 == nullptr)
-         {
-            return(false);
-         }
-
-         if (  !chunk_is_str(tmp3, ")", 1)
-            || !(  chunk_is_str(tmp1, "*", 1)
-                || chunk_is_str(tmp1, "^", 1)) // Issue #2656
-            || !(  tmp2->type == CT_WORD
-                || chunk_is_str(tmp2, ")", 1)))
-         {
-            LOG_FMT(LFPARAM, "%s(%d): <== '%s' not fcn type!\n",
-                    __func__, __LINE__, get_token_name(pc->type));
-            return(false);
-         }
-         LOG_FMT(LFPARAM, "%s(%d): <skip fcn type>\n",
-                 __func__, __LINE__);
-         tmp1 = chunk_get_next_ncnnl(tmp3, scope_e::PREPROC);
-
-         if (tmp1 == nullptr)
-         {
-            return(false);
-         }
-
-         if (chunk_is_str(tmp1, "(", 1))
-         {
-            tmp3 = chunk_skip_to_match(tmp1, scope_e::PREPROC);
-         }
-         pc = tmp3;
-         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
-
-         // reset some vars to allow [] after parens
-         word_count = 1;
-         type_count = 1;
-      }
-      else if (chunk_is_token(pc, CT_TSQUARE))
-      {
-         // ignore it
-      }
-      else if (  word_count == 1
-              && chunk_is_token(pc, CT_SQUARE_OPEN))
-      {
-         // skip over any array stuff
-         pc = chunk_skip_to_match(pc, scope_e::PREPROC);
-         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
-      }
-      else if (  word_count == 2
-              && chunk_is_token(pc, CT_SQUARE_OPEN))
-      {
-         // Bug #671: is it such as: bool foo[FOO_MAX]
-         pc = chunk_skip_to_match(pc, scope_e::PREPROC);
-         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
-      }
-      else if (  word_count == 1
-              && language_is_set(LANG_CPP)
-              && chunk_is_str(pc, "&&", 2))
-      {
-         // ignore possible 'move' operator
-      }
-      else
-      {
-         LOG_FMT(LFPARAM, "%s(%d): <== type is %s, no way!, type count is %d, word count is %d\n",
-                 __func__, __LINE__, get_token_name(pc->type), type_count, word_count);
-         return(false);
-      }
-      LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
-   }
-
-   chunk_t *last = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-
-   LOG_FMT(LFPARAM, "%s(%d): last->text() is '%s', type is %s\n",
-           __func__, __LINE__, last->text(), get_token_name(last->type));
-
-   if (chunk_is_ptr_operator(last))
-   {
-      LOG_FMT(LFPARAM, "%s(%d): <== type is %s, sure!\n",
-              __func__, __LINE__, get_token_name(last->type));
-      return(true);
-   }
-
-   if (  word_count < 2
-      && type_count < 1
-      && start->brace_level > 0)
-   {
-      LOG_FMT(LFPARAM, "%s(%d): !MVP!\n",
-              __func__, __LINE__);
-      // Oh, joy, we are in Most Vexing Parse territory
-      auto const brace =
-         chunk_get_prev_type(start, CT_BRACE_OPEN, start->brace_level - 1);
-
-      if (brace != nullptr)
-      {
-         LOG_FMT(LFPARAM, "%s(%d): (matching %s brace at orig_line %zu, orig_col is %zu)",
-                 __func__, __LINE__,
-                 get_token_name(get_chunk_parent_type(brace)), brace->orig_line, brace->orig_col);
-      }
-
-      if (  brace != nullptr
-         && (  get_chunk_parent_type(brace) == CT_CLASS
-            || get_chunk_parent_type(brace) == CT_STRUCT))
-      {
-         // A Most Vexing Parse variable declaration cannot occur in the body
-         // of a struct/class, so we probably have a function prototype
-         LOG_FMT(LFPARAM, "%s(%d): <== type is %s, Likely!\n",
-                 __func__, __LINE__, (pc == nullptr ? "nullptr" : get_token_name(pc->type)));
-         return(true);
-      }
-   }
-   LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', word_count is %d, type_count is %d\n",
-           __func__, __LINE__, pc->text(), word_count, type_count);
-
-   if (first_word != nullptr)
-   {
-      LOG_FMT(LFPARAM, "%s(%d): first_word->text() is '%s'\n",
-              __func__, __LINE__, first_word->text());
-   }
-   bool ret = (  word_count >= 2
-              || (  word_count == 1
-                 && type_count == 1));
-
-   LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', ",
-           __func__, __LINE__, pc->text());
-   LOG_FMT(LFPARAM, "<== type is %s, ",
-           (pc == nullptr ? "nullptr" : get_token_name(pc->type)));
-
-   if (ret)
-   {
-      LOG_FMT(LFPARAM, "Yup!\n");
-
-      if (!chunk_is_token(first_word, CT_TYPE))
-      {
-         set_chunk_type(first_word, CT_TYPE);
-      }
-      chunk_t *tmp = chunk_get_prev_ncnnl(first_word);
-
-      if (chunk_is_token(tmp, CT_STAR))
-      {
-         set_chunk_type(tmp, CT_PTR_TYPE);
-      }
-   }
-   else
-   {
-      LOG_FMT(LFPARAM, "Unlikely!\n");
-   }
-   return(ret);
-} // can_be_full_param
-
-
-bool chunk_ends_type(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc       = start;
-   bool    ret       = false;
-   size_t  cnt       = 0;
-   bool    last_expr = false;
-   bool    last_lval = false;
-
-   bool    a = pc->flags.test(PCF_IN_FCN_CTOR);
-
-   if (a)
-   {
-      return(false);
-   }
-
-   for ( ; pc != nullptr; pc = chunk_get_prev_ncnnlni(pc)) // Issue #2279
-   {
-      LOG_FMT(LFTYPE, "%s(%d): type is %s, text() '%s', orig_line %zu, orig_col %zu\n   ",
-              __func__, __LINE__, get_token_name(pc->type), pc->text(),
-              pc->orig_line, pc->orig_col);
-      log_pcf_flags(LFTYPE, pc->flags);
-
-      if (  chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_PTR_TYPE)
-         || chunk_is_token(pc, CT_STAR)
-         || chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_DC_MEMBER)
-         || chunk_is_token(pc, CT_PP)
-         || chunk_is_token(pc, CT_QUALIFIER)
-         || (  language_is_set(LANG_CPP | LANG_OC)                       // Issue #2727
-            && get_chunk_parent_type(pc) == CT_TEMPLATE
-            && (  chunk_is_token(pc, CT_ANGLE_OPEN)
-               || chunk_is_token(pc, CT_ANGLE_CLOSE)))
-         || (  language_is_set(LANG_CS)
-            && (chunk_is_token(pc, CT_MEMBER))))
-      {
-         cnt++;
-         last_expr = pc->flags.test(PCF_EXPR_START)
-                     && !pc->flags.test(PCF_IN_FCN_CALL);
-         last_lval = pc->flags.test(PCF_LVALUE);
-         continue;
-      }
-      /* If a comma is encountered within a template, it must be
-       * considered within the context of its immediate parent
-       * template (i.e. argument list nest level)
-       */
-
-      if (  (  chunk_is_semicolon(pc)
-            && !pc->flags.test(PCF_IN_FOR))
-         || chunk_is_token(pc, CT_TYPEDEF)
-         || chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE)
-         || chunk_is_token(pc, CT_FPAREN_CLOSE)
-         || chunk_is_forin(pc)
-         || chunk_is_token(pc, CT_MACRO)
-         || chunk_is_token(pc, CT_PP_IF)
-         || chunk_is_token(pc, CT_PP_ELSE)
-         || chunk_is_token(pc, CT_PP_ENDIF)
-         || (  (  chunk_is_token(pc, CT_COMMA)
-               && !pc->flags.test(PCF_IN_FCN_CALL)
-               && get_cpp_template_angle_nest_level(start) ==
-                  get_cpp_template_angle_nest_level(pc))
-            && last_expr)
-         || (  chunk_is_token(pc, CT_SPAREN_OPEN)
-            && last_lval))
-      {
-         ret = cnt > 0;
-      }
-      break;
-   }
-
-   if (pc == nullptr)
-   {
-      // first token
-      ret = true;
-   }
-   LOG_FMT(LFTYPE, "%s(%d): first token verdict: %s\n",
-           __func__, __LINE__, ret ? "yes" : "no");
-
-   return(ret);
-} // chunk_ends_type
-
-
-bool chunkstack_match(ChunkStack &cs, chunk_t *pc)
-{
-   for (size_t idx = 0; idx < cs.Len(); idx++)
-   {
-      chunk_t *tmp = cs.GetChunk(idx);
-
-      if (pc->str.equals(tmp->str))
-      {
-         return(true);
-      }
-   }
-
-   return(false);
-} // chunkstack_match
-
-
-void flag_series(chunk_t *start, chunk_t *end, pcf_flags_t set_flags, pcf_flags_t clr_flags, scope_e nav)
-{
-   LOG_FUNC_ENTRY();
-
-   while (  start != nullptr
-         && start != end)
-   {
-      chunk_flags_upd(start, clr_flags, set_flags);
-
-      start = chunk_get_next(start, nav);
-
-      if (start == nullptr)
-      {
-         return;
-      }
-   }
-
-   if (end != nullptr)
-   {
-      chunk_flags_upd(end, clr_flags, set_flags);
-   }
-} // flag_series
-
-
-size_t get_cpp_template_angle_nest_level(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   int nestLevel = 0;
-
-   while (  pc != nullptr
-         && pc->flags.test(PCF_IN_TEMPLATE))
-   {
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         && get_chunk_parent_type(pc) == CT_TEMPLATE)
-      {
-         --nestLevel;
-      }
-      else if (  chunk_is_token(pc, CT_ANGLE_OPEN)
-              && get_chunk_parent_type(pc) == CT_TEMPLATE)
-      {
-         ++nestLevel;
-      }
-      pc = chunk_get_prev_ncnnlni(pc);
-   }
-   return(nestLevel <= 0 ? 0 : size_t(nestLevel));
-}
-
-
-chunk_t *get_d_template_types(ChunkStack &cs, chunk_t *open_paren)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *tmp       = open_paren;
-   bool    maybe_type = true;
-
-   while (  ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
-         && tmp->level > open_paren->level)
-   {
-      if (  chunk_is_token(tmp, CT_TYPE)
-         || chunk_is_token(tmp, CT_WORD))
-      {
-         if (maybe_type)
-         {
-            make_type(tmp);
-            cs.Push_Back(tmp);
-         }
-         maybe_type = false;
-      }
-      else if (chunk_is_token(tmp, CT_COMMA))
-      {
-         maybe_type = true;
-      }
-   }
-   return(tmp);
-} // get_d_template_types
-
-
-bool go_on(chunk_t *pc, chunk_t *start)
-{
-   if (  pc == nullptr
-      || pc->level != start->level)
-   {
-      return(false);
-   }
-
-   if (pc->flags.test(PCF_IN_FOR))
-   {
-      return(  (!chunk_is_semicolon(pc))
-            && (!(chunk_is_token(pc, CT_COLON))));
-   }
-   return(!chunk_is_semicolon(pc));
-} // go_on
-
-
-bool is_ucase_str(const char *str, size_t len)
-{
-   while (len-- > 0)
-   {
-      if (unc_toupper(*str) != *str)
-      {
-         return(false);
-      }
-      str++;
-   }
-   return(true);
-} // is_ucase_str
-
-
-void make_type(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc != nullptr)
-   {
-      if (chunk_is_token(pc, CT_WORD))
-      {
-         set_chunk_type(pc, CT_TYPE);
-      }
-      else if (  (  chunk_is_star(pc)
-                 || chunk_is_msref(pc)
-                 || chunk_is_nullable(pc))
-              && chunk_is_type(pc->prev))                              // Issue # 2640
-      {
-         set_chunk_type(pc, CT_PTR_TYPE);
-      }
-      else if (  chunk_is_addr(pc)
-              && !chunk_is_token(pc->prev, CT_SQUARE_OPEN))            // Issue # 2166
-      {
-         set_chunk_type(pc, CT_BYREF);
-      }
-   }
-} // make_type
-
-
-chunk_t *set_paren_parent(chunk_t *start, c_token_t parent)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *end;
-
-   end = chunk_skip_to_match(start, scope_e::PREPROC);
-
-   if (end != nullptr)
-   {
-      LOG_FMT(LFLPAREN, "%s(%d): %zu:%zu '%s' and %zu:%zu '%s' type is %s, parent_type is %s",
-              __func__, __LINE__, start->orig_line, start->orig_col, start->text(),
-              end->orig_line, end->orig_col, end->text(),
-              get_token_name(start->type), get_token_name(parent));
-      log_func_stack_inline(LFLPAREN);
-      set_chunk_parent(start, parent);
-      set_chunk_parent(end, parent);
-   }
-   LOG_FMT(LFLPAREN, "%s(%d):\n", __func__, __LINE__);
-   return(chunk_get_next_ncnnl(end, scope_e::PREPROC));
-} // set_paren_parent
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.h
deleted file mode 100644
index f7f83d12..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * @file combine_tools.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#ifndef COMBINE_TOOLS_H_INCLUDED
-#define COMBINE_TOOLS_H_INCLUDED
-
-#include "chunk_list.h"
-#include "ChunkStack.h"
-
-/**
- * Checks to see if a series of chunks could be a C++ parameter
- * FOO foo(5, &val);
- *
- * WORD means CT_WORD or CT_TYPE
- *
- * "WORD WORD"          ==> true
- * "QUALIFIER ??"       ==> true
- * "TYPE"               ==> true
- * "WORD"               ==> true
- * "WORD.WORD"          ==> true
- * "WORD::WORD"         ==> true
- * "WORD * WORD"        ==> true
- * "WORD & WORD"        ==> true
- * "NUMBER"             ==> false
- * "STRING"             ==> false
- * "OPEN PAREN"         ==> false
- *
- * @param start  the first chunk to look at
- * @param end    the chunk after the last one to look at
- */
-bool can_be_full_param(chunk_t *start, chunk_t *end);
-
-
-//! Scan backwards to see if we might be on a type declaration
-bool chunk_ends_type(chunk_t *start);
-
-
-bool chunkstack_match(ChunkStack &cs, chunk_t *pc);
-
-
-///**
-// * Simply change any STAR to PTR_TYPE and WORD to TYPE
-// *
-// * @param start  points to the open paren
-// */
-void fix_fcn_def_params(chunk_t *pc);
-
-
-void flag_series(chunk_t *start, chunk_t *end, pcf_flags_t set_flags, pcf_flags_t clr_flags = {}, scope_e nav = scope_e::ALL);
-
-
-/*
- * Checks whether or not a given chunk has a parent cpp template,
- * and if so returns the associated angle bracket nest level
- * with respect to the root parent template; returns 0 if
- * the chunk is not part of a template parameter list
- */
-size_t get_cpp_template_angle_nest_level(chunk_t *pc);
-
-
-/**
- * Parse off the types in the D template args, adds to cs
- * returns the close_paren
- */
-chunk_t *get_d_template_types(ChunkStack &cs, chunk_t *open_paren);
-
-
-//! help function for mark_variable_definition...
-bool go_on(chunk_t *pc, chunk_t *start);
-
-
-bool is_ucase_str(const char *str, size_t len);
-
-
-void make_type(chunk_t *pc);
-
-chunk_t *set_paren_parent(chunk_t *start, c_token_t parent);
-
-
-#endif /* COMBINE_TOOLS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat.h
deleted file mode 100644
index 32fce459..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file compat.h
- * prototypes for compat_xxx.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef COMPAT_H_INCLUDED
-#define COMPAT_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-bool unc_getenv(const char *name, std::string &str);
-
-
-bool unc_homedir(std::string &home);
-
-
-/*
- * even if we prefer the format %zu, we have to change to %lu
- * to be runable under Windows
- */
-void convert_log_zu2lu(char *buf);
-
-#endif /* COMPAT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_posix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_posix.cpp
deleted file mode 100644
index c77c7a89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_posix.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file compat_posix.cpp
- * Compatibility functions for POSIX
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef WIN32
-
-#include "uncrustify_types.h"
-
-
-bool unc_getenv(const char *name, std::string &str)
-{
-   const char *val = getenv(name);
-
-   if (val != nullptr)
-   {
-      str = val;
-      return(true);
-   }
-   return(false);
-}
-
-
-bool unc_homedir(std::string &home)
-{
-   return(unc_getenv("HOME", home));
-}
-
-
-void convert_log_zu2lu(char *fmt)
-{
-   UNUSED(fmt);
-   // nothing to do
-}
-
-#endif /* ifndef WIN32 */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_win32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_win32.cpp
deleted file mode 100644
index d7292466..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_win32.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @file compat_win32.cpp
- * Compatibility functions for win32
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#if defined (_WIN32) \
-   && !defined (__CYGWIN__)
-
-#include "windows_compat.h"
-
-#include <cstdio>
-#include <string>
-
-
-bool unc_getenv(const char *name, std::string &str)
-{
-   DWORD len = GetEnvironmentVariableA(name, NULL, 0);
-   char  *buf;
-
-   if (len == 0)
-   {
-      if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)
-      {
-         return(false);
-      }
-   }
-   buf = (char *)malloc(len);
-
-   if (buf)
-   {
-      len = GetEnvironmentVariableA(name, buf, len);
-   }
-   buf[len] = 0;
-
-   str = buf;
-   //printf("%s: name=%s len=%d value=%s\n", __func__, name, (int)len, str.c_str());
-   free(buf);
-
-   return(true);
-}
-
-
-bool unc_homedir(std::string &home)
-{
-   if (unc_getenv("HOME", home))
-   {
-      return(true);
-   }
-
-   if (unc_getenv("USERPROFILE", home))
-   {
-      return(true);
-   }
-   std::string hd, hp;
-
-   if (  unc_getenv("HOMEDRIVE", hd)
-      && unc_getenv("HOMEPATH", hp))
-   {
-      home = hd + hp;
-      return(true);
-   }
-   return(false);
-}
-
-
-void convert_log_zu2lu(char *fmt)
-{
-   for (size_t i = 0; i < strlen(fmt); i++)
-   {
-      if (  (fmt[i] == '%')
-         && (fmt[i + 1] == 'z')
-         && (fmt[i + 2] == 'u'))
-      {
-         fmt[i + 1] = 'l';
-      }
-   }
-}
-
-#endif /* if defined(_WIN32) && !defined(__CYGWIN__) */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/config.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/config.h.in
deleted file mode 100644
index 4270a733..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/config.h.in
+++ /dev/null
@@ -1,97 +0,0 @@
-// Used by CMake to generate config.h.
-
-// Define to 1 if you have the <inttypes.h> header file.
-#cmakedefine HAVE_INTTYPES_H 1
-
-// Define to 1 if you have the <memory.h> header file.
-#cmakedefine HAVE_MEMORY_H 1
-
-// Define to 1 if you have the `memset' function.
-#cmakedefine HAVE_MEMSET 1
-
-// Define to 1 if stdbool.h conforms to C99.
-#cmakedefine HAVE_STDBOOL_H 1
-
-// Define to 1 if you have the <stdint.h> header file.
-#cmakedefine HAVE_STDINT_H 1
-
-// Define to 1 if you have the <stdlib.h> header file.
-#cmakedefine HAVE_STDLIB_H 1
-
-// Define to 1 if you have the `strcasecmp' function.
-#cmakedefine HAVE_STRCASECMP 1
-
-// Define to 1 if you have the `strchr' function.
-#cmakedefine HAVE_STRCHR 1
-
-// Define to 1 if you have the `strdup' function.
-#cmakedefine HAVE_STRDUP 1
-
-// Define to 1 if you have the `strerror' function.
-#cmakedefine HAVE_STRERROR 1
-
-// Define to 1 if you have the <strings.h> header file.
-#cmakedefine HAVE_STRINGS_H 1
-
-// Define to 1 if you have the <string.h> header file.
-#cmakedefine HAVE_STRING_H 1
-
-// Define to 1 if you have the `strtol' function.
-#cmakedefine HAVE_STRTOL 1
-
-// Define to 1 if you have the `strtoul' function.
-#cmakedefine HAVE_STRTOUL 1
-
-// Define to 1 if you have the <sys/stat.h> header file.
-#cmakedefine HAVE_SYS_STAT_H 1
-
-// Define to 1 if you have the <sys/types.h> header file.
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-// Define to 1 if you have the <unistd.h> header file.
-#cmakedefine HAVE_UNISTD_H 1
-
-// Define to 1 if you have the <utime.h> header file.
-#cmakedefine HAVE_UTIME_H 1
-
-// Define to 1 if the system has the type `_Bool'.
-#cmakedefine HAVE__BOOL 1
-
-// Name of package
-#cmakedefine PACKAGE "@PACKAGE@"
-
-// Define to the address where bug reports for this package should be sent.
-#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
-
-// Define to the full name of this package.
-#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
-
-// Define to the full name and version of this package.
-#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
-
-// Define to the one symbol short name of this package.
-#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"
-
-// Define to the home page for this package.
-#cmakedefine PACKAGE_URL "@PACKAGE_URL@"
-
-// Define to the version of this package.
-#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
-
-// Define to 1 if you have the ANSI C header files.
-#cmakedefine STDC_HEADERS 1
-
-// Version number of package
-#cmakedefine VERSION "@VERSION@"
-
-/* Define to appropriate substitue if compiler doesnt have __func__ */
-/* #undef __func__ */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- * calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.cpp
deleted file mode 100644
index d358912c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file cs_top_is_question.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#include "cs_top_is_question.h"
-
-#include "chunk_list.h"
-
-
-bool cs_top_is_question(ChunkStack &cs, size_t level)
-{
-   chunk_t *pc = cs.Empty() ? nullptr : cs.Top()->m_pc;
-
-   return(  chunk_is_token(pc, CT_QUESTION)
-         && pc->level == level);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.h
deleted file mode 100644
index de6ace3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file cs_top_is_question.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#ifndef CS_TOP_IS_QUESTION_H_INCLUDED
-#define CS_TOP_IS_QUESTION_H_INCLUDED
-
-#include "ChunkStack.h"
-
-
-bool cs_top_is_question(ChunkStack &cs, size_t level);
-
-
-#endif /* CS_TOP_IS_QUESTION_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.cpp
deleted file mode 100644
index f3629e9f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.cpp
+++ /dev/null
@@ -1,439 +0,0 @@
-/**
- * @file detect.cpp
- * Scans the parsed file and tries to determine options.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "detect.h"
-
-#include "prototypes.h"
-
-
-using namespace uncrustify;
-
-
-//! Detect spacing options
-static void detect_space_options(void);
-
-
-class sp_votes
-{
-protected:
-   size_t         m_add    = 0;
-   size_t         m_remove = 0;
-   size_t         m_force  = 0;
-   Option<iarf_e> &m_option;
-
-public:
-   sp_votes(Option<iarf_e> &opt)
-      : m_option(opt)
-   {}
-
-   //! Figure out the result of the vote and maybe update *m_av
-   ~sp_votes();
-
-   void vote(chunk_t *first, chunk_t *second);
-};
-
-
-void sp_votes::vote(chunk_t *first, chunk_t *second)
-{
-   if (  first == nullptr
-      || chunk_is_newline(first)
-      || second == nullptr
-      || chunk_is_newline(second))
-   {
-      return;
-   }
-   int col_dif = second->column - (first->column + first->len());
-
-   if (col_dif == 0)
-   {
-      m_remove++;
-   }
-   else if (col_dif == 1)
-   {
-      m_force++;
-   }
-   else
-   {
-      m_add++;
-   }
-}
-
-
-//! Figure out the result of the vote and maybe update *m_av
-sp_votes::~sp_votes()
-{
-   // no change if no items were added
-   if (  m_remove == 0
-      && m_add == 0
-      && m_force == 0)
-   {
-      return;
-   }
-
-   if (m_remove == 0)
-   {
-      m_option = (m_force > m_add) ? IARF_FORCE : IARF_ADD;
-   }
-   else if (  m_force == 0
-           && m_add == 0)
-   {
-      m_option = IARF_REMOVE;
-   }
-   else
-   {
-      // nothing conclusive. do not alter.
-   }
-}
-
-
-// generates "vote_sp_xxx" variable name from uncrustify option name "UO_xxx"
-#define SP_VOTE_VAR(x)    sp_votes vote_ ## x(options::x)
-
-
-static void detect_space_options(void)
-{
-   SP_VOTE_VAR(sp_arith);
-   SP_VOTE_VAR(sp_before_assign);
-   SP_VOTE_VAR(sp_after_assign);
-   SP_VOTE_VAR(sp_enum_before_assign);
-   SP_VOTE_VAR(sp_enum_after_assign);
-   SP_VOTE_VAR(sp_bool);
-   SP_VOTE_VAR(sp_compare);
-   SP_VOTE_VAR(sp_inside_paren);
-   SP_VOTE_VAR(sp_paren_paren);
-   SP_VOTE_VAR(sp_paren_brace);
-   SP_VOTE_VAR(sp_before_ptr_star);
-   SP_VOTE_VAR(sp_before_unnamed_ptr_star);
-   SP_VOTE_VAR(sp_between_ptr_star);
-   SP_VOTE_VAR(sp_after_ptr_star);
-   SP_VOTE_VAR(sp_after_byref);
-   SP_VOTE_VAR(sp_before_byref);
-   SP_VOTE_VAR(sp_before_unnamed_byref);
-   SP_VOTE_VAR(sp_after_type);
-   SP_VOTE_VAR(sp_template_angle);
-   SP_VOTE_VAR(sp_before_angle);
-   SP_VOTE_VAR(sp_inside_angle);
-   SP_VOTE_VAR(sp_after_angle);
-   SP_VOTE_VAR(sp_angle_paren);
-   SP_VOTE_VAR(sp_angle_word);
-   SP_VOTE_VAR(sp_before_square);
-   SP_VOTE_VAR(sp_before_squares);
-   SP_VOTE_VAR(sp_inside_square);
-   SP_VOTE_VAR(sp_before_sparen);
-   SP_VOTE_VAR(sp_inside_sparen);
-   SP_VOTE_VAR(sp_after_sparen);
-   SP_VOTE_VAR(sp_sparen_brace);
-   SP_VOTE_VAR(sp_special_semi);
-   SP_VOTE_VAR(sp_before_semi);
-   SP_VOTE_VAR(sp_before_semi_for);
-   SP_VOTE_VAR(sp_before_semi_for_empty);
-   SP_VOTE_VAR(sp_after_semi_for_empty);
-   SP_VOTE_VAR(sp_after_comma);
-   SP_VOTE_VAR(sp_before_comma);
-   SP_VOTE_VAR(sp_after_class_colon);
-   SP_VOTE_VAR(sp_before_class_colon);
-   SP_VOTE_VAR(sp_inside_braces);
-   SP_VOTE_VAR(sp_inside_braces_empty);
-   SP_VOTE_VAR(sp_else_brace);
-   SP_VOTE_VAR(sp_brace_else);
-   SP_VOTE_VAR(sp_catch_brace);
-   SP_VOTE_VAR(sp_brace_catch);
-   SP_VOTE_VAR(sp_finally_brace);
-   SP_VOTE_VAR(sp_brace_finally);
-   SP_VOTE_VAR(sp_try_brace);
-   SP_VOTE_VAR(sp_getset_brace);
-
-   chunk_t *prev = chunk_get_head();
-   chunk_t *pc   = chunk_get_next(prev);
-   chunk_t *next;
-
-   while (pc != nullptr)
-   {
-      next = chunk_get_next(pc);
-
-      if (next == nullptr)
-      {
-         break;
-      }
-
-      if (  chunk_is_token(pc, CT_ARITH)
-         || chunk_is_token(pc, CT_SHIFT))
-      {
-         vote_sp_arith.vote(pc, next);
-         vote_sp_arith.vote(prev, pc);
-      }
-
-      if (chunk_is_token(pc, CT_ASSIGN))
-      {
-         if (!pc->flags.test(PCF_IN_ENUM))
-         {
-            vote_sp_before_assign.vote(prev, pc);
-            vote_sp_after_assign.vote(pc, next);
-         }
-         else
-         {
-            vote_sp_enum_before_assign.vote(prev, pc);
-            vote_sp_enum_after_assign.vote(pc, next);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_SQUARE_OPEN))
-      {
-         vote_sp_before_square.vote(prev, pc);
-         vote_sp_inside_square.vote(pc, next);
-      }
-
-      if (chunk_is_token(pc, CT_SQUARE_CLOSE))
-      {
-         vote_sp_inside_square.vote(prev, pc);
-      }
-
-      if (chunk_is_token(pc, CT_TSQUARE))
-      {
-         vote_sp_before_squares.vote(prev, pc);
-      }
-
-      if (chunk_is_token(pc, CT_BOOL))
-      {
-         vote_sp_bool.vote(prev, pc);
-         vote_sp_bool.vote(pc, next);
-      }
-
-      if (chunk_is_token(pc, CT_COMPARE))
-      {
-         vote_sp_compare.vote(prev, pc);
-         vote_sp_compare.vote(pc, next);
-      }
-
-      if (chunk_is_token(pc, CT_PAREN_CLOSE))
-      {
-         vote_sp_inside_paren.vote(prev, pc);
-      }
-
-      if (chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         vote_sp_inside_paren.vote(pc, next);
-      }
-
-      if (  (  chunk_is_paren_open(pc)
-            && chunk_is_paren_open(next))
-         || (  chunk_is_paren_close(pc)
-            && chunk_is_paren_close(next)))
-      {
-         vote_sp_paren_paren.vote(pc, next);
-      }
-
-      if (  chunk_is_paren_close(pc)
-         && chunk_is_token(next, CT_BRACE_OPEN))
-      {
-         vote_sp_paren_brace.vote(pc, next);
-      }
-
-      if (chunk_is_token(pc, CT_PTR_TYPE))
-      {
-         if (chunk_is_token(prev, CT_PTR_TYPE))
-         {
-            vote_sp_between_ptr_star.vote(prev, pc);
-         }
-         else if (next->type != CT_WORD)
-         {
-            vote_sp_before_unnamed_ptr_star.vote(prev, pc);
-         }
-         else
-         {
-            vote_sp_before_ptr_star.vote(prev, pc);
-         }
-
-         if (CharTable::IsKw1(next->str[0]))
-         {
-            vote_sp_after_ptr_star.vote(pc, next);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_BYREF))
-      {
-         if (next->type != CT_WORD)
-         {
-            vote_sp_before_unnamed_byref.vote(prev, pc);
-         }
-         else
-         {
-            vote_sp_before_byref.vote(prev, pc);
-         }
-         vote_sp_after_byref.vote(pc, next);
-      }
-
-      if (  pc->type != CT_PTR_TYPE
-         && (  chunk_is_token(prev, CT_QUALIFIER)
-            || chunk_is_token(prev, CT_TYPE)))
-      {
-         vote_sp_after_type.vote(prev, pc);
-      }
-
-      if (chunk_is_token(pc, CT_ANGLE_OPEN))
-      {
-         vote_sp_inside_angle.vote(pc, next);
-
-         if (chunk_is_token(prev, CT_TEMPLATE))
-         {
-            vote_sp_template_angle.vote(prev, pc);
-         }
-         else
-         {
-            vote_sp_before_angle.vote(prev, pc);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_ANGLE_CLOSE))
-      {
-         vote_sp_inside_angle.vote(prev, pc);
-
-         if (chunk_is_paren_open(next))
-         {
-            vote_sp_angle_paren.vote(prev, pc);
-         }
-         else if (  chunk_is_token(next, CT_WORD)
-                 || CharTable::IsKw1(next->str[0]))
-         {
-            vote_sp_angle_word.vote(prev, pc);
-         }
-         else
-         {
-            vote_sp_after_angle.vote(pc, next);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_SPAREN_OPEN))
-      {
-         vote_sp_before_sparen.vote(prev, pc);
-         vote_sp_inside_sparen.vote(pc, next);
-      }
-
-      if (chunk_is_token(pc, CT_SPAREN_CLOSE))
-      {
-         vote_sp_inside_sparen.vote(prev, pc);
-
-         if (chunk_is_token(next, CT_BRACE_OPEN))
-         {
-            vote_sp_sparen_brace.vote(pc, next);
-         }
-         else
-         {
-            vote_sp_after_sparen.vote(pc, next);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_SEMICOLON))
-      {
-         if (get_chunk_parent_type(pc) == CT_FOR)
-         {
-            if (chunk_is_token(prev, CT_SPAREN_OPEN))
-            {
-               // empty, ie for (;;)
-               //               ^ is prev
-               //                ^ is pc
-               vote_sp_before_semi_for_empty.vote(prev, pc);
-            }
-            else if (chunk_is_token(next, CT_SPAREN_CLOSE))
-            {
-               // empty, ie for (;;)
-               //                 ^ is pc
-               //                  ^ is next
-               vote_sp_after_semi_for_empty.vote(pc, next);
-            }
-            else if (prev->type != CT_SEMICOLON)
-            {
-               // empty, ie for (; i < 8;)
-               //                       ^ is pc
-               // or
-               //                      ^ is prev
-               vote_sp_before_semi_for.vote(prev, pc);
-            }
-         }
-         else if (chunk_is_token(prev, CT_VBRACE_OPEN))
-         {
-            vote_sp_special_semi.vote(chunk_get_prev(prev), pc);
-         }
-         else
-         {
-            vote_sp_before_semi.vote(prev, pc);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_COMMA))
-      {
-         vote_sp_before_comma.vote(prev, pc);
-         vote_sp_after_comma.vote(pc, next);
-      }
-
-      if (chunk_is_token(pc, CT_CLASS_COLON))
-      {
-         vote_sp_before_class_colon.vote(prev, pc);
-         vote_sp_after_class_colon.vote(pc, next);
-      }
-
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
-      {
-         if (chunk_is_token(prev, CT_ELSE))
-         {
-            vote_sp_else_brace.vote(prev, pc);
-         }
-         else if (chunk_is_token(prev, CT_CATCH))
-         {
-            vote_sp_catch_brace.vote(prev, pc);
-         }
-         else if (chunk_is_token(prev, CT_FINALLY))
-         {
-            vote_sp_catch_brace.vote(prev, pc);
-         }
-         else if (chunk_is_token(prev, CT_TRY))
-         {
-            vote_sp_catch_brace.vote(prev, pc);
-         }
-         else if (chunk_is_token(prev, CT_GETSET))
-         {
-            vote_sp_catch_brace.vote(prev, pc);
-         }
-
-         if (chunk_is_token(next, CT_BRACE_CLOSE))
-         {
-            vote_sp_inside_braces_empty.vote(pc, next);
-         }
-         else
-         {
-            vote_sp_inside_braces.vote(pc, next);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         vote_sp_inside_braces.vote(prev, pc);
-
-         if (chunk_is_token(next, CT_ELSE))
-         {
-            vote_sp_brace_else.vote(pc, next);
-         }
-         else if (chunk_is_token(next, CT_CATCH))
-         {
-            vote_sp_brace_catch.vote(pc, next);
-         }
-         else if (chunk_is_token(next, CT_FINALLY))
-         {
-            vote_sp_brace_finally.vote(pc, next);
-         }
-      }
-      prev = pc;
-      pc   = next;
-   }
-} // detect_space_options
-
-
-void detect_options(void)
-{
-   detect_space_options();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.h
deleted file mode 100644
index 5c6ec1e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file detect.h
- * prototypes for detect.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef DETECT_H_INCLUDED
-#define DETECT_H_INCLUDED
-
-
-//! Call all the detect_xxxx() functions
-void detect_options(void);
-
-
-#endif /* DETECT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.cpp
deleted file mode 100644
index 7c04fbb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * @file enum_cleanup.cpp
- * works on the last comma withing enum
- *
- * @author  Guy Maurel Juli 2018
- * @license GPL v2+
- */
-
-#include "enum_cleanup.h"
-
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LTOK;
-
-using namespace uncrustify;
-
-
-void enum_cleanup(void)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("mod_enum_last_comma");
-
-   if (options::mod_enum_last_comma() == IARF_IGNORE)
-   {
-      // nothing to do
-      return;
-   }
-   chunk_t *pc = chunk_get_head();  // Issue #858
-
-   while (pc != nullptr)
-   {
-      if (  get_chunk_parent_type(pc) == CT_ENUM
-         && chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s\n",
-                 __func__, __LINE__, pc->orig_line, get_token_name(pc->type));
-         chunk_t *prev = chunk_get_prev_ncnnlnp(pc);
-
-         // test of (prev == nullptr) is not necessary
-         if (chunk_is_token(prev, CT_COMMA))
-         {
-            log_rule_B("mod_enum_last_comma");
-
-            if (options::mod_enum_last_comma() == IARF_REMOVE)
-            {
-               chunk_del(prev);
-            }
-         }
-         else
-         {
-            if (chunk_is_token(prev, CT_BRACE_OPEN))                // Issue #2902
-            {
-               // nothing betwen CT_BRACE_OPEN and CT_BRACE_CLOSE
-            }
-            else
-            {
-               log_rule_B("mod_enum_last_comma");
-
-               if (  options::mod_enum_last_comma() == IARF_ADD
-                  || options::mod_enum_last_comma() == IARF_FORCE)
-               {
-                  // create a comma
-                  chunk_t comma;
-                  set_chunk_type(&comma, CT_COMMA);
-                  comma.orig_line = prev->orig_line;
-                  comma.orig_col  = prev->orig_col + 1;
-                  comma.nl_count  = 0;
-                  comma.pp_level  = 0;
-                  comma.flags     = PCF_NONE;
-                  comma.str       = ",";
-                  chunk_add_after(&comma, prev);
-               }
-            }
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-} // enum_cleanup
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.h
deleted file mode 100644
index 3853c8ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file enum_cleanup.h
- *
- * @author  Guy Maurel Juli 2018
- * @license GPL v2+
- */
-#ifndef ENUM_CLEANUP_H_INCLUDED
-#define ENUM_CLEANUP_H_INCLUDED
-
-/**
- * Scans through the whole list and does stuff.
- * works on the last comma withing enum
- */
-void enum_cleanup(void);
-
-#endif /* ENUM_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_flags.h
deleted file mode 100644
index badd8226..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_flags.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * @file enum_flags.h
- * Operators for working with bit-flag enumerators.
- *
- * @author  Matthew Woehlke (but mostly "borrowed" from Qt)
- * @license GPL v2+
- */
-
-#ifndef ENUM_FLAGS_H_INCLUDED
-#define ENUM_FLAGS_H_INCLUDED
-
-#include <type_traits>
-
-#if __GNUC__ == 4 && !defined (__clang__)
-#pragma GCC diagnostic push
-#if __GNUC_MINOR__ < 9 || __GNUC_PATCHLEVEL__ < 2
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59624
-#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
-#endif
-#endif
-
-#define UNC_DECLARE_FLAGS(flag_type, enum_type) \
-   using flag_type = ::uncrustify::flags<enum_type>
-
-#define UNC_DECLARE_OPERATORS_FOR_FLAGS(flag_type)                        \
-   inline flag_type operator&(flag_type::enum_t f1, flag_type::enum_t f2) \
-   { return(flag_type{ f1 } & f2); }                                      \
-   inline flag_type operator|(flag_type::enum_t f1, flag_type::enum_t f2) \
-   { return(flag_type{ f1 } | f2); }                                      \
-   inline flag_type operator|(flag_type::enum_t f1, flag_type f2)         \
-   { return(f2 | f1); }                                                   \
-   inline void operator|(flag_type::enum_t f1, int f2) = delete
-
-namespace uncrustify
-{
-
-//-----------------------------------------------------------------------------
-template<typename Enum>
-class flags
-{
-public:
-   using enum_t = Enum;
-   using int_t  = typename std::underlying_type<enum_t>::type;
-
-   template<typename T> using integral =
-      typename std::enable_if<std::is_integral<T>::value, bool>::type;
-
-   inline flags() = default;
-   inline flags(Enum flag)
-      : m_i{static_cast<int_t>(flag)}
-   {}
-
-   inline bool operator==(Enum const &other)
-   { return(m_i == static_cast<int_t>(other)); }
-   inline bool operator==(flags const &other)
-   { return(m_i == other.m_i); }
-   inline bool operator!=(Enum const &other)
-   { return(m_i != static_cast<int_t>(other)); }
-   inline bool operator!=(flags const &other)
-   { return(m_i != other.m_i); }
-
-   template<typename T, integral<T> = true>
-   inline flags &operator&=(T mask)
-   { m_i &= static_cast<int_t>(mask); return(*this); }
-
-   inline flags &operator|=(flags f)
-   { m_i |= f.m_i; return(*this); }
-   inline flags &operator|=(Enum f)
-   { m_i |= f; return(*this); }
-
-   inline flags &operator^=(flags f)
-   { m_i ^= f.m_i; return(*this); }
-   inline flags &operator^=(Enum f)
-   { m_i ^= f; return(*this); }
-
-   inline operator int_t() const { return(m_i); }
-   inline operator enum_t() const { return(static_cast<enum_t>(m_i)); }
-
-   inline flags operator&(Enum f) const
-   { flags g; g.m_i = m_i & static_cast<int_t>(f); return(g); }
-   inline flags operator&(flags f) const
-   { flags g; g.m_i = m_i & static_cast<int_t>(f); return(g); }
-
-   template<typename T, integral<T> = true>
-   inline flags operator&(T mask) const
-   { flags g; g.m_i = m_i & static_cast<int_t>(mask); return(g); }
-
-   inline flags operator|(flags f) const
-   { flags g; g.m_i = m_i | f.m_i; return(g); }
-   inline flags operator|(Enum f) const
-   { flags g; g.m_i = m_i | static_cast<int_t>(f); return(g); }
-
-   inline flags operator^(flags f) const
-   { flags g; g.m_i = m_i ^ f.m_i; return(g); }
-   inline flags operator^(Enum f) const
-   { flags g; g.m_i = m_i ^ static_cast<int_t>(f); return(g); }
-
-   inline int_t operator~() const
-   { return(~m_i); }
-
-   inline operator bool() const { return(!!m_i); }
-   inline bool operator!() const { return(!m_i); }
-
-   inline bool test(flags f) const { return((*this & f) == f); }
-   inline bool test(Enum f) const { return((*this & f) == f); }
-
-   inline bool test_any() const { return(m_i != 0); }
-   inline bool test_any(flags f) const { return((*this & f).test_any()); }
-
-protected:
-   int_t m_i = 0;
-};
-
-} // namespace uncrustify
-
-#if __GNUC__ == 4 && !defined (__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/error_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/error_types.h
deleted file mode 100644
index f0ebb502..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/error_types.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @file error_types.h
- *
- * Defines the error codes that are used throughout uncrustify
- *
- * @license GPL v2+
- */
-#ifndef ERROR_TYPES_H_INCLUDED
-#define ERROR_TYPES_H_INCLUDED
-
-#if 1
-#include <stdlib.h>      // provides EXIT_SUCCESS and EXIT FAILURE
-
-// TODO: if we decided to only use EX_OK and EX_xxx we can avoid including stdlib.h here
-
-#else
-// TODO: I left this to show my modifications remove it after the PR was reviewed
-
-// the good old SUCCESS/FAILURE
-#define SUCCESS    0      //! same as EX_OK */
-#define FAILURE    -1     //! incompatible to EXIT_FAILURE
-#endif
-
-
-#if defined (WIN32) || defined (__QNXNTO__)
-// Windows does not know sysexists.h. Thus define the error codes
-
-#define EX_OK             0    //! successful termination
-#define EX__BASE          64   //! base value for error messages
-#define EX_USAGE          64   //! command line usage error
-#define EX_DATAERR        65   //! data format error
-#define EX_NOINPUT        66   //! cannot open input
-#define EX_NOUSER         67   //! addressee unknown
-#define EX_NOHOST         68   //! host name unknown
-#define EX_UNAVAILABLE    69   //! service unavailable
-#define EX_SOFTWARE       70   //! internal software error
-#define EX_OSERR          71   //! system error (e.g., can't fork)
-#define EX_OSFILE         72   //! critical OS file missing
-#define EX_CANTCREAT      73   //! can't create (user) output file
-#define EX_IOERR          74   //! input/output error
-#define EX_TEMPFAIL       75   //! temp failure; user is invited to retry
-#define EX_PROTOCOL       76   //! remote error in protocol
-#define EX_NOPERM         77   //! permission denied
-#define EX_CONFIG         78   //! configuration error
-#define EX__MAX           78   //! maximum listed value
-
-#else // not WIN32 or not __QNXNTO__
-// TODO: do all non windows systems know sysexits.h, Linux probably not?
-#include "sysexits.h"      // comes from BSD
-#endif
-
-#endif /* ERROR_TYPES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.cpp
deleted file mode 100644
index 7e5badac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * @file flag_braced_init_list.cpp
- *
- * @license GPL v2+
- */
-
-#include "chunk_list.h"
-
-#include "flag_braced_init_list.h"
-
-#include "uncrustify.h"
-
-
-bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
-{
-   LOG_FUNC_ENTRY();
-   // Issue #2332
-   bool we_have_a_case_before = false;
-
-   if (chunk_is_token(pc, CT_COLON))
-   {
-      // check if we have a case before
-      chunk_t *switch_before = chunk_get_prev_type(pc, CT_CASE, pc->level);
-
-      if (switch_before != nullptr)
-      {
-         LOG_FMT(LFCNR, "%s(%d): switch_before->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, switch_before->orig_line, switch_before->orig_col,
-                 switch_before->text(), get_token_name(switch_before->type));
-         we_have_a_case_before = true;
-      }
-   }
-
-   // Detect a braced-init-list
-   if (  chunk_is_token(pc, CT_WORD)
-      || chunk_is_token(pc, CT_TYPE)
-      || chunk_is_token(pc, CT_ASSIGN)
-      || chunk_is_token(pc, CT_RETURN)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_ANGLE_CLOSE)
-      || chunk_is_token(pc, CT_SQUARE_CLOSE)
-      || chunk_is_token(pc, CT_TSQUARE)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_QUESTION)
-      || (  chunk_is_token(pc, CT_COLON)
-         && !we_have_a_case_before)
-      || (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && (  get_chunk_parent_type(pc) == CT_NONE
-            || get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)))
-   {
-      log_pcf_flags(LFCNR, pc->flags);
-      auto brace_open = chunk_get_next_ncnnl(pc);
-
-      if (  chunk_is_token(brace_open, CT_BRACE_OPEN)
-         && (  get_chunk_parent_type(brace_open) == CT_NONE
-            || get_chunk_parent_type(brace_open) == CT_ASSIGN
-            || get_chunk_parent_type(brace_open) == CT_RETURN
-            || get_chunk_parent_type(brace_open) == CT_BRACED_INIT_LIST))
-      {
-         log_pcf_flags(LFCNR, brace_open->flags);
-         auto brace_close = chunk_skip_to_match(next);
-
-         if (chunk_is_token(brace_close, CT_BRACE_CLOSE))
-         {
-            return(true);
-         }
-      }
-   }
-   return(false);
-} // detect_cpp_braced_init_list
-
-
-void flag_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
-{
-   auto brace_open  = chunk_get_next_ncnnl(pc);
-   auto brace_close = chunk_skip_to_match(next);
-
-   set_chunk_parent(brace_open, CT_BRACED_INIT_LIST);
-   set_chunk_parent(brace_close, CT_BRACED_INIT_LIST);
-
-   auto *tmp = chunk_get_next_ncnnl(brace_close);
-
-   if (tmp != nullptr)
-   {
-      chunk_flags_clr(tmp, PCF_EXPR_START | PCF_STMT_START);
-
-      // Flag call operator
-      if (chunk_is_token(tmp, CT_PAREN_OPEN))
-      {
-         if (auto *const c = chunk_skip_to_match(tmp))
-         {
-            set_chunk_type(tmp, CT_FPAREN_OPEN);
-            set_chunk_parent(tmp, CT_FUNC_CALL);
-            set_chunk_type(c, CT_FPAREN_CLOSE);
-            set_chunk_parent(c, CT_FUNC_CALL);
-         }
-      }
-   }
-   // TODO: Change pc->type CT_WORD -> CT_TYPE
-   // for the case CT_ASSIGN (and others).
-
-   // TODO: Move this block to the fix_fcn_call_args function.
-   if (  chunk_is_token(pc, CT_WORD)
-      && pc->flags.test(PCF_IN_FCN_CALL))
-   {
-      set_chunk_type(pc, CT_TYPE);
-   }
-} // flag_cpp_braced_init_list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.h
deleted file mode 100644
index 4500a260..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file flag_braced_init_list.h
- *
- * @license GPL v2+
- */
-
-#ifndef FLAG_BRACED_INIT_LIST_INCLUDED
-#define FLAG_BRACED_INIT_LIST_INCLUDED
-
-
-/**
- * Detect a cpp braced init list
- */
-bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next);
-
-
-/**
- * Flags the opening and closing braces of an expression deemed to be
- * a cpp braced initializer list; a call to detect_cpp_braced_init_list()
- * should first be made prior to calling this function
- */
-void flag_cpp_braced_init_list(chunk_t *pc, chunk_t *next);
-
-
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.cpp
deleted file mode 100644
index c5cc0134..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file flag_decltype.cpp
- *
- * @license GPL v2+
- */
-
-#include "chunk_list.h"
-
-
-bool flag_cpp_decltype(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(pc, CT_DECLTYPE))
-   {
-      auto paren_open = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_token(paren_open, CT_PAREN_OPEN))
-      {
-         auto close_paren = chunk_skip_to_match(paren_open);
-
-         if (close_paren != nullptr)
-         {
-            pc = paren_open;
-
-            do
-            {
-               chunk_flags_set(pc, PCF_IN_DECLTYPE);
-               pc = pc->next;
-            } while (pc != close_paren);
-
-            return(true);
-         }
-      }
-   }
-   return(false);
-} // mark_cpp_decltype
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.h
deleted file mode 100644
index f6946575..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file flag_decltype.h
- *
- * @license GPL v2+
- */
-
-#ifndef FLAG_DECLTYPE_INCLUDED
-#define FLAG_DECLTYPE_INCLUDED
-
-
-/**
- * Flags all chunks within a cpp decltype expression from the opening
- * brace to the closing brace
- *
- * @return Returns true if expression is a valid decltype expression
- */
-bool flag_cpp_decltype(chunk_t *pc);
-
-
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.cpp
deleted file mode 100644
index c0983745..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file flag_parens.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "flag_parens.h"
-
-#include "uncrustify.h"
-
-
-chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token_t parenttype, bool parent_all)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *paren_close;
-
-   paren_close = chunk_skip_to_match(po, scope_e::PREPROC);
-
-   if (paren_close == nullptr)
-   {
-      LOG_FMT(LERR, "%s(%d): no match for '%s' at [%zu:%zu]",
-              __func__, __LINE__, po->text(), po->orig_line, po->orig_col);
-      log_func_stack_inline(LERR);
-      cpd.error_count++;
-      return(nullptr);
-   }
-   LOG_FMT(LFLPAREN, "%s(%d): between  po is '%s', orig_line is %zu, orig_col is %zu, and\n",
-           __func__, __LINE__, po->text(), po->orig_line, po->orig_col);
-   LOG_FMT(LFLPAREN, "%s(%d): paren_close is '%s', orig_line is %zu, orig_col is %zu, type is %s, parent_type is %s\n",
-           __func__, __LINE__, paren_close->text(), paren_close->orig_line, paren_close->orig_col,
-           get_token_name(opentype), get_token_name(parenttype));
-   log_func_stack_inline(LFLPAREN);
-
-   // the last chunk must be also modified. Issue #2149
-   chunk_t *after_paren_close = chunk_get_next(paren_close);
-
-   if (po != paren_close)
-   {
-      if (  flags != PCF_NONE
-         || (  parent_all
-            && parenttype != CT_NONE))
-      {
-         chunk_t *pc;
-
-         for (pc = chunk_get_next(po, scope_e::PREPROC);
-              pc != nullptr && pc != after_paren_close;
-              pc = chunk_get_next(pc, scope_e::PREPROC))
-         {
-            chunk_flags_set(pc, flags);
-
-            if (parent_all)
-            {
-               set_chunk_parent(pc, parenttype);
-            }
-         }
-      }
-
-      if (opentype != CT_NONE)
-      {
-         set_chunk_type(po, opentype);
-         set_chunk_type(paren_close, (c_token_t)(opentype + 1));
-      }
-
-      if (parenttype != CT_NONE)
-      {
-         set_chunk_parent(po, parenttype);
-         set_chunk_parent(paren_close, parenttype);
-      }
-   }
-   return(chunk_get_next_ncnnl(paren_close, scope_e::PREPROC));
-} // flag_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.h
deleted file mode 100644
index 5c4d1e43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file flag_parens.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#ifndef FLAG_PARENS_H_INCLUDED
-#define FLAG_PARENS_H_INCLUDED
-
-#include "chunk_list.h"
-
-
-/**
- * Flags everything from the open paren to the close paren.
- *
- * @param po          Pointer to the open parenthesis
- * @param flags       flags to add
- * @param opentype
- * @param parenttype
- * @param parent_all
- *
- * @return The token after the close paren
- */
-chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token_t parenttype, bool parent_all);
-
-
-#endif /* FLAG_PARENS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.cpp
deleted file mode 100644
index 54bbf8a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- * @file frame_list.cpp
- * mainly used to handle preprocessor stuff
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "frame_list.h"
-
-#include "prototypes.h"
-
-
-namespace
-{
-
-void fl_log_frms(log_sev_t logsev, const char *txt, const ParseFrame &frm, const std::vector<ParseFrame> &frames);
-
-
-//! Logs the entire parse frame stack
-void fl_log_all(log_sev_t logsev, const std::vector<ParseFrame> &frames);
-
-
-/**
- * Copy the top element of the frame list into the ParseFrame.
- *
- * If the frame list is empty nothing happens.
- *
- * This is called on #else and #elif.
- */
-void fl_copy_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames);
-
-
-/**
- * Copy the 2nd top element off the list into the ParseFrame.
- * This is called on #else and #elif.
- * The stack contains [...] [base] [if] at this point.
- * We want to copy [base].
- */
-void fl_copy_2nd_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames);
-
-
-//! Deletes the top element from the list.
-void fl_trash_tos(std::vector<ParseFrame> &frames);
-
-
-//! Logs one parse frame
-void fl_log(log_sev_t logsev, const ParseFrame &frm)
-{
-   LOG_FMT(logsev, "[%s] BrLevel=%zu Level=%zu PseTos=%zu\n",
-           get_token_name(frm.in_ifdef), frm.brace_level, frm.level, frm.size() - 1);
-
-   LOG_FMT(logsev, " *");
-
-   for (size_t idx = 1; idx < frm.size(); idx++)
-   {
-      LOG_FMT(logsev, " [%s-%u]", get_token_name(frm.at(idx).type),
-              static_cast<unsigned int>(frm.at(idx).stage));
-   }
-
-   LOG_FMT(logsev, "\n");
-}
-
-
-void fl_log_frms(log_sev_t                     logsev,
-                 const char                    *txt,
-                 const ParseFrame              &frm,
-                 const std::vector<ParseFrame> &frames)
-{
-   LOG_FMT(logsev, "%s Parse Frames(%zu):", txt, frames.size());
-
-   for (size_t idx = 0; idx < frames.size(); idx++)
-   {
-      LOG_FMT(logsev, " [%s-%zu]", get_token_name(frames.at(idx).in_ifdef),
-              frames.at(idx).ref_no);
-   }
-
-   LOG_FMT(logsev, "-[%s-%zu]\n", get_token_name(frm.in_ifdef), frm.ref_no);
-}
-
-
-void fl_log_all(log_sev_t logsev, const std::vector<ParseFrame> &frames)
-{
-   LOG_FMT(logsev, "##=- Parse Frame : %zu entries\n", frames.size());
-
-   for (size_t idx = 0; idx < frames.size(); idx++)
-   {
-      LOG_FMT(logsev, "##  idx is %zu, ", idx);
-
-      fl_log(logsev, frames.at(idx));
-   }
-
-   LOG_FMT(logsev, "##=-\n");
-}
-
-
-void fl_copy_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames)
-{
-   if (!frames.empty())
-   {
-      pf = *std::prev(std::end(frames));
-   }
-   LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, frames.size());
-}
-
-
-void fl_copy_2nd_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames)
-{
-   if (frames.size() > 1)
-   {
-      pf = *std::prev(std::end(frames), 2);
-   }
-   LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, frames.size());
-}
-
-
-void fl_trash_tos(std::vector<ParseFrame> &frames)
-{
-   if (!frames.empty())
-   {
-      frames.pop_back();
-   }
-   LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, frames.size());
-}
-
-} // namespace
-
-
-void fl_push(std::vector<ParseFrame> &frames, ParseFrame &frm)
-{
-   static int ref_no = 1;
-
-   frames.push_back(frm);
-   frm.ref_no = ref_no++;
-
-   LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, frames.size());
-}
-
-
-void fl_pop(std::vector<ParseFrame> &frames, ParseFrame &pf)
-{
-   if (frames.empty())
-   {
-      return;
-   }
-   fl_copy_tos(pf, frames);
-   fl_trash_tos(frames);
-}
-
-
-int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, chunk_t *pc)
-{
-   if (pc->type != CT_PREPROC)
-   {
-      return(pp_level);
-   }
-   chunk_t *next = chunk_get_next(pc);
-
-   if (next == nullptr)
-   {
-      return(pp_level);
-   }
-
-   if (get_chunk_parent_type(pc) != next->type)
-   {
-      LOG_FMT(LNOTE, "%s(%d): Preproc parent not set correctly on orig_line %zu: got %s expected %s\n",
-              __func__, __LINE__, pc->orig_line, get_token_name(get_chunk_parent_type(pc)),
-              get_token_name(next->type));
-      set_chunk_parent(pc, next->type);
-   }
-   LOG_FMT(LPFCHK, "%s(%d): %zu] %s\n",
-           __func__, __LINE__, pc->orig_line, get_token_name(get_chunk_parent_type(pc)));
-   fl_log_frms(LPFCHK, "TOP", frm, frames);
-
-
-   int             out_pp_level = pp_level;
-   const c_token_t in_ifdef     = frm.in_ifdef;
-   const size_t    b4_cnt       = frames.size();
-
-   const char      *txt = nullptr;
-
-   if (pc->flags.test(PCF_IN_PREPROC))
-   {
-      LOG_FMT(LPF, " <In> ");
-      fl_log(LPF, frm);
-
-      if (get_chunk_parent_type(pc) == CT_PP_IF)
-      {
-         // An #if pushes a copy of the current frame on the stack
-         pp_level++;
-         fl_push(frames, frm);
-         frm.in_ifdef = CT_PP_IF;
-         txt          = "if-push";
-      }
-      else if (get_chunk_parent_type(pc) == CT_PP_ELSE)
-      {
-         if (out_pp_level == 0)
-         {
-            fprintf(stderr, "%s(%d): pp_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
-            log_flush(true);
-            exit(EX_SOFTWARE);
-         }
-         out_pp_level--;
-
-         /*
-          * For #else of #elif, we want to keep the #if part and throw out the
-          * else parts.
-          * We check to see what the top type is to see if we just push or
-          * pop and then push.
-          * We need to use the copy right before the if.
-          */
-         if (frm.in_ifdef == CT_PP_IF)
-         {
-            // we have [...] [base]-[if], so push an [else]
-            fl_push(frames, frm);
-            frm.in_ifdef = CT_PP_ELSE;
-         }
-         // we have [...] [base] [if]-[else], copy [base] over [else]
-         fl_copy_2nd_tos(frm, frames);
-         frm.in_ifdef = CT_PP_ELSE;
-         txt          = "else-push";
-      }
-      else if (get_chunk_parent_type(pc) == CT_PP_ENDIF)
-      {
-         /*
-          * we may have [...] [base] [if]-[else] or [...] [base]-[if].
-          * Throw out the [else].
-          */
-         if (pp_level == 0)
-         {
-            // cpd.pp_level is ZERO, cannot be decremented.
-            fprintf(stderr, "%s(%d): #endif found, at line %zu, column %zu, without corresponding #if\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
-            log_flush(true);
-            exit(EX_SOFTWARE);
-         }
-         pp_level--;
-
-         if (out_pp_level == 0)
-         {
-            fprintf(stderr, "%s(%d): pp_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
-            log_flush(true);
-            exit(EX_SOFTWARE);
-         }
-         out_pp_level--;
-
-         if (frm.in_ifdef == CT_PP_ELSE)
-         {
-            /*
-             * We have: [...] [base] [if]-[else]
-             * We want: [...]-[if]
-             */
-            fl_copy_tos(frm, frames);     // [...] [base] [if]-[if]
-
-            if (frames.size() < 2)
-            {
-               fprintf(stderr, "Number of 'frame' is too small.\n");
-               fprintf(stderr, "Please make a report.\n");
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            frm.in_ifdef = frames[frames.size() - 2].in_ifdef;
-            fl_trash_tos(frames);       // [...] [base]-[if]
-            fl_trash_tos(frames);       // [...]-[if]
-
-            txt = "endif-trash/pop";
-         }
-         else if (frm.in_ifdef == CT_PP_IF)
-         {
-            /*
-             * We have: [...] [base] [if]
-             * We want: [...] [base]
-             */
-            fl_pop(frames, frm);
-            txt = "endif-pop";
-         }
-         else
-         {
-            txt = "???";
-         }
-      }
-   }
-
-   if (txt != nullptr)
-   {
-      LOG_FMT(LPF, "%s(%d): orig_line is %zu, type is %s: %s in_ifdef is %d/%d, counts is %zu, frame_count is %zu\n",
-              __func__, __LINE__, pc->orig_line,
-              get_token_name(get_chunk_parent_type(pc)), txt, static_cast<int>(in_ifdef),
-              static_cast<int>(frm.in_ifdef), b4_cnt, frames.size());
-      fl_log_all(LPF, frames);
-      LOG_FMT(LPF, " <Out>");
-      fl_log(LPF, frm);
-   }
-   fl_log_frms(LPFCHK, "END", frm, frames);
-
-   return(out_pp_level);
-} // fl_check
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.h
deleted file mode 100644
index eef2f00d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file frame_list.h
- * mainly used to handle preprocessor stuff
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef PARSE_FRAME_H_INCLUDED
-#define PARSE_FRAME_H_INCLUDED
-
-#include "ParseFrame.h"
-#include "uncrustify_types.h"
-
-
-/**
- * Push a copy of a ParseFrame onto the frames list.
- * This is called on #if and #ifdef.
- */
-void fl_push(std::vector<ParseFrame> &frames, ParseFrame &frm);
-
-
-/**
- * Pop the top element off the frame list and copy it into the ParseFrame.
- *
- * Does nothing if the frame list is empty.
- *
- * This is called on #endif
- */
-void fl_pop(std::vector<ParseFrame> &frames, ParseFrame &pf);
-
-
-// TODO: this name is dumb:
-// - what is it checking?
-// - why does is much more than simple checks, it allters kinds of stuff
-//! Returns the pp_indent to use for this line
-int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, chunk_t *pc);
-
-
-#endif /* PARSE_FRAME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.cpp
deleted file mode 100644
index fc6679ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.cpp
+++ /dev/null
@@ -1,4402 +0,0 @@
-/**
- * @file indent.cpp
- * Does all the indenting stuff.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel October 2015- 2021
- * @license GPL v2+
- */
-
-#include "indent.h"
-
-#include "align.h"
-#include "frame_list.h"
-#include "options_for_QT.h"
-#include "prototypes.h"
-#include "quick_align_again.h"
-#include "space.h"
-
-#ifdef WIN32
-#include <algorithm>                   // to get max
-#endif // ifdef WIN32
-
-
-constexpr static auto LCURRENT = LINDENT;
-
-using namespace std;
-using namespace uncrustify;
-
-
-/**
- * General indenting approach:
- * Indenting levels are put into a stack.
- *
- * The stack entries contain:
- *  - opening type
- *  - brace column
- *  - continuation column
- *
- * Items that start a new stack item:
- *  - preprocessor (new parse frame)
- *  - Brace Open (Virtual brace also)
- *  - Paren, Square, Angle open
- *  - Assignments
- *  - C++ '<<' operator (ie, cout << "blah")
- *  - case
- *  - class colon
- *  - return
- *  - types
- *  - any other continued statement
- *
- * Note that the column of items marked 'PCF_WAS_ALIGNED' is not changed.
- *
- * For an open brace:
- *  - indent increases by indent_columns
- *  - if part of if/else/do/while/switch/etc, an extra indent may be applied
- *  - if in a paren, then cont-col is set to column + 1, ie "({ some code })"
- *
- * Open paren/square/angle:
- * cont-col is set to the column of the item after the open paren, unless
- * followed by a newline, then it is set to (brace-col + indent_columns).
- * Examples:
- *    a_really_long_funcion_name(
- *       param1, param2);
- *    a_really_long_funcion_name(param1,
- *                               param2);
- *
- * Assignments:
- * Assignments are continued aligned with the first item after the assignment,
- * unless the assign is followed by a newline.
- * Examples:
- *    some.variable = asdf + asdf +
- *                    asdf;
- *    some.variable =
- *       asdf + asdf + asdf;
- *
- * C++ << operator:
- * Handled the same as assignment.
- * Examples:
- *    cout << "this is test number: "
- *         << test_number;
- *
- * case:
- * Started with case or default.
- * Terminated with close brace at level or another case or default.
- * Special indenting according to various rules.
- *  - indent of case label
- *  - indent of case body
- *  - how to handle optional braces
- * Examples:
- * {
- * case x: {
- *    a++;
- *    break;
- *    }
- * case y:
- *    b--;
- *    break;
- * default:
- *    c++;
- *    break;
- * }
- *
- * Class colon:
- * Indent continuation by indent_columns:
- * class my_class :
- *    baseclass1,
- *    baseclass2
- * {
- *
- * Return: same as assignments
- * If the return statement is not fully paren'd, then the indent continues at
- * the column of the item after the return. If it is paren'd, then the paren
- * rules apply.
- * return somevalue +
- *        othervalue;
- *
- * Type: pretty much the same as assignments
- * Examples:
- * int foo,
- *     bar,
- *     baz;
- *
- * Any other continued item:
- * There shouldn't be anything not covered by the above cases, but any other
- * continued item is indented by indent_columns:
- * Example:
- * somereallycrazylongname.with[lotsoflongstuff].
- *    thatreallyannoysme.whenIhavetomaintain[thecode] = 3;
- */
-
-/**
- * REVISIT: This needs to be re-checked, maybe cleaned up
- *
- * Indents comments in a (hopefully) smart manner.
- *
- * There are two type of comments that get indented:
- *  - stand alone (ie, no tokens on the line before the comment)
- *  - trailing comments (last token on the line apart from a linefeed)
- *    + note that a stand-alone comment is a special case of a trailing
- *
- * The stand alone comments will get indented in one of three ways:
- *  - column 1:
- *    + There is an empty line before the comment AND the indent level is 0
- *    + The comment was originally in column 1
- *
- *  - Same column as trailing comment on previous line (ie, aligned)
- *    + if originally within TBD (3) columns of the previous comment
- *
- *  - syntax indent level
- *    + doesn't fit in the previous categories
- *
- * Options modify this behavior:
- *  - keep original column (don't move the comment, if possible)
- *  - keep relative column (move out the same amount as first item on line)
- *  - fix trailing comment in column TBD
- *
- * @param pc   The comment, which is the first item on a line
- * @param col  The column if this is to be put at indent level
- */
-static void indent_comment(chunk_t *pc, size_t col);
-
-
-static size_t token_indent(c_token_t type);
-
-
-static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos);
-
-/**
- * Get candidate chunk first on line to which OC blocks can be indented against.
- */
-static chunk_t *candidate_chunk_first_on_line(chunk_t *pc);
-
-/**
- * We are on a '{' that has parent = OC_BLOCK_EXPR
- * find the column of the param tag
- */
-static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace, bool from_caret, bool from_colon, bool from_keyword);
-
-
-/**
- * returns true if forward scan reveals only single newlines or comments
- * stops when hits code
- * false if next thing hit is a closing brace, also if 2 newlines in a row
- */
-static bool single_line_comment_indent_rule_applies(chunk_t *start);
-
-/**
- * returns true if semicolon on the same level ends any assign operations
- * false if next thing hit is not the end of an assign operation
- */
-static bool is_end_of_assignment(chunk_t *pc, const ParseFrame &frm);
-
-
-void indent_to_column(chunk_t *pc, size_t column)
-{
-   LOG_FUNC_ENTRY();
-
-   if (column < pc->column)
-   {
-      column = pc->column;
-   }
-   reindent_line(pc, column);
-}
-
-
-enum class align_mode_e : unsigned int
-{
-   SHIFT,     //! shift relative to the current column
-   KEEP_ABS,  //! try to keep the original absolute column
-   KEEP_REL,  //! try to keep the original gap
-};
-
-
-void align_to_column(chunk_t *pc, size_t column)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc == nullptr
-      || column == pc->column)
-   {
-      return;
-   }
-   LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s => column is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->column, pc->text(),
-           get_token_name(pc->type), column);
-
-   const auto col_delta = static_cast<int>(column) - static_cast<int>(pc->column);
-   size_t     min_col   = column;
-
-   pc->column = column;
-
-   do
-   {
-      auto *next = chunk_get_next(pc);
-
-      if (next == nullptr)
-      {
-         break;
-      }
-      const size_t min_delta = space_col_align(pc, next);
-      min_col += min_delta;
-
-      const auto *prev = pc;
-      pc = next;
-
-      auto almod = align_mode_e::SHIFT;
-
-      if (  chunk_is_comment(pc)
-         && get_chunk_parent_type(pc) != CT_COMMENT_EMBED)
-      {
-         log_rule_B("indent_relative_single_line_comments");
-         almod = (  chunk_is_single_line_comment(pc)
-                 && options::indent_relative_single_line_comments())
-                 ? align_mode_e::KEEP_REL : align_mode_e::KEEP_ABS;
-      }
-
-      if (almod == align_mode_e::KEEP_ABS)
-      {
-         // Keep same absolute column
-         pc->column = max(pc->orig_col, min_col);
-      }
-      else if (almod == align_mode_e::KEEP_REL)
-      {
-         // Keep same relative column
-         auto orig_delta = static_cast<int>(pc->orig_col) - static_cast<int>(prev->orig_col);
-         orig_delta = max<int>(orig_delta, min_delta);  // keeps orig_delta positive
-
-         pc->column = prev->column + static_cast<size_t>(orig_delta);
-      }
-      else // SHIFT
-      {
-         // Shift by the same amount, keep above negative values
-         pc->column = (  col_delta >= 0
-                      || cast_abs(pc->column, col_delta) < pc->column)
-                      ? pc->column + col_delta : 0;
-         pc->column = max(pc->column, min_col);
-      }
-      LOG_FMT(LINDLINED, "%s(%d):   %s set column of '%s', type is %s, orig_line is %zu, to col %zu (orig_col was %zu)\n",
-              __func__, __LINE__,
-              (almod == align_mode_e::KEEP_ABS) ? "abs" :
-              (almod == align_mode_e::KEEP_REL) ? "rel" : "sft",
-              pc->text(), get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col);
-   } while (  pc != nullptr
-           && pc->nl_count == 0);
-} // align_to_column
-
-
-void reindent_line(chunk_t *pc, size_t column)
-{
-   LOG_FUNC_ENTRY();
-   char copy[1000];
-
-   LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, on '%s' [%s/%s] => %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy),
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           column);
-   log_func_stack_inline(LINDLINE);
-
-   if (column == pc->column)
-   {
-      return;
-   }
-   auto col_delta = static_cast<int>(column) - static_cast<int>(pc->column);
-   auto min_col   = column;
-
-   pc->column = column;
-
-   do
-   {
-      if (QT_SIGNAL_SLOT_found)
-      {
-         // fix the bug #654
-         // connect(&mapper, SIGNAL(mapped(QString &)), this, SLOT(onSomeEvent(QString &)));
-         // look for end of SIGNAL/SLOT block
-         if (!pc->flags.test(PCF_IN_QT_MACRO))
-         {
-            LOG_FMT(LINDLINE, "FLAGS is NOT set: PCF_IN_QT_MACRO\n");
-            restore_options_for_QT();
-         }
-      }
-      else
-      {
-         // look for begin of SIGNAL/SLOT block
-         if (pc->flags.test(PCF_IN_QT_MACRO))
-         {
-            LOG_FMT(LINDLINE, "FLAGS is set: PCF_IN_QT_MACRO\n");
-            save_set_options_for_QT(pc->level);
-         }
-      }
-      chunk_t *next = chunk_get_next(pc);
-
-      if (next == nullptr)
-      {
-         break;
-      }
-
-      if (pc->nl_count)
-      {
-         min_col   = 0;
-         col_delta = 0;
-      }
-      min_col += space_col_align(pc, next);
-      pc       = next;
-
-      const bool is_comment = chunk_is_comment(pc);
-      log_rule_B("indent_relative_single_line_comments");
-      const bool keep = (  is_comment
-                        && chunk_is_single_line_comment(pc)
-                        && options::indent_relative_single_line_comments());
-
-      if (  is_comment
-         && get_chunk_parent_type(pc) != CT_COMMENT_EMBED
-         && !keep)
-      {
-         pc->column = max(pc->orig_col, min_col);
-         LOG_FMT(LINDLINE, "%s(%d): set comment on line %zu to col %zu (orig %zu)\n",
-                 __func__, __LINE__, pc->orig_line, pc->column, pc->orig_col);
-      }
-      else
-      {
-         const auto tmp_col = static_cast<int>(pc->column) + col_delta;
-         pc->column = max(tmp_col, static_cast<int>(min_col));
-
-         LOG_FMT(LINDLINED, "%s(%d): set column of ", __func__, __LINE__);
-
-         if (chunk_is_token(pc, CT_NEWLINE))
-         {
-            LOG_FMT(LINDLINED, "<Newline>");
-         }
-         else
-         {
-            LOG_FMT(LINDLINED, "'%s'", pc->text());
-         }
-         LOG_FMT(LINDLINED, " to %zu (orig %zu)\n", pc->column, pc->orig_col);
-      }
-   } while (  pc != nullptr
-           && pc->nl_count == 0);
-} // reindent_line
-
-
-static size_t token_indent(c_token_t type)
-{
-   switch (type)
-   {
-   case CT_IF:
-   case CT_DO:
-      return(3);
-
-   case CT_FOR:
-   case CT_ELSE:  // wacky, but that's what is wanted
-      return(4);
-
-   case CT_WHILE:
-   case CT_USING_STMT:
-      return(6);
-
-   case CT_SWITCH:
-      return(7);
-
-   case CT_ELSEIF:
-      return(8);
-
-   case CT_SYNCHRONIZED:
-      return(13);
-
-   default:
-      return(0);
-   }
-}
-
-
-#define indent_column_set(X)                                                                 \
-   do {                                                                                      \
-      LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, indent_column changed from %zu to %zu\n", \
-              __func__, __LINE__, pc->orig_line, indent_column, (size_t)X);                  \
-      indent_column = (X);                                                                   \
-   } while (false)
-
-
-static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos)
-{
-   log_rule_B("indent_continue");
-   const int ic = options::indent_continue();
-
-   if (  ic < 0
-      && frm.at(pse_tos).indent_cont)
-   {
-      return(frm.at(pse_tos).indent);
-   }
-   return(frm.at(pse_tos).indent + abs(ic));
-}
-
-
-static size_t calc_indent_continue(const ParseFrame &frm)
-{
-   return(calc_indent_continue(frm, frm.size() - 1));
-}
-
-
-static chunk_t *candidate_chunk_first_on_line(chunk_t *pc)
-{
-   chunk_t *first = chunk_first_on_line(pc);
-
-   log_rule_B("indent_inside_ternary_operator");
-
-   if (  options::indent_inside_ternary_operator()
-      && (  chunk_is_token(first, CT_QUESTION)
-         || chunk_is_token(first, CT_COND_COLON)))
-   {
-      return(chunk_get_next_ncnnl(first));
-   }
-   else
-   {
-      return(first);
-   }
-}
-
-
-static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
-                                    bool from_caret, bool from_colon,
-                                    bool from_keyword)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *tmp = chunk_get_prev_nc(pc);
-
-   if (from_brace)
-   {
-      return(pc);
-   }
-
-   // Skip to open paren in ':^TYPE *(ARGS) {'
-   if (chunk_is_paren_close(tmp))
-   {
-      tmp = chunk_get_prev_nc(chunk_skip_to_match_rev(tmp));
-   }
-
-   // // Check for star in ':^TYPE *(ARGS) {'. Issue 2477
-   if (chunk_is_token(tmp, CT_PTR_TYPE))
-   {
-      tmp = chunk_get_prev_nc(tmp);
-   }
-
-   // Check for type in ':^TYPE *(ARGS) {'. Issue 2482
-   if (chunk_is_token(tmp, CT_TYPE))
-   {
-      tmp = chunk_get_prev_nc(tmp);
-   }
-   // Check for caret in ':^TYPE *(ARGS) {'
-   // Store the caret position
-   chunk_t *caret_tmp = nullptr;
-
-   if (  tmp != nullptr
-      && tmp->type == CT_OC_BLOCK_CARET)
-   {
-      caret_tmp = tmp;
-   }
-   else
-   {
-      caret_tmp = chunk_get_prev_type(tmp, CT_OC_BLOCK_CARET, -1);
-      tmp       = caret_tmp;
-   }
-
-   // If we still cannot find caret then return first chunk on the line
-   if (  tmp == nullptr
-      || tmp->type != CT_OC_BLOCK_CARET)
-   {
-      return(candidate_chunk_first_on_line(pc));
-   }
-
-   if (from_caret)
-   {
-      return(tmp);
-   }
-   tmp = chunk_get_prev_nc(tmp);
-
-   // Check for colon in ':^TYPE *(ARGS) {'
-   if (from_colon)
-   {
-      if (  tmp == nullptr
-         || tmp->type != CT_OC_COLON)
-      {
-         return(candidate_chunk_first_on_line(pc));
-      }
-      else
-      {
-         return(tmp);
-      }
-   }
-   tmp = chunk_get_prev_nc(tmp);
-
-   if (from_keyword)
-   {
-      if (  tmp == nullptr
-         || (  tmp->type != CT_OC_MSG_NAME
-            && tmp->type != CT_OC_MSG_FUNC))
-      {
-         return(candidate_chunk_first_on_line(pc));
-      }
-      else
-      {
-         return(tmp);
-      }
-   }
-   // In almost all the cases, its better to return the first chunk on the line than not indenting at all.
-   tmp = candidate_chunk_first_on_line(pc);
-   return(tmp);
-} // oc_msg_block_indent
-
-
-#define log_indent()                          \
-   do { _log_indent(__func__, __LINE__, frm); \
-   } while (false)
-
-
-static void _log_indent(const char *func, const uint32_t line, const ParseFrame &frm)
-{
-   LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, ...indent is %zu\n",
-           func, line, frm.size() - 1, frm.top().indent);
-}
-
-
-#define log_prev_indent()                          \
-   do { _log_prev_indent(__func__, __LINE__, frm); \
-   } while (false)
-
-
-static void _log_prev_indent(const char *func, const uint32_t line, const ParseFrame &frm)
-{
-   LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, prev....indent is %zu\n",
-           func, line, frm.size() - 1, frm.prev().indent);
-}
-
-
-#define log_indent_tmp()                          \
-   do { _log_indent_tmp(__func__, __LINE__, frm); \
-   } while (false)
-
-
-static void _log_indent_tmp(const char *func, const uint32_t line, const ParseFrame &frm)
-{
-   LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, ...indent_tmp is %zu\n",
-           func, line, frm.size() - 1, frm.top().indent_tmp);
-}
-
-
-static void quick_indent_again(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (pc->indent.ref == nullptr)
-      {
-         continue;
-      }
-      chunk_t *tmp = chunk_get_prev(pc);
-
-      if (!chunk_is_newline(tmp))
-      {
-         continue;
-      }
-      const size_t col = pc->indent.ref->column + pc->indent.delta;
-      indent_to_column(pc, col);
-
-      LOG_FMT(LINDENTAG, "%s(%d): [%zu] indent [%s] to %zu based on [%s] @ %zu:%zu\n",
-              __func__, __LINE__, pc->orig_line, pc->text(), col,
-              pc->indent.ref->text(), pc->indent.ref->orig_line,
-              pc->indent.ref->column);
-   }
-}
-
-
-void indent_text(void)
-{
-   LOG_FUNC_ENTRY();
-   bool   did_newline = true;
-   size_t vardefcol   = 0;
-
-   log_rule_B("indent_columns");
-   const size_t indent_size   = options::indent_columns();
-   size_t       indent_column = 0;
-   int          xml_indent    = 0;
-   size_t       sql_col       = 0;
-   size_t       sql_orig_col  = 0;
-   bool         in_func_def   = false;
-
-
-   std::vector<ParseFrame> frames;
-   ParseFrame              frm{};
-
-
-   chunk_t *pc        = chunk_get_head();
-   bool    classFound = false;                               // Issue #672
-
-   while (pc != nullptr)
-   {
-      //  forces string literal to column-1 [Fix for 1246]
-      log_rule_B("indent_col1_multi_string_literal");
-
-      if (  (pc->type == CT_STRING_MULTI)
-         && !(cpd.lang_flags & LANG_OC)                      // Issue #1795
-         && options::indent_col1_multi_string_literal())
-      {
-         string str = pc->text();
-
-         if (  (str[0] == '@')
-            && (chunk_get_prev(pc)->type == CT_NEWLINE))
-         {
-            indent_column_set(1);
-            reindent_line(pc, indent_column);
-            pc          = chunk_get_next(pc);
-            did_newline = false;
-         }
-      }
-
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, <Newline>\n",
-                 __func__, __LINE__, pc->orig_line);
-      }
-      else if (chunk_is_token(pc, CT_NL_CONT))
-      {
-         LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, CT_NL_CONT\n",
-                 __func__, __LINE__, pc->orig_line);
-      }
-      else
-      {
-         char copy[1000];
-         LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, for '%s'\n   ",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->elided_text(copy));
-         log_pcf_flags(LINDLINE, pc->flags);
-      }
-      log_rule_B("use_options_overriding_for_qt_macros");
-
-      if (  options::use_options_overriding_for_qt_macros()
-         && (  strcmp(pc->text(), "SIGNAL") == 0
-            || strcmp(pc->text(), "SLOT") == 0))
-      {
-         LOG_FMT(LINDLINE, "%s(%d): orig_line=%zu: type %s SIGNAL/SLOT found\n",
-                 __func__, __LINE__, pc->orig_line, get_token_name(pc->type));
-      }
-      // Handle preprocessor transitions
-      log_rule_B("indent_brace_parent");
-      const size_t parent_token_indent = (options::indent_brace_parent())
-                                         ? token_indent(get_chunk_parent_type(pc)) : 0;
-
-      // Handle "force indentation of function definition to start in column 1"
-      log_rule_B("indent_func_def_force_col1");
-
-      if (options::indent_func_def_force_col1())
-      {
-         if (!in_func_def)
-         {
-            chunk_t *next = chunk_get_next_ncnnl(pc);
-
-            if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-               || (  chunk_is_token(pc, CT_COMMENT)
-                  && next != nullptr
-                  && get_chunk_parent_type(next) == CT_FUNC_DEF))
-            {
-               in_func_def = true;
-               frm.push(pc, __func__, __LINE__);
-               frm.top().indent_tmp = 1;
-               frm.top().indent     = 1;
-               frm.top().indent_tab = 1;
-            }
-         }
-         else
-         {
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-               && get_chunk_parent_type(prev) == CT_FUNC_DEF)
-            {
-               in_func_def = false;
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-         }
-      }
-      // Clean up after a #define, etc
-      const bool in_preproc = pc->flags.test(PCF_IN_PREPROC);
-
-      if (!in_preproc)
-      {
-         while (  !frm.empty()
-               && frm.top().in_preproc)
-         {
-            const c_token_t type = frm.top().type;
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-
-            /*
-             * If we just removed an #endregion, then check to see if a
-             * PP_REGION_INDENT entry is right below it
-             */
-            if (  type == CT_PP_ENDREGION
-               && frm.top().type == CT_PP_REGION_INDENT)
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_PREPROC)) // #
-      {
-         // Close out PP_IF_INDENT before playing with the parse frames
-         if (  frm.top().type == CT_PP_IF_INDENT
-            && (  get_chunk_parent_type(pc) == CT_PP_ENDIF
-               || get_chunk_parent_type(pc) == CT_PP_ELSE))
-         {
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-         }
-         ParseFrame frmbkup = frm;
-         fl_check(frames, frm, cpd.pp_level, pc);
-
-         // Indent the body of a #region here
-         log_rule_B("pp_region_indent_code");
-
-         if (  options::pp_region_indent_code()
-            && get_chunk_parent_type(pc) == CT_PP_REGION)
-         {
-            chunk_t *next = chunk_get_next(pc);
-
-            if (next == nullptr)
-            {
-               break;
-            }
-            // Hack to get the logs to look right
-            set_chunk_type(next, CT_PP_REGION_INDENT);
-            frm.push(next, __func__, __LINE__);
-            set_chunk_type(next, CT_PP_REGION);
-
-            // Indent one level
-            frm.top().indent = frm.prev().indent + indent_size;
-            log_indent();
-
-            frm.top().indent_tab = frm.prev().indent_tab + indent_size;
-            frm.top().indent_tmp = frm.top().indent;
-            frm.top().in_preproc = false;
-            log_indent_tmp();
-         }
-         // If option set, remove indent inside switch statement
-         log_rule_B("indent_switch_pp");
-
-         if (  frm.top().type == CT_CASE
-            && !options::indent_switch_pp())
-         {
-            frm.push(pc, __func__, __LINE__);
-            LOG_FMT(LINDPC, "%s(%d): frm.top().indent is %zu, indent_size is %zu\n",
-                    __func__, __LINE__, frm.top().indent, indent_size);
-
-            if (frm.top().indent >= indent_size)
-            {
-               frm.prev().indent = frm.top().indent - indent_size;
-            }
-            log_prev_indent();
-         }
-         // Indent the body of a #if here
-         log_rule_B("pp_if_indent_code");
-
-         if (  options::pp_if_indent_code()
-            && (  get_chunk_parent_type(pc) == CT_PP_IF
-               || get_chunk_parent_type(pc) == CT_PP_ELSE))
-         {
-            chunk_t *next = chunk_get_next(pc);
-
-            if (next == nullptr)
-            {
-               break;
-            }
-            int     should_indent_preproc = true;
-            chunk_t *preproc_next         = chunk_get_next_nl(pc);
-            preproc_next = chunk_get_next_nblank(preproc_next);
-
-            /* Look ahead at what's on the line after the #if */
-            log_rule_B("pp_indent_brace");
-            log_rule_B("pp_indent_func_def");
-            log_rule_B("pp_indent_case");
-            log_rule_B("pp_indent_extern");
-
-            while (  preproc_next != nullptr
-                  && preproc_next->type != CT_NEWLINE)
-            {
-               if (  (  (  (chunk_is_token(preproc_next, CT_BRACE_OPEN))
-                        || (chunk_is_token(preproc_next, CT_BRACE_CLOSE)))
-                     && !options::pp_indent_brace())
-                  || (  chunk_is_token(preproc_next, CT_FUNC_DEF)
-                     && !options::pp_indent_func_def())
-                  || (  chunk_is_token(preproc_next, CT_CASE)
-                     && !options::pp_indent_case())
-                  || (  chunk_is_token(preproc_next, CT_EXTERN)
-                     && !options::pp_indent_extern()))
-               {
-                  should_indent_preproc = false;
-                  break;
-               }
-               preproc_next = chunk_get_next(preproc_next);
-            }
-
-            if (should_indent_preproc)
-            {
-               // Hack to get the logs to look right
-
-               const c_token_t memtype = next->type;
-               set_chunk_type(next, CT_PP_IF_INDENT);
-               frm.push(next, __func__, __LINE__);
-               set_chunk_type(next, memtype);
-
-               // Indent one level except if the #if is a #include guard
-               size_t extra = (  pc->pp_level == 0
-                              && ifdef_over_whole_file())
-                              ? 0 : indent_size;
-
-               frm.top().indent = frm.prev().indent + extra;
-               log_indent();
-
-               frm.top().indent_tab = frm.prev().indent_tab + extra;
-               frm.top().indent_tmp = frm.top().indent;
-               frm.top().in_preproc = false;
-               log_indent_tmp();
-            }
-         }
-         log_rule_B("indent_member_single");
-
-         if (options::indent_member_single())
-         {
-            if (get_chunk_parent_type(pc) == CT_PP_IF)
-            {
-               // do nothing
-            }
-            else if (get_chunk_parent_type(pc) == CT_PP_ELSE)
-            {
-               if (  frm.top().type == CT_MEMBER
-                  && frm.top().pop_pc
-                  && frm.top().pc != frmbkup.top().pc)
-               {
-                  chunk_t *tmp = chunk_get_next_ncnnlnp(pc);
-
-                  if (tmp != nullptr)
-                  {
-                     if (  chunk_is_token(tmp, CT_WORD)
-                        || chunk_is_token(tmp, CT_TYPE))
-                     {
-                        tmp = chunk_get_next_ncnnlnp(pc);
-                     }
-                     else if (  chunk_is_token(tmp, CT_FUNC_CALL)
-                             || chunk_is_token(tmp, CT_FPAREN_OPEN))
-                     {
-                        tmp = chunk_get_next_type(tmp, CT_FPAREN_CLOSE, tmp->level);
-
-                        if (tmp != nullptr)
-                        {
-                           tmp = chunk_get_next_ncnnlnp(pc);
-                        }
-                     }
-
-                     if (tmp != nullptr)
-                     {
-                        frm.top().pop_pc = tmp;
-                     }
-                  }
-               }
-            }
-            else if (get_chunk_parent_type(pc) == CT_PP_ENDIF)
-            {
-               if (  frmbkup.top().type == CT_MEMBER
-                  && frm.top().type == CT_MEMBER)
-               {
-                  frm.top().pop_pc = frmbkup.top().pop_pc;
-               }
-            }
-         }
-         // Transition into a preproc by creating a dummy indent
-         chunk_t *pp_next = chunk_get_next(pc);
-
-         if (pp_next == nullptr)
-         {
-            return;
-         }
-         frm.push(pp_next, __func__, __LINE__);
-
-         if (  get_chunk_parent_type(pc) == CT_PP_DEFINE
-            || get_chunk_parent_type(pc) == CT_PP_UNDEF)
-         {
-            log_rule_B("pp_define_at_level");
-            frm.top().indent_tmp = options::pp_define_at_level()
-                                   ? frm.prev().indent_tmp : 1;
-            frm.top().indent = frm.top().indent_tmp + indent_size;
-            log_indent();
-
-            frm.top().indent_tab = frm.top().indent;
-            log_indent_tmp();
-         }
-         else if (  get_chunk_parent_type(pc) == CT_PP_PRAGMA
-                 && options::pp_define_at_level())
-         {
-            log_rule_B("pp_define_at_level");
-            frm.top().indent_tmp = frm.prev().indent_tmp;
-            frm.top().indent     = frm.top().indent_tmp + indent_size;
-            log_indent();
-
-            frm.top().indent_tab = frm.top().indent;
-            log_indent_tmp();
-         }
-         else
-         {
-            if (  (frm.prev().type == CT_PP_REGION_INDENT)
-               || (  (frm.prev().type == CT_PP_IF_INDENT)
-                  && (frm.top().type != CT_PP_ENDIF)))
-            {
-               frm.top().indent = frm.prev(2).indent;
-               log_indent();
-            }
-            else
-            {
-               frm.top().indent = frm.prev().indent;
-               log_indent();
-            }
-            log_indent();
-
-
-            auto val = 0;
-
-            if (  get_chunk_parent_type(pc) == CT_PP_REGION
-               || get_chunk_parent_type(pc) == CT_PP_ENDREGION)
-            {
-               log_rule_B("pp_indent_region");
-               val = options::pp_indent_region();
-               log_indent();
-            }
-            else if (  get_chunk_parent_type(pc) == CT_PP_IF
-                    || get_chunk_parent_type(pc) == CT_PP_ELSE
-                    || get_chunk_parent_type(pc) == CT_PP_ENDIF)
-            {
-               log_rule_B("pp_indent_if");
-               val = options::pp_indent_if();
-               log_indent();
-            }
-
-            if (val != 0)
-            {
-               auto &indent = frm.top().indent;
-
-               indent = (val > 0) ? val                     // reassign if positive val,
-                        : (cast_abs(indent, val) < indent)  // else if no underflow
-                        ? (indent + val) : 0;               // reduce, else 0
-            }
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-         }
-      }
-      // Check for close XML tags "</..."
-      log_rule_B("indent_xml_string");
-
-      if (options::indent_xml_string() > 0)
-      {
-         if (chunk_is_token(pc, CT_STRING))
-         {
-            if (  pc->len() > 4
-               && xml_indent > 0
-               && pc->str[1] == '<'
-               && pc->str[2] == '/')
-            {
-               log_rule_B("indent_xml_string");
-               xml_indent -= options::indent_xml_string();
-            }
-         }
-         else if (  !chunk_is_comment(pc)
-                 && !chunk_is_newline(pc))
-         {
-            xml_indent = 0;
-         }
-      }
-      // Handle non-brace closures
-      log_indent_tmp();
-
-      bool   token_used = false;
-      size_t old_frm_size;
-
-      do
-      {
-         old_frm_size = frm.size();
-
-         // End anything that drops a level
-         if (  !chunk_is_newline(pc)
-            && !chunk_is_comment(pc)
-            && frm.top().level > pc->level)
-         {
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-         }
-
-         if (frm.top().level >= pc->level)
-         {
-            // process virtual braces closes (no text output)
-            if (  chunk_is_token(pc, CT_VBRACE_CLOSE)
-               && frm.top().type == CT_VBRACE_OPEN)
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-               pc = chunk_get_next(pc);
-
-               if (pc == nullptr)
-               {
-                  // need to break out of both the do and while loops
-                  goto null_pc;
-               }
-            }
-
-            if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-               && get_chunk_parent_type(pc) == CT_ENUM)
-            {
-               chunk_t *prev_ncnl = chunk_get_prev_ncnnl(pc);
-               LOG_FMT(LINDLINE, "%s(%d): prev_ncnl is '%s', prev_ncnl->orig_line is %zu, prev_ncnl->orig_col is %zu\n",
-                       __func__, __LINE__, prev_ncnl->text(), prev_ncnl->orig_line, prev_ncnl->orig_col);
-
-               if (chunk_is_token(prev_ncnl, CT_COMMA))
-               {
-                  LOG_FMT(LINDLINE, "%s(%d): prev_ncnl is comma\n", __func__, __LINE__);
-               }
-               else
-               {
-                  LOG_FMT(LINDLINE, "%s(%d): prev_ncnl is NOT comma\n", __func__, __LINE__);
-               }
-            }
-
-            // End any assign operations with a semicolon on the same level
-            if (is_end_of_assignment(pc, frm))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-            // Pop Colon from stack in ternary operator
-            // a
-            // ? b
-            // : e/*top*/;/*pc*/
-            log_rule_B("indent_inside_ternary_operator");
-
-            if (  options::indent_inside_ternary_operator()
-               && (frm.top().type == CT_COND_COLON)
-               && (  chunk_is_semicolon(pc)
-                  || chunk_is_token(pc, CT_COMMA)
-                  || chunk_is_token(pc, CT_OC_MSG_NAME)
-                  || chunk_is_token(pc, CT_SPAREN_CLOSE))) // Issue #1130, #1715
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // End any assign operations with a semicolon on the same level
-            if (  chunk_is_semicolon(pc)
-               && (  (frm.top().type == CT_IMPORT)
-                  || (frm.top().type == CT_USING)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // End any custom macro-based open/closes
-            if (  !token_used
-               && (frm.top().type == CT_MACRO_OPEN)
-               && chunk_is_token(pc, CT_MACRO_CLOSE))
-            {
-               token_used = true;
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // End any CPP/ObjC class colon stuff
-            if (  (  (frm.top().type == CT_CLASS_COLON)
-                  || (frm.top().type == CT_CONSTR_COLON))
-               && (  chunk_is_token(pc, CT_BRACE_OPEN)
-                  || chunk_is_token(pc, CT_OC_END)
-                  || chunk_is_token(pc, CT_OC_SCOPE)
-                  || chunk_is_token(pc, CT_OC_PROPERTY)
-                  || chunk_is_token(pc, CT_TYPEDEF) // Issue #2675
-                  || chunk_is_token(pc, CT_MACRO_OPEN)
-                  || chunk_is_token(pc, CT_MACRO_CLOSE)
-                  || (  language_is_set(LANG_OC)
-                     && chunk_is_comment(pc)
-                     && get_chunk_parent_type(pc) == CT_COMMENT_WHOLE) // Issue #2675
-                  || chunk_is_semicolon(pc)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // End ObjC class colon stuff inside of generic definition (like Test<T1: id<T3>>)
-            if (  (frm.top().type == CT_CLASS_COLON)
-               && chunk_is_token(pc, CT_ANGLE_CLOSE)
-               && get_chunk_parent_type(pc) == CT_OC_GENERIC_SPEC)
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // End Objc nested message and boxed array
-            // TODO: ideally formatting would know which opens occurred on a line and group closes in the same manor
-            if (  language_is_set(LANG_OC)
-               && chunk_is_token(pc, CT_SQUARE_CLOSE)
-               && get_chunk_parent_type(pc) == CT_OC_AT
-               && frm.top().level >= pc->level)
-            {
-               size_t  count = 1;
-               chunk_t *next = chunk_get_next_nc(pc);
-
-               while (  next != nullptr
-                     && (  (  chunk_is_token(next, CT_BRACE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_MSG)))
-               {
-                  count++;
-                  next = chunk_get_next_nc(next);
-               }
-               count = std::min(count, frm.size());
-
-               if (count > 0)
-               {
-                  while (count-- > 0)
-                  {
-                     if (frm.top().type == CT_SQUARE_OPEN)
-                     {
-                        if (frm.paren_count == 0)
-                        {
-                           fprintf(stderr, "%s(%d): frm.paren_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                                   __func__, __LINE__, pc->orig_line, pc->orig_col);
-                           log_flush(true);
-                           exit(EX_SOFTWARE);
-                        }
-                        frm.paren_count--;
-                     }
-                     LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                             __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-                     frm.pop(__func__, __LINE__);
-                  }
-
-                  if (next)
-                  {
-                     // End any assign operations with a semicolon on the same level
-                     if (is_end_of_assignment(next, frm))
-                     {
-                        LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-                        frm.pop(__func__, __LINE__);
-                     }
-                  }
-                  // Indent the brace to match outer most brace/square
-                  indent_column_set(frm.top().indent_tmp);
-                  continue;
-               }
-            }
-
-            // a case is ended with another case or a close brace
-            if (  (frm.top().type == CT_CASE)
-               && (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                  || chunk_is_token(pc, CT_CASE)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            if (  (frm.top().type == CT_MEMBER)
-               && frm.top().pop_pc == pc)
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            if (  (frm.top().type == CT_LAMBDA)
-               && (  chunk_is_token(pc, CT_SEMICOLON)
-                  || chunk_is_token(pc, CT_COMMA)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-            // a class scope is ended with another class scope or a close brace
-            log_rule_B("indent_access_spec_body");
-
-            if (  options::indent_access_spec_body()
-               && (frm.top().type == CT_ACCESS)
-               && (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                  || chunk_is_token(pc, CT_ACCESS)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // return & throw are ended with a semicolon
-            if (  chunk_is_semicolon(pc)
-               && (  (frm.top().type == CT_RETURN)
-                  || (frm.top().type == CT_THROW)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // an OC SCOPE ('-' or '+') ends with a semicolon or brace open
-            if (  (frm.top().type == CT_OC_SCOPE)
-               && (  chunk_is_semicolon(pc)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            /*
-             * a typedef and an OC SCOPE ('-' or '+') ends with a semicolon or
-             * brace open
-             */
-            if (  (frm.top().type == CT_TYPEDEF)
-               && (  chunk_is_semicolon(pc)
-                  || chunk_is_paren_open(pc)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // an SQL EXEC is ended with a semicolon
-            if (  (frm.top().type == CT_SQL_EXEC)
-               && chunk_is_semicolon(pc))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // an CLASS is ended with a semicolon or brace open
-            if (  (frm.top().type == CT_CLASS)
-               && (  chunk_is_token(pc, CT_CLASS_COLON)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)
-                  || chunk_is_semicolon(pc)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-            log_rule_B("indent_oc_inside_msg_sel");
-
-            // Pop OC msg selector stack
-            if (  options::indent_oc_inside_msg_sel()
-               && (frm.top().type != CT_SQUARE_OPEN)
-               && frm.top().level >= pc->level
-               && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
-                  || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-
-            // Close out parenthesis and squares
-            if (  (frm.top().type == (pc->type - 1))
-               && (  chunk_is_token(pc, CT_PAREN_CLOSE)
-                  || chunk_is_token(pc, CT_LPAREN_CLOSE)                     // Issue #3054
-                  || chunk_is_token(pc, CT_SPAREN_CLOSE)
-                  || chunk_is_token(pc, CT_FPAREN_CLOSE)
-                  || chunk_is_token(pc, CT_SQUARE_CLOSE)
-                  || chunk_is_token(pc, CT_ANGLE_CLOSE)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-
-               if (frm.paren_count == 0)
-               {
-                  fprintf(stderr, "%s(%d): frm.paren_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
-               frm.paren_count--;
-            }
-         }
-      } while (old_frm_size > frm.size());
-
-      // Grab a copy of the current indent
-      indent_column_set(frm.top().indent_tmp);
-      log_indent_tmp();
-
-      log_rule_B("indent_single_newlines");
-
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         && options::indent_single_newlines())
-      {
-         pc->nl_column = indent_column;
-      }
-
-      if (  !chunk_is_newline(pc)
-         && !chunk_is_comment(pc)
-         && log_sev_on(LINDPC))
-      {
-         LOG_FMT(LINDPC, "%s(%d):\n", __func__, __LINE__);
-         LOG_FMT(LINDPC, "   -=[ pc->orig_line is %zu, orig_col is %zu, text() is '%s' ]=-, frm.size() is %zu\n",
-                 pc->orig_line, pc->orig_col, pc->text(), frm.size());
-
-         for (size_t ttidx = frm.size() - 1; ttidx > 0; ttidx--)
-         {
-            LOG_FMT(LINDPC, "     [%zu %zu:%zu '%s' %s/%s tmp=%zu indent=%zu brace_indent=%zu indent_tab=%zu indent_cont=%d level=%zu pc->brace_level=%zu]\n",
-                    ttidx,
-                    frm.at(ttidx).pc->orig_line,
-                    frm.at(ttidx).pc->orig_col,
-                    frm.at(ttidx).pc->text(),
-                    get_token_name(frm.at(ttidx).type),
-                    get_token_name(frm.at(ttidx).pc->parent_type),
-                    frm.at(ttidx).indent_tmp,
-                    frm.at(ttidx).indent,
-                    frm.at(ttidx).brace_indent,
-                    frm.at(ttidx).indent_tab,
-                    frm.at(ttidx).indent_cont,
-                    frm.at(ttidx).level,
-                    frm.at(ttidx).pc->brace_level);
-         }
-      }
-      char copy[1000];
-      LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->elided_text(copy));
-
-      // Issue #672
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && classFound)
-      {
-         LOG_FMT(LINDENT, "%s(%d): CT_BRACE_OPEN found, CLOSE IT\n",
-                 __func__, __LINE__);
-         LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         frm.pop(__func__, __LINE__);
-         frm.top().indent_tmp = 1;
-         frm.top().indent     = 1;
-         frm.top().indent_tab = 1;
-         log_indent();
-         classFound = false;
-      }
-      /*
-       * Handle stuff that can affect the current indent:
-       *  - brace close
-       *  - vbrace open
-       *  - brace open
-       *  - case         (immediate)
-       *  - labels       (immediate)
-       *  - class colons (immediate)
-       *
-       * And some stuff that can't
-       *  - open paren
-       *  - open square
-       *  - assignment
-       *  - return
-       */
-      log_rule_B("indent_braces");
-      log_rule_B("indent_braces_no_func");
-      log_rule_B("indent_braces_no_class");
-      log_rule_B("indent_braces_no_struct");
-      const bool brace_indent = (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                                   || chunk_is_token(pc, CT_BRACE_OPEN))
-                                && options::indent_braces()
-                                && (  !options::indent_braces_no_func()
-                                   || get_chunk_parent_type(pc) != CT_FUNC_DEF)
-                                && (  !options::indent_braces_no_func()
-                                   || get_chunk_parent_type(pc) != CT_FUNC_CLASS_DEF)
-                                && (  !options::indent_braces_no_class()
-                                   || get_chunk_parent_type(pc) != CT_CLASS)
-                                && (  !options::indent_braces_no_struct()
-                                   || get_chunk_parent_type(pc) != CT_STRUCT));
-
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         if (language_is_set(LANG_OC))
-         {
-            if (  frm.top().type == CT_BRACE_OPEN
-               && frm.top().level >= pc->level)
-            {
-               size_t  count = 1;
-               chunk_t *next = chunk_get_next_nc(pc);
-
-               while (  next != nullptr
-                     && (  (  chunk_is_token(next, CT_BRACE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_MSG)))
-               {
-                  count++;
-                  next = chunk_get_next_nc(next);
-               }
-               count = std::min(count, frm.size());
-
-               // End Objc nested boxed dictionary
-               // TODO: ideally formatting would know which opens occurred on a line and group closes in the same manor
-               if (  count > 0
-                  && chunk_is_token(pc, CT_BRACE_CLOSE)
-                  && get_chunk_parent_type(pc) == CT_OC_AT)
-               {
-                  if (frm.top().ip.ref)
-                  {
-                     pc->indent.ref   = frm.top().ip.ref;
-                     pc->indent.delta = 0;
-                  }
-
-                  while (count-- > 0)
-                  {
-                     LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                             __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-                     frm.pop(__func__, __LINE__);
-                  }
-
-                  if (next)
-                  {
-                     // End any assign operations with a semicolon on the same level
-                     if (is_end_of_assignment(next, frm))
-                     {
-                        LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-                        frm.pop(__func__, __LINE__);
-                     }
-                  }
-
-                  // Indent the brace to match outer most brace/square
-                  if (frm.top().indent_cont)
-                  {
-                     indent_column_set(frm.top().indent_tmp - indent_size);
-                  }
-                  else
-                  {
-                     indent_column_set(frm.top().indent_tmp);
-                  }
-               }
-               else
-               {
-                  // Indent the brace to match the open brace
-                  indent_column_set(frm.top().brace_indent);
-
-                  if (frm.top().ip.ref)
-                  {
-                     pc->indent.ref   = frm.top().ip.ref;
-                     pc->indent.delta = 0;
-                  }
-                  LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-                  frm.pop(__func__, __LINE__);
-               }
-            }
-         }
-         else
-         {
-            // Indent the brace to match the open brace
-            indent_column_set(frm.top().brace_indent);
-
-            if (frm.top().ip.ref)
-            {
-               pc->indent.ref   = frm.top().ip.ref;
-               pc->indent.delta = 0;
-            }
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-         }
-      }
-      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
-      {
-         frm.push(pc, __func__, __LINE__);
-
-         log_rule_B("indent_min_vbrace_open");
-         size_t iMinIndent = options::indent_min_vbrace_open();
-
-         if (indent_size > iMinIndent)
-         {
-            iMinIndent = indent_size;
-         }
-         size_t iNewIndent = frm.prev().indent + iMinIndent;
-
-         log_rule_B("indent_vbrace_open_on_tabstop");
-
-         if (options::indent_vbrace_open_on_tabstop())
-         {
-            iNewIndent = next_tab_column(iNewIndent);
-         }
-         frm.top().indent = iNewIndent;
-         log_indent();
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
-         log_indent_tmp();
-
-         // Always indent on virtual braces
-         indent_column_set(frm.top().indent_tmp);
-      }
-      else if (  chunk_is_token(pc, CT_BRACE_OPEN)
-              && (  pc->next != nullptr
-                 && pc->next->type != CT_NAMESPACE))
-      {
-         LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         frm.push(pc, __func__, __LINE__);
-
-         log_rule_B("indent_macro_brace");
-
-         if (  !options::indent_macro_brace()
-            && frm.prev().type == CT_PP_DEFINE
-            && frm.prev().open_line == frm.top().open_line)
-         {
-            LOG_FMT(LINDENT2, "%s(%d): indent_macro_brace\n", __func__, __LINE__);
-         }
-         else if (  options::indent_cpp_lambda_body()
-                 && get_chunk_parent_type(pc) == CT_CPP_LAMBDA)
-         {
-            log_rule_B("indent_cpp_lambda_body");
-            frm.top().brace_indent = frm.prev().indent;
-
-            chunk_t *head     = chunk_get_prev_ncnnlnp(frm.top().pc);
-            chunk_t *tail     = nullptr;
-            bool    enclosure = frm.prev().pc != chunk_skip_to_match(frm.prev().pc);
-            bool    linematch = true;
-
-            for (auto it = frm.rbegin(); it != frm.rend() && tail == nullptr; ++it)
-            {
-               if (it->pc && it->pc != frm.top().pc)
-               {
-                  linematch &= are_chunks_in_same_line(it->pc, head);
-               }
-               chunk_t *match = chunk_skip_to_match(it->pc);
-
-               if (match == nullptr)
-               {
-                  continue;
-               }
-               chunk_t *target = chunk_get_next_ncnnlnp(match);
-
-               while (tail == nullptr && target != nullptr)
-               {
-                  if (chunk_is_semicolon(target) && target->level == match->level)
-                  {
-                     tail = target;
-                  }
-                  else if (target->level < match->level)
-                  {
-                     break;
-                  }
-                  else
-                  {
-                     target = chunk_get_next_ncnnlnp(target);
-                  }
-               }
-            }
-
-            bool toplevel = true;
-
-            for (auto it = frm.rbegin(); it != frm.rend() && tail != nullptr; ++it)
-            {
-               if (!chunk_is_token(it->pc, CT_FPAREN_OPEN))
-               {
-                  continue;
-               }
-
-               if (it->pc->level < tail->level)
-               {
-                  toplevel = false;
-                  break;
-               }
-            }
-
-            // A few things to check:
-            // 1. The matching brace is on the same line as the ending semicolon
-            // 2a. If it's an assignment, check that both sides of the assignment operator are on the same line
-            // 2b. If it's inside some closure, check that all the frames are on the same line, and it is in the top level closure
-            if (  options::align_assign_span() == 0 && are_chunks_in_same_line(chunk_skip_to_match(frm.top().pc), tail)
-               && (  (  !enclosure && are_chunks_in_same_line(chunk_get_prev_ncnnlnp(frm.prev().pc), frm.prev().pc)
-                     && are_chunks_in_same_line(frm.prev().pc, chunk_get_next_ncnnlnp(frm.prev().pc)))
-                  || (enclosure && linematch && toplevel)))
-            {
-               frm.top().brace_indent -= indent_size;
-            }
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
-            log_indent();
-
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-
-            frm.prev().indent_tmp = frm.top().indent_tmp;
-            log_indent_tmp();
-         }
-         else if (  language_is_set(LANG_CPP)
-                 && options::indent_cpp_lambda_only_once()
-                 && (get_chunk_parent_type(pc) == CT_CPP_LAMBDA))
-         {
-            log_rule_B("indent_cpp_lambda_only_once");
-
-            size_t namespace_indent_to_ignore = 0;                   // Issue #1813
-            log_rule_B("indent_namespace");
-
-            if (!options::indent_namespace())
-            {
-               for (auto i = frm.rbegin(); i != frm.rend(); ++i)
-               {
-                  if (i->ns_cnt)
-                  {
-                     namespace_indent_to_ignore = i->ns_cnt;
-                     break;
-                  }
-               }
-            }
-            // Issue # 1296
-            frm.top().brace_indent = 1 + ((pc->brace_level - namespace_indent_to_ignore) * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
-            log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-
-            frm.prev().indent_tmp = frm.top().indent_tmp;
-            log_indent_tmp();
-         }
-         else if (  language_is_set(LANG_CS | LANG_JAVA)
-                 && options::indent_cs_delegate_brace()
-                 && (  get_chunk_parent_type(pc) == CT_LAMBDA
-                    || get_chunk_parent_type(pc) == CT_DELEGATE))
-         {
-            log_rule_B("indent_cs_delegate_brace");
-            frm.top().brace_indent = 1 + ((pc->brace_level + 1) * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
-            log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-
-            frm.prev().indent_tmp = frm.top().indent_tmp;
-            log_indent_tmp();
-         }
-         else if (  language_is_set(LANG_CS | LANG_JAVA)
-                 && !options::indent_cs_delegate_brace()
-                 && !options::indent_align_paren()
-                 && (  get_chunk_parent_type(pc) == CT_LAMBDA
-                    || get_chunk_parent_type(pc) == CT_DELEGATE))
-         {
-            log_rule_B("indent_cs_delegate_brace");
-            log_rule_B("indent_align_paren");
-            frm.top().brace_indent = frm.prev().indent;
-
-            // Issue # 1620, UNI-24090.cs
-            if (are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnlnp(frm.top().pc)))
-            {
-               frm.top().brace_indent -= indent_size;
-            }
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
-            log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-            frm.prev().indent_tmp = frm.top().indent_tmp;
-            log_indent_tmp();
-         }
-         else if (  !options::indent_paren_open_brace()
-                 && !language_is_set(LANG_CS)
-                 && get_chunk_parent_type(pc) == CT_CPP_LAMBDA
-                 && (  pc->flags.test(PCF_IN_FCN_DEF)
-                    || pc->flags.test(PCF_IN_FCN_CTOR)) // Issue #2152
-                 && chunk_is_newline(chunk_get_next_nc(pc)))
-         {
-            log_rule_B("indent_paren_open_brace");
-            // Issue #1165
-            LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->brace_level is %zu, for '%s', pc->level is %zu, pc(-1)->level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->brace_level, pc->text(), pc->level, frm.prev().pc->level);
-            frm.top().brace_indent = 1 + ((pc->brace_level + 1) * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = frm.prev().indent_tmp;
-            log_indent();
-
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-         }
-         // any '{' that is inside of a '(' overrides the '(' indent
-         else if (  !options::indent_paren_open_brace()
-                 && chunk_is_paren_open(frm.prev().pc)
-                 && chunk_is_newline(chunk_get_next_nc(pc)))
-         {
-            log_rule_B("indent_paren_open_brace");
-            LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->brace_level is %zu, for '%s', pc->level is %zu, pc(-1)->level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->brace_level, pc->text(), pc->level, frm.prev().pc->level);
-            // FIXME: I don't know how much of this is necessary, but it seems to work
-            frm.top().brace_indent = 1 + (pc->brace_level * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
-            log_indent();
-
-            if (  (get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR)
-               && pc->flags.test(PCF_IN_OC_MSG))
-            {
-               frm.top().indent = frm.prev().indent_tmp + indent_size;
-               log_indent();
-               frm.top().brace_indent = frm.prev().indent_tmp;
-               indent_column_set(frm.top().brace_indent);
-            }
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-
-            frm.prev().indent_tmp = frm.top().indent_tmp;
-         }
-         else if (frm.paren_count != 0)
-         {
-            if (frm.top().pc->parent_type == CT_OC_BLOCK_EXPR)
-            {
-               log_rule_B("indent_oc_block_msg");
-
-               if (  pc->flags.test(PCF_IN_OC_MSG)
-                  && options::indent_oc_block_msg())
-               {
-                  frm.top().ip.ref = oc_msg_block_indent(pc, false, false, false, true);
-                  log_rule_B("indent_oc_block_msg");
-                  frm.top().ip.delta = options::indent_oc_block_msg();
-               }
-               log_rule_B("indent_oc_block");
-               log_rule_B("indent_oc_block_msg_xcode_style");
-
-               if (  options::indent_oc_block()
-                  || options::indent_oc_block_msg_xcode_style())
-               {
-                  bool in_oc_msg = pc->flags.test(PCF_IN_OC_MSG);
-                  log_rule_B("indent_oc_block_msg_from_keyword");
-                  bool indent_from_keyword = options::indent_oc_block_msg_from_keyword()
-                                             && in_oc_msg;
-                  log_rule_B("indent_oc_block_msg_from_colon");
-                  bool indent_from_colon = options::indent_oc_block_msg_from_colon()
-                                           && in_oc_msg;
-                  log_rule_B("indent_oc_block_msg_from_caret");
-                  bool indent_from_caret = options::indent_oc_block_msg_from_caret()
-                                           && in_oc_msg;
-                  log_rule_B("indent_oc_block_msg_from_brace");
-                  bool indent_from_brace = options::indent_oc_block_msg_from_brace()
-                                           && in_oc_msg;
-
-                  /*
-                   * In "Xcode indent mode", we want to indent:
-                   *  - if the colon is aligned (namely, if a newline has been
-                   *    added before it), indent_from_brace
-                   *  - otherwise, indent from previous block (the "else" statement here)
-                   */
-                  log_rule_B("indent_oc_block_msg_xcode_style");
-
-                  if (options::indent_oc_block_msg_xcode_style())
-                  {
-                     chunk_t *bbc           = chunk_skip_to_match(pc); // block brace close '}'
-                     chunk_t *bbc_next_ncnl = chunk_get_next_ncnnl(bbc);
-
-                     if (  bbc_next_ncnl->type == CT_OC_MSG_NAME
-                        || bbc_next_ncnl->type == CT_OC_MSG_FUNC)
-                     {
-                        indent_from_brace   = false;
-                        indent_from_colon   = false;
-                        indent_from_caret   = false;
-                        indent_from_keyword = true;
-                     }
-                     else
-                     {
-                        indent_from_brace   = false;
-                        indent_from_colon   = false;
-                        indent_from_caret   = false;
-                        indent_from_keyword = false;
-                     }
-                  }
-                  chunk_t *ref = oc_msg_block_indent(pc, indent_from_brace,
-                                                     indent_from_caret,
-                                                     indent_from_colon,
-                                                     indent_from_keyword);
-
-                  if (ref)
-                  {
-                     frm.top().indent = indent_size + ref->column;
-                  }
-                  else
-                  {
-                     frm.top().indent = 1 + ((pc->brace_level + 1) * indent_size);
-                  }
-                  log_indent();
-                  indent_column_set(frm.top().indent - indent_size);
-               }
-               else
-               {
-                  frm.top().indent = frm.prev().indent_tmp + indent_size;
-                  log_indent();
-               }
-            }
-            else if (  frm.top().pc->type == CT_BRACE_OPEN
-                    && frm.top().pc->parent_type == CT_OC_AT)
-            {
-               // We are inside @{ ... } -- indent one tab from the paren
-               if (frm.prev().indent_cont)
-               {
-                  frm.top().indent = frm.prev().indent_tmp;
-               }
-               else
-               {
-                  frm.top().indent = frm.prev().indent_tmp + indent_size;
-               }
-               log_indent();
-            }
-            // Issue # 1620, UNI-24090.cs
-            else if (  are_chunks_in_same_line(frm.prev().pc, frm.top().pc)
-                    && !options::indent_align_paren()
-                    && chunk_is_paren_open(frm.prev().pc)
-                    && !pc->flags.test(PCF_ONE_LINER))
-            {
-               log_rule_B("indent_align_paren");
-               // We are inside ({ ... }) -- where { and ( are on the same line, avoiding double indentations.
-               frm.top().brace_indent = frm.prev().indent - indent_size;
-               indent_column_set(frm.top().brace_indent);
-               frm.top().indent = frm.prev().indent_tmp;
-               log_indent();
-            }
-            else if (  are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnlnp(frm.top().pc))
-                    && !options::indent_align_paren()
-                    && chunk_is_paren_open(frm.prev().pc)
-                    && !pc->flags.test(PCF_ONE_LINER))
-            {
-               log_rule_B("indent_align_paren");
-               // We are inside ({ ... }) -- where { and ( are on adjacent lines, avoiding indentation of brace.
-               frm.top().brace_indent = frm.prev().indent - indent_size;
-               indent_column_set(frm.top().brace_indent);
-               frm.top().indent = frm.prev().indent_tmp;
-               log_indent();
-            }
-            else if (  options::indent_oc_inside_msg_sel()
-                    && (  frm.prev().type == CT_OC_MSG_FUNC
-                       || frm.prev().type == CT_OC_MSG_NAME)) // Issue #2658
-            {
-               log_rule_B("indent_oc_inside_msg_sel");
-               // [Class Message:{<here>
-               frm.top().indent = frm.prev().pc->column + indent_size;
-               log_indent();
-               indent_column_set(frm.prev().pc->column);
-            }
-            else
-            {
-               // We are inside ({ ... }) -- indent one tab from the paren
-               frm.top().indent = frm.prev().indent_tmp + indent_size;
-
-               if (!chunk_is_paren_open(frm.prev().pc))
-               {
-                  frm.top().indent_tab = frm.top().indent;
-               }
-               log_indent();
-            }
-         }
-         else if (  frm.top().pc->type == CT_BRACE_OPEN
-                 && frm.top().pc->parent_type == CT_OC_AT)
-         {
-            // We are inside @{ ... } -- indent one tab from the paren
-            if (frm.prev().indent_cont)
-            {
-               frm.top().indent = frm.prev().indent_tmp;
-            }
-            else
-            {
-               frm.top().indent     = frm.prev().indent_tmp + indent_size;
-               frm.top().indent_tab = frm.top().indent;
-            }
-            log_indent();
-         }
-         else if (  (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
-                    || (  !options::indent_compound_literal_return()
-                       && get_chunk_parent_type(pc) == CT_C_CAST))
-                 && frm.prev().type == CT_RETURN)
-         {
-            log_rule_B("indent_compound_literal_return");
-
-            // we're returning either a c compound literal (CT_C_CAST) or a
-            // C++11 initialization list (CT_BRACED_INIT_LIST), use indent from the return.
-            if (frm.prev().indent_cont)
-            {
-               frm.top().indent = frm.prev().indent_tmp;
-            }
-            else
-            {
-               frm.top().indent = frm.prev().indent_tmp + indent_size;
-            }
-            log_indent();
-         }
-         else
-         {
-            // Use the prev indent level + indent_size.
-            frm.top().indent = frm.prev().indent + indent_size;
-            LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, ... indent is %zu\n",
-                    __func__, __LINE__, frm.size() - 1, frm.top().indent);
-            LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', parent_type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-                    get_token_name(get_chunk_parent_type(pc)));
-
-            // If this brace is part of a statement, bump it out by indent_brace
-            if (  get_chunk_parent_type(pc) == CT_IF
-               || get_chunk_parent_type(pc) == CT_ELSE
-               || get_chunk_parent_type(pc) == CT_ELSEIF
-               || get_chunk_parent_type(pc) == CT_TRY
-               || get_chunk_parent_type(pc) == CT_CATCH
-               || get_chunk_parent_type(pc) == CT_DO
-               || get_chunk_parent_type(pc) == CT_WHILE
-               || get_chunk_parent_type(pc) == CT_USING_STMT
-               || get_chunk_parent_type(pc) == CT_SWITCH
-               || get_chunk_parent_type(pc) == CT_SYNCHRONIZED
-               || get_chunk_parent_type(pc) == CT_FOR)
-            {
-               if (parent_token_indent != 0)
-               {
-                  frm.top().indent += parent_token_indent - indent_size;
-                  log_indent();
-               }
-               else
-               {
-                  log_rule_B("indent_brace");
-                  frm.top().indent += options::indent_brace();
-                  log_indent();
-                  indent_column_set(indent_column + options::indent_brace());
-               }
-            }
-            else if (get_chunk_parent_type(pc) == CT_CASE)
-            {
-               log_rule_B("indent_case_brace");
-               const auto tmp_indent = static_cast<int>(frm.prev().indent)
-                                       - static_cast<int>(indent_size)
-                                       + options::indent_case_brace();
-
-               /*
-                * An open brace with the parent of case does not indent by default
-                * UO_indent_case_brace can be used to indent the brace.
-                * So we need to take the CASE indent, subtract off the
-                * indent_size that was added above and then add indent_case_brace.
-                * may take negative value
-                */
-               indent_column_set(max(tmp_indent, 0));
-
-               // Stuff inside the brace still needs to be indented
-               frm.top().indent = indent_column + indent_size;
-               log_indent();
-
-               frm.top().indent_tmp = frm.top().indent;
-               log_indent_tmp();
-            }
-            else if (  get_chunk_parent_type(pc) == CT_CLASS
-                    && !options::indent_class())
-            {
-               log_rule_B("indent_class");
-               LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, orig_col is %zu, text is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-               frm.top().indent -= indent_size;
-               log_indent();
-            }
-            else if (get_chunk_parent_type(pc) == CT_NAMESPACE)
-            {
-               frm.top().ns_cnt = frm.prev().ns_cnt + 1;
-
-               log_rule_B("indent_namespace");
-               log_rule_B("indent_namespace_single_indent");
-
-               if (  options::indent_namespace()
-                  && options::indent_namespace_single_indent())
-               {
-                  if (frm.top().ns_cnt >= 2)
-                  {
-                     // undo indent on all except the first namespace
-                     frm.top().indent -= indent_size;
-                     log_indent();
-                  }
-                  indent_column_set(frm.prev(frm.top().ns_cnt).indent);
-               }
-               else if (  pc->flags.test(PCF_LONG_BLOCK)
-                       || !options::indent_namespace())
-               {
-                  log_rule_B("indent_namespace");
-                  // don't indent long blocks
-                  frm.top().indent -= indent_size;
-                  log_indent();
-               }
-               else // indenting 'short' namespace
-               {
-                  log_rule_B("indent_namespace_level");
-
-                  if (options::indent_namespace_level() > 0)
-                  {
-                     frm.top().indent -= indent_size;
-                     log_indent();
-
-                     frm.top().indent +=
-                        options::indent_namespace_level();
-                     log_indent();
-                  }
-               }
-            }
-            else if (  get_chunk_parent_type(pc) == CT_EXTERN
-                    && !options::indent_extern())
-            {
-               log_rule_B("indent_extern");
-               frm.top().indent -= indent_size;
-               log_indent();
-            }
-            frm.top().indent_tab = frm.top().indent;
-         }
-
-         if (pc->flags.test(PCF_DONT_INDENT))
-         {
-            frm.top().indent = pc->column;
-            log_indent();
-
-            indent_column_set(pc->column);
-         }
-         else
-         {
-            /*
-             * If there isn't a newline between the open brace and the next
-             * item, just indent to wherever the next token is.
-             * This covers this sort of stuff:
-             * { a++;
-             *   b--; };
-             */
-            chunk_t *next = chunk_get_next_ncnnl(pc);
-
-            if (next == nullptr)
-            {
-               break;
-            }
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
-               && chunk_is_token(prev, CT_BRACE_OPEN)
-               && get_chunk_parent_type(prev) == CT_BRACED_INIT_LIST)
-            {
-               indent_column = frm.prev().brace_indent;
-               frm.top().indent = frm.prev().indent;
-               log_indent();
-            }
-            else if (  !chunk_is_newline_between(pc, next)
-                    && get_chunk_parent_type(next) != CT_BRACED_INIT_LIST
-                    && options::indent_token_after_brace()
-                    && !pc->flags.test(PCF_ONE_LINER)) // Issue #1108
-            {
-               log_rule_B("indent_token_after_brace");
-               frm.top().indent = next->column;
-               log_indent();
-            }
-            frm.top().indent_tmp = frm.top().indent;
-            frm.top().open_line  = pc->orig_line;
-            log_indent_tmp();
-
-            // Update the indent_column if needed
-            if (  brace_indent
-               || parent_token_indent != 0)
-            {
-               indent_column_set(frm.top().indent_tmp);
-               log_indent_tmp();
-            }
-         }
-         // Save the brace indent
-         frm.top().brace_indent = indent_column;
-      }
-      else if (chunk_is_token(pc, CT_SQL_END))
-      {
-         if (frm.top().type == CT_SQL_BEGIN)
-         {
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-            indent_column_set(frm.top().indent_tmp);
-            log_indent_tmp();
-         }
-      }
-      else if (  chunk_is_token(pc, CT_SQL_BEGIN)
-              || chunk_is_token(pc, CT_MACRO_OPEN)
-              || chunk_is_token(pc, CT_CLASS))
-      {
-         frm.push(pc, __func__, __LINE__);
-
-         frm.top().indent = frm.prev().indent + indent_size;
-         log_indent();
-
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
-         log_indent_tmp();
-      }
-      else if (chunk_is_token(pc, CT_SQL_EXEC))
-      {
-         frm.push(pc, __func__, __LINE__);
-
-         frm.top().indent = frm.prev().indent + indent_size;
-         log_indent();
-
-         frm.top().indent_tmp = frm.top().indent;
-         log_indent_tmp();
-      }
-      else if (chunk_is_token(pc, CT_MACRO_ELSE))
-      {
-         if (frm.top().type == CT_MACRO_OPEN)
-         {
-            indent_column_set(frm.prev().indent);
-         }
-      }
-      else if (chunk_is_token(pc, CT_CASE))
-      {
-         // Start a case - indent UO_indent_switch_case from the switch level
-         log_rule_B("indent_switch_case");
-         const size_t tmp = frm.top().indent
-                            + options::indent_switch_case();
-         frm.push(pc, __func__, __LINE__);
-
-         frm.top().indent = tmp;
-         log_indent();
-
-         log_rule_B("indent_case_shift");
-         frm.top().indent_tmp = tmp - indent_size + options::indent_case_shift();
-         frm.top().indent_tab = tmp;
-         log_indent_tmp();
-
-         // Always set on case statements
-         indent_column_set(frm.top().indent_tmp);
-
-         // comments before 'case' need to be aligned with the 'case'
-         chunk_t *pct = pc;
-
-         while (  ((pct = chunk_get_prev_nnl(pct)) != nullptr)
-               && chunk_is_comment(pct))
-         {
-            chunk_t *t2 = chunk_get_prev(pct);
-
-            if (chunk_is_newline(t2))
-            {
-               pct->column        = frm.top().indent_tmp;
-               pct->column_indent = pct->column;
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_BREAK))
-      {
-         chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-         if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(prev) == CT_CASE)
-         {
-            // issue #663 + issue #1366
-            chunk_t *prev_newline = chunk_get_prev_nl(pc);
-
-            if (prev_newline != nullptr)
-            {
-               chunk_t *prev_prev_newline = chunk_get_prev_nl(prev_newline);
-
-               if (prev_prev_newline != nullptr)
-               {
-                  // This only affects the 'break', so no need for a stack entry
-                  indent_column_set(prev_prev_newline->next->column);
-               }
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_LABEL))
-      {
-         log_rule_B("indent_label");
-         const auto val        = options::indent_label();
-         const auto pse_indent = frm.top().indent;
-
-         // Labels get sent to the left or backed up
-         if (val > 0)
-         {
-            indent_column_set(val);
-
-            chunk_t *next = chunk_get_next(chunk_get_next(pc));  // colon + possible statement
-
-            if (  next != nullptr
-               && !chunk_is_newline(next)
-                  // label (+ 2, because there is colon and space after it) must fit into indent
-               && (val + static_cast<int>(pc->len()) + 2 <= static_cast<int>(pse_indent)))
-            {
-               reindent_line(next, pse_indent);
-            }
-         }
-         else
-         {
-            const auto no_underflow = cast_abs(pse_indent, val) < pse_indent;
-            indent_column_set(((no_underflow) ? (pse_indent + val) : 0));
-         }
-      }
-      else if (chunk_is_token(pc, CT_ACCESS))
-      {
-         log_rule_B("indent_access_spec_body");
-
-         if (options::indent_access_spec_body())
-         {
-            const size_t tmp = frm.top().indent + indent_size;
-            frm.push(pc, __func__, __LINE__);
-
-            frm.top().indent = tmp;
-            log_indent();
-
-            frm.top().indent_tmp = tmp - indent_size;
-            frm.top().indent_tab = tmp;
-            log_indent_tmp();
-
-            /*
-             * If we are indenting the body, then we must leave the access spec
-             * indented at brace level
-             */
-            indent_column_set(frm.top().indent_tmp);
-            // Issues 1161 + 2704
-            // comments before 'access specifier' need to be aligned with the 'access specifier'
-            // unless it is a Doxygen comment
-            chunk_t *pct = pc;
-
-            while (  ((pct = chunk_get_prev_nnl(pct)) != nullptr)
-                  && chunk_is_comment(pct)
-                  && !chunk_is_Doxygen_comment(pct))
-            {
-               chunk_t *t2 = chunk_get_prev(pct);
-
-               if (chunk_is_newline(t2))
-               {
-                  pct->column        = frm.top().indent_tmp;
-                  pct->column_indent = pct->column;
-               }
-            }
-         }
-         else
-         {
-            // Access spec labels get sent to the left or backed up
-            log_rule_B("indent_access_spec");
-            const auto val = options::indent_access_spec();
-
-            if (val > 0)
-            {
-               indent_column_set(val);
-            }
-            else
-            {
-               const auto pse_indent   = frm.top().indent;
-               const auto no_underflow = cast_abs(pse_indent, val) < pse_indent;
-
-               indent_column_set(no_underflow ? (pse_indent + val) : 0);
-            }
-         }
-      }
-      else if (  chunk_is_token(pc, CT_CLASS_COLON)
-              || chunk_is_token(pc, CT_CONSTR_COLON))
-      {
-         // just indent one level
-         frm.push(pc, __func__, __LINE__);
-
-         frm.top().indent = frm.prev().indent_tmp + indent_size;
-         log_indent();
-
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
-         log_indent_tmp();
-
-         if (  options::indent_before_class_colon() != 0
-            && chunk_is_token(pc, CT_CLASS_COLON))
-         {
-            log_rule_B("indent_before_class_colon");
-            frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_before_class_colon(), 0);
-            log_indent_tmp();
-         }
-         indent_column_set(frm.top().indent_tmp);
-
-         log_rule_B("indent_class_colon");
-
-         if (  options::indent_class_colon()
-            && chunk_is_token(pc, CT_CLASS_COLON))
-         {
-            log_rule_B("indent_class_on_colon");
-
-            if (options::indent_class_on_colon())
-            {
-               frm.top().indent = pc->column;
-               log_indent();
-            }
-            else
-            {
-               chunk_t *next = chunk_get_next(pc);
-
-               if (  next != nullptr
-                  && !chunk_is_newline(next))
-               {
-                  frm.top().indent = next->column;
-                  log_indent();
-               }
-            }
-         }
-         else if (  options::indent_constr_colon()
-                 && chunk_is_token(pc, CT_CONSTR_COLON))
-         {
-            log_rule_B("indent_constr_colon");
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (chunk_is_newline(prev))
-            {
-               log_rule_B("indent_ctor_init_leading");
-               frm.top().indent += options::indent_ctor_init_leading();
-               log_indent();
-            }
-            // TODO: Create a dedicated indent_constr_on_colon?
-            log_rule_B("indent_class_on_colon");
-
-            if (options::indent_class_on_colon())
-            {
-               frm.top().indent = pc->column;
-               log_indent();
-            }
-            else if (options::indent_ctor_init() != 0)
-            {
-               log_rule_B("indent_ctor_init");
-               /*
-                * If the std::max() calls were specialized with size_t (the type of the underlying variable),
-                * they would never actually do their job, because size_t is unsigned and therefore even
-                * a "negative" result would be always greater than zero.
-                * Using ptrdiff_t (a standard signed type of the same size as size_t) in order to avoid that.
-                */
-               frm.top().indent = std::max<ptrdiff_t>(frm.top().indent + options::indent_ctor_init(), 0);
-               log_indent();
-               frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_ctor_init(), 0);
-               frm.top().indent_tab = std::max<ptrdiff_t>(frm.top().indent_tab + options::indent_ctor_init(), 0);
-               log_indent_tmp();
-               indent_column_set(frm.top().indent_tmp);
-            }
-            else
-            {
-               chunk_t *next = chunk_get_next(pc);
-
-               if (  next != nullptr
-                  && !chunk_is_newline(next))
-               {
-                  frm.top().indent = next->column;
-                  log_indent();
-               }
-            }
-         }
-      }
-      else if (  chunk_is_token(pc, CT_PAREN_OPEN)
-              && (  get_chunk_parent_type(pc) == CT_ASM
-                 || (  chunk_get_prev_ncnnl(pc) != nullptr
-                    && chunk_get_prev_ncnnl(pc)->type == CT_ASM))
-              && options::indent_ignore_asm_block())
-      {
-         log_rule_B("indent_ignore_asm_block");
-         chunk_t *tmp = chunk_skip_to_match(pc);
-
-         int     move = 0;
-
-         if (  chunk_is_newline(chunk_get_prev(pc))
-            && pc->column != indent_column)
-         {
-            move = indent_column - pc->column;
-         }
-         else
-         {
-            move = pc->column - pc->orig_col;
-         }
-
-         do
-         {
-            pc->column = pc->orig_col + move;
-            pc         = chunk_get_next(pc);
-         } while (pc != tmp);
-
-         reindent_line(pc, indent_column);
-      }
-      else if (  chunk_is_token(pc, CT_PAREN_OPEN)
-              || chunk_is_token(pc, CT_LPAREN_OPEN)                     // Issue #3054
-              || chunk_is_token(pc, CT_SPAREN_OPEN)
-              || chunk_is_token(pc, CT_FPAREN_OPEN)
-              || chunk_is_token(pc, CT_SQUARE_OPEN)
-              || chunk_is_token(pc, CT_ANGLE_OPEN))
-      {
-         /*
-          * Open parenthesis and squares - never update indent_column,
-          * unless right after a newline.
-          */
-         frm.push(pc, __func__, __LINE__);
-
-         if (  chunk_is_newline(chunk_get_prev(pc))
-            && pc->column != indent_column
-            && !pc->flags.test(PCF_DONT_INDENT))
-         {
-            LOG_FMT(LINDENT, "%s[line %d]: %zu] indent => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
-         }
-         frm.top().indent = pc->column + pc->len();
-         log_indent();
-
-         if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-            && language_is_set(LANG_D))
-         {
-            frm.top().indent_tab = frm.top().indent;
-         }
-         bool skipped = false;
-         log_rule_B("indent_inside_ternary_operator");
-         log_rule_B("indent_align_paren");
-
-         if (  options::indent_inside_ternary_operator()
-            && (  chunk_is_token(pc, CT_FPAREN_OPEN)
-               || chunk_is_token(pc, CT_PAREN_OPEN))
-            && frm.size() > 2
-            && (  frm.prev().type == CT_QUESTION
-               || frm.prev().type == CT_COND_COLON)
-            && !options::indent_align_paren())
-         {
-            frm.top().indent = frm.prev().indent_tmp + indent_size;
-            log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-         }
-         else if (  (  chunk_is_token(pc, CT_FPAREN_OPEN)
-                    || chunk_is_token(pc, CT_ANGLE_OPEN))
-                 && (  (  options::indent_func_call_param()
-                       && (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-                          || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER))
-                    || (  options::indent_func_proto_param()
-                       && (  get_chunk_parent_type(pc) == CT_FUNC_PROTO
-                          || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO))
-                    || (  options::indent_func_class_param()
-                       && (  get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                          || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO))
-                    || (  options::indent_template_param()
-                       && get_chunk_parent_type(pc) == CT_TEMPLATE)
-                    || (  options::indent_func_ctor_var_param()
-                       && get_chunk_parent_type(pc) == CT_FUNC_CTOR_VAR)
-                    || (  options::indent_func_def_param()
-                       && get_chunk_parent_type(pc) == CT_FUNC_DEF)
-                    || (  !options::indent_func_def_param()          // Issue #931
-                       && get_chunk_parent_type(pc) == CT_FUNC_DEF
-                       && options::indent_func_def_param_paren_pos_threshold() > 0
-                       && pc->orig_col > options::indent_func_def_param_paren_pos_threshold())))
-         {
-            log_rule_B("indent_func_call_param");
-            log_rule_B("indent_func_proto_param");
-            log_rule_B("indent_func_class_param");
-            log_rule_B("indent_template_param");
-            log_rule_B("indent_func_ctor_var_param");
-            log_rule_B("indent_func_def_param");
-            log_rule_B("indent_func_def_param_paren_pos_threshold");
-            // Skip any continuation indents
-            size_t idx = (!frm.empty()) ? frm.size() - 2 : 0;
-
-            while (  (  (  idx > 0
-                        && frm.at(idx).type != CT_BRACE_OPEN
-                        && frm.at(idx).type != CT_VBRACE_OPEN
-                        && frm.at(idx).type != CT_PAREN_OPEN
-                        && frm.at(idx).type != CT_FPAREN_OPEN
-                        && frm.at(idx).type != CT_SPAREN_OPEN
-                        && frm.at(idx).type != CT_SQUARE_OPEN
-                        && frm.at(idx).type != CT_ANGLE_OPEN
-                        && frm.at(idx).type != CT_CASE
-                        && frm.at(idx).type != CT_MEMBER
-                        && frm.at(idx).type != CT_QUESTION
-                        && frm.at(idx).type != CT_COND_COLON
-                        && frm.at(idx).type != CT_LAMBDA
-                        && frm.at(idx).type != CT_ASSIGN_NL)
-                     || are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
-                  && (  frm.at(idx).type != CT_CLASS_COLON
-                     && frm.at(idx).type != CT_CONSTR_COLON
-                     && !(  frm.at(idx).type == CT_LAMBDA
-                         && chunk_get_prev_nc(frm.at(idx).pc)->type == CT_NEWLINE)))
-            {
-               if (idx == 0)
-               {
-                  fprintf(stderr, "%s(%d): idx is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
-               idx--;
-               skipped = true;
-            }
-            // PR#381
-            log_rule_B("indent_param");
-
-            if (options::indent_param() != 0)
-            {
-               frm.top().indent = frm.at(idx).indent + options::indent_param();
-               log_indent();
-            }
-            else
-            {
-               frm.top().indent = frm.at(idx).indent + indent_size;
-               log_indent();
-            }
-            log_rule_B("indent_func_param_double");
-
-            if (options::indent_func_param_double())
-            {
-               // double is: Use both values of the options indent_columns and indent_param
-               frm.top().indent += indent_size;
-               log_indent();
-            }
-            frm.top().indent_tab = frm.top().indent;
-         }
-         else if (  options::indent_oc_inside_msg_sel()
-                 && chunk_is_token(pc, CT_PAREN_OPEN)
-                 && frm.size() > 2
-                 && (  frm.prev().type == CT_OC_MSG_FUNC
-                    || frm.prev().type == CT_OC_MSG_NAME)
-                 && !options::indent_align_paren()) // Issue #2658
-         {
-            log_rule_B("indent_oc_inside_msg_sel");
-            log_rule_B("indent_align_paren");
-            // When parens are inside OC messages, push on the parse frame stack
-            // [Class Message:(<here>
-            frm.top().indent = frm.prev().pc->column + indent_size;
-            log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-         }
-         else if (  chunk_is_token(pc, CT_PAREN_OPEN)
-                 && !chunk_is_newline(chunk_get_next(pc))
-                 && !options::indent_align_paren()
-                 && !pc->flags.test(PCF_IN_SPAREN))
-         {
-            log_rule_B("indent_align_paren");
-            int idx = static_cast<int>(frm.size()) - 2;
-
-            while (  idx > 0
-                  && are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
-            {
-               if (idx == 0)
-               {
-                  fprintf(stderr, "%s(%d): idx is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
-               idx--;
-               skipped = true;
-            }
-            frm.top().indent = frm.at(idx).indent + indent_size;
-            log_indent();
-
-            frm.top().indent_tab = frm.top().indent;
-            skipped = true;
-         }
-         else if (  (  chunk_is_str(pc, "(", 1)
-                    && !options::indent_paren_nl())
-                 || (  chunk_is_str(pc, "<", 1)
-                    && !options::indent_paren_nl())    // TODO: add indent_angle_nl?
-                 || (  chunk_is_str(pc, "[", 1)
-                    && !options::indent_square_nl()))
-         {
-            log_rule_B("indent_paren_nl");
-            log_rule_B("indent_square_nl");
-            chunk_t *next = chunk_get_next_nc(pc);
-
-            if (next == nullptr)
-            {
-               break;
-            }
-            log_rule_B("indent_paren_after_func_def");
-            log_rule_B("indent_paren_after_func_decl");
-            log_rule_B("indent_paren_after_func_call");
-
-            if (  chunk_is_newline(next)
-               && !options::indent_paren_after_func_def()
-               && !options::indent_paren_after_func_decl()
-               && !options::indent_paren_after_func_call())
-            {
-               size_t sub = 2;
-
-               if (  (frm.prev().type == CT_ASSIGN)
-                  || (frm.prev().type == CT_RETURN))
-               {
-                  sub = 3;
-               }
-               sub = static_cast<int>(frm.size()) - sub;
-
-               log_rule_B("indent_align_paren");
-
-               if (!options::indent_align_paren())
-               {
-                  sub = static_cast<int>(frm.size()) - 2;
-
-                  while (  sub > 0
-                        && are_chunks_in_same_line(frm.at(sub).pc, frm.top().pc))
-                  {
-                     if (sub == 0)
-                     {
-                        fprintf(stderr, "%s(%d): sub is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col);
-                        log_flush(true);
-                        exit(EX_SOFTWARE);
-                     }
-                     sub--;
-                     skipped = true;
-                  }
-
-                  if (  (  frm.at(sub + 1).type == CT_CLASS_COLON
-                        || frm.at(sub + 1).type == CT_CONSTR_COLON)
-                     && (chunk_is_token(frm.at(sub + 1).pc->prev, CT_NEWLINE)))
-                  {
-                     sub = sub + 1;
-                  }
-               }
-               frm.top().indent = frm.at(sub).indent + indent_size;
-               log_indent();
-
-               frm.top().indent_tab = frm.top().indent;
-               skipped = true;
-            }
-            else
-            {
-               if (  next != nullptr
-                  && !chunk_is_comment(next))
-               {
-                  if (chunk_is_token(next, CT_SPACE))
-                  {
-                     next = chunk_get_next_nc(next);
-
-                     if (next == nullptr)
-                     {
-                        break;
-                     }
-                  }
-
-                  if (chunk_is_comment(next->prev))
-                  {
-                     // Issue #2099
-                     frm.top().indent = next->prev->column;
-                  }
-                  else
-                  {
-                     frm.top().indent = next->column;
-                  }
-                  log_indent();
-               }
-            }
-         }
-         log_rule_B("use_indent_continue_only_once");
-         log_rule_B("indent_paren_after_func_decl");
-         log_rule_B("indent_paren_after_func_def");
-         log_rule_B("indent_paren_after_func_call");
-
-         if (  !options::use_indent_continue_only_once() // Issue #1160
-            && (  chunk_is_token(pc, CT_FPAREN_OPEN)
-               && chunk_is_newline(chunk_get_prev(pc)))
-            && (  (  (  get_chunk_parent_type(pc) == CT_FUNC_PROTO
-                     || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO)
-                  && options::indent_paren_after_func_decl())
-               || (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-                  && options::indent_paren_after_func_def())
-               || (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-                     || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
-                  && options::indent_paren_after_func_call())
-               || !chunk_is_newline(chunk_get_next(pc))))
-         {
-            frm.top().indent = frm.prev().indent + indent_size;
-            log_indent();
-
-            indent_column_set(frm.top().indent);
-         }
-         log_rule_B("indent_continue");
-
-         if (  get_chunk_parent_type(pc) != CT_OC_AT
-            && options::indent_continue() != 0
-            && !skipped)
-         {
-            frm.top().indent = frm.prev().indent;
-            log_indent();
-
-            if (  pc->level == pc->brace_level
-               && (  chunk_is_token(pc, CT_FPAREN_OPEN)
-                  || chunk_is_token(pc, CT_SPAREN_OPEN)
-                  || (  chunk_is_token(pc, CT_SQUARE_OPEN)
-                     && get_chunk_parent_type(pc) != CT_OC_MSG)
-                  || chunk_is_token(pc, CT_ANGLE_OPEN)))     // Issue #1170
-            {
-               //log_rule_B("indent_continue");
-               //frm.top().indent += abs(options::indent_continue());
-               //   frm.top().indent      = calc_indent_continue(frm);
-               //   frm.top().indent_cont = true;
-               log_rule_B("use_indent_continue_only_once");
-
-               if (  (options::use_indent_continue_only_once())
-                  && (frm.top().indent_cont)
-                  && vardefcol != 0)
-               {
-                  /*
-                   * The value of the indentation for a continuation line is calculate
-                   * differently if the line is:
-                   *   a declaration :your case with QString fileName ...
-                   *   an assignment  :your case with pSettings = new QSettings( ...
-                   * At the second case the option value might be used twice:
-                   *   at the assignment
-                   *   at the function call (if present)
-                   * If you want to prevent the double use of the option value
-                   * you may use the new option :
-                   *   use_indent_continue_only_once
-                   * with the value "true".
-                   * use/don't use indent_continue once Guy 2016-05-16
-                   */
-
-                  // if vardefcol isn't zero, use it
-                  frm.top().indent = vardefcol;
-                  log_indent();
-               }
-               else
-               {
-                  frm.top().indent = calc_indent_continue(frm);
-                  log_indent();
-                  frm.top().indent_cont = true;
-
-                  log_rule_B("indent_sparen_extra");
-
-                  if (  chunk_is_token(pc, CT_SPAREN_OPEN)
-                     && options::indent_sparen_extra() != 0)
-                  {
-                     frm.top().indent += options::indent_sparen_extra();
-                     log_indent();
-                  }
-               }
-            }
-         }
-         frm.top().indent_tmp = frm.top().indent;
-         log_indent_tmp();
-
-         frm.paren_count++;
-      }
-      else if (  options::indent_member_single()
-              && chunk_is_token(pc, CT_MEMBER)
-              && (strcmp(pc->text(), ".") == 0)
-              && language_is_set(LANG_CS | LANG_CPP))
-      {
-         log_rule_B("indent_member_single");
-
-         if (frm.top().type != CT_MEMBER)
-         {
-            frm.push(pc, __func__, __LINE__);
-            chunk_t *tmp = chunk_get_prev_ncnnlnp(frm.top().pc);
-
-            if (are_chunks_in_same_line(frm.prev().pc, tmp))
-            {
-               frm.top().indent = frm.prev().indent;
-            }
-            else
-            {
-               frm.top().indent = frm.prev().indent + indent_size;
-            }
-            log_indent();
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-         }
-
-         if (chunk_is_newline(chunk_get_prev(pc)))
-         {
-            if (  chunk_is_token(pc, CT_MEMBER)                           // Issue #2890
-               && language_is_set(LANG_CPP))
-            {
-               // will be done at another place
-               // look at the comment: XXXXXXXXXXXXXXXXXXXXXXXXXX
-            }
-            else
-            {
-               indent_column_set(frm.top().indent);
-               reindent_line(pc, indent_column);
-               did_newline = false;
-            }
-         }
-         //check for the series of CT_member chunks else pop it.
-         chunk_t *tmp = chunk_get_next_ncnnlnp(pc);
-
-         if (tmp != nullptr)
-         {
-            if (chunk_is_token(tmp, CT_FUNC_CALL))
-            {
-               tmp = chunk_get_next_ncnnlnp(chunk_get_next_type(tmp, CT_FPAREN_CLOSE, tmp->level));
-            }
-            else if (  chunk_is_token(tmp, CT_WORD)
-                    || chunk_is_token(tmp, CT_TYPE))
-            {
-               tmp = chunk_get_next_ncnnlnp(tmp);
-            }
-         }
-
-         if (  tmp != nullptr
-            && (  (strcmp(tmp->text(), ".") != 0)
-               || tmp->type != CT_MEMBER))
-         {
-            if (chunk_is_paren_close(tmp))
-            {
-               tmp = chunk_get_prev_ncnnlnp(tmp);
-            }
-
-            if (  tmp != nullptr
-               && chunk_is_newline(tmp->prev))
-            {
-               tmp = chunk_get_next_nl(chunk_get_prev_ncnnlnp(tmp));
-            }
-
-            if (tmp != nullptr)
-            {
-               frm.top().pop_pc = tmp;
-            }
-         }
-      }
-      else if (  chunk_is_token(pc, CT_ASSIGN)
-              || chunk_is_token(pc, CT_IMPORT)
-              || (  chunk_is_token(pc, CT_USING)
-                 && language_is_set(LANG_CS)))
-      {
-         /*
-          * if there is a newline after the '=' or the line starts with a '=',
-          * just indent one level,
-          * otherwise align on the '='.
-          */
-         if (  chunk_is_token(pc, CT_ASSIGN)
-            && chunk_is_newline(chunk_get_prev(pc)))
-         {
-            if (frm.top().type == CT_ASSIGN_NL)
-            {
-               frm.top().indent_tmp = frm.top().indent;
-            }
-            else
-            {
-               frm.top().indent_tmp = frm.top().indent + indent_size;
-            }
-            log_indent_tmp();
-
-            indent_column_set(frm.top().indent_tmp);
-            LOG_FMT(LINDENT, "%s(%d): %zu] assign => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, frm.top().indent_tmp);
-         }
-         chunk_t *next = chunk_get_next(pc);
-
-         if (next != nullptr)
-         {
-            /*
-             * fixes  1260 , 1268 , 1277 (Extra indentation after line with multiple assignments)
-             * For multiple consecutive assignments in single line , the indent of all these
-             * assignments should be same and one more than this line's indent.
-             * so poping the previous assign and pushing the new one
-             */
-            if (  frm.top().type == CT_ASSIGN
-               && chunk_is_token(pc, CT_ASSIGN))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__func__, __LINE__);
-            }
-            frm.push(pc, __func__, __LINE__);
-
-            if (  chunk_is_token(pc, CT_ASSIGN)
-               && chunk_is_newline(chunk_get_prev(pc)))
-            {
-               frm.top().type = CT_ASSIGN_NL;
-            }
-            log_rule_B("indent_continue");
-
-            if (options::indent_continue() != 0)
-            {
-               frm.top().indent = frm.prev().indent;
-               log_indent();
-
-               if (  pc->level == pc->brace_level
-                  && (  pc->type != CT_ASSIGN
-                     || (  get_chunk_parent_type(pc) != CT_FUNC_PROTO
-                        && get_chunk_parent_type(pc) != CT_FUNC_DEF)))
-               {
-                  log_rule_B("use_indent_continue_only_once");
-
-                  if (  (options::use_indent_continue_only_once())
-                     && (frm.top().indent_cont)
-                     && vardefcol != 0)
-                  {
-                     // if vardefcol isn't zero, use it
-                     frm.top().indent = vardefcol;
-                     log_indent();
-                  }
-                  else
-                  {
-                     frm.top().indent = calc_indent_continue(frm);
-                     log_indent();
-
-                     vardefcol = frm.top().indent;  // use the same variable for the next line
-                     frm.top().indent_cont = true;
-                  }
-               }
-            }
-            else if (  chunk_is_newline(next)
-                    || !options::indent_align_assign())
-            {
-               log_rule_B("indent_align_assign");
-               log_rule_B("indent_off_after_assign");
-
-               if (options::indent_off_after_assign())             // Issue #2591
-               {
-                  frm.top().indent = frm.prev().indent_tmp;
-               }
-               else
-               {
-                  frm.top().indent = frm.prev().indent_tmp + indent_size;
-               }
-               log_indent();
-
-               if (  chunk_is_token(pc, CT_ASSIGN)
-                  && chunk_is_newline(next))
-               {
-                  frm.top().type       = CT_ASSIGN_NL;
-                  frm.top().indent_tab = frm.top().indent;
-               }
-            }
-            else
-            {
-               frm.top().indent = pc->column + pc->len() + 1;
-               log_indent();
-            }
-            frm.top().indent_tmp = frm.top().indent;
-            log_indent_tmp();
-         }
-      }
-      else if (  chunk_is_token(pc, CT_RETURN)
-              || (  chunk_is_token(pc, CT_THROW)
-                 && get_chunk_parent_type(pc) == CT_NONE))
-      {
-         // don't count returns inside a () or []
-         if (  pc->level == pc->brace_level
-            || pc->flags.test(PCF_IN_LAMBDA))
-         {
-            chunk_t *next = chunk_get_next(pc);
-
-            // Avoid indentation on return token set by the option.
-            log_rule_B("indent_off_after_return");
-
-            // Avoid indentation on return token if the next token is a new token
-            // to properly indent object initializers returned by functions.
-            log_rule_B("indent_off_after_return_new");
-            bool indent_after_return = (  next != nullptr
-                                       && next->type == CT_NEW)
-                                       ? !options::indent_off_after_return_new()
-                                       : !options::indent_off_after_return();
-
-            if (  indent_after_return
-               || next == nullptr)
-            {
-               frm.push(pc, __func__, __LINE__);
-
-               log_rule_B("indent_single_after_return");
-
-               if (  chunk_is_newline(next)
-                  || (  chunk_is_token(pc, CT_RETURN)
-                     && options::indent_single_after_return()))
-               {
-                  // apply normal single indentation
-                  frm.top().indent = frm.prev().indent + indent_size;
-               }
-               else
-               {
-                  // indent after the return token
-                  frm.top().indent = frm.prev().indent + pc->len() + 1;
-               }
-               log_indent();
-               frm.top().indent_tmp = frm.prev().indent;
-               log_indent_tmp();
-            }
-            log_indent();
-         }
-      }
-      else if (  chunk_is_token(pc, CT_OC_SCOPE)
-              || chunk_is_token(pc, CT_TYPEDEF))
-      {
-         frm.push(pc, __func__, __LINE__);
-         // Issue #405
-         frm.top().indent = frm.prev().indent;
-         log_indent();
-
-         frm.top().indent_tmp = frm.top().indent;
-         LOG_FMT(LINDLINE, "%s(%d): .indent is %zu, .indent_tmp is %zu\n",
-                 __func__, __LINE__, frm.top().indent, frm.top().indent_tmp);
-
-         log_rule_B("indent_continue");
-
-         if (options::indent_continue() != 0)
-         {
-            frm.top().indent = calc_indent_continue(frm, frm.size() - 2);
-            log_indent();
-
-            frm.top().indent_cont = true;
-         }
-         else
-         {
-            frm.top().indent = frm.prev().indent + indent_size;
-            log_indent();
-         }
-      }
-      else if (chunk_is_token(pc, CT_C99_MEMBER))
-      {
-         // nothing to do
-      }
-      else if (chunk_is_token(pc, CT_WHERE_SPEC))
-      {
-         /* class indentation is ok already, just need to adjust func */
-         /* TODO: make this configurable, obviously.. */
-         if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-            || get_chunk_parent_type(pc) == CT_FUNC_PROTO
-            || (  get_chunk_parent_type(pc) == CT_STRUCT
-               && frm.top().type != CT_CLASS_COLON))
-         {
-            indent_column_set(frm.top().indent + 4);
-         }
-      }
-      else if (  options::indent_inside_ternary_operator()
-              && (  chunk_is_token(pc, CT_QUESTION)
-                 || chunk_is_token(pc, CT_COND_COLON))) // Issue #1130, #1715
-      {
-         log_rule_B("indent_inside_ternary_operator");
-
-         // Pop any colons before because they should already be processed
-         while (  chunk_is_token(pc, CT_COND_COLON)
-               && frm.top().type == CT_COND_COLON)
-         {
-            frm.pop(__func__, __LINE__);
-         }
-         log_rule_B("indent_inside_ternary_operator");
-
-         // Pop Question from stack in ternary operator
-         if (  options::indent_inside_ternary_operator()
-            && chunk_is_token(pc, CT_COND_COLON)
-            && frm.top().type == CT_QUESTION)
-         {
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
-            indent_column_set(frm.top().indent_tmp);
-         }
-         frm.push(pc, __func__, __LINE__);
-
-         frm.top().indent     = frm.prev().indent + indent_size;
-         frm.top().indent_tab = frm.top().indent;
-         log_indent();
-         frm.top().indent_tmp = frm.top().indent;
-         log_indent_tmp();
-      }
-      else if (  chunk_is_token(pc, CT_LAMBDA)
-              && (language_is_set(LANG_CS | LANG_JAVA))
-              && chunk_get_next_ncnnlnp(pc)->type != CT_BRACE_OPEN
-              && options::indent_cs_delegate_body())
-      {
-         log_rule_B("indent_cs_delegate_body");
-         frm.push(pc, __func__, __LINE__);
-         frm.top().indent = frm.prev().indent;
-         log_indent();
-
-         if (  chunk_is_newline(chunk_get_prev_nc(pc))
-            && !are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnl(pc)))
-         {
-            frm.top().indent = frm.prev().indent + indent_size;
-            log_indent();
-            reindent_line(pc, (frm.prev().indent + indent_size));
-            did_newline = false;
-         }
-         else if (  chunk_is_newline(chunk_get_next_nc(pc))
-                 && !are_chunks_in_same_line(frm.prev().pc, frm.top().pc))
-         {
-            frm.top().indent = frm.prev().indent + indent_size;
-         }
-         log_indent();
-         frm.top().indent_tmp = frm.top().indent;
-         log_indent_tmp();
-      }
-      else if (  options::indent_oc_inside_msg_sel()
-              && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
-                 || chunk_is_token(pc, CT_OC_MSG_NAME))
-              && chunk_is_token(chunk_get_next_ncnnl(pc), CT_OC_COLON)) // Issue #2658
-      {
-         log_rule_B("indent_oc_inside_msg_sel");
-         // Pop the OC msg name that is on the top of the stack
-         // [Class Message:<here>
-         frm.push(pc, __func__, __LINE__);
-
-         frm.top().indent     = frm.prev().indent;
-         frm.top().indent_tab = frm.prev().indent_tab;
-         log_indent();
-         frm.top().indent_tmp = frm.prev().indent_tmp;
-         log_indent_tmp();
-      }
-      else
-      {
-         // anything else?
-      }
-      // Handle shift expression continuation indenting
-      size_t shiftcontcol = 0;
-
-      log_rule_B("indent_shift");
-
-      if (  options::indent_shift()
-         && !pc->flags.test(PCF_IN_ENUM)
-         && get_chunk_parent_type(pc) != CT_OPERATOR
-         && pc->type != CT_COMMENT
-         && pc->type != CT_COMMENT_CPP
-         && pc->type != CT_COMMENT_MULTI
-         && pc->type != CT_BRACE_OPEN
-         && pc->level > 0
-         && !chunk_is_blank(pc))
-      {
-         bool in_shift    = false;
-         bool is_operator = false;
-
-         // Are we in such an expression? Go both forwards and backwards.
-         chunk_t *tmp = pc;
-
-         do
-         {
-            if (chunk_is_token(tmp, CT_SHIFT))
-            {
-               in_shift = true;
-               LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
-                       __func__, __LINE__);
-
-               tmp = chunk_get_prev_ncnnl(tmp);
-
-               if (chunk_is_token(tmp, CT_OPERATOR))
-               {
-                  is_operator = true;
-               }
-               break;
-            }
-            tmp = chunk_get_prev_ncnnl(tmp);
-         } while (  !in_shift
-                 && tmp != nullptr
-                 && tmp->type != CT_SEMICOLON
-                 && tmp->type != CT_BRACE_OPEN
-                 && tmp->type != CT_BRACE_CLOSE
-                 && tmp->type != CT_COMMA
-                 && tmp->type != CT_SPAREN_OPEN
-                 && tmp->type != CT_SPAREN_CLOSE);
-
-         tmp = pc;
-
-         do
-         {
-            tmp = chunk_get_next_ncnnl(tmp);
-
-            if (  tmp != nullptr
-               && chunk_is_token(tmp, CT_SHIFT))
-            {
-               in_shift = true;
-               LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
-                       __func__, __LINE__);
-
-               tmp = chunk_get_prev_ncnnl(tmp);
-
-               if (chunk_is_token(tmp, CT_OPERATOR))
-               {
-                  is_operator = true;
-               }
-               break;
-            }
-         } while (  !in_shift
-                 && tmp != nullptr
-                 && tmp->type != CT_SEMICOLON
-                 && tmp->type != CT_BRACE_OPEN
-                 && tmp->type != CT_BRACE_CLOSE
-                 && tmp->type != CT_COMMA
-                 && tmp->type != CT_SPAREN_OPEN
-                 && tmp->type != CT_SPAREN_CLOSE);
-
-         LOG_FMT(LINDENT2, "%s(%d): in_shift is %s\n",
-                 __func__, __LINE__, in_shift ? "TRUE" : "FALSE");
-         chunk_t *prev_nonl = chunk_get_prev_ncnnl(pc);
-         chunk_t *prev2     = chunk_get_prev_nc(pc);
-
-         if ((  chunk_is_semicolon(prev_nonl)
-             || chunk_is_token(prev_nonl, CT_BRACE_OPEN)
-             || chunk_is_token(prev_nonl, CT_BRACE_CLOSE)
-             || chunk_is_token(prev_nonl, CT_VBRACE_CLOSE)
-             || chunk_is_token(prev_nonl, CT_VBRACE_OPEN)
-             || chunk_is_token(prev_nonl, CT_CASE_COLON)
-             || (  prev_nonl != nullptr
-                && prev_nonl->flags.test(PCF_IN_PREPROC)) != pc->flags.test(PCF_IN_PREPROC)
-             || chunk_is_token(prev_nonl, CT_COMMA)
-             || is_operator))
-         {
-            in_shift = false;
-         }
-         LOG_FMT(LINDENT2, "%s(%d): in_shift is %s\n",
-                 __func__, __LINE__, in_shift ? "TRUE" : "FALSE");
-
-         if (  chunk_is_token(prev2, CT_NEWLINE)
-            && in_shift)
-         {
-            shiftcontcol = calc_indent_continue(frm);
-            // Setting frm.top().indent_cont = true in the top context when the indent is not also set
-            // just leads to compications when succeeding statements try to indent based on being
-            // embedded in a continuation. In other words setting frm.top().indent_cont = true
-            // should only be set if frm.top().indent is also set.
-
-            // Work around the doubly increased indent in RETURNs and assignments
-            bool   need_workaround = false;
-            size_t sub             = 0;
-
-            for (int i = frm.size() - 1; i >= 0; i--)
-            {
-               if (  frm.at(i).type == CT_RETURN
-                  || frm.at(i).type == CT_ASSIGN)
-               {
-                  need_workaround = true;
-                  sub             = frm.size() - i;
-                  break;
-               }
-            }
-
-            if (need_workaround)
-            {
-               shiftcontcol = calc_indent_continue(frm, frm.size() - 1 - sub);
-            }
-         }
-      }
-
-      // Handle variable definition continuation indenting
-      if (  vardefcol == 0
-         && (  chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, CT_FUNC_CTOR_VAR))
-         && !pc->flags.test(PCF_IN_FCN_DEF)
-         && pc->flags.test(PCF_VAR_1ST_DEF))
-      {
-         log_rule_B("indent_continue");
-
-         if (options::indent_continue() != 0)
-         {
-            vardefcol = calc_indent_continue(frm);
-            // Setting frm.top().indent_cont = true in the top context when the indent is not also set
-            // just leads to compications when succeeding statements try to indent based on being
-            // embedded in a continuation. In other words setting frm.top().indent_cont = true
-            // should only be set if frm.top().indent is also set.
-         }
-         else if (  options::indent_var_def_cont()
-                 || chunk_is_newline(chunk_get_prev(pc)))
-         {
-            log_rule_B("indent_var_def_cont");
-            vardefcol = frm.top().indent + indent_size;
-         }
-         else
-         {
-            // Issue #3010
-            vardefcol = pc->column;
-            // BUT, we need to skip backward over any '*'
-            chunk_t *tmp = chunk_get_prev_nc(pc);
-
-            while (chunk_is_token(tmp, CT_PTR_TYPE))
-            {
-               vardefcol = tmp->column;
-               tmp       = chunk_get_prev_nc(tmp);
-            }
-            // BUT, we need to skip backward over any '::' or TYPE
-            //tmp = chunk_get_prev_nc(pc);
-
-            //if (chunk_is_token(tmp, CT_DC_MEMBER))
-            //{
-            //   // look for a type
-            //   chunk_t *tmp2 = chunk_get_prev_nc(tmp);
-            //   if (chunk_is_token(tmp2, CT_TYPE))
-            //   {
-            //      // we have something like "SomeLongNamespaceName::Foo()"
-            //      vardefcol = tmp2->column;
-            //      LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, vardefcol is %zu\n",
-            //              __func__, __LINE__, pc->orig_line, vardefcol);
-            //   }
-            //}
-         }
-      }
-
-      if (  chunk_is_semicolon(pc)
-         || (  chunk_is_token(pc, CT_BRACE_OPEN)
-            && get_chunk_parent_type(pc) == CT_FUNCTION))
-      {
-         vardefcol = 0;
-      }
-
-      // Indent the line if needed
-      if (  did_newline
-         && !chunk_is_newline(pc)
-         && (pc->len() != 0))
-      {
-         pc->column_indent = frm.top().indent_tab;
-
-         if (frm.top().ip.ref)
-         {
-            pc->indent.ref   = frm.top().ip.ref;
-            pc->indent.delta = frm.top().ip.delta;
-         }
-         LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->column_indent is %zu, indent_column is %zu, for '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->column_indent, indent_column, pc->elided_text(copy));
-
-         /*
-          * Check for special continuations.
-          * Note that some of these could be done as a stack item like
-          * everything else
-          */
-
-         auto prev  = chunk_get_prev_ncnnl(pc);
-         auto prevv = chunk_get_prev_ncnnl(prev);
-         auto next  = chunk_get_next_ncnnl(pc);
-
-         bool do_vardefcol = false;
-
-         if (  vardefcol > 0
-            && pc->level == pc->brace_level
-            && (  chunk_is_token(prev, CT_COMMA)
-               || chunk_is_token(prev, CT_TYPE)
-               || chunk_is_token(prev, CT_PTR_TYPE)
-               || chunk_is_token(prev, CT_WORD)))
-         {
-            chunk_t *tmp = pc;
-
-            while (chunk_is_token(tmp, CT_PTR_TYPE))
-            {
-               tmp = chunk_get_next_ncnnl(tmp);
-            }
-            LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, for '%s'",
-                    __func__, __LINE__, tmp->orig_line, tmp->text());
-            LOG_FMT(LINDENT2, " tmp->flags: ");
-            log_pcf_flags(LINDENT2, tmp->flags);                   // Issue #2332
-
-            if (  tmp->flags.test(PCF_VAR_DEF)
-               && (  chunk_is_token(tmp, CT_WORD)
-                  || chunk_is_token(tmp, CT_FUNC_CTOR_VAR)))
-            {
-               do_vardefcol = true;
-            }
-         }
-         //LOG_FMT(LINDENT2, "%s(%d): GUY 2:\n", __func__, __LINE__);
-
-         if (pc->flags.test(PCF_DONT_INDENT))
-         {
-            // no change
-         }
-         else if (  get_chunk_parent_type(pc) == CT_SQL_EXEC
-                 && options::indent_preserve_sql())
-         {
-            log_rule_B("indent_preserve_sql");
-            reindent_line(pc, sql_col + (pc->orig_col - sql_orig_col));
-            LOG_FMT(LINDENT, "Indent SQL: [%s] to %zu (%zu/%zu)\n",
-                    pc->text(), pc->column, sql_col, sql_orig_col);
-         }
-         else if (  !options::indent_member_single()
-                 && !pc->flags.test(PCF_STMT_START)
-                 && (  chunk_is_token(pc, CT_MEMBER)
-                    || (  chunk_is_token(pc, CT_DC_MEMBER)
-                       && chunk_is_token(prev, CT_TYPE))
-                    || (  chunk_is_token(prev, CT_MEMBER)
-                       || (  chunk_is_token(prev, CT_DC_MEMBER)
-                          && chunk_is_token(prevv, CT_TYPE)))))
-         {
-            log_rule_B("indent_member_single");
-            log_rule_B("indent_member");
-            size_t tmp = options::indent_member() + indent_column;
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, member => %zu\n",
-                    __func__, __LINE__, pc->orig_line, tmp);
-            reindent_line(pc, tmp);
-         }
-         else if (do_vardefcol)
-         {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, vardefcol is %zu\n",
-                    __func__, __LINE__, pc->orig_line, vardefcol);
-            reindent_line(pc, vardefcol);
-         }
-         else if (shiftcontcol > 0)
-         {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, shiftcontcol is %zu\n",
-                    __func__, __LINE__, pc->orig_line, shiftcontcol);
-            reindent_line(pc, shiftcontcol);
-         }
-         else if (  chunk_is_token(pc, CT_NAMESPACE)
-                 && options::indent_namespace()
-                 && options::indent_namespace_single_indent()
-                 && frm.top().ns_cnt)
-         {
-            log_rule_B("indent_namespace");
-            log_rule_B("indent_namespace_single_indent");
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, Namespace => %zu\n",
-                    __func__, __LINE__, pc->orig_line, frm.top().brace_indent);
-            reindent_line(pc, frm.top().brace_indent);
-         }
-         else if (  chunk_is_token(pc, CT_STRING)
-                 && chunk_is_token(prev, CT_STRING)
-                 && options::indent_align_string())
-         {
-            log_rule_B("indent_align_string");
-            const int tmp = (xml_indent != 0) ? xml_indent : prev->column;
-
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, String => %d\n",
-                    __func__, __LINE__, pc->orig_line, tmp);
-            reindent_line(pc, tmp);
-         }
-         else if (chunk_is_comment(pc))
-         {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, comment => %zu\n",
-                    __func__, __LINE__, pc->orig_line, frm.top().indent_tmp);
-            indent_comment(pc, frm.top().indent_tmp);
-         }
-         else if (chunk_is_token(pc, CT_PREPROC))
-         {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, pp-indent => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
-         }
-         else if (  chunk_is_paren_close(pc)
-                 || chunk_is_token(pc, CT_ANGLE_CLOSE))
-         {
-            /*
-             * This is a big hack. We assume that since we hit a paren close,
-             * that we just removed a paren open
-             */
-            LOG_FMT(LINDLINE, "%s(%d): indent_column is %zu\n",
-                    __func__, __LINE__, indent_column);
-
-            if (frm.poped().type == c_token_t(pc->type - 1))
-            {
-               // Issue # 405
-               LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               chunk_t *ck1 = frm.poped().pc;
-               LOG_FMT(LINDLINE, "%s(%d): ck1->orig_line is %zu, ck1->orig_col is %zu, ck1->text() is '%s', ck1->type is %s\n",
-                       __func__, __LINE__, ck1->orig_line, ck1->orig_col, ck1->text(), get_token_name(ck1->type));
-               chunk_t *ck2 = chunk_get_prev(ck1);
-               LOG_FMT(LINDLINE, "%s(%d): ck2->orig_line is %zu, ck2->orig_col is %zu, ck2->text() is '%s', ck2->type is %s\n",
-                       __func__, __LINE__, ck2->orig_line, ck2->orig_col, ck2->text(), get_token_name(ck2->type));
-
-               /*
-                * If the open parenthesis was the first thing on the line or we
-                * are doing mode 1, then put the close parenthesis in the same
-                * column
-                */
-               log_rule_B("indent_paren_close");
-
-               if (  chunk_is_newline(ck2)
-                  || (options::indent_paren_close() == 1))
-               {
-                  LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_paren_close is 1\n",
-                          __func__, __LINE__, ck2->orig_line, ck2->orig_col);
-                  indent_column_set(ck1->column);
-                  LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
-                          __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
-               }
-               else
-               {
-                  log_rule_B("indent_paren_close");
-
-                  if (options::indent_paren_close() != 2)
-                  {
-                     // indent_paren_close is 0 or 1
-                     LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_paren_close is 0 or 1\n",
-                             __func__, __LINE__, ck2->orig_line, ck2->orig_col);
-                     indent_column_set(frm.poped().indent_tmp);
-                     LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
-                             __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
-                     pc->column_indent = frm.poped().indent_tab;
-                     log_rule_B("indent_paren_close");
-
-                     if (options::indent_paren_close() == 1)
-                     {
-                        LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_paren_close is 1\n",
-                                __func__, __LINE__, ck2->orig_line, ck2->orig_col);
-
-                        if (indent_column == 0)
-                        {
-                           fprintf(stderr, "%s(%d): indent_column is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                                   __func__, __LINE__, pc->orig_line, pc->orig_col);
-                           log_flush(true);
-                           exit(EX_SOFTWARE);
-                        }
-                        indent_column--;
-                        LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
-                                __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
-                     }
-                  }
-                  else
-                  {
-                     // indent_paren_close is 2: Indent to the brace level
-                     LOG_FMT(LINDLINE, "%s(%d): indent_paren_close is 2\n",
-                             __func__, __LINE__);
-                     LOG_FMT(LINDLINE, "%s(%d): ck2->orig_line is %zu, ck2->orig_col is %zu, ck2->text() is '%s'\n",
-                             __func__, __LINE__, ck2->orig_line, ck2->orig_col, ck2->text());
-
-                     if (chunk_get_prev(pc)->type == CT_NEWLINE)
-                     {
-                        LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-                        LOG_FMT(LINDLINE, "%s(%d): prev is <newline>\n",
-                                __func__, __LINE__);
-                        chunk_t *search = pc;
-
-                        while (chunk_is_paren_close(chunk_get_next(search)))
-                        {
-                           search = chunk_get_next(search);
-                        }
-                        chunk_t *searchNext = chunk_get_next(search);
-
-                        if (  searchNext->type == CT_SEMICOLON
-                           || searchNext->type == CT_MEMBER            // Issue #2582
-                           || searchNext->type == CT_NEWLINE)
-                        {
-                           LOG_FMT(LINDLINE, "%s(%d):\n", __func__, __LINE__);
-                           search = chunk_skip_to_match_rev(search);
-
-                           if (  options::indent_oc_inside_msg_sel()
-                              && chunk_is_token(chunk_get_prev_ncnnl(search), CT_OC_COLON)
-                              && (  frm.top().type == CT_OC_MSG_FUNC
-                                 || frm.top().type == CT_OC_MSG_NAME)) // Issue #2658
-                           {
-                              log_rule_B("indent_oc_inside_msg_sel");
-                              // [Class Message:(...)<here>
-                              indent_column_set(frm.top().pc->column);
-                           }
-                           else if (  options::indent_inside_ternary_operator()
-                                   && (  frm.top().type == CT_QUESTION
-                                      || frm.top().type == CT_COND_COLON)) // Issue #1130, #1715
-                           {
-                              log_rule_B("indent_inside_ternary_operator");
-                              indent_column_set(frm.top().indent);
-                           }
-                           else
-                           {
-                              search = chunk_get_next(chunk_get_prev_nl(search));
-
-                              if (search == nullptr)
-                              {
-                                 search = chunk_get_head();
-                              }
-                              indent_column_set(search->column);
-                           }
-                        }
-                     }
-                  }
-               }
-            }
-            size_t indent_value = 0;
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, closing parenthesis => %zu, text is '%s'\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            LOG_FMT(LINDENT, "%s(%d): [%s/%s]\n",
-                    __func__, __LINE__,
-                    get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
-            chunk_t *prev2 = chunk_get_prev(pc);                  // Issue #2930
-            LOG_FMT(LINDENT, "%s(%d): prev2 is orig_line is %zu, text is '%s'\n",
-                    __func__, __LINE__, prev2->orig_line, prev2->text());
-            chunk_t *next2 = chunk_get_next(pc);
-            LOG_FMT(LINDENT, "%s(%d): next2 is orig_line is %zu, text is '%s'\n",
-                    __func__, __LINE__, next2->orig_line, next2->text());
-
-            if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-               && chunk_is_newline(prev2)
-               && chunk_is_newline(next2))
-            {
-               if (options::donot_indent_func_def_close_paren())
-               {
-                  indent_value = 1;
-               }
-               else
-               {
-                  reindent_line(pc, indent_column);
-                  indent_value = indent_column;
-               }
-            }
-            else
-            {
-               indent_value = indent_column;
-            }
-            reindent_line(pc, indent_value);
-         }
-         else if (chunk_is_token(pc, CT_COMMA))
-         {
-            log_rule_B("indent_comma_paren");
-            bool comma_paren = options::indent_comma_paren()
-                               && chunk_is_paren_open(frm.top().pc);
-            log_rule_B("indent_comma_brace");
-            bool comma_brace = options::indent_comma_brace()
-                               && chunk_is_opening_brace(frm.top().pc);
-
-            if (comma_paren || comma_brace)
-            {
-               indent_column_set(frm.top().pc->column);
-            }
-            LOG_FMT(LINDENT, "%s(%d): %zu] comma => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
-         }
-         else if (  options::indent_func_const()
-                 && chunk_is_token(pc, CT_QUALIFIER)
-                 && strncasecmp(pc->text(), "const", pc->len()) == 0
-                 && (  next == nullptr
-                    || chunk_is_token(next, CT_BRACED)
-                    || chunk_is_token(next, CT_BRACE_OPEN)
-                    || chunk_is_token(next, CT_NEWLINE)
-                    || chunk_is_token(next, CT_SEMICOLON)
-                    || chunk_is_token(next, CT_THROW)
-                    || chunk_is_token(next, CT_VBRACE_OPEN)))
-         {
-            // indent const - void GetFoo(void)\n const\n { return (m_Foo); }
-            log_rule_B("indent_func_const");
-            indent_column_set(frm.top().indent + options::indent_func_const());
-            LOG_FMT(LINDENT, "%s(%d): %zu] const => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
-         }
-         else if (  options::indent_func_throw()
-                 && chunk_is_token(pc, CT_THROW)
-                 && get_chunk_parent_type(pc) != CT_NONE)
-         {
-            // indent throw - void GetFoo(void)\n throw()\n { return (m_Foo); }
-            log_rule_B("indent_func_throw");
-            indent_column_set(options::indent_func_throw());
-            LOG_FMT(LINDENT, "%s(%d): %zu] throw => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
-         }
-         else if (  pc->flags.test(PCF_IN_FOR)
-                 && options::indent_semicolon_for_paren()
-                 && chunk_is_token(pc, CT_SEMICOLON))
-         {
-            log_rule_B("indent_semicolon_for_paren");
-            indent_column_set(frm.top().pc->column);
-
-            log_rule_B("indent_first_for_expr");
-
-            if (options::indent_first_for_expr())
-            {
-               reindent_line(chunk_get_next(frm.top().pc),
-                             indent_column + pc->len() + 1);
-            }
-            LOG_FMT(LINDENT, "%s(%d): %zu] SEMICOLON => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
-         }
-         else if (chunk_is_token(pc, CT_BOOL))
-         {
-            log_rule_B("indent_bool_paren");
-
-            if (  options::indent_bool_paren()
-               && chunk_is_paren_open(frm.top().pc))
-            {
-               indent_column_set(frm.top().pc->column);
-
-               log_rule_B("indent_first_bool_expr");
-
-               if (options::indent_first_bool_expr())
-               {
-                  reindent_line(chunk_get_next(frm.top().pc),
-                                indent_column + pc->len() + 1);
-               }
-            }
-            LOG_FMT(LINDENT, "%s(%d): %zu] bool => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
-         }
-         else if (  options::indent_ternary_operator() == 1
-                 && chunk_is_token(prev, CT_COND_COLON)
-                 && (  chunk_is_token(pc, CT_ADDR)
-                    || chunk_is_token(pc, CT_WORD)
-                    || chunk_is_token(pc, CT_DEREF)
-                    || chunk_is_token(pc, CT_NUMBER)
-                    || chunk_is_token(pc, CT_STRING)
-                    || chunk_is_token(pc, CT_PAREN_OPEN)))
-         {
-            log_rule_B("indent_ternary_operator");
-            chunk_t *tmp = chunk_get_prev_type(prev, CT_QUESTION, -1);
-
-            if (tmp != nullptr)
-            {
-               tmp = chunk_get_next_ncnnl(tmp);
-
-               if (tmp != nullptr)
-               {
-                  LOG_FMT(LINDENT, "%s: %zu] ternarydefcol => %zu [%s]\n",
-                          __func__, pc->orig_line, tmp->column, pc->text());
-                  reindent_line(pc, tmp->column);
-               }
-            }
-         }
-         else if (  options::indent_ternary_operator() == 2
-                 && chunk_is_token(pc, CT_COND_COLON))
-         {
-            log_rule_B("indent_ternary_operator");
-            chunk_t *tmp = chunk_get_prev_type(pc, CT_QUESTION, -1);
-
-            if (tmp != nullptr)
-            {
-               LOG_FMT(LINDENT, "%s: %zu] ternarydefcol => %zu [%s]\n",
-                       __func__, pc->orig_line, tmp->column, pc->text());
-               reindent_line(pc, tmp->column);
-            }
-         }
-         else if (  options::indent_oc_inside_msg_sel()
-                 && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
-                    || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
-         {
-            log_rule_B("indent_oc_inside_msg_sel");
-            reindent_line(pc, frm.top().indent);
-         }
-         else
-         {
-            bool         use_indent = true;
-            const size_t ttidx      = frm.size() - 1;
-
-            if (ttidx > 0)
-            {
-               LOG_FMT(LINDPC, "%s(%d): (frm.at(ttidx).pc)->parent_type is %s\n",
-                       __func__, __LINE__, get_token_name((frm.at(ttidx).pc)->parent_type));
-
-               if ((frm.at(ttidx).pc)->parent_type == CT_FUNC_CALL)
-               {
-                  LOG_FMT(LINDPC, "FUNC_CALL OK [%d]\n", __LINE__);
-
-                  log_rule_B("use_indent_func_call_param");
-
-                  if (options::use_indent_func_call_param())
-                  {
-                     LOG_FMT(LINDPC, "use is true [%d]\n", __LINE__);
-                  }
-                  else
-                  {
-                     LOG_FMT(LINDPC, "use is false [%d]\n", __LINE__);
-                     use_indent = false;
-                  }
-               }
-            }
-            LOG_FMT(LINDENT, "%s(%d): pc->line is %zu, pc->column is %zu, pc->text() is '%s, indent_column is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->column, pc->text(), indent_column);
-
-            if (  use_indent
-               && pc->type != CT_PP_IGNORE) // Leave indentation alone for PP_IGNORE tokens
-            {
-               log_rule_B("pos_conditional");
-
-               if (  (  chunk_is_token(pc, CT_QUESTION)      // Issue #2101
-                     || chunk_is_token(pc, CT_COND_COLON))   // Issue #2101
-                  && options::pos_conditional() == TP_IGNORE)
-               {
-                  // do not indent this line
-                  LOG_FMT(LINDENT, "%s(%d): %zu] don't indent this line\n",
-                          __func__, __LINE__, pc->orig_line);
-               }
-               else if (chunk_is_token(pc, CT_BREAK))
-               {
-                  // Issue #1692
-                  log_rule_B("indent_switch_break_with_case");
-
-                  // Issue #2281
-                  if (  options::indent_switch_break_with_case()
-                     && get_type_of_the_parent(pc) == CT_SWITCH)
-                  {
-                     // look for a case before Issue #2735
-                     chunk_t *whereIsCase = chunk_get_prev_type(pc, CT_CASE, pc->level);
-
-                     if (whereIsCase != nullptr)
-                     {
-                        LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                                __func__, __LINE__, whereIsCase->orig_line, whereIsCase->orig_col, whereIsCase->text());
-                        LOG_FMT(LINDENT, "%s(%d): column is %zu\n",
-                                __func__, __LINE__, whereIsCase->column);
-                        reindent_line(pc, whereIsCase->column);
-                     }
-                  }
-                  else
-                  {
-                     LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent set to %zu, for '%s'\n",
-                             __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-                     reindent_line(pc, indent_column);
-                  }
-               }
-               else if (  chunk_is_token(pc, CT_MEMBER)                      // Issue #2890
-                       && language_is_set(LANG_CPP))
-               {
-                  // comment name: XXXXXXXXXXXXXXXXXXXXXXXXXX
-                  LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent set to %zu, for '%s'\n",
-                          __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-                  const size_t frm_size = frm.size();
-                  LOG_FMT(LINDPC, "%s(%d): frm_size is %zu\n",
-                          __func__, __LINE__, frm_size);
-                  // get pc
-                  LOG_FMT(LINDPC, "%s(%d): text() is '%s', (frm.at(frm_size - 1).pc)->type is %s\n",
-                          __func__, __LINE__, (frm.at(frm_size - 1).pc)->text(), get_token_name((frm.at(frm_size - 1).pc)->type));
-                  // get the token before
-                  const size_t temp_ttidx = frm_size - 2;
-
-                  if (temp_ttidx == 0)
-                  {
-                     indent_column = 1 + indent_size;
-                     reindent_line(pc, indent_column);
-                  }
-                  else if (temp_ttidx > 0)
-                  {
-                     chunk_t *token_before = frm.at(temp_ttidx).pc;
-                     LOG_FMT(LINDPC, "%s(%d): text() is '%s', token_before->type is %s\n",
-                             __func__, __LINE__, token_before->text(), get_token_name(token_before->type));
-
-                     size_t vor_col = 0;
-
-                     if (chunk_is_token(token_before, CT_ASSIGN))
-                     {
-                        chunk_t *before_Assign = frm.at(temp_ttidx - 1).pc;
-
-                        if (before_Assign == nullptr)
-                        {
-                           indent_column = 1 + indent_size;
-                        }
-                        else
-                        {
-                           vor_col = before_Assign->column;
-                           LOG_FMT(LINDPC, "%s(%d): text() is '%s', before_Assign->type is %s, column is %zu\n",
-                                   __func__, __LINE__, before_Assign->text(), get_token_name(before_Assign->type), vor_col);
-                           indent_column = vor_col + 2 * indent_size;
-                        }
-                     }
-                     else if (chunk_is_token(token_before, CT_BRACE_OPEN))
-                     {
-                        vor_col = token_before->column;
-                        LOG_FMT(LINDPC, "%s(%d): text() is '%s', token_before->type is %s, column is %zu\n",
-                                __func__, __LINE__, token_before->text(), get_token_name(token_before->type), vor_col);
-                        indent_column = vor_col + 2 * indent_size;
-                     }
-                     else if (chunk_is_token(token_before, CT_RETURN))
-                     {
-                        chunk_t *before_Return = frm.at(temp_ttidx - 1).pc;
-                        vor_col = before_Return->column;
-                        LOG_FMT(LINDPC, "%s(%d): text() is '%s', before_Return->type is %s, column is %zu\n",
-                                __func__, __LINE__, before_Return->text(), get_token_name(before_Return->type), vor_col);
-                        indent_column = vor_col + 2 * indent_size;
-                     }
-                     else
-                     {
-                        // TO DO
-                     }
-                     reindent_line(pc, indent_column);
-                  }
-                  else
-                  {
-                     LOG_FMT(LINDPC, "%s(%d): temp_ttidx is zero\n",
-                             __func__, __LINE__);
-                  }
-                  reindent_line(pc, indent_column);
-               }
-               else
-               {
-                  LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent set to %zu, for '%s'\n",
-                          __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-                  reindent_line(pc, indent_column);
-               }
-            }
-            else
-            {
-               // do not indent this line
-               LOG_FMT(LINDENT, "%s(%d): %zu] don't indent this line\n",
-                       __func__, __LINE__, pc->orig_line);
-            }
-         }
-         did_newline = false;
-
-         if (  chunk_is_token(pc, CT_SQL_EXEC)
-            || chunk_is_token(pc, CT_SQL_BEGIN)
-            || chunk_is_token(pc, CT_SQL_END))
-         {
-            sql_col      = pc->column;
-            sql_orig_col = pc->orig_col;
-         }
-
-         // Handle indent for variable defs at the top of a block of code
-         if (pc->flags.test(PCF_VAR_TYPE))
-         {
-            if (  !frm.top().non_vardef
-               && (frm.top().type == CT_BRACE_OPEN))
-            {
-               log_rule_B("indent_var_def_blk");
-               const auto val = options::indent_var_def_blk();
-
-               if (val != 0)
-               {
-                  auto indent = indent_column;
-                  indent = (val > 0) ? val                     // reassign if positive val,
-                           : (cast_abs(indent, val) < indent)  // else if no underflow
-                           ? (indent + val) : 0;               // reduce, else 0
-
-                  LOG_FMT(LINDENT, "%s(%d): %zu] var_type indent => %zu [%s]\n",
-                          __func__, __LINE__, pc->orig_line, indent, pc->text());
-                  reindent_line(pc, indent);
-               }
-            }
-         }
-         else if (pc != frm.top().pc)
-         {
-            frm.top().non_vardef = true;
-         }
-      }
-
-      // if we hit a newline, reset indent_tmp
-      if (  chunk_is_newline(pc)
-         || chunk_is_token(pc, CT_COMMENT_MULTI)
-         || chunk_is_token(pc, CT_COMMENT_CPP))
-      {
-         log_indent();
-         frm.top().indent_tmp = frm.top().indent;
-         log_indent_tmp();
-
-         /*
-          * Handle the case of a multi-line #define w/o anything on the
-          * first line (indent_tmp will be 1 or 0)
-          */
-         if (  chunk_is_token(pc, CT_NL_CONT)
-            && (frm.top().indent_tmp <= indent_size))
-         {
-            frm.top().indent_tmp = indent_size + 1;
-            log_indent_tmp();
-         }
-         // Get ready to indent the next item
-         did_newline = true;
-      }
-      // Check for open XML tags "</..."
-      log_rule_B("indent_xml_string");
-
-      if (  options::indent_xml_string() > 0
-         && chunk_is_token(pc, CT_STRING)
-         && pc->len() > 4
-         && pc->str[1] == '<'
-         && pc->str[2] != '/'
-         && pc->str[pc->len() - 3] != '/')
-      {
-         if (xml_indent <= 0)
-         {
-            xml_indent = pc->column;
-         }
-         log_rule_B("indent_xml_string");
-         xml_indent += options::indent_xml_string();
-      }
-      // Issue #672
-      log_rule_B("indent_continue_class_head");
-
-      if (  chunk_is_token(pc, CT_CLASS)
-         && language_is_set(LANG_CPP | LANG_JAVA)
-         && options::indent_continue_class_head() != 0
-         && !classFound)
-      {
-         LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, CT_CLASS found and UO_indent_continue != 0, OPEN IT\n",
-                 __func__, __LINE__, pc->orig_line);
-         frm.push(pc, __func__, __LINE__);
-         frm.top().indent = options::indent_continue_class_head() + 1;
-         log_indent();
-
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
-         log_indent_tmp();
-         classFound = true;
-      }
-      pc = chunk_get_next(pc);
-   }
-null_pc:
-
-   // Throw out any stuff inside a preprocessor - no need to warn
-   while (  !frm.empty()
-         && frm.top().in_preproc)
-   {
-      frm.pop(__func__, __LINE__);
-   }
-
-   // Throw out any VBRACE_OPEN at the end - implied with the end of file
-   while (  !frm.empty()
-         && frm.top().type == CT_VBRACE_OPEN)
-   {
-      frm.pop(__func__, __LINE__);
-   }
-
-   for (size_t idx_temp = 1; idx_temp < frm.size(); idx_temp++)
-   {
-      LOG_FMT(LWARN, "%s(%d): size is %zu\n",
-              __func__, __LINE__, frm.size());
-      LOG_FMT(LWARN, "%s(%d): File: %s, open_line is %zu, parent is %s: Unmatched %s\n",
-              __func__, __LINE__, cpd.filename.c_str(), frm.at(idx_temp).open_line,
-              get_token_name(frm.at(idx_temp).parent),
-              get_token_name(frm.at(idx_temp).type));
-      cpd.error_count++;
-   }
-
-   LOG_FMT(LINDLINE, "%s(%d): before quick_align_again\n", __func__, __LINE__);
-   quick_align_again();
-   quick_indent_again();
-   LOG_FMT(LINDLINE, "%s(%d): after quick_align_again\n", __func__, __LINE__);
-} // indent_text
-
-
-static bool single_line_comment_indent_rule_applies(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   if (!chunk_is_single_line_comment(start))
-   {
-      return(false);
-   }
-   chunk_t *pc      = start;
-   size_t  nl_count = 0;
-
-   while ((pc = chunk_get_next(pc)) != nullptr)
-   {
-      if (chunk_is_newline(pc))
-      {
-         if (  nl_count > 0
-            || pc->nl_count > 1)
-         {
-            return(false);
-         }
-         nl_count++;
-      }
-      else if (chunk_is_single_line_comment(pc))
-      {
-         nl_count = 0;
-      }
-      else if (  chunk_is_token(pc, CT_COMMENT_MULTI)
-              || chunk_is_closing_brace(pc))
-      {
-         /*
-          * check for things we wouldn't want to indent the comment for
-          * example: non-single line comment, closing brace
-          */
-         return(false);
-      }
-      else
-      {
-         return(true);
-      }
-   }
-   return(false);
-} // single_line_comment_indent_rule_applies
-
-
-static bool is_end_of_assignment(chunk_t *pc, const ParseFrame &frm)
-{
-   return(  (  frm.top().type == CT_ASSIGN_NL
-            || frm.top().type == CT_MEMBER
-            || frm.top().type == CT_ASSIGN)
-         && (  chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_COMMA)
-            || chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_token(pc, CT_SPAREN_CLOSE)
-            || (  chunk_is_token(pc, CT_SQUARE_OPEN)
-               && get_chunk_parent_type(pc) == CT_ASSIGN))
-         && get_chunk_parent_type(pc) != CT_CPP_LAMBDA);
-}
-
-
-static size_t calc_comment_next_col_diff(chunk_t *pc)
-{
-   chunk_t *next = pc; // assumes pc has a comment type
-
-   LOG_FMT(LCMTIND, "%s(%d): next->text() is '%s'\n",
-           __func__, __LINE__, next->text());
-
-   // Note: every comment is squashed into a single token
-   // (including newline chars for multiline comments) and is followed by
-   // a newline token (unless there are no more tokens left)
-   do
-   {
-      chunk_t *newline_token = chunk_get_next(next);
-      LOG_FMT(LCMTIND, "%s(%d): newline_token->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, newline_token->text(), newline_token->orig_line, newline_token->orig_col);
-
-      if (  newline_token == nullptr
-         || newline_token->nl_count > 1)
-      {
-         return(5000);  // FIXME: Max thresh magic number 5000
-      }
-      next = chunk_get_next(newline_token);
-
-      if (next != nullptr)
-      {
-         LOG_FMT(LCMTIND, "%s(%d): next->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, next->text(), next->orig_line, next->orig_col);
-      }
-   } while (chunk_is_comment(next));
-
-   if (next == nullptr)
-   {
-      return(5000);     // FIXME: Max thresh magic number 5000
-   }
-   LOG_FMT(LCMTIND, "%s(%d): next->text() is '%s'\n",
-           __func__, __LINE__, next->text());
-   // here next is the first non comment, non newline token
-   return(next->orig_col > pc->orig_col
-          ? next->orig_col - pc->orig_col
-          : pc->orig_col - next->orig_col);
-}
-
-
-static void indent_comment(chunk_t *pc, size_t col)
-{
-   LOG_FUNC_ENTRY();
-   char copy[1000];
-
-   LOG_FMT(LCMTIND, "%s(%d): pc->text() is '%s', orig_line %zu, orig_col %zu, level %zu\n",
-           __func__, __LINE__, pc->elided_text(copy), pc->orig_line, pc->orig_col, pc->level);
-
-   // force column 1 comment to column 1 if not changing them
-   log_rule_B("indent_col1_comment");
-
-   if (  pc->orig_col == 1
-      && !options::indent_col1_comment()
-      && !pc->flags.test(PCF_INSERTED))
-   {
-      LOG_FMT(LCMTIND, "%s(%d): rule 1 - keep in col 1\n", __func__, __LINE__);
-      reindent_line(pc, 1);
-      return;
-   }
-   chunk_t *nl = chunk_get_prev(pc);
-
-   if (nl != nullptr)
-   {
-      LOG_FMT(LCMTIND, "%s(%d): nl->text() is '%s', orig_line %zu, orig_col %zu, level %zu\n",
-              __func__, __LINE__, nl->text(), nl->orig_line, nl->orig_col, nl->level);
-   }
-   // TODO: Add an indent_comment_align_thresh option?
-   const size_t indent_comment_align_thresh = 3;
-
-   if (pc->orig_col > 1)
-   {
-      chunk_t *prev = chunk_get_prev(nl);
-
-      if (prev != nullptr)
-      {
-         LOG_FMT(LCMTIND, "%s(%d): prev->text() is '%s', orig_line %zu, orig_col %zu, level %zu\n",
-                 __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col, prev->level);
-         log_pcf_flags(LCMTIND, prev->flags);
-      }
-
-      if (  chunk_is_comment(prev)
-         && nl->nl_count == 1)
-      {
-         const size_t prev_col_diff = (prev->orig_col > pc->orig_col)
-                                      ? prev->orig_col - pc->orig_col
-                                      : pc->orig_col - prev->orig_col;
-         LOG_FMT(LCMTIND, "%s(%d): prev_col_diff is %zu\n",
-                 __func__, __LINE__, prev_col_diff);
-
-         /*
-          * Here we want to align comments that are relatively close one to
-          * another but not when the comment is a Doxygen comment (Issue #1134)
-          */
-         if (prev_col_diff <= indent_comment_align_thresh)
-         {
-            LOG_FMT(LCMTIND, "%s(%d): prev->text() is '%s', Doxygen_comment(prev) is %s\n",
-                    __func__, __LINE__, prev->text(), chunk_is_Doxygen_comment(prev) ? "TRUE" : "FALSE");
-            LOG_FMT(LCMTIND, "%s(%d): pc->text() is '%s', Doxygen_comment(pc) is %s\n",
-                    __func__, __LINE__, pc->text(), chunk_is_Doxygen_comment(pc) ? "TRUE" : "FALSE");
-
-            if (chunk_is_Doxygen_comment(prev) == chunk_is_Doxygen_comment(pc))
-            {
-               const size_t next_col_diff = calc_comment_next_col_diff(pc);
-               LOG_FMT(LCMTIND, "%s(%d): next_col_diff is %zu\n",
-                       __func__, __LINE__, next_col_diff);
-
-               // Align to the previous comment or to the next token?
-               if (  prev_col_diff <= next_col_diff
-                  || next_col_diff == 5000) // FIXME: Max thresh magic number 5000
-               {
-                  LOG_FMT(LCMTIND, "%s(%d): rule 3 - prev comment, coldiff = %zu, now in %zu\n",
-                          __func__, __LINE__, prev_col_diff, pc->column);
-                  reindent_line(pc, prev->column);
-                  return;
-               }
-            }
-         }
-      }
-   }
-   // check if special single line comment rule applies
-   log_rule_B("indent_sing_line_comments");
-
-   if (  (options::indent_sing_line_comments() > 0)
-      && single_line_comment_indent_rule_applies(pc))
-   {
-      LOG_FMT(LCMTIND, "%s(%d): rule 4 - single line comment indent, now in %zu\n",
-              __func__, __LINE__, pc->column);
-      reindent_line(pc, col + options::indent_sing_line_comments());
-      return;
-   }
-   LOG_FMT(LCMTIND, "%s(%d): rule 5 - fall-through, stay in %zu\n",
-           __func__, __LINE__, col);
-   reindent_line(pc, col);
-} // indent_comment
-
-
-bool ifdef_over_whole_file(void)
-{
-   LOG_FUNC_ENTRY();
-
-   // the results for this file are cached
-   if (cpd.ifdef_over_whole_file)
-   {
-      return(cpd.ifdef_over_whole_file > 0);
-   }
-   chunk_t *start_pp = nullptr;
-   chunk_t *end_pp   = nullptr;
-   size_t  IFstage   = 0;
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      LOG_FMT(LNOTE, "%s(%d): pc->pp_level is %zu, pc->orig_line is %zu, pc->orig_col is %zu, pc->text() is '%s'\n",
-              __func__, __LINE__, pc->pp_level, pc->orig_line, pc->orig_col, pc->text());
-
-      if (  chunk_is_comment(pc)
-         || chunk_is_newline(pc))
-      {
-         continue;
-      }
-
-      if (IFstage == 0)                   // 0 is BEGIN
-      {
-         // Check the first preprocessor, make sure it is an #if type
-         if (pc->type != CT_PREPROC)
-         {
-            break;
-         }
-         chunk_t *next = chunk_get_next(pc);
-
-         if (  next == nullptr
-            || next->type != CT_PP_IF)
-         {
-            break;
-         }
-         IFstage  = 1;                      // 1 is CT_PP_IF found
-         start_pp = pc;
-      }
-      else if (IFstage == 1)                // 1 is CT_PP_IF found
-      {
-         // Scan until a preprocessor at level 0 is found - the close to the #if
-         if (chunk_is_token(pc, CT_PREPROC))
-         {
-            if (pc->pp_level == 0)
-            {
-               IFstage = 2;
-               end_pp  = pc;
-            }
-         }
-         continue;
-      }
-      else if (IFstage == 2)
-      {
-         // We should only see the rest of the preprocessor
-         if (  chunk_is_token(pc, CT_PREPROC)
-            || !pc->flags.test(PCF_IN_PREPROC))
-         {
-            IFstage = 0;
-            break;
-         }
-      }
-   }
-
-   cpd.ifdef_over_whole_file = (IFstage == 2) ? 1 : -1;
-
-   if (cpd.ifdef_over_whole_file > 0)
-   {
-      chunk_flags_set(start_pp, PCF_WF_IF);
-      chunk_flags_set(end_pp, PCF_WF_ENDIF);
-   }
-   LOG_FMT(LNOTE, "The whole file is%s covered by a #IF\n",
-           (cpd.ifdef_over_whole_file > 0) ? "" : " NOT");
-   return(cpd.ifdef_over_whole_file > 0);
-} // ifdef_over_whole_file
-
-
-void indent_preproc(void)
-{
-   LOG_FUNC_ENTRY();
-
-   // Scan to see if the whole file is covered by one #ifdef
-   const size_t pp_level_sub = ifdef_over_whole_file() ? 1 : 0;
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      LOG_FMT(LPPIS, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-
-      if (pc->type != CT_PREPROC)
-      {
-         continue;
-      }
-      chunk_t *next = chunk_get_next_ncnnl(pc);
-
-      if (next == nullptr)
-      {
-         break;
-      }
-      const size_t pp_level = (pc->pp_level > pp_level_sub)
-                              ? pc->pp_level - pp_level_sub : 0;
-
-      // Adjust the indent of the '#'
-      log_rule_B("pp_indent");
-
-      if (options::pp_indent() & IARF_ADD)
-      {
-         log_rule_B("pp_indent_count");
-         reindent_line(pc, 1 + pp_level * options::pp_indent_count());
-      }
-      else if (options::pp_indent() & IARF_REMOVE)
-      {
-         log_rule_B("pp_indent");
-         reindent_line(pc, 1);
-      }
-      // Add spacing by adjusting the length
-      log_rule_B("pp_space");
-
-      if (  (options::pp_space() != IARF_IGNORE)
-         && next != nullptr)
-      {
-         if (options::pp_space() & IARF_ADD)
-         {
-            log_rule_B("pp_space_count");
-            // Issue #3055
-            const size_t mult = max<size_t>(options::pp_space_count(), 1);
-            reindent_line(next, pc->column + pc->len() + (pp_level * mult));
-         }
-         else if (options::pp_space() & IARF_REMOVE)
-         {
-            log_rule_B("pp_space");
-            reindent_line(next, pc->column + pc->len());
-         }
-      }
-      // Mark as already handled if not region stuff or in column 1
-      log_rule_B("pp_indent_at_level");
-
-      if (  (  !options::pp_indent_at_level()
-            || (pc->brace_level <= ((get_chunk_parent_type(pc) == CT_PP_DEFINE) ? 1 : 0)))
-         && get_chunk_parent_type(pc) != CT_PP_REGION
-         && get_chunk_parent_type(pc) != CT_PP_ENDREGION)
-      {
-         log_rule_B("pp_define_at_level");
-
-         if (  !options::pp_define_at_level()
-            || get_chunk_parent_type(pc) != CT_PP_DEFINE)
-         {
-            chunk_flags_set(pc, PCF_DONT_INDENT);
-         }
-      }
-      LOG_FMT(LPPIS, "%s(%d): orig_line %zu to %zu (len %zu, next->col %zu)\n",
-              __func__, __LINE__, pc->orig_line, 1 + pp_level, pc->len(),
-              next ? next->column : -1);
-   }
-} // indent_preproc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.h
deleted file mode 100644
index dc703eed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @file indent.h
- * prototypes for indent.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef INDENT_H_INCLUDED
-#define INDENT_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * Change the top-level indentation only by changing the column member in
- * the chunk structures.
- * The level indicator must already be set.
- */
-void indent_text(void);
-
-
-/**
- * Indent the preprocessor stuff from column 1.
- * FIXME: This is broken if there is a comment or escaped newline
- * between '#' and 'define'.
- */
-void indent_preproc(void);
-
-/**
- *
- * @param pc      chunk at the start of the line
- * @param column  desired column
- */
-void indent_to_column(chunk_t *pc, size_t column);
-
-
-/**
- * Same as indent_to_column, except we can move both ways
- *
- * @param pc      chunk at the start of the line
- * @param column  desired column
- */
-void align_to_column(chunk_t *pc, size_t column);
-
-
-//! Scan to see if the whole file is covered by one #ifdef
-bool ifdef_over_whole_file(void);
-
-
-/**
- * Changes the initial indent for a line to the given column
- *
- * @param pc      The chunk at the start of the line
- * @param column  The desired column
- */
-void reindent_line(chunk_t *pc, size_t column);
-
-
-#endif /* INDENT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.cpp
deleted file mode 100644
index 5e4be691..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-/**
- * @file keywords.cpp
- * Manages the table of keywords.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
- * @license GPL v2+
- */
-
-#include "keywords.h"
-
-#include "args.h"
-#include "prototypes.h"
-
-#include <map>
-
-
-using namespace std;
-
-// Dynamic keyword map
-typedef map<string, c_token_t> dkwmap;
-static dkwmap dkwm;
-
-
-/**
- * Compares two chunk_tag_t entries using strcmp on the strings
- *
- * @param the 'left' entry
- * @param the 'right' entry
- *
- * @return == 0  if both keywords are equal
- * @return  < 0  p1 is smaller than p2
- * @return  > 0  p2 is smaller than p1
- */
-static int kw_compare(const void *p1, const void *p2);
-
-
-/**
- * search in static keywords for first occurrence of a given tag
- *
- * @param tag/keyword to search for
- */
-static const chunk_tag_t *kw_static_first(const chunk_tag_t *tag);
-
-
-//static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag);
-static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag, int lang_flags);
-
-/**
- * interesting static keywords - keep sorted.
- * Table includes the Name, Type, and Language flags.
- */
-static chunk_tag_t keywords[] =
-{
-   // TODO: it might be useful if users could add there custom keywords to this list
-   { "@autoreleasepool",                CT_AUTORELEASEPOOL,  LANG_OC                                                                     },
-   { "@available",                      CT_OC_AVAILABLE,     LANG_OC                                                                     },
-   { "@catch",                          CT_CATCH,            LANG_OC                                                                     },
-   { "@dynamic",                        CT_OC_DYNAMIC,       LANG_OC                                                                     },
-   { "@end",                            CT_OC_END,           LANG_OC                                                                     },
-   { "@finally",                        CT_FINALLY,          LANG_OC                                                                     },
-   { "@implementation",                 CT_OC_IMPL,          LANG_OC                                                                     },
-   { "@interface",                      CT_OC_INTF,          LANG_OC                                                                     },
-   { "@interface",                      CT_CLASS,            LANG_JAVA                                                                   },
-   { "@private",                        CT_ACCESS,           LANG_OC                                                                     },
-   { "@property",                       CT_OC_PROPERTY,      LANG_OC                                                                     },
-   { "@protected",                      CT_ACCESS,           LANG_OC                                                                     },
-   { "@protocol",                       CT_OC_PROTOCOL,      LANG_OC                                                                     },
-   { "@public",                         CT_ACCESS,           LANG_OC                                                                     },
-   { "@selector",                       CT_OC_SEL,           LANG_OC                                                                     },
-   { "@synchronized",                   CT_SYNCHRONIZED,     LANG_OC                                                                     },
-   { "@synthesize",                     CT_OC_DYNAMIC,       LANG_OC                                                                     },
-   { "@throw",                          CT_THROW,            LANG_OC                                                                     },
-   { "@try",                            CT_TRY,              LANG_OC                                                                     },
-   { "API_AVAILABLE",                   CT_ATTRIBUTE,        LANG_OC                                                                     },
-   { "API_DEPRECATED",                  CT_ATTRIBUTE,        LANG_OC                                                                     },
-   { "API_DEPRECATED_WITH_REPLACEMENT", CT_ATTRIBUTE,        LANG_OC                                                                     },
-   { "API_UNAVAILABLE",                 CT_ATTRIBUTE,        LANG_OC                                                                     },
-   { "BOOL",                            CT_TYPE,             LANG_OC                                                                     },
-   { "NS_ENUM",                         CT_ENUM,             LANG_OC                                                                     },
-   { "NS_OPTIONS",                      CT_ENUM,             LANG_OC                                                                     },
-   { "Q_EMIT",                          CT_Q_EMIT,           LANG_CPP                                                                    }, // guy 2015-10-16
-   { "Q_FOREACH",                       CT_FOR,              LANG_CPP                                                                    }, // guy 2015-09-23
-   { "Q_FOREVER",                       CT_Q_FOREVER,        LANG_CPP                                                                    }, // guy 2015-10-18
-   { "Q_GADGET",                        CT_Q_GADGET,         LANG_CPP                                                                    }, // guy 2016-05-04
-   { "Q_OBJECT",                        CT_COMMENT_EMBED,    LANG_CPP                                                                    },
-   { "Q_SIGNALS",                       CT_ACCESS,           LANG_CPP                                                                    },
-   { "_Bool",                           CT_TYPE,             LANG_C                                                                      },
-   { "_Complex",                        CT_TYPE,             LANG_C                                                                      },
-   { "_Imaginary",                      CT_TYPE,             LANG_C                                                                      },
-   { "_Nonnull",                        CT_QUALIFIER,        LANG_OC                                                                     },
-   { "_Null_unspecified",               CT_QUALIFIER,        LANG_OC                                                                     },
-   { "_Nullable",                       CT_QUALIFIER,        LANG_OC                                                                     },
-   { "_Pragma",                         CT_PP_PRAGMA,        LANG_ALL | FLAG_PP                                                          },
-   { "__DI__",                          CT_DI,               LANG_C                                                                      },
-   { "__HI__",                          CT_HI,               LANG_C                                                                      },
-   { "__QI__",                          CT_QI,               LANG_C                                                                      },
-   { "__SI__",                          CT_SI,               LANG_C                                                                      },
-   { "__asm__",                         CT_ASM,              LANG_C                                                                      },
-   { "__attribute__",                   CT_ATTRIBUTE,        LANG_C                                                                      },
-   { "__autoreleasing",                 CT_QUALIFIER,        LANG_C                                                                      },
-   { "__block",                         CT_QUALIFIER,        LANG_C                                                                      },
-   { "__bridge",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "__bridge_retained",               CT_QUALIFIER,        LANG_C                                                                      },
-   { "__bridge_transfer",               CT_QUALIFIER,        LANG_C                                                                      },
-   { "__const__",                       CT_QUALIFIER,        LANG_C                                                                      },
-   { "__declspec",                      CT_DECLSPEC,         LANG_C                                                                      },
-   { "__except",                        CT_CATCH,            LANG_C                                                                      },
-   { "__finally",                       CT_FINALLY,          LANG_C                                                                      },
-   { "__has_include",                   CT_CNG_HASINC,       LANG_C | FLAG_PP                                                            }, // clang
-   { "__has_include_next",              CT_CNG_HASINCN,      LANG_C | FLAG_PP                                                            }, // clang
-   { "__inline__",                      CT_QUALIFIER,        LANG_C                                                                      },
-   { "__nonnull",                       CT_QUALIFIER,        LANG_OC                                                                     },
-   { "__nothrow__",                     CT_NOTHROW,          LANG_C                                                                      },
-   { "__null_unspecified",              CT_QUALIFIER,        LANG_OC                                                                     },
-   { "__nullable",                      CT_QUALIFIER,        LANG_OC                                                                     },
-   { "__pragma",                        CT_PP_PRAGMA,        LANG_ALL | FLAG_PP                                                          },
-   { "__restrict",                      CT_QUALIFIER,        LANG_C                                                                      },
-   { "__signed__",                      CT_TYPE,             LANG_C                                                                      },
-   { "__strong",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "__thread",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "__traits",                        CT_QUALIFIER,        LANG_D                                                                      },
-   { "__try",                           CT_TRY,              LANG_C                                                                      },
-   { "__typeof",                        CT_DECLTYPE,         LANG_C                                                                      },
-   { "__typeof__",                      CT_DECLTYPE,         LANG_C                                                                      },
-   { "__unsafe_unretained",             CT_QUALIFIER,        LANG_OC                                                                     },
-   { "__unused",                        CT_ATTRIBUTE,        LANG_C                                                                      },
-   { "__volatile__",                    CT_QUALIFIER,        LANG_C                                                                      },
-   { "__weak",                          CT_QUALIFIER,        LANG_C                                                                      },
-   { "__word__",                        CT_WORD_,            LANG_C                                                                      },
-   { "abstract",                        CT_QUALIFIER,        LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA                        },
-   { "add",                             CT_GETSET,           LANG_CS                                                                     },
-   { "alias",                           CT_USING,            LANG_D                                                                      },
-   { "align",                           CT_ALIGN,            LANG_D                                                                      },
-   { "alignof",                         CT_SIZEOF,           LANG_CPP                                                                    },
-   { "and",                             CT_SBOOL,            LANG_CPP                                                                    },
-   { "and_eq",                          CT_SASSIGN,          LANG_CPP                                                                    },
-   { "as",                              CT_AS,               LANG_CS | LANG_VALA                                                         },
-   { "asm",                             CT_ASM,              LANG_C | LANG_D                                                             },
-   { "asm",                             CT_PP_ASM,           LANG_ALL | FLAG_PP                                                          },
-   { "assert",                          CT_ASSERT,           LANG_JAVA                                                                   },
-   { "assert",                          CT_FUNCTION,         LANG_D | LANG_PAWN                                                          }, // PAWN
-   { "assert",                          CT_PP_ASSERT,        LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "auto",                            CT_TYPE,             LANG_C | LANG_D                                                             },
-   { "base",                            CT_BASE,             LANG_CS | LANG_VALA                                                         },
-   { "bit",                             CT_TYPE,             LANG_D                                                                      },
-   { "bitand",                          CT_ARITH,            LANG_C                                                                      },
-   { "bitor",                           CT_ARITH,            LANG_C                                                                      },
-   { "body",                            CT_BODY,             LANG_D                                                                      },
-   { "bool",                            CT_TYPE,             LANG_C | LANG_CS | LANG_VALA                                                },
-   { "boolean",                         CT_TYPE,             LANG_JAVA | LANG_ECMA                                                       },
-   { "break",                           CT_BREAK,            LANG_ALL                                                                    }, // PAWN
-   { "byte",                            CT_TYPE,             LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA                                    },
-   { "callback",                        CT_QUALIFIER,        LANG_VALA                                                                   },
-   { "case",                            CT_CASE,             LANG_ALL                                                                    }, // PAWN
-   { "cast",                            CT_D_CAST,           LANG_D                                                                      },
-   { "catch",                           CT_CATCH,            LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA             },
-   { "cdouble",                         CT_TYPE,             LANG_D                                                                      },
-   { "cent",                            CT_TYPE,             LANG_D                                                                      },
-   { "cfloat",                          CT_TYPE,             LANG_D                                                                      },
-   { "char",                            CT_CHAR,             LANG_PAWN                                                                   }, // PAWN
-   { "char",                            CT_TYPE,             LANG_ALLC                                                                   },
-   { "checked",                         CT_QUALIFIER,        LANG_CS                                                                     },
-   { "class",                           CT_CLASS,            LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA             },
-   { "compl",                           CT_ARITH,            LANG_CPP                                                                    },
-   { "const",                           CT_QUALIFIER,        LANG_ALL                                                                    }, // PAWN
-   { "const_cast",                      CT_TYPE_CAST,        LANG_CPP                                                                    },
-   { "constexpr",                       CT_QUALIFIER,        LANG_CPP                                                                    },
-   { "construct",                       CT_CONSTRUCT,        LANG_VALA                                                                   },
-   { "continue",                        CT_CONTINUE,         LANG_ALL                                                                    }, // PAWN
-   { "creal",                           CT_TYPE,             LANG_D                                                                      },
-   { "dchar",                           CT_TYPE,             LANG_D                                                                      },
-   { "debug",                           CT_DEBUG,            LANG_D                                                                      },
-   { "debugger",                        CT_DEBUGGER,         LANG_ECMA                                                                   },
-   { "decltype",                        CT_DECLTYPE,         LANG_CPP                                                                    },
-   { "default",                         CT_DEFAULT,          LANG_ALL                                                                    }, // PAWN
-   { "define",                          CT_PP_DEFINE,        LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "defined",                         CT_DEFINED,          LANG_PAWN                                                                   }, // PAWN
-   { "defined",                         CT_PP_DEFINED,       LANG_ALLC | FLAG_PP                                                         },
-   { "delegate",                        CT_DELEGATE,         LANG_CS | LANG_VALA | LANG_D                                                },
-   { "delete",                          CT_DELETE,           LANG_CPP | LANG_D | LANG_ECMA | LANG_VALA                                   },
-   { "deprecated",                      CT_QUALIFIER,        LANG_D                                                                      },
-   { "do",                              CT_DO,               LANG_ALL                                                                    }, // PAWN
-   { "double",                          CT_TYPE,             LANG_ALLC                                                                   },
-   { "dynamic_cast",                    CT_TYPE_CAST,        LANG_CPP                                                                    },
-   { "elif",                            CT_PP_ELSE,          LANG_ALLC | FLAG_PP                                                         },
-   { "else",                            CT_ELSE,             LANG_ALL                                                                    }, // PAWN
-   { "else",                            CT_PP_ELSE,          LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "elseif",                          CT_PP_ELSE,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "emit",                            CT_PP_EMIT,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "endif",                           CT_PP_ENDIF,         LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "endinput",                        CT_PP_ENDINPUT,      LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "endregion",                       CT_PP_ENDREGION,     LANG_ALL | FLAG_PP                                                          },
-   { "endscript",                       CT_PP_ENDINPUT,      LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "enum",                            CT_ENUM,             LANG_ALL                                                                    }, // PAWN
-   { "error",                           CT_PP_ERROR,         LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "event",                           CT_TYPE,             LANG_CS                                                                     },
-   { "exit",                            CT_FUNCTION,         LANG_PAWN                                                                   }, // PAWN
-   { "explicit",                        CT_QUALIFIER,        LANG_CPP | LANG_CS                                                          },
-   { "export",                          CT_EXPORT,           LANG_CPP | LANG_D | LANG_ECMA                                               },
-   { "extends",                         CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
-   { "extern",                          CT_EXTERN,           LANG_C | LANG_CS | LANG_D | LANG_VALA                                       },
-   { "false",                           CT_WORD,             LANG_ALL                                                                    },
-   { "file",                            CT_PP_FILE,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "final",                           CT_QUALIFIER,        LANG_CPP | LANG_D | LANG_ECMA                                               },
-   { "finally",                         CT_FINALLY,          LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_JAVA                        },
-   { "fixed",                           CT_FIXED,            LANG_CS                                                                     },
-   { "flags",                           CT_TYPE,             LANG_VALA                                                                   },
-   { "float",                           CT_TYPE,             LANG_ALLC                                                                   },
-   { "for",                             CT_FOR,              LANG_ALL                                                                    }, // PAWN
-   { "foreach",                         CT_FOR,              LANG_CS | LANG_D | LANG_VALA                                                },
-   { "foreach_reverse",                 CT_FOR,              LANG_D                                                                      },
-   { "forward",                         CT_FORWARD,          LANG_PAWN                                                                   }, // PAWN
-   { "friend",                          CT_FRIEND,           LANG_CPP                                                                    },
-   { "function",                        CT_FUNCTION,         LANG_D | LANG_ECMA                                                          },
-   { "get",                             CT_GETSET,           LANG_CS | LANG_VALA                                                         },
-   { "goto",                            CT_GOTO,             LANG_ALL                                                                    }, // PAWN
-   { "idouble",                         CT_TYPE,             LANG_D                                                                      },
-   { "if",                              CT_IF,               LANG_ALL                                                                    }, // PAWN
-   { "if",                              CT_PP_IF,            LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "ifdef",                           CT_PP_IF,            LANG_ALLC | FLAG_PP                                                         },
-   { "ifloat",                          CT_TYPE,             LANG_D                                                                      },
-   { "ifndef",                          CT_PP_IF,            LANG_ALLC | FLAG_PP                                                         },
-   { "implements",                      CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
-   { "implicit",                        CT_QUALIFIER,        LANG_CS                                                                     },
-   { "import",                          CT_IMPORT,           LANG_D | LANG_JAVA | LANG_ECMA                                              }, // fudged to get indenting
-   { "import",                          CT_PP_INCLUDE,       LANG_OC | FLAG_PP                                                           }, // ObjectiveC version of include
-   { "in",                              CT_IN,               LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_OC                          },
-   { "include",                         CT_PP_INCLUDE,       LANG_C | LANG_PAWN | FLAG_PP                                                }, // PAWN
-   { "inline",                          CT_QUALIFIER,        LANG_C                                                                      },
-   { "inout",                           CT_QUALIFIER,        LANG_D                                                                      },
-   { "instanceof",                      CT_SIZEOF,           LANG_JAVA | LANG_ECMA                                                       },
-   { "int",                             CT_TYPE,             LANG_ALLC                                                                   },
-   { "interface",                       CT_CLASS,            LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA             },
-   { "internal",                        CT_QUALIFIER,        LANG_CS                                                                     },
-   { "invariant",                       CT_INVARIANT,        LANG_D                                                                      },
-   { "ireal",                           CT_TYPE,             LANG_D                                                                      },
-   { "is",                              CT_SCOMPARE,         LANG_D | LANG_CS | LANG_VALA                                                },
-   { "lazy",                            CT_LAZY,             LANG_D                                                                      },
-   { "line",                            CT_PP_LINE,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "lock",                            CT_LOCK,             LANG_CS | LANG_VALA                                                         },
-   { "long",                            CT_TYPE,             LANG_ALLC                                                                   },
-   { "macro",                           CT_D_MACRO,          LANG_D                                                                      },
-   { "mixin",                           CT_CLASS,            LANG_D                                                                      }, // may need special handling
-   { "module",                          CT_D_MODULE,         LANG_D                                                                      },
-   { "mutable",                         CT_QUALIFIER,        LANG_CPP                                                                    },
-   { "namespace",                       CT_NAMESPACE,        LANG_CPP | LANG_CS | LANG_VALA                                              },
-   { "native",                          CT_NATIVE,           LANG_PAWN                                                                   }, // PAWN
-   { "native",                          CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
-   { "new",                             CT_NEW,              LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_PAWN | LANG_VALA | LANG_ECMA }, // PAWN
-   { "noexcept",                        CT_NOEXCEPT,         LANG_CPP                                                                    },
-   { "nonnull",                         CT_TYPE,             LANG_OC                                                                     },
-   { "not",                             CT_SARITH,           LANG_CPP                                                                    },
-   { "not_eq",                          CT_SCOMPARE,         LANG_CPP                                                                    },
-// { "null",                            CT_TYPE,             LANG_CS | LANG_D | LANG_JAVA | LANG_VALA                                    },
-   { "null_resettable",                 CT_OC_PROPERTY_ATTR, LANG_OC                                                                     },
-   { "null_unspecified",                CT_TYPE,             LANG_OC                                                                     },
-   { "nullable",                        CT_TYPE,             LANG_OC                                                                     },
-   { "object",                          CT_TYPE,             LANG_CS                                                                     },
-   { "operator",                        CT_OPERATOR,         LANG_CPP | LANG_CS | LANG_PAWN                                              }, // PAWN
-   { "or",                              CT_SBOOL,            LANG_CPP                                                                    },
-   { "or_eq",                           CT_SASSIGN,          LANG_CPP                                                                    },
-   { "out",                             CT_QUALIFIER,        LANG_CS | LANG_D | LANG_VALA                                                },
-   { "override",                        CT_QUALIFIER,        LANG_CPP | LANG_CS | LANG_D | LANG_VALA                                     },
-   { "package",                         CT_ACCESS,           LANG_D                                                                      },
-   { "package",                         CT_PACKAGE,          LANG_ECMA | LANG_JAVA                                                       },
-   { "params",                          CT_TYPE,             LANG_CS | LANG_VALA                                                         },
-   { "pragma",                          CT_PP_PRAGMA,        LANG_ALL | FLAG_PP                                                          },
-   { "private",                         CT_ACCESS,           LANG_ALLC                                                                   }, // not C
-   { "property",                        CT_PP_PROPERTY,      LANG_CS | FLAG_PP                                                           },
-   { "protected",                       CT_ACCESS,           LANG_ALLC                                                                   }, // not C
-   { "public",                          CT_ACCESS,           LANG_ALL                                                                    }, // PAWN // not C
-   { "readonly",                        CT_QUALIFIER,        LANG_CS                                                                     },
-   { "real",                            CT_TYPE,             LANG_D                                                                      },
-   { "ref",                             CT_QUALIFIER,        LANG_CS | LANG_VALA                                                         },
-   { "region",                          CT_PP_REGION,        LANG_ALL | FLAG_PP                                                          },
-   { "register",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "reinterpret_cast",                CT_TYPE_CAST,        LANG_CPP                                                                    },
-   { "remove",                          CT_GETSET,           LANG_CS                                                                     },
-   { "restrict",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "return",                          CT_RETURN,           LANG_ALL                                                                    }, // PAWN
-   { "sbyte",                           CT_TYPE,             LANG_CS                                                                     },
-   { "scope",                           CT_D_SCOPE,          LANG_D                                                                      },
-   { "sealed",                          CT_QUALIFIER,        LANG_CS                                                                     },
-   { "section",                         CT_PP_SECTION,       LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "self",                            CT_THIS,             LANG_OC                                                                     },
-   { "set",                             CT_GETSET,           LANG_CS | LANG_VALA                                                         },
-   { "short",                           CT_TYPE,             LANG_ALLC                                                                   },
-   { "signal",                          CT_ACCESS,           LANG_VALA                                                                   },
-   { "signals",                         CT_ACCESS,           LANG_CPP                                                                    },
-   { "signed",                          CT_TYPE,             LANG_C                                                                      },
-   { "size_t",                          CT_TYPE,             LANG_ALLC                                                                   },
-   { "sizeof",                          CT_SIZEOF,           LANG_C | LANG_CS | LANG_VALA | LANG_PAWN                                    }, // PAWN
-   { "sleep",                           CT_SIZEOF,           LANG_PAWN                                                                   }, // PAWN
-   { "stackalloc",                      CT_NEW,              LANG_CS                                                                     },
-   { "state",                           CT_STATE,            LANG_PAWN                                                                   }, // PAWN
-   { "static",                          CT_QUALIFIER,        LANG_ALL                                                                    }, // PAWN
-   { "static_cast",                     CT_TYPE_CAST,        LANG_CPP                                                                    },
-   { "stock",                           CT_STOCK,            LANG_PAWN                                                                   }, // PAWN
-   { "strictfp",                        CT_QUALIFIER,        LANG_JAVA                                                                   },
-   { "string",                          CT_TYPE,             LANG_CS | LANG_VALA                                                         },
-   { "struct",                          CT_STRUCT,           LANG_C | LANG_CS | LANG_D | LANG_VALA                                       },
-   { "super",                           CT_SUPER,            LANG_D | LANG_JAVA | LANG_ECMA                                              },
-   { "switch",                          CT_SWITCH,           LANG_ALL                                                                    }, // PAWN
-   { "synchronized",                    CT_QUALIFIER,        LANG_D | LANG_ECMA                                                          },
-   { "synchronized",                    CT_SYNCHRONIZED,     LANG_JAVA                                                                   },
-   { "tagof",                           CT_TAGOF,            LANG_PAWN                                                                   }, // PAWN
-   { "template",                        CT_TEMPLATE,         LANG_CPP | LANG_D                                                           },
-   { "this",                            CT_THIS,             LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA             },
-   { "throw",                           CT_THROW,            LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA             },
-   { "throws",                          CT_QUALIFIER,        LANG_JAVA | LANG_ECMA | LANG_VALA                                           },
-   { "transient",                       CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
-   { "true",                            CT_WORD,             LANG_ALL                                                                    },
-   { "try",                             CT_TRY,              LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA | LANG_VALA             },
-   { "tryinclude",                      CT_PP_INCLUDE,       LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "typedef",                         CT_TYPEDEF,          LANG_C | LANG_D                                                             },
-   { "typeid",                          CT_SIZEOF,           LANG_CPP | LANG_D                                                           },
-   { "typename",                        CT_TYPENAME,         LANG_CPP                                                                    },
-   { "typeof",                          CT_DECLTYPE,         LANG_C                                                                      },
-   { "typeof",                          CT_SIZEOF,           LANG_CS | LANG_D | LANG_VALA | LANG_ECMA                                    },
-   { "ubyte",                           CT_TYPE,             LANG_D                                                                      },
-   { "ucent",                           CT_TYPE,             LANG_D                                                                      },
-   { "uint",                            CT_TYPE,             LANG_CS | LANG_VALA | LANG_D                                                },
-   { "ulong",                           CT_TYPE,             LANG_CS | LANG_VALA | LANG_D                                                },
-   { "unchecked",                       CT_QUALIFIER,        LANG_CS                                                                     },
-   { "undef",                           CT_PP_UNDEF,         LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "union",                           CT_UNION,            LANG_C | LANG_D                                                             },
-   { "unittest",                        CT_UNITTEST,         LANG_D                                                                      },
-   { "unsafe",                          CT_UNSAFE,           LANG_CS                                                                     },
-   { "unsafe_unretained",               CT_QUALIFIER,        LANG_OC                                                                     },
-   { "unsigned",                        CT_TYPE,             LANG_C                                                                      },
-   { "ushort",                          CT_TYPE,             LANG_CS | LANG_VALA | LANG_D                                                },
-   { "using",                           CT_USING,            LANG_CPP | LANG_CS | LANG_VALA                                              },
-   { "var",                             CT_TYPE,             LANG_VALA | LANG_ECMA                                                       },
-   { "version",                         CT_D_VERSION,        LANG_D                                                                      },
-   { "virtual",                         CT_QUALIFIER,        LANG_CPP | LANG_CS | LANG_VALA                                              },
-   { "void",                            CT_TYPE,             LANG_ALLC                                                                   },
-   { "volatile",                        CT_QUALIFIER,        LANG_C | LANG_CS | LANG_JAVA | LANG_ECMA                                    },
-   { "volatile",                        CT_VOLATILE,         LANG_D                                                                      },
-   { "wchar",                           CT_TYPE,             LANG_D                                                                      },
-   { "wchar_t",                         CT_TYPE,             LANG_C                                                                      },
-   { "weak",                            CT_QUALIFIER,        LANG_VALA                                                                   },
-   { "when",                            CT_WHEN,             LANG_CS                                                                     },
-   { "where",                           CT_WHERE,            LANG_CS                                                                     },
-   { "while",                           CT_WHILE,            LANG_ALL                                                                    }, // PAWN
-   { "with",                            CT_D_WITH,           LANG_D | LANG_ECMA                                                          },
-   { "xor",                             CT_SARITH,           LANG_CPP                                                                    },
-   { "xor_eq",                          CT_SASSIGN,          LANG_CPP                                                                    },
-};
-
-
-void init_keywords()
-{
-   /* Please read comments above keywords array */
-
-   for (int idx = 1; idx < (int)ARRAY_SIZE(keywords); idx++)
-   {
-      chunk_tag_t *tag = &keywords[idx];
-
-      if (  (tag->lang_flags == LANG_ALL)
-         || (tag->lang_flags == LANG_ALLC))
-      {
-         continue;
-      }
-
-      if ((tag->lang_flags & LANG_C) != 0)
-      {
-         int               lang_flags = LANG_OC;
-         const chunk_tag_t *probe     = kw_static_match(tag, lang_flags);
-
-         if (probe == NULL)
-         {
-            tag->lang_flags |= lang_flags;
-         }
-         lang_flags = LANG_CPP;
-         probe      = kw_static_match(tag, lang_flags);
-
-         if (probe == NULL)
-         {
-            tag->lang_flags |= lang_flags;
-         }
-      }
-   }
-}
-
-
-static int kw_compare(const void *p1, const void *p2)
-{
-   const chunk_tag_t *t1 = static_cast<const chunk_tag_t *>(p1);
-   const chunk_tag_t *t2 = static_cast<const chunk_tag_t *>(p2);
-
-   return(strcmp(t1->tag, t2->tag));
-}
-
-
-bool keywords_are_sorted(void)
-{
-   for (int idx = 1; idx < static_cast<int> ARRAY_SIZE(keywords); idx++)
-   {
-      if (kw_compare(&keywords[idx - 1], &keywords[idx]) > 0)
-      {
-         fprintf(stderr, "%s: bad sort order at idx %d, words '%s' and '%s'\n",
-                 __func__, idx - 1, keywords[idx - 1].tag, keywords[idx].tag);
-         // coveralls will always complain.
-         // these lines are only needed for the developper.
-         log_flush(true);
-         cpd.error_count++;
-         return(false);
-      }
-   }
-
-   return(true);
-}
-
-
-void add_keyword(const std::string &tag, c_token_t type)
-{
-   // See if the keyword has already been added
-   dkwmap::iterator it = dkwm.find(tag);
-
-   if (it != dkwm.end())
-   {
-      LOG_FMT(LDYNKW, "%s(%d): changed '%s' to '%s'\n",
-              __func__, __LINE__, tag.c_str(), get_token_name(type));
-      (*it).second = type;
-      return;
-   }
-   // Insert the keyword
-   dkwm.insert(dkwmap::value_type(tag, type));
-   LOG_FMT(LDYNKW, "%s(%d): added '%s' as '%s'\n",
-           __func__, __LINE__, tag.c_str(), get_token_name(type));
-}
-
-
-static const chunk_tag_t *kw_static_first(const chunk_tag_t *tag)
-{
-   const chunk_tag_t *prev = tag - 1;
-
-   // TODO: avoid pointer arithmetics
-   // loop over static keyword array
-   while (  prev >= &keywords[0]                // not at beginning of keyword array
-         && strcmp(prev->tag, tag->tag) == 0)   // tags match
-   {
-      tag = prev;
-      prev--;
-   }
-   return(tag);
-}
-
-
-static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag, int lang_flags)
-{
-   bool in_pp = (  cpd.in_preproc != CT_NONE
-                && cpd.in_preproc != CT_PP_DEFINE);
-
-   for (const chunk_tag_t *iter = kw_static_first(tag);
-        iter < &keywords[ARRAY_SIZE(keywords)];
-        iter++)
-   {
-      bool pp_iter = (iter->lang_flags & FLAG_PP) != 0; // forcing value to bool
-
-      if (  (strcmp(iter->tag, tag->tag) == 0)
-         && language_is_set(iter->lang_flags)
-         && (lang_flags & iter->lang_flags)
-         && in_pp == pp_iter)
-      {
-         return(iter);
-      }
-   }
-
-   return(nullptr);
-}
-
-
-c_token_t find_keyword_type(const char *word, size_t len)
-{
-   if (len <= 0)
-   {
-      return(CT_NONE);
-   }
-   // check the dynamic word list first
-   string           ss(word, len);
-   dkwmap::iterator it = dkwm.find(ss);
-
-   if (it != dkwm.end())
-   {
-      return((*it).second);
-   }
-   chunk_tag_t key;
-
-   key.tag = ss.c_str();
-
-   // check the static word list
-   const chunk_tag_t *p_ret = static_cast<const chunk_tag_t *>(
-      bsearch(&key, keywords, ARRAY_SIZE(keywords), sizeof(keywords[0]), kw_compare));
-
-   if (p_ret != nullptr)
-   {
-      if (  strcmp(p_ret->tag, "__pragma") == 0
-         || strcmp(p_ret->tag, "_Pragma") == 0)
-      {
-         cpd.in_preproc = CT_PREPROC;
-      }
-      p_ret = kw_static_match(p_ret, cpd.lang_flags);
-   }
-   return((p_ret != nullptr) ? p_ret->type : CT_WORD);
-}
-
-
-int load_keyword_file(const char *filename)
-{
-   FILE *pf = fopen(filename, "r");
-
-   if (pf == nullptr)
-   {
-      LOG_FMT(LERR, "%s: fopen(%s) failed: %s (%d)\n",
-              __func__, filename, strerror(errno), errno);
-      cpd.error_count++;
-      return(EX_IOERR);
-   }
-   const int max_line_length = 256;
-   const int max_arg_count   = 2;
-
-   // maximal length of a line in the file
-   char   buf[max_line_length];
-   char   *args[max_arg_count];
-   size_t line_no = 0;
-
-   // read file line by line
-   while (fgets(buf, max_line_length, pf) != nullptr)
-   {
-      line_no++;
-
-      // remove comments after '#' sign
-      char *ptr;
-
-      if ((ptr = strchr(buf, '#')) != nullptr)
-      {
-         *ptr = 0; // set string end where comment begins
-      }
-      size_t argc = Args::SplitLine(buf, args, max_arg_count);
-
-      if (argc > 0)
-      {
-         if (  argc == 1
-            && CharTable::IsKw1(*args[0]))
-         {
-            add_keyword(args[0], CT_TYPE);
-         }
-         else
-         {
-            LOG_FMT(LWARN, "%s:%zu Invalid line (starts with '%s')\n",
-                    filename, line_no, args[0]);
-            cpd.error_count++;
-         }
-      }
-      else
-      {
-         continue; // the line is empty
-      }
-   }
-   fclose(pf);
-   return(EX_OK);
-} // load_keyword_file
-
-
-void print_keywords(FILE *pfile)
-{
-   for (const auto &keyword_pair : dkwm)
-   {
-      c_token_t tt = keyword_pair.second;
-
-      if (tt == CT_TYPE)
-      {
-         fprintf(pfile, "type %*.s%s\n",
-                 uncrustify::limits::MAX_OPTION_NAME_LEN - 4, " ",
-                 keyword_pair.first.c_str());
-      }
-      else if (tt == CT_MACRO_OPEN)
-      {
-         fprintf(pfile, "macro-open %*.s%s\n",
-                 uncrustify::limits::MAX_OPTION_NAME_LEN - 11, " ",
-                 keyword_pair.first.c_str());
-      }
-      else if (tt == CT_MACRO_CLOSE)
-      {
-         fprintf(pfile, "macro-close %*.s%s\n",
-                 uncrustify::limits::MAX_OPTION_NAME_LEN - 12, " ",
-                 keyword_pair.first.c_str());
-      }
-      else if (tt == CT_MACRO_ELSE)
-      {
-         fprintf(pfile, "macro-else %*.s%s\n",
-                 uncrustify::limits::MAX_OPTION_NAME_LEN - 11, " ",
-                 keyword_pair.first.c_str());
-      }
-      else
-      {
-         const char *tn = get_token_name(tt);
-
-         fprintf(pfile, "set %s %*.s%s\n",
-                 tn,
-                 uncrustify::limits::MAX_OPTION_NAME_LEN - (4 + static_cast<int>(strlen(tn))),
-                 " ", keyword_pair.first.c_str());
-      }
-   }
-}
-
-
-void clear_keyword_file(void)
-{
-   dkwm.clear();
-}
-
-
-pattern_class_e get_token_pattern_class(c_token_t tok)
-{
-   // TODO: instead of this switch better assign the pattern class to each statement
-   switch (tok)
-   {
-   case CT_IF:
-   case CT_ELSEIF:
-   case CT_SWITCH:
-   case CT_FOR:
-   case CT_WHILE:
-   case CT_SYNCHRONIZED:
-   case CT_USING_STMT:
-   case CT_LOCK:
-   case CT_D_WITH:
-   case CT_D_VERSION_IF:
-   case CT_D_SCOPE_IF:
-      return(pattern_class_e::PBRACED);
-
-   case CT_ELSE:
-      return(pattern_class_e::ELSE);
-
-   case CT_DO:
-   case CT_TRY:
-   case CT_FINALLY:
-   case CT_BODY:
-   case CT_UNITTEST:
-   case CT_UNSAFE:
-   case CT_VOLATILE:
-   case CT_GETSET:
-      return(pattern_class_e::BRACED);
-
-   case CT_CATCH:
-   case CT_D_VERSION:
-   case CT_DEBUG:
-      return(pattern_class_e::OPBRACED);
-
-   case CT_NAMESPACE:
-      return(pattern_class_e::VBRACED);
-
-   case CT_WHILE_OF_DO:
-      return(pattern_class_e::PAREN);
-
-   case CT_INVARIANT:
-      return(pattern_class_e::OPPAREN);
-
-   default:
-      return(pattern_class_e::NONE);
-   } // switch
-}    // get_token_pattern_class
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.h
deleted file mode 100644
index 3a6f9ea5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @file keywords.h
- * prototypes for keywords.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef KEYWORDS_H_INCLUDED
-#define KEYWORDS_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-/**
- * Initializes keywords table
- */
-void init_keywords(void);
-
-/**
- * Loads the dynamic keywords from a file
- *
- * @param filename  The path to the file to load
- *
- * @retval EX_OK     successfully read keywords from file
- * @retval EX_IOERR  reading keywords file failed
- */
-int load_keyword_file(const char *filename);
-
-
-/**
- * Search first the dynamic and then the static table for a matching keyword
- *
- * @param word  Pointer to the text -- NOT zero terminated
- * @param len   The length of the text
- *
- * @return CT_WORD (no match) or the keyword token
- */
-c_token_t find_keyword_type(const char *word, size_t len);
-
-
-/**
- * Adds a keyword to the list of dynamic keywords
- *
- * @param tag   The tag (string) must be zero terminated
- * @param type  The type, usually CT_TYPE
- */
-void add_keyword(const std::string &tag, c_token_t type);
-
-
-void print_keywords(FILE *pfile);
-
-
-void clear_keyword_file(void);
-
-
-//! Returns the pattern that the keyword needs based on the token
-pattern_class_e get_token_pattern_class(c_token_t tok);
-
-
-bool keywords_are_sorted(void);
-
-
-#endif /* KEYWORDS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.cpp
deleted file mode 100644
index a3b3ed65..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.cpp
+++ /dev/null
@@ -1,523 +0,0 @@
-/**
- * @file lang_pawn.cpp
- * Special functions for pawn stuff
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "lang_pawn.h"
-
-#include "prototypes.h"
-
-using namespace uncrustify;
-
-
-/**
- * Checks to see if a token continues a statement to the next line.
- * We need to check for 'open' braces/paren/etc because the level doesn't
- * change until the token after the open.
- */
-static bool pawn_continued(chunk_t *pc, size_t br_level);
-
-
-/**
- * Functions prototypes and definitions can only appear in level 0.
- *
- * Function prototypes start with "native", "forward", or are just a function
- * with a trailing semicolon instead of a open brace (or something else)
- *
- * somefunc(params)              <-- def
- * stock somefunc(params)        <-- def
- * somefunc(params);             <-- proto
- * forward somefunc(params)      <-- proto
- * native somefunc[rect](params) <-- proto
- *
- * Functions start with 'stock', 'static', 'public', or '@' (on level 0)
- *
- * Variable definitions start with 'stock', 'static', 'new', or 'public'.
- */
-static chunk_t *pawn_process_line(chunk_t *start);
-
-
-//! We are on a level 0 function proto of def
-static chunk_t *pawn_mark_function0(chunk_t *start, chunk_t *fcn);
-
-
-/**
- * follows a variable definition at level 0 until the end.
- * Adds a semicolon at the end, if needed.
- */
-static chunk_t *pawn_process_variable(chunk_t *start);
-
-
-static chunk_t *pawn_process_func_def(chunk_t *pc);
-
-
-chunk_t *pawn_add_vsemi_after(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  chunk_is_token(pc, CT_VSEMICOLON)
-      || chunk_is_token(pc, CT_SEMICOLON))
-   {
-      return(pc);
-   }
-   chunk_t *next = chunk_get_next_nc(pc);
-
-   if (  next != nullptr
-      && (  chunk_is_token(next, CT_VSEMICOLON)
-         || chunk_is_token(next, CT_SEMICOLON)))
-   {
-      return(pc);
-   }
-   chunk_t chunk = *pc;
-
-   set_chunk_type(&chunk, CT_VSEMICOLON);
-   set_chunk_parent(&chunk, CT_NONE);
-   chunk.str     = options::mod_pawn_semicolon() ? ";" : "";
-   chunk.column += pc->len();
-
-   LOG_FMT(LPVSEMI, "%s: Added VSEMI on line %zu, prev='%s' [%s]\n",
-           __func__, pc->orig_line, pc->text(),
-           get_token_name(pc->type));
-
-   return(chunk_add_after(&chunk, pc));
-}
-
-
-void pawn_scrub_vsemi(void)
-{
-   constexpr static auto LCURRENT = LPVSEMI;
-
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("mod_pawn_semicolon");
-
-   if (!options::mod_pawn_semicolon())
-   {
-      return;
-   }
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (pc->type != CT_VSEMICOLON)
-      {
-         continue;
-      }
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-      if (chunk_is_token(prev, CT_BRACE_CLOSE))
-      {
-         if (  get_chunk_parent_type(prev) == CT_IF
-            || get_chunk_parent_type(prev) == CT_ELSE
-            || get_chunk_parent_type(prev) == CT_SWITCH
-            || get_chunk_parent_type(prev) == CT_CASE
-            || get_chunk_parent_type(prev) == CT_WHILE_OF_DO)
-         {
-            pc->str.clear();
-         }
-      }
-   }
-}
-
-
-static bool pawn_continued(chunk_t *pc, size_t br_level)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return(false);
-   }
-
-   if (  pc->level > br_level
-      || chunk_is_token(pc, CT_ARITH)
-      || chunk_is_token(pc, CT_SHIFT)
-      || chunk_is_token(pc, CT_CARET)
-      || chunk_is_token(pc, CT_QUESTION)
-      || chunk_is_token(pc, CT_BOOL)
-      || chunk_is_token(pc, CT_ASSIGN)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_COMPARE)
-      || chunk_is_token(pc, CT_IF)
-      || chunk_is_token(pc, CT_ELSE)
-      || chunk_is_token(pc, CT_DO)
-      || chunk_is_token(pc, CT_SWITCH)
-      || chunk_is_token(pc, CT_WHILE)
-      || chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_token(pc, CT_VBRACE_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || get_chunk_parent_type(pc) == CT_IF
-      || get_chunk_parent_type(pc) == CT_ELSE
-      || get_chunk_parent_type(pc) == CT_ELSEIF
-      || get_chunk_parent_type(pc) == CT_DO
-      || get_chunk_parent_type(pc) == CT_FOR
-      || get_chunk_parent_type(pc) == CT_SWITCH
-      || get_chunk_parent_type(pc) == CT_WHILE
-      || get_chunk_parent_type(pc) == CT_FUNC_DEF
-      || get_chunk_parent_type(pc) == CT_ENUM
-      || pc->flags.test_any(PCF_IN_ENUM | PCF_IN_STRUCT)
-      || chunk_is_str(pc, ":", 1)
-      || chunk_is_str(pc, "+", 1)
-      || chunk_is_str(pc, "-", 1))
-   {
-      return(true);
-   }
-   return(false);
-} // pawn_continued
-
-
-void pawn_prescan(void)
-{
-   LOG_FUNC_ENTRY();
-
-   /*
-    * Start at the beginning and step through the entire file, and clean up
-    * any questionable stuff
-    */
-   bool    did_nl = true;
-   chunk_t *pc    = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      if (  did_nl
-         && pc->type != CT_PREPROC
-         && !chunk_is_newline(pc)
-         && pc->level == 0)
-      {
-         // pc now points to the start of a line
-         pc = pawn_process_line(pc);
-      }
-
-      // note that continued lines are ignored
-      if (pc != nullptr)
-      {
-         did_nl = (chunk_is_token(pc, CT_NEWLINE));
-      }
-      pc = chunk_get_next_nc(pc);
-   }
-}
-
-
-static chunk_t *pawn_process_line(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   //LOG_FMT(LSYS, "%s: %d - %s\n", __func__,
-   //        start->orig_line, start->text());
-
-   if (  chunk_is_token(start, CT_NEW)
-      || chunk_is_str(start, "const", 5))
-   {
-      return(pawn_process_variable(start));
-   }
-   // if a open paren is found before an assign, then this is a function
-   chunk_t *fcn = nullptr;
-
-   if (chunk_is_token(start, CT_WORD))
-   {
-      fcn = start;
-   }
-   chunk_t *pc = start;
-
-   while (  ((pc = chunk_get_next_nc(pc)) != nullptr)
-         && !chunk_is_str(pc, "(", 1)
-         && pc->type != CT_ASSIGN
-         && pc->type != CT_NEWLINE)
-   {
-      if (  pc->level == 0
-         && (  chunk_is_token(pc, CT_FUNCTION)
-            || chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, CT_OPERATOR_VAL)))
-      {
-         fcn = pc;
-      }
-   }
-
-   if (pc != nullptr)
-   {
-      if (chunk_is_token(pc, CT_ASSIGN))
-      {
-         return(pawn_process_variable(pc));
-      }
-   }
-
-   if (fcn != nullptr)
-   {
-      //LOG_FMT(LSYS, "FUNCTION: %s\n", fcn->text());
-      return(pawn_mark_function0(start, fcn));
-   }
-
-   if (chunk_is_token(start, CT_ENUM))
-   {
-      pc = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
-      return(pc);
-   }
-   //LOG_FMT(LSYS, "%s: Don't understand line %d, starting with '%s' [%s]\n",
-   //        __func__, start->orig_line, start->text(), get_token_name(start->type));
-   return(start);
-} // pawn_process_line
-
-
-static chunk_t *pawn_process_variable(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *prev = nullptr;
-   chunk_t *pc   = start;
-
-   while ((pc = chunk_get_next_nc(pc)) != nullptr)
-   {
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         && prev != nullptr                          // Issue 2586
-         && !pawn_continued(prev, start->level))
-      {
-         if (  prev->type != CT_VSEMICOLON
-            && prev->type != CT_SEMICOLON)
-         {
-            pawn_add_vsemi_after(prev);
-         }
-         break;
-      }
-      prev = pc;
-   }
-   return(pc);
-}
-
-
-void pawn_add_virtual_semicolons(void)
-{
-   LOG_FUNC_ENTRY();
-
-   // Add Pawn virtual semicolons
-   if (language_is_set(LANG_PAWN))
-   {
-      chunk_t *prev = nullptr;
-      chunk_t *pc   = chunk_get_head();
-
-      while ((pc = chunk_get_next(pc)) != nullptr)
-      {
-         if (  !chunk_is_comment(pc)
-            && !chunk_is_newline(pc)
-            && pc->type != CT_VBRACE_CLOSE
-            && pc->type != CT_VBRACE_OPEN)
-         {
-            prev = pc;
-         }
-
-         if (  prev == nullptr
-            || (  pc->type != CT_NEWLINE
-               && pc->type != CT_BRACE_CLOSE
-               && pc->type != CT_VBRACE_CLOSE))
-         {
-            continue;
-         }
-
-         // we just hit a newline and we have a previous token
-         if (  !prev->flags.test(PCF_IN_PREPROC)
-            && !prev->flags.test_any(PCF_IN_ENUM | PCF_IN_STRUCT)
-            && prev->type != CT_VSEMICOLON
-            && prev->type != CT_SEMICOLON
-            && !pawn_continued(prev, prev->brace_level))
-         {
-            pawn_add_vsemi_after(prev);
-            prev = nullptr;
-         }
-      }
-   }
-}
-
-
-static chunk_t *pawn_mark_function0(chunk_t *start, chunk_t *fcn)
-{
-   LOG_FUNC_ENTRY();
-
-   // handle prototypes
-   if (start == fcn)
-   {
-      chunk_t *last = chunk_get_next_type(fcn, CT_PAREN_CLOSE, fcn->level);
-      last = chunk_get_next(last);
-
-      if (chunk_is_token(last, CT_SEMICOLON))
-      {
-         LOG_FMT(LPFUNC, "%s: %zu] '%s' proto due to semicolon\n",
-                 __func__, fcn->orig_line, fcn->text());
-         set_chunk_type(fcn, CT_FUNC_PROTO);
-         return(last);
-      }
-   }
-   else
-   {
-      if (  chunk_is_token(start, CT_FORWARD)
-         || chunk_is_token(start, CT_NATIVE))
-      {
-         LOG_FMT(LPFUNC, "%s: %zu] '%s' [%s] proto due to %s\n",
-                 __func__, fcn->orig_line, fcn->text(),
-                 get_token_name(fcn->type),
-                 get_token_name(start->type));
-         set_chunk_type(fcn, CT_FUNC_PROTO);
-         return(chunk_get_next_nc(fcn));
-      }
-   }
-   // Not a prototype, so it must be a function def
-   return(pawn_process_func_def(fcn));
-}
-
-
-static chunk_t *pawn_process_func_def(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   // We are on a function definition
-   set_chunk_type(pc, CT_FUNC_DEF);
-
-   LOG_FMT(LPFUNC, "%s: %zu:%zu %s\n",
-           __func__, pc->orig_line, pc->orig_col, pc->text());
-
-   /*
-    * If we don't have a brace open right after the close fparen, then
-    * we need to add virtual braces around the function body.
-    */
-   chunk_t *clp  = chunk_get_next_str(pc, ")", 1, 0);
-   chunk_t *last = chunk_get_next_ncnnl(clp);
-
-   if (last != nullptr)
-   {
-      LOG_FMT(LPFUNC, "%s: %zu] last is '%s' [%s]\n",
-              __func__, last->orig_line, last->text(), get_token_name(last->type));
-   }
-
-   // See if there is a state clause after the function
-   if (  last != nullptr
-      && chunk_is_str(last, "<", 1))
-   {
-      LOG_FMT(LPFUNC, "%s: %zu] '%s' has state angle open %s\n",
-              __func__, pc->orig_line, pc->text(), get_token_name(last->type));
-
-      set_chunk_type(last, CT_ANGLE_OPEN);
-      set_chunk_parent(last, CT_FUNC_DEF);
-
-      while (  ((last = chunk_get_next(last)) != nullptr)
-            && !chunk_is_str(last, ">", 1))
-      {
-         // do nothing just search, TODO: use search_chunk
-      }
-
-      if (last != nullptr)
-      {
-         LOG_FMT(LPFUNC, "%s: %zu] '%s' has state angle close %s\n",
-                 __func__, pc->orig_line, pc->text(), get_token_name(last->type));
-         set_chunk_type(last, CT_ANGLE_CLOSE);
-         set_chunk_parent(last, CT_FUNC_DEF);
-      }
-      last = chunk_get_next_ncnnl(last);
-   }
-
-   if (last == nullptr)
-   {
-      return(last);
-   }
-
-   if (chunk_is_token(last, CT_BRACE_OPEN))
-   {
-      set_chunk_parent(last, CT_FUNC_DEF);
-      last = chunk_get_next_type(last, CT_BRACE_CLOSE, last->level);
-
-      if (last != nullptr)
-      {
-         set_chunk_parent(last, CT_FUNC_DEF);
-      }
-   }
-   else
-   {
-      LOG_FMT(LPFUNC, "%s: %zu] '%s' fdef: expected brace open: %s\n",
-              __func__, pc->orig_line, pc->text(), get_token_name(last->type));
-
-      // do not insert a vbrace before a preproc
-      if (last->flags.test(PCF_IN_PREPROC))
-      {
-         return(last);
-      }
-      chunk_t chunk = *last;
-      chunk.str.clear();
-      set_chunk_type(&chunk, CT_VBRACE_OPEN);
-      set_chunk_parent(&chunk, CT_FUNC_DEF);
-
-      chunk_t *prev = chunk_add_before(&chunk, last);
-      last = prev;
-
-      // find the next newline at level 0
-      prev = chunk_get_next_ncnnl(prev);
-
-      do
-      {
-         LOG_FMT(LPFUNC, "%s:%zu] check %s, level %zu\n",
-                 __func__, prev->orig_line, get_token_name(prev->type), prev->level);
-
-         if (  chunk_is_token(prev, CT_NEWLINE)
-            && prev->level == 0)
-         {
-            chunk_t *next = chunk_get_next_ncnnl(prev);
-
-            if (  next != nullptr
-               && next->type != CT_ELSE
-               && next->type != CT_WHILE_OF_DO)
-            {
-               break;
-            }
-         }
-         prev->level++;
-         prev->brace_level++;
-         last = prev;
-      } while ((prev = chunk_get_next(prev)) != nullptr);
-
-      if (last != nullptr)
-      {
-         LOG_FMT(LPFUNC, "%s:%zu] ended on %s, level %zu\n",
-                 __func__, last->orig_line, get_token_name(last->type), last->level);
-      }
-      chunk = *last;
-      chunk.str.clear();
-      set_chunk_type(&chunk, CT_VBRACE_CLOSE);
-      set_chunk_parent(&chunk, CT_FUNC_DEF);
-      chunk.column     += last->len();
-      chunk.level       = 0;
-      chunk.brace_level = 0;
-      last              = chunk_add_after(&chunk, last);
-   }
-   return(last);
-} // pawn_process_func_def
-
-
-chunk_t *pawn_check_vsemicolon(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   // Grab the open VBrace
-   chunk_t *vb_open = chunk_get_prev_type(pc, CT_VBRACE_OPEN, -1);
-
-   /*
-    * Grab the item before the newline
-    * Don't do anything if:
-    *  - the only thing previous is the V-Brace open
-    *  - in a preprocessor
-    *  - level > (vb_open->level + 1) -- ie, in () or []
-    *  - it is something that needs a continuation
-    *    + arith, assign, bool, comma, compare
-    */
-   chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-   if (  prev == nullptr
-      || prev == vb_open
-      || prev->flags.test(PCF_IN_PREPROC)
-      || pawn_continued(prev, vb_open->level + 1))
-   {
-      if (prev != nullptr)
-      {
-         LOG_FMT(LPVSEMI, "%s:  no  VSEMI on line %zu, prev='%s' [%s]\n",
-                 __func__, prev->orig_line, prev->text(), get_token_name(prev->type));
-      }
-      return(pc);
-   }
-   return(pawn_add_vsemi_after(prev));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.h
deleted file mode 100644
index 01fd5908..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @file long_pawn.h
- * prototypes for long_pawn.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef LONG_PAWN_H_INCLUDED
-#define LONG_PAWN_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * Does a scan of level 0 BEFORE stuff in combine.cpp is called.
- * At this point, VSemis have been added only in VBraces.
- * Otherwise, all level info is correct, except for unbraced functions.
- *
- * We are looking for unbraced functions.
- */
-void pawn_prescan(void);
-
-
-void pawn_add_virtual_semicolons(void);
-
-
-/**
- * We are in a virtual brace and hit a newline.
- * If this should end the vbrace, then insert a VSEMICOLON and return that.
- *
- * @param pc  The newline (CT_NEWLINE)
- *
- * @return Either the newline or the newly inserted virtual semicolon
- */
-chunk_t *pawn_check_vsemicolon(chunk_t *pc);
-
-
-/**
- * Turns certain virtual semicolons invisible.
- *  - after a close brace with a parent of switch, case, else, if
- */
-void pawn_scrub_vsemi(void);
-
-
-//! add a semicolon after ...
-chunk_t *pawn_add_vsemi_after(chunk_t *pc);
-
-
-#endif /* LONG_PAWN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.cpp
deleted file mode 100644
index 77e577f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @file language_tools.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "language_tools.h"
-
-
-/**
- * check if the language(s) is/are set
- */
-bool language_is_set(size_t lang)
-{
-   return((cpd.lang_flags & lang) != 0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.h
deleted file mode 100644
index 5f57c3f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file language_tools.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-#ifndef LANGUAGE_TOOLS_H_INCLUDED
-#define LANGUAGE_TOOLS_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * check if the language(s) is/are set
- */
-bool language_is_set(size_t lang);
-
-#endif /* LANGUAGE_TOOLS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_levels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_levels.h
deleted file mode 100644
index d809514a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_levels.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * @file log_levels.h
- *
- * Enum for log levels.
- * Use these for the log severities in LOG_FMT(), etc.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel October 2015- 2021
- * @license GPL v2+
- */
-
-#ifndef LOG_LEVELS_H_INCLUDED
-#define LOG_LEVELS_H_INCLUDED
-
-/**
- * list of available log levels
- *
- * The user defines which log level is active using the
- * -L or -log option.
- * use -L A to set all the levels
- * All messages which have a level that is active will be stored to the log
- * file.
- * All other log messages will be discarded.
- * Different parts of the software use different log levels.
- * This allows to log only operations of a specific operation.
- * This eases debugging.
- * To get all log messages use the option -La
- * By default only system messages (level=LSYS) are logged.
- */
-enum log_sev_t
-{
-   LSYS      = 0,   //! system messages
-   LERR      = 1,   //! error messages
-   LWARN     = 2,   //! warnings
-   LNOTE     = 3,   //! user notifications
-   LINFO     = 4,   //! user informations
-   LDATA     = 5,   //! data logging
-
-   LFILELIST = 8,   //! Files in the file list file
-   LLINEENDS = 9,   //! Show which line endings are used
-   LCASTS    = 10,  //! align casts
-   LALBR     = 11,  //! align braces
-   LALTD     = 12,  //! Align Typedef
-   LALPP     = 13,  //! align #define
-   LALPROTO  = 14,  //! align prototype
-   LALNLC    = 15,  //! align backslash-newline
-   LALTC     = 16,  //! align trailing comments
-   LALADD    = 17,  //! align add
-   LALASS    = 18,  //! align assign
-   LFVD      = 19,  //! fix_var_def
-   LFVD2     = 20,  //! fix_var_def-2
-   LINDENT   = 21,  //! indent_text
-   LINDENT2  = 22,  //! indent_text tab level
-   LINDPSE   = 23,  //! indent_text stack
-   LINDPC    = 24,  //! indent play-by-play
-   LNEWLINE  = 25,  //! newlines
-   LPF       = 26,  //! Parse Frame
-   LSTMT     = 27,  //! Marking statements/expressions
-   LTOK      = 28,  //! Tokenize
-   LALRC     = 29,  //! align right comment
-   LCMTIND   = 30,  //! Comment Indent
-   LINDLINE  = 31,  //! indent line
-   LSIB      = 32,  //! Scan IB
-   LRETURN   = 33,  //! add/remove parens for return
-   LBRDEL    = 34,  //! brace removal
-   LFCN      = 35,  //! function detection
-   LFCNP     = 36,  //! function parameters
-   LPCU      = 37,  //! parse cleanup
-   LDYNKW    = 38,  //! dynamic keywords
-   LOUTIND   = 39,  //! output indent
-   LBCSAFTER = 40,  //! Brace cleanup stack - after each token
-   LBCSPOP   = 41,  //! Brace cleanup stack - log pops
-   LBCSPUSH  = 42,  //! Brace cleanup stack - log push
-   LBCSSWAP  = 43,  //! Brace cleanup stack - log swaps
-   LFTOR     = 44,  //! Class Ctor or Dtor
-   LAS       = 45,  //! align_stack
-   LPPIS     = 46,  //! Preprocessor Indent and Space
-   LTYPEDEF  = 47,  //! Typedef and function types
-   LVARDEF   = 48,  //! Variable def marking
-   LDEFVAL   = 49,  //! define values
-   LPVSEMI   = 50,  //! Pawn: virtual semicolons
-   LPFUNC    = 51,  //! Pawn: function recognition
-   LSPLIT    = 52,  //! Line splitting
-   LFTYPE    = 53,  //! Function type detection
-   LTEMPL    = 54,  //! Template detection
-   LPARADD   = 55,  //! adding parens in if/while
-   LPARADD2  = 56,  //! adding parens in if/while - details
-   LBLANKD   = 57,  //! blank line details
-   LTEMPFUNC = 58,  //! Template function detection
-   LSCANSEMI = 59,  //! scan semicolon removal
-   LDELSEMI  = 60,  //! Removing semicolons
-   LFPARAM   = 61,  //! Testing for a full parameter
-   LNL1LINE  = 62,  //! NL check for 1 liners
-   LPFCHK    = 63,  //! Parse Frame check function call
-   LAVDB     = 64,  //! align var def braces
-   LSORT     = 65,  //! Sorting
-   LSPACE    = 66,  //! Space
-   LALIGN    = 67,  //! align
-   LALAGAIN  = 68,  //! align again
-   LOPERATOR = 69,  //! operator
-   LASFCP    = 70,  //! Align Same Function Call Params
-   LINDLINED = 71,  //! indent line details
-   LBCTRL    = 72,  //! beautifier control
-   LRMRETURN = 73,  //! remove 'return;'
-   LPPIF     = 74,  //! #if/#else/#endif pair processing
-   LMCB      = 75,  //! mod_case_brace
-   LBRCH     = 76,  //! if brace chain
-   LFCNR     = 77,  //! function return type
-   LOCCLASS  = 78,  //! OC Class stuff
-   LOCMSG    = 79,  //! OC Message stuff
-   LBLANK    = 80,  //! Blank Lines
-   LOBJCWORD = 81,  //! Convert keyword to CT_WORD in certain circumstances
-   LCHANGE   = 82,  //! something changed
-   LCONTTEXT = 83,  //! comment cont_text set
-   LANNOT    = 84,  //! Java annotation
-   LOCBLK    = 85,  //! OC Block stuff
-   LFLPAREN  = 86,  //! Flag paren
-   LOCMSGD   = 87,  //! OC Message declaration
-   LINDENTAG = 88,  //! indent again
-   LNFD      = 89,  //! newline-function-def
-   LJDBI     = 90,  //! Java Double Brace Init
-   LSETPAR   = 91,  //! set_chunk_parent()
-   LSETTYP   = 92,  //! set_chunk_type()
-   LSETFLG   = 93,  //! set_chunk_flags()
-   LNLFUNCT  = 94,  //! newlines before function
-   LCHUNK    = 95,  //! Add or delete chunk
-   LBC       = 96,  //! brace cleanup
-   LCOMBINE  = 97,  //! combine
-   LGUY98    = 98,  //! for guy-test
-   LGUY      = 99,  //! for guy-test
-   LBR       = 100, //! braces
-   LOUTPUT   = 101, //! output
-   LUNC      = 102, //! rules used in uncrustify.cpp
-   LQT       = 103, //! load/save options for Qt
-   LOTHER    = 255, //! stuff that doesn't neatly fit any other category
-};
-
-#endif /* LOG_LEVELS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.cpp
deleted file mode 100644
index 0117ff20..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @file log_rules.cpp
- * is an extract from space.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "log_rules.h"
-
-#include "unc_tools.h"
-
-
-void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second)
-{
-   LOG_FUNC_ENTRY();
-
-   if (second->type != CT_NEWLINE)
-   {
-      LOG_FMT(LSPACE, "%s(%zu): first->orig_line is %zu, first->orig_col is %zu, first->text() is '%s', [%s/%s] <===>\n",
-              func, line, first->orig_line, first->orig_col, first->text(),
-              get_token_name(first->type), get_token_name(get_chunk_parent_type(first)));
-      LOG_FMT(LSPACE, "           second->orig_line is %zu, second->orig_col is %zu, second->text() is '%s', [%s/%s] :",
-              second->orig_line, second->orig_col, second->text(),
-              get_token_name(second->type), get_token_name(get_chunk_parent_type(second)));
-      LOG_FMT(LSPACE, " rule %s[line %zu]\n",
-              rule, line);
-   }
-}
-
-
-#ifdef SUPER_LOG
-
-
-void log_rule3(log_sev_t sev, const char *func, size_t line, const char *rule)
-#else
-
-
-void log_rule3(log_sev_t sev, const char *func, const char *rule)
-#endif
-{
-   // some Windows platforms provide a qualified function name ("ABC::XYZ::function_Name")
-   // as __func__; call get_unqualified_func_name() to return an unqualified function name
-
-   func = get_unqualified_func_name(func);
-
-#ifdef SUPER_LOG
-   LOG_FMT(sev, "log_rule(%s:%zu): rule is '%s'\n", func, line, rule);
-#else
-   LOG_FMT(sev, "log_rule(%s): rule is '%s'\n", func, rule);
-#endif
-}
-
-
-void log_rule4(const char *rule, chunk_t *first)
-{
-   if (cpd.html_file == nullptr)
-   {
-      return;
-   }
-
-   if (first->tracking == nullptr)
-   {
-      first->tracking = new track_list;
-      first->tracking->reserve(3);
-   }
-   // copy the rule
-   size_t length = strlen(rule) + 1;
-   char   *r     = (char *)malloc(length);
-
-   strcpy(r, rule);
-   size_t   a_number = get_A_Number();
-   Track_nr A        = make_pair(a_number, r);
-
-   first->tracking->push_back(A);
-   size_t sizeOfTrack = first->tracking->size();
-
-   LOG_FMT(LSPACE, "log_rule4(%d): rule is '%s', after '%s'', at line %zu, tracking number is %zu, size is %zu\n",
-           __LINE__, rule, first->text(), first->orig_line, a_number, sizeOfTrack);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.h
deleted file mode 100644
index 9fd201cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @file log_rules.h
- * prototypes for log_rules.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#ifndef LOG_RULES_H_INCLUDED
-#define LOG_RULES_H_INCLUDED
-
-#include "chunk_list.h"
-#include "uncrustify.h"
-
-using namespace uncrustify;
-
-#if defined DEBUG
-#define log_rule(rule)                                      \
-   do {                                                     \
-      log_rule2(__func__, __LINE__, (rule), first, second); \
-      log_rule4((rule), first);                             \
-                                                            \
-   } while (0)
-#else
-#define log_rule(rule)                                      \
-   do {                                                     \
-      log_rule2(__func__, __LINE__, (rule), first, second); \
-   } while (0)
-#endif
-
-#define log_rule_short(rule)                                \
-   do {                                                     \
-      log_rule2(__func__, __LINE__, (rule), first, second); \
-   } while (0)
-
-// if you need more debug informations, remove the comment at the next line
-#define SUPER_LOG    1
-#ifdef SUPER_LOG
-#define log_rule_B(rule)                               \
-   do {                                                \
-      log_rule3(LCURRENT, __func__, __LINE__, (rule)); \
-   } while (0)
-#else
-#define log_rule_B(rule)                     \
-   do {                                      \
-      log_rule3(LCURRENT, __func__, (rule)); \
-   } while (0)
-#endif
-
-void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second);
-
-
-#ifdef SUPER_LOG
-void log_rule3(log_sev_t sev, const char *func, size_t line, const char *rule);
-
-#else
-void log_rule3(log_sev_t sev, const char *func, const char *rule);
-
-#endif
-
-void log_rule4(const char *rule, chunk_t *first);
-
-#endif /* LOG_RULES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.cpp
deleted file mode 100644
index 969a4192..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-/**
- * @file logger.cpp
- *
- * Functions to do logging.
- *
- * If a log statement ends in a newline, the current log is ended.
- * When the log severity changes, an implicit newline is inserted.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "logger.h"
-
-#include "compat.h"
-
-#include <cstdarg>                   // to get va_start, va_end
-
-
-struct log_fcn_info
-{
-   log_fcn_info(const char *name_, int line_)
-      : name(name_)
-      , line(line_)
-   {
-   }
-
-   const char *name;
-   int        line;
-};
-static std::deque<log_fcn_info> g_fq;
-
-//! Private log structure
-struct log_buf
-{
-   log_buf()
-      : log_file(nullptr)
-      , sev(LSYS)
-      , in_log(0)
-      , buf_len(0)
-      , show_hdr(false)
-   {
-      bufX.clear();
-      bufX.resize(256);
-   }
-
-   FILE              *log_file; //! file where the log messages are stored into
-   log_sev_t         sev;       //! log level determines which messages are logged
-   int               in_log;    //! flag indicates if a log operation is going on
-   size_t            buf_len;   //! number of characters currently stored in buffer
-   std::vector<char> bufX;      //! buffer holds the log message
-   log_mask_t        mask;
-   bool              show_hdr;  //! flag determine if a header gets added to log message
-};
-
-
-static struct log_buf g_log;
-
-
-/**
- * Starts the log statement by flushing if needed and printing the header
- *
- * @param sev  The log severity
- *
- * @return The number of bytes available
- */
-static size_t log_start(log_sev_t sev);
-
-
-/**
- * Cleans up after a log statement by detecting whether the log is done,
- * (it ends in a newline) and possibly flushing the log.
- */
-static void log_end(void);
-
-
-/**
- * Initializes the log subsystem - call this first.
- * This function sets the log stream and enables the top 3 sevs (0-2).
- *
- * @param log_file  NULL for stderr or the FILE stream for logs.
- */
-void log_init(FILE *log_file)
-{
-   // set the top 3 severities
-   logmask_set_all(g_log.mask, false);
-   log_set_sev(LSYS, true);
-   log_set_sev(LERR, true);
-   log_set_sev(LWARN, true);
-
-   g_log.log_file = (log_file != nullptr) ? log_file : stderr;
-}
-
-
-void log_show_sev(bool show)
-{
-   g_log.show_hdr = show;
-}
-
-
-bool log_sev_on(log_sev_t sev)
-{
-   return(logmask_test(g_log.mask, sev));
-}
-
-
-void log_set_sev(log_sev_t sev, bool value)
-{
-   logmask_set_sev(g_log.mask, sev, value);
-}
-
-
-void log_set_mask(const log_mask_t &mask)
-{
-   g_log.mask = mask;
-}
-
-
-void log_get_mask(log_mask_t &mask)
-{
-   mask = g_log.mask;
-}
-
-
-void log_flush(bool force_nl)
-{
-   if (g_log.buf_len > 0)
-   {
-      if (  force_nl
-         && g_log.bufX[g_log.buf_len - 1] != '\n')
-      {
-         g_log.bufX[g_log.buf_len++] = '\n';
-         g_log.bufX[g_log.buf_len]   = 0;
-      }
-      size_t retlength = fwrite(&g_log.bufX[0], g_log.buf_len, 1, g_log.log_file);
-
-      if (retlength != 1)
-      {
-         // maybe we should log something to complain... =)
-      }
-      g_log.buf_len = 0;
-   }
-}
-
-
-static size_t log_start(log_sev_t sev)
-{
-   if (sev != g_log.sev)
-   {
-      if (g_log.buf_len > 0)
-      {
-         log_flush(true);
-      }
-      g_log.sev    = sev;
-      g_log.in_log = false;
-   }
-
-   // If not in a log, the buffer is empty. Add the header, if enabled.
-   if (  !g_log.in_log
-      && g_log.show_hdr)
-   {
-      g_log.buf_len = static_cast<size_t>(snprintf(&g_log.bufX[0], g_log.bufX.size(), "<%d>", sev));
-   }
-   size_t cap = (g_log.bufX.size() - 2) - g_log.buf_len;
-
-   return((cap > 0) ? cap : 0);
-}
-
-
-static void log_end(void)
-{
-   g_log.in_log = (g_log.bufX[g_log.buf_len - 1] != '\n');
-
-   if (  !g_log.in_log
-      || (g_log.buf_len > (g_log.bufX.size() / 2)))
-   {
-      log_flush(false);
-   }
-}
-
-
-void log_fmt(log_sev_t sev, const char *fmt, ...)
-{
-   if (  fmt == nullptr
-      || !log_sev_on(sev))
-   {
-      return;
-   }
-   // Issue #1203
-   unsigned int length = strlen(fmt);
-
-   if (length == 0)
-   {
-      return;
-   }
-   // the value of buffer_length is experimental
-   const int buffer_length = 40000;
-   char      buf[buffer_length];
-
-   // it MUST be a 'unsigned int' variable to be runable under windows
-
-   if (length >= buffer_length)
-   {
-      fprintf(stderr, "FATAL(1): The variable 'buf' is not big enought:\n");
-      fprintf(stderr, "   it should be bigger as %u\n", length);
-      fprintf(stderr, "Please make a report.\n");
-      fprintf(stderr, "For the buffer: %s\n", fmt);
-      exit(EX_SOFTWARE);
-   }
-   memcpy(buf, fmt, length);
-   buf[length] = 0;
-   convert_log_zu2lu(buf);
-
-   while (true)
-   {
-      /* Some implementation of vsnprintf() return the number of characters
-       * that would have been stored if the buffer was large enough instead of
-       * the number of characters actually stored.
-       *
-       * this gets the number of characters that fit into the log buffer
-       */
-      size_t  cap = log_start(sev);
-      // Add on the variable log parameters to the log string
-      va_list args;        // determine list of arguments ...
-      va_start(args, fmt);
-      size_t  which  = g_log.buf_len;
-      char    *where = &g_log.bufX[which];
-      size_t  lenX   = static_cast<size_t>(vsnprintf(where, cap, buf, args));
-      va_end(args);
-
-      if (lenX > 0)
-      {
-         // The functions snprintf() and vsnprintf() do not  write  more  than  size  bytes
-         // (including  the terminating null byte ('\0')).  If the output was truncated due
-         // to this limit, then the return value is the number of characters (excluding the
-         // terminating  null  byte)  which  would have been written to the final string if
-         // enough space had been available.  Thus, a return value of size  or  more  means
-         // that the output was truncated.
-         if (lenX > cap)
-         {
-            size_t bufXLength = g_log.bufX.size();
-            size_t X          = bufXLength * 2;
-
-            if (X >= buffer_length)
-            {
-               fprintf(stderr, "FATAL(2): The variable 'buf' is not big enought:\n");
-               fprintf(stderr, "   it should be bigger as %zu\n", X);
-               fprintf(stderr, "Please make a report.\n");
-               fprintf(stderr, "For the buffer: %s\n", fmt);
-               exit(EX_SOFTWARE);
-            }
-            g_log.bufX.resize(X);
-         }
-         else
-         {
-            g_log.buf_len            += lenX;
-            g_log.bufX[g_log.buf_len] = 0;
-            break;
-         }
-      }
-   }
-   log_end();
-} // log_fmt
-
-
-log_func::log_func(const char *name, int line)
-{
-   g_fq.push_back(log_fcn_info(name, line));
-}
-
-
-log_func::~log_func()
-{
-   g_fq.pop_back();
-}
-
-
-void log_func_stack(log_sev_t sev, const char *prefix, const char *suffix, size_t skip_cnt)
-{
-   UNUSED(skip_cnt);
-
-   if (prefix)
-   {
-      LOG_FMT(sev, "%s", prefix);
-   }
-#ifdef DEBUG
-   const char *sep      = "";
-   size_t     g_fq_size = g_fq.size();
-   size_t     begin_with;
-
-   if (g_fq_size > (skip_cnt + 1))
-   {
-      begin_with = g_fq_size - (skip_cnt + 1);
-
-      for (size_t idx = begin_with; idx != 0; idx--)
-      {
-         LOG_FMT(sev, "%s %s:%d", sep, g_fq[idx].name, g_fq[idx].line);
-         sep = ",";
-      }
-
-      LOG_FMT(sev, "%s %s:%d", sep, g_fq[0].name, g_fq[0].line);
-   }
-#else
-   LOG_FMT(sev, "-DEBUG NOT SET-");
-#endif
-
-   if (suffix)
-   {
-      LOG_FMT(sev, "%s", suffix);
-   }
-}
-
-
-const char *get_unqualified_func_name(const char *func)
-{
-   /**
-    * we look for the last ':' character;
-    */
-   for (auto i = strlen(func); i > 0; --i)
-   {
-      if (func[i - 1] == ':')
-      {
-         /**
-          * function name is qualified, so return the
-          * unqualified portion
-          */
-         return(func + i);
-      }
-   }
-
-   /**
-    * input function name is unqualified
-    */
-
-   return(func);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.h
deleted file mode 100644
index df63b276..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * @file logger.h
- *
- * Functions to do logging.
- * The macros check whether the logsev is active before evaluating the
- * parameters.  Use them instead of the functions.
- *
- * If a log statement ends in a newline, the current log is ended.
- * When the log severity changes, an implicit newline is inserted.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef LOGGER_H_INCLUDED
-#define LOGGER_H_INCLUDED
-
-#include "logmask.h"
-
-#include <cstdio>      // FILE
-
-
-/**
- * Initializes the log subsystem - call this first.
- * This function sets the log stream and enables the top 3 sevs (0-2).
- *
- * @param log_file  nullptr for stderr or the FILE stream for logs.
- */
-void log_init(FILE *log_file);
-
-
-/**
- * Show or hide the severity prefix "<1>"
- *
- * @param show  true=show, false=hide
- */
-void log_show_sev(bool show);
-
-
-/**
- * Returns whether a log severity is active.
- *
- * @param sev  severity log level
- *
- * @return true/false
- */
-bool log_sev_on(log_sev_t sev);
-
-
-/**
- * Sets a log sev on or off
- *
- * @param sev  severity log level to modify
- * @param val  new value for severity log level
- *
- * @return true/false
- */
-void log_set_sev(log_sev_t sev, bool value);
-
-
-/**
- * Sets the log mask
- *
- * @param mask  The mask to copy
- */
-void log_set_mask(const log_mask_t &mask);
-
-
-/**
- * Gets the log mask
- *
- * @param mask  Where to copy the mask
- */
-void log_get_mask(log_mask_t &mask);
-
-
-#ifdef __MINGW_PRINTF_FORMAT
-// On MinGW, the printf functions can be provided by a number of different
-// implementations, with different format string support. Annontate log_fmt
-// below with the same format attribute as the currently chosen default printf
-// function.
-#define PRINTF_FORMAT    __MINGW_PRINTF_FORMAT
-#else
-#define PRINTF_FORMAT    printf
-#endif
-
-/**
- * Logs a formatted string -- similar to printf()
- *
- * @param sev  The severity
- * @param fmt  The format string
- * @param ...  Additional arguments
- */
-void log_fmt(log_sev_t sev, const char *fmt, ...) __attribute__((format(PRINTF_FORMAT, 2, 3)));
-
-
-/**
- * Flushes the cached log text to the stream
- *
- * @param force_nl   Append NL if not present
- */
-void log_flush(bool force_nl);
-
-
-// it is necessary to make at least one time pro change a check of all the
-// uses of the MACRO LOG_FMT under Linux. This to detect all the used pointers,
-// which might be nullptr.
-// uncomment the define to do that.
-// #define NO_MACRO_VARARG
-
-#ifdef NO_MACRO_VARARG
-#define LOG_FMT    log_fmt
-// TODO during debugging add source file and line number
-#else
-#define LOG_FMT(sev, ...)                                   \
-   do { if (log_sev_on(sev)) { log_fmt(sev, __VA_ARGS__); } \
-   } while (0)
-#endif
-
-
-#define __unqualified_func__    get_unqualified_func_name(__func__)
-
-
-#ifdef DEBUG
-/**
- * This should be called as the first thing in a function.
- * It uses the log_func class to add an entry to the function log stack.
- * It is automatically removed when the function returns.
- */
-#define LOG_FUNC_ENTRY()    log_func log_fe = log_func(__unqualified_func__, __LINE__)
-
-
-#else
-#define LOG_FUNC_ENTRY()
-#endif
-
-
-/**
- * This class just adds a entry to the top of the stack on construction and
- * removes it on destruction.
- * RAII for the win.
- */
-class log_func
-{
-public:
-   log_func(const char *name, int line);
-
-
-   ~log_func();
-};
-
-
-void log_func_stack(log_sev_t sev, const char *prefix = 0, const char *suffix = "\n", size_t skip_cnt = 0);
-
-
-/**
- * Return the unqualified function name from the input argument
- * @param  the qualified function name, usually provided by __func__ macro
- * @return the corresponding unqualified name
- */
-const char *get_unqualified_func_name(const char *func);
-
-
-#define log_func_stack_inline(_sev)    log_func_stack((_sev), " [CallStack:", "]\n", 0)
-
-
-#endif /* LOGGER_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.cpp
deleted file mode 100644
index ca94cd05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * @file logmask.cpp
- *
- * Functions to convert between a string and a severity mask.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "logmask.h"
-
-#include "unc_ctype.h"
-
-#include <cstdio>      // snprintf()
-#include <cstdlib>     // strtoul()
-
-#ifdef DEVELOP_ONLY
-
-
-/*
- * the test suite Coveralls: https://coveralls.io
- * will complains because these functions are only
- * used at developement time.
- * Don't worry about unsed lines for the functions:
- *   logmask_to_str
- */
-char *logmask_to_str(const log_mask_t &mask, char *buf, int size)
-{
-   if (  buf == nullptr
-      || size <= 0)
-   {
-      return(buf);
-   }
-   int  last_sev = -1;
-   bool is_range = false;
-   int  len      = 0;
-
-   for (int sev = 0; sev < 256; sev++)
-   {
-      if (logmask_test(mask, static_cast<log_sev_t>(sev)))
-      {
-         if (last_sev == -1)
-         {
-            len += snprintf(&buf[len], size - len, "%d,", sev);
-         }
-         else
-         {
-            is_range = true;
-         }
-         last_sev = sev;
-      }
-      else
-      {
-         if (is_range)
-         {
-            buf[len - 1] = '-';  // change last comma to a dash
-            len         += snprintf(&buf[len], size - len, "%d,", last_sev);
-            is_range     = false;
-         }
-         last_sev = -1;
-      }
-   }
-
-   // handle a range that ends on the last bit
-   if (  is_range
-      && last_sev != -1)
-   {
-      buf[len - 1] = '-';  // change last comma to a dash
-      len         += snprintf(&buf[len], size - len, "%d", last_sev);
-   }
-   else
-   {
-      // Eat the last comma
-      if (len > 0)
-      {
-         len--;
-      }
-   }
-   buf[len] = 0;
-
-   return(buf);
-} // logmask_to_str
-#endif /* DEVELOP_ONLY */
-
-
-void logmask_from_string(const char *str, log_mask_t &mask)
-{
-   if (str == nullptr)
-   {
-      return;
-   }
-   logmask_set_all(mask, false);  // Start with a clean mask
-
-   // If the first character is 'a' or 'A', set all severities
-   if (unc_toupper(*str) == 'A')
-   {
-      logmask_set_all(mask, true);
-      str++;
-   }
-   char *ptmp;
-   bool was_dash   = false;
-   int  last_level = -1;
-
-   while (*str != 0)         // check string until termination character
-   {
-      if (unc_isspace(*str)) // ignore spaces and go on with next character
-      {
-         str++;
-         continue;
-      }
-
-      if (unc_isdigit(*str))
-      {
-         int level = strtoul(str, &ptmp, 10);
-         str = ptmp;
-
-         logmask_set_sev(mask, static_cast<log_sev_t>(level), true);
-
-         if (was_dash)
-         {
-            for (int idx = last_level + 1; idx < level; idx++)
-            {
-               logmask_set_sev(mask, static_cast<log_sev_t>(idx), true);
-            }
-
-            was_dash = false;
-         }
-         last_level = level;
-      }
-      else if (*str == '-') // a dash marks all bits until the next number
-      {
-         was_dash = true;
-         str++;
-      }
-      else  // probably a comma
-      {
-         last_level = -1;
-         was_dash   = false;
-         str++;
-      }
-   }
-} // logmask_from_string
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.h
deleted file mode 100644
index 7cc24ca4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @file logmask.h
- *
- * Functions to manipulate a log severity mask.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef LOGMASK_H_INCLUDED
-#define LOGMASK_H_INCLUDED
-
-#include "base_types.h"
-#include "log_levels.h"
-
-#include <bitset>
-#include <cstring>     // memset()
-
-/*
- * the test suite Coveralls: https://coveralls.io
- * will complains because these functions are only
- * used at developement time.
- * Don't worry about unsed lines for the functions:
- *   logmask_test
- *   logmask_set_all
- */
-
-//! A simple array of 256 bits
-typedef std::bitset<256> log_mask_t;
-
-
-/**
- * Tests whether a sev bit is set in the mask
- *
- * @param mask  log mask to evaluate
- * @param sev   severity bit to check
- *
- * @return true (is set) or false (not set)
- */
-static inline bool logmask_test(const log_mask_t &mask, log_sev_t sev)
-{
-   return(mask.test(sev));
-}
-
-
-/**
- * Sets a set bit in the mask
- *
- * @param mask   log mask to modify
- * @param sev    The severity to check
- * @param value  true (set bit) or false (clear bit)
- */
-static inline void logmask_set_sev(log_mask_t &mask, log_sev_t sev, bool value)
-{
-   mask.set(sev, value);
-}
-
-
-/**
- * Sets all bits to the same value
- *
- * @param mast   log mask to operate on
- * @param value  true (set bit) or false (clear bit)
- */
-static inline void logmask_set_all(log_mask_t &mask, bool value)
-{
-   if (value)
-   {
-      mask.set();
-   }
-   else
-   {
-      mask.reset();
-   }
-}
-
-
-#ifdef DEVELOP_ONLY
-/**
- * Convert a logmask into a string.
- * The string is a comma-delimited list of severities.
- * Example: 1,3,5-10
- *
- * @param mask  the mask to convert
- * @param buf   the buffer to hold the string
- * @param size  the size of the buffer
- *
- * @return buf (pass through)
- */
-char *logmask_to_str(const log_mask_t &mask, char *buf, int size);
-
-#endif /* DEVELOP_ONLY */
-
-
-/**
- * Parses a string into a log severity
- *
- * @param str   string to parse
- * @param mask  bit mask to populate with log levels
- */
-void logmask_from_string(const char *str, log_mask_t &mask);
-
-
-#endif /* LOGMASK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.cpp
deleted file mode 100644
index af8874a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.	This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legales
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to MD5Init, call MD5Update as
- * needed on buffers full of bytes, and then call MD5Final, which
- * will fill a supplied 16-byte array with the digest.
- *
- * @license Public Domain / GPL v2+
- */
-
-#include "md5.h"
-
-#include <string.h>
-
-
-void MD5::reverse_u32(UINT8 *buf, int n_u32)
-{
-   UINT8 tmp;
-
-   if (m_big_endian)
-   {
-      // change { 4, 3, 2, 1 } => { 1, 2, 3, 4 }
-      while (n_u32-- > 0)
-      {
-         tmp    = buf[0];
-         buf[0] = buf[3];
-         buf[3] = tmp;
-
-         tmp    = buf[1];
-         buf[1] = buf[2];
-         buf[2] = tmp;
-
-         buf += 4;
-      }
-   }
-   else
-   {
-      // change { 4, 3, 2, 1 } => { 3, 4, 1, 2 }
-      while (n_u32-- > 0)
-      {
-         tmp    = buf[0];
-         buf[0] = buf[1];
-         buf[1] = tmp;
-
-         tmp    = buf[2];
-         buf[2] = buf[3];
-         buf[3] = tmp;
-
-         buf += 4;
-      }
-   }
-}
-
-
-MD5::MD5()
-{
-   m_buf[0] = 0x01020304;
-
-   /*
-    * Little endian = { 4, 3, 2, 1 }
-    * Big endian    = { 1, 2, 3, 4 }
-    * PDP endian    = { 3, 4, 1, 2 }
-    *
-    * The MD5 stuff is written for little endian.
-    */
-
-   m_in8           = (UINT8 *)m_in32;
-   m_need_byteswap = *(UINT8 *)m_buf != 4;
-   m_big_endian    = *(UINT8 *)m_buf == 1;
-}
-
-
-//! Start MD5 accumulation.
-void MD5::Init()
-{
-   m_buf[0] = 0x67452301;
-   m_buf[1] = 0xefcdab89;
-   m_buf[2] = 0x98badcfe;
-   m_buf[3] = 0x10325476;
-
-   m_bits[0] = 0;
-   m_bits[1] = 0;
-}
-
-
-//! Update context to reflect the concatenation of another buffer full of bytes.
-void MD5::Update(const void *data, UINT32 len)
-{
-   const UINT8 *buf = (const UINT8 *)data;
-
-   UINT32      t = m_bits[0]; // Update bitcount
-
-   if ((m_bits[0] = t + ((UINT32)len << 3)) < t)
-   {
-      m_bits[1]++;   // Carry from low to high
-   }
-   m_bits[1] += len >> 29;
-
-   t = (t >> 3) & 0x3f;   // Bytes already in shsInfo->data
-
-   // Handle any leading odd-sized chunks
-   if (t)
-   {
-      UINT8 *p = m_in8 + t;
-
-      t = 64 - t;
-
-      if (len < t)
-      {
-         memcpy(p, buf, len);
-         return;
-      }
-      memcpy(p, buf, t);
-
-      if (m_need_byteswap)
-      {
-         reverse_u32(m_in8, 16);
-      }
-      Transform(m_buf, m_in32);
-      buf += t;
-      len -= t;
-   }
-
-   // Process data in 64-byte chunks
-   while (len >= 64)
-   {
-      memcpy(m_in32, buf, 64);
-
-      if (m_need_byteswap)
-      {
-         reverse_u32(m_in8, 16);
-      }
-      Transform(m_buf, m_in32);
-      buf += 64;  // TODO: possible creation of out-of-bounds pointer 64 beyond end of data
-      len -= 64;
-   }
-   // Save off any remaining bytes of data
-   memcpy(m_in32, buf, len); // TODO: possible access beyond array
-} // MD5::Update
-
-
-void MD5::Final(UINT8 digest[16])
-{
-   // Compute number of bytes modulo 64
-   UINT32 count = (m_bits[0] >> 3) & 0x3F;
-
-   /*
-    * Set the first char of padding to 0x80. This is safe since there is always
-    * at least one byte free
-    */
-   UINT8 *p = m_in8 + count;
-
-   *p++ = 0x80;
-
-   // Bytes of padding needed to make 64 bytes
-   count = 64 - 1 - count;
-
-   // Pad out to 56 modulo 64
-   if (count < 8)
-   {
-      // Two lots of padding:  Pad the first block to 64 bytes
-      memset(p, 0, count);
-
-      if (m_need_byteswap)
-      {
-         reverse_u32(m_in8, 16);
-      }
-      Transform(m_buf, m_in32);
-
-      // Now fill the next block with 56 bytes
-      memset(m_in32, 0, 56);
-   }
-   else
-   {
-      // Pad block to 56 bytes
-      memset(p, 0, count - 8);
-   }
-
-   if (m_need_byteswap)
-   {
-      reverse_u32(m_in8, 14);
-   }
-   // Append length in bits and transform
-   memcpy(m_in8 + 56, &m_bits[0], 4);
-   memcpy(m_in8 + 60, &m_bits[1], 4);
-
-   Transform(m_buf, m_in32);
-
-   if (m_need_byteswap)
-   {
-      reverse_u32((UINT8 *)m_buf, 4);
-   }
-   memcpy(digest, m_buf, 16);
-} // MD5::Final
-
-
-// The four core functions - F1 is optimized somewhat
-// #define F1(x, y, z) (x & y | ~x & z)
-#define F1(x, y, z)    (z ^ (x & (y ^ z)))
-#define F2(x, y, z)    F1(z, x, y)
-#define F3(x, y, z)    (x ^ y ^ z)
-#define F4(x, y, z)    (y ^ (x | ~z))
-
-
-// This is the central step in the MD5 algorithm.
-#define MD5STEP(f, w, x, y, z, data, s) \
-   ((w) += f((x), (y), (z)) + (data), (w) = (w) << (s) | (w) >> (32 - (s)), (w) += (x))
-
-
-void MD5::Transform(UINT32 buf[4], UINT32 in_data[16])
-{
-   UINT32 a = buf[0];
-   UINT32 b = buf[1];
-   UINT32 c = buf[2];
-   UINT32 d = buf[3];
-
-   MD5STEP(F1, a, b, c, d, in_data[0] + 0xd76aa478, 7);
-   MD5STEP(F1, d, a, b, c, in_data[1] + 0xe8c7b756, 12);
-   MD5STEP(F1, c, d, a, b, in_data[2] + 0x242070db, 17);
-   MD5STEP(F1, b, c, d, a, in_data[3] + 0xc1bdceee, 22);
-   MD5STEP(F1, a, b, c, d, in_data[4] + 0xf57c0faf, 7);
-   MD5STEP(F1, d, a, b, c, in_data[5] + 0x4787c62a, 12);
-   MD5STEP(F1, c, d, a, b, in_data[6] + 0xa8304613, 17);
-   MD5STEP(F1, b, c, d, a, in_data[7] + 0xfd469501, 22);
-   MD5STEP(F1, a, b, c, d, in_data[8] + 0x698098d8, 7);
-   MD5STEP(F1, d, a, b, c, in_data[9] + 0x8b44f7af, 12);
-   MD5STEP(F1, c, d, a, b, in_data[10] + 0xffff5bb1, 17);
-   MD5STEP(F1, b, c, d, a, in_data[11] + 0x895cd7be, 22);
-   MD5STEP(F1, a, b, c, d, in_data[12] + 0x6b901122, 7);
-   MD5STEP(F1, d, a, b, c, in_data[13] + 0xfd987193, 12);
-   MD5STEP(F1, c, d, a, b, in_data[14] + 0xa679438e, 17);
-   MD5STEP(F1, b, c, d, a, in_data[15] + 0x49b40821, 22);
-
-   MD5STEP(F2, a, b, c, d, in_data[1] + 0xf61e2562, 5);
-   MD5STEP(F2, d, a, b, c, in_data[6] + 0xc040b340, 9);
-   MD5STEP(F2, c, d, a, b, in_data[11] + 0x265e5a51, 14);
-   MD5STEP(F2, b, c, d, a, in_data[0] + 0xe9b6c7aa, 20);
-   MD5STEP(F2, a, b, c, d, in_data[5] + 0xd62f105d, 5);
-   MD5STEP(F2, d, a, b, c, in_data[10] + 0x02441453, 9);
-   MD5STEP(F2, c, d, a, b, in_data[15] + 0xd8a1e681, 14);
-   MD5STEP(F2, b, c, d, a, in_data[4] + 0xe7d3fbc8, 20);
-   MD5STEP(F2, a, b, c, d, in_data[9] + 0x21e1cde6, 5);
-   MD5STEP(F2, d, a, b, c, in_data[14] + 0xc33707d6, 9);
-   MD5STEP(F2, c, d, a, b, in_data[3] + 0xf4d50d87, 14);
-   MD5STEP(F2, b, c, d, a, in_data[8] + 0x455a14ed, 20);
-   MD5STEP(F2, a, b, c, d, in_data[13] + 0xa9e3e905, 5);
-   MD5STEP(F2, d, a, b, c, in_data[2] + 0xfcefa3f8, 9);
-   MD5STEP(F2, c, d, a, b, in_data[7] + 0x676f02d9, 14);
-   MD5STEP(F2, b, c, d, a, in_data[12] + 0x8d2a4c8a, 20);
-
-   MD5STEP(F3, a, b, c, d, in_data[5] + 0xfffa3942, 4);
-   MD5STEP(F3, d, a, b, c, in_data[8] + 0x8771f681, 11);
-   MD5STEP(F3, c, d, a, b, in_data[11] + 0x6d9d6122, 16);
-   MD5STEP(F3, b, c, d, a, in_data[14] + 0xfde5380c, 23);
-   MD5STEP(F3, a, b, c, d, in_data[1] + 0xa4beea44, 4);
-   MD5STEP(F3, d, a, b, c, in_data[4] + 0x4bdecfa9, 11);
-   MD5STEP(F3, c, d, a, b, in_data[7] + 0xf6bb4b60, 16);
-   MD5STEP(F3, b, c, d, a, in_data[10] + 0xbebfbc70, 23);
-   MD5STEP(F3, a, b, c, d, in_data[13] + 0x289b7ec6, 4);
-   MD5STEP(F3, d, a, b, c, in_data[0] + 0xeaa127fa, 11);
-   MD5STEP(F3, c, d, a, b, in_data[3] + 0xd4ef3085, 16);
-   MD5STEP(F3, b, c, d, a, in_data[6] + 0x04881d05, 23);
-   MD5STEP(F3, a, b, c, d, in_data[9] + 0xd9d4d039, 4);
-   MD5STEP(F3, d, a, b, c, in_data[12] + 0xe6db99e5, 11);
-   MD5STEP(F3, c, d, a, b, in_data[15] + 0x1fa27cf8, 16);
-   MD5STEP(F3, b, c, d, a, in_data[2] + 0xc4ac5665, 23);
-
-   MD5STEP(F4, a, b, c, d, in_data[0] + 0xf4292244, 6);
-   MD5STEP(F4, d, a, b, c, in_data[7] + 0x432aff97, 10);
-   MD5STEP(F4, c, d, a, b, in_data[14] + 0xab9423a7, 15);
-   MD5STEP(F4, b, c, d, a, in_data[5] + 0xfc93a039, 21);
-   MD5STEP(F4, a, b, c, d, in_data[12] + 0x655b59c3, 6);
-   MD5STEP(F4, d, a, b, c, in_data[3] + 0x8f0ccc92, 10);
-   MD5STEP(F4, c, d, a, b, in_data[10] + 0xffeff47d, 15);
-   MD5STEP(F4, b, c, d, a, in_data[1] + 0x85845dd1, 21);
-   MD5STEP(F4, a, b, c, d, in_data[8] + 0x6fa87e4f, 6);
-   MD5STEP(F4, d, a, b, c, in_data[15] + 0xfe2ce6e0, 10);
-   MD5STEP(F4, c, d, a, b, in_data[6] + 0xa3014314, 15);
-   MD5STEP(F4, b, c, d, a, in_data[13] + 0x4e0811a1, 21);
-   MD5STEP(F4, a, b, c, d, in_data[4] + 0xf7537e82, 6);
-   MD5STEP(F4, d, a, b, c, in_data[11] + 0xbd3af235, 10);
-   MD5STEP(F4, c, d, a, b, in_data[2] + 0x2ad7d2bb, 15);
-   MD5STEP(F4, b, c, d, a, in_data[9] + 0xeb86d391, 21);
-
-   buf[0] += a;
-   buf[1] += b;
-   buf[2] += c;
-   buf[3] += d;
-} // MD5::Transform
-
-
-void MD5::Calc(const void *data, UINT32 length, UINT8 digest[16])
-{
-   MD5 md5;
-
-   md5.Init();
-   md5.Update(data, length);
-   md5.Final(digest);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.h
deleted file mode 100644
index d1148b5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * @file md5.h
- * A simple class for MD5 calculation
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef MD5_H_INCLUDED
-#define MD5_H_INCLUDED
-
-#include "base_types.h"
-
-class MD5
-{
-public:
-   MD5();
-
-
-   ~MD5()
-   {
-   }
-
-
-   /**
-    * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-    * initialization constants.
-    */
-   void Init();
-
-
-   /**
-    * Update context to reflect the concatenation of another buffer full
-    * of bytes.
-    */
-   void Update(const void *data, UINT32 len);
-
-
-   /**
-    * Final wrapup - pad to 64-byte boundary with the bit pattern
-    * 1 0* (64-bit count of bits processed, MSB-first)
-    *
-    * @param[out] digest  calculated MD5 checksum
-    */
-   void Final(UINT8 digest[16]);
-
-
-   /**
-    * The core of the MD5 algorithm, this alters an existing MD5 hash to
-    * reflect the addition of 16 longwords of new data.  MD5::Update blocks
-    * the data and converts bytes into longwords for this routine.
-    */
-   static void Transform(UINT32 buf[4], UINT32 in_data[16]);
-
-
-   /**
-    * Calculates MD5 for a block of data
-    *
-    * @param      data    data to calculate MD5 for
-    * @param      length  number of bytes in data
-    * @param[out] digest  calculated MD5 checksum
-    */
-   static void Calc(const void *data, UINT32 length, UINT8 digest[16]);
-
-
-private:
-   UINT32 m_buf[4];
-   UINT32 m_bits[2];
-   UINT32 m_in32[16];
-   // Alternate view of m_in32
-   UINT8  *m_in8;
-   bool   m_need_byteswap;
-   bool   m_big_endian;
-
-
-   /**
-    * Reverse the bytes in 32-bit chunks.
-    * 'buf' might not be word-aligned.
-    *
-    * @param buf    The byte array to reverse
-    * @param n_u32  The number of UINT32's in the data
-    */
-   void reverse_u32(UINT8 *buf, int n_u32);
-};
-
-#endif /* MD5_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.cpp
deleted file mode 100644
index c49bf32b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.cpp
+++ /dev/null
@@ -1,6609 +0,0 @@
-/**
- * @file newlines.cpp
- * Adds or removes newlines.
- *
- * Informations
- *   "Ignore" means do not change it.
- *   "Add" in the context of spaces means make sure there is at least 1.
- *   "Add" elsewhere means make sure one is present.
- *   "Remove" mean remove the space/brace/newline/etc.
- *   "Force" in the context of spaces means ensure that there is exactly 1.
- *   "Force" in other contexts means the same as "add".
- *
- *   Rmk: spaces = space + nl
- *
- * @author  Ben Gardner
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "newlines.h"
-
-#include "align_stack.h"
-#include "combine_skip.h"
-#include "flag_parens.h"
-#include "indent.h"
-#include "keywords.h"
-#include "prototypes.h"
-#include "space.h"
-
-#ifdef WIN32
-#include <algorithm>                   // to get max
-#endif // ifdef WIN32
-
-
-constexpr static auto LCURRENT = LNEWLINE;
-
-using namespace std;
-using namespace uncrustify;
-
-
-static void mark_change(const char *func, size_t line);
-
-
-/**
- * Check to see if we are allowed to increase the newline count.
- * We can't increase the newline count:
- *  - if nl_squeeze_ifdef and a preproc is after the newline.
- *  - if eat_blanks_before_close_brace and the next is '}'
- *    - unless function contains an empty body and
- *      nl_inside_empty_func is non-zero
- *  - if eat_blanks_after_open_brace and the prev is '{'
- *    - unless the brace belongs to a namespace
- *      and nl_inside_namespace is non-zero
- */
-static bool can_increase_nl(chunk_t *nl);
-
-
-/**
- * Basic approach:
- * 1. Find next open brace
- * 2. Find next close brace
- * 3. Determine why the braces are there
- * a. struct/union/enum "enum [name] {"
- * c. assignment "= {"
- * b. if/while/switch/for/etc ") {"
- * d. else "} else {"
- */
-static void setup_newline_add(chunk_t *prev, chunk_t *nl, chunk_t *next);
-
-
-//! Make sure there is a blank line after a commented group of values
-static void newlines_double_space_struct_enum_union(chunk_t *open_brace);
-
-
-//! If requested, make sure each entry in an enum is on its own line
-static void newlines_enum_entries(chunk_t *open_brace, iarf_e av);
-
-
-/**
- * Checks to see if it is OK to add a newline around the chunk.
- * Don't want to break one-liners...
- * return value:
- *  true: a new line may be added
- * false: a new line may NOT be added
- */
-static bool one_liner_nl_ok(chunk_t *pc);
-
-
-static void nl_create_one_liner(chunk_t *vbrace_open);
-
-
-static void nl_create_list_liner(chunk_t *brace_open);
-
-
-/**
- * Test if a chunk belongs to a one-liner method definition inside a class body
- */
-static bool is_class_one_liner(chunk_t *pc);
-
-
-/**
- * Test if a chunk may be combined with a function prototype group.
- *
- * If nl_class_leave_one_liner_groups is enabled, a chunk may be combined with
- * a function prototype group if it is a one-liner inside a class body, and is
- * a definition of the same sort as surrounding prototypes. This checks against
- * either the function name, or the function closing brace.
- */
-bool is_func_proto_group(chunk_t *pc, c_token_t one_liner_type);
-
-
-//! Find the next newline or nl_cont
-static void nl_handle_define(chunk_t *pc);
-
-
-/**
- * Does the Ignore, Add, Remove, or Force thing between two chunks
- *
- * @param before  The first chunk
- * @param after   The second chunk
- * @param av      The IARF value
- */
-static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool check_nl_assign_leave_one_liners = false);
-
-
-/**
- * Adds newlines to multi-line function call/decl/def
- * Start points to the open paren
- */
-static void newline_func_multi_line(chunk_t *start);
-
-
-static void newline_template(chunk_t *start);
-
-
-/**
- * Formats a function declaration
- * Start points to the open paren
- */
-static void newline_func_def_or_call(chunk_t *start);
-
-
-/**
- * Formats a message, adding newlines before the item before the colons.
- *
- * Start points to the open '[' in:
- * [myObject doFooWith:arg1 name:arg2  // some lines with >1 arg
- *            error:arg3];
- */
-static void newline_oc_msg(chunk_t *start);
-
-
-//! Ensure that the next non-comment token after close brace is a newline
-static void newline_end_newline(chunk_t *br_close);
-
-
-/**
- * Add or remove a newline between the closing paren and opening brace.
- * Also uncuddles anything on the closing brace. (may get fixed later)
- *
- * "if (...) { \n" or "if (...) \n { \n"
- *
- * For virtual braces, we can only add a newline after the vbrace open.
- * If we do so, also add a newline after the vbrace close.
- */
-static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt);
-
-
-/**
- * Add or remove extra newline before the chunk.
- * Adds before comments
- * Doesn't do anything if open brace before it
- * "code\n\ncomment\nif (...)" or "code\ncomment\nif (...)"
- */
-static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e nl_opt);
-
-
-static void blank_line_set(chunk_t *pc, Option<unsigned> &opt);
-
-
-/**
- * Add one/two newline(s) before the chunk.
- * Adds before comments
- * Adds before destructor
- * Doesn't do anything if open brace before it
- * "code\n\ncomment\nif (...)" or "code\ncomment\nif (...)"
- */
-static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type);
-
-
-static chunk_t *get_closing_brace(chunk_t *start);
-
-
-/**
- * remove any consecutive newlines following this chunk
- * skip vbraces
- */
-static void remove_next_newlines(chunk_t *start);
-
-
-/**
- * Add or remove extra newline after end of the block started in chunk.
- * Doesn't do anything if close brace after it
- * Interesting issue is that at this point, nls can be before or after vbraces
- * VBraces will stay VBraces, conversion to real ones should have already happened
- * "if (...)\ncode\ncode" or "if (...)\ncode\n\ncode"
- */
-static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e nl_opt);
-
-
-/**
- * Adds or removes a newline between the keyword and the open brace.
- * If there is something after the '{' on the same line, then
- * the newline is removed unconditionally.
- * If there is a '=' between the keyword and '{', do nothing.
- *
- * "struct [name] {" or "struct [name] \n {"
- */
-static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trailing);
-static void newlines_enum(chunk_t *start);
-static void newlines_namespace(chunk_t *start); // Issue #2186
-
-
-/**
- * Cuddles or un-cuddles a chunk with a previous close brace
- *
- * "} while" vs "} \n while"
- * "} else" vs "} \n else"
- *
- * @param start  The chunk - should be CT_ELSE or CT_WHILE_OF_DO
- */
-static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt);
-
-
-/**
- * Adds/removes a newline between else and '{'.
- * "else {" or "else \n {"
- */
-static void newlines_do_else(chunk_t *start, iarf_e nl_opt);
-
-
-//! Check if token starts a variable declaration
-static bool is_var_def(chunk_t *pc, chunk_t *next);
-
-
-//! Put newline(s) before and/or after a block of variable definitions
-static chunk_t *newline_def_blk(chunk_t *start, bool fn_top);
-
-
-/**
- * Handles the brace_on_func_line setting and decides if the closing brace
- * of a pair should be right after a newline.
- * The only cases where the closing brace shouldn't be the first thing on a line
- * is where the opening brace has junk after it AND where a one-liner in a
- * class is supposed to be preserved.
- *
- * General rule for break before close brace:
- * If the brace is part of a function (call or definition) OR if the only
- * thing after the opening brace is comments, the there must be a newline
- * before the close brace.
- *
- * Example of no newline before close
- * struct mystring { int  len;
- *                   char str[]; };
- * while (*(++ptr) != 0) { }
- *
- * Examples of newline before close
- * void foo() {
- * }
- */
-static void newlines_brace_pair(chunk_t *br_open);
-
-
-/**
- * Put a empty line between the 'case' statement and the previous case colon
- * or semicolon.
- * Does not work with PAWN (?)
- */
-static void newline_case(chunk_t *start);
-
-
-static void newline_case_colon(chunk_t *start);
-
-
-//! Put a blank line before a return statement, unless it is after an open brace
-static void newline_before_return(chunk_t *start);
-
-
-/**
- * Put a empty line after a return statement, unless it is followed by a
- * close brace.
- *
- * May not work with PAWN
- */
-static void newline_after_return(chunk_t *start);
-
-
-static void blank_line_max(chunk_t *pc, Option<unsigned> &opt);
-
-
-static iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base, iarf_e fallback);
-
-
-#define MARK_CHANGE()    mark_change(__func__, __LINE__)
-
-
-static void mark_change(const char *func, size_t line)
-{
-   LOG_FUNC_ENTRY();
-
-   cpd.changes++;
-
-   if (cpd.pass_count == 0)
-   {
-      LOG_FMT(LCHANGE, "%s(%d): change %d on %s:%zu\n",
-              __func__, __LINE__, cpd.changes, func, line);
-   }
-} // mark_change
-
-
-static bool can_increase_nl(chunk_t *nl)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *prev = chunk_get_prev_nc(nl);
-
-   chunk_t *pcmt = chunk_get_prev(nl);
-   chunk_t *next = chunk_get_next(nl);
-
-   if (options::nl_squeeze_ifdef())
-   {
-      log_rule_B("nl_squeeze_ifdef");
-
-      chunk_t *pp_start = chunk_get_pp_start(prev);
-
-      if (  pp_start != nullptr
-         && (  get_chunk_parent_type(pp_start) == CT_PP_IF
-            || get_chunk_parent_type(pp_start) == CT_PP_ELSE)
-         && (  pp_start->level > 0
-            || options::nl_squeeze_ifdef_top_level()))
-      {
-         log_rule_B("nl_squeeze_ifdef_top_level");
-         bool rv = ifdef_over_whole_file() && pp_start->flags.test(PCF_WF_IF);
-         LOG_FMT(LBLANKD, "%s(%d): nl_squeeze_ifdef %zu (prev) pp_lvl=%zu rv=%d\n",
-                 __func__, __LINE__, nl->orig_line, nl->pp_level, rv);
-         return(rv);
-      }
-
-      if (  chunk_is_token(next, CT_PREPROC)
-         && (  get_chunk_parent_type(next) == CT_PP_ELSE
-            || get_chunk_parent_type(next) == CT_PP_ENDIF)
-         && (  next->level > 0
-            || options::nl_squeeze_ifdef_top_level()))
-      {
-         log_rule_B("nl_squeeze_ifdef_top_level");
-         bool rv = ifdef_over_whole_file() && next->flags.test(PCF_WF_ENDIF);
-         LOG_FMT(LBLANKD, "%s(%d): nl_squeeze_ifdef %zu (next) pp_lvl=%zu rv=%d\n",
-                 __func__, __LINE__, nl->orig_line, nl->pp_level, rv);
-         return(rv);
-      }
-   }
-
-   if (chunk_is_token(next, CT_BRACE_CLOSE))
-   {
-      if (  options::nl_inside_namespace() > 0
-         && get_chunk_parent_type(next) == CT_NAMESPACE)
-      {
-         log_rule_B("nl_inside_namespace");
-         LOG_FMT(LBLANKD, "%s(%d): nl_inside_namespace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
-         return(true);
-      }
-
-      if (  options::nl_inside_empty_func() > 0
-         && chunk_is_token(prev, CT_BRACE_OPEN)
-         && (  get_chunk_parent_type(next) == CT_FUNC_DEF
-            || get_chunk_parent_type(next) == CT_FUNC_CLASS_DEF))
-      {
-         log_rule_B("nl_inside_empty_func");
-         LOG_FMT(LBLANKD, "%s(%d): nl_inside_empty_func %zu\n",
-                 __func__, __LINE__, nl->orig_line);
-         return(true);
-      }
-
-      if (options::eat_blanks_before_close_brace())
-      {
-         log_rule_B("eat_blanks_before_close_brace");
-         LOG_FMT(LBLANKD, "%s(%d): eat_blanks_before_close_brace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
-         return(false);
-      }
-   }
-
-   if (chunk_is_token(prev, CT_BRACE_CLOSE))
-   {
-      if (  options::nl_before_namespace()
-         && get_chunk_parent_type(prev) == CT_NAMESPACE)
-      {
-         log_rule_B("nl_before_namespace");
-         LOG_FMT(LBLANKD, "%s(%d): nl_before_namespace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
-         return(true);
-      }
-   }
-
-   if (chunk_is_token(prev, CT_BRACE_OPEN))
-   {
-      if (  options::nl_inside_namespace() > 0
-         && get_chunk_parent_type(prev) == CT_NAMESPACE)
-      {
-         log_rule_B("nl_inside_namespace");
-         LOG_FMT(LBLANKD, "%s(%d): nl_inside_namespace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
-         return(true);
-      }
-
-      if (  options::nl_inside_empty_func() > 0
-         && chunk_is_token(next, CT_BRACE_CLOSE)
-         && (  get_chunk_parent_type(prev) == CT_FUNC_DEF
-            || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF))
-      {
-         log_rule_B("nl_inside_empty_func");
-         LOG_FMT(LBLANKD, "%s(%d): nl_inside_empty_func %zu\n",
-                 __func__, __LINE__, nl->orig_line);
-         return(true);
-      }
-
-      if (options::eat_blanks_after_open_brace())
-      {
-         log_rule_B("eat_blanks_after_open_brace");
-         LOG_FMT(LBLANKD, "%s(%d): eat_blanks_after_open_brace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
-         return(false);
-      }
-   }
-   log_rule_B("nl_start_of_file");
-
-   if (  !pcmt
-      && (options::nl_start_of_file() != IARF_IGNORE))
-   {
-      LOG_FMT(LBLANKD, "%s(%d): SOF no prev %zu\n", __func__, __LINE__, nl->orig_line);
-      return(false);
-   }
-   log_rule_B("nl_end_of_file");
-
-   if (  !next
-      && (options::nl_end_of_file() != IARF_IGNORE))
-   {
-      LOG_FMT(LBLANKD, "%s(%d): EOF no next %zu\n", __func__, __LINE__, nl->orig_line);
-      return(false);
-   }
-   return(true);
-} // can_increase_nl
-
-
-static void setup_newline_add(chunk_t *prev, chunk_t *nl, chunk_t *next)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  prev == nullptr
-      || nl == nullptr
-      || next == nullptr)
-   {
-      return;
-   }
-   undo_one_liner(prev);
-
-   nl->orig_line   = prev->orig_line;
-   nl->level       = prev->level;
-   nl->pp_level    = prev->pp_level;
-   nl->brace_level = prev->brace_level;
-   nl->pp_level    = prev->pp_level;
-   nl->nl_count    = 1;
-   nl->flags       = (prev->flags & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC;
-   nl->orig_col    = prev->orig_col_end;
-   nl->column      = prev->orig_col;
-
-   if (  prev->flags.test(PCF_IN_PREPROC)
-      && next->flags.test(PCF_IN_PREPROC))
-   {
-      chunk_flags_set(nl, PCF_IN_PREPROC);
-   }
-
-   if (nl->flags.test(PCF_IN_PREPROC))
-   {
-      set_chunk_type(nl, CT_NL_CONT);
-      nl->str = "\\\n";
-   }
-   else
-   {
-      set_chunk_type(nl, CT_NEWLINE);
-      nl->str = "\n";
-   }
-} // setup_newline_add
-
-
-void double_newline(chunk_t *nl)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *prev = chunk_get_prev(nl);
-
-   if (prev == nullptr)
-   {
-      return;
-   }
-   LOG_FMT(LNEWLINE, "%s(%d): add newline after ", __func__, __LINE__);
-
-   if (chunk_is_token(prev, CT_VBRACE_CLOSE))
-   {
-      LOG_FMT(LNEWLINE, "VBRACE_CLOSE ");
-   }
-   else
-   {
-      LOG_FMT(LNEWLINE, "'%s' ", prev->text());
-   }
-   LOG_FMT(LNEWLINE, "on line %zu", prev->orig_line);
-
-   if (!can_increase_nl(nl))
-   {
-      LOG_FMT(LNEWLINE, " - denied\n");
-      return;
-   }
-   LOG_FMT(LNEWLINE, " - done\n");
-
-   if (nl->nl_count != 2)
-   {
-      nl->nl_count = 2;
-      MARK_CHANGE();
-   }
-} // double_newline
-
-
-chunk_t *newline_add_before(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t nl;
-   chunk_t *prev = chunk_get_prev_nvb(pc);
-
-   if (chunk_is_newline(prev))
-   {
-      // Already has a newline before this chunk
-      return(prev);
-   }
-   LOG_FMT(LNEWLINE, "%s(%d): text() '%s', on orig_line is %zu, orig_col is %zu, pc->column is %zu",
-           __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->column);
-   log_func_stack_inline(LNEWLINE);
-
-   setup_newline_add(prev, &nl, pc);
-   nl.orig_col = pc->orig_col;
-   nl.pp_level = pc->pp_level;
-   LOG_FMT(LNEWLINE, "%s(%d): nl.column is %zu\n",
-           __func__, __LINE__, nl.column);
-
-   MARK_CHANGE();
-   return(chunk_add_before(&nl, pc));
-} // newline_add_before
-
-
-chunk_t *newline_force_before(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *nl = newline_add_before(pc);
-
-   if (  nl != nullptr
-      && nl->nl_count > 1)
-   {
-      nl->nl_count = 1;
-      MARK_CHANGE();
-   }
-   return(nl);
-} // newline_force_before
-
-
-chunk_t *newline_add_after(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk_t *next = chunk_get_next_nvb(pc);
-
-   if (chunk_is_newline(next))
-   {
-      // Already has a newline after this chunk
-      return(next);
-   }
-   LOG_FMT(LNEWLINE, "%s(%d): '%s' on line %zu",
-           __func__, __LINE__, pc->text(), pc->orig_line);
-   log_func_stack_inline(LNEWLINE);
-
-   chunk_t nl;
-
-   nl.orig_line = pc->orig_line;
-   nl.orig_col  = pc->orig_col;
-   setup_newline_add(pc, &nl, next);
-
-   MARK_CHANGE();
-   // TO DO: check why the next statement is necessary
-   nl.orig_col = pc->orig_col;
-   nl.pp_level = pc->pp_level;
-   return(chunk_add_after(&nl, pc));
-} // newline_add_after
-
-
-chunk_t *newline_force_after(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *nl = newline_add_after(pc);   // add a newline
-
-   if (  nl != nullptr
-      && nl->nl_count > 1) // check if there are more than 1 newline
-   {
-      nl->nl_count = 1;                   // if so change the newline count back to 1
-      MARK_CHANGE();
-   }
-   return(nl);
-} // newline_force_after
-
-
-static void newline_end_newline(chunk_t *br_close)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *next = chunk_get_next(br_close);
-   chunk_t nl;
-
-   if (  !chunk_is_newline(next)
-      && !chunk_is_comment(next))
-   {
-      nl.orig_line = br_close->orig_line;
-      nl.orig_col  = br_close->orig_col;
-      nl.nl_count  = 1;
-      nl.pp_level  = 0;
-      nl.flags     = (br_close->flags & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC;
-
-      if (  br_close->flags.test(PCF_IN_PREPROC)
-         && next != nullptr
-         && next->flags.test(PCF_IN_PREPROC))
-      {
-         nl.flags |= PCF_IN_PREPROC;
-      }
-
-      if (nl.flags.test(PCF_IN_PREPROC))
-      {
-         set_chunk_type(&nl, CT_NL_CONT);
-         nl.str = "\\\n";
-      }
-      else
-      {
-         set_chunk_type(&nl, CT_NEWLINE);
-         nl.str = "\n";
-      }
-      MARK_CHANGE();
-      LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline after '%s'\n",
-              __func__, __LINE__, br_close->orig_line, br_close->orig_col, br_close->text());
-      chunk_add_after(&nl, br_close);
-   }
-} // newline_end_newline
-
-
-static void newline_min_after(chunk_t *ref, size_t count, pcf_flag_e flag)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNEWLINE, "%s(%d): for '%s', at orig_line %zu, count is %zu, flag is %s:",
-           __func__, __LINE__, ref->text(), ref->orig_line, count,
-           pcf_flags_str(flag).c_str());
-   log_func_stack_inline(LNEWLINE);
-
-   chunk_t *pc = ref;
-
-   do
-   {
-      pc = chunk_get_next(pc);
-   } while (  pc != nullptr
-           && !chunk_is_newline(pc));
-
-   if (pc != nullptr)                 // Coverity CID 76002
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): type is %s, orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, get_token_name(pc->type), pc->orig_line, pc->orig_col);
-   }
-   chunk_t *next = chunk_get_next(pc);
-
-   if (next == nullptr)
-   {
-      return;
-   }
-
-   if (  chunk_is_comment(next)
-      && next->nl_count == 1
-      && chunk_is_comment(chunk_get_prev(pc)))
-   {
-      newline_min_after(next, count, flag);
-      return;
-   }
-   chunk_flags_set(pc, flag);
-
-   if (  chunk_is_newline(pc)
-      && can_increase_nl(pc))
-   {
-      if (pc->nl_count < count)
-      {
-         pc->nl_count = count;
-         MARK_CHANGE();
-      }
-   }
-} // newline_min_after
-
-
-chunk_t *newline_add_between(chunk_t *start, chunk_t *end)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  start == nullptr
-      || end == nullptr
-      || chunk_is_token(end, CT_IGNORED))
-   {
-      return(nullptr);
-   }
-   LOG_FMT(LNEWLINE, "%s(%d): start->text() is '%s', type is %s, orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->text(), get_token_name(start->type),
-           start->orig_line, start->orig_col);
-   LOG_FMT(LNEWLINE, "%s(%d): and end->text() is '%s', orig_line is %zu, orig_col is %zu\n  ",
-           __func__, __LINE__, end->text(), end->orig_line, end->orig_col);
-   log_func_stack_inline(LNEWLINE);
-
-   // Back-up check for one-liners (should never be true!)
-   if (!one_liner_nl_ok(start))
-   {
-      return(nullptr);
-   }
-
-   /*
-    * Scan for a line break, if there is a line break between start and end
-    * we won't add another one
-    */
-   for (chunk_t *pc = start; pc != end; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_newline(pc))
-      {
-         return(pc);
-      }
-   }
-
-   /*
-    * If the second one is a brace open, then check to see
-    * if a comment + newline follows
-    */
-   if (chunk_is_token(end, CT_BRACE_OPEN))
-   {
-      chunk_t *pc = chunk_get_next(end);
-
-      if (chunk_is_comment(pc))
-      {
-         pc = chunk_get_next(pc);
-
-         if (chunk_is_newline(pc))
-         {
-            // are there some more (comment + newline)s ?
-            chunk_t *pc1 = chunk_get_next_ncnnl(end);
-
-            if (!chunk_is_newline(pc1))
-            {
-               // yes, go back
-               chunk_t *pc2 = chunk_get_prev(pc1);
-               pc = pc2;
-            }
-         }
-
-         if (end == pc)
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): pc1 and pc are identical\n",
-                    __func__, __LINE__);
-         }
-         else
-         {
-            // Move the open brace to after the newline
-            chunk_move_after(end, pc);
-         }
-         LOG_FMT(LNEWLINE, "%s(%d):\n", __func__, __LINE__);
-         newline_add_after(end);
-         return(pc);
-      }
-      else
-      {
-         LOG_FMT(LNEWLINE, "%s(%d):\n", __func__, __LINE__);
-      }
-   }
-   else
-   {
-      LOG_FMT(LNEWLINE, "%s(%d):\n", __func__, __LINE__);
-   }
-   chunk_t *tmp = newline_add_before(end);
-
-   return(tmp);
-} // newline_add_between
-
-
-void newline_del_between(chunk_t *start, chunk_t *end)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNEWLINE, "%s(%d): start->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->orig_col);
-   LOG_FMT(LNEWLINE, "%s(%d): and end->text() is '%s', orig_line is %zu, orig_col is %zu: preproc=%c/%c\n",
-           __func__, __LINE__, end->text(), end->orig_line, end->orig_col,
-           start->flags.test(PCF_IN_PREPROC) ? 'y' : 'n',
-           end->flags.test(PCF_IN_PREPROC) ? 'y' : 'n');
-   log_func_stack_inline(LNEWLINE);
-
-   // Can't remove anything if the preproc status differs
-   if (!chunk_same_preproc(start, end))
-   {
-      return;
-   }
-   chunk_t *pc           = start;
-   bool    start_removed = false;
-
-   do
-   {
-      chunk_t *next = chunk_get_next(pc);
-
-      if (chunk_is_newline(pc))
-      {
-         chunk_t *prev = chunk_get_prev(pc);
-
-         if (  (  !chunk_is_comment(prev)
-               && !chunk_is_comment(next))
-            || chunk_is_newline(prev)
-            || chunk_is_newline(next))
-         {
-            if (chunk_safe_to_del_nl(pc))
-            {
-               if (pc == start)
-               {
-                  start_removed = true;
-               }
-               chunk_del(pc);
-               MARK_CHANGE();
-
-               if (prev != nullptr)
-               {
-                  align_to_column(next, prev->column + space_col_align(prev, next));
-               }
-            }
-         }
-         else
-         {
-            if (pc->nl_count > 1)
-            {
-               pc->nl_count = 1;
-               MARK_CHANGE();
-            }
-         }
-      }
-      pc = next;
-   } while (pc != end);
-
-   if (  !start_removed
-      && chunk_is_str(end, "{", 1)
-      && (  chunk_is_str(start, ")", 1)
-         || chunk_is_token(start, CT_DO)
-         || chunk_is_token(start, CT_ELSE)))
-   {
-      chunk_move_after(end, start);
-   }
-} // newline_del_between
-
-
-void newlines_sparens()
-{
-   LOG_FUNC_ENTRY();
-
-   //chunk_t *sparen_open;
-
-   for (chunk_t *sparen_open = chunk_get_next_type(chunk_get_head(), CT_SPAREN_OPEN, ANY_LEVEL);
-        sparen_open != nullptr; sparen_open = chunk_get_next_type(
-           sparen_open, CT_SPAREN_OPEN, ANY_LEVEL))
-   {
-      chunk_t *sparen_close = chunk_get_next_type(sparen_open, CT_SPAREN_CLOSE, sparen_open->level);
-
-      if (sparen_close == nullptr)
-      {
-         continue;
-      }
-      chunk_t *sparen_content_start = chunk_get_next_nnl(sparen_open);
-      chunk_t *sparen_content_end   = chunk_get_prev_nnl(sparen_close);
-      bool    is_multiline          = (
-         sparen_content_start != sparen_content_end
-                                      && !are_chunks_in_same_line(sparen_content_start, sparen_content_end));
-
-      // Add a newline after '(' if an if/for/while/switch condition spans multiple lines,
-      // as e.g. required by the ROS 2 development style guidelines:
-      // https://index.ros.org/doc/ros2/Contributing/Developer-Guide/#open-versus-cuddled-braces
-      if (is_multiline)
-      {
-         log_rule_B("nl_multi_line_sparen_open");
-         newline_iarf(sparen_open, options::nl_multi_line_sparen_open());
-      }
-
-      // Add a newline before ')' if an if/for/while/switch condition spans multiple lines. Overrides nl_before_if_closing_paren if both are specified.
-      if (  is_multiline
-         && options::nl_multi_line_sparen_close() != IARF_IGNORE)
-      {
-         log_rule_B("nl_multi_line_sparen_close");
-         newline_iarf(sparen_content_end, options::nl_multi_line_sparen_close());
-      }
-      else
-      {
-         // add/remove trailing newline in an if condition
-         chunk_t *ctrl_structure = chunk_get_prev_ncnnl(sparen_open);
-
-         if (  chunk_is_token(ctrl_structure, CT_IF)
-            || chunk_is_token(ctrl_structure, CT_ELSEIF))
-         {
-            log_rule_B("nl_before_if_closing_paren");
-            newline_iarf_pair(sparen_content_end, sparen_close, options::nl_before_if_closing_paren());
-         }
-      }
-   }
-} // newlines_sparens
-
-
-static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_define_macro");
-
-   if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
-         && !options::nl_define_macro()))
-   {
-      return(false);
-   }
-   bool    retval = false;
-   chunk_t *pc    = chunk_get_next_ncnnl(start);
-
-   if (chunk_is_token(pc, CT_SPAREN_OPEN))
-   {
-      chunk_t *close_paren = chunk_get_next_type(pc, CT_SPAREN_CLOSE, pc->level);
-      chunk_t *brace_open  = chunk_get_next_ncnnl(close_paren);
-
-      if (  (  chunk_is_token(brace_open, CT_BRACE_OPEN)
-            || chunk_is_token(brace_open, CT_VBRACE_OPEN))
-         && one_liner_nl_ok(brace_open))
-      {
-         log_rule_B("nl_multi_line_cond");
-
-         if (options::nl_multi_line_cond())
-         {
-            while ((pc = chunk_get_next(pc)) != close_paren)
-            {
-               if (chunk_is_newline(pc))
-               {
-                  nl_opt = IARF_ADD;
-                  break;
-               }
-            }
-         }
-
-         if (chunk_is_token(brace_open, CT_VBRACE_OPEN))
-         {
-            // Can only add - we don't want to create a one-line here
-            if (nl_opt & IARF_ADD)
-            {
-               newline_iarf_pair(close_paren, chunk_get_next_ncnnl(brace_open), nl_opt);
-               pc = chunk_get_next_type(brace_open, CT_VBRACE_CLOSE, brace_open->level);
-
-               if (  !chunk_is_newline(chunk_get_prev_nc(pc))
-                  && !chunk_is_newline(chunk_get_next_nc(pc)))
-               {
-                  newline_add_after(pc);
-                  retval = true;
-               }
-            }
-         }
-         else
-         {
-            newline_iarf_pair(close_paren, brace_open, nl_opt);
-            chunk_t *next = chunk_get_next_ncnnl(brace_open);
-
-            if (brace_open->type != next->type)                       // Issue #2836
-            {
-               newline_add_between(brace_open, chunk_get_next_ncnnl(brace_open));
-            }
-            // Make sure nothing is cuddled with the closing brace
-            pc = chunk_get_next_type(brace_open, CT_BRACE_CLOSE, brace_open->level);
-            newline_add_between(pc, chunk_get_next_nblank(pc));
-            retval = true;
-         }
-      }
-   }
-   return(retval);
-} // newlines_if_for_while_switch
-
-
-static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e nl_opt)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNEWLINE, "%s(%d): start->text() is '%s', type is %s, orig_line is %zu, orig_column is %zu\n",
-           __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line, start->orig_col);
-
-   log_rule_B("nl_define_macro");
-
-   if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
-         && !options::nl_define_macro()))
-   {
-      return;
-   }
-
-   /*
-    * look backwards until we find
-    *   open brace (don't add or remove)
-    *   2 newlines in a row (don't add)
-    *   something else (don't remove)
-    */
-   for (chunk_t *pc = chunk_get_prev(start); pc != nullptr; pc = chunk_get_prev(pc))
-   {
-      size_t  level    = start->level;
-      bool    do_add   = (nl_opt & IARF_ADD) != IARF_IGNORE; // forcing value to bool
-      chunk_t *last_nl = nullptr;
-
-      if (chunk_is_newline(pc))
-      {
-         last_nl = pc;
-
-         // if we found 2 or more in a row
-         if (  pc->nl_count > 1
-            || chunk_is_newline(chunk_get_prev_nvb(pc)))
-         {
-            // need to remove
-            if (  (nl_opt & IARF_REMOVE)
-               && !pc->flags.test(PCF_VAR_DEF))
-            {
-               // if we're also adding, take care of that here
-               size_t nl_count = do_add ? 2 : 1;
-
-               if (nl_count != pc->nl_count)
-               {
-                  pc->nl_count = nl_count;
-                  MARK_CHANGE();
-               }
-               chunk_t *prev;
-
-               // can keep using pc because anything other than newline stops loop, and we delete if newline
-               while (chunk_is_newline(prev = chunk_get_prev_nvb(pc)))
-               {
-                  // Make sure we don't combine a preproc and non-preproc
-                  if (!chunk_safe_to_del_nl(prev))
-                  {
-                     break;
-                  }
-                  chunk_del(prev);
-                  MARK_CHANGE();
-               }
-            }
-            return;
-         }
-      }
-      else if (  chunk_is_opening_brace(pc)
-              || pc->level < level)
-      {
-         return;
-      }
-      else if (chunk_is_comment(pc))
-      {
-         // vbrace close is ok because it won't go into output, so we should skip it
-         last_nl = nullptr;
-         continue;
-      }
-      else
-      {
-         if (do_add) // we found something previously besides a comment or a new line
-         {
-            // if we have run across a newline
-            if (last_nl != nullptr)
-            {
-               if (last_nl->nl_count < 2)
-               {
-                  double_newline(last_nl);
-               }
-            }
-            else
-            {
-               chunk_t *next;
-
-               // we didn't run into a newline, so we need to add one
-               if (  ((next = chunk_get_next(pc)) != nullptr)
-                  && chunk_is_comment(next))
-               {
-                  pc = next;
-               }
-
-               if ((last_nl = newline_add_after(pc)) != nullptr)
-               {
-                  double_newline(last_nl);
-               }
-            }
-         }
-         return;
-      }
-   }
-} // newlines_if_for_while_switch_pre_blank_lines
-
-
-static void blank_line_set(chunk_t *pc, Option<unsigned> &opt)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-   const unsigned optval = opt();
-
-   if (  (optval > 0)
-      && (pc->nl_count != optval))
-   {
-      LOG_FMT(LBLANKD, "%s(%d): do_blank_lines: %s set line %zu to %u\n",
-              __func__, __LINE__, opt.name(), pc->orig_line, optval);
-      pc->nl_count = optval;
-      MARK_CHANGE();
-   }
-} // blank_line_set
-
-
-bool do_it_newlines_func_pre_blank_lines(chunk_t *last_nl, c_token_t start_type)
-{
-   LOG_FUNC_ENTRY();
-
-   if (last_nl == nullptr)
-   {
-      return(false);
-   }
-   LOG_FMT(LNLFUNCT, "%s(%d): orig_line is %zu, orig_col is %zu, type is %s, text() is '%s'\n",
-           __func__, __LINE__,
-           last_nl->orig_line, last_nl->orig_col, get_token_name(last_nl->type), last_nl->text());
-
-   switch (start_type)
-   {
-   case CT_FUNC_CLASS_DEF:
-   {
-      log_rule_B("nl_before_func_class_def");
-      bool diff = options::nl_before_func_class_def() <= last_nl->nl_count;
-      LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
-              __func__, __LINE__, diff ? "TRUE" : "FALSE");
-
-      log_rule_B("nl_before_func_class_def");
-
-      if (options::nl_before_func_class_def() != last_nl->nl_count)
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d):   set blank line(s) to %u\n",
-                 __func__, __LINE__, options::nl_before_func_class_def());
-         blank_line_set(last_nl, options::nl_before_func_class_def);
-      }
-      return(diff);
-   }
-
-   case CT_FUNC_CLASS_PROTO:
-   {
-      log_rule_B("nl_before_func_class_proto");
-      bool diff = options::nl_before_func_class_proto() <= last_nl->nl_count;
-      LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
-              __func__, __LINE__, diff ? "TRUE" : "FALSE");
-
-      log_rule_B("nl_before_func_class_proto");
-
-      if (options::nl_before_func_class_proto() != last_nl->nl_count)
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d):   set blank line(s) to %u\n",
-                 __func__, __LINE__, options::nl_before_func_class_proto());
-         blank_line_set(last_nl, options::nl_before_func_class_proto);
-      }
-      return(diff);
-   }
-
-   case CT_FUNC_DEF:
-   {
-      LOG_FMT(LNLFUNCT, "%s(%d): nl_before_func_body_def() is %u, last_nl->nl_count is %zu\n",
-              __func__, __LINE__, options::nl_before_func_body_def(), last_nl->nl_count);
-      log_rule_B("nl_before_func_body_def");
-      bool diff = options::nl_before_func_body_def() <= last_nl->nl_count;
-      LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
-              __func__, __LINE__, diff ? "TRUE" : "FALSE");
-
-      log_rule_B("nl_before_func_body_def");
-
-      if (options::nl_before_func_body_def() != last_nl->nl_count)
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d):    set blank line(s) to %u\n",
-                 __func__, __LINE__, options::nl_before_func_body_def());
-         log_rule_B("nl_before_func_body_def");
-         blank_line_set(last_nl, options::nl_before_func_body_def);
-      }
-      LOG_FMT(LNLFUNCT, "%s(%d): nl_before_func_body_def() is %u, last_nl->nl_count is %zu\n",
-              __func__, __LINE__, options::nl_before_func_body_def(), last_nl->nl_count);
-      return(diff);
-   }
-
-   case CT_FUNC_PROTO:
-   {
-      log_rule_B("nl_before_func_body_proto");
-      bool diff = options::nl_before_func_body_proto() <= last_nl->nl_count;
-      LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
-              __func__, __LINE__, diff ? "TRUE" : "FALSE");
-
-      log_rule_B("nl_before_func_body_proto");
-
-      if (options::nl_before_func_body_proto() != last_nl->nl_count)
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d):   set blank line(s) to %u\n",
-                 __func__, __LINE__, options::nl_before_func_body_proto());
-         log_rule_B("nl_before_func_body_proto");
-         blank_line_set(last_nl, options::nl_before_func_body_proto);
-      }
-      return(diff);
-   }
-
-   default:
-   {
-      LOG_FMT(LERR, "%s(%d):   setting to blank line(s) at line %zu not possible\n",
-              __func__, __LINE__, last_nl->orig_line);
-      return(false);
-   }
-   } // switch
-} // do_it_newlines_func_pre_blank_lines
-
-
-static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_before_func_class_def");
-   log_rule_B("nl_before_func_class_proto");
-   log_rule_B("nl_before_func_body_def");
-   log_rule_B("nl_before_func_body_proto");
-
-   if (  start == nullptr
-      || (  (  start_type != CT_FUNC_CLASS_DEF
-            || options::nl_before_func_class_def() == 0)
-         && (  start_type != CT_FUNC_CLASS_PROTO
-            || options::nl_before_func_class_proto() == 0)
-         && (  start_type != CT_FUNC_DEF
-            || options::nl_before_func_body_def() == 0)
-         && (  start_type != CT_FUNC_PROTO
-            || options::nl_before_func_body_proto() == 0)))
-   {
-      return;
-   }
-   LOG_FMT(LNLFUNCT, "%s(%d):    set blank line(s): for <NL> at line %zu, column %zu, start_type is %s\n",
-           __func__, __LINE__, start->orig_line, start->orig_col, get_token_name(start_type));
-   LOG_FMT(LNLFUNCT, "%s(%d): BEGIN set blank line(s) for '%s' at line %zu\n",
-           __func__, __LINE__, start->text(), start->orig_line);
-   /*
-    * look backwards until we find:
-    *   - open brace (don't add or remove)
-    *   - two newlines in a row (don't add)
-    *   - a destructor
-    *   - something else (don't remove)
-    */
-   chunk_t *pc           = nullptr;
-   chunk_t *last_nl      = nullptr;
-   chunk_t *last_comment = nullptr;
-   size_t  first_line    = start->orig_line;
-
-   for (pc = chunk_get_prev(start); pc != nullptr; pc = chunk_get_prev(pc))
-   {
-      LOG_FMT(LNLFUNCT, "%s(%d): orig_line is %zu, orig_col is %zu, type is %s, text() is '%s', nl_count is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->text(), pc->nl_count);
-
-      if (chunk_is_newline(pc))
-      {
-         last_nl = pc;
-         LOG_FMT(LNLFUNCT, "%s(%d):    <chunk_is_newline> found at line %zu, column %zu, nl_count is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
-         LOG_FMT(LNLFUNCT, "%s(%d):    last_nl set to %zu\n",
-                 __func__, __LINE__, last_nl->orig_line);
-         bool break_now = false;
-
-         if (pc->nl_count > 1)
-         {
-            break_now = do_it_newlines_func_pre_blank_lines(last_nl, start_type);
-            LOG_FMT(LNLFUNCT, "%s(%d): break_now is %s\n",
-                    __func__, __LINE__, break_now ? "TRUE" : "FALSE");
-         }
-
-         if (break_now)
-         {
-            break;
-         }
-         else
-         {
-            continue;
-         }
-      }
-      else if (chunk_is_comment(pc))
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d):    <chunk_is_comment> found at line %zu, column %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-
-         if (  (  pc->orig_line < first_line
-               && ((first_line - pc->orig_line
-                    - (chunk_is_token(pc, CT_COMMENT_MULTI) ? pc->nl_count : 0))) < 2)
-            || (  last_comment != nullptr
-               && chunk_is_token(pc, CT_COMMENT_CPP)         // combine only cpp comments
-               && chunk_is_token(last_comment, pc->type)     // don't mix comment types
-               && last_comment->orig_line > pc->orig_line
-               && (last_comment->orig_line - pc->orig_line) < 2))
-         {
-            last_comment = pc;
-            continue;
-         }
-         bool break_now = do_it_newlines_func_pre_blank_lines(last_nl, start_type);
-         LOG_FMT(LNLFUNCT, "%s(%d): break_now is %s\n",
-                 __func__, __LINE__, break_now ? "TRUE" : "FALSE");
-         continue;
-      }
-      else if (  chunk_is_token(pc, CT_DESTRUCTOR)
-              || chunk_is_token(pc, CT_TYPE)
-              || chunk_is_token(pc, CT_TEMPLATE)
-              || chunk_is_token(pc, CT_QUALIFIER)
-              || chunk_is_token(pc, CT_PTR_TYPE)
-              || chunk_is_token(pc, CT_BYREF)                  // Issue #2163
-              || chunk_is_token(pc, CT_DC_MEMBER)
-              || chunk_is_token(pc, CT_EXTERN)
-              || (  chunk_is_token(pc, CT_STRING)
-                 && get_chunk_parent_type(pc) == CT_EXTERN))
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d): first_line set to %zu\n",
-                 __func__, __LINE__, pc->orig_line);
-         first_line = pc->orig_line;
-         continue;
-      }
-      else if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-              && get_chunk_parent_type(pc) == CT_TEMPLATE)
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d):\n", __func__, __LINE__);
-         // skip template stuff to add newlines before it
-         pc = chunk_skip_to_match_rev(pc);
-
-         if (pc != nullptr)
-         {
-            first_line = pc->orig_line;
-         }
-         continue;
-      }
-      else
-      {
-         LOG_FMT(LNLFUNCT, "%s(%d): else ==================================\n",
-                 __func__, __LINE__);
-         bool break_now = do_it_newlines_func_pre_blank_lines(last_nl, start_type);
-         LOG_FMT(LNLFUNCT, "%s(%d): break_now is %s\n",
-                 __func__, __LINE__, break_now ? "TRUE" : "FALSE");
-         break;
-      }
-   }
-} // newlines_func_pre_blank_lines
-
-
-static chunk_t *get_closing_brace(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc;
-   size_t  level = start->level;
-
-   for (pc = start; (pc = chunk_get_next(pc)) != nullptr;)
-   {
-      if (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            || chunk_is_token(pc, CT_VBRACE_CLOSE))
-         && pc->level == level)
-      {
-         return(pc);
-      }
-
-      // for some reason, we can have newlines between if and opening brace that are lower level than either
-      if (  !chunk_is_newline(pc)
-         && pc->level < level)
-      {
-         return(nullptr);
-      }
-   }
-
-   return(nullptr);
-} // get_closing_brace
-
-
-static void remove_next_newlines(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *next;
-
-   while ((next = chunk_get_next(start)) != nullptr)
-   {
-      if (  chunk_is_newline(next)
-         && chunk_safe_to_del_nl(next))
-      {
-         chunk_del(next);
-         MARK_CHANGE();
-      }
-      else if (chunk_is_vbrace(next))
-      {
-         start = next;
-      }
-      else
-      {
-         break;
-      }
-   }
-} // remove_next_newlines
-
-
-static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e nl_opt)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *prev;
-
-   LOG_FMT(LNEWLINE, "%s(%d): start->text() is '%s', type is %s, orig_line is %zu, orig_column is %zu\n",
-           __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line, start->orig_col);
-
-   log_rule_B("nl_define_macro");
-
-   if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
-         && !options::nl_define_macro()))
-   {
-      return;
-   }
-   chunk_t *pc = get_closing_brace(start);
-
-   // first find ending brace
-   if (pc == nullptr)
-   {
-      return;
-   }
-   LOG_FMT(LNEWLINE, "%s(%d): pc->text() is '%s', type is %s, orig_line is %zu, orig_column is %zu\n",
-           __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
-
-   /*
-    * if we're dealing with an if, we actually want to add or remove
-    * blank lines after any else
-    */
-   if (chunk_is_token(start, CT_IF))
-   {
-      chunk_t *next;
-
-      while (true)
-      {
-         next = chunk_get_next_ncnnl(pc);
-
-         if (  next != nullptr
-            && (  chunk_is_token(next, CT_ELSE)
-               || chunk_is_token(next, CT_ELSEIF)))
-         {
-            // point to the closing brace of the else
-            if ((pc = get_closing_brace(next)) == nullptr)
-            {
-               return;
-            }
-            LOG_FMT(LNEWLINE, "%s(%d): pc->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                    __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
-         }
-         else
-         {
-            break;
-         }
-      }
-   }
-
-   /*
-    * if we're dealing with a do/while, we actually want to add or
-    * remove blank lines after while and its condition
-    */
-   if (chunk_is_token(start, CT_DO))
-   {
-      // point to the next semicolon
-      if ((pc = chunk_get_next_type(pc, CT_SEMICOLON, start->level)) == nullptr)
-      {
-         return;
-      }
-      LOG_FMT(LNEWLINE, "%s(%d): pc->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
-   }
-   bool isVBrace = (chunk_is_token(pc, CT_VBRACE_CLOSE));
-
-   if (isVBrace)
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): isVBrace is TRUE\n", __func__, __LINE__);
-   }
-   else
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): isVBrace is FALSE\n", __func__, __LINE__);
-   }
-
-   if ((prev = chunk_get_prev_nvb(pc)) == nullptr)
-   {
-      return;
-   }
-   bool have_pre_vbrace_nl = isVBrace && chunk_is_newline(prev);
-
-   if (have_pre_vbrace_nl)
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): have_pre_vbrace_nl is TRUE\n", __func__, __LINE__);
-   }
-   else
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): have_pre_vbrace_nl is FALSE\n", __func__, __LINE__);
-   }
-
-   if (nl_opt & IARF_REMOVE)
-   {
-      chunk_t *next;
-
-      // if chunk before is a vbrace, remove any newlines after it
-      if (have_pre_vbrace_nl)
-      {
-         if (prev->nl_count != 1)
-         {
-            prev->nl_count = 1;
-            MARK_CHANGE();
-         }
-         remove_next_newlines(pc);
-      }
-      else if (  (chunk_is_newline(next = chunk_get_next_nvb(pc)))
-              && !next->flags.test(PCF_VAR_DEF))
-      {
-         // otherwise just deal with newlines after brace
-         if (next->nl_count != 1)
-         {
-            next->nl_count = 1;
-            MARK_CHANGE();
-         }
-         remove_next_newlines(next);
-      }
-   }
-
-   // may have a newline before and after vbrace
-   // don't do anything with it if the next non newline chunk is a closing brace
-   if (nl_opt & IARF_ADD)
-   {
-      chunk_t *next;
-      chunk_t *nextNNL = chunk_get_next_nnl(pc);
-
-      do
-      {
-         if (nextNNL == nullptr)
-         {
-            return;
-         }
-
-         if (chunk_is_not_token(nextNNL, CT_VBRACE_CLOSE))
-         {
-            next = nextNNL;
-            break;
-         }
-         nextNNL = chunk_get_next_nnl(nextNNL);
-      } while (true);
-
-      LOG_FMT(LNEWLINE, "%s(%d): next->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-              __func__, __LINE__, next->text(), get_token_name(next->type), next->orig_line, next->orig_col);
-
-      if (chunk_is_not_token(next, CT_BRACE_CLOSE))
-      {
-         // if vbrace, have to check before and after
-         // if chunk before vbrace, check its count
-         size_t nl_count = have_pre_vbrace_nl ? prev->nl_count : 0;
-         LOG_FMT(LNEWLINE, "%s(%d): nl_count %zu\n", __func__, __LINE__, nl_count);
-
-         if (chunk_is_newline(next = chunk_get_next_nvb(pc)))
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): next->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                    __func__, __LINE__, next->text(), get_token_name(next->type), next->orig_line, next->orig_col);
-            nl_count += next->nl_count;
-            LOG_FMT(LNEWLINE, "%s(%d): nl_count is %zu\n", __func__, __LINE__, nl_count);
-         }
-
-         // if we have no newlines, add one and make it double
-         if (nl_count == 0)
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): nl_count is 0\n", __func__, __LINE__);
-
-            if (  ((next = chunk_get_next(pc)) != nullptr)
-               && chunk_is_comment(next))
-            {
-               LOG_FMT(LNEWLINE, "%s(%d): next->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, next->text(), get_token_name(next->type), next->orig_line, next->orig_col);
-               pc = next;
-               LOG_FMT(LNEWLINE, "%s(%d): pc->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
-            }
-
-            if ((next = newline_add_after(pc)) == nullptr)
-            {
-               return;
-            }
-            LOG_FMT(LNEWLINE, "%s(%d): next->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                    __func__, __LINE__, next->text(), get_token_name(next->type), next->orig_line, next->orig_col);
-            double_newline(next);
-         }
-         else if (nl_count == 1) // if we don't have enough newlines
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): nl_count is 1\n", __func__, __LINE__);
-
-            // if we have a preceeding vbrace, add one after it
-            if (have_pre_vbrace_nl)
-            {
-               LOG_FMT(LNEWLINE, "%s(%d): have_pre_vbrace_nl is TRUE\n", __func__, __LINE__);
-               next = newline_add_after(pc);
-               LOG_FMT(LNEWLINE, "%s(%d): next->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, next->text(), get_token_name(next->type), next->orig_line, next->orig_col);
-            }
-            else
-            {
-               LOG_FMT(LNEWLINE, "%s(%d): have_pre_vbrace_nl is FALSE\n", __func__, __LINE__);
-               prev = chunk_get_prev_nnl(next);
-               LOG_FMT(LNEWLINE, "%s(%d): prev->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, prev->text(), get_token_name(prev->type), prev->orig_line, prev->orig_col);
-               pc = chunk_get_next_nl(next);
-               LOG_FMT(LNEWLINE, "%s(%d): pc->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
-               chunk_t *pc2 = chunk_get_next(pc);
-
-               if (pc2 != nullptr)
-               {
-                  pc = pc2;
-                  LOG_FMT(LNEWLINE, "%s(%d): pc->text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                          __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
-               }
-               else
-               {
-                  LOG_FMT(LNEWLINE, "%s(%d): no next found: <EOF>\n", __func__, __LINE__);
-               }
-               log_rule_B("nl_squeeze_ifdef");
-
-               if (  chunk_is_token(pc, CT_PREPROC)
-                  && get_chunk_parent_type(pc) == CT_PP_ENDIF
-                  && options::nl_squeeze_ifdef())
-               {
-                  LOG_FMT(LNEWLINE, "%s(%d): cannot add newline after orig_line %zu due to nl_squeeze_ifdef\n",
-                          __func__, __LINE__, prev->orig_line);
-               }
-               else
-               {
-                  // make newline after double
-                  LOG_FMT(LNEWLINE, "%s(%d): call double_newline\n", __func__, __LINE__);
-                  double_newline(next);
-               }
-            }
-         }
-      }
-   }
-} // newlines_if_for_while_switch_post_blank_lines
-
-
-static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trailing)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_define_macro");
-
-   if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
-         && !options::nl_define_macro()))
-   {
-      return;
-   }
-   /*
-    * step past any junk between the keyword and the open brace
-    * Quit if we hit a semicolon or '=', which are not expected.
-    */
-   size_t  level = start->level;
-   chunk_t *pc   = start;
-
-   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-         && pc->level >= level)
-   {
-      if (  pc->level == level
-         && (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_ASSIGN)))
-      {
-         break;
-      }
-      start = pc;
-   }
-
-   // If we hit a brace open, then we need to toy with the newlines
-   if (chunk_is_token(pc, CT_BRACE_OPEN))
-   {
-      // Skip over embedded C comments
-      chunk_t *next = chunk_get_next(pc);
-
-      while (chunk_is_token(next, CT_COMMENT))
-      {
-         next = chunk_get_next(next);
-      }
-
-      if (  leave_trailing
-         && !chunk_is_comment(next)
-         && !chunk_is_newline(next))
-      {
-         nl_opt = IARF_IGNORE;
-      }
-      newline_iarf_pair(start, pc, nl_opt);
-   }
-} // newlines_struct_union
-
-
-// enum {
-// enum class angle_state_e : unsigned int {
-// enum-key attr(optional) identifier(optional) enum-base(optional) { enumerator-list(optional) }
-// enum-key attr(optional) nested-name-specifier(optional) identifier enum-base(optional) ; TODO
-// enum-key         - one of enum, enum class or enum struct  TODO
-// identifier       - the name of the enumeration that's being declared
-// enum-base(C++11) - colon (:), followed by a type-specifier-seq
-// enumerator-list  - comma-separated list of enumerator definitions
-static void newlines_enum(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_define_macro");
-
-   if (  start->flags.test(PCF_IN_PREPROC)
-      && !options::nl_define_macro())
-   {
-      return;
-   }
-   // look for 'enum class'
-   chunk_t *pcClass = chunk_get_next_ncnnl(start);
-
-   if (chunk_is_token(pcClass, CT_ENUM_CLASS))
-   {
-      log_rule_B("nl_enum_class");
-      newline_iarf_pair(start, pcClass, options::nl_enum_class());
-      // look for 'identifier'/ 'type'
-      chunk_t *pcType = chunk_get_next_ncnnl(pcClass);
-
-      if (chunk_is_token(pcType, CT_TYPE))
-      {
-         log_rule_B("nl_enum_class_identifier");
-         newline_iarf_pair(pcClass, pcType, options::nl_enum_class_identifier());
-         // look for ':'
-         chunk_t *pcColon = chunk_get_next_ncnnl(pcType);
-
-         if (chunk_is_token(pcColon, CT_BIT_COLON))
-         {
-            log_rule_B("nl_enum_identifier_colon");
-            newline_iarf_pair(pcType, pcColon, options::nl_enum_identifier_colon());
-            // look for 'type' i.e. unsigned
-            chunk_t *pcType1 = chunk_get_next_ncnnl(pcColon);
-
-            if (chunk_is_token(pcType1, CT_TYPE))
-            {
-               log_rule_B("nl_enum_colon_type");
-               newline_iarf_pair(pcColon, pcType1, options::nl_enum_colon_type());
-               // look for 'type' i.e. int
-               chunk_t *pcType2 = chunk_get_next_ncnnl(pcType1);
-
-               if (chunk_is_token(pcType2, CT_TYPE))
-               {
-                  log_rule_B("nl_enum_colon_type");
-                  newline_iarf_pair(pcType1, pcType2, options::nl_enum_colon_type());
-               }
-            }
-         }
-      }
-   }
-   /*
-    * step past any junk between the keyword and the open brace
-    * Quit if we hit a semicolon or '=', which are not expected.
-    */
-   size_t  level = start->level;
-   chunk_t *pc   = start;
-
-   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-         && pc->level >= level)
-   {
-      if (  pc->level == level
-         && (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_ASSIGN)))
-      {
-         break;
-      }
-      start = pc;
-   }
-
-   // If we hit a brace open, then we need to toy with the newlines
-   if (chunk_is_token(pc, CT_BRACE_OPEN))
-   {
-      // Skip over embedded C comments
-      chunk_t *next = chunk_get_next(pc);
-
-      while (chunk_is_token(next, CT_COMMENT))
-      {
-         next = chunk_get_next(next);
-      }
-      iarf_e nl_opt;
-
-      if (  !chunk_is_comment(next)
-         && !chunk_is_newline(next))
-      {
-         nl_opt = IARF_IGNORE;
-      }
-      else
-      {
-         log_rule_B("nl_enum_brace");
-         nl_opt = options::nl_enum_brace();
-      }
-      newline_iarf_pair(start, pc, nl_opt);
-   }
-} // newlines_enum
-
-
-// namespace {
-// namespace word {
-// namespace type::word {
-static void newlines_namespace(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_namespace_brace");
-
-   // Add or remove newline between 'namespace' and 'BRACE_OPEN'
-   log_rule_B("nl_define_macro");
-   iarf_e nl_opt = options::nl_namespace_brace();
-
-   if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
-         && !options::nl_define_macro()))
-   {
-      return;
-   }
-   chunk_t *braceOpen = chunk_get_next_type(start, CT_BRACE_OPEN, start->level);
-
-   LOG_FMT(LNEWLINE, "%s(%d): braceOpen->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-           __func__, __LINE__, braceOpen->orig_line, braceOpen->orig_col, braceOpen->text());
-   // produces much more log output. Use it only debugging purpose
-   //log_pcf_flags(LNEWLINE, braceOpen->flags);
-
-   if (braceOpen->flags.test(PCF_ONE_LINER))
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): is one_liner\n",
-              __func__, __LINE__);
-      return;
-   }
-   chunk_t *beforeBrace = chunk_get_prev(braceOpen);
-
-   LOG_FMT(LNEWLINE, "%s(%d): beforeBrace->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-           __func__, __LINE__, beforeBrace->orig_line, beforeBrace->orig_col, beforeBrace->text());
-   // 'namespace' 'BRACE_OPEN'
-   newline_iarf_pair(beforeBrace, braceOpen, nl_opt);
-} // newlines_namespace
-
-
-static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_define_macro");
-
-   if (  start->flags.test(PCF_IN_PREPROC)
-      && !options::nl_define_macro())
-   {
-      return;
-   }
-   chunk_t *br_close = chunk_get_prev_ncnnlni(start);   // Issue #2279
-
-   if (chunk_is_token(br_close, CT_BRACE_CLOSE))
-   {
-      newline_iarf_pair(br_close, start, nl_opt);
-   }
-} // newlines_cuddle_uncuddle
-
-
-static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_define_macro");
-
-   if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
-         && !options::nl_define_macro()))
-   {
-      return;
-   }
-   chunk_t *next = chunk_get_next_ncnnl(start);
-
-   if (  next != nullptr
-      && (  chunk_is_token(next, CT_BRACE_OPEN)
-         || chunk_is_token(next, CT_VBRACE_OPEN)))
-   {
-      if (!one_liner_nl_ok(next))
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): a new line may NOT be added\n", __func__, __LINE__);
-         return;
-      }
-      LOG_FMT(LNL1LINE, "%s(%d): a new line may be added\n", __func__, __LINE__);
-
-      if (chunk_is_token(next, CT_VBRACE_OPEN))
-      {
-         // Can only add - we don't want to create a one-line here
-         if (nl_opt & IARF_ADD)
-         {
-            newline_iarf_pair(start, chunk_get_next_ncnnl(next), nl_opt);
-            chunk_t *tmp = chunk_get_next_type(next, CT_VBRACE_CLOSE, next->level);
-
-            if (  !chunk_is_newline(chunk_get_next_nc(tmp))
-               && !chunk_is_newline(chunk_get_prev_nc(tmp)))
-            {
-               newline_add_after(tmp);
-            }
-         }
-      }
-      else
-      {
-         newline_iarf_pair(start, next, nl_opt);
-         newline_add_between(next, chunk_get_next_ncnnl(next));
-      }
-   }
-} // newlines_do_else
-
-
-static bool is_var_def(chunk_t *pc, chunk_t *next)
-{
-   if (  chunk_is_token(pc, CT_DECLTYPE)
-      && chunk_is_token(next, CT_PAREN_OPEN))
-   {
-      // If current token starts a decltype expression, skip it
-      next = chunk_skip_to_match(next);
-      next = chunk_get_next_ncnnl(next);
-   }
-   else if (!chunk_is_type(pc))
-   {
-      // Otherwise, if the current token is not a type --> not a declaration
-      return(false);
-   }
-   else if (chunk_is_token(next, CT_DC_MEMBER))
-   {
-      // If next token is CT_DC_MEMBER, skip it
-      next = chunk_skip_dc_member(next);
-   }
-   else if (chunk_is_token(next, CT_ANGLE_OPEN))
-   {
-      // If we have a template type, skip it
-      next = chunk_skip_to_match(next);
-      next = chunk_get_next_ncnnl(next);
-   }
-   bool is = (  (  chunk_is_type(next)
-                && get_chunk_parent_type(next) != CT_FUNC_DEF)           // Issue #2639
-             || chunk_is_token(next, CT_WORD)
-             || chunk_is_token(next, CT_FUNC_CTOR_VAR));
-
-   return(is);
-} // is_var_def
-
-
-// Put newline(s) before and/or after a block of variable definitions
-static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
-
-   // can't be any variable definitions in a "= {" block
-   if (chunk_is_token(prev, CT_ASSIGN))
-   {
-      chunk_t *tmp = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
-      return(chunk_get_next_ncnnl(tmp));
-   }
-   chunk_t *pc           = chunk_get_next(start);
-   bool    did_this_line = false;
-   bool    first_var_blk = true;
-   bool    var_blk       = false;
-
-   while (  pc != nullptr
-         && (  pc->level >= start->level
-            || pc->level == 0))
-   {
-      LOG_FMT(LNL1LINE, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-
-      chunk_t *next_pc = chunk_get_next(pc);
-
-      if (chunk_is_token(next_pc, CT_DC_MEMBER))
-      {
-         // If next_pc token is CT_DC_MEMBER, skip it
-         pc = chunk_skip_dc_member(pc);
-      }
-
-      if (chunk_is_comment(pc))
-      {
-         pc = chunk_get_next(pc);
-         continue;
-      }
-
-      // process nested braces
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
-      {
-         pc = newline_def_blk(pc, false);
-         continue;
-      }
-
-      // Done with this brace set?
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         pc = chunk_get_next(pc);
-         break;
-      }
-
-      if (chunk_is_preproc(pc))
-      {
-         if (!var_blk)
-         {
-            pc = chunk_get_next(pc);
-            break;
-         }
-      }
-
-      // skip vbraces
-      if (chunk_is_token(pc, CT_VBRACE_OPEN))
-      {
-         pc = chunk_get_next_type(pc, CT_VBRACE_CLOSE, pc->level);
-         pc = chunk_get_next(pc);
-         continue;
-      }
-
-      // Ignore stuff inside parenthesis/squares/angles
-      if (pc->level > pc->brace_level)
-      {
-         pc = chunk_get_next(pc);
-         continue;
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         did_this_line = false;
-         pc            = chunk_get_next(pc);
-         continue;
-      }
-
-      // Determine if this is a variable definition or code
-      if (  !did_this_line
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_DEF)
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_PROTO)
-         && (  (pc->level == (start->level + 1))
-            || pc->level == 0))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (  chunk_is_token(next, CT_PTR_TYPE) // Issue #2692
-            || chunk_is_token(next, CT_BYREF))   // Issue #3018
-         {
-            next = chunk_get_next_ncnnl(next);
-         }
-
-         if (next == nullptr)
-         {
-            break;
-         }
-         LOG_FMT(LNL1LINE, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, text() is '%s'\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->text());
-         prev = chunk_get_prev_type(pc, CT_SEMICOLON, pc->level);
-
-         if (prev == nullptr)
-         {
-            prev = chunk_get_prev_type(pc, CT_BRACE_OPEN, pc->level - 1);      // Issue #2692
-         }
-
-         if (  chunk_is_token(prev, CT_STRING)
-            && get_chunk_parent_type(prev) == CT_EXTERN
-            && chunk_is_token(prev->prev, CT_EXTERN))
-         {
-            prev = chunk_get_prev_ncnnlni(prev->prev);   // Issue #2279
-         }
-
-         if (is_var_def(pc, next))
-         {
-            LOG_FMT(LBLANKD, "%s(%d): 'typ==var' found: '%s %s' at line %zu\n",
-                    __func__, __LINE__, pc->text(), next->text(), pc->orig_line);
-            // Put newline(s) before a block of variable definitions
-            log_rule_B("nl_var_def_blk_start");
-
-            if (  !var_blk
-               && first_var_blk
-               && options::nl_var_def_blk_start() > 0)
-            {
-               chunk_t *prev_2 = chunk_get_prev_nnl(pc);                  // Issue #3097
-
-               // std::mutex* a;                                             Issue #2692
-               while (  chunk_is_token(prev_2, CT_DC_MEMBER)
-                     || chunk_is_token(prev_2, CT_TYPE))
-               {
-                  prev_2 = chunk_get_prev(prev_2);
-               }
-
-               if (chunk_is_token(prev_2, CT_NEWLINE))
-               {
-                  prev_2 = chunk_get_prev_nnl(prev_2);
-               }
-               LOG_FMT(LBLANKD, "%s(%d): prev_2 is '%s', orig_line is %zu\n",
-                       __func__, __LINE__, prev_2->text(), prev_2->orig_line);
-               newline_min_after(prev_2, options::nl_var_def_blk_start(), PCF_VAR_DEF);
-            }
-            // set newlines within var def block
-            else if (  var_blk
-                    && (options::nl_var_def_blk_in() > 0))
-            {
-               log_rule_B("nl_var_def_blk_in");
-               prev = chunk_get_prev(pc);
-               LOG_FMT(LNL1LINE, "%s(%d): prev->orig_line is %zu, prev->orig_col is %zu, text() is '%s'\n",
-                       __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text());
-
-               if (chunk_is_newline(prev))
-               {
-                  log_rule_B("nl_var_def_blk_in");
-
-                  if (prev->nl_count > options::nl_var_def_blk_in())
-                  {
-                     prev->nl_count = options::nl_var_def_blk_in();
-                     MARK_CHANGE();
-                  }
-               }
-            }
-            pc      = chunk_get_next_type(pc, CT_SEMICOLON, pc->level);
-            var_blk = true;
-         }
-         else if (var_blk)
-         {
-            log_rule_B("nl_var_def_blk_end");
-
-            if (options::nl_var_def_blk_end() > 0)
-            {
-               newline_min_after(prev, options::nl_var_def_blk_end(), PCF_VAR_DEF);
-            }
-            // set blank lines after first var def block
-            log_rule_B("nl_func_var_def_blk");
-
-            if (  var_blk
-               && first_var_blk
-               && fn_top
-               && (options::nl_func_var_def_blk() > 0))
-            {
-               LOG_FMT(LBLANKD, "%s(%d): nl_func_var_def_blk at line %zu\n",
-                       __func__, __LINE__, prev->orig_line);
-               log_rule_B("nl_func_var_def_blk");
-               newline_min_after(prev, 1 + options::nl_func_var_def_blk(), PCF_VAR_DEF);
-            }
-            // reset the variables for the next block
-            first_var_blk = true;
-            var_blk       = false;
-         }
-      }
-      else
-      {
-         if (chunk_is_token(pc, CT_FUNC_CLASS_DEF))
-         {
-            log_rule_B("nl_var_def_blk_end");
-
-            if (  var_blk
-               && options::nl_var_def_blk_end() > 0)
-            {
-               prev = chunk_get_prev(pc);
-               prev = chunk_get_prev(prev);
-               newline_min_after(prev, options::nl_var_def_blk_end(), PCF_VAR_DEF);
-               pc            = chunk_get_next(pc);
-               first_var_blk = false;
-               var_blk       = false;
-            }
-         }
-      }
-      did_this_line = true;
-      pc            = chunk_get_next(pc);
-   }
-   return(pc);
-} // newline_def_blk
-
-
-static bool collapse_empty_body(chunk_t *br_open)
-{
-   log_rule_B("nl_collapse_empty_body");
-
-   if (  !options::nl_collapse_empty_body()
-      || !chunk_is_token(chunk_get_next_nnl(br_open), CT_BRACE_CLOSE))
-   {
-      return(false);
-   }
-
-   for (chunk_t *pc = chunk_get_next(br_open)
-        ; chunk_is_not_token(pc, CT_BRACE_CLOSE)
-        ; pc = chunk_get_next(pc))
-   {
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         && chunk_safe_to_del_nl(pc))
-      {
-         pc = pc->prev;
-         chunk_t *next = pc->next;
-         chunk_del(next);
-         MARK_CHANGE();
-      }
-   }
-
-   return(true);
-} // collapse_empty_body
-
-
-static void newlines_brace_pair(chunk_t *br_open)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("nl_define_macro");
-
-   if (  br_open->flags.test(PCF_IN_PREPROC)
-      && !options::nl_define_macro())
-   {
-      return;
-   }
-
-   //fixes 1235 Add single line namespace support
-   if (  chunk_is_token(br_open, CT_BRACE_OPEN)
-      && (get_chunk_parent_type(br_open) == CT_NAMESPACE)
-      && chunk_is_newline(chunk_get_prev(br_open)))
-   {
-      chunk_t *chunk_brace_close = chunk_skip_to_match(br_open, scope_e::ALL);
-
-      if (chunk_brace_close != nullptr)
-      {
-         if (are_chunks_in_same_line(br_open, chunk_brace_close))
-         {
-            log_rule_B("nl_namespace_two_to_one_liner");
-
-            if (options::nl_namespace_two_to_one_liner())
-            {
-               chunk_t *prev = chunk_get_prev_nnl(br_open);
-               newline_del_between(prev, br_open);
-            }
-            /* Below code is to support conversion of 2 liner to 4 liners
-             * else
-             * {
-             *  chunk_t *nxt = chunk_get_next(br_open);
-             *  newline_add_between(br_open, nxt);
-             * }*/
-         }
-      }
-   }
-   // fix 1247 oneliner function support - converts 4,3,2  liners to oneliner
-   log_rule_B("nl_create_func_def_one_liner");
-
-   if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
-      && options::nl_create_func_def_one_liner()
-      && !br_open->flags.test(PCF_NOT_POSSIBLE))          // Issue #2795
-   {
-      chunk_t *br_close = chunk_skip_to_match(br_open, scope_e::ALL);
-      chunk_t *tmp      = chunk_get_prev_ncnnlni(br_open); // Issue #2279
-
-      if (  br_close != nullptr                            // Issue #2594
-         && ((br_close->orig_line - br_open->orig_line) <= 2)
-         && chunk_is_paren_close(tmp))                     // need to check the conditions.
-      {
-         // Issue #1825
-         bool is_it_possible = true;
-
-         while (  tmp != nullptr
-               && (tmp = chunk_get_next(tmp)) != nullptr
-               && !chunk_is_closing_brace(tmp)
-               && (chunk_get_next(tmp) != nullptr))
-         {
-            LOG_FMT(LNL1LINE, "%s(%d): tmp->orig_line is %zu, tmp->orig_col is %zu, text() is '%s'\n",
-                    __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-
-            if (chunk_is_comment(tmp))
-            {
-               is_it_possible = false;
-               break;
-            }
-         }
-
-         if (is_it_possible)
-         {
-            // Issue 2795
-            // we have to check if it could be too long for code_width
-            // make a vector to save the chunk
-            vector<chunk_t> saved_chunk;
-            log_rule_B("code_width");
-
-            if (options::code_width() > 0)
-            {
-               saved_chunk.reserve(16);
-               chunk_t *current       = chunk_get_prev_ncnnlni(br_open);
-               chunk_t *next_br_close = chunk_get_next(br_close);
-               current = chunk_get_next(current);
-
-               while (current != nullptr)
-               {
-                  LOG_FMT(LNL1LINE, "%s(%d): zu  kopieren: current->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                          __func__, __LINE__, current->orig_line, current->orig_col, current->text());
-                  saved_chunk.push_back(*current);
-                  chunk_t *the_next = chunk_get_next(current);
-
-                  if (  the_next == nullptr
-                     || the_next == next_br_close)
-                  {
-                     break;
-                  }
-                  current = the_next;
-               }
-            }
-            chunk_t *tmp_1 = chunk_get_prev_ncnnlni(br_open);
-
-            while (  tmp_1 != nullptr
-                  && (tmp_1 = chunk_get_next(tmp_1)) != nullptr
-                  && !chunk_is_closing_brace(tmp_1)
-                  && (chunk_get_next(tmp_1) != nullptr))
-            {
-               LOG_FMT(LNL1LINE, "%s(%d): tmp_1->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                       __func__, __LINE__, tmp_1->orig_line, tmp_1->orig_col, tmp_1->text());
-
-               if (chunk_is_newline(tmp_1))
-               {
-                  tmp_1 = chunk_get_prev(tmp_1);                 // Issue #1825
-                  newline_iarf_pair(tmp_1, chunk_get_next_ncnnl(tmp_1), IARF_REMOVE);
-               }
-            }
-            chunk_flags_set(br_open, PCF_ONE_LINER);         // set the one liner flag if needed
-            chunk_flags_set(br_close, PCF_ONE_LINER);
-            log_rule_B("code_width");
-
-            if (  options::code_width() > 0
-               && br_close->column > options::code_width())
-            {
-               // the created line is too long
-               // it is not possible to make an one_liner
-               // because the line would be too long
-               chunk_flags_set(br_open, PCF_NOT_POSSIBLE);
-               // restore the code
-               size_t  count;
-               chunk_t tmp_2;
-               chunk_t *current = br_open;
-
-               for (count = 0; count < saved_chunk.size(); count++)
-               {
-                  tmp_2 = saved_chunk.at(count);
-
-                  if (tmp_2.orig_line != current->orig_line)
-                  {
-                     // restore the newline
-                     chunk_t chunk;
-                     set_chunk_type(&chunk, CT_NEWLINE);
-                     chunk.orig_line = current->orig_line;
-                     chunk.orig_col  = current->orig_col;
-                     chunk.pp_level  = current->pp_level;
-                     chunk.nl_count  = 1;
-                     chunk_add_before(&chunk, current);
-                     LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline before '%s'\n",
-                             __func__, __LINE__, current->orig_line, current->orig_col, current->text());
-                  }
-                  else
-                  {
-                     current = chunk_get_next(current);
-                  }
-               }
-            }
-         }
-      }
-   }
-
-   // Make sure we don't break a one-liner
-   if (!one_liner_nl_ok(br_open))
-   {
-      LOG_FMT(LNL1LINE, "%s(%d): br_open->orig_line is %zu, br_open->orig_col is %zu, a new line may NOT be added\n",
-              __func__, __LINE__, br_open->orig_line, br_open->orig_col);
-      return;
-   }
-   LOG_FMT(LNL1LINE, "%s(%d): a new line may be added\n", __func__, __LINE__);
-
-   chunk_t *next = chunk_get_next_nc(br_open);
-
-   // Insert a newline between the '=' and open brace, if needed
-   LOG_FMT(LNL1LINE, "%s(%d): br_open->text() '%s', br_open->type [%s], br_open->parent_type [%s]\n",
-           __func__, __LINE__, br_open->text(), get_token_name(br_open->type),
-           get_token_name(get_chunk_parent_type(br_open)));
-
-   if (get_chunk_parent_type(br_open) == CT_ASSIGN)
-   {
-      // Only mess with it if the open brace is followed by a newline
-      if (chunk_is_newline(next))
-      {
-         chunk_t *prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
-         log_rule_B("nl_assign_brace");
-         newline_iarf_pair(prev, br_open, options::nl_assign_brace());
-      }
-   }
-
-   if (  get_chunk_parent_type(br_open) == CT_OC_MSG_DECL
-      || get_chunk_parent_type(br_open) == CT_FUNC_DEF
-      || get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-      || get_chunk_parent_type(br_open) == CT_OC_CLASS
-      || get_chunk_parent_type(br_open) == CT_CS_PROPERTY
-      || get_chunk_parent_type(br_open) == CT_CPP_LAMBDA
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL_USER)
-   {
-      chunk_t *prev = nullptr;
-      iarf_e  val;
-
-      if (get_chunk_parent_type(br_open) == CT_OC_MSG_DECL)
-      {
-         log_rule_B("nl_oc_mdef_brace");
-         val = options::nl_oc_mdef_brace();
-      }
-      else
-      {
-         if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
-            || get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-            || get_chunk_parent_type(br_open) == CT_OC_CLASS)
-         {
-            val = IARF_NOT_DEFINED;
-            log_rule_B("nl_fdef_brace_cond");
-            const iarf_e nl_fdef_brace_cond_v = options::nl_fdef_brace_cond();
-
-            if (nl_fdef_brace_cond_v != IARF_IGNORE)
-            {
-               prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
-
-               if (chunk_is_token(prev, CT_FPAREN_CLOSE))
-               {
-                  val = nl_fdef_brace_cond_v;
-               }
-            }
-
-            if (val == IARF_NOT_DEFINED)
-            {
-               log_rule_B("nl_fdef_brace");
-               val = options::nl_fdef_brace();
-            }
-         }
-         else
-         {
-            log_rule_B("nl_property_brace");
-            log_rule_B("nl_cpp_ldef_brace");
-            log_rule_B("nl_fcall_brace");
-            val = ((get_chunk_parent_type(br_open) == CT_CS_PROPERTY) ?
-                   options::nl_property_brace() :
-                   ((get_chunk_parent_type(br_open) == CT_CPP_LAMBDA) ?
-                    options::nl_cpp_ldef_brace() :
-                    options::nl_fcall_brace()));
-         }
-      }
-
-      if (val != IARF_IGNORE)
-      {
-         if (prev == nullptr)
-         {
-            // Grab the chunk before the open brace
-            prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
-         }
-         newline_iarf_pair(prev, br_open, val);
-      }
-   }
-
-   if (collapse_empty_body(br_open))
-   {
-      return;
-   }
-   //fixes #1245 will add new line between tsquare and brace open based on nl_tsquare_brace
-
-   if (chunk_is_token(br_open, CT_BRACE_OPEN))
-   {
-      chunk_t *chunk_closeing_brace = chunk_skip_to_match(br_open, scope_e::ALL);
-
-      if (chunk_closeing_brace != nullptr)
-      {
-         if (chunk_closeing_brace->orig_line > br_open->orig_line)
-         {
-            chunk_t *prev = chunk_get_prev_nc(br_open);
-
-            if (  chunk_is_token(prev, CT_TSQUARE)
-               && chunk_is_newline(next))
-            {
-               log_rule_B("nl_tsquare_brace");
-               newline_iarf_pair(prev, br_open, options::nl_tsquare_brace());
-            }
-         }
-      }
-   }
-   // Eat any extra newlines after the brace open
-   log_rule_B("eat_blanks_after_open_brace");
-
-   if (options::eat_blanks_after_open_brace())
-   {
-      if (chunk_is_newline(next))
-      {
-         log_rule_B("nl_inside_empty_func");
-         log_rule_B("nl_inside_namespace");
-
-         if (  options::nl_inside_empty_func() > 0
-            && chunk_is_token(chunk_get_next_nnl(br_open), CT_BRACE_CLOSE)
-            && (  get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-               || get_chunk_parent_type(br_open) == CT_FUNC_DEF))
-         {
-            blank_line_set(next, options::nl_inside_empty_func);
-         }
-         else if (  options::nl_inside_namespace() > 0
-                 && get_chunk_parent_type(br_open) == CT_NAMESPACE)
-         {
-            blank_line_set(next, options::nl_inside_namespace);
-         }
-         else if (next->nl_count > 1)
-         {
-            next->nl_count = 1;
-            LOG_FMT(LBLANKD, "%s(%d): eat_blanks_after_open_brace %zu\n",
-                    __func__, __LINE__, next->orig_line);
-            MARK_CHANGE();
-         }
-      }
-   }
-   bool nl_close_brace = false;
-
-   // Handle the cases where the brace is part of a function call or definition
-   if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL_USER
-      || get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-      || get_chunk_parent_type(br_open) == CT_OC_CLASS
-      || get_chunk_parent_type(br_open) == CT_OC_MSG_DECL
-      || get_chunk_parent_type(br_open) == CT_CS_PROPERTY
-      || get_chunk_parent_type(br_open) == CT_CPP_LAMBDA)
-   {
-      // Need to force a newline before the close brace, if not in a class body
-      if (!br_open->flags.test(PCF_IN_CLASS))
-      {
-         nl_close_brace = true;
-      }
-      // handle newlines after the open brace
-      chunk_t *pc = chunk_get_next_ncnnl(br_open);
-      newline_add_between(br_open, pc);
-
-      newline_def_blk(br_open, true);
-   }
-
-   // Handle the cases where the brace is part of a class or struct
-   if (  get_chunk_parent_type(br_open) == CT_CLASS
-      || get_chunk_parent_type(br_open) == CT_STRUCT)
-   {
-      newline_def_blk(br_open, false);
-   }
-   // Grab the matching brace close
-   chunk_t *br_close = chunk_get_next_type(br_open, CT_BRACE_CLOSE, br_open->level);
-
-   if (br_close == nullptr)
-   {
-      return;
-   }
-
-   if (!nl_close_brace)
-   {
-      /*
-       * If the open brace hits a CT_NEWLINE, CT_NL_CONT, CT_COMMENT_MULTI, or
-       * CT_COMMENT_CPP without hitting anything other than CT_COMMENT, then
-       * there should be a newline before the close brace.
-       */
-      chunk_t *pc = chunk_get_next(br_open);
-
-      while (chunk_is_token(pc, CT_COMMENT))
-      {
-         pc = chunk_get_next(pc);
-      }
-
-      if (  chunk_is_newline(pc)
-         || chunk_is_comment(pc))
-      {
-         nl_close_brace = true;
-      }
-   }
-   chunk_t *prev = chunk_get_prev_nblank(br_close);
-
-   if (nl_close_brace)
-   {
-      newline_add_between(prev, br_close);
-   }
-   else
-   {
-      newline_del_between(prev, br_close);
-   }
-} // newlines_brace_pair
-
-
-static void newline_case(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   //   printf("%s case (%s) on line %d col %d\n",
-   //          __func__, c_chunk_names[start->type],
-   //          start->orig_line, start->orig_col);
-
-   // Scan backwards until a '{' or ';' or ':'. Abort if a multi-newline is found
-   chunk_t *prev = start;
-
-   do
-   {
-      prev = chunk_get_prev_nc(prev);
-
-      if (  prev != nullptr
-         && chunk_is_newline(prev)
-         && prev->nl_count > 1)
-      {
-         return;
-      }
-   } while (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-           && chunk_is_not_token(prev, CT_BRACE_CLOSE)
-           && chunk_is_not_token(prev, CT_SEMICOLON)
-           && chunk_is_not_token(prev, CT_CASE_COLON));
-
-   if (prev == nullptr)
-   {
-      return;
-   }
-   chunk_t *pc = newline_add_between(prev, start);
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   // Only add an extra line after a semicolon or brace close
-   if (  chunk_is_token(prev, CT_SEMICOLON)
-      || chunk_is_token(prev, CT_BRACE_CLOSE))
-   {
-      if (  chunk_is_newline(pc)
-         && pc->nl_count < 2)
-      {
-         double_newline(pc);
-      }
-   }
-} // newline_case
-
-
-static void newline_case_colon(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   // Scan forwards until a non-comment is found
-   chunk_t *pc = start;
-
-   do
-   {
-      pc = chunk_get_next(pc);
-   } while (chunk_is_comment(pc));
-
-   if (  pc != nullptr
-      && !chunk_is_newline(pc))
-   {
-      newline_add_before(pc);
-   }
-} // newline_case_colon
-
-
-static void newline_before_return(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = chunk_get_prev(start);
-   chunk_t *nl = pc;
-
-   // Skip over single preceding newline
-   if (chunk_is_newline(pc))
-   {
-      // Do we already have a blank line?
-      if (nl->nl_count > 1)
-      {
-         return;
-      }
-      pc = chunk_get_prev(nl);
-   }
-
-   // Skip over preceding comments that are not a trailing comment, taking
-   // into account that comment blocks may span multiple lines.
-   // Trailing comments are considered part of the previous token, not the
-   // return statement.  They are handled below.
-   while (  chunk_is_comment(pc)
-         && get_chunk_parent_type(pc) != CT_COMMENT_END)
-   {
-      pc = chunk_get_prev(pc);
-
-      if (!chunk_is_newline(pc))
-      {
-         return;
-      }
-      nl = pc;
-      pc = chunk_get_prev(pc);
-   }
-   pc = chunk_get_prev(nl);
-
-   // Peek over trailing comment of previous token
-   if (  chunk_is_comment(pc)
-      && get_chunk_parent_type(pc) == CT_COMMENT_END)
-   {
-      pc = chunk_get_prev(pc);
-   }
-
-   // Don't add extra blanks after an opening brace or a case statement
-   if (  pc == nullptr
-      || (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_OPEN)
-         || chunk_is_token(pc, CT_CASE_COLON)))
-   {
-      return;
-   }
-
-   if (  chunk_is_newline(nl)
-      && nl->nl_count < 2)
-   {
-      nl->nl_count++;
-      MARK_CHANGE();
-   }
-} // newline_before_return
-
-
-static void newline_after_return(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *semi  = chunk_get_next_type(start, CT_SEMICOLON, start->level);
-   chunk_t *after = chunk_get_next_nblank(semi);
-
-   // If we hit a brace or an 'else', then a newline isn't needed
-   if (  after == nullptr
-      || chunk_is_token(after, CT_BRACE_CLOSE)
-      || chunk_is_token(after, CT_VBRACE_CLOSE)
-      || chunk_is_token(after, CT_ELSE))
-   {
-      return;
-   }
-   chunk_t *pc;
-
-   for (pc = chunk_get_next(semi); pc != after; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         if (pc->nl_count < 2)
-         {
-            double_newline(pc);
-         }
-         return;
-      }
-   }
-} // newline_after_return
-
-
-static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool check_nl_assign_leave_one_liners)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNEWLINE, "%s(%d): ", __func__, __LINE__);
-   log_func_stack(LNEWLINE, "CallStack:");
-
-   if (  before == nullptr
-      || after == nullptr
-      || chunk_is_token(after, CT_IGNORED))
-   {
-      return;
-   }
-
-   if (av & IARF_ADD)
-   {
-      log_rule_B("nl_assign_leave_one_liners");
-
-      if (  check_nl_assign_leave_one_liners
-         && options::nl_assign_leave_one_liners()
-         && after->flags.test(PCF_ONE_LINER))
-      {
-         return;
-      }
-      chunk_t *nl = newline_add_between(before, after);
-      LOG_FMT(LNEWLINE, "%s(%d): newline_add_between '%s' and '%s'\n",
-              __func__, __LINE__, before->text(), after->text());
-
-      if (  nl != nullptr
-         && av == IARF_FORCE
-         && nl->nl_count > 1)
-      {
-         nl->nl_count = 1;
-      }
-   }
-   else if (av & IARF_REMOVE)
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): newline_remove_between '%s' and '%s'\n",
-              __func__, __LINE__, before->text(), after->text());
-      newline_del_between(before, after);
-   }
-} // newline_iarf_pair
-
-
-void newline_iarf(chunk_t *pc, iarf_e av)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNFD, "%s(%d): ", __func__, __LINE__);
-   log_func_stack(LNFD, "CallStack:");
-   chunk_t *after = chunk_get_next_nnl(pc);
-
-   if (  chunk_is_token(pc, CT_FPAREN_OPEN)                         // Issue #2914
-      && get_chunk_parent_type(pc) == CT_FUNC_CALL
-      && chunk_is_token(after, CT_COMMENT_CPP)
-      && options::donot_add_nl_before_cpp_comment())
-   {
-      return;
-   }
-   newline_iarf_pair(pc, after, av);
-} // newline_iarf
-
-
-static void newline_func_multi_line(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNFD, "%s(%d): called on %zu:%zu '%s' [%s/%s]\n",
-           __func__, __LINE__, start->orig_line, start->orig_col,
-           start->text(), get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
-
-   bool add_start;
-   bool add_args;
-   bool add_end;
-
-   if (  get_chunk_parent_type(start) == CT_FUNC_DEF
-      || get_chunk_parent_type(start) == CT_FUNC_CLASS_DEF)
-   {
-      log_rule_B("nl_func_def_start_multi_line");
-      add_start = options::nl_func_def_start_multi_line();
-      log_rule_B("nl_func_def_args_multi_line");
-      add_args = options::nl_func_def_args_multi_line();
-      log_rule_B("nl_func_def_end_multi_line");
-      add_end = options::nl_func_def_end_multi_line();
-   }
-   else if (  get_chunk_parent_type(start) == CT_FUNC_CALL
-           || get_chunk_parent_type(start) == CT_FUNC_CALL_USER)
-   {
-      log_rule_B("nl_func_call_start_multi_line");
-      add_start = options::nl_func_call_start_multi_line();
-      log_rule_B("nl_func_call_args_multi_line");
-      add_args = options::nl_func_call_args_multi_line();
-      log_rule_B("nl_func_call_end_multi_line");
-      add_end = options::nl_func_call_end_multi_line();
-   }
-   else
-   {
-      log_rule_B("nl_func_decl_start_multi_line");
-      add_start = options::nl_func_decl_start_multi_line();
-      log_rule_B("nl_func_decl_args_multi_line");
-      add_args = options::nl_func_decl_args_multi_line();
-      log_rule_B("nl_func_decl_end_multi_line");
-      add_end = options::nl_func_decl_end_multi_line();
-   }
-
-   if (  !add_start
-      && !add_args
-      && !add_end)
-   {
-      return;
-   }
-   chunk_t *pc = chunk_get_next_ncnnl(start);
-
-   while (  pc != nullptr
-         && pc->level > start->level)
-   {
-      pc = chunk_get_next_ncnnl(pc);
-   }
-
-   if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-      && chunk_is_newline_between(start, pc))
-   {
-      chunk_t *start_next         = chunk_get_next_ncnnl(start);
-      bool    has_leading_closure = (  start_next->parent_type == CT_OC_BLOCK_EXPR
-                                    || start_next->parent_type == CT_CPP_LAMBDA
-                                    || chunk_is_token(start_next, CT_BRACE_OPEN));
-
-      chunk_t *prev_end            = chunk_get_prev_ncnnl(pc);
-      bool    has_trailing_closure = (  prev_end->parent_type == CT_OC_BLOCK_EXPR
-                                     || prev_end->parent_type == CT_CPP_LAMBDA
-                                     || chunk_is_token(prev_end, CT_BRACE_OPEN));
-
-      if (  add_start
-         && !chunk_is_newline(chunk_get_next(start)))
-      {
-         log_rule_B("nl_func_call_args_multi_line_ignore_closures");
-
-         if (options::nl_func_call_args_multi_line_ignore_closures())
-         {
-            if (  !has_leading_closure
-               && !has_trailing_closure)
-            {
-               newline_iarf(start, IARF_ADD);
-            }
-         }
-         else
-         {
-            newline_iarf(start, IARF_ADD);
-         }
-      }
-
-      if (  add_end
-         && !chunk_is_newline(chunk_get_prev(pc)))
-      {
-         log_rule_B("nl_func_call_args_multi_line_ignore_closures");
-
-         if (options::nl_func_call_args_multi_line_ignore_closures())
-         {
-            if (  !has_leading_closure
-               && !has_trailing_closure)
-            {
-               newline_iarf(chunk_get_prev(pc), IARF_ADD);
-            }
-         }
-         else
-         {
-            newline_iarf(chunk_get_prev(pc), IARF_ADD);
-         }
-      }
-
-      if (add_args)
-      {
-         // process the function in reverse and leave the first comma if the option to leave trailing closure
-         // is on. nl_func_call_args_multi_line_ignore_trailing_closure
-         for (pc = chunk_get_next_ncnnl(start);
-              pc != nullptr && pc->level > start->level;
-              pc = chunk_get_next_ncnnl(pc))
-         {
-            if (  chunk_is_token(pc, CT_COMMA)
-               && (pc->level == (start->level + 1)))
-            {
-               chunk_t *tmp = chunk_get_next(pc);
-
-               if (chunk_is_comment(tmp))
-               {
-                  pc = tmp;
-               }
-
-               if (!chunk_is_newline(chunk_get_next(pc)))
-               {
-                  log_rule_B("nl_func_call_args_multi_line_ignore_closures");
-
-                  if (options::nl_func_call_args_multi_line_ignore_closures())
-                  {
-                     chunk_t *prev_comma  = chunk_get_prev_ncnnl(pc);
-                     chunk_t *after_comma = chunk_get_next_ncnnl(pc);
-
-                     if (!(  (  prev_comma->parent_type == CT_OC_BLOCK_EXPR
-                             || prev_comma->parent_type == CT_CPP_LAMBDA
-                             || chunk_is_token(prev_comma, CT_BRACE_OPEN))
-                          || (  after_comma->parent_type == CT_OC_BLOCK_EXPR
-                             || after_comma->parent_type == CT_CPP_LAMBDA
-                             || chunk_is_token(after_comma, CT_BRACE_OPEN))))
-                     {
-                        newline_iarf(pc, IARF_ADD);
-                     }
-                  }
-                  else
-                  {
-                     newline_iarf(pc, IARF_ADD);
-                  }
-               }
-            }
-         }
-      }
-   }
-} // newline_func_multi_line
-
-
-static void newline_template(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNFD, "%s(%d): called on %zu:%zu '%s' [%s/%s]\n",
-           __func__, __LINE__, start->orig_line, start->orig_col,
-           start->text(), get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
-
-   log_rule_B("nl_template_start");
-   bool add_start = options::nl_template_start();
-
-   log_rule_B("nl_template_args");
-   bool add_args = options::nl_template_args();
-
-   log_rule_B("nl_template_end");
-   bool add_end = options::nl_template_end();
-
-   if (  !add_start
-      && !add_args
-      && !add_end)
-   {
-      return;
-   }
-   chunk_t *pc = chunk_get_next_ncnnl(start);
-
-   while (  pc != nullptr
-         && pc->level > start->level)
-   {
-      pc = chunk_get_next_ncnnl(pc);
-   }
-
-   if (chunk_is_token(pc, CT_ANGLE_CLOSE))
-   {
-      if (add_start)
-      {
-         newline_iarf(start, IARF_ADD);
-      }
-
-      if (add_end)
-      {
-         newline_iarf(chunk_get_prev(pc), IARF_ADD);
-      }
-
-      if (add_args)
-      {
-         chunk_t *pc_1;
-
-         for (pc_1 = chunk_get_next_ncnnl(start);
-              pc_1 != nullptr && pc_1->level > start->level;
-              pc_1 = chunk_get_next_ncnnl(pc_1))
-         {
-            if (  chunk_is_token(pc_1, CT_COMMA)
-               && (pc_1->level == (start->level + 1)))
-            {
-               chunk_t *tmp = chunk_get_next(pc_1);
-
-               if (chunk_is_comment(tmp))
-               {
-                  pc_1 = tmp;
-               }
-
-               if (!chunk_is_newline(chunk_get_next(pc_1)))
-               {
-                  newline_iarf(pc_1, IARF_ADD);
-               }
-            }
-         }
-      }
-   }
-} // newline_template
-
-
-static void newline_func_def_or_call(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNFD, "%s(%d): called on start->text() is '%s', orig_line is %zu, orig_col is %zu, [%s/%s]\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->orig_col,
-           get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
-
-   bool is_def = (get_chunk_parent_type(start) == CT_FUNC_DEF)
-                 || get_chunk_parent_type(start) == CT_FUNC_CLASS_DEF;
-   bool is_call = (get_chunk_parent_type(start) == CT_FUNC_CALL)
-                  || get_chunk_parent_type(start) == CT_FUNC_CALL_USER;
-
-   LOG_FMT(LNFD, "%s(%d): is_def is %s, is_call is %s\n",
-           __func__, __LINE__, is_def ? "TRUE" : "FALSE", is_call ? "TRUE" : "FALSE");
-
-   if (is_call)
-   {
-      log_rule_B("nl_func_call_paren");
-      iarf_e atmp = options::nl_func_call_paren();
-
-      if (atmp != IARF_IGNORE)
-      {
-         chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
-
-         if (prev != nullptr)
-         {
-            newline_iarf(prev, atmp);
-         }
-      }
-      chunk_t *pc = chunk_get_next_ncnnl(start);
-
-      if (chunk_is_str(pc, ")", 1))
-      {
-         log_rule_B("nl_func_call_paren_empty");
-         atmp = options::nl_func_call_paren_empty();
-
-         if (atmp != IARF_IGNORE)
-         {
-            chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
-
-            if (prev != nullptr)
-            {
-               newline_iarf(prev, atmp);
-            }
-         }
-         log_rule_B("nl_func_call_empty");
-         atmp = options::nl_func_call_empty();
-
-         if (atmp != IARF_IGNORE)
-         {
-            newline_iarf(start, atmp);
-         }
-         return;
-      }
-   }
-   else
-   {
-      log_rule_B("nl_func_def_paren");
-      log_rule_B("nl_func_paren");
-      iarf_e atmp = is_def ? options::nl_func_def_paren()
-                  : options::nl_func_paren();
-      LOG_FMT(LSPACE, "%s(%d): atmp is %s\n",
-              __func__, __LINE__,
-              (atmp == IARF_IGNORE) ? "IGNORE" :
-              (atmp == IARF_ADD) ? "ADD" :
-              (atmp == IARF_REMOVE) ? "REMOVE" : "FORCE");
-
-      if (atmp != IARF_IGNORE)
-      {
-         chunk_t *prev = chunk_get_prev_ncnnlni(start);      // Issue #2279
-
-         if (prev != nullptr)
-         {
-            newline_iarf(prev, atmp);
-         }
-      }
-      // Handle break newlines type and function
-      chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
-      prev = skip_template_prev(prev);
-      // Don't split up a function variable
-      prev = chunk_is_paren_close(prev) ? nullptr : chunk_get_prev_ncnnlni(prev);   // Issue #2279
-
-      log_rule_B("nl_func_class_scope");
-
-      if (  chunk_is_token(prev, CT_DC_MEMBER)
-         && (options::nl_func_class_scope() != IARF_IGNORE))
-      {
-         newline_iarf(chunk_get_prev_ncnnlni(prev), options::nl_func_class_scope());   // Issue #2279
-      }
-
-      if (chunk_is_not_token(prev, CT_ACCESS_COLON))
-      {
-         chunk_t *tmp;
-
-         if (chunk_is_token(prev, CT_OPERATOR))
-         {
-            tmp  = prev;
-            prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
-         }
-         else
-         {
-            tmp = start;
-         }
-
-         if (chunk_is_token(prev, CT_DC_MEMBER))
-         {
-            log_rule_B("nl_func_scope_name");
-
-            if (options::nl_func_scope_name() != IARF_IGNORE)
-            {
-               newline_iarf(prev, options::nl_func_scope_name());
-            }
-         }
-         const chunk_t *tmp_next = chunk_get_next_ncnnl(prev);
-
-         if (chunk_is_not_token(tmp_next, CT_FUNC_CLASS_DEF))
-         {
-            chunk_t *closing = chunk_skip_to_match(tmp);
-            chunk_t *brace   = chunk_get_next_ncnnl(closing);
-            iarf_e  a;                                           // Issue #2561
-
-            if (  get_chunk_parent_type(tmp) == CT_FUNC_PROTO
-               || get_chunk_parent_type(tmp) == CT_FUNC_CLASS_PROTO)
-            {
-               // proto
-               log_rule_B("nl_func_proto_type_name");
-               a = options::nl_func_proto_type_name();
-            }
-            else
-            {
-               // def
-
-               log_rule_B("nl_func_leave_one_liners");
-
-               if (  options::nl_func_leave_one_liners()
-                  && brace->flags.test(PCF_ONE_LINER))                 // Issue #1511
-               {
-                  a = IARF_IGNORE;
-               }
-               else
-               {
-                  log_rule_B("nl_func_type_name");
-                  a = options::nl_func_type_name();
-               }
-            }
-            log_rule_B("nl_func_type_name_class");
-
-            if (  tmp->flags.test(PCF_IN_CLASS)
-               && (options::nl_func_type_name_class() != IARF_IGNORE))
-            {
-               a = options::nl_func_type_name_class();
-            }
-
-            if (  a != IARF_IGNORE
-               && prev != nullptr)
-            {
-               LOG_FMT(LNFD, "%s(%d): prev->text() '%s', orig_line is %zu, orig_col is %zu, [%s/%s]\n",
-                       __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
-                       get_token_name(prev->type),
-                       get_token_name(get_chunk_parent_type(prev)));
-
-               if (chunk_is_token(prev, CT_DESTRUCTOR))
-               {
-                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
-               }
-
-               /*
-                * If we are on a '::', step back two tokens
-                * TODO: do we also need to check for '.' ?
-                */
-               while (chunk_is_token(prev, CT_DC_MEMBER))
-               {
-                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
-                  prev = skip_template_prev(prev);
-                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
-               }
-
-               if (  chunk_is_not_token(prev, CT_BRACE_CLOSE)
-                  && chunk_is_not_token(prev, CT_VBRACE_CLOSE)
-                  && chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_SEMICOLON)
-                  && chunk_is_not_token(prev, CT_ACCESS_COLON)
-                     // #1008: if we landed on an operator check that it is having
-                     // a type before it, in order to not apply nl_func_type_name
-                     // on conversion operators as they don't have a normal
-                     // return type syntax
-                  && (chunk_is_not_token(tmp_next, CT_OPERATOR) ? true : chunk_is_type(prev)))
-               {
-                  newline_iarf(prev, a);
-               }
-            }
-         }
-      }
-      chunk_t *pc = chunk_get_next_ncnnl(start);
-
-      if (chunk_is_str(pc, ")", 1))
-      {
-         log_rule_B("nl_func_def_empty");
-         log_rule_B("nl_func_decl_empty");
-         atmp = is_def ? options::nl_func_def_empty()
-                : options::nl_func_decl_empty();
-
-         if (atmp != IARF_IGNORE)
-         {
-            newline_iarf(start, atmp);
-         }
-         log_rule_B("nl_func_def_paren_empty");
-         log_rule_B("nl_func_paren_empty");
-         atmp = is_def ? options::nl_func_def_paren_empty()
-                : options::nl_func_paren_empty();
-
-         if (atmp != IARF_IGNORE)
-         {
-            prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
-
-            if (prev != nullptr)
-            {
-               newline_iarf(prev, atmp);
-            }
-         }
-         return;
-      }
-   }
-   // Now scan for commas
-   size_t  comma_count = 0;
-   chunk_t *tmp;
-   chunk_t *pc;
-
-   for (pc = chunk_get_next_ncnnl(start);
-        pc != nullptr && pc->level > start->level;
-        pc = chunk_get_next_ncnnl(pc))
-   {
-      if (  chunk_is_token(pc, CT_COMMA)
-         && (pc->level == (start->level + 1)))
-      {
-         comma_count++;
-         tmp = chunk_get_next(pc);
-
-         if (chunk_is_comment(tmp))
-         {
-            pc = tmp;
-         }
-
-         if (is_def)
-         {
-            log_rule_B("nl_func_def_args");
-            newline_iarf(pc, options::nl_func_def_args());
-         }
-         else if (is_call)
-         {
-            // Issue #2604
-            log_rule_B("nl_func_call_args");
-            newline_iarf(pc, options::nl_func_call_args());
-         }
-         else // get_chunk_parent_type(start) == CT_FUNC_DECL
-         {
-            log_rule_B("nl_func_decl_args");
-            newline_iarf(pc, options::nl_func_decl_args());
-         }
-      }
-   }
-
-   log_rule_B("nl_func_def_start");
-   log_rule_B("nl_func_decl_start");
-   iarf_e as = is_def ? options::nl_func_def_start() : options::nl_func_decl_start();
-
-   log_rule_B("nl_func_def_end");
-   log_rule_B("nl_func_decl_end");
-   iarf_e ae = is_def ? options::nl_func_def_end() : options::nl_func_decl_end();
-
-   if (comma_count == 0)
-   {
-      iarf_e atmp;
-      log_rule_B("nl_func_def_start_single");
-      log_rule_B("nl_func_decl_start_single");
-      atmp = is_def ? options::nl_func_def_start_single() :
-             options::nl_func_decl_start_single();
-
-      if (atmp != IARF_IGNORE)
-      {
-         as = atmp;
-      }
-      log_rule_B("nl_func_def_end_single");
-      log_rule_B("nl_func_decl_end_single");
-      atmp = is_def ? options::nl_func_def_end_single() :
-             options::nl_func_decl_end_single();
-
-      if (atmp != IARF_IGNORE)
-      {
-         ae = atmp;
-      }
-   }
-
-   if (!is_call)
-   {
-      newline_iarf(start, as);
-   }
-
-   // and fix up the close parenthesis
-   if (chunk_is_token(pc, CT_FPAREN_CLOSE))
-   {
-      chunk_t *prev = chunk_get_prev_nnl(pc);
-
-      if (  chunk_is_not_token(prev, CT_FPAREN_OPEN)
-         && !is_call)
-      {
-         newline_iarf(prev, ae);
-      }
-      newline_func_multi_line(start);
-   }
-} // newline_func_def_or_call
-
-
-static void newline_oc_msg(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *sq_c = chunk_skip_to_match(start);
-
-   if (sq_c == nullptr)
-   {
-      return;
-   }
-   log_rule_B("nl_oc_msg_leave_one_liner");
-
-   if (options::nl_oc_msg_leave_one_liner())
-   {
-      return;
-   }
-
-   for (chunk_t *pc = chunk_get_next_ncnnl(start); pc; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (pc->level <= start->level)
-      {
-         break;
-      }
-
-      if (chunk_is_token(pc, CT_OC_MSG_NAME))
-      {
-         newline_add_before(pc);
-      }
-   }
-} // newline_oc_msg
-
-
-static bool one_liner_nl_ok(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNL1LINE, "%s(%d): check type is %s, parent is %s, flag is %s, orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           pcf_flags_str(pc->flags).c_str(), pc->orig_line, pc->orig_col);
-
-   if (!pc->flags.test(PCF_ONE_LINER))
-   {
-      LOG_FMT(LNL1LINE, "%s(%d): true (not 1-liner), a new line may be added\n", __func__, __LINE__);
-      return(true);
-   }
-   // Step back to find the opening brace
-   chunk_t *br_open = pc;
-
-   if (chunk_is_closing_brace(br_open))
-   {
-      br_open = chunk_get_prev_type(br_open,
-                                    chunk_is_token(br_open, CT_BRACE_CLOSE) ? CT_BRACE_OPEN : CT_VBRACE_OPEN,
-                                    br_open->level, scope_e::ALL);
-   }
-   else
-   {
-      while (  br_open != nullptr
-            && br_open->flags.test(PCF_ONE_LINER)
-            && !chunk_is_opening_brace(br_open)
-            && !chunk_is_closing_brace(br_open))
-      {
-         br_open = chunk_get_prev(br_open);
-      }
-   }
-   pc = br_open;
-
-   if (  pc != nullptr
-      && pc->flags.test(PCF_ONE_LINER)
-      && (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE)))
-   {
-      log_rule_B("nl_class_leave_one_liners");
-
-      if (  options::nl_class_leave_one_liners()
-         && pc->flags.test(PCF_IN_CLASS))
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (class)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_assign_leave_one_liners");
-
-      if (  options::nl_assign_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_ASSIGN)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (assign)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_enum_leave_one_liners");
-
-      if (  options::nl_enum_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_ENUM)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (enum)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_getset_leave_one_liners");
-
-      if (  options::nl_getset_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_GETSET)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (get/set), a new line may NOT be added\n", __func__, __LINE__);
-         return(false);
-      }
-      // Issue #UT-98
-      log_rule_B("nl_cs_property_leave_one_liners");
-
-      if (  options::nl_cs_property_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_CS_PROPERTY)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (c# property), a new line may NOT be added\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_func_leave_one_liners");
-
-      if (  options::nl_func_leave_one_liners()
-         && (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-            || get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF))
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (func def)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_func_leave_one_liners");
-
-      if (  options::nl_func_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_OC_MSG_DECL)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (method def)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_cpp_lambda_leave_one_liners");
-
-      if (  options::nl_cpp_lambda_leave_one_liners()
-         && ((get_chunk_parent_type(pc) == CT_CPP_LAMBDA)))
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (lambda)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_oc_msg_leave_one_liner");
-
-      if (  options::nl_oc_msg_leave_one_liner()
-         && pc->flags.test(PCF_IN_OC_MSG))
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (message)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_if_leave_one_liners");
-
-      if (  options::nl_if_leave_one_liners()
-         && (  get_chunk_parent_type(pc) == CT_IF
-            || get_chunk_parent_type(pc) == CT_ELSEIF
-            || get_chunk_parent_type(pc) == CT_ELSE))
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (if/else)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_while_leave_one_liners");
-
-      if (  options::nl_while_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_WHILE)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (while)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_do_leave_one_liners");
-
-      if (  options::nl_do_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_DO)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (do)\n", __func__, __LINE__);
-         return(false);
-      }
-      log_rule_B("nl_for_leave_one_liners");
-
-      if (  options::nl_for_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_FOR)
-      {
-         LOG_FMT(LNL1LINE, "%s(%d): false (for)\n", __func__, __LINE__);
-         return(false);
-      }
-   }
-   LOG_FMT(LNL1LINE, "%s(%d): true, a new line may be added\n", __func__, __LINE__);
-   return(true);
-} // one_liner_nl_ok
-
-
-void undo_one_liner(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc != nullptr
-      && pc->flags.test(PCF_ONE_LINER))
-   {
-      LOG_FMT(LNL1LINE, "%s(%d): pc->text() '%s', orig_line is %zu, orig_col is %zu",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-      chunk_flags_clr(pc, PCF_ONE_LINER);
-
-      // scan backward
-      LOG_FMT(LNL1LINE, "%s(%d): scan backward\n", __func__, __LINE__);
-      chunk_t *tmp = pc;
-
-      while ((tmp = chunk_get_prev(tmp)) != nullptr)
-      {
-         if (!tmp->flags.test(PCF_ONE_LINER))
-         {
-            LOG_FMT(LNL1LINE, "%s(%d): tmp->text() '%s', orig_line is %zu, orig_col is %zu, --> break\n",
-                    __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col);
-            break;
-         }
-         LOG_FMT(LNL1LINE, "%s(%d): clear for tmp->text() '%s', orig_line is %zu, orig_col is %zu",
-                 __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col);
-         chunk_flags_clr(tmp, PCF_ONE_LINER);
-      }
-      // scan forward
-      LOG_FMT(LNL1LINE, "%s(%d): scan forward\n", __func__, __LINE__);
-      tmp = pc;
-      LOG_FMT(LNL1LINE, "%s(%d): - \n", __func__, __LINE__);
-
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
-      {
-         if (!tmp->flags.test(PCF_ONE_LINER))
-         {
-            LOG_FMT(LNL1LINE, "%s(%d): tmp->text() '%s', orig_line is %zu, orig_col is %zu, --> break\n",
-                    __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col);
-            break;
-         }
-         LOG_FMT(LNL1LINE, "%s(%d): clear for tmp->text() '%s', orig_line is %zu, orig_col is %zu",
-                 __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col);
-         chunk_flags_clr(tmp, PCF_ONE_LINER);
-      }
-      LOG_FMT(LNL1LINE, "\n");
-   }
-} // undo_one_liner
-
-
-static void nl_create_one_liner(chunk_t *vbrace_open)
-{
-   LOG_FUNC_ENTRY();
-
-   // See if we get a newline between the next text and the vbrace_close
-   chunk_t *tmp   = chunk_get_next_ncnnl(vbrace_open);
-   chunk_t *first = tmp;
-
-   if (  first == nullptr
-      || get_token_pattern_class(first->type) != pattern_class_e::NONE)
-   {
-      return;
-   }
-   size_t nl_total = 0;
-
-   while (chunk_is_not_token(tmp, CT_VBRACE_CLOSE))
-   {
-      if (chunk_is_newline(tmp))
-      {
-         nl_total += tmp->nl_count;
-
-         if (nl_total > 1)
-         {
-            return;
-         }
-      }
-      tmp = chunk_get_next(tmp);
-   }
-
-   if (  tmp != nullptr
-      && first != nullptr)
-   {
-      newline_del_between(vbrace_open, first);
-   }
-} // nl_create_one_liner
-
-
-static void nl_create_list_liner(chunk_t *brace_open)
-{
-   LOG_FUNC_ENTRY();
-
-   // See if we get a newline between the next text and the vbrace_close
-   if (brace_open == nullptr)
-   {
-      return;
-   }
-   chunk_t *closing = chunk_get_next_type(brace_open, CT_BRACE_CLOSE, brace_open->level);
-   chunk_t *tmp     = brace_open;
-
-   do
-   {
-      if (chunk_is_token(tmp, CT_COMMA))
-      {
-         return;
-      }
-      tmp = chunk_get_next(tmp);
-   } while (tmp != closing);
-
-   newline_del_between(brace_open, closing);
-} // nl_create_list_liner
-
-
-void newlines_remove_newlines(void)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LBLANK, "%s(%d):\n", __func__, __LINE__);
-   chunk_t *pc = chunk_get_head();
-
-   if (!chunk_is_newline(pc))
-   {
-      pc = chunk_get_next_nl(pc);
-   }
-   chunk_t *next;
-   chunk_t *prev;
-
-   while (pc != nullptr)
-   {
-      // Remove all newlines not in preproc
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         next = pc->next;
-         prev = pc->prev;
-         newline_iarf(pc, IARF_REMOVE);
-
-         if (next == chunk_get_head())
-         {
-            pc = next;
-            continue;
-         }
-         else if (  prev != nullptr
-                 && !chunk_is_newline(prev->next))
-         {
-            pc = prev;
-         }
-      }
-      pc = chunk_get_next_nl(pc);
-   }
-} // newlines_remove_newlines
-
-
-void newlines_remove_disallowed()
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = chunk_get_head();
-   chunk_t *next;
-
-   while ((pc = chunk_get_next_nl(pc)) != nullptr)
-   {
-      LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
-
-      next = chunk_get_next(pc);
-
-      if (  next != nullptr
-         && !chunk_is_token(next, CT_NEWLINE)
-         && !can_increase_nl(pc))
-      {
-         LOG_FMT(LBLANKD, "%s(%d): force to 1 orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-
-         if (pc->nl_count != 1)
-         {
-            pc->nl_count = 1;
-            MARK_CHANGE();
-         }
-      }
-   }
-} // newlines_remove_disallowed
-
-
-void newlines_cleanup_angles()
-{
-   // Issue #1167
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      char copy[1000];
-      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
-
-      if (chunk_is_token(pc, CT_ANGLE_OPEN))
-      {
-         newline_template(pc);
-      }
-   }
-} // newlines_cleanup_angles
-
-
-void newlines_cleanup_braces(bool first)
-{
-   LOG_FUNC_ENTRY();
-
-   // Get the first token that's not an empty line:
-   chunk_t *pc;
-
-   if (chunk_is_newline(pc = chunk_get_head()))
-   {
-      pc = chunk_get_next_ncnnl(pc);
-   }
-
-   for ( ; pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      char copy[1000];
-      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
-
-      if (  chunk_is_token(pc, CT_IF)
-         || chunk_is_token(pc, CT_CONSTEXPR))
-      {
-         log_rule_B("nl_if_brace");
-         newlines_if_for_while_switch(pc, options::nl_if_brace());
-      }
-      else if (chunk_is_token(pc, CT_ELSEIF))
-      {
-         log_rule_B("nl_elseif_brace");
-         iarf_e arg = options::nl_elseif_brace();
-         log_rule_B("nl_if_brace");
-         newlines_if_for_while_switch(
-            pc, (arg != IARF_IGNORE) ? arg : options::nl_if_brace());
-      }
-      else if (chunk_is_token(pc, CT_FOR))
-      {
-         log_rule_B("nl_for_brace");
-         newlines_if_for_while_switch(pc, options::nl_for_brace());
-      }
-      else if (chunk_is_token(pc, CT_CATCH))
-      {
-         log_rule_B("nl_oc_brace_catch");
-
-         if (  language_is_set(LANG_OC)
-            && (pc->str[0] == '@')
-            && (options::nl_oc_brace_catch() != IARF_IGNORE))
-         {
-            newlines_cuddle_uncuddle(pc, options::nl_oc_brace_catch());
-         }
-         else
-         {
-            log_rule_B("nl_brace_catch");
-            newlines_cuddle_uncuddle(pc, options::nl_brace_catch());
-         }
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(next, CT_BRACE_OPEN))
-         {
-            log_rule_B("nl_oc_catch_brace");
-
-            if (  language_is_set(LANG_OC)
-               && (options::nl_oc_catch_brace() != IARF_IGNORE))
-            {
-               log_rule_B("nl_oc_catch_brace");
-               newlines_do_else(pc, options::nl_oc_catch_brace());
-            }
-            else
-            {
-               log_rule_B("nl_catch_brace");
-               newlines_do_else(pc, options::nl_catch_brace());
-            }
-         }
-         else
-         {
-            log_rule_B("nl_oc_catch_brace");
-
-            if (  language_is_set(LANG_OC)
-               && (options::nl_oc_catch_brace() != IARF_IGNORE))
-            {
-               newlines_if_for_while_switch(pc, options::nl_oc_catch_brace());
-            }
-            else
-            {
-               log_rule_B("nl_catch_brace");
-               newlines_if_for_while_switch(pc, options::nl_catch_brace());
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_WHILE))
-      {
-         log_rule_B("nl_while_brace");
-         newlines_if_for_while_switch(pc, options::nl_while_brace());
-      }
-      else if (chunk_is_token(pc, CT_USING_STMT))
-      {
-         log_rule_B("nl_using_brace");
-         newlines_if_for_while_switch(pc, options::nl_using_brace());
-      }
-      else if (chunk_is_token(pc, CT_D_SCOPE_IF))
-      {
-         log_rule_B("nl_scope_brace");
-         newlines_if_for_while_switch(pc, options::nl_scope_brace());
-      }
-      else if (chunk_is_token(pc, CT_UNITTEST))
-      {
-         log_rule_B("nl_unittest_brace");
-         newlines_do_else(pc, options::nl_unittest_brace());
-      }
-      else if (chunk_is_token(pc, CT_D_VERSION_IF))
-      {
-         log_rule_B("nl_version_brace");
-         newlines_if_for_while_switch(pc, options::nl_version_brace());
-      }
-      else if (chunk_is_token(pc, CT_SWITCH))
-      {
-         log_rule_B("nl_switch_brace");
-         newlines_if_for_while_switch(pc, options::nl_switch_brace());
-      }
-      else if (chunk_is_token(pc, CT_SYNCHRONIZED))
-      {
-         log_rule_B("nl_synchronized_brace");
-         newlines_if_for_while_switch(pc, options::nl_synchronized_brace());
-      }
-      else if (chunk_is_token(pc, CT_DO))
-      {
-         log_rule_B("nl_do_brace");
-         newlines_do_else(pc, options::nl_do_brace());
-      }
-      else if (chunk_is_token(pc, CT_ELSE))
-      {
-         log_rule_B("nl_brace_else");
-         newlines_cuddle_uncuddle(pc, options::nl_brace_else());
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(next, CT_ELSEIF))
-         {
-            log_rule_B("nl_else_if");
-            newline_iarf_pair(pc, next, options::nl_else_if());
-         }
-         log_rule_B("nl_else_brace");
-         newlines_do_else(pc, options::nl_else_brace());
-      }
-      else if (chunk_is_token(pc, CT_TRY))
-      {
-         log_rule_B("nl_try_brace");
-         newlines_do_else(pc, options::nl_try_brace());
-         // Issue #1734
-         chunk_t *po = chunk_get_next_ncnnl(pc);
-         flag_parens(po, PCF_IN_TRY_BLOCK, po->type, CT_NONE, false);
-      }
-      else if (chunk_is_token(pc, CT_GETSET))
-      {
-         log_rule_B("nl_getset_brace");
-         newlines_do_else(pc, options::nl_getset_brace());
-      }
-      else if (chunk_is_token(pc, CT_FINALLY))
-      {
-         log_rule_B("nl_brace_finally");
-         newlines_cuddle_uncuddle(pc, options::nl_brace_finally());
-         log_rule_B("nl_finally_brace");
-         newlines_do_else(pc, options::nl_finally_brace());
-      }
-      else if (chunk_is_token(pc, CT_WHILE_OF_DO))
-      {
-         log_rule_B("nl_brace_while");
-         newlines_cuddle_uncuddle(pc, options::nl_brace_while());
-      }
-      else if (chunk_is_token(pc, CT_BRACE_OPEN))
-      {
-         switch (get_chunk_parent_type(pc))
-         {
-         case CT_DOUBLE_BRACE:
-         {
-            log_rule_B("nl_paren_dbrace_open");
-
-            if (options::nl_paren_dbrace_open() != IARF_IGNORE)
-            {
-               chunk_t *prev = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);   // Issue #2279
-
-               if (chunk_is_paren_close(prev))
-               {
-                  log_rule_B("nl_paren_dbrace_open");
-                  newline_iarf_pair(prev, pc, options::nl_paren_dbrace_open());
-               }
-            }
-            break;
-         }
-
-         case CT_ENUM:
-         {
-            log_rule_B("nl_enum_own_lines");
-
-            if (options::nl_enum_own_lines() != IARF_IGNORE)
-            {
-               newlines_enum_entries(pc, options::nl_enum_own_lines());
-            }
-            log_rule_B("nl_ds_struct_enum_cmt");
-
-            if (options::nl_ds_struct_enum_cmt())
-            {
-               newlines_double_space_struct_enum_union(pc);
-            }
-            break;
-         }
-
-         case CT_STRUCT:
-         case CT_UNION:
-         {
-            log_rule_B("nl_ds_struct_enum_cmt");
-
-            if (options::nl_ds_struct_enum_cmt())
-            {
-               newlines_double_space_struct_enum_union(pc);
-            }
-            break;
-         }
-
-         case CT_CLASS:
-         {
-            if (pc->level == pc->brace_level)
-            {
-               log_rule_B("nl_class_brace");
-               newlines_do_else(chunk_get_prev_nnl(pc), options::nl_class_brace());
-            }
-            break;
-         }
-
-         case CT_OC_CLASS:
-         {
-            if (pc->level == pc->brace_level)
-            {
-               chunk_t *tmp = nullptr;
-
-               // Request #126
-               // introduce two new options
-               // look back if we have a @interface or a @implementation
-               for (tmp = chunk_get_prev(pc); tmp != nullptr; tmp = chunk_get_prev(tmp))
-               {
-                  LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                          __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-
-                  if (  chunk_is_token(tmp, CT_OC_INTF)
-                     || chunk_is_token(tmp, CT_OC_IMPL))
-                  {
-                     LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, may be remove/force newline before {\n",
-                             __func__, __LINE__, pc->orig_line, pc->orig_col);
-
-                     if (chunk_is_token(tmp, CT_OC_INTF))
-                     {
-                        log_rule_B("nl_oc_interface_brace");
-                        newlines_do_else(chunk_get_prev_nnl(pc), options::nl_oc_interface_brace());
-                     }
-                     else
-                     {
-                        log_rule_B("nl_oc_implementation_brace");
-                        newlines_do_else(chunk_get_prev_nnl(pc), options::nl_oc_implementation_brace());
-                     }
-                     break;
-                  }
-               }
-            }
-            break;
-         }
-
-         case CT_BRACED_INIT_LIST:
-         {
-            // Issue #1052
-            log_rule_B("nl_create_list_one_liner");
-
-            if (options::nl_create_list_one_liner())
-            {
-               nl_create_list_liner(pc);
-               break;
-            }
-            chunk_t *prev = chunk_get_prev_nnl(pc);
-
-            if (  prev != nullptr
-               && (  prev->type == CT_TYPE
-                  || prev->type == CT_WORD
-                  || prev->parent_type == CT_TEMPLATE
-                  || prev->parent_type == CT_DECLTYPE))
-            {
-               log_rule_B("nl_type_brace_init_lst");
-               newline_iarf_pair(prev, pc, options::nl_type_brace_init_lst(), true);
-            }
-            break;
-         }
-
-         case CT_OC_BLOCK_EXPR:
-         {
-            // issue # 477
-            log_rule_B("nl_oc_block_brace");
-            newline_iarf_pair(chunk_get_prev(pc), pc, options::nl_oc_block_brace());
-            break;
-         }
-
-         case CT_FUNC_CLASS_DEF:                             // Issue #2343
-         {
-            if (!one_liner_nl_ok(pc))
-            {
-               LOG_FMT(LNL1LINE, "a new line may NOT be added\n");
-               // no change - preserve one liner body
-            }
-            else
-            {
-               log_rule_B("nl_before_opening_brace_func_class_def");
-
-               if (options::nl_before_opening_brace_func_class_def() != IARF_IGNORE)
-               {
-                  newline_iarf_pair(chunk_get_prev(pc), pc, options::nl_before_opening_brace_func_class_def());
-               }
-            }
-         }
-
-         default:
-         {
-            break;
-         }
-         } // switch
-
-         log_rule_B("nl_brace_brace");
-
-         if (options::nl_brace_brace() != IARF_IGNORE)
-         {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
-
-            if (chunk_is_token(next, CT_BRACE_OPEN))
-            {
-               newline_iarf_pair(pc, next, options::nl_brace_brace());
-            }
-         }
-         chunk_t *next = chunk_get_next_nnl(pc);
-
-         if (next == nullptr)
-         {
-            // do nothing
-         }
-         else if (chunk_is_token(next, CT_BRACE_CLOSE))
-         {
-            // TODO: add an option to split open empty statements? { };
-         }
-         else if (chunk_is_token(next, CT_BRACE_OPEN))
-         {
-            // already handled
-         }
-         else
-         {
-            next = chunk_get_next_ncnnl(pc);
-
-            // Handle unnamed temporary direct-list-initialization
-            if (get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)
-            {
-               log_rule_B("nl_type_brace_init_lst_open");
-               newline_iarf_pair(pc, chunk_get_next_nnl(pc),
-                                 options::nl_type_brace_init_lst_open(), true);
-            }
-            // Handle nl_after_brace_open
-            else if (  (  get_chunk_parent_type(pc) == CT_CPP_LAMBDA
-                       || pc->level == pc->brace_level)
-                    && options::nl_after_brace_open())
-            {
-               log_rule_B("nl_after_brace_open");
-
-               if (!one_liner_nl_ok(pc))
-               {
-                  LOG_FMT(LNL1LINE, "a new line may NOT be added\n");
-                  // no change - preserve one liner body
-               }
-               else if (  pc->flags.test(PCF_IN_ARRAY_ASSIGN)
-                       || pc->flags.test(PCF_IN_PREPROC))
-               {
-                  // no change - don't break up array assignments or preprocessors
-               }
-               else
-               {
-                  // Step back from next to the first non-newline item
-                  chunk_t *tmp = chunk_get_prev(next);
-
-                  while (tmp != pc)
-                  {
-                     if (chunk_is_comment(tmp))
-                     {
-                        log_rule_B("nl_after_brace_open_cmt");
-
-                        if (  !options::nl_after_brace_open_cmt()
-                           && chunk_is_not_token(tmp, CT_COMMENT_MULTI))
-                        {
-                           break;
-                        }
-                     }
-                     tmp = chunk_get_prev(tmp);
-                  }
-                  // Add the newline
-                  newline_iarf(tmp, IARF_ADD);
-               }
-            }
-         }
-         // braced-init-list is more like a function call with arguments,
-         // than curly braces that determine a structure of a source code,
-         // so, don't add a newline before a closing brace. Issue #1405.
-         log_rule_B("nl_type_brace_init_lst_open");
-         log_rule_B("nl_type_brace_init_lst_close");
-
-         if (!(  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
-              && options::nl_type_brace_init_lst_open() == IARF_IGNORE
-              && options::nl_type_brace_init_lst_close() == IARF_IGNORE))
-         {
-            newlines_brace_pair(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         // newline between a close brace and x
-         log_rule_B("nl_brace_brace");
-
-         if (options::nl_brace_brace() != IARF_IGNORE)
-         {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
-
-            if (chunk_is_token(next, CT_BRACE_CLOSE))
-            {
-               log_rule_B("nl_brace_brace");
-               newline_iarf_pair(pc, next, options::nl_brace_brace());
-            }
-         }
-         log_rule_B("nl_brace_square");
-
-         if (options::nl_brace_square() != IARF_IGNORE)
-         {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
-
-            if (chunk_is_token(next, CT_SQUARE_CLOSE))
-            {
-               log_rule_B("nl_brace_square");
-               newline_iarf_pair(pc, next, options::nl_brace_square());
-            }
-         }
-         log_rule_B("nl_brace_fparen");
-
-         if (options::nl_brace_fparen() != IARF_IGNORE)
-         {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
-
-            log_rule_B("nl_brace_fparen");
-
-            if (  chunk_is_token(next, CT_NEWLINE)
-               && (options::nl_brace_fparen() == IARF_REMOVE))
-            {
-               next = chunk_get_next_nc(next, scope_e::PREPROC);  // Issue #1000
-            }
-
-            if (chunk_is_token(next, CT_FPAREN_CLOSE))
-            {
-               log_rule_B("nl_brace_fparen");
-               newline_iarf_pair(pc, next, options::nl_brace_fparen());
-            }
-         }
-         // newline before a close brace
-         log_rule_B("nl_type_brace_init_lst_close");
-
-         if (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
-            && options::nl_type_brace_init_lst_close() != IARF_IGNORE)
-         {
-            // Handle unnamed temporary direct-list-initialization
-            newline_iarf_pair(chunk_get_prev_nnl(pc), pc,
-                              options::nl_type_brace_init_lst_close(), true);
-         }
-         // blanks before a close brace
-         log_rule_B("eat_blanks_before_close_brace");
-
-         if (options::eat_blanks_before_close_brace())
-         {
-            // Limit the newlines before the close brace to 1
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (chunk_is_newline(prev))
-            {
-               log_rule_B("nl_inside_namespace");
-               log_rule_B("nl_inside_empty_func");
-
-               if (  options::nl_inside_empty_func() > 0
-                  && chunk_is_token(chunk_get_prev_nnl(pc), CT_BRACE_OPEN)
-                  && (  get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                     || get_chunk_parent_type(pc) == CT_FUNC_DEF))
-               {
-                  blank_line_set(prev, options::nl_inside_empty_func);
-               }
-               else if (  options::nl_inside_namespace() > 0
-                       && get_chunk_parent_type(pc) == CT_NAMESPACE)
-               {
-                  blank_line_set(prev, options::nl_inside_namespace);
-               }
-               else if (prev->nl_count != 1)
-               {
-                  prev->nl_count = 1;
-                  LOG_FMT(LBLANKD, "%s(%d): eat_blanks_before_close_brace %zu\n",
-                          __func__, __LINE__, prev->orig_line);
-                  MARK_CHANGE();
-               }
-            }
-         }
-         else if (  options::nl_ds_struct_enum_close_brace()
-                 && (  get_chunk_parent_type(pc) == CT_ENUM
-                    || get_chunk_parent_type(pc) == CT_STRUCT
-                    || get_chunk_parent_type(pc) == CT_UNION))
-         {
-            log_rule_B("nl_ds_struct_enum_close_brace");
-
-            if (!pc->flags.test(PCF_ONE_LINER))
-            {
-               // Make sure the brace is preceded by two newlines
-               chunk_t *prev = chunk_get_prev(pc);
-
-               if (!chunk_is_newline(prev))
-               {
-                  prev = newline_add_before(pc);
-               }
-
-               if (prev->nl_count < 2)
-               {
-                  double_newline(prev);
-               }
-            }
-         }
-         // Force a newline after a close brace
-         log_rule_B("nl_brace_struct_var");
-
-         if (  (options::nl_brace_struct_var() != IARF_IGNORE)
-            && (  get_chunk_parent_type(pc) == CT_STRUCT
-               || get_chunk_parent_type(pc) == CT_ENUM
-               || get_chunk_parent_type(pc) == CT_UNION))
-         {
-            chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-            if (  chunk_is_not_token(next, CT_SEMICOLON)
-               && chunk_is_not_token(next, CT_COMMA))
-            {
-               log_rule_B("nl_brace_struct_var");
-               newline_iarf(pc, options::nl_brace_struct_var());
-            }
-         }
-         else if (  get_chunk_parent_type(pc) != CT_OC_AT
-                 && get_chunk_parent_type(pc) != CT_BRACED_INIT_LIST
-                 && (  options::nl_after_brace_close()
-                    || get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                    || get_chunk_parent_type(pc) == CT_FUNC_DEF
-                    || get_chunk_parent_type(pc) == CT_OC_MSG_DECL))
-         {
-            log_rule_B("nl_after_brace_close");
-            chunk_t *next = chunk_get_next(pc);
-
-            if (  chunk_is_not_token(next, CT_SEMICOLON)
-               && chunk_is_not_token(next, CT_COMMA)
-               && chunk_is_not_token(next, CT_SPAREN_CLOSE)    // Issue #664
-               && chunk_is_not_token(next, CT_SQUARE_CLOSE)
-               && chunk_is_not_token(next, CT_FPAREN_CLOSE)
-               && chunk_is_not_token(next, CT_PAREN_CLOSE)
-               && chunk_is_not_token(next, CT_WHILE_OF_DO)
-               && chunk_is_not_token(next, CT_VBRACE_CLOSE) // Issue #666
-               && (  chunk_is_not_token(next, CT_BRACE_CLOSE)
-                  || !next->flags.test(PCF_ONE_LINER))      // #1258
-               && !pc->flags.test(PCF_IN_ARRAY_ASSIGN)
-               && !pc->flags.test(PCF_IN_TYPEDEF)
-               && !chunk_is_newline(next)
-               && !chunk_is_comment(next))
-            {
-               // #1258
-               // dont add newline between two consecutive braces closes, if the second is a part of one liner.
-               newline_end_newline(pc);
-            }
-         }
-         else if (get_chunk_parent_type(pc) == CT_NAMESPACE)
-         {
-            log_rule_B("nl_after_namespace");
-
-            if (options::nl_after_namespace() > 0)
-            {
-               chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-               if (next != nullptr)
-               {
-                  newline_add_before(next);
-                  // newline_iarf(next, IARF_ADD);
-               }
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
-      {
-         log_rule_B("nl_after_vbrace_open");
-         log_rule_B("nl_after_vbrace_open_empty");
-
-         if (  options::nl_after_vbrace_open()
-            || options::nl_after_vbrace_open_empty())
-         {
-            chunk_t *next = chunk_get_next(pc, scope_e::PREPROC);
-            bool    add_it;
-
-            if (chunk_is_semicolon(next))
-            {
-               log_rule_B("nl_after_vbrace_open_empty");
-               add_it = options::nl_after_vbrace_open_empty();
-            }
-            else
-            {
-               log_rule_B("nl_after_vbrace_open");
-               add_it = (  options::nl_after_vbrace_open()
-                        && chunk_is_not_token(next, CT_VBRACE_CLOSE)
-                        && !chunk_is_comment(next)
-                        && !chunk_is_newline(next));
-            }
-
-            if (add_it)
-            {
-               newline_iarf(pc, IARF_ADD);
-            }
-         }
-         log_rule_B("nl_create_if_one_liner");
-         log_rule_B("nl_create_for_one_liner");
-         log_rule_B("nl_create_while_one_liner");
-
-         if (  (  (  get_chunk_parent_type(pc) == CT_IF
-                  || get_chunk_parent_type(pc) == CT_ELSEIF
-                  || get_chunk_parent_type(pc) == CT_ELSE)
-               && options::nl_create_if_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_FOR
-               && options::nl_create_for_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_WHILE
-               && options::nl_create_while_one_liner()))
-         {
-            nl_create_one_liner(pc);
-         }
-         log_rule_B("nl_split_if_one_liner");
-         log_rule_B("nl_split_for_one_liner");
-         log_rule_B("nl_split_while_one_liner");
-
-         if (  (  (  get_chunk_parent_type(pc) == CT_IF
-                  || get_chunk_parent_type(pc) == CT_ELSEIF
-                  || get_chunk_parent_type(pc) == CT_ELSE)
-               && options::nl_split_if_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_FOR
-               && options::nl_split_for_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_WHILE
-               && options::nl_split_while_one_liner()))
-         {
-            if (pc->flags.test(PCF_ONE_LINER))
-            {
-               // split one-liner
-               chunk_t *end = chunk_get_next(chunk_get_next_type(pc->next, CT_SEMICOLON, -1));
-               // Scan for clear flag
-               LOG_FMT(LNEWLINE, "(%d) ", __LINE__);
-               LOG_FMT(LNEWLINE, "\n");
-
-               for (chunk_t *temp = pc; temp != end; temp = chunk_get_next(temp))
-               {
-                  LOG_FMT(LNEWLINE, "%s(%d): text() is '%s', type is %s, level is %zu\n",
-                          __func__, __LINE__, temp->text(), get_token_name(temp->type), temp->level);
-                  // produces much more log output. Use it only debugging purpose
-                  //log_pcf_flags(LNEWLINE, temp->flags);
-                  chunk_flags_clr(temp, PCF_ONE_LINER);
-               }
-
-               // split
-               newline_add_between(pc, pc->next);
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_VBRACE_CLOSE))
-      {
-         log_rule_B("nl_after_vbrace_close");
-
-         if (options::nl_after_vbrace_close())
-         {
-            if (!chunk_is_newline(chunk_get_next_nc(pc)))
-            {
-               newline_iarf(pc, IARF_ADD);
-            }
-         }
-      }
-      else if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-              && get_chunk_parent_type(pc) == CT_OC_MSG)
-      {
-         log_rule_B("nl_oc_msg_args");
-
-         if (options::nl_oc_msg_args())
-         {
-            newline_oc_msg(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_STRUCT))
-      {
-         log_rule_B("nl_struct_brace");
-         newlines_struct_union(pc, options::nl_struct_brace(), true);
-      }
-      else if (chunk_is_token(pc, CT_UNION))
-      {
-         log_rule_B("nl_union_brace");
-         newlines_struct_union(pc, options::nl_union_brace(), true);
-      }
-      else if (chunk_is_token(pc, CT_ENUM))
-      {
-         newlines_enum(pc);
-      }
-      else if (chunk_is_token(pc, CT_CASE))
-      {
-         // Note: 'default' also maps to CT_CASE
-         log_rule_B("nl_before_case");
-
-         if (options::nl_before_case())
-         {
-            newline_case(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_THROW))
-      {
-         chunk_t *prev = chunk_get_prev(pc);
-
-         if (  chunk_is_token(prev, CT_PAREN_CLOSE)
-            || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
-         {
-            log_rule_B("nl_before_throw");
-            newline_iarf(chunk_get_prev_ncnnlni(pc), options::nl_before_throw());   // Issue #2279
-         }
-      }
-      else if (  chunk_is_token(pc, CT_QUALIFIER)
-              && !strcmp(pc->text(), "throws"))
-      {
-         chunk_t *prev = chunk_get_prev(pc);
-
-         if (  chunk_is_token(prev, CT_PAREN_CLOSE)
-            || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
-         {
-            log_rule_B("nl_before_throw");
-            newline_iarf(chunk_get_prev_ncnnlni(pc), options::nl_before_throw());   // Issue #2279
-         }
-      }
-      else if (chunk_is_token(pc, CT_CASE_COLON))
-      {
-         chunk_t *next = chunk_get_next_nnl(pc);
-
-         log_rule_B("nl_case_colon_brace");
-
-         if (  chunk_is_token(next, CT_BRACE_OPEN)
-            && options::nl_case_colon_brace() != IARF_IGNORE)
-         {
-            newline_iarf(pc, options::nl_case_colon_brace());
-         }
-         else if (options::nl_after_case())
-         {
-            log_rule_B("nl_after_case");
-            newline_case_colon(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_SPAREN_CLOSE))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(next, CT_BRACE_OPEN))
-         {
-            /*
-             * TODO: this could be used to control newlines between the
-             * the if/while/for/switch close parenthesis and the open brace, but
-             * that is currently handled elsewhere.
-             */
-         }
-      }
-      else if (chunk_is_token(pc, CT_RETURN))
-      {
-         log_rule_B("nl_before_return");
-
-         if (options::nl_before_return())
-         {
-            newline_before_return(pc);
-         }
-         log_rule_B("nl_after_return");
-
-         if (options::nl_after_return())
-         {
-            newline_after_return(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_SEMICOLON))
-      {
-         log_rule_B("nl_after_semicolon");
-
-         if (  !pc->flags.test(PCF_IN_SPAREN)
-            && !pc->flags.test(PCF_IN_PREPROC)
-            && options::nl_after_semicolon())
-         {
-            chunk_t *next = chunk_get_next(pc);
-
-            while (chunk_is_token(next, CT_VBRACE_CLOSE))
-            {
-               next = chunk_get_next(next);
-            }
-
-            if (  next != nullptr
-               && !chunk_is_comment(next)
-               && !chunk_is_newline(next))
-            {
-               if (one_liner_nl_ok(next))
-               {
-                  LOG_FMT(LNL1LINE, "%s(%d): a new line may be added\n", __func__, __LINE__);
-                  newline_iarf(pc, IARF_ADD);
-               }
-               else
-               {
-                  LOG_FMT(LNL1LINE, "%s(%d): a new line may NOT be added\n", __func__, __LINE__);
-               }
-            }
-         }
-         else if (get_chunk_parent_type(pc) == CT_CLASS)
-         {
-            log_rule_B("nl_after_class");
-
-            if (options::nl_after_class() > 0)
-            {
-               newline_iarf(pc, IARF_ADD);
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_FPAREN_OPEN))
-      {
-         log_rule_B("nl_func_decl_start");
-         log_rule_B("nl_func_def_start");
-         log_rule_B("nl_func_decl_start_single");
-         log_rule_B("nl_func_def_start_single");
-         log_rule_B("nl_func_decl_start_multi_line");
-         log_rule_B("nl_func_def_start_multi_line");
-         log_rule_B("nl_func_decl_args");
-         log_rule_B("nl_func_def_args");
-         log_rule_B("nl_func_decl_args_multi_line");
-         log_rule_B("nl_func_def_args_multi_line");
-         log_rule_B("nl_func_decl_end");
-         log_rule_B("nl_func_def_end");
-         log_rule_B("nl_func_decl_end_single");
-         log_rule_B("nl_func_def_end_single");
-         log_rule_B("nl_func_decl_end_multi_line");
-         log_rule_B("nl_func_def_end_multi_line");
-         log_rule_B("nl_func_decl_empty");
-         log_rule_B("nl_func_def_empty");
-         log_rule_B("nl_func_type_name");
-         log_rule_B("nl_func_type_name_class");
-         log_rule_B("nl_func_class_scope");
-         log_rule_B("nl_func_scope_name");
-         log_rule_B("nl_func_proto_type_name");
-         log_rule_B("nl_func_paren");
-         log_rule_B("nl_func_def_paren");
-         log_rule_B("nl_func_def_paren_empty");
-         log_rule_B("nl_func_paren_empty");
-         log_rule_B("nl_func_call_args");
-
-         if (  (  (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-                  || get_chunk_parent_type(pc) == CT_FUNC_PROTO
-                  || get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                  || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO
-                  || get_chunk_parent_type(pc) == CT_OPERATOR)
-               && (  options::nl_func_decl_start() != IARF_IGNORE
-                  || options::nl_func_def_start() != IARF_IGNORE
-                  || options::nl_func_decl_start_single() != IARF_IGNORE
-                  || options::nl_func_def_start_single() != IARF_IGNORE
-                  || options::nl_func_decl_start_multi_line()
-                  || options::nl_func_def_start_multi_line()
-                  || options::nl_func_decl_args() != IARF_IGNORE
-                  || options::nl_func_def_args() != IARF_IGNORE
-                  || options::nl_func_decl_args_multi_line()
-                  || options::nl_func_def_args_multi_line()
-                  || options::nl_func_decl_end() != IARF_IGNORE
-                  || options::nl_func_def_end() != IARF_IGNORE
-                  || options::nl_func_decl_end_single() != IARF_IGNORE
-                  || options::nl_func_def_end_single() != IARF_IGNORE
-                  || options::nl_func_decl_end_multi_line()
-                  || options::nl_func_def_end_multi_line()
-                  || options::nl_func_decl_empty() != IARF_IGNORE
-                  || options::nl_func_def_empty() != IARF_IGNORE
-                  || options::nl_func_type_name() != IARF_IGNORE
-                  || options::nl_func_type_name_class() != IARF_IGNORE
-                  || options::nl_func_class_scope() != IARF_IGNORE
-                  || options::nl_func_scope_name() != IARF_IGNORE
-                  || options::nl_func_proto_type_name() != IARF_IGNORE
-                  || options::nl_func_paren() != IARF_IGNORE
-                  || options::nl_func_def_paren() != IARF_IGNORE
-                  || options::nl_func_def_paren_empty() != IARF_IGNORE
-                  || options::nl_func_paren_empty() != IARF_IGNORE))
-
-            || (  get_chunk_parent_type(pc) == CT_FUNC_CALL                // Issue #2604
-               && options::nl_func_call_args() != IARF_IGNORE))
-         {
-            newline_func_def_or_call(pc);
-         }
-         else if (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL                // Issue #2020
-                    || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
-                 && options::nl_func_call_start() != IARF_IGNORE)
-         {
-            log_rule_B("nl_func_call_start");
-            newline_iarf(pc, options::nl_func_call_start());
-         }
-         else if (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-                    || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
-                 && (  (options::nl_func_call_start_multi_line())
-                    || (options::nl_func_call_args_multi_line())
-                    || (options::nl_func_call_end_multi_line())
-                    || (options::nl_func_call_paren() != IARF_IGNORE)
-                    || (options::nl_func_call_paren_empty() != IARF_IGNORE)
-                    || (options::nl_func_call_empty() != IARF_IGNORE)))
-         {
-            log_rule_B("nl_func_call_start_multi_line");
-            log_rule_B("nl_func_call_args_multi_line");
-            log_rule_B("nl_func_call_end_multi_line");
-            log_rule_B("nl_func_call_paren");
-            log_rule_B("nl_func_call_paren_empty");
-            log_rule_B("nl_func_call_empty");
-
-            if (  options::nl_func_call_paren() != IARF_IGNORE
-               || options::nl_func_call_paren_empty() != IARF_IGNORE
-               || options::nl_func_call_empty() != IARF_IGNORE)
-            {
-               newline_func_def_or_call(pc);
-            }
-            newline_func_multi_line(pc);
-         }
-         else if (  first
-                 && (options::nl_remove_extra_newlines() == 1))
-         {
-            log_rule_B("nl_remove_extra_newlines");
-            newline_iarf(pc, IARF_REMOVE);
-         }
-      }
-      else if (chunk_is_token(pc, CT_FPAREN_CLOSE))                          // Issue #2758
-      {
-         if (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-               || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
-            && options::nl_func_call_end() != IARF_IGNORE)
-         {
-            log_rule_B("nl_func_call_end");
-            newline_iarf(pc->prev, options::nl_func_call_end());
-         }
-      }
-      else if (chunk_is_token(pc, CT_ANGLE_CLOSE))
-      {
-         if (get_chunk_parent_type(pc) == CT_TEMPLATE)
-         {
-            chunk_t *next = chunk_get_next_ncnnl(pc);
-
-            if (  next != nullptr
-               && next->level == next->brace_level)
-            {
-               chunk_t *tmp = chunk_get_prev_ncnnlni(chunk_get_prev_type(pc, CT_ANGLE_OPEN, pc->level));   // Issue #2279
-
-               if (chunk_is_token(tmp, CT_TEMPLATE))
-               {
-                  if (chunk_is_token(next, CT_USING))
-                  {
-                     newline_iarf(pc, options::nl_template_using());
-                     log_rule_B("nl_template_using");
-                  }
-                  else if (get_chunk_parent_type(next) == CT_FUNC_DEF) // function definition
-                  {
-                     iarf_e const action =
-                        newline_template_option(
-                           pc,
-                           options::nl_template_func_def_special(),
-                           options::nl_template_func_def(),
-                           options::nl_template_func());
-                     log_rule_B("nl_template_func_def_special");
-                     log_rule_B("nl_template_func_def");
-                     log_rule_B("nl_template_func");
-                     newline_iarf(pc, action);
-                  }
-                  else if (get_chunk_parent_type(next) == CT_FUNC_PROTO) // function declaration
-                  {
-                     iarf_e const action =
-                        newline_template_option(
-                           pc,
-                           options::nl_template_func_decl_special(),
-                           options::nl_template_func_decl(),
-                           options::nl_template_func());
-                     log_rule_B("nl_template_func_decl_special");
-                     log_rule_B("nl_template_func_decl");
-                     log_rule_B("nl_template_func");
-                     newline_iarf(pc, action);
-                  }
-                  else if (  chunk_is_token(next, CT_TYPE)
-                          || chunk_is_token(next, CT_QUALIFIER)) // variable
-                  {
-                     newline_iarf(pc, options::nl_template_var());
-                     log_rule_B("nl_template_var");
-                  }
-                  else if (next->flags.test(PCF_INCOMPLETE)) // class declaration
-                  {
-                     iarf_e const action =
-                        newline_template_option(
-                           pc,
-                           options::nl_template_class_decl_special(),
-                           options::nl_template_class_decl(),
-                           options::nl_template_class());
-                     log_rule_B("nl_template_class_decl_special");
-                     log_rule_B("nl_template_class_decl");
-                     log_rule_B("nl_template_class");
-                     newline_iarf(pc, action);
-                  }
-                  else // class definition
-                  {
-                     iarf_e const action =
-                        newline_template_option(
-                           pc,
-                           options::nl_template_class_def_special(),
-                           options::nl_template_class_def(),
-                           options::nl_template_class());
-                     log_rule_B("nl_template_class_def_special");
-                     log_rule_B("nl_template_class_def");
-                     log_rule_B("nl_template_class");
-                     newline_iarf(pc, action);
-                  }
-               }
-            }
-         }
-      }
-      else if (  chunk_is_token(pc, CT_NAMESPACE)
-              && get_chunk_parent_type(pc) != CT_USING)
-      {
-         // Issue #2387
-         chunk_t *next = chunk_get_next_ncnnl(pc);
-
-         if (next != nullptr)
-         {
-            next = chunk_get_next_ncnnl(next);
-
-            if (!chunk_is_token(next, CT_ASSIGN))
-            {
-               // Issue #1235
-               // Issue #2186
-               chunk_t *braceOpen = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
-
-               if (braceOpen == nullptr)
-               {
-                  // fatal error
-                  LOG_FMT(LERR, "%s(%d): Missing BRACE_OPEN after namespace\n   orig_line is %zu, orig_col is %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
-                  exit(EXIT_FAILURE);
-               }
-               LOG_FMT(LNEWLINE, "%s(%d): braceOpen->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                       __func__, __LINE__, braceOpen->orig_line, braceOpen->orig_col, braceOpen->text());
-               // produces much more log output. Use it only debugging purpose
-               //log_pcf_flags(LNEWLINE, braceOpen->flags);
-               newlines_namespace(pc);
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_SQUARE_OPEN))
-      {
-         if (  get_chunk_parent_type(pc) == CT_ASSIGN
-            && !pc->flags.test(PCF_ONE_LINER))
-         {
-            chunk_t *tmp = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-            newline_iarf(tmp, options::nl_assign_square());
-            log_rule_B("nl_assign_square");
-
-            iarf_e arg = options::nl_after_square_assign();
-            log_rule_B("nl_after_square_assign");
-
-            if (options::nl_assign_square() & IARF_ADD)
-            {
-               log_rule_B("nl_assign_square");
-               arg = IARF_ADD;
-            }
-            newline_iarf(pc, arg);
-
-            /*
-             * if there is a newline after the open, then force a newline
-             * before the close
-             */
-            tmp = chunk_get_next_nc(pc);
-
-            if (chunk_is_newline(tmp))
-            {
-               tmp = chunk_get_next_type(pc, CT_SQUARE_CLOSE, pc->level);
-
-               if (tmp != nullptr)
-               {
-                  newline_add_before(tmp);
-               }
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_ACCESS))
-      {
-         // Make sure there is a newline before an access spec
-         if (options::nl_before_access_spec() > 0)
-         {
-            log_rule_B("nl_before_access_spec");
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (!chunk_is_newline(prev))
-            {
-               newline_add_before(pc);
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_ACCESS_COLON))
-      {
-         // Make sure there is a newline after an access spec
-         if (options::nl_after_access_spec() > 0)
-         {
-            log_rule_B("nl_after_access_spec");
-            chunk_t *next = chunk_get_next(pc);
-
-            if (!chunk_is_newline(next))
-            {
-               newline_add_before(next);
-            }
-         }
-      }
-      else if (chunk_is_token(pc, CT_PP_DEFINE))
-      {
-         if (options::nl_multi_line_define())
-         {
-            log_rule_B("nl_multi_line_define");
-            nl_handle_define(pc);
-         }
-      }
-      else if (  first
-              && (options::nl_remove_extra_newlines() == 1)
-              && !pc->flags.test(PCF_IN_PREPROC))
-      {
-         log_rule_B("nl_remove_extra_newlines");
-         newline_iarf(pc, IARF_REMOVE);
-      }
-      else if (  chunk_is_token(pc, CT_MEMBER)
-              && (  language_is_set(LANG_JAVA)
-                 || language_is_set(LANG_CPP)))                 // Issue #2574
-      {
-         // Issue #1124
-         if (pc->parent_type != CT_FUNC_DEF)
-         {
-            newline_iarf(chunk_get_prev_nnl(pc), options::nl_before_member());
-            log_rule_B("nl_before_member");
-            newline_iarf(pc, options::nl_after_member());
-            log_rule_B("nl_after_member");
-         }
-      }
-      else
-      {
-         // ignore it
-      }
-   }
-
-   newline_def_blk(chunk_get_head(), false);
-} // newlines_cleanup_braces
-
-
-static void nl_handle_define(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *nl  = pc;
-   chunk_t *ref = nullptr;
-
-   while ((nl = chunk_get_next(nl)) != nullptr)
-   {
-      if (chunk_is_token(nl, CT_NEWLINE))
-      {
-         return;
-      }
-
-      if (  chunk_is_token(nl, CT_MACRO)
-         || (  chunk_is_token(nl, CT_FPAREN_CLOSE)
-            && get_chunk_parent_type(nl) == CT_MACRO_FUNC))
-      {
-         ref = nl;
-      }
-
-      if (chunk_is_token(nl, CT_NL_CONT))
-      {
-         if (ref != nullptr)
-         {
-            newline_add_after(ref);
-         }
-         return;
-      }
-   }
-} // nl_handle_define
-
-
-void newline_after_multiline_comment(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_not_token(pc, CT_COMMENT_MULTI))
-      {
-         continue;
-      }
-      chunk_t *tmp = pc;
-
-      while (  ((tmp = chunk_get_next(tmp)) != nullptr)
-            && !chunk_is_newline(tmp))
-      {
-         if (!chunk_is_comment(tmp))
-         {
-            newline_add_before(tmp);
-            break;
-         }
-      }
-   }
-} // newline_after_multiline_comment
-
-
-void newline_after_label_colon(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_not_token(pc, CT_LABEL_COLON))
-      {
-         continue;
-      }
-      newline_add_after(pc);
-   }
-} // newline_after_label_colon
-
-
-static bool is_class_one_liner(chunk_t *pc)
-{
-   if (  (  chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-         || chunk_is_token(pc, CT_FUNC_DEF))
-      && pc->flags.test(PCF_IN_CLASS))
-   {
-      // Find opening brace
-      pc = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
-      return(  pc != nullptr
-            && pc->flags.test(PCF_ONE_LINER));
-   }
-   return(false);
-} // is_class_one_liner
-
-
-void newlines_insert_blank_lines(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      //LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-      //        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      if (chunk_is_token(pc, CT_IF))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_if());
-         log_rule_B("nl_before_if");
-         newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_if());
-         log_rule_B("nl_after_if");
-      }
-      else if (chunk_is_token(pc, CT_FOR))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_for());
-         log_rule_B("nl_before_for");
-         newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_for());
-         log_rule_B("nl_after_for");
-      }
-      else if (chunk_is_token(pc, CT_WHILE))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_while());
-         log_rule_B("nl_before_while");
-         newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_while());
-         log_rule_B("nl_after_while");
-      }
-      else if (chunk_is_token(pc, CT_SWITCH))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_switch());
-         log_rule_B("nl_before_switch");
-         newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_switch());
-         log_rule_B("nl_after_switch");
-      }
-      else if (chunk_is_token(pc, CT_SYNCHRONIZED))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_synchronized());
-         log_rule_B("nl_before_synchronized");
-         newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_synchronized());
-         log_rule_B("nl_after_synchronized");
-      }
-      else if (chunk_is_token(pc, CT_DO))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_do());
-         log_rule_B("nl_before_do");
-         newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_do());
-         log_rule_B("nl_after_do");
-      }
-      else if (chunk_is_token(pc, CT_OC_INTF))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_oc_before_interface());
-         log_rule_B("nl_oc_before_interface");
-      }
-      else if (chunk_is_token(pc, CT_OC_END))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_oc_before_end());
-         log_rule_B("nl_oc_before_end");
-      }
-      else if (chunk_is_token(pc, CT_OC_IMPL))
-      {
-         newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_oc_before_implementation());
-         log_rule_B("nl_oc_before_implementation");
-      }
-      else if (  chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-              || chunk_is_token(pc, CT_FUNC_DEF)
-              || chunk_is_token(pc, CT_FUNC_CLASS_PROTO)
-              || chunk_is_token(pc, CT_FUNC_PROTO))
-      {
-         if (  options::nl_class_leave_one_liner_groups()
-            && is_class_one_liner(pc))
-         {
-            log_rule_B("nl_class_leave_one_liner_groups");
-            newlines_func_pre_blank_lines(pc, CT_FUNC_PROTO);
-         }
-         else
-         {
-            newlines_func_pre_blank_lines(pc, pc->type);
-         }
-      }
-      else
-      {
-         // ignore it
-         //LOG_FMT(LNEWLINE, "%s(%d): ignore it\n", __func__, __LINE__);
-      }
-   }
-} // newlines_insert_blank_lines
-
-
-void newlines_functions_remove_extra_blank_lines(void)
-{
-   LOG_FUNC_ENTRY();
-
-   const size_t nl_max_blank_in_func = options::nl_max_blank_in_func();
-
-   log_rule_B("nl_max_blank_in_func");
-
-   if (nl_max_blank_in_func == 0)
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): nl_max_blank_in_func is zero\n", __func__, __LINE__);
-      return;
-   }
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         || (  get_chunk_parent_type(pc) != CT_FUNC_DEF
-            && get_chunk_parent_type(pc) != CT_CPP_LAMBDA))
-      {
-         continue;
-      }
-      const size_t startMoveLevel = pc->level;
-
-      while (pc != nullptr)
-      {
-         if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            && pc->level == startMoveLevel)
-         {
-            break;
-         }
-
-         // delete newlines
-         if (  !chunk_is_token(pc, CT_COMMENT_MULTI)   // Issue #2195
-            && pc->nl_count > nl_max_blank_in_func)
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            pc->nl_count = nl_max_blank_in_func;
-            MARK_CHANGE();
-            remove_next_newlines(pc);
-         }
-         else
-         {
-            pc = chunk_get_next(pc);
-         }
-      }
-   }
-} // newlines_functions_remove_extra_blank_lines
-
-
-void newlines_squeeze_ifdef(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc;
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (  chunk_is_token(pc, CT_PREPROC)
-         && (  pc->level > 0
-            || options::nl_squeeze_ifdef_top_level()))
-      {
-         log_rule_B("nl_squeeze_ifdef_top_level");
-         chunk_t *ppr = chunk_get_next(pc);
-
-         if (  chunk_is_token(ppr, CT_PP_IF)
-            || chunk_is_token(ppr, CT_PP_ELSE)
-            || chunk_is_token(ppr, CT_PP_ENDIF))
-         {
-            chunk_t *pnl = nullptr;
-            chunk_t *nnl = chunk_get_next_nl(ppr);
-
-            if (  chunk_is_token(ppr, CT_PP_ELSE)
-               || chunk_is_token(ppr, CT_PP_ENDIF))
-            {
-               pnl = chunk_get_prev_nl(pc);
-            }
-            chunk_t *tmp1;
-            chunk_t *tmp2;
-
-            if (nnl != nullptr)
-            {
-               if (pnl != nullptr)
-               {
-                  if (pnl->nl_count > 1)
-                  {
-                     pnl->nl_count = 1;
-                     MARK_CHANGE();
-
-                     tmp1 = chunk_get_prev_nnl(pnl);
-                     tmp2 = chunk_get_prev_nnl(nnl);
-
-                     LOG_FMT(LNEWLINE, "%s(%d): moved from after line %zu to after %zu\n",
-                             __func__, __LINE__, tmp1->orig_line, tmp2->orig_line);
-                  }
-               }
-
-               if (  chunk_is_token(ppr, CT_PP_IF)
-                  || chunk_is_token(ppr, CT_PP_ELSE))
-               {
-                  if (nnl->nl_count > 1)
-                  {
-                     tmp1 = chunk_get_prev_nnl(nnl);
-                     LOG_FMT(LNEWLINE, "%s(%d): trimmed newlines after line %zu from %zu\n",
-                             __func__, __LINE__, tmp1->orig_line, nnl->nl_count);
-                     nnl->nl_count = 1;
-                     MARK_CHANGE();
-                  }
-               }
-            }
-         }
-      }
-   }
-} // newlines_squeeze_ifdef
-
-
-void newlines_squeeze_paren_close(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc;
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      chunk_t *next;
-      chunk_t *prev;
-
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         prev = chunk_get_prev(pc);
-      }
-      else
-      {
-         prev = pc;
-      }
-      next = chunk_get_next(pc);
-
-      if (  next != nullptr
-         && prev != nullptr
-         && chunk_is_paren_close(next)
-         && chunk_is_paren_close(prev))
-      {
-         chunk_t *prev_op = chunk_skip_to_match_rev(prev);
-         chunk_t *next_op = chunk_skip_to_match_rev(next);
-         bool    flag     = true;
-
-         if (true)
-         {
-            chunk_t *tmp = prev;
-
-            while (chunk_is_paren_close(tmp))
-            {
-               tmp = chunk_get_prev(tmp);
-            }
-
-            if (chunk_is_not_token(tmp, CT_NEWLINE))
-            {
-               flag = false;
-            }
-         }
-
-         if (flag)
-         {
-            if (are_chunks_in_same_line(next_op, prev_op))
-            {
-               if (chunk_is_token(pc, CT_NEWLINE))
-               {
-                  pc = next;
-               }
-               newline_del_between(prev, next);
-            }
-            else
-            {
-               newline_add_between(prev, next);
-            }
-         }
-      }
-   }
-} // newlines_squeeze_paren_close
-
-
-void newlines_eat_start_end(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc;
-
-   // Process newlines at the start of the file
-   if (  cpd.frag_cols == 0
-      && (  (options::nl_start_of_file() & IARF_REMOVE)
-         || (  (options::nl_start_of_file() & IARF_ADD)
-            && (options::nl_start_of_file_min() > 0))))
-   {
-      log_rule_B("nl_start_of_file");
-      log_rule_B("nl_start_of_file_min");
-      pc = chunk_get_head();
-
-      if (pc != nullptr)
-      {
-         if (chunk_is_token(pc, CT_NEWLINE))
-         {
-            if (options::nl_start_of_file() == IARF_REMOVE)
-            {
-               log_rule_B("nl_start_of_file");
-               LOG_FMT(LBLANKD, "%s(%d): eat_blanks_start_of_file %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               chunk_del(pc);
-               MARK_CHANGE();
-            }
-            else if (  options::nl_start_of_file() == IARF_FORCE
-                    || (pc->nl_count < options::nl_start_of_file_min()))
-            {
-               log_rule_B("nl_start_of_file");
-               LOG_FMT(LBLANKD, "%s(%d): set_blanks_start_of_file %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               pc->nl_count = options::nl_start_of_file_min();
-               log_rule_B("nl_start_of_file_min");
-               MARK_CHANGE();
-            }
-         }
-         else if (  (options::nl_start_of_file() & IARF_ADD)
-                 && (options::nl_start_of_file_min() > 0))
-         {
-            log_rule_B("nl_start_of_file");
-            log_rule_B("nl_start_of_file_min");
-            chunk_t chunk;
-            set_chunk_type(&chunk, CT_NEWLINE);
-            chunk.orig_line = pc->orig_line;
-            chunk.orig_col  = pc->orig_col;
-            chunk.pp_level  = pc->pp_level;
-            chunk.nl_count  = options::nl_start_of_file_min();
-            log_rule_B("nl_start_of_file_min");
-            chunk_add_before(&chunk, pc);
-            LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline before '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-            MARK_CHANGE();
-         }
-      }
-   }
-
-   // Process newlines at the end of the file
-   if (  cpd.frag_cols == 0
-      && (  (options::nl_end_of_file() & IARF_REMOVE)
-         || (  (options::nl_end_of_file() & IARF_ADD)
-            && (options::nl_end_of_file_min() > 0))))
-   {
-      log_rule_B("nl_end_of_file");
-      log_rule_B("nl_end_of_file_min");
-      pc = chunk_get_tail();
-
-      if (pc != nullptr)
-      {
-         if (chunk_is_token(pc, CT_NEWLINE))
-         {
-            if (options::nl_end_of_file() == IARF_REMOVE)
-            {
-               log_rule_B("nl_end_of_file");
-               LOG_FMT(LBLANKD, "%s(%d): eat_blanks_end_of_file %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               chunk_del(pc);
-               MARK_CHANGE();
-            }
-            else if (  options::nl_end_of_file() == IARF_FORCE
-                    || (pc->nl_count < options::nl_end_of_file_min()))
-            {
-               log_rule_B("nl_end_of_file");
-               log_rule_B("nl_end_of_file_min");
-
-               if (pc->nl_count != options::nl_end_of_file_min())
-               {
-                  log_rule_B("nl_end_of_file_min");
-                  LOG_FMT(LBLANKD, "%s(%d): set_blanks_end_of_file %zu\n",
-                          __func__, __LINE__, pc->orig_line);
-                  pc->nl_count = options::nl_end_of_file_min();
-                  log_rule_B("nl_end_of_file_min");
-                  MARK_CHANGE();
-               }
-            }
-         }
-         else if (  (options::nl_end_of_file() & IARF_ADD)
-                 && (options::nl_end_of_file_min() > 0))
-         {
-            log_rule_B("nl_end_of_file");
-            log_rule_B("nl_end_of_file_min");
-            chunk_t chunk;
-            set_chunk_type(&chunk, CT_NEWLINE);
-            chunk.orig_line = pc->orig_line;
-            chunk.orig_col  = pc->orig_col;
-            chunk.pp_level  = pc->pp_level;
-            chunk.nl_count  = options::nl_end_of_file_min();
-            log_rule_B("nl_end_of_file_min");
-            chunk_add_before(&chunk, nullptr);
-            LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline after '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-            MARK_CHANGE();
-         }
-      }
-   }
-} // newlines_eat_start_end
-
-
-void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LNEWLINE, "%s(%d): mode is %s\n",
-           __func__, __LINE__, to_string(mode));
-
-   if (  !(mode & (TP_JOIN | TP_LEAD | TP_TRAIL))
-      && chunk_type != CT_COMMA)
-   {
-      return;
-   }
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      char copy[1000];
-      LOG_FMT(LNEWLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
-      // produces much more log output. Use it only debugging purpose
-      //log_pcf_flags(LNEWLINE, pc->flags);
-
-      if (chunk_is_token(pc, chunk_type))
-      {
-         token_pos_e mode_local;
-
-         if (chunk_type == CT_COMMA)
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            // produces much more log output. Use it only debugging purpose
-            //log_pcf_flags(LNEWLINE, pc->flags);
-
-            if (pc->flags.test(PCF_IN_CONST_ARGS)) // Issue #2250
-            {
-               continue;
-            }
-
-            /*
-             * for chunk_type == CT_COMMA
-             * we get 'mode' from options::pos_comma()
-             * BUT we must take care of options::pos_class_comma()
-             * TODO and options::pos_constr_comma()
-             */
-            if (pc->flags.test(PCF_IN_CLASS_BASE))
-            {
-               // change mode
-               log_rule_B("pos_class_comma");
-               mode_local = options::pos_class_comma();
-            }
-            else if (pc->flags.test(PCF_IN_ENUM))
-            {
-               log_rule_B("pos_enum_comma");
-               mode_local = options::pos_enum_comma();
-            }
-            else
-            {
-               mode_local = mode;
-            }
-            LOG_FMT(LNEWLINE, "%s(%d): mode_local is %s\n",
-                    __func__, __LINE__, to_string(mode_local));
-         }
-         else
-         {
-            mode_local = mode;
-         }
-         chunk_t *prev = chunk_get_prev_nc(pc);
-         chunk_t *next = chunk_get_next_nc(pc);
-
-         LOG_FMT(LNEWLINE, "%s(%d): mode_local is %s\n",
-                 __func__, __LINE__, to_string(mode_local));
-
-         LOG_FMT(LNEWLINE, "%s(%d): prev->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                 __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text());
-         LOG_FMT(LNEWLINE, "%s(%d): next->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->text());
-         size_t nl_flag = ((chunk_is_newline(prev) ? 1 : 0) |
-                           (chunk_is_newline(next) ? 2 : 0));
-         LOG_FMT(LNEWLINE, "%s(%d): nl_flag is %zu\n",
-                 __func__, __LINE__, nl_flag);
-
-         if (mode_local & TP_JOIN)
-         {
-            if (nl_flag & 1)
-            {
-               // remove newline if not preceded by a comment
-               chunk_t *prev2 = chunk_get_prev(prev);
-
-               if (  prev2 != nullptr
-                  && !(chunk_is_comment(prev2)))
-               {
-                  remove_next_newlines(prev2);
-               }
-            }
-
-            if (nl_flag & 2)
-            {
-               // remove newline if not followed by a comment
-               chunk_t *next2 = chunk_get_next(next);
-
-               if (  next2 != nullptr
-                  && !(chunk_is_comment(next2)))
-               {
-                  remove_next_newlines(pc);
-               }
-            }
-            continue;
-         }
-
-         if (  (  nl_flag == 0
-               && !(mode_local & (TP_FORCE | TP_BREAK)))
-            || (  nl_flag == 3
-               && !(mode_local & TP_FORCE)))
-         {
-            // No newlines and not adding any or both and not forcing
-            continue;
-         }
-
-         if (  (  (mode_local & TP_LEAD)
-               && nl_flag == 1)
-            || (  (mode_local & TP_TRAIL)
-               && nl_flag == 2))
-         {
-            // Already a newline before (lead) or after (trail)
-            continue;
-         }
-
-         // If there were no newlines, we need to add one
-         if (nl_flag == 0)
-         {
-            if (mode_local & TP_LEAD)
-            {
-               newline_add_before(pc);
-            }
-            else
-            {
-               newline_add_after(pc);
-            }
-            continue;
-         }
-
-         // If there were both newlines, we need to remove one
-         if (nl_flag == 3)
-         {
-            if (mode_local & TP_LEAD)
-            {
-               remove_next_newlines(pc);
-            }
-            else
-            {
-               remove_next_newlines(chunk_get_prev_ncnnlni(pc));   // Issue #2279
-            }
-            continue;
-         }
-
-         // we need to move the newline
-         if (mode_local & TP_LEAD)
-         {
-            chunk_t *next2 = chunk_get_next(next);
-
-            if (  chunk_is_token(next2, CT_PREPROC)
-               || (  chunk_type == CT_ASSIGN
-                  && chunk_is_token(next2, CT_BRACE_OPEN)))
-            {
-               continue;
-            }
-
-            if (next->nl_count == 1)
-            {
-               if (  prev != nullptr
-                  && !prev->flags.test(PCF_IN_PREPROC))
-               {
-                  // move the CT_BOOL to after the newline
-                  chunk_move_after(pc, next);
-               }
-            }
-         }
-         else
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): prev->orig_line is %zu, orig_col is %zu, text() is '%s', nl_count is %zu\n",
-                    __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text(), prev->nl_count);
-
-            if (prev->nl_count == 1)
-            {
-               // Back up to the next non-comment item
-               prev = chunk_get_prev_nc(prev);
-               LOG_FMT(LNEWLINE, "%s(%d): prev->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                       __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text());
-
-               if (  prev != nullptr
-                  && !chunk_is_newline(prev)
-                  && !prev->flags.test(PCF_IN_PREPROC)
-                  && !prev->flags.test(PCF_IN_OC_MSG))
-               {
-                  chunk_move_after(pc, prev);
-               }
-            }
-         }
-      }
-   }
-} // newlines_chunk_pos
-
-
-void newlines_class_colon_pos(c_token_t tok)
-{
-   LOG_FUNC_ENTRY();
-
-   token_pos_e tpc;
-   token_pos_e pcc;
-   iarf_e      anc;
-   iarf_e      ncia;
-
-   if (tok == CT_CLASS_COLON)
-   {
-      tpc = options::pos_class_colon();
-      log_rule_B("pos_class_colon");
-      anc = options::nl_class_colon();
-      log_rule_B("nl_class_colon");
-      ncia = options::nl_class_init_args();
-      log_rule_B("nl_class_init_args");
-      pcc = options::pos_class_comma();
-      log_rule_B("pos_class_comma");
-   }
-   else // tok == CT_CONSTR_COLON
-   {
-      tpc = options::pos_constr_colon();
-      log_rule_B("pos_constr_colon");
-      anc = options::nl_constr_colon();
-      log_rule_B("nl_constr_colon");
-      ncia = options::nl_constr_init_args();
-      log_rule_B("nl_constr_init_args");
-      pcc = options::pos_constr_comma();
-      log_rule_B("pos_constr_comma");
-   }
-   chunk_t *ccolon  = nullptr;
-   size_t  acv_span = options::align_constr_value_span();
-
-   log_rule_B("align_constr_value_span");
-   bool       with_acv = (acv_span > 0) && language_is_set(LANG_CPP);
-   AlignStack constructorValue;    // ABC_Member(abc_value)
-
-   if (with_acv)
-   {
-      int    acv_thresh = options::align_constr_value_thresh();
-      log_rule_B("align_constr_value_thresh");
-      size_t acv_gap = options::align_constr_value_gap();
-      log_rule_B("align_constr_value_gap");
-      constructorValue.Start(acv_span, acv_thresh);
-      constructorValue.m_gap         = acv_gap;
-      constructorValue.m_right_align = !options::align_on_tabstop();
-      log_rule_B("align_on_tabstop");
-   }
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (  ccolon == nullptr
-         && chunk_is_not_token(pc, tok))
-      {
-         continue;
-      }
-      chunk_t *prev;
-      chunk_t *next;
-
-      if (chunk_is_token(pc, tok))
-      {
-         LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         ccolon = pc;
-         prev   = chunk_get_prev_nc(pc);
-         next   = chunk_get_next_nc(pc);
-
-         if (chunk_is_token(pc, CT_CONSTR_COLON))
-         {
-            LOG_FMT(LBLANKD, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            chunk_t *paren_vor_value = chunk_get_next_type(pc, CT_FPAREN_OPEN, pc->level);
-
-            if (  with_acv
-               && paren_vor_value != nullptr)
-            {
-               LOG_FMT(LBLANKD, "%s(%d): paren_vor_value->orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                       __func__, __LINE__, paren_vor_value->orig_line, paren_vor_value->orig_col,
-                       paren_vor_value->text(), get_token_name(paren_vor_value->type));
-               constructorValue.NewLines(paren_vor_value->nl_count);
-               constructorValue.Add(paren_vor_value);
-            }
-         }
-
-         if (  !chunk_is_newline(prev)
-            && !chunk_is_newline(next)
-            && (anc & IARF_ADD))                   // nl_class_colon, nl_constr_colon: 1
-
-         {
-            newline_add_after(pc);
-            prev = chunk_get_prev_nc(pc);
-            next = chunk_get_next_nc(pc);
-         }
-
-         if (anc == IARF_REMOVE)                   // nl_class_colon, nl_constr_colon: 2
-         {
-            if (  chunk_is_newline(prev)
-               && chunk_safe_to_del_nl(prev))
-            {
-               chunk_del(prev);
-               MARK_CHANGE();
-               prev = chunk_get_prev_nc(pc);
-            }
-
-            if (  chunk_is_newline(next)
-               && chunk_safe_to_del_nl(next))
-            {
-               chunk_del(next);
-               MARK_CHANGE();
-               next = chunk_get_next_nc(pc);
-            }
-         }
-
-         if (tpc & TP_TRAIL)                       // pos_class_colon, pos_constr_colon: 4
-         {
-            if (  chunk_is_newline(prev)
-               && prev->nl_count == 1
-               && chunk_safe_to_del_nl(prev))
-            {
-               chunk_swap(pc, prev);
-            }
-         }
-         else if (tpc & TP_LEAD)                   // pos_class_colon, pos_constr_colon: 3
-         {
-            if (  chunk_is_newline(next)
-               && next->nl_count == 1
-               && chunk_safe_to_del_nl(next))
-            {
-               chunk_swap(pc, next);
-            }
-         }
-      }
-      else
-      {
-         // (pc->type != tok)
-         if (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_token(pc, CT_SEMICOLON))
-         {
-            ccolon = nullptr;
-
-            if (with_acv)
-            {
-               constructorValue.End();
-            }
-            continue;
-         }
-
-         if (  chunk_is_token(pc, CT_COMMA)
-            && pc->level == ccolon->level)
-         {
-            LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            chunk_t *paren_vor_value = chunk_get_next_type(pc, CT_FPAREN_OPEN, pc->level);
-
-            if (  with_acv
-               && paren_vor_value != nullptr)
-            {
-               LOG_FMT(LBLANKD, "%s(%d): paren_vor_value->orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                       __func__, __LINE__, paren_vor_value->orig_line, paren_vor_value->orig_col,
-                       paren_vor_value->text(), get_token_name(paren_vor_value->type));
-               constructorValue.NewLines(paren_vor_value->nl_count);
-               constructorValue.Add(paren_vor_value);
-            }
-
-            if (ncia & IARF_ADD)                   // nl_class_init_args, nl_constr_init_args:
-            {
-               if (pcc & TP_TRAIL)                 // pos_class_comma, pos_constr_comma
-               {
-                  if (ncia == IARF_FORCE)          // nl_class_init_args, nl_constr_init_args: 5
-                  {
-                     chunk_t *after = chunk_get_next(pc);   // Issue #2759
-
-                     if (chunk_is_not_token(after, CT_COMMENT_CPP))
-                     {
-                        newline_force_after(pc);
-                     }
-                  }
-                  else
-                  {
-                     // (ncia == IARF_ADD)         // nl_class_init_args, nl_constr_init_args: 8
-                     newline_add_after(pc);
-                  }
-                  prev = chunk_get_prev_nc(pc);
-
-                  if (  chunk_is_newline(prev)
-                     && chunk_safe_to_del_nl(prev))
-                  {
-                     chunk_del(prev);
-                     MARK_CHANGE();
-                  }
-               }
-               else if (pcc & TP_LEAD)             // pos_class_comma, pos_constr_comma
-               {
-                  if (ncia == IARF_FORCE)          // nl_class_init_args, nl_constr_init_args: 7
-                  {
-                     newline_force_before(pc);
-                  }
-                  else
-                  {
-                     // (ncia == IARF_ADD)         // nl_class_init_args, nl_constr_init_args: 9
-                     newline_add_before(pc);
-                  }
-                  next = chunk_get_next_nc(pc);
-
-                  if (  chunk_is_newline(next)
-                     && chunk_safe_to_del_nl(next))
-                  {
-                     chunk_del(next);
-                     MARK_CHANGE();
-                  }
-               }
-            }
-            else if (ncia == IARF_REMOVE)          // nl_class_init_args, nl_constr_init_args: 6
-            {
-               next = chunk_get_next(pc);
-
-               if (  chunk_is_newline(next)
-                  && chunk_safe_to_del_nl(next))
-               {
-                  // comma is after
-                  chunk_del(next);
-                  MARK_CHANGE();
-               }
-               else
-               {
-                  prev = chunk_get_prev(pc);
-
-                  if (  chunk_is_newline(prev)
-                     && chunk_safe_to_del_nl(prev))
-                  {
-                     // comma is before
-                     chunk_del(prev);
-                     MARK_CHANGE();
-                  }
-               }
-            }
-         }
-      }
-   }
-} // newlines_class_colon_pos
-
-
-static void blank_line_max(chunk_t *pc, Option<unsigned> &opt)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-   const auto optval = opt();
-
-   if (  (optval > 0)
-      && (pc->nl_count > optval))
-   {
-      LOG_FMT(LBLANKD, "%s(%d): do_blank_lines: %s max line %zu\n",
-              __func__, __LINE__, opt.name(), pc->orig_line);
-      pc->nl_count = optval;
-      MARK_CHANGE();
-   }
-} // blank_line_max
-
-
-iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base, iarf_e fallback)
-{
-   chunk_t *const prev = chunk_get_prev_ncnnl(pc);
-
-   if (  chunk_is_token(prev, CT_ANGLE_OPEN)
-      && special != IARF_IGNORE)
-   {
-      return(special);
-   }
-   else if (base != IARF_IGNORE)
-   {
-      return(base);
-   }
-   else
-   {
-      return(fallback);
-   }
-} // newline_template_option
-
-
-bool is_func_proto_group(chunk_t *pc, c_token_t one_liner_type)
-{
-   if (  pc != nullptr
-      && options::nl_class_leave_one_liner_groups()
-      && (  chunk_is_token(pc, one_liner_type)
-         || get_chunk_parent_type(pc) == one_liner_type)
-      && pc->flags.test(PCF_IN_CLASS))
-   {
-      log_rule_B("nl_class_leave_one_liner_groups");
-
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
-      {
-         return(pc->flags.test(PCF_ONE_LINER));
-      }
-      else
-      {
-         // Find opening brace
-         pc = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
-         return(  pc != nullptr
-               && pc->flags.test(PCF_ONE_LINER));
-      }
-   }
-   return(false);
-} // is_func_proto_group
-
-
-void do_blank_lines(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
-      }
-      else
-      {
-         char copy[1000];
-         LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type));
-      }
-      LOG_FMT(LBLANK, "%s(%d): nl_count is %zu\n",
-              __func__, __LINE__, pc->nl_count);
-
-      //if (pc->type != CT_NEWLINE)
-      if (chunk_is_not_token(pc, CT_NEWLINE))
-      {
-         continue;
-      }
-      chunk_t *prev = chunk_get_prev_nc(pc);
-
-      if (prev != nullptr)
-      {
-         LOG_FMT(LBLANK, "%s(%d): prev->orig_line is %zu, prev->text() '%s', prev->type is %s\n",
-                 __func__, __LINE__, pc->orig_line,
-                 prev->text(), get_token_name(prev->type));
-
-         if (chunk_is_token(prev, CT_IGNORED))
-         {
-            continue;
-         }
-      }
-      chunk_t *next = chunk_get_next(pc);
-      chunk_t *pcmt = chunk_get_prev(pc);
-
-      bool    line_added = false;
-
-      /*
-       * If this is the first or the last token, pretend that there is an extra
-       * line. It will be removed at the end.
-       */
-      if (  pc == chunk_get_head()
-         || next == nullptr)
-      {
-         line_added = true;
-         ++pc->nl_count;
-      }
-
-      // Limit consecutive newlines
-      if (  (options::nl_max() > 0)
-         && (pc->nl_count > options::nl_max()))
-      {
-         log_rule_B("nl_max");
-         blank_line_max(pc, options::nl_max);
-      }
-
-      if (!can_increase_nl(pc))
-      {
-         LOG_FMT(LBLANKD, "%s(%d): force to 1 orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-
-         if (pc->nl_count != 1)
-         {
-            pc->nl_count = 1;
-            MARK_CHANGE();
-         }
-         continue;
-      }
-
-      // Control blanks before multi-line comments
-      if (  (options::nl_before_block_comment() > pc->nl_count)
-         && chunk_is_token(next, CT_COMMENT_MULTI))
-      {
-         log_rule_B("nl_before_block_comment");
-
-         // Don't add blanks after an open brace or a case statement
-         if (  (  prev == nullptr
-               || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_VBRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_CASE_COLON)))
-            && chunk_is_not_token(pcmt, CT_COMMENT_MULTI))    // Issue #2383
-         {
-            blank_line_set(pc, options::nl_before_block_comment);
-            log_rule_B("nl_before_block_comment");
-         }
-      }
-
-      // Control blanks before single line C comments
-      if (  (options::nl_before_c_comment() > pc->nl_count)
-         && chunk_is_token(next, CT_COMMENT))
-      {
-         log_rule_B("nl_before_c_comment");
-
-         // Don't add blanks after an open brace, a case stamement, or a comment
-         if (  (  prev == nullptr
-               || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_VBRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_CASE_COLON)))
-            && chunk_is_not_token(pcmt, CT_COMMENT))    // Issue #2383
-         {
-            blank_line_set(pc, options::nl_before_c_comment);
-            log_rule_B("nl_before_c_comment");
-         }
-      }
-
-      // Control blanks before CPP comments
-      if (  (options::nl_before_cpp_comment() > pc->nl_count)
-         && chunk_is_token(next, CT_COMMENT_CPP))
-      {
-         log_rule_B("nl_before_cpp_comment");
-
-         // Don't add blanks after an open brace or a case statement
-         if (  (  prev == nullptr
-               || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_VBRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_CASE_COLON)))
-            && chunk_is_not_token(pcmt, CT_COMMENT_CPP))    // Issue #2383
-         {
-            blank_line_set(pc, options::nl_before_cpp_comment);
-            log_rule_B("nl_before_cpp_comment");
-         }
-      }
-
-      // Control blanks before a class
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            || chunk_is_token(prev, CT_BRACE_CLOSE))
-         && get_chunk_parent_type(prev) == CT_CLASS)
-      {
-         chunk_t *start = chunk_get_prev_type(prev, CT_CLASS, prev->level);
-         chunk_t *tmp   = start;
-
-         // Is this a class template?
-         if (get_chunk_parent_type(tmp) == CT_TEMPLATE)
-         {
-            tmp = chunk_get_prev_type(tmp, CT_TEMPLATE, prev->level);
-            tmp = chunk_get_prev_nc(tmp);
-         }
-         else
-         {
-            tmp = chunk_get_prev_nc(tmp);
-
-            while (  chunk_is_token(tmp, CT_NEWLINE)
-                  && chunk_is_comment(tmp->prev))
-            {
-               tmp = chunk_get_prev_nc(tmp->prev);
-            }
-
-            if (chunk_is_token(tmp, CT_FRIEND))
-            {
-               // Account for a friend declaration
-               tmp = chunk_get_prev_nc(tmp);
-            }
-         }
-
-         while (  chunk_is_token(tmp, CT_NEWLINE)
-               && chunk_is_comment(tmp->prev))
-         {
-            tmp = chunk_get_prev_nc(tmp->prev);
-         }
-
-         if (  tmp != nullptr
-            && !start->flags.test(PCF_INCOMPLETE)
-            && options::nl_before_class() > tmp->nl_count)
-         {
-            log_rule_B("nl_before_class");
-            blank_line_set(tmp, options::nl_before_class);
-         }
-      }
-
-      if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-         && get_chunk_parent_type(prev) == CT_NAMESPACE)
-      {
-         // Control blanks before a namespace
-         chunk_t *tmp = chunk_get_prev_type(prev, CT_NAMESPACE, prev->level);
-         tmp = chunk_get_prev_nc(tmp);
-
-         while (  chunk_is_token(tmp, CT_NEWLINE)
-               && chunk_is_comment(tmp->prev))
-         {
-            tmp = chunk_get_prev_nc(tmp->prev);
-         }
-
-         if (  tmp != nullptr
-            && options::nl_before_namespace() > tmp->nl_count)
-         {
-            log_rule_B("nl_before_namespace");
-            blank_line_set(tmp, options::nl_before_namespace);
-         }
-
-         // Add blanks after namespace
-         if (options::nl_after_namespace() > pc->nl_count)
-         {
-            log_rule_B("nl_after_namespace");
-            blank_line_set(pc, options::nl_after_namespace);
-         }
-      }
-
-      // Control blanks inside empty function body
-      if (  chunk_is_token(prev, CT_BRACE_OPEN)
-         && chunk_is_token(next, CT_BRACE_CLOSE)
-         && (  get_chunk_parent_type(prev) == CT_FUNC_DEF
-            || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF)
-         && options::nl_inside_empty_func() > pc->nl_count
-         && prev->flags.test(PCF_EMPTY_BODY))
-      {
-         blank_line_set(pc, options::nl_inside_empty_func);
-         log_rule_B("nl_inside_empty_func");
-      }
-
-      // Control blanks after an access spec
-      if (  (options::nl_after_access_spec() > 0)
-         && (options::nl_after_access_spec() != pc->nl_count)
-         && chunk_is_token(prev, CT_ACCESS_COLON))
-      {
-         log_rule_B("nl_after_access_spec");
-
-         // Don't add blanks before a closing brace
-         if (  next == nullptr
-            || (  chunk_is_not_token(next, CT_BRACE_CLOSE)
-               && chunk_is_not_token(next, CT_VBRACE_CLOSE)))
-         {
-            log_rule_B("nl_after_access_spec");
-            blank_line_set(pc, options::nl_after_access_spec);
-         }
-      }
-
-      // Add blanks after function bodies
-      if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-         && (  get_chunk_parent_type(prev) == CT_FUNC_DEF
-            || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF
-            || get_chunk_parent_type(prev) == CT_OC_MSG_DECL
-            || get_chunk_parent_type(prev) == CT_ASSIGN))
-      {
-         if (prev->flags.test(PCF_ONE_LINER))
-         {
-            if (options::nl_after_func_body_one_liner() > pc->nl_count)
-            {
-               log_rule_B("nl_after_func_body_one_liner");
-               blank_line_set(pc, options::nl_after_func_body_one_liner);
-            }
-         }
-         else
-         {
-            if (  prev->flags.test(PCF_IN_CLASS)
-               && (options::nl_after_func_body_class() > 0))
-            {
-               log_rule_B("nl_after_func_body_class");
-
-               if (options::nl_after_func_body_class() != pc->nl_count)
-               {
-                  log_rule_B("nl_after_func_body_class");
-                  blank_line_set(pc, options::nl_after_func_body_class);
-               }
-            }
-            else if (options::nl_after_func_body() > 0)
-            {
-               log_rule_B("nl_after_func_body");
-
-               // Issue #1734
-               if (!(pc->prev->flags.test(PCF_IN_TRY_BLOCK)))
-               {
-                  if (options::nl_after_func_body() != pc->nl_count)
-                  {
-                     log_rule_B("nl_after_func_body");
-                     blank_line_set(pc, options::nl_after_func_body);
-                  }
-               }
-            }
-         }
-      }
-
-      // Add blanks after function prototypes
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            && get_chunk_parent_type(prev) == CT_FUNC_PROTO)
-         || is_func_proto_group(prev, CT_FUNC_DEF))
-      {
-         if (options::nl_after_func_proto() > pc->nl_count)
-         {
-            log_rule_B("nl_after_func_proto");
-            pc->nl_count = options::nl_after_func_proto();
-            MARK_CHANGE();
-         }
-
-         if (  (options::nl_after_func_proto_group() > pc->nl_count)
-            && next != nullptr
-            && get_chunk_parent_type(next) != CT_FUNC_PROTO
-            && !is_func_proto_group(next, CT_FUNC_DEF))
-         {
-            log_rule_B("nl_after_func_proto_group");
-            blank_line_set(pc, options::nl_after_func_proto_group);
-         }
-      }
-
-      // Issue #411: Add blanks after function class prototypes
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            && get_chunk_parent_type(prev) == CT_FUNC_CLASS_PROTO)
-         || is_func_proto_group(prev, CT_FUNC_CLASS_DEF))
-      {
-         if (options::nl_after_func_class_proto() > pc->nl_count)
-         {
-            log_rule_B("nl_after_func_class_proto");
-            pc->nl_count = options::nl_after_func_class_proto();
-            MARK_CHANGE();
-         }
-
-         if (  (options::nl_after_func_class_proto_group() > pc->nl_count)
-            && chunk_is_not_token(next, CT_FUNC_CLASS_PROTO)
-            && get_chunk_parent_type(next) != CT_FUNC_CLASS_PROTO
-            && !is_func_proto_group(next, CT_FUNC_CLASS_DEF))
-         {
-            log_rule_B("nl_after_func_class_proto_group");
-            blank_line_set(pc, options::nl_after_func_class_proto_group);
-         }
-      }
-
-      // Add blanks after struct/enum/union/class
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            || chunk_is_token(prev, CT_BRACE_CLOSE))
-         && (  get_chunk_parent_type(prev) == CT_STRUCT
-            || get_chunk_parent_type(prev) == CT_ENUM
-            || get_chunk_parent_type(prev) == CT_UNION
-            || get_chunk_parent_type(prev) == CT_CLASS))
-      {
-         auto &opt = (get_chunk_parent_type(prev) == CT_CLASS
-         ? options::nl_after_class
-         : options::nl_after_struct);
-         log_rule_B("nl_after_class");
-         log_rule_B("nl_after_struct");
-
-         if (opt() > pc->nl_count)
-         {
-            // Issue #1702
-            // look back if we have a variable
-            chunk_t *tmp        = pc;
-            bool    is_var_def  = false;
-            bool    is_fwd_decl = false;
-
-            while ((tmp = chunk_get_prev(tmp)) != nullptr)
-            {
-               if (tmp->level > pc->level)
-               {
-                  continue;
-               }
-               LOG_FMT(LBLANK, "%s(%d): %zu:%zu token is '%s'\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
-
-               if (tmp->flags.test(PCF_VAR_DEF))
-               {
-                  is_var_def = true;
-                  break;
-               }
-
-               if (chunk_is_token(tmp, get_chunk_parent_type(prev)))
-               {
-                  is_fwd_decl = tmp->flags.test(PCF_INCOMPLETE);
-                  break;
-               }
-            }
-            LOG_FMT(LBLANK, "%s(%d): var_def = %s, fwd_decl = %s\n",
-                    __func__, __LINE__,
-                    is_var_def ? "yes" : "no",
-                    is_fwd_decl ? "yes" : "no");
-
-            if (  !is_var_def
-               && !is_fwd_decl)
-            {
-               blank_line_set(pc, opt);
-            }
-         }
-      }
-
-      // Change blanks between a function comment and body
-      if (  (options::nl_comment_func_def() != 0)
-         && chunk_is_token(pcmt, CT_COMMENT_MULTI)
-         && get_chunk_parent_type(pcmt) == CT_COMMENT_WHOLE
-         && next != nullptr
-         && (  get_chunk_parent_type(next) == CT_FUNC_DEF
-            || get_chunk_parent_type(next) == CT_FUNC_CLASS_DEF))
-      {
-         log_rule_B("nl_comment_func_def");
-
-         if (options::nl_comment_func_def() != pc->nl_count)
-         {
-            log_rule_B("nl_comment_func_def");
-            blank_line_set(pc, options::nl_comment_func_def);
-         }
-      }
-
-      // Change blanks after a try-catch-finally block
-      if (  (options::nl_after_try_catch_finally() != 0)
-         && (options::nl_after_try_catch_finally() != pc->nl_count)
-         && prev != nullptr
-         && next != nullptr)
-      {
-         log_rule_B("nl_after_try_catch_finally");
-
-         if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-            && (  get_chunk_parent_type(prev) == CT_CATCH
-               || get_chunk_parent_type(prev) == CT_FINALLY))
-         {
-            if (  chunk_is_not_token(next, CT_BRACE_CLOSE)
-               && chunk_is_not_token(next, CT_CATCH)
-               && chunk_is_not_token(next, CT_FINALLY))
-            {
-               blank_line_set(pc, options::nl_after_try_catch_finally);
-               log_rule_B("nl_after_try_catch_finally");
-            }
-         }
-      }
-
-      // Change blanks after a try-catch-finally block
-      if (  (options::nl_between_get_set() != 0)
-         && (options::nl_between_get_set() != pc->nl_count)
-         && prev != nullptr
-         && next != nullptr)
-      {
-         log_rule_B("nl_between_get_set");
-
-         if (  get_chunk_parent_type(prev) == CT_GETSET
-            && chunk_is_not_token(next, CT_BRACE_CLOSE)
-            && (  chunk_is_token(prev, CT_BRACE_CLOSE)
-               || chunk_is_token(prev, CT_SEMICOLON)))
-         {
-            blank_line_set(pc, options::nl_between_get_set);
-            log_rule_B("nl_between_get_set");
-         }
-      }
-
-      // Change blanks after a try-catch-finally block
-      if (  (options::nl_around_cs_property() != 0)
-         && (options::nl_around_cs_property() != pc->nl_count)
-         && prev != nullptr
-         && next != nullptr)
-      {
-         log_rule_B("nl_around_cs_property");
-
-         if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(prev) == CT_CS_PROPERTY
-            && chunk_is_not_token(next, CT_BRACE_CLOSE))
-         {
-            blank_line_set(pc, options::nl_around_cs_property);
-            log_rule_B("nl_around_cs_property");
-         }
-         else if (  get_chunk_parent_type(next) == CT_CS_PROPERTY
-                 && next->flags.test(PCF_STMT_START))
-         {
-            blank_line_set(pc, options::nl_around_cs_property);
-            log_rule_B("nl_around_cs_property");
-         }
-      }
-
-      // Control blanks before an access spec
-      if (  (options::nl_before_access_spec() > 0)
-         && (options::nl_before_access_spec() != pc->nl_count)
-         && chunk_is_token(next, CT_ACCESS))
-      {
-         log_rule_B("nl_before_access_spec");
-
-         // Don't add blanks after an open brace
-         if (  prev == nullptr
-            || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-               && chunk_is_not_token(prev, CT_VBRACE_OPEN)))
-         {
-            log_rule_B("nl_before_access_spec");
-            blank_line_set(pc, options::nl_before_access_spec);
-         }
-      }
-
-      // Change blanks inside namespace braces
-      if (  (options::nl_inside_namespace() != 0)
-         && (options::nl_inside_namespace() != pc->nl_count)
-         && (  (  chunk_is_token(prev, CT_BRACE_OPEN)
-               && get_chunk_parent_type(prev) == CT_NAMESPACE)
-            || (  chunk_is_token(next, CT_BRACE_CLOSE)
-               && get_chunk_parent_type(next) == CT_NAMESPACE)))
-      {
-         log_rule_B("nl_inside_namespace");
-         blank_line_set(pc, options::nl_inside_namespace);
-      }
-
-      // Control blanks before a whole-file #ifdef
-      if (  options::nl_before_whole_file_ifdef() != 0
-         && options::nl_before_whole_file_ifdef() != pc->nl_count
-         && chunk_is_token(next, CT_PREPROC)
-         && get_chunk_parent_type(next) == CT_PP_IF
-         && ifdef_over_whole_file()
-         && next->flags.test(PCF_WF_IF))
-      {
-         log_rule_B("nl_before_whole_file_ifdef");
-         blank_line_set(pc, options::nl_before_whole_file_ifdef);
-      }
-
-      // Control blanks after a whole-file #ifdef
-      if (  options::nl_after_whole_file_ifdef() != 0
-         && options::nl_after_whole_file_ifdef() != pc->nl_count)
-      {
-         chunk_t *pp_start = chunk_get_pp_start(prev);
-
-         if (  pp_start != nullptr
-            && get_chunk_parent_type(pp_start) == CT_PP_IF
-            && ifdef_over_whole_file()
-            && pp_start->flags.test(PCF_WF_IF))
-         {
-            log_rule_B("nl_after_whole_file_ifdef");
-            blank_line_set(pc, options::nl_after_whole_file_ifdef);
-         }
-      }
-
-      // Control blanks before a whole-file #endif
-      if (  options::nl_before_whole_file_endif() != 0
-         && options::nl_before_whole_file_endif() != pc->nl_count
-         && chunk_is_token(next, CT_PREPROC)
-         && get_chunk_parent_type(next) == CT_PP_ENDIF
-         && ifdef_over_whole_file()
-         && next->flags.test(PCF_WF_ENDIF))
-      {
-         log_rule_B("nl_before_whole_file_endif");
-         blank_line_set(pc, options::nl_before_whole_file_endif);
-      }
-
-      // Control blanks after a whole-file #endif
-      if (  options::nl_after_whole_file_endif() != 0
-         && options::nl_after_whole_file_endif() != pc->nl_count)
-      {
-         chunk_t *pp_start = chunk_get_pp_start(prev);
-
-         if (  pp_start != nullptr
-            && get_chunk_parent_type(pp_start) == CT_PP_ENDIF
-            && ifdef_over_whole_file()
-            && pp_start->flags.test(PCF_WF_ENDIF))
-         {
-            log_rule_B("nl_after_whole_file_endif");
-            blank_line_set(pc, options::nl_after_whole_file_endif);
-         }
-      }
-
-      if (  line_added
-         && pc->nl_count > 1)
-      {
-         --pc->nl_count;
-      }
-      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text is '%s', nl_count is now %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), pc->nl_count);
-   }
-} // do_blank_lines
-
-
-void newlines_cleanup_dup(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc   = chunk_get_head();
-   chunk_t *next = pc;
-
-   while (pc != nullptr)
-   {
-      next = chunk_get_next(next);
-
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         && chunk_is_token(next, CT_NEWLINE))
-      {
-         next->nl_count = max(pc->nl_count, next->nl_count);
-         chunk_del(pc);
-         MARK_CHANGE();
-      }
-      pc = next;
-   }
-} // newlines_cleanup_dup
-
-
-static void newlines_enum_entries(chunk_t *open_brace, iarf_e av)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = open_brace;
-
-   while (  (pc = chunk_get_next_nc(pc)) != nullptr
-         && pc->level > open_brace->level)
-   {
-      if (  (pc->level != (open_brace->level + 1))
-         || chunk_is_not_token(pc, CT_COMMA)
-         || (  chunk_is_token(pc, CT_COMMA)
-            && pc->next != nullptr
-            && (  pc->next->type == CT_COMMENT_CPP
-               || pc->next->type == CT_COMMENT)))
-      {
-         continue;
-      }
-      newline_iarf(pc, av);
-   }
-   newline_iarf(open_brace, av);
-} // newlines_enum_entries
-
-
-static void newlines_double_space_struct_enum_union(chunk_t *open_brace)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = open_brace;
-
-   while (  (pc = chunk_get_next_nc(pc)) != nullptr
-         && pc->level > open_brace->level)
-   {
-      if (  pc->level != (open_brace->level + 1)
-         || chunk_is_not_token(pc, CT_NEWLINE))
-      {
-         continue;
-      }
-      /*
-       * If the newline is NOT after a comment or a brace open and
-       * it is before a comment, then make sure that the newline is
-       * at least doubled
-       */
-      chunk_t *prev = chunk_get_prev(pc);
-
-      if (  !chunk_is_comment(prev)
-         && chunk_is_not_token(prev, CT_BRACE_OPEN)
-         && chunk_is_comment(chunk_get_next(pc)))
-      {
-         if (pc->nl_count < 2)
-         {
-            double_newline(pc);
-         }
-      }
-   }
-} // newlines_double_space_struct_enum_union
-
-
-void annotations_newlines(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *next;
-   chunk_t *prev;
-   chunk_t *ae;   // last token of the annotation
-   chunk_t *pc = chunk_get_head();
-
-   while (  (pc = chunk_get_next_type(pc, CT_ANNOTATION, -1)) != nullptr
-         && (next = chunk_get_next_nnl(pc)) != nullptr)
-   {
-      // find the end of this annotation
-      if (chunk_is_paren_open(next))
-      {
-         // TODO: control newline between annotation and '(' ?
-         ae = chunk_skip_to_match(next);
-      }
-      else
-      {
-         ae = pc;
-      }
-
-      if (ae == nullptr)
-      {
-         break;
-      }
-      LOG_FMT(LANNOT, "%s(%d): orig_line is %zu, orig_col is %zu, annotation is '%s',  end @ orig_line %zu, orig_col %zu, is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-              ae->orig_line, ae->orig_col, ae->text());
-
-      prev = chunk_get_prev(ae);             // Issue #1845
-      LOG_FMT(LANNOT, "%s(%d): prev->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text());
-      next = chunk_get_next_nnl(ae);
-
-      if (chunk_is_token(next, CT_ANNOTATION))
-      {
-         LOG_FMT(LANNOT, "%s(%d):  -- nl_between_annotation\n",
-                 __func__, __LINE__);
-         newline_iarf(ae, options::nl_between_annotation());
-         log_rule_B("nl_between_annotation");
-      }
-
-      if (chunk_is_token(next, CT_NEWLINE))
-      {
-         if (chunk_is_token(next, CT_ANNOTATION))
-         {
-            LOG_FMT(LANNOT, "%s(%d):  -- nl_after_annotation\n",
-                    __func__, __LINE__);
-            newline_iarf(ae, options::nl_after_annotation());
-            log_rule_B("nl_after_annotation");
-         }
-      }
-   }
-} // annotations_newlines
-
-
-bool newlines_between(chunk_t *pc_start, chunk_t *pc_end, size_t &newlines, scope_e scope)
-{
-   if (  pc_start == nullptr
-      || pc_end == nullptr)
-   {
-      return(false);
-   }
-   newlines = 0;
-
-   chunk_t *it = pc_start;
-
-   for ( ; it != nullptr && it != pc_end; it = chunk_get_next(it, scope))
-   {
-      newlines += it->nl_count;
-   }
-
-   // newline count is valid if search stopped on expected chunk
-   return(it == pc_end);
-} // newlines_between
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.h
deleted file mode 100644
index cd5d61db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * @file newlines.h
- * prototypes for newlines.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef NEWLINES_H_INCLUDED
-#define NEWLINES_H_INCLUDED
-
-#include "chunk_list.h"
-
-/**
- * Double the newline, if allowed.
- */
-void double_newline(chunk_t *nl);
-
-/**
- * Remove all extra newlines.
- * Modify line breaks as needed.
- */
-void newlines_remove_newlines(void);
-
-
-/**
- * Remove all newlines that fail the checks performed by the can_increase_nl() function
- */
-void newlines_remove_disallowed();
-
-
-/** Step through all chunks, altering newlines inside parens of if/for/while/do as needed.
- * Handles the style options: nl_multi_line_sparen_open, nl_multi_line_sparen_close, nl_before_if_closing_paren
- */
-void newlines_sparens();
-
-//! Step through all chunks.
-void newlines_cleanup_braces(bool first);
-
-
-void newlines_cleanup_angles();
-
-
-//! Handle insertion/removal of blank lines before if/for/while/do and functions
-void newlines_insert_blank_lines(void);
-
-
-/**
- * Handle removal of extra blank lines in functions
- * x <= 0: do nothing, x > 0: allow max x-1 blank lines
- */
-void newlines_functions_remove_extra_blank_lines(void);
-
-
-void newlines_squeeze_ifdef(void);
-
-/**
- * In case of consecutive closing parens, which follow a newline,
- * the closing paren are altered to different lines, as per the respective opening parens.
- * In the given example, first 2 opening paren are in same line, hence the respective closing paren are put in the same line.
- * input:
- * func1(func2(
- *    func3(
- *       func4(
- *       )
- *    )
- * )
- * );
- * output:
- * func1(func2(
- *    func3(
- *       func4(
- *       )
- *    )
- * ));
- */
-void newlines_squeeze_paren_close(void);
-
-
-//! removes unnecessary newlines at start and end of a file
-void newlines_eat_start_end(void);
-
-
-/**
- * Searches for a chunk of type chunk_type and moves them, if needed.
- * Will not move tokens that are on their own line or have other than
- * exactly 1 newline before (UO_pos_comma == TRAIL) or after (UO_pos_comma == LEAD).
- * We can't remove a newline if it is right before a preprocessor.
- */
-void newlines_chunk_pos(c_token_t chunk_type, uncrustify::token_pos_e mode);
-
-
-/**
- * Searches for CT_CLASS_COLON and moves them, if needed.
- * Also breaks up the args
- */
-void newlines_class_colon_pos(c_token_t tok);
-
-
-void newlines_cleanup_dup(void);
-
-
-void annotations_newlines(void);
-
-
-void newline_after_multiline_comment(void);
-
-
-//! Handle insertion of blank lines after label colons
-void newline_after_label_colon(void);
-
-
-/**
- * Scans for newline tokens and changes the nl_count.
- * A newline token has a minimum nl_count of 1.
- * Note that a blank line is actually 2 newlines, unless the newline is the
- * first chunk.
- * So, most comparisons have +1 below.
- */
-void do_blank_lines(void);
-
-
-/**
- * Clears the PCF_ONE_LINER flag on the current line.
- * Done right before inserting a newline.
- */
-void undo_one_liner(chunk_t *pc);
-
-
-/**
- * Does a simple Ignore, Add, Remove, or Force after the given chunk
- *
- * @param pc  The chunk
- * @param av  The IARF value
- */
-void newline_iarf(chunk_t *pc, uncrustify::iarf_e av);
-
-
-/**
- * Add a newline before the chunk if there isn't already a newline present.
- * Virtual braces are skipped, as they do not contribute to the output.
- */
-chunk_t *newline_add_before(chunk_t *pc);
-
-
-/**
- * Add a newline after the chunk if there isn't already a newline present.
- * Virtual braces are skipped, as they do not contribute to the output.
- */
-chunk_t *newline_force_before(chunk_t *pc);
-
-
-chunk_t *newline_add_after(chunk_t *pc);
-
-
-chunk_t *newline_force_after(chunk_t *pc);
-
-
-/**
- * Removes any CT_NEWLINE or CT_NL_CONT between start and end.
- * Start must be before end on the chunk list.
- * If the 'PCF_IN_PREPROC' status differs between two tags, we can't remove
- * the newline.
- *
- * @param start  The starting chunk (if it is a newline, it will be removed!)
- * @param end    The ending chunk (will not be removed, even if it is a newline)
- *
- * @return true/false - removed something
- */
-void newline_del_between(chunk_t *start, chunk_t *end);
-
-
-/**
- * Add a newline between two tokens.
- * If there is already a newline between then, nothing is done.
- * Otherwise a newline is inserted.
- *
- * If end is CT_BRACE_OPEN and a comment and newline follow, then
- * the brace open is moved instead of inserting a newline.
- *
- * In this situation:
- *    if (...) { //comment
- *
- * you get:
- *    if (...)   //comment
- *    {
- */
-chunk_t *newline_add_between(chunk_t *start, chunk_t *end);
-
-
-/**
- * Counts newlines between two chunk elements
- *
- * @param  pc_start  chunk from which the counting of newlines will start
- * @param  pc_end    chunk at which the counting of newlines will end
- * @param  newlines  reference in which the amount of newlines will be written to
- *                   (will be initialized with 0)
- * @param  scope     specifies region chunks should/should not be considered.
- *
- * @return false  if pc_start or pc_end are nullptr or if pc_end is not reached
- * @return true   if above cases are not met
- */
-bool newlines_between(chunk_t *pc_start, chunk_t *pc_end, size_t &newlines, scope_e scope = scope_e::ALL);
-
-
-#endif /* NEWLINES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.cpp
deleted file mode 100644
index 6d3f7f34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.cpp
+++ /dev/null
@@ -1,1184 +0,0 @@
-/**
- * @file option.cpp
- * Parses the options from the config file.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel October 2015, 2021
- * @author  Matthew Woehlke since version 0.67
- * @license GPL v2+
- */
-
-#include "option.h"
-
-#include "keywords.h"
-#include "uncrustify.h"
-#include "uncrustify_version.h"
-
-#include <fstream>
-#include <unordered_map>
-
-#include <cctype>                    // to get std::tolower
-#include <cstdarg>                   // to get va_start, va_end
-
-
-namespace uncrustify
-{
-
-namespace
-{
-
-static const char *DOC_TEXT_END = u8R"___(
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-)___";
-
-
-std::vector<OptionGroup>                         option_groups;
-std::unordered_map<std::string, GenericOption *> option_map;
-
-#define LOG_CONFIG(...)                            \
-   do { log_config(); LOG_FMT(LNOTE, __VA_ARGS__); \
-   } while (0)
-
-
-//-----------------------------------------------------------------------------
-constexpr int option_level(int major, int minor, int patch = 0)
-{
-   return((major << 20) | (minor << 10) | (patch << 0));
-}
-
-
-//-----------------------------------------------------------------------------
-void log_config()
-{
-   // Print the name of the configuration file only once
-   static bool config_name_logged = false;
-
-   if (!config_name_logged)
-   {
-      LOG_FMT(LNOTE, "log_config: the configuration file is: %s\n",
-              cpd.filename.c_str());
-      config_name_logged = true;
-   }
-}
-
-
-//-----------------------------------------------------------------------------
-// This identity function exists so that all Option<T>::str can simply call
-// to_string(m_val); this function will be used by Option<string>
-std::string to_string(const std::string &in)
-{
-   return(in);
-}
-
-using std::to_string;
-
-
-//-----------------------------------------------------------------------------
-std::string to_lower(const char *in, std::string::size_type size = 0)
-{
-   std::string out;
-
-   if (size > 0)
-   {
-      out.reserve(size);
-   }
-
-   while (*in)
-   {
-      out += static_cast<char>(std::tolower(*in));
-      ++in;
-   }
-   return(out);
-}
-
-
-//-----------------------------------------------------------------------------
-std::string to_lower(const std::string &in)
-{
-   return(to_lower(in.data(), in.size()));
-}
-
-
-//-----------------------------------------------------------------------------
-bool is_arg_sep(int ch)
-{
-   return(  isspace(ch)
-         || ch == ','
-         || ch == '=');
-}
-
-
-//-----------------------------------------------------------------------------
-bool is_varg_sep(int ch)
-{
-   return(ch == '.');
-}
-
-
-//-----------------------------------------------------------------------------
-std::vector<std::string> split_args(std::string in, const char *filename,
-                                    bool (*is_sep)(int))
-{
-   std::vector<std::string> out;
-   std::string::size_type   n = 0;
-   std::string::size_type   k = in.size();
-
-   // Parse input string
-   while (n < k)
-   {
-      // Skip leading space
-      while (  n < k
-            && is_sep(in[n]))
-      {
-         ++n;
-      }
-
-      // Detect comments or trailing space
-      if (  n >= k
-         || in[n] == '#')
-      {
-         break;
-      }
-
-      // Detect and extract quoted string
-      if (const auto *quote = strchr("\'\"`", in[n]))
-      {
-         const auto start = ++n;
-
-         for ((void)n; in[n] != *quote; ++n)
-         {
-            if (  n < k
-               && in[n] == '\\')
-            {
-               in.erase(n, 1);
-               --k;
-            }
-
-            if (n >= k)
-            {
-               OptionWarning w{ filename };
-               w("found unterminated quoted-string");
-               return{};
-            }
-         }
-
-         out.push_back(in.substr(start, n - start));
-
-         if (  ++n < k
-            && !is_sep(in[n]))
-         {
-            OptionWarning w{ filename };
-            w("unexpected text following quoted-string");
-            return{};
-         }
-         continue;
-      }
-      // Extract anything else
-      const auto start = n;
-
-      for ((void)n;
-           (  n < k
-           && !is_sep(in[n]));
-           ++n)
-      {
-         if (in[n] == '\\')
-         {
-            in.erase(n, 1);
-            --k;
-         }
-
-         if (n >= k)
-         {
-            OptionWarning w{ filename };
-            w("found unterminated quoted-string");
-            return{};
-         }
-      }
-
-      out.push_back(in.substr(start, n - start));
-   }
-   return(out);
-} // split_args
-
-
-//-----------------------------------------------------------------------------
-bool is_path_relative(const std::string &path)
-{
-   assert(!path.empty());
-
-#ifdef WIN32
-   // Check for partition labels as indication for an absolute path
-   // 'X:\path\to\file' style absolute disk path
-   if (  path.size() > 1
-      && isalpha(path[0])
-      && path[1] == ':')
-   {
-      return(false);
-   }
-
-   // Check for double backslashs as indication for a network path
-   // '\\server\path\to\file style' absolute UNC path
-   if (  path.size() > 1
-      && path[0] == '\\'
-      && path[1] == '\\')
-   {
-      return(false);
-   }
-#endif
-
-   // Check for a slash as indication for a filename with leading path
-   // '/path/to/file' style absolute path
-   return(path[0] != '/');
-}
-
-
-//-----------------------------------------------------------------------------
-void print_description(FILE *pfile, std::string description,
-                       const char *eol_marker)
-{
-   // Descriptions always start with a '\n', so skip the first character
-   for (std::string::size_type start = 1, length = description.length();
-        (  start != std::string::npos
-        && start < length);
-        ++start)
-   {
-      // Check for empty line so we can squelch trailing whitespace
-      if (description[start] == '\n')
-      {
-         fprintf(pfile, "#%s", eol_marker);
-      }
-      else
-      {
-         const auto end = description.find('\n', start);
-         fprintf(pfile, "# %s%s",
-                 description.substr(start, end - start).c_str(), eol_marker);
-         start = end;
-      }
-   }
-}
-
-
-//-----------------------------------------------------------------------------
-bool process_option_line_compat_0_68(const std::string              &cmd,
-                                     const std::vector<std::string> &args,
-                                     const char                     *filename)
-{
-   if (cmd == "sp_cpp_lambda_paren")
-   {
-      OptionWarning w{ filename, OptionWarning::MINOR };
-      w("option '%s' is deprecated; use '%s' instead",
-        cmd.c_str(), options::sp_cpp_lambda_square_paren.name());
-
-      UNUSED(options::sp_cpp_lambda_square_paren.read(args[1].c_str()));
-      return(true);
-   }
-   return(false);
-} // process_option_line_compat_0_68
-
-
-bool process_option_line_compat_0_70(const std::string &cmd,
-                                     const char        *filename)
-{
-   if (cmd == "sp_word_brace")                     // Issue #2428
-   {
-      OptionWarning w{ filename, OptionWarning::MINOR };
-      w("option '%s' is deprecated; did you want to use '%s' instead?",
-        cmd.c_str(), options::sp_type_brace_init_lst.name());
-
-      //UNUSED(options::sp_type_brace_init_lst.read(args[1].c_str()));
-      return(true);
-   }
-   return(false);
-} // process_option_line_compat_0_70
-
-} // namespace
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<T> and helpers
-
-
-//-----------------------------------------------------------------------------
-OptionWarning::OptionWarning(const char *filename, Severity severity)
-{
-   if (severity != MINOR)
-   {
-      ++cpd.error_count;
-   }
-
-   if (cpd.line_number != 0)
-   {
-      fprintf(stderr, "%s:%u: ", filename, cpd.line_number);
-   }
-   else
-   {
-      fprintf(stderr, "%s: ", filename);
-   }
-}
-
-
-//-----------------------------------------------------------------------------
-OptionWarning::OptionWarning(const GenericOption *opt, Severity severity)
-{
-   if (severity != MINOR)
-   {
-      ++cpd.error_count;
-   }
-   fprintf(stderr, "Option<%s>: at %s:%d: ", to_string(opt->type()),
-           cpd.filename.c_str(), cpd.line_number);
-}
-
-
-//-----------------------------------------------------------------------------
-OptionWarning::~OptionWarning()
-{
-   fprintf(stderr, "\n");
-   log_flush(true);
-}
-
-
-//-----------------------------------------------------------------------------
-void OptionWarning::operator()(const char *fmt, ...)
-{
-   va_list args;
-
-   va_start(args, fmt);
-   vfprintf(stderr, fmt, args);
-   va_end(args);
-}
-
-
-//-----------------------------------------------------------------------------
-void GenericOption::warnUnexpectedValue(const char *actual) const
-{
-   OptionWarning w{ this };
-
-   auto          values = possibleValues();
-
-   if (values[1] == nullptr)
-   {
-      w("Expected %s ", *values);
-   }
-   else
-   {
-      w("Expected one of ");
-
-      while (*values)
-      {
-         w("'%s'", *values);
-
-         if (*(++values))
-         {
-            w(", ");
-         }
-      }
-   }
-   w(", for '%s'; got '%s'", name(), actual);
-}
-
-
-//-----------------------------------------------------------------------------
-void GenericOption::warnIncompatibleReference(const GenericOption *ref) const
-{
-   OptionWarning w{ this };
-
-   w("%s references option %s with incompatible type %s",
-     name(), ref->name(), to_string(ref->type()));
-}
-
-
-//-----------------------------------------------------------------------------
-template<typename T>
-bool read_enum(const char *in, Option<T> &out)
-{
-   assert(in);
-
-   if (convert_string(in, out.m_val))
-   {
-      return(true);
-   }
-
-   if (const auto *const opt = find_option(in))
-   {
-      if (opt->type() != out.type())
-      {
-         out.warnIncompatibleReference(opt);
-         return(false);
-      }
-      auto &topt = *static_cast<const Option<T> *>(opt);
-      out.m_val = topt();
-      return(true);
-   }
-   out.warnUnexpectedValue(in);
-   return(false);
-}
-
-
-//-----------------------------------------------------------------------------
-template<typename T>
-bool read_number(const char *in, Option<T> &out)
-{
-   assert(in);
-
-   char       *c;
-   const auto val = std::strtol(in, &c, 10);
-
-   if (  *c == 0
-      && out.validate(val))
-   {
-      out.m_val = static_cast<T>(val);
-      return(true);
-   }
-   bool invert = false;
-
-   if (strchr("-", in[0]))
-   {
-      invert = true;
-      ++in;
-   }
-
-   if (const auto *const opt = find_option(in))
-   {
-      LOG_CONFIG("%s(%d): line_number is %d, option(%s) %s, ref(%s) %s\n",
-                 __func__, __LINE__, cpd.line_number,
-                 to_string(out.type()), out.name(),
-                 to_string(opt->type()), opt->name());
-
-      long tval;
-
-      if (opt->type() == OT_NUM)
-      {
-         auto &sopt = *static_cast<const Option<signed> *>(opt);
-         tval = static_cast<long>(sopt());
-      }
-      else if (opt->type() == OT_UNUM)
-      {
-         auto &uopt = *static_cast<const Option<unsigned> *>(opt);
-         tval = static_cast<long>(uopt());
-      }
-      else
-      {
-         out.warnIncompatibleReference(opt);
-         return(false);
-      }
-      const auto rval = (invert ? -tval : tval);
-
-      if (out.validate(rval))
-      {
-         out.m_val = static_cast<T>(rval);
-         return(true);
-      }
-      return(false);
-   }
-   out.warnUnexpectedValue(in);
-   return(false);
-} // read_number
-
-
-//-----------------------------------------------------------------------------
-template<typename T>
-void Option<T>::reset()
-{
-   m_val = m_default;
-}
-
-
-//-----------------------------------------------------------------------------
-template<typename T>
-std::string Option<T>::str() const
-{
-   return(to_string(m_val));
-}
-
-
-//-----------------------------------------------------------------------------
-template<typename T>
-std::string Option<T>::defaultStr() const
-{
-   return(m_default != T{} ? to_string(m_default) : std::string{});
-}
-
-// Explicit instantiations
-template class Option<bool>;
-template class Option<iarf_e>;
-template class Option<line_end_e>;
-template class Option<token_pos_e>;
-template class Option<signed>;
-template class Option<unsigned>;
-template class Option<std::string>;
-
-//END Option<T> and helpers
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<bool>
-
-
-//-----------------------------------------------------------------------------
-template<>
-option_type_e Option<bool>::type() const
-{
-   return(OT_BOOL);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-const char *const *Option<bool>::possibleValues() const
-{
-   static char const *values[] = { "true", "false", nullptr };
-
-   return(values);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-bool Option<bool>::read(const char *in)
-{
-   assert(in);
-
-   if (convert_string(in, m_val))
-   {
-      return(true);
-   }
-   bool invert = false;
-
-   if (strchr("~!-", in[0]))
-   {
-      invert = true;
-      ++in;
-   }
-
-   if (const auto *const opt = find_option(in))
-   {
-      if (opt->type() != OT_BOOL)
-      {
-         warnIncompatibleReference(opt);
-         return(false);
-      }
-      auto &bopt = *static_cast<const Option<bool> *>(opt);
-      m_val = (invert ? !bopt() : bopt());
-      return(true);
-   }
-   warnUnexpectedValue(in);
-   return(false);
-}
-
-//END Option<bool>
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<iarf_e>
-
-
-//-----------------------------------------------------------------------------
-template<>
-option_type_e Option<iarf_e>::type() const
-{
-   return(OT_IARF);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-const char *const *Option<iarf_e>::possibleValues() const
-{
-   return(iarf_values);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-bool Option<iarf_e>::read(const char *in)
-{
-   return(read_enum(in, *this));
-}
-
-//END Option<iarf_e>
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<line_end_e>
-
-
-//-----------------------------------------------------------------------------
-template<>
-option_type_e Option<line_end_e>::type() const
-{
-   return(OT_LINEEND);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-const char *const *Option<line_end_e>::possibleValues() const
-{
-   return(line_end_values);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-bool Option<line_end_e>::read(const char *in)
-{
-   return(read_enum(in, *this));
-}
-
-//END Option<line_end_e>
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<token_pos_e>
-
-
-//-----------------------------------------------------------------------------
-template<>
-option_type_e Option<token_pos_e>::type() const
-{
-   return(OT_TOKENPOS);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-const char *const *Option<token_pos_e>::possibleValues() const
-{
-   return(token_pos_values);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-bool Option<token_pos_e>::read(const char *in)
-{
-   return(read_enum(in, *this));
-}
-
-//END Option<token_pos_e>
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<signed>
-
-
-//-----------------------------------------------------------------------------
-template<>
-option_type_e Option<signed>::type() const
-{
-   return(OT_NUM);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-const char *const *Option<signed>::possibleValues() const
-{
-   static char const *values[] = { "number", nullptr };
-
-   return(values);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-bool Option<signed>::read(const char *in)
-{
-   return(read_number(in, *this));
-}
-
-//END Option<signed>
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<unsigned>
-
-
-//-----------------------------------------------------------------------------
-template<>
-option_type_e Option<unsigned>::type() const
-{
-   return(OT_UNUM);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-const char *const *Option<unsigned>::possibleValues() const
-{
-   static char const *values[] = { "unsigned number", nullptr };
-
-   return(values);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-bool Option<unsigned>::read(const char *in)
-{
-   return(read_number(in, *this));
-}
-
-//END Option<unsigned>
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN Option<string>
-
-
-//-----------------------------------------------------------------------------
-template<>
-option_type_e Option<std::string>::type() const
-{
-   return(OT_STRING);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-const char *const *Option<std::string>::possibleValues() const
-{
-   static char const *values[] = { "string", nullptr };
-
-   return(values);
-}
-
-
-//-----------------------------------------------------------------------------
-template<>
-bool Option<std::string>::read(const char *in)
-{
-   m_val = in;
-   return(true);
-}
-
-//END Option<string>
-
-///////////////////////////////////////////////////////////////////////////////
-
-//BEGIN global functions for options
-
-
-//-----------------------------------------------------------------------------
-void begin_option_group(const char *description)
-{
-   auto g = OptionGroup{ description, {} };
-
-   option_groups.push_back(g);
-}
-
-
-//-----------------------------------------------------------------------------
-void register_option(GenericOption *option)
-{
-   assert(!option_groups.empty());
-
-   option_groups.back().options.push_back(option);
-   option_map.emplace(option->name(), option);
-}
-
-
-//-----------------------------------------------------------------------------
-uncrustify::GenericOption *find_option(const char *name)
-{
-   const auto iter = option_map.find(to_lower(name));
-
-   if (iter != option_map.end())
-   {
-      return(iter->second);
-   }
-   return(nullptr);
-}
-
-
-//-----------------------------------------------------------------------------
-OptionGroup *get_option_group(size_t i)
-{
-   if (i >= option_groups.size())
-   {
-      return(nullptr);
-   }
-   return(&option_groups[i]);
-}
-
-
-//-----------------------------------------------------------------------------
-size_t get_option_count()
-{
-   return(option_map.size());
-}
-
-
-//-----------------------------------------------------------------------------
-void process_option_line(const std::string &config_line, const char *filename,
-                         int &compat_level)
-{
-   // Split line into arguments, and punt if no arguments are present
-   auto args = split_args(config_line, filename, is_arg_sep);
-
-   if (args.empty())
-   {
-      return;
-   }
-   // Check for necessary arguments
-   const auto &cmd = to_lower(args.front());
-
-   if (  cmd == "set"
-      || cmd == "file_ext")
-   {
-      if (args.size() < 3)
-      {
-         OptionWarning w{ filename };
-         w("%s requires at least three arguments", cmd.c_str());
-         return;
-      }
-   }
-   else
-   {
-      if (args.size() < 2)
-      {
-         OptionWarning w{ filename };
-         w("%s requires at least two arguments", cmd.c_str());
-         return;
-      }
-   }
-
-   if (cmd == "type")
-   {
-      for (size_t i = 1; i < args.size(); ++i)
-      {
-         add_keyword(args[i], CT_TYPE);
-      }
-   }
-   else if (cmd == "macro-open")
-   {
-      add_keyword(args[1], CT_MACRO_OPEN);
-   }
-   else if (cmd == "macro-close")
-   {
-      add_keyword(args[1], CT_MACRO_CLOSE);
-   }
-   else if (cmd == "macro-else")
-   {
-      add_keyword(args[1], CT_MACRO_ELSE);
-   }
-   else if (cmd == "set")
-   {
-      const auto token = find_token_name(args[1].c_str());
-
-      if (token != CT_NONE)
-      {
-         LOG_FMT(LNOTE, "%s:%d set '%s':",
-                 filename, cpd.line_number, args[1].c_str());
-
-         for (size_t i = 2; i < args.size(); ++i)
-         {
-            LOG_FMT(LNOTE, " '%s'", args[i].c_str());
-            add_keyword(args[i], token);
-         }
-
-         LOG_FMT(LNOTE, "\n");
-      }
-      else
-      {
-         OptionWarning w{ filename };
-         w("%s: unknown type '%s'", cmd.c_str(), args[1].c_str());
-      }
-   }
-#ifndef EMSCRIPTEN
-   else if (cmd == "include")
-   {
-      auto       this_line_number = cpd.line_number;
-      const auto &include_path    = args[1];
-
-      if (include_path.empty())
-      {
-         OptionWarning w{ filename };
-         w("include: path cannot be empty");
-      }
-      else if (is_path_relative(include_path))
-      {
-         // include is a relative path to the current config file
-         unc_text ut = std::string{ filename };
-         ut.resize(static_cast<unsigned>(path_dirname_len(filename)));
-         ut.append(include_path);
-         UNUSED(load_option_file(ut.c_str(), compat_level));
-      }
-      else
-      {
-         // include is an absolute path
-         UNUSED(load_option_file(include_path.c_str(), compat_level));
-      }
-      cpd.line_number = this_line_number;
-   }
-#endif
-   else if (cmd == "file_ext")
-   {
-      auto *const lang_arg = args[1].c_str();
-
-      for (size_t i = 2; i < args.size(); ++i)
-      {
-         auto *const lang_name = extension_add(args[i].c_str(), lang_arg);
-
-         if (lang_name)
-         {
-            LOG_FMT(LNOTE, "%s:%d file_ext '%s' => '%s'\n",
-                    filename, cpd.line_number, args[i].c_str(), lang_name);
-         }
-         else
-         {
-            OptionWarning w{ filename };
-            w("file_ext: unknown language '%s'", lang_arg);
-            break;
-         }
-      }
-   }
-   else if (cmd == "using")
-   {
-      auto vargs = split_args(args[1], filename, is_varg_sep);
-
-      if (vargs.size() == 2)
-      {
-         compat_level = option_level(std::stoi(vargs[0]), std::stoi(vargs[1]));
-      }
-      else if (vargs.size() == 3)
-      {
-         compat_level = option_level(std::stoi(vargs[0]),
-                                     std::stoi(vargs[1]),
-                                     std::stoi(vargs[2]));
-      }
-      else
-      {
-         OptionWarning w{ filename };
-         w("%s requires a version number in the form MAJOR.MINOR[.PATCH]",
-           cmd.c_str());
-      }
-   }
-   else
-   {
-      // Must be a regular option = value
-      if (compat_level < option_level(0, 69))
-      {
-         if (process_option_line_compat_0_68(cmd, args, filename))
-         {
-            return;
-         }
-      }
-
-      if (compat_level < option_level(0, 71))
-      {
-         if (process_option_line_compat_0_70(cmd, filename))
-         {
-            return;
-         }
-      }
-      const auto oi = option_map.find(cmd);
-
-      if (oi == option_map.end())
-      {
-         OptionWarning w{ filename };
-         w("unknown option '%s'", args[0].c_str());
-      }
-      else
-      {
-         UNUSED(oi->second->read(args[1].c_str()));
-      }
-   }
-} // process_option_line
-
-
-//-----------------------------------------------------------------------------
-bool load_option_file(const char *filename, int compat_level)
-{
-   cpd.line_number = 0;
-
-#ifdef WIN32
-   // "/dev/null" not understood by "fopen" in Windows
-   if (strcasecmp(filename, "/dev/null") == 0)
-   {
-      return(true);
-   }
-#endif
-
-   std::ifstream in;
-   in.open(filename, std::ifstream::in);
-
-   if (!in.good())
-   {
-      OptionWarning w{ filename };
-      w("file could not be opened: %s (%d)\n",
-        strerror(errno), errno);
-      return(false);
-   }
-   // Read in the file line by line
-   std::string line;
-
-   while (std::getline(in, line))
-   {
-      ++cpd.line_number;
-      process_option_line(line, filename, compat_level);
-   }
-   return(true);
-}
-
-
-//-----------------------------------------------------------------------------
-const char *get_eol_marker()
-{
-   static char eol[3] = { 0x0A, 0x00, 0x00 };
-
-   const auto  &lines = cpd.newline.get();
-
-   for (size_t i = 0; i < lines.size(); ++i)
-   {
-      eol[i] = static_cast<char>(lines[i]);
-   }
-
-   return(eol);
-}
-
-
-//-----------------------------------------------------------------------------
-void save_option_file(FILE *pfile, bool with_doc, bool minimal)
-{
-   int        non_default_values = 0;
-   const char *eol_marker        = get_eol_marker();
-
-   fprintf(pfile, "# %s%s", UNCRUSTIFY_VERSION, eol_marker);
-
-   // Print the options by group
-   for (auto &og : option_groups)
-   {
-      bool first = true;
-
-      for (auto *option : og.options)
-      {
-         const auto val = option->str();
-
-         if (!option->isDefault())
-         {
-            ++non_default_values;
-         }
-         else if (minimal)
-         {
-            continue;
-         }
-         //....................................................................
-
-         if (with_doc)
-         {
-            assert(option->description() != nullptr);
-            assert(*option->description() != 0);
-
-            if (first)
-            {
-               fprintf(pfile, "%s#%s", eol_marker, eol_marker);
-               print_description(pfile, og.description, eol_marker);
-               fprintf(pfile, "#%s", eol_marker);
-            }
-            fprintf(pfile, "%s", eol_marker);
-            print_description(pfile, option->description(), eol_marker);
-
-            const auto ds = option->defaultStr();
-
-            if (!ds.empty())
-            {
-               fprintf(pfile, "#%s# Default: %s%s",
-                       eol_marker, ds.c_str(), eol_marker);
-            }
-         }
-         first = false;
-
-         const int name_len = static_cast<int>(strlen(option->name()));
-         const int pad      = name_len < uncrustify::limits::MAX_OPTION_NAME_LEN
-                              ? (uncrustify::limits::MAX_OPTION_NAME_LEN - name_len)
-                              : 1;
-
-         fprintf(pfile, "%s%*.s= ", option->name(), pad, " ");
-
-         if (option->type() == OT_STRING)
-         {
-            fprintf(pfile, "\"%s\"", val.c_str());
-         }
-         else
-         {
-            fprintf(pfile, "%s", val.c_str());
-         }
-
-         if (with_doc)
-         {
-            const int val_len = static_cast<int>(val.length());
-            fprintf(pfile, "%*.s # ", 8 - val_len, " ");
-
-            for (auto pv = option->possibleValues(); *pv; ++pv)
-            {
-               fprintf(pfile, "%s%s", *pv, pv[1] ? "/" : "");
-            }
-         }
-         fputs(eol_marker, pfile);
-      }
-   }
-
-   if (with_doc)
-   {
-      fprintf(pfile, "%s", DOC_TEXT_END);
-   }
-   print_keywords(pfile);    // Print custom keywords
-   print_extensions(pfile);  // Print custom file extensions
-
-   fprintf(pfile, "# option(s) with 'not default' value: %d%s#%s",
-           non_default_values, eol_marker, eol_marker);
-} // save_option_file
-
-} // namespace uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.h
deleted file mode 100644
index 4ab356b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
- * @file option.h
- * Enumerations and data types for options.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
- * @author  Matthew Woehlke since version 0.67
- * @license GPL v2+
- */
-#ifndef OPTION_H_INCLUDED
-#define OPTION_H_INCLUDED
-
-/* NOTE:
- * This file is processed by make_option_enum.py, which parses any 'enum class'
- * it finds, as well as the special macros UNC_OPTVAL_ALIAS and UNC_OPTVALS.
- *
- * The '// <PREFIX>' comment after an 'enum class' tells the script to generate
- * aliases for the enum values using the prefix that is given in the '<>'s.
- * Don't remove or alter these.
- */
-
-#include "enum_flags.h"
-
-#include <string>
-#include <vector>
-
-#include <cassert>
-
-#ifdef IGNORE // WinBase.h
-#undef IGNORE
-#endif
-
-namespace uncrustify
-{
-
-template<typename T> class Option;
-
-//-----------------------------------------------------------------------------
-// Option types
-enum class option_type_e // <OT>
-{
-   // UNC_CONVERT_INTERNAL
-   BOOL,
-   IARF,
-   LINEEND,
-   TOKENPOS,
-   NUM,
-   UNUM,
-   STRING,
-};
-
-#if 0 // Fake enumeration for make_option_enum.py
-enum class bool
-{
-   true,
-   false,
-};
-#endif
-
-//-----------------------------------------------------------------------------
-/// I/A/R/F values - these are bit fields
-enum class iarf_e // <IARF>
-{
-   IGNORE      = 0,              //! option ignores a given feature
-   ADD         = (1u << 0),      //! option adds a given feature
-   REMOVE      = (1u << 1),      //! option removes a given feature
-   FORCE       = (ADD | REMOVE), //! option forces the usage of a given feature
-   NOT_DEFINED = (1u << 2)       //! for debugging
-};
-
-UNC_DECLARE_FLAGS(iarf_flags_t, iarf_e);
-UNC_DECLARE_OPERATORS_FOR_FLAGS(iarf_flags_t);
-
-//-----------------------------------------------------------------------------
-/// Line endings
-enum class line_end_e // <LE>
-{
-   LF,   //! "\n"   typically used on Unix/Linux system
-   CRLF, //! "\r\n" typically used on Windows systems
-   CR,   //! "\r"   carriage return without newline
-   AUTO, //! keep last
-};
-constexpr auto line_end_styles = static_cast<size_t>(line_end_e::AUTO);
-
-//-----------------------------------------------------------------------------
-/// Token position - these are bit fields
-enum class token_pos_e // <TP>
-{
-   IGNORE      = 0,               //! don't change it
-   BREAK       = 1,               //! add a newline before or after the if not present
-   FORCE       = 2,               //! force a newline on one side and not the other
-   LEAD        = 4,               //! at the start of a line or leading if wrapped line
-   TRAIL       = 8,               //! at the end of a line or trailing if wrapped line
-   JOIN        = 16,              //! remove newlines on both sides
-   LEAD_BREAK  = (LEAD | BREAK),  //  5
-   LEAD_FORCE  = (LEAD | FORCE),  //  6
-   TRAIL_BREAK = (TRAIL | BREAK), //  9
-   TRAIL_FORCE = (TRAIL | FORCE), // 10
-};
-
-UNC_DECLARE_FLAGS(token_pos_flags_t, token_pos_e);
-UNC_DECLARE_OPERATORS_FOR_FLAGS(token_pos_flags_t);
-
-//-----------------------------------------------------------------------------
-/// Abstract (untyped) interface for options
-class GenericOption
-{
-public:
-   GenericOption(const char *opt_name, const char *opt_desc)
-      : m_name{opt_name}
-      , m_desc{opt_desc}
-   {}
-
-   virtual ~GenericOption() = default;
-
-   virtual option_type_e type() const = 0;
-   const char *name() const { return(m_name); }
-   const char *description() const { return(m_desc); }
-   virtual const char *const *possibleValues() const = 0;
-
-   virtual std::string defaultStr() const = 0;
-   virtual std::string minStr() const { return(std::string{}); }
-   virtual std::string maxStr() const { return(std::string{}); }
-
-   virtual bool isDefault() const = 0;
-
-   virtual void reset() = 0;
-   virtual bool read(const char *s) = 0;
-   virtual std::string str() const = 0;
-
-protected:
-   template<typename V> friend bool read_enum(const char *s, Option<V> &o);
-   template<typename V> friend bool read_number(const char *s, Option<V> &o);
-
-   void warnUnexpectedValue(const char *actual) const;
-   void warnIncompatibleReference(const GenericOption *ref) const;
-
-   const char *const m_name;
-   const char *const m_desc;
-};
-
-//-----------------------------------------------------------------------------
-// Helper class for reporting problems with options
-class OptionWarning
-{
-public:
-   enum class /* UNC_NO_META */ Severity
-   {
-      OS_CRITICAL,
-      OS_MINOR,
-   };
-
-   constexpr static auto CRITICAL = Severity::OS_CRITICAL;
-   constexpr static auto MINOR    = Severity::OS_MINOR;
-
-   OptionWarning(const char *filename, Severity = CRITICAL);
-   OptionWarning(const GenericOption *, Severity = CRITICAL);
-   OptionWarning(const OptionWarning &) = delete;
-   ~OptionWarning();
-
-#ifdef __GNUC__
-   [[gnu::format(printf, 2, 3)]]
-#endif
-   void operator()(const char *fmt, ...);
-};
-
-//-----------------------------------------------------------------------------
-// Concrete (strongly typed) interface for options
-template<typename T>
-class Option : public GenericOption
-{
-public:
-   Option(const char *opt_name, const char *opt_desc, T opt_val = T{})
-      : GenericOption{opt_name, opt_desc}
-      , m_val{opt_val}
-      , m_default{opt_val}
-   {}
-
-   option_type_e type() const override;
-   const char *const *possibleValues() const override;
-
-   std::string defaultStr() const override;
-
-   bool isDefault() const override { return(m_val == m_default); }
-
-   //! resets option to its default value
-   //- currently only used by the emscripten interface
-   virtual void reset() override;
-
-   bool read(const char *s) override;
-   std::string str() const override;
-
-   T operator()() const { return(m_val); }
-   Option &operator=(T val) { m_val = val; return(*this); }
-
-protected:
-   template<typename V> friend bool read_enum(const char *s, Option<V> &o);
-   template<typename V> friend bool read_number(const char *s, Option<V> &o);
-
-   virtual bool validate(long) { return(true); }
-
-   T m_val     = T{};
-   T m_default = T{};
-};
-
-//-----------------------------------------------------------------------------
-// Concrete (strongly typed) interface for bounded numeric options
-template<typename T, T min, T max>
-class BoundedOption : public Option<T>
-{
-public:
-   BoundedOption(const char *opt_name, const char *opt_desc, T opt_val = T{})
-      : Option<T>{opt_name, opt_desc, opt_val}
-   {
-      assert(  opt_val >= min
-            && opt_val <= max);
-   }
-
-   std::string minStr() const override { return(std::to_string(min)); }
-   std::string maxStr() const override { return(std::to_string(max)); }
-
-protected:
-   bool validate(long val) override
-   {
-      if (val < static_cast<long>(min))
-      {
-         OptionWarning w{ this };
-         w("requested value %ld for option '%s' "
-           "is less than the minimum value %ld",
-           val, this->name(), static_cast<long>(min));
-         return(false);
-      }
-
-      if (val > static_cast<long>(max))
-      {
-         OptionWarning w{ this };
-         w("requested value %ld for option '%s' "
-           "is greater than the maximum value %ld",
-           val, this->name(), static_cast<long>(max));
-         return(false);
-      }
-      return(true);
-   }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-// Declaration of option types; implementations are in option.cpp
-#define UNC_IMPLEMENT_OPTION(T)                                     \
-   template<> option_type_e Option<T>::type() const;                \
-   template<> const char *const *Option<T>::possibleValues() const; \
-   template<> bool Option<T>::read(const char *s);                  \
-   extern template class Option<T>
-
-UNC_IMPLEMENT_OPTION(bool);
-UNC_IMPLEMENT_OPTION(iarf_e);
-UNC_IMPLEMENT_OPTION(line_end_e);
-UNC_IMPLEMENT_OPTION(token_pos_e);
-UNC_IMPLEMENT_OPTION(signed);
-UNC_IMPLEMENT_OPTION(unsigned);
-UNC_IMPLEMENT_OPTION(std::string);
-
-// Additional mappings for option values
-#define UNC_OPTVAL_ALIAS(...) \
-   static_assert(true, "This is just a tag for make_option_enum.py")
-
-UNC_OPTVAL_ALIAS(bool, false, "0", "f", "n", "no");
-UNC_OPTVAL_ALIAS(bool, true, "1", "t", "y", "yes");
-UNC_OPTVAL_ALIAS(iarf_e, IGNORE, "i");
-UNC_OPTVAL_ALIAS(iarf_e, ADD, "a", "2", "t", "true", "y", "yes");
-UNC_OPTVAL_ALIAS(iarf_e, REMOVE, "r", "0", "f", "false", "n", "no");
-UNC_OPTVAL_ALIAS(iarf_e, FORCE, "f", "1");
-
-// Possible values for options, by type
-#define UNC_OPTVALS(e)    extern const char *const e ## _values[]
-UNC_OPTVALS(iarf);
-UNC_OPTVALS(line_end);
-UNC_OPTVALS(token_pos);
-
-extern bool convert_string(const char *, bool &);
-extern bool convert_string(const char *, iarf_e &);
-extern bool convert_string(const char *, line_end_e &);
-extern bool convert_string(const char *, token_pos_e &);
-
-extern const char *to_string(bool);
-extern const char *to_string(iarf_e);
-extern const char *to_string(line_end_e);
-extern const char *to_string(token_pos_e);
-extern const char *to_string(option_type_e);
-
-struct OptionGroup
-{
-   const char                   *description;
-   std::vector<GenericOption *> options;
-};
-
-
-/**
- * @brief Defines a new group of uncrustify options.
- *
- * New options are always added to the most recently defined group.
- */
-void begin_option_group(const char *description);
-
-
-/**
- * @brief Adds an uncrustify option to the global option registry.
- *
- * The option is added to the most recently defined option group.
- */
-void register_option(GenericOption *);
-
-
-GenericOption *find_option(const char *name);
-
-
-//! Add all uncrustify options to the global option registry
-void register_options(void);
-
-
-OptionGroup *get_option_group(size_t);
-
-
-size_t get_option_count();
-
-
-/**
- * processes a single line string to extract configuration settings
- * increments cpd.line_number and cpd.error_count
- *
- * @param config_line  single line string that will be processed
- * @param filename     for log messages, file from which the \p config_line
- *                     param was extracted
- * @param compat_level version of Uncrustify with which to be compatible
- */
-void process_option_line(const std::string &config_line, const char *filename, int &compat_level);
-
-
-bool load_option_file(const char *filename, int compat_level = 0);
-
-
-/**
- * save the used options into a text file
- *
- * @param pfile     file to print into
- * @param with_doc  also print description
- * @param minimal   print only options with non default value
- */
-void save_option_file(FILE *pfile, bool with_doc = false, bool minimal = false);
-
-
-/**
- * get the marker that was selected for the end of line via the config file
- *
- * @return "\n"     if newlines was set to LE_LF in the config file
- * @return "\r\n"   if newlines was set to LE_CRLF in the config file
- * @return "\r"     if newlines was set to LE_CR in the config file
- * @return "\n"     if newlines was set to LE_AUTO in the config file
- */
-const char *get_eol_marker();
-
-} // namespace uncrustify
-
-#endif /* OPTION_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.cpp.in
deleted file mode 100644
index aeb976b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.cpp.in
+++ /dev/null
@@ -1,24 +0,0 @@
-##BANNER##
-#include "options.h"
-
-#include "base_types.h"
-#include "logger.h"
-
-#include <cstdlib>
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>  // strcasecmp()
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning(disable: 4809)
-#elif __GNUC__ > 4 || __clang_major__ > 3 || __clang_minor__ > 4
-#pragma GCC diagnostic ignored "-Wswitch-bool"
-#endif
-
-namespace uncrustify
-{
-
-##VALUE_STRINGS##
-##CONVERSIONS##
-} // namespace uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.h.in
deleted file mode 100644
index e50a9281..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
-##BANNER##
-#ifndef OPTION_ENUM_H_INCLUDED
-#define OPTION_ENUM_H_INCLUDED
-
-#include "option.h"
-
-#ifdef IGNORE // WinBase.h
-#undef IGNORE
-#endif
-
-namespace uncrustify
-{
-
-##ALIASES##
-} // namespace uncrustify
-
-#endif /* OPTION_ENUM_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.cpp.in
deleted file mode 100644
index 2ee14c8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.cpp.in
+++ /dev/null
@@ -1,26 +0,0 @@
-##BANNER##
-
-#include "uncrustify_types.h"
-
-namespace uncrustify
-{
-
-//BEGIN declarations of option object instances
-
-namespace options
-{
-
-##DECLARATIONS##
-} // namespace options
-
-//END declarations of option object instances
-
-///////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-void register_options(void)
-{
-##REGISTRATIONS##
-}
-
-} // namespace uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.h
deleted file mode 100644
index 520f45c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.h
+++ /dev/null
@@ -1,3879 +0,0 @@
-/**
- * @file options.h
- * Declarations of all the options.
- *
- * September 2020
- * @author  Ben Gardner
- * @author  Guy Maurel
- * @author  Matthew Woehlke
- * @license GPL v2+
- */
-
-#ifndef OPTIONS_H_INCLUDED
-#define OPTIONS_H_INCLUDED
-
-/* NOTE:
- * This file is processed by make_options.py, and must conform to a particular
- * format. Option groups are marked by '//begin ' (in upper case; this example
- * is lower case to prevent being considered a region marker for code folding)
- * followed by the group description. Options consist of two lines of
- * declaration preceded by one or more lines of C++ comments. The comments form
- * the option description and are taken verbatim, aside from stripping the
- * leading '// '. Only comments immediately preceding an option declaration,
- * with no blank lines, are taken as part of the description, so a blank line
- * may be used to separate notations from a description.
- *
- * An option declaration is 'extern TYPE\nNAME;', optionally followed by
- * ' // = VALUE' if the option has a default value that is different from the
- * default-constructed value type of the option. The 'VALUE' must be valid C++
- * code, and is taken verbatim as an argument when creating the option's
- * instantiation. Note also that the line break, as shown, is required.
- */
-
-#include "option_enum.h"
-
-namespace uncrustify
-{
-
-namespace options
-{
-
-using std::string;
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN General options
-
-// The type of line endings.
-extern Option<line_end_e>
-newlines; // = LE_AUTO
-
-// The original size of tabs in the input.
-extern BoundedOption<unsigned, 1, 32>
-input_tab_size; // = 8
-
-// The size of tabs in the output (only used if align_with_tabs=true).
-extern BoundedOption<unsigned, 1, 32>
-output_tab_size; // = 8
-
-// The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-extern BoundedOption<unsigned, 0, 255>
-string_escape_char; // = '\\'
-
-// Alternate string escape char (usually only used for Pawn).
-// Only works right before the quote char.
-extern BoundedOption<unsigned, 0, 255>
-string_escape_char2;
-
-// Replace tab characters found in string literals with the escape sequence \t
-// instead.
-extern Option<bool>
-string_replace_tab_chars;
-
-// Allow interpreting '>=' and '>>=' as part of a template in code like
-// 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-// Improvements to template detection may make this option obsolete.
-extern Option<bool>
-tok_split_gte;
-
-// Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
-extern Option<bool>
-disable_processing_nl_cont;
-
-// Specify the marker used in comments to disable processing of part of the
-// file.
-extern Option<string>
-disable_processing_cmt; // = UNCRUSTIFY_OFF_TEXT
-
-// Specify the marker used in comments to (re)enable processing in a file.
-extern Option<string>
-enable_processing_cmt; // = UNCRUSTIFY_ON_TEXT
-
-// Enable parsing of digraphs.
-extern Option<bool>
-enable_digraphs;
-
-// Option to allow both disable_processing_cmt and enable_processing_cmt
-// strings, if specified, to be interpreted as ECMAScript regular expressions.
-// If true, a regex search will be performed within comments according to the
-// specified patterns in order to disable/enable processing.
-extern Option<bool>
-processing_cmt_as_regex;
-
-// Add or remove the UTF-8 BOM (recommend 'remove').
-extern Option<iarf_e>
-utf8_bom;
-
-// If the file contains bytes with values between 128 and 255, but is not
-// UTF-8, then output as UTF-8.
-extern Option<bool>
-utf8_byte;
-
-// Force the output encoding to UTF-8.
-extern Option<bool>
-utf8_force;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Spacing options
-
-// Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-// '<<', and so forth).
-extern Option<iarf_e>
-sp_arith;
-
-// Add or remove space around arithmetic operators '+' and '-'.
-//
-// Overrides sp_arith.
-extern Option<iarf_e>
-sp_arith_additive;
-
-// Add or remove space around assignment operator '=', '+=', etc.
-extern Option<iarf_e>
-sp_assign;
-
-// Add or remove space around '=' in C++11 lambda capture specifications.
-//
-// Overrides sp_assign.
-extern Option<iarf_e>
-sp_cpp_lambda_assign;
-
-// Add or remove space after the capture specification of a C++11 lambda when
-// an argument list is present, as in '[] <here> (int x){ ... }'.
-extern Option<iarf_e>
-sp_cpp_lambda_square_paren;
-
-// Add or remove space after the capture specification of a C++11 lambda with
-// no argument list is present, as in '[] <here> { ... }'.
-extern Option<iarf_e>
-sp_cpp_lambda_square_brace;
-
-// Add or remove space after the opening parenthesis and before the closing
-// parenthesis of a argument list of a C++11 lambda, as in
-// '[]( <here> int x <here> ){ ... }'.
-extern Option<iarf_e>
-sp_cpp_lambda_argument_list;
-
-// Add or remove space after the argument list of a C++11 lambda, as in
-// '[](int x) <here> { ... }'.
-extern Option<iarf_e>
-sp_cpp_lambda_paren_brace;
-
-// Add or remove space between a lambda body and its call operator of an
-// immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-extern Option<iarf_e>
-sp_cpp_lambda_fparen;
-
-// Add or remove space around assignment operator '=' in a prototype.
-//
-// If set to ignore, use sp_assign.
-extern Option<iarf_e>
-sp_assign_default;
-
-// Add or remove space before assignment operator '=', '+=', etc.
-//
-// Overrides sp_assign.
-extern Option<iarf_e>
-sp_before_assign;
-
-// Add or remove space after assignment operator '=', '+=', etc.
-//
-// Overrides sp_assign.
-extern Option<iarf_e>
-sp_after_assign;
-
-// Add or remove space in 'NS_ENUM ('.
-extern Option<iarf_e>
-sp_enum_paren;
-
-// Add or remove space around assignment '=' in enum.
-extern Option<iarf_e>
-sp_enum_assign;
-
-// Add or remove space before assignment '=' in enum.
-//
-// Overrides sp_enum_assign.
-extern Option<iarf_e>
-sp_enum_before_assign;
-
-// Add or remove space after assignment '=' in enum.
-//
-// Overrides sp_enum_assign.
-extern Option<iarf_e>
-sp_enum_after_assign;
-
-// Add or remove space around assignment ':' in enum.
-extern Option<iarf_e>
-sp_enum_colon;
-
-// Add or remove space around preprocessor '##' concatenation operator.
-extern Option<iarf_e>
-sp_pp_concat; // = IARF_ADD
-
-// Add or remove space after preprocessor '#' stringify operator.
-// Also affects the '#@' charizing operator.
-extern Option<iarf_e>
-sp_pp_stringify;
-
-// Add or remove space before preprocessor '#' stringify operator
-// as in '#define x(y) L#y'.
-extern Option<iarf_e>
-sp_before_pp_stringify;
-
-// Add or remove space around boolean operators '&&' and '||'.
-extern Option<iarf_e>
-sp_bool;
-
-// Add or remove space around compare operator '<', '>', '==', etc.
-extern Option<iarf_e>
-sp_compare;
-
-// Add or remove space inside '(' and ')'.
-extern Option<iarf_e>
-sp_inside_paren;
-
-// Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-extern Option<iarf_e>
-sp_paren_paren;
-
-// Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-extern Option<iarf_e>
-sp_cparen_oparen;
-
-// Whether to balance spaces inside nested parentheses.
-extern Option<bool>
-sp_balance_nested_parens;
-
-// Add or remove space between ')' and '{'.
-extern Option<iarf_e>
-sp_paren_brace;
-
-// Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-extern Option<iarf_e>
-sp_brace_brace;
-
-// Add or remove space before pointer star '*'.
-extern Option<iarf_e>
-sp_before_ptr_star;
-
-// Add or remove space before pointer star '*' that isn't followed by a
-// variable name. If set to ignore, sp_before_ptr_star is used instead.
-extern Option<iarf_e>
-sp_before_unnamed_ptr_star;
-
-// Add or remove space between pointer stars '*'.
-extern Option<iarf_e>
-sp_between_ptr_star;
-
-// Add or remove space after pointer star '*', if followed by a word.
-//
-// Overrides sp_type_func.
-extern Option<iarf_e>
-sp_after_ptr_star;
-
-// Add or remove space after pointer caret '^', if followed by a word.
-extern Option<iarf_e>
-sp_after_ptr_block_caret;
-
-// Add or remove space after pointer star '*', if followed by a qualifier.
-extern Option<iarf_e>
-sp_after_ptr_star_qualifier;
-
-// Add or remove space after a pointer star '*', if followed by a function
-// prototype or function definition.
-//
-// Overrides sp_after_ptr_star and sp_type_func.
-extern Option<iarf_e>
-sp_after_ptr_star_func;
-
-// Add or remove space after a pointer star '*', if followed by an open
-// parenthesis, as in 'void* (*)().
-extern Option<iarf_e>
-sp_ptr_star_paren;
-
-// Add or remove space before a pointer star '*', if followed by a function
-// prototype or function definition.
-extern Option<iarf_e>
-sp_before_ptr_star_func;
-
-// Add or remove space before a reference sign '&'.
-extern Option<iarf_e>
-sp_before_byref;
-
-// Add or remove space before a reference sign '&' that isn't followed by a
-// variable name. If set to ignore, sp_before_byref is used instead.
-extern Option<iarf_e>
-sp_before_unnamed_byref;
-
-// Add or remove space after reference sign '&', if followed by a word.
-//
-// Overrides sp_type_func.
-extern Option<iarf_e>
-sp_after_byref;
-
-// Add or remove space after a reference sign '&', if followed by a function
-// prototype or function definition.
-//
-// Overrides sp_after_byref and sp_type_func.
-extern Option<iarf_e>
-sp_after_byref_func;
-
-// Add or remove space before a reference sign '&', if followed by a function
-// prototype or function definition.
-extern Option<iarf_e>
-sp_before_byref_func;
-
-// Add or remove space between type and word. In cases where total removal of
-// whitespace would be a syntax error, a value of 'remove' is treated the same
-// as 'force'.
-//
-// This also affects some other instances of space following a type that are
-// not covered by other options; for example, between the return type and
-// parenthesis of a function type template argument, between the type and
-// parenthesis of an array parameter, or between 'decltype(...)' and the
-// following word.
-extern Option<iarf_e>
-sp_after_type; // = IARF_FORCE
-
-// Add or remove space between 'decltype(...)' and word,
-// brace or function call.
-extern Option<iarf_e>
-sp_after_decltype;
-
-// (D) Add or remove space before the parenthesis in the D constructs
-// 'template Foo(' and 'class Foo('.
-extern Option<iarf_e>
-sp_before_template_paren;
-
-// Add or remove space between 'template' and '<'.
-// If set to ignore, sp_before_angle is used.
-extern Option<iarf_e>
-sp_template_angle;
-
-// Add or remove space before '<'.
-extern Option<iarf_e>
-sp_before_angle;
-
-// Add or remove space inside '<' and '>'.
-extern Option<iarf_e>
-sp_inside_angle;
-
-// Add or remove space inside '<>'.
-extern Option<iarf_e>
-sp_inside_angle_empty;
-
-// Add or remove space between '>' and ':'.
-extern Option<iarf_e>
-sp_angle_colon;
-
-// Add or remove space after '>'.
-extern Option<iarf_e>
-sp_after_angle;
-
-// Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-extern Option<iarf_e>
-sp_angle_paren;
-
-// Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-extern Option<iarf_e>
-sp_angle_paren_empty;
-
-// Add or remove space between '>' and a word as in 'List<byte> m;' or
-// 'template <typename T> static ...'.
-extern Option<iarf_e>
-sp_angle_word;
-
-// Add or remove space between '>' and '>' in '>>' (template stuff).
-extern Option<iarf_e>
-sp_angle_shift; // = IARF_ADD
-
-// (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-// that sp_angle_shift cannot remove the space without this option.
-extern Option<bool>
-sp_permit_cpp11_shift;
-
-// Add or remove space before '(' of control statements ('if', 'for', 'switch',
-// 'while', etc.).
-extern Option<iarf_e>
-sp_before_sparen;
-
-// Add or remove space inside '(' and ')' of control statements.
-extern Option<iarf_e>
-sp_inside_sparen;
-
-// Add or remove space after '(' of control statements.
-//
-// Overrides sp_inside_sparen.
-extern Option<iarf_e>
-sp_inside_sparen_open;
-
-// Add or remove space before ')' of control statements.
-//
-// Overrides sp_inside_sparen.
-extern Option<iarf_e>
-sp_inside_sparen_close;
-
-// Add or remove space after ')' of control statements.
-extern Option<iarf_e>
-sp_after_sparen;
-
-// Add or remove space between ')' and '{' of of control statements.
-extern Option<iarf_e>
-sp_sparen_brace;
-
-// Add or remove space between 'do' and '{'.
-extern Option<iarf_e>
-sp_do_brace_open;
-
-// Add or remove space between '}' and 'while'.
-extern Option<iarf_e>
-sp_brace_close_while;
-
-// Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-extern Option<iarf_e>
-sp_while_paren_open;
-
-// (D) Add or remove space between 'invariant' and '('.
-extern Option<iarf_e>
-sp_invariant_paren;
-
-// (D) Add or remove space after the ')' in 'invariant (C) c'.
-extern Option<iarf_e>
-sp_after_invariant_paren;
-
-// Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-extern Option<iarf_e>
-sp_special_semi;
-
-// Add or remove space before ';'.
-extern Option<iarf_e>
-sp_before_semi; // = IARF_REMOVE
-
-// Add or remove space before ';' in non-empty 'for' statements.
-extern Option<iarf_e>
-sp_before_semi_for;
-
-// Add or remove space before a semicolon of an empty part of a for statement.
-extern Option<iarf_e>
-sp_before_semi_for_empty;
-
-// Add or remove space after ';', except when followed by a comment.
-extern Option<iarf_e>
-sp_after_semi; // = IARF_ADD
-
-// Add or remove space after ';' in non-empty 'for' statements.
-extern Option<iarf_e>
-sp_after_semi_for; // = IARF_FORCE
-
-// Add or remove space after the final semicolon of an empty part of a for
-// statement, as in 'for ( ; ; <here> )'.
-extern Option<iarf_e>
-sp_after_semi_for_empty;
-
-// Add or remove space before '[' (except '[]').
-extern Option<iarf_e>
-sp_before_square;
-
-// Add or remove space before '[' for a variable definition.
-extern Option<iarf_e>
-sp_before_vardef_square; // = IARF_REMOVE
-
-// Add or remove space before '[' for asm block.
-extern Option<iarf_e>
-sp_before_square_asm_block;
-
-// Add or remove space before '[]'.
-extern Option<iarf_e>
-sp_before_squares;
-
-// Add or remove space before C++17 structured bindings.
-extern Option<iarf_e>
-sp_cpp_before_struct_binding;
-
-// Add or remove space inside a non-empty '[' and ']'.
-extern Option<iarf_e>
-sp_inside_square;
-
-// Add or remove space inside '[]'.
-extern Option<iarf_e>
-sp_inside_square_empty;
-
-// (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-// ']'. If set to ignore, sp_inside_square is used.
-extern Option<iarf_e>
-sp_inside_square_oc_array;
-
-// Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-extern Option<iarf_e>
-sp_after_comma;
-
-// Add or remove space before ','.
-extern Option<iarf_e>
-sp_before_comma; // = IARF_REMOVE
-
-// (C#) Add or remove space between ',' and ']' in multidimensional array type
-// like 'int[,,]'.
-extern Option<iarf_e>
-sp_after_mdatype_commas;
-
-// (C#) Add or remove space between '[' and ',' in multidimensional array type
-// like 'int[,,]'.
-extern Option<iarf_e>
-sp_before_mdatype_commas;
-
-// (C#) Add or remove space between ',' in multidimensional array type
-// like 'int[,,]'.
-extern Option<iarf_e>
-sp_between_mdatype_commas;
-
-// Add or remove space between an open parenthesis and comma,
-// i.e. '(,' vs. '( ,'.
-extern Option<iarf_e>
-sp_paren_comma; // = IARF_FORCE
-
-// Add or remove space before the variadic '...' when preceded by a
-// non-punctuator.
-extern Option<iarf_e>
-sp_before_ellipsis;
-
-// Add or remove space between a type and '...'.
-extern Option<iarf_e>
-sp_type_ellipsis;
-
-// (D) Add or remove space between a type and '?'.
-extern Option<iarf_e>
-sp_type_question;
-
-// Add or remove space between ')' and '...'.
-extern Option<iarf_e>
-sp_paren_ellipsis;
-
-// Add or remove space between ')' and a qualifier such as 'const'.
-extern Option<iarf_e>
-sp_paren_qualifier;
-
-// Add or remove space between ')' and 'noexcept'.
-extern Option<iarf_e>
-sp_paren_noexcept;
-
-// Add or remove space after class ':'.
-extern Option<iarf_e>
-sp_after_class_colon;
-
-// Add or remove space before class ':'.
-extern Option<iarf_e>
-sp_before_class_colon;
-
-// Add or remove space after class constructor ':'.
-extern Option<iarf_e>
-sp_after_constr_colon;
-
-// Add or remove space before class constructor ':'.
-extern Option<iarf_e>
-sp_before_constr_colon;
-
-// Add or remove space before case ':'.
-extern Option<iarf_e>
-sp_before_case_colon; // = IARF_REMOVE
-
-// Add or remove space between 'operator' and operator sign.
-extern Option<iarf_e>
-sp_after_operator;
-
-// Add or remove space between the operator symbol and the open parenthesis, as
-// in 'operator ++('.
-extern Option<iarf_e>
-sp_after_operator_sym;
-
-// Overrides sp_after_operator_sym when the operator has no arguments, as in
-// 'operator *()'.
-extern Option<iarf_e>
-sp_after_operator_sym_empty;
-
-// Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-// '(int)a' vs. '(int) a'.
-extern Option<iarf_e>
-sp_after_cast;
-
-// Add or remove spaces inside cast parentheses.
-extern Option<iarf_e>
-sp_inside_paren_cast;
-
-// Add or remove space between the type and open parenthesis in a C++ cast,
-// i.e. 'int(exp)' vs. 'int (exp)'.
-extern Option<iarf_e>
-sp_cpp_cast_paren;
-
-// Add or remove space between 'sizeof' and '('.
-extern Option<iarf_e>
-sp_sizeof_paren;
-
-// Add or remove space between 'sizeof' and '...'.
-extern Option<iarf_e>
-sp_sizeof_ellipsis;
-
-// Add or remove space between 'sizeof...' and '('.
-extern Option<iarf_e>
-sp_sizeof_ellipsis_paren;
-
-// Add or remove space between 'decltype' and '('.
-extern Option<iarf_e>
-sp_decltype_paren;
-
-// (Pawn) Add or remove space after the tag keyword.
-extern Option<iarf_e>
-sp_after_tag;
-
-// Add or remove space inside enum '{' and '}'.
-extern Option<iarf_e>
-sp_inside_braces_enum;
-
-// Add or remove space inside struct/union '{' and '}'.
-extern Option<iarf_e>
-sp_inside_braces_struct;
-
-// (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-extern Option<iarf_e>
-sp_inside_braces_oc_dict;
-
-// Add or remove space after open brace in an unnamed temporary
-// direct-list-initialization.
-extern Option<iarf_e>
-sp_after_type_brace_init_lst_open;
-
-// Add or remove space before close brace in an unnamed temporary
-// direct-list-initialization.
-extern Option<iarf_e>
-sp_before_type_brace_init_lst_close;
-
-// Add or remove space inside an unnamed temporary direct-list-initialization.
-extern Option<iarf_e>
-sp_inside_type_brace_init_lst;
-
-// Add or remove space inside '{' and '}'.
-extern Option<iarf_e>
-sp_inside_braces;
-
-// Add or remove space inside '{}'.
-extern Option<iarf_e>
-sp_inside_braces_empty;
-
-// Add or remove space around trailing return operator '->'.
-extern Option<iarf_e>
-sp_trailing_return;
-
-// Add or remove space between return type and function name. A minimum of 1
-// is forced except for pointer return types.
-extern Option<iarf_e>
-sp_type_func;
-
-// Add or remove space between type and open brace of an unnamed temporary
-// direct-list-initialization.
-extern Option<iarf_e>
-sp_type_brace_init_lst;
-
-// Add or remove space between function name and '(' on function declaration.
-extern Option<iarf_e>
-sp_func_proto_paren;
-
-// Add or remove space between function name and '()' on function declaration
-// without parameters.
-extern Option<iarf_e>
-sp_func_proto_paren_empty;
-
-// Add or remove space between function name and '(' with a typedef specifier.
-extern Option<iarf_e>
-sp_func_type_paren;
-
-// Add or remove space between alias name and '(' of a non-pointer function type typedef.
-extern Option<iarf_e>
-sp_func_def_paren;
-
-// Add or remove space between function name and '()' on function definition
-// without parameters.
-extern Option<iarf_e>
-sp_func_def_paren_empty;
-
-// Add or remove space inside empty function '()'.
-// Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-extern Option<iarf_e>
-sp_inside_fparens;
-
-// Add or remove space inside function '(' and ')'.
-extern Option<iarf_e>
-sp_inside_fparen;
-
-// Add or remove space inside the first parentheses in a function type, as in
-// 'void (*x)(...)'.
-extern Option<iarf_e>
-sp_inside_tparen;
-
-// Add or remove space between the ')' and '(' in a function type, as in
-// 'void (*x)(...)'.
-extern Option<iarf_e>
-sp_after_tparen_close;
-
-// Add or remove space between ']' and '(' when part of a function call.
-extern Option<iarf_e>
-sp_square_fparen;
-
-// Add or remove space between ')' and '{' of function.
-extern Option<iarf_e>
-sp_fparen_brace;
-
-// Add or remove space between ')' and '{' of a function call in object
-// initialization.
-//
-// Overrides sp_fparen_brace.
-extern Option<iarf_e>
-sp_fparen_brace_initializer;
-
-// (Java) Add or remove space between ')' and '{{' of double brace initializer.
-extern Option<iarf_e>
-sp_fparen_dbrace;
-
-// Add or remove space between function name and '(' on function calls.
-extern Option<iarf_e>
-sp_func_call_paren;
-
-// Add or remove space between function name and '()' on function calls without
-// parameters. If set to ignore (the default), sp_func_call_paren is used.
-extern Option<iarf_e>
-sp_func_call_paren_empty;
-
-// Add or remove space between the user function name and '(' on function
-// calls. You need to set a keyword to be a user function in the config file,
-// like:
-//   set func_call_user tr _ i18n
-extern Option<iarf_e>
-sp_func_call_user_paren;
-
-// Add or remove space inside user function '(' and ')'.
-extern Option<iarf_e>
-sp_func_call_user_inside_fparen;
-
-// Add or remove space between nested parentheses with user functions,
-// i.e. '((' vs. '( ('.
-extern Option<iarf_e>
-sp_func_call_user_paren_paren;
-
-// Add or remove space between a constructor/destructor and the open
-// parenthesis.
-extern Option<iarf_e>
-sp_func_class_paren;
-
-// Add or remove space between a constructor without parameters or destructor
-// and '()'.
-extern Option<iarf_e>
-sp_func_class_paren_empty;
-
-// Add or remove space between 'return' and '('.
-extern Option<iarf_e>
-sp_return_paren;
-
-// Add or remove space between 'return' and '{'.
-extern Option<iarf_e>
-sp_return_brace;
-
-// Add or remove space between '__attribute__' and '('.
-extern Option<iarf_e>
-sp_attribute_paren;
-
-// Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-extern Option<iarf_e>
-sp_defined_paren;
-
-// Add or remove space between 'throw' and '(' in 'throw (something)'.
-extern Option<iarf_e>
-sp_throw_paren;
-
-// Add or remove space between 'throw' and anything other than '(' as in
-// '@throw [...];'.
-extern Option<iarf_e>
-sp_after_throw;
-
-// Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-// If set to ignore, sp_before_sparen is used.
-extern Option<iarf_e>
-sp_catch_paren;
-
-// (OC) Add or remove space between '@catch' and '('
-// in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-extern Option<iarf_e>
-sp_oc_catch_paren;
-
-// (OC) Add or remove space before Objective-C protocol list
-// as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-extern Option<iarf_e>
-sp_before_oc_proto_list;
-
-// (OC) Add or remove space between class name and '('
-// in '@interface className(categoryName)<ProtocolName>:BaseClass'
-extern Option<iarf_e>
-sp_oc_classname_paren;
-
-// (D) Add or remove space between 'version' and '('
-// in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-extern Option<iarf_e>
-sp_version_paren;
-
-// (D) Add or remove space between 'scope' and '('
-// in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-extern Option<iarf_e>
-sp_scope_paren;
-
-// Add or remove space between 'super' and '(' in 'super (something)'.
-extern Option<iarf_e>
-sp_super_paren; // = IARF_REMOVE
-
-// Add or remove space between 'this' and '(' in 'this (something)'.
-extern Option<iarf_e>
-sp_this_paren; // = IARF_REMOVE
-
-// Add or remove space between a macro name and its definition.
-extern Option<iarf_e>
-sp_macro;
-
-// Add or remove space between a macro function ')' and its definition.
-extern Option<iarf_e>
-sp_macro_func;
-
-// Add or remove space between 'else' and '{' if on the same line.
-extern Option<iarf_e>
-sp_else_brace;
-
-// Add or remove space between '}' and 'else' if on the same line.
-extern Option<iarf_e>
-sp_brace_else;
-
-// Add or remove space between '}' and the name of a typedef on the same line.
-extern Option<iarf_e>
-sp_brace_typedef;
-
-// Add or remove space before the '{' of a 'catch' statement, if the '{' and
-// 'catch' are on the same line, as in 'catch (decl) <here> {'.
-extern Option<iarf_e>
-sp_catch_brace;
-
-// (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-// and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-// If set to ignore, sp_catch_brace is used.
-extern Option<iarf_e>
-sp_oc_catch_brace;
-
-// Add or remove space between '}' and 'catch' if on the same line.
-extern Option<iarf_e>
-sp_brace_catch;
-
-// (OC) Add or remove space between '}' and '@catch' if on the same line.
-// If set to ignore, sp_brace_catch is used.
-extern Option<iarf_e>
-sp_oc_brace_catch;
-
-// Add or remove space between 'finally' and '{' if on the same line.
-extern Option<iarf_e>
-sp_finally_brace;
-
-// Add or remove space between '}' and 'finally' if on the same line.
-extern Option<iarf_e>
-sp_brace_finally;
-
-// Add or remove space between 'try' and '{' if on the same line.
-extern Option<iarf_e>
-sp_try_brace;
-
-// Add or remove space between get/set and '{' if on the same line.
-extern Option<iarf_e>
-sp_getset_brace;
-
-// Add or remove space between a variable and '{' for C++ uniform
-// initialization.
-extern Option<iarf_e>
-sp_word_brace_init_lst;
-
-// Add or remove space between a variable and '{' for a namespace.
-extern Option<iarf_e>
-sp_word_brace_ns; // = IARF_ADD
-
-// Add or remove space before the '::' operator.
-extern Option<iarf_e>
-sp_before_dc;
-
-// Add or remove space after the '::' operator.
-extern Option<iarf_e>
-sp_after_dc;
-
-// (D) Add or remove around the D named array initializer ':' operator.
-extern Option<iarf_e>
-sp_d_array_colon;
-
-// Add or remove space after the '!' (not) unary operator.
-extern Option<iarf_e>
-sp_not; // = IARF_REMOVE
-
-// Add or remove space after the '~' (invert) unary operator.
-extern Option<iarf_e>
-sp_inv; // = IARF_REMOVE
-
-// Add or remove space after the '&' (address-of) unary operator. This does not
-// affect the spacing after a '&' that is part of a type.
-extern Option<iarf_e>
-sp_addr; // = IARF_REMOVE
-
-// Add or remove space around the '.' or '->' operators.
-extern Option<iarf_e>
-sp_member; // = IARF_REMOVE
-
-// Add or remove space after the '*' (dereference) unary operator. This does
-// not affect the spacing after a '*' that is part of a type.
-extern Option<iarf_e>
-sp_deref; // = IARF_REMOVE
-
-// Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-extern Option<iarf_e>
-sp_sign; // = IARF_REMOVE
-
-// Add or remove space between '++' and '--' the word to which it is being
-// applied, as in '(--x)' or 'y++;'.
-extern Option<iarf_e>
-sp_incdec; // = IARF_REMOVE
-
-// Add or remove space before a backslash-newline at the end of a line.
-extern Option<iarf_e>
-sp_before_nl_cont; // = IARF_ADD
-
-// (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-// or '+(int) bar;'.
-extern Option<iarf_e>
-sp_after_oc_scope;
-
-// (OC) Add or remove space after the colon in message specs,
-// i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-extern Option<iarf_e>
-sp_after_oc_colon;
-
-// (OC) Add or remove space before the colon in message specs,
-// i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-extern Option<iarf_e>
-sp_before_oc_colon;
-
-// (OC) Add or remove space after the colon in immutable dictionary expression
-// 'NSDictionary *test = @{@"foo" :@"bar"};'.
-extern Option<iarf_e>
-sp_after_oc_dict_colon;
-
-// (OC) Add or remove space before the colon in immutable dictionary expression
-// 'NSDictionary *test = @{@"foo" :@"bar"};'.
-extern Option<iarf_e>
-sp_before_oc_dict_colon;
-
-// (OC) Add or remove space after the colon in message specs,
-// i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-extern Option<iarf_e>
-sp_after_send_oc_colon;
-
-// (OC) Add or remove space before the colon in message specs,
-// i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-extern Option<iarf_e>
-sp_before_send_oc_colon;
-
-// (OC) Add or remove space after the (type) in message specs,
-// i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-extern Option<iarf_e>
-sp_after_oc_type;
-
-// (OC) Add or remove space after the first (type) in message specs,
-// i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-extern Option<iarf_e>
-sp_after_oc_return_type;
-
-// (OC) Add or remove space between '@selector' and '(',
-// i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-// Also applies to '@protocol()' constructs.
-extern Option<iarf_e>
-sp_after_oc_at_sel;
-
-// (OC) Add or remove space between '@selector(x)' and the following word,
-// i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-extern Option<iarf_e>
-sp_after_oc_at_sel_parens;
-
-// (OC) Add or remove space inside '@selector' parentheses,
-// i.e. '@selector(foo)' vs. '@selector( foo )'.
-// Also applies to '@protocol()' constructs.
-extern Option<iarf_e>
-sp_inside_oc_at_sel_parens;
-
-// (OC) Add or remove space before a block pointer caret,
-// i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-extern Option<iarf_e>
-sp_before_oc_block_caret;
-
-// (OC) Add or remove space after a block pointer caret,
-// i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-extern Option<iarf_e>
-sp_after_oc_block_caret;
-
-// (OC) Add or remove space between the receiver and selector in a message,
-// as in '[receiver selector ...]'.
-extern Option<iarf_e>
-sp_after_oc_msg_receiver;
-
-// (OC) Add or remove space after '@property'.
-extern Option<iarf_e>
-sp_after_oc_property;
-
-// (OC) Add or remove space between '@synchronized' and the open parenthesis,
-// i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-extern Option<iarf_e>
-sp_after_oc_synchronized;
-
-// Add or remove space around the ':' in 'b ? t : f'.
-extern Option<iarf_e>
-sp_cond_colon;
-
-// Add or remove space before the ':' in 'b ? t : f'.
-//
-// Overrides sp_cond_colon.
-extern Option<iarf_e>
-sp_cond_colon_before;
-
-// Add or remove space after the ':' in 'b ? t : f'.
-//
-// Overrides sp_cond_colon.
-extern Option<iarf_e>
-sp_cond_colon_after;
-
-// Add or remove space around the '?' in 'b ? t : f'.
-extern Option<iarf_e>
-sp_cond_question;
-
-// Add or remove space before the '?' in 'b ? t : f'.
-//
-// Overrides sp_cond_question.
-extern Option<iarf_e>
-sp_cond_question_before;
-
-// Add or remove space after the '?' in 'b ? t : f'.
-//
-// Overrides sp_cond_question.
-extern Option<iarf_e>
-sp_cond_question_after;
-
-// In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-// and ':'.
-//
-// Overrides all other sp_cond_* options.
-extern Option<iarf_e>
-sp_cond_ternary_short;
-
-// Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-// sense here.
-extern Option<iarf_e>
-sp_case_label;
-
-// (D) Add or remove space around the D '..' operator.
-extern Option<iarf_e>
-sp_range;
-
-// Add or remove space after ':' in a Java/C++11 range-based 'for',
-// as in 'for (Type var : <here> expr)'.
-extern Option<iarf_e>
-sp_after_for_colon;
-
-// Add or remove space before ':' in a Java/C++11 range-based 'for',
-// as in 'for (Type var <here> : expr)'.
-extern Option<iarf_e>
-sp_before_for_colon;
-
-// (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
-extern Option<iarf_e>
-sp_extern_paren;
-
-// Add or remove space after the opening of a C++ comment, as in '// <here> A'.
-extern Option<iarf_e>
-sp_cmt_cpp_start;
-
-// Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
-// A region marker is defined as a comment which is not preceded by other text
-// (i.e. the comment is the first non-whitespace on the line), and which starts
-// with either 'BEGIN' or 'END'.
-//
-// Overrides sp_cmt_cpp_start.
-extern Option<iarf_e>
-sp_cmt_cpp_region;
-
-// If true, space added with sp_cmt_cpp_start will be added after Doxygen
-// sequences like '///', '///<', '//!' and '//!<'.
-extern Option<bool>
-sp_cmt_cpp_doxygen;
-
-// If true, space added with sp_cmt_cpp_start will be added after Qt translator
-// or meta-data comments like '//:', '//=', and '//~'.
-extern Option<bool>
-sp_cmt_cpp_qttr;
-
-// Add or remove space between #else or #endif and a trailing comment.
-extern Option<iarf_e>
-sp_endif_cmt;
-
-// Add or remove space after 'new', 'delete' and 'delete[]'.
-extern Option<iarf_e>
-sp_after_new;
-
-// Add or remove space between 'new' and '(' in 'new()'.
-extern Option<iarf_e>
-sp_between_new_paren;
-
-// Add or remove space between ')' and type in 'new(foo) BAR'.
-extern Option<iarf_e>
-sp_after_newop_paren;
-
-// Add or remove space inside parenthesis of the new operator
-// as in 'new(foo) BAR'.
-extern Option<iarf_e>
-sp_inside_newop_paren;
-
-// Add or remove space after the open parenthesis of the new operator,
-// as in 'new(foo) BAR'.
-//
-// Overrides sp_inside_newop_paren.
-extern Option<iarf_e>
-sp_inside_newop_paren_open;
-
-// Add or remove space before the close parenthesis of the new operator,
-// as in 'new(foo) BAR'.
-//
-// Overrides sp_inside_newop_paren.
-extern Option<iarf_e>
-sp_inside_newop_paren_close;
-
-// Add or remove space before a trailing or embedded comment.
-extern Option<iarf_e>
-sp_before_tr_emb_cmt;
-
-// Number of spaces before a trailing or embedded comment.
-extern BoundedOption<unsigned, 0, 16>
-sp_num_before_tr_emb_cmt;
-
-// (Java) Add or remove space between an annotation and the open parenthesis.
-extern Option<iarf_e>
-sp_annotation_paren;
-
-// If true, vbrace tokens are dropped to the previous token and skipped.
-extern Option<bool>
-sp_skip_vbrace_tokens;
-
-// Add or remove space after 'noexcept'.
-extern Option<iarf_e>
-sp_after_noexcept;
-
-// Add or remove space after '_'.
-extern Option<iarf_e>
-sp_vala_after_translation;
-
-// If true, a <TAB> is inserted after #define.
-extern Option<bool>
-force_tab_after_define;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Indenting options
-
-// The number of columns to indent per level. Usually 2, 3, 4, or 8.
-extern BoundedOption<unsigned, 0, 16>
-indent_columns; // = 8
-
-// The continuation indent. If non-zero, this overrides the indent of '(', '['
-// and '=' continuation indents. Negative values are OK; negative value is
-// absolute and not increased for each '(' or '[' level.
-//
-// For FreeBSD, this is set to 4.
-extern BoundedOption<signed, -16, 16>
-indent_continue;
-
-// The continuation indent, only for class header line(s). If non-zero, this
-// overrides the indent of 'class' continuation indents.
-extern BoundedOption<unsigned, 0, 16>
-indent_continue_class_head;
-
-// Whether to indent empty lines (i.e. lines which contain only spaces before
-// the newline character).
-extern Option<bool>
-indent_single_newlines;
-
-// The continuation indent for func_*_param if they are true. If non-zero, this
-// overrides the indent.
-extern BoundedOption<unsigned, 0, 16>
-indent_param;
-
-// How to use tabs when indenting code.
-//
-// 0: Spaces only
-// 1: Indent with tabs to brace level, align with spaces (default)
-// 2: Indent and align with tabs, using spaces when not on a tabstop
-extern BoundedOption<unsigned, 0, 2>
-indent_with_tabs; // = 1
-
-// Whether to indent comments that are not at a brace level with tabs on a
-// tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-extern Option<bool>
-indent_cmt_with_tabs;
-
-// Whether to indent strings broken by '\' so that they line up.
-extern Option<bool>
-indent_align_string;
-
-// The number of spaces to indent multi-line XML strings.
-// Requires indent_align_string=true.
-extern BoundedOption<unsigned, 0, 16>
-indent_xml_string;
-
-// Spaces to indent '{' from level.
-extern BoundedOption<unsigned, 0, 16>
-indent_brace;
-
-// Whether braces are indented to the body level.
-extern Option<bool>
-indent_braces;
-
-// Whether to disable indenting function braces if indent_braces=true.
-extern Option<bool>
-indent_braces_no_func;
-
-// Whether to disable indenting class braces if indent_braces=true.
-extern Option<bool>
-indent_braces_no_class;
-
-// Whether to disable indenting struct braces if indent_braces=true.
-extern Option<bool>
-indent_braces_no_struct;
-
-// Whether to indent based on the size of the brace parent,
-// i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-extern Option<bool>
-indent_brace_parent;
-
-// Whether to indent based on the open parenthesis instead of the open brace
-// in '({\n'.
-extern Option<bool>
-indent_paren_open_brace;
-
-// (C#) Whether to indent the brace of a C# delegate by another level.
-extern Option<bool>
-indent_cs_delegate_brace;
-
-// (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-// another level.
-extern Option<bool>
-indent_cs_delegate_body;
-
-// Whether to indent the body of a 'namespace'.
-extern Option<bool>
-indent_namespace;
-
-// Whether to indent only the first namespace, and not any nested namespaces.
-// Requires indent_namespace=true.
-extern Option<bool>
-indent_namespace_single_indent;
-
-// The number of spaces to indent a namespace block.
-// If set to zero, use the value indent_columns
-extern BoundedOption<unsigned, 0, 16>
-indent_namespace_level;
-
-// If the body of the namespace is longer than this number, it won't be
-// indented. Requires indent_namespace=true. 0 means no limit.
-extern BoundedOption<unsigned, 0, 255>
-indent_namespace_limit;
-
-// Whether the 'extern "C"' body is indented.
-extern Option<bool>
-indent_extern;
-
-// Whether the 'class' body is indented.
-extern Option<bool>
-indent_class;
-
-// Additional indent before the leading base class colon.
-// Negative values decrease indent down to the first column.
-// Requires a newline break before colon (see pos_class_colon
-// and nl_class_colon)
-extern BoundedOption<signed, -16, 16>
-indent_before_class_colon;
-
-// Whether to indent the stuff after a leading base class colon.
-extern Option<bool>
-indent_class_colon;
-
-// Whether to indent based on a class colon instead of the stuff after the
-// colon. Requires indent_class_colon=true.
-extern Option<bool>
-indent_class_on_colon;
-
-// Whether to indent the stuff after a leading class initializer colon.
-extern Option<bool>
-indent_constr_colon;
-
-// Virtual indent from the ':' for member initializers.
-extern BoundedOption<unsigned, 0, 16>
-indent_ctor_init_leading; // = 2
-
-// Additional indent for constructor initializer list.
-// Negative values decrease indent down to the first column.
-extern BoundedOption<signed, -16, 16>
-indent_ctor_init;
-
-// Whether to indent 'if' following 'else' as a new block under the 'else'.
-// If false, 'else\nif' is treated as 'else if' for indenting purposes.
-extern Option<bool>
-indent_else_if;
-
-// Amount to indent variable declarations after a open brace.
-//
-//  <0: Relative
-// >=0: Absolute
-extern BoundedOption<signed, -16, 16>
-indent_var_def_blk;
-
-// Whether to indent continued variable declarations instead of aligning.
-extern Option<bool>
-indent_var_def_cont;
-
-// Whether to indent continued shift expressions ('<<' and '>>') instead of
-// aligning. Set align_left_shift=false when enabling this.
-extern Option<bool>
-indent_shift;
-
-// Whether to force indentation of function definitions to start in column 1.
-extern Option<bool>
-indent_func_def_force_col1;
-
-// Whether to indent continued function call parameters one indent level,
-// rather than aligning parameters under the open parenthesis.
-extern Option<bool>
-indent_func_call_param;
-
-// Whether to indent continued function definition parameters one indent level,
-// rather than aligning parameters under the open parenthesis.
-extern Option<bool>
-indent_func_def_param;
-
-// for function definitions, only if indent_func_def_param is false
-// Allows to align params when appropriate and indent them when not
-// behave as if it was true if paren position is more than this value
-// if paren position is more than the option value
-extern BoundedOption<unsigned, 0, 160>
-indent_func_def_param_paren_pos_threshold;
-
-// Whether to indent continued function call prototype one indent level,
-// rather than aligning parameters under the open parenthesis.
-extern Option<bool>
-indent_func_proto_param;
-
-// Whether to indent continued function call declaration one indent level,
-// rather than aligning parameters under the open parenthesis.
-extern Option<bool>
-indent_func_class_param;
-
-// Whether to indent continued class variable constructors one indent level,
-// rather than aligning parameters under the open parenthesis.
-extern Option<bool>
-indent_func_ctor_var_param;
-
-// Whether to indent continued template parameter list one indent level,
-// rather than aligning parameters under the open parenthesis.
-extern Option<bool>
-indent_template_param;
-
-// Double the indent for indent_func_xxx_param options.
-// Use both values of the options indent_columns and indent_param.
-extern Option<bool>
-indent_func_param_double;
-
-// Indentation column for standalone 'const' qualifier on a function
-// prototype.
-extern BoundedOption<unsigned, 0, 69>
-indent_func_const;
-
-// Indentation column for standalone 'throw' qualifier on a function
-// prototype.
-extern BoundedOption<unsigned, 0, 41>
-indent_func_throw;
-
-// How to indent within a macro followed by a brace on the same line
-// This allows reducing the indent in macros that have (for example)
-// `do { ... } while (0)` blocks bracketing them.
-//
-// true:  add an indent for the brace on the same line as the macro
-// false: do not add an indent for the brace on the same line as the macro
-extern Option<bool>
-indent_macro_brace; // = true
-
-// The number of spaces to indent a continued '->' or '.'.
-// Usually set to 0, 1, or indent_columns.
-extern BoundedOption<unsigned, 0, 16>
-indent_member;
-
-// Whether lines broken at '.' or '->' should be indented by a single indent.
-// The indent_member option will not be effective if this is set to true.
-extern Option<bool>
-indent_member_single;
-
-// Spaces to indent single line ('//') comments on lines before code.
-extern BoundedOption<unsigned, 0, 16>
-indent_sing_line_comments;
-
-// When opening a paren for a control statement (if, for, while, etc), increase
-// the indent level by this value. Negative values decrease the indent level.
-extern BoundedOption<signed, -16, 16>
-indent_sparen_extra;
-
-// Whether to indent trailing single line ('//') comments relative to the code
-// instead of trying to keep the same absolute column.
-extern Option<bool>
-indent_relative_single_line_comments;
-
-// Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-// It might wise to choose the same value for the option indent_case_brace.
-extern BoundedOption<unsigned, 0, 16>
-indent_switch_case;
-
-// Spaces to indent '{' from 'case'. By default, the brace will appear under
-// the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-// It might wise to choose the same value for the option indent_switch_case.
-extern BoundedOption<signed, -16, 16>
-indent_case_brace;
-
-// indent 'break' with 'case' from 'switch'.
-extern Option<bool>
-indent_switch_break_with_case;
-
-// Whether to indent preprocessor statements inside of switch statements.
-extern Option<bool>
-indent_switch_pp; // = true
-
-// Spaces to shift the 'case' line, without affecting any other lines.
-// Usually 0.
-extern BoundedOption<unsigned, 0, 16>
-indent_case_shift;
-
-// Whether to indent comments found in first column.
-extern Option<bool>
-indent_col1_comment;
-
-// Whether to indent multi string literal in first column.
-extern Option<bool>
-indent_col1_multi_string_literal;
-
-// How to indent goto labels.
-//
-//  >0: Absolute column where 1 is the leftmost column
-// <=0: Subtract from brace indent
-extern BoundedOption<signed, -16, 16>
-indent_label; // = 1
-
-// How to indent access specifiers that are followed by a
-// colon.
-//
-//  >0: Absolute column where 1 is the leftmost column
-// <=0: Subtract from brace indent
-extern BoundedOption<signed, -16, 16>
-indent_access_spec; // = 1
-
-// Whether to indent the code after an access specifier by one level.
-// If true, this option forces 'indent_access_spec=0'.
-extern Option<bool>
-indent_access_spec_body;
-
-// If an open parenthesis is followed by a newline, whether to indent the next
-// line so that it lines up after the open parenthesis (not recommended).
-extern Option<bool>
-indent_paren_nl;
-
-// How to indent a close parenthesis after a newline.
-//
-// 0: Indent to body level (default)
-// 1: Align under the open parenthesis
-// 2: Indent to the brace level
-extern BoundedOption<unsigned, 0, 2>
-indent_paren_close;
-
-// Whether to indent the open parenthesis of a function definition,
-// if the parenthesis is on its own line.
-extern Option<bool>
-indent_paren_after_func_def;
-
-// Whether to indent the open parenthesis of a function declaration,
-// if the parenthesis is on its own line.
-extern Option<bool>
-indent_paren_after_func_decl;
-
-// Whether to indent the open parenthesis of a function call,
-// if the parenthesis is on its own line.
-extern Option<bool>
-indent_paren_after_func_call;
-
-// Whether to indent a comma when inside a brace.
-// If true, aligns under the open brace.
-extern Option<bool>
-indent_comma_brace;
-
-// Whether to indent a comma when inside a parenthesis.
-// If true, aligns under the open parenthesis.
-extern Option<bool>
-indent_comma_paren;
-
-// Whether to indent a Boolean operator when inside a parenthesis.
-// If true, aligns under the open parenthesis.
-extern Option<bool>
-indent_bool_paren;
-
-// Whether to indent a semicolon when inside a for parenthesis.
-// If true, aligns under the open for parenthesis.
-extern Option<bool>
-indent_semicolon_for_paren;
-
-// Whether to align the first expression to following ones
-// if indent_bool_paren=true.
-extern Option<bool>
-indent_first_bool_expr;
-
-// Whether to align the first expression to following ones
-// if indent_semicolon_for_paren=true.
-extern Option<bool>
-indent_first_for_expr;
-
-// If an open square is followed by a newline, whether to indent the next line
-// so that it lines up after the open square (not recommended).
-extern Option<bool>
-indent_square_nl;
-
-// (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-extern Option<bool>
-indent_preserve_sql;
-
-// Whether to align continued statements at the '='. If false or if the '=' is
-// followed by a newline, the next line is indent one tab.
-extern Option<bool>
-indent_align_assign; // = true
-
-// If true, the indentation of the chunks after a '=' sequence will be set at
-// LHS token indentation column before '='.
-extern Option<bool>
-indent_off_after_assign;
-
-// Whether to align continued statements at the '('. If false or the '(' is
-// followed by a newline, the next line indent is one tab.
-extern Option<bool>
-indent_align_paren; // = true
-
-// (OC) Whether to indent Objective-C code inside message selectors.
-extern Option<bool>
-indent_oc_inside_msg_sel;
-
-// (OC) Whether to indent Objective-C blocks at brace level instead of usual
-// rules.
-extern Option<bool>
-indent_oc_block;
-
-// (OC) Indent for Objective-C blocks in a message relative to the parameter
-// name.
-//
-// =0: Use indent_oc_block rules
-// >0: Use specified number of spaces to indent
-extern BoundedOption<unsigned, 0, 16>
-indent_oc_block_msg;
-
-// (OC) Minimum indent for subsequent parameters
-extern BoundedOption<unsigned, 0, 5000>
-indent_oc_msg_colon;
-
-// (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-// from lines, if necessary).
-extern Option<bool>
-indent_oc_msg_prioritize_first_colon; // = true
-
-// (OC) Whether to indent blocks the way that Xcode does by default
-// (from the keyword if the parameter is on its own line; otherwise, from the
-// previous indentation level). Requires indent_oc_block_msg=true.
-extern Option<bool>
-indent_oc_block_msg_xcode_style;
-
-// (OC) Whether to indent blocks from where the brace is, relative to a
-// message keyword. Requires indent_oc_block_msg=true.
-extern Option<bool>
-indent_oc_block_msg_from_keyword;
-
-// (OC) Whether to indent blocks from where the brace is, relative to a message
-// colon. Requires indent_oc_block_msg=true.
-extern Option<bool>
-indent_oc_block_msg_from_colon;
-
-// (OC) Whether to indent blocks from where the block caret is.
-// Requires indent_oc_block_msg=true.
-extern Option<bool>
-indent_oc_block_msg_from_caret;
-
-// (OC) Whether to indent blocks from where the brace caret is.
-// Requires indent_oc_block_msg=true.
-extern Option<bool>
-indent_oc_block_msg_from_brace;
-
-// When indenting after virtual brace open and newline add further spaces to
-// reach this minimum indent.
-extern BoundedOption<unsigned, 0, 16>
-indent_min_vbrace_open;
-
-// Whether to add further spaces after regular indent to reach next tabstop
-// when indenting after virtual brace open and newline.
-extern Option<bool>
-indent_vbrace_open_on_tabstop;
-
-// How to indent after a brace followed by another token (not a newline).
-// true:  indent all contained lines to match the token
-// false: indent all contained lines to match the brace
-extern Option<bool>
-indent_token_after_brace; // = true
-
-// Whether to indent the body of a C++11 lambda.
-extern Option<bool>
-indent_cpp_lambda_body;
-
-// How to indent compound literals that are being returned.
-// true: add both the indent from return & the compound literal open brace
-//       (i.e. 2 indent levels)
-// false: only indent 1 level, don't add the indent for the open brace, only
-//        add the indent for the return.
-extern Option<bool>
-indent_compound_literal_return; // = true
-
-// (C#) Whether to indent a 'using' block if no braces are used.
-extern Option<bool>
-indent_using_block; // = true
-
-// How to indent the continuation of ternary operator.
-//
-// 0: Off (default)
-// 1: When the `if_false` is a continuation, indent it under `if_false`
-// 2: When the `:` is a continuation, indent it under `?`
-extern BoundedOption<unsigned, 0, 2>
-indent_ternary_operator;
-
-// Whether to indent the statements inside ternary operator.
-extern Option<bool>
-indent_inside_ternary_operator;
-
-// If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-extern Option<bool>
-indent_off_after_return;
-
-// If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-extern Option<bool>
-indent_off_after_return_new;
-
-// If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-extern Option<bool>
-indent_single_after_return;
-
-// Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-// have their own indentation).
-extern Option<bool>
-indent_ignore_asm_block;
-
-// Don't indent the close parenthesis of a function definition,
-// if the parenthesis is on its own line.
-extern Option<bool>
-donot_indent_func_def_close_paren;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Newline adding and removing options
-
-// Whether to collapse empty blocks between '{' and '}'.
-// If true, overrides nl_inside_empty_func
-extern Option<bool>
-nl_collapse_empty_body;
-
-// Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-extern Option<bool>
-nl_assign_leave_one_liners;
-
-// Don't split one-line braced statements inside a 'class xx { }' body.
-extern Option<bool>
-nl_class_leave_one_liners;
-
-// Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-extern Option<bool>
-nl_enum_leave_one_liners;
-
-// Don't split one-line get or set functions.
-extern Option<bool>
-nl_getset_leave_one_liners;
-
-// (C#) Don't split one-line property get or set functions.
-extern Option<bool>
-nl_cs_property_leave_one_liners;
-
-// Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-// might modify nl_func_type_name
-extern Option<bool>
-nl_func_leave_one_liners;
-
-// Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-extern Option<bool>
-nl_cpp_lambda_leave_one_liners;
-
-// Don't split one-line if/else statements, as in 'if(...) b++;'.
-extern Option<bool>
-nl_if_leave_one_liners;
-
-// Don't split one-line while statements, as in 'while(...) b++;'.
-extern Option<bool>
-nl_while_leave_one_liners;
-
-// Don't split one-line do statements, as in 'do { b++; } while(...);'.
-extern Option<bool>
-nl_do_leave_one_liners;
-
-// Don't split one-line for statements, as in 'for(...) b++;'.
-extern Option<bool>
-nl_for_leave_one_liners;
-
-// (OC) Don't split one-line Objective-C messages.
-extern Option<bool>
-nl_oc_msg_leave_one_liner;
-
-// (OC) Add or remove newline between method declaration and '{'.
-extern Option<iarf_e>
-nl_oc_mdef_brace;
-
-// (OC) Add or remove newline between Objective-C block signature and '{'.
-extern Option<iarf_e>
-nl_oc_block_brace;
-
-// (OC) Add or remove blank line before '@interface' statement.
-extern Option<iarf_e>
-nl_oc_before_interface;
-
-// (OC) Add or remove blank line before '@implementation' statement.
-extern Option<iarf_e>
-nl_oc_before_implementation;
-
-// (OC) Add or remove blank line before '@end' statement.
-extern Option<iarf_e>
-nl_oc_before_end;
-
-// (OC) Add or remove newline between '@interface' and '{'.
-extern Option<iarf_e>
-nl_oc_interface_brace;
-
-// (OC) Add or remove newline between '@implementation' and '{'.
-extern Option<iarf_e>
-nl_oc_implementation_brace;
-
-// Add or remove newlines at the start of the file.
-extern Option<iarf_e>
-nl_start_of_file;
-
-// The minimum number of newlines at the start of the file (only used if
-// nl_start_of_file is 'add' or 'force').
-extern BoundedOption<unsigned, 0, 16>
-nl_start_of_file_min;
-
-// Add or remove newline at the end of the file.
-extern Option<iarf_e>
-nl_end_of_file;
-
-// The minimum number of newlines at the end of the file (only used if
-// nl_end_of_file is 'add' or 'force').
-extern BoundedOption<unsigned, 0, 16>
-nl_end_of_file_min;
-
-// Add or remove newline between '=' and '{'.
-extern Option<iarf_e>
-nl_assign_brace;
-
-// (D) Add or remove newline between '=' and '['.
-extern Option<iarf_e>
-nl_assign_square;
-
-// Add or remove newline between '[]' and '{'.
-extern Option<iarf_e>
-nl_tsquare_brace;
-
-// (D) Add or remove newline after '= ['. Will also affect the newline before
-// the ']'.
-extern Option<iarf_e>
-nl_after_square_assign;
-
-// Add or remove newline between a function call's ')' and '{', as in
-// 'list_for_each(item, &list) { }'.
-extern Option<iarf_e>
-nl_fcall_brace;
-
-// Add or remove newline between 'enum' and '{'.
-extern Option<iarf_e>
-nl_enum_brace;
-
-// Add or remove newline between 'enum' and 'class'.
-extern Option<iarf_e>
-nl_enum_class;
-
-// Add or remove newline between 'enum class' and the identifier.
-extern Option<iarf_e>
-nl_enum_class_identifier;
-
-// Add or remove newline between 'enum class' type and ':'.
-extern Option<iarf_e>
-nl_enum_identifier_colon;
-
-// Add or remove newline between 'enum class identifier :' and type.
-extern Option<iarf_e>
-nl_enum_colon_type;
-
-// Add or remove newline between 'struct and '{'.
-extern Option<iarf_e>
-nl_struct_brace;
-
-// Add or remove newline between 'union' and '{'.
-extern Option<iarf_e>
-nl_union_brace;
-
-// Add or remove newline between 'if' and '{'.
-extern Option<iarf_e>
-nl_if_brace;
-
-// Add or remove newline between '}' and 'else'.
-extern Option<iarf_e>
-nl_brace_else;
-
-// Add or remove newline between 'else if' and '{'. If set to ignore,
-// nl_if_brace is used instead.
-extern Option<iarf_e>
-nl_elseif_brace;
-
-// Add or remove newline between 'else' and '{'.
-extern Option<iarf_e>
-nl_else_brace;
-
-// Add or remove newline between 'else' and 'if'.
-extern Option<iarf_e>
-nl_else_if;
-
-// Add or remove newline before '{' opening brace
-extern Option<iarf_e>
-nl_before_opening_brace_func_class_def;
-
-// Add or remove newline before 'if'/'else if' closing parenthesis.
-extern Option<iarf_e>
-nl_before_if_closing_paren;
-
-// Add or remove newline between '}' and 'finally'.
-extern Option<iarf_e>
-nl_brace_finally;
-
-// Add or remove newline between 'finally' and '{'.
-extern Option<iarf_e>
-nl_finally_brace;
-
-// Add or remove newline between 'try' and '{'.
-extern Option<iarf_e>
-nl_try_brace;
-
-// Add or remove newline between get/set and '{'.
-extern Option<iarf_e>
-nl_getset_brace;
-
-// Add or remove newline between 'for' and '{'.
-extern Option<iarf_e>
-nl_for_brace;
-
-// Add or remove newline before the '{' of a 'catch' statement, as in
-// 'catch (decl) <here> {'.
-extern Option<iarf_e>
-nl_catch_brace;
-
-// (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-// '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-extern Option<iarf_e>
-nl_oc_catch_brace;
-
-// Add or remove newline between '}' and 'catch'.
-extern Option<iarf_e>
-nl_brace_catch;
-
-// (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-// nl_brace_catch is used.
-extern Option<iarf_e>
-nl_oc_brace_catch;
-
-// Add or remove newline between '}' and ']'.
-extern Option<iarf_e>
-nl_brace_square;
-
-// Add or remove newline between '}' and ')' in a function invocation.
-extern Option<iarf_e>
-nl_brace_fparen;
-
-// Add or remove newline between 'while' and '{'.
-extern Option<iarf_e>
-nl_while_brace;
-
-// (D) Add or remove newline between 'scope (x)' and '{'.
-extern Option<iarf_e>
-nl_scope_brace;
-
-// (D) Add or remove newline between 'unittest' and '{'.
-extern Option<iarf_e>
-nl_unittest_brace;
-
-// (D) Add or remove newline between 'version (x)' and '{'.
-extern Option<iarf_e>
-nl_version_brace;
-
-// (C#) Add or remove newline between 'using' and '{'.
-extern Option<iarf_e>
-nl_using_brace;
-
-// Add or remove newline between two open or close braces. Due to general
-// newline/brace handling, REMOVE may not work.
-extern Option<iarf_e>
-nl_brace_brace;
-
-// Add or remove newline between 'do' and '{'.
-extern Option<iarf_e>
-nl_do_brace;
-
-// Add or remove newline between '}' and 'while' of 'do' statement.
-extern Option<iarf_e>
-nl_brace_while;
-
-// Add or remove newline between 'switch' and '{'.
-extern Option<iarf_e>
-nl_switch_brace;
-
-// Add or remove newline between 'synchronized' and '{'.
-extern Option<iarf_e>
-nl_synchronized_brace;
-
-// Add a newline between ')' and '{' if the ')' is on a different line than the
-// if/for/etc.
-//
-// Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-// nl_catch_brace.
-extern Option<bool>
-nl_multi_line_cond;
-
-// Add a newline after '(' if an if/for/while/switch condition spans multiple
-// lines
-extern Option<iarf_e>
-nl_multi_line_sparen_open;
-
-// Add a newline before ')' if an if/for/while/switch condition spans multiple
-// lines. Overrides nl_before_if_closing_paren if both are specified.
-extern Option<iarf_e>
-nl_multi_line_sparen_close;
-
-// Force a newline in a define after the macro name for multi-line defines.
-extern Option<bool>
-nl_multi_line_define;
-
-// Whether to add a newline before 'case', and a blank line before a 'case'
-// statement that follows a ';' or '}'.
-extern Option<bool>
-nl_before_case;
-
-// Whether to add a newline after a 'case' statement.
-extern Option<bool>
-nl_after_case;
-
-// Add or remove newline between a case ':' and '{'.
-//
-// Overrides nl_after_case.
-extern Option<iarf_e>
-nl_case_colon_brace;
-
-// Add or remove newline between ')' and 'throw'.
-extern Option<iarf_e>
-nl_before_throw;
-
-// Add or remove newline between 'namespace' and '{'.
-extern Option<iarf_e>
-nl_namespace_brace;
-
-// Add or remove newline after 'template<...>' of a template class.
-extern Option<iarf_e>
-nl_template_class;
-
-// Add or remove newline after 'template<...>' of a template class declaration.
-//
-// Overrides nl_template_class.
-extern Option<iarf_e>
-nl_template_class_decl;
-
-// Add or remove newline after 'template<>' of a specialized class declaration.
-//
-// Overrides nl_template_class_decl.
-extern Option<iarf_e>
-nl_template_class_decl_special;
-
-// Add or remove newline after 'template<...>' of a template class definition.
-//
-// Overrides nl_template_class.
-extern Option<iarf_e>
-nl_template_class_def;
-
-// Add or remove newline after 'template<>' of a specialized class definition.
-//
-// Overrides nl_template_class_def.
-extern Option<iarf_e>
-nl_template_class_def_special;
-
-// Add or remove newline after 'template<...>' of a template function.
-extern Option<iarf_e>
-nl_template_func;
-
-// Add or remove newline after 'template<...>' of a template function
-// declaration.
-//
-// Overrides nl_template_func.
-extern Option<iarf_e>
-nl_template_func_decl;
-
-// Add or remove newline after 'template<>' of a specialized function
-// declaration.
-//
-// Overrides nl_template_func_decl.
-extern Option<iarf_e>
-nl_template_func_decl_special;
-
-// Add or remove newline after 'template<...>' of a template function
-// definition.
-//
-// Overrides nl_template_func.
-extern Option<iarf_e>
-nl_template_func_def;
-
-// Add or remove newline after 'template<>' of a specialized function
-// definition.
-//
-// Overrides nl_template_func_def.
-extern Option<iarf_e>
-nl_template_func_def_special;
-
-// Add or remove newline after 'template<...>' of a template variable.
-extern Option<iarf_e>
-nl_template_var;
-
-// Add or remove newline between 'template<...>' and 'using' of a templated
-// type alias.
-extern Option<iarf_e>
-nl_template_using;
-
-// Add or remove newline between 'class' and '{'.
-extern Option<iarf_e>
-nl_class_brace;
-
-// Add or remove newline before or after (depending on pos_class_comma,
-// may not be IGNORE) each',' in the base class list.
-extern Option<iarf_e>
-nl_class_init_args;
-
-// Add or remove newline after each ',' in the constructor member
-// initialization. Related to nl_constr_colon, pos_constr_colon and
-// pos_constr_comma.
-extern Option<iarf_e>
-nl_constr_init_args;
-
-// Add or remove newline before first element, after comma, and after last
-// element, in 'enum'.
-extern Option<iarf_e>
-nl_enum_own_lines;
-
-// Add or remove newline between return type and function name in a function
-// definition.
-// might be modified by nl_func_leave_one_liners
-extern Option<iarf_e>
-nl_func_type_name;
-
-// Add or remove newline between return type and function name inside a class
-// definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-// is used instead.
-extern Option<iarf_e>
-nl_func_type_name_class;
-
-// Add or remove newline between class specification and '::'
-// in 'void A::f() { }'. Only appears in separate member implementation (does
-// not appear with in-line implementation).
-extern Option<iarf_e>
-nl_func_class_scope;
-
-// Add or remove newline between function scope and name, as in
-// 'void A :: <here> f() { }'.
-extern Option<iarf_e>
-nl_func_scope_name;
-
-// Add or remove newline between return type and function name in a prototype.
-extern Option<iarf_e>
-nl_func_proto_type_name;
-
-// Add or remove newline between a function name and the opening '(' in the
-// declaration.
-extern Option<iarf_e>
-nl_func_paren;
-
-// Overrides nl_func_paren for functions with no parameters.
-extern Option<iarf_e>
-nl_func_paren_empty;
-
-// Add or remove newline between a function name and the opening '(' in the
-// definition.
-extern Option<iarf_e>
-nl_func_def_paren;
-
-// Overrides nl_func_def_paren for functions with no parameters.
-extern Option<iarf_e>
-nl_func_def_paren_empty;
-
-// Add or remove newline between a function name and the opening '(' in the
-// call.
-extern Option<iarf_e>
-nl_func_call_paren;
-
-// Overrides nl_func_call_paren for functions with no parameters.
-extern Option<iarf_e>
-nl_func_call_paren_empty;
-
-// Add or remove newline after '(' in a function declaration.
-extern Option<iarf_e>
-nl_func_decl_start;
-
-// Add or remove newline after '(' in a function definition.
-extern Option<iarf_e>
-nl_func_def_start;
-
-// Overrides nl_func_decl_start when there is only one parameter.
-extern Option<iarf_e>
-nl_func_decl_start_single;
-
-// Overrides nl_func_def_start when there is only one parameter.
-extern Option<iarf_e>
-nl_func_def_start_single;
-
-// Whether to add a newline after '(' in a function declaration if '(' and ')'
-// are in different lines. If false, nl_func_decl_start is used instead.
-extern Option<bool>
-nl_func_decl_start_multi_line;
-
-// Whether to add a newline after '(' in a function definition if '(' and ')'
-// are in different lines. If false, nl_func_def_start is used instead.
-extern Option<bool>
-nl_func_def_start_multi_line;
-
-// Add or remove newline after each ',' in a function declaration.
-extern Option<iarf_e>
-nl_func_decl_args;
-
-// Add or remove newline after each ',' in a function definition.
-extern Option<iarf_e>
-nl_func_def_args;
-
-// Add or remove newline after each ',' in a function call.
-extern Option<iarf_e>
-nl_func_call_args;
-
-// Whether to add a newline after each ',' in a function declaration if '('
-// and ')' are in different lines. If false, nl_func_decl_args is used instead.
-extern Option<bool>
-nl_func_decl_args_multi_line;
-
-// Whether to add a newline after each ',' in a function definition if '('
-// and ')' are in different lines. If false, nl_func_def_args is used instead.
-extern Option<bool>
-nl_func_def_args_multi_line;
-
-// Add or remove newline before the ')' in a function declaration.
-extern Option<iarf_e>
-nl_func_decl_end;
-
-// Add or remove newline before the ')' in a function definition.
-extern Option<iarf_e>
-nl_func_def_end;
-
-// Overrides nl_func_decl_end when there is only one parameter.
-extern Option<iarf_e>
-nl_func_decl_end_single;
-
-// Overrides nl_func_def_end when there is only one parameter.
-extern Option<iarf_e>
-nl_func_def_end_single;
-
-// Whether to add a newline before ')' in a function declaration if '(' and ')'
-// are in different lines. If false, nl_func_decl_end is used instead.
-extern Option<bool>
-nl_func_decl_end_multi_line;
-
-// Whether to add a newline before ')' in a function definition if '(' and ')'
-// are in different lines. If false, nl_func_def_end is used instead.
-extern Option<bool>
-nl_func_def_end_multi_line;
-
-// Add or remove newline between '()' in a function declaration.
-extern Option<iarf_e>
-nl_func_decl_empty;
-
-// Add or remove newline between '()' in a function definition.
-extern Option<iarf_e>
-nl_func_def_empty;
-
-// Add or remove newline between '()' in a function call.
-extern Option<iarf_e>
-nl_func_call_empty;
-
-// Whether to add a newline after '(' in a function call,
-// has preference over nl_func_call_start_multi_line.
-extern Option<iarf_e>
-nl_func_call_start;
-
-// Whether to add a newline before ')' in a function call.
-extern Option<iarf_e>
-nl_func_call_end;
-
-// Whether to add a newline after '(' in a function call if '(' and ')' are in
-// different lines.
-extern Option<bool>
-nl_func_call_start_multi_line;
-
-// Whether to add a newline after each ',' in a function call if '(' and ')'
-// are in different lines.
-extern Option<bool>
-nl_func_call_args_multi_line;
-
-// Whether to add a newline before ')' in a function call if '(' and ')' are in
-// different lines.
-extern Option<bool>
-nl_func_call_end_multi_line;
-
-// Whether to respect nl_func_call_XXX option in case of closure args.
-extern Option<bool>
-nl_func_call_args_multi_line_ignore_closures; // false
-
-// Whether to add a newline after '<' of a template parameter list.
-extern Option<bool>
-nl_template_start;
-
-// Whether to add a newline after each ',' in a template parameter list.
-extern Option<bool>
-nl_template_args;
-
-// Whether to add a newline before '>' of a template parameter list.
-extern Option<bool>
-nl_template_end;
-
-// (OC) Whether to put each Objective-C message parameter on a separate line.
-// See nl_oc_msg_leave_one_liner.
-extern Option<bool>
-nl_oc_msg_args;
-
-// Add or remove newline between function signature and '{'.
-extern Option<iarf_e>
-nl_fdef_brace;
-
-// Add or remove newline between function signature and '{',
-// if signature ends with ')'. Overrides nl_fdef_brace.
-extern Option<iarf_e>
-nl_fdef_brace_cond;
-
-// Add or remove newline between C++11 lambda signature and '{'.
-extern Option<iarf_e>
-nl_cpp_ldef_brace;
-
-// Add or remove newline between 'return' and the return expression.
-extern Option<iarf_e>
-nl_return_expr;
-
-// Whether to add a newline after semicolons, except in 'for' statements.
-extern Option<bool>
-nl_after_semicolon;
-
-// (Java) Add or remove newline between the ')' and '{{' of the double brace
-// initializer.
-extern Option<iarf_e>
-nl_paren_dbrace_open;
-
-// Whether to add a newline after the type in an unnamed temporary
-// direct-list-initialization.
-extern Option<iarf_e>
-nl_type_brace_init_lst;
-
-// Whether to add a newline after the open brace in an unnamed temporary
-// direct-list-initialization.
-extern Option<iarf_e>
-nl_type_brace_init_lst_open;
-
-// Whether to add a newline before the close brace in an unnamed temporary
-// direct-list-initialization.
-extern Option<iarf_e>
-nl_type_brace_init_lst_close;
-
-// Whether to add a newline after '{'. This also adds a newline before the
-// matching '}'.
-extern Option<bool>
-nl_after_brace_open;
-
-// Whether to add a newline between the open brace and a trailing single-line
-// comment. Requires nl_after_brace_open=true.
-extern Option<bool>
-nl_after_brace_open_cmt;
-
-// Whether to add a newline after a virtual brace open with a non-empty body.
-// These occur in un-braced if/while/do/for statement bodies.
-extern Option<bool>
-nl_after_vbrace_open;
-
-// Whether to add a newline after a virtual brace open with an empty body.
-// These occur in un-braced if/while/do/for statement bodies.
-extern Option<bool>
-nl_after_vbrace_open_empty;
-
-// Whether to add a newline after '}'. Does not apply if followed by a
-// necessary ';'.
-extern Option<bool>
-nl_after_brace_close;
-
-// Whether to add a newline after a virtual brace close,
-// as in 'if (foo) a++; <here> return;'.
-extern Option<bool>
-nl_after_vbrace_close;
-
-// Add or remove newline between the close brace and identifier,
-// as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-// structures. If set to ignore, uses nl_after_brace_close.
-extern Option<iarf_e>
-nl_brace_struct_var;
-
-// Whether to alter newlines in '#define' macros.
-extern Option<bool>
-nl_define_macro;
-
-// Whether to alter newlines between consecutive parenthesis closes. The number
-// of closing parentheses in a line will depend on respective open parenthesis
-// lines.
-extern Option<bool>
-nl_squeeze_paren_close;
-
-// Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-// '#endif'. Does not affect top-level #ifdefs.
-extern Option<bool>
-nl_squeeze_ifdef;
-
-// Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-extern Option<bool>
-nl_squeeze_ifdef_top_level;
-
-// Add or remove blank line before 'if'.
-extern Option<iarf_e>
-nl_before_if;
-
-// Add or remove blank line after 'if' statement. Add/Force work only if the
-// next token is not a closing brace.
-extern Option<iarf_e>
-nl_after_if;
-
-// Add or remove blank line before 'for'.
-extern Option<iarf_e>
-nl_before_for;
-
-// Add or remove blank line after 'for' statement.
-extern Option<iarf_e>
-nl_after_for;
-
-// Add or remove blank line before 'while'.
-extern Option<iarf_e>
-nl_before_while;
-
-// Add or remove blank line after 'while' statement.
-extern Option<iarf_e>
-nl_after_while;
-
-// Add or remove blank line before 'switch'.
-extern Option<iarf_e>
-nl_before_switch;
-
-// Add or remove blank line after 'switch' statement.
-extern Option<iarf_e>
-nl_after_switch;
-
-// Add or remove blank line before 'synchronized'.
-extern Option<iarf_e>
-nl_before_synchronized;
-
-// Add or remove blank line after 'synchronized' statement.
-extern Option<iarf_e>
-nl_after_synchronized;
-
-// Add or remove blank line before 'do'.
-extern Option<iarf_e>
-nl_before_do;
-
-// Add or remove blank line after 'do/while' statement.
-extern Option<iarf_e>
-nl_after_do;
-
-// Whether to put a blank line before 'return' statements, unless after an open
-// brace.
-extern Option<bool>
-nl_before_return;
-
-// Whether to put a blank line after 'return' statements, unless followed by a
-// close brace.
-extern Option<bool>
-nl_after_return;
-
-// Whether to put a blank line before a member '.' or '->' operators.
-extern Option<iarf_e>
-nl_before_member;
-
-// (Java) Whether to put a blank line after a member '.' or '->' operators.
-extern Option<iarf_e>
-nl_after_member;
-
-// Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-extern Option<bool>
-nl_ds_struct_enum_cmt;
-
-// Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-// (Lower priority than eat_blanks_before_close_brace.)
-extern Option<bool>
-nl_ds_struct_enum_close_brace;
-
-// Add or remove newline before or after (depending on pos_class_colon) a class
-// colon, as in 'class Foo <here> : <or here> public Bar'.
-extern Option<iarf_e>
-nl_class_colon;
-
-// Add or remove newline around a class constructor colon. The exact position
-// depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-extern Option<iarf_e>
-nl_constr_colon;
-
-// Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-// into a single line. If true, prevents other brace newline rules from turning
-// such code into four lines.
-extern Option<bool>
-nl_namespace_two_to_one_liner;
-
-// Whether to remove a newline in simple unbraced if statements, turning them
-// into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-extern Option<bool>
-nl_create_if_one_liner;
-
-// Whether to remove a newline in simple unbraced for statements, turning them
-// into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-extern Option<bool>
-nl_create_for_one_liner;
-
-// Whether to remove a newline in simple unbraced while statements, turning
-// them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-extern Option<bool>
-nl_create_while_one_liner;
-
-// Whether to collapse a function definition whose body (not counting braces)
-// is only one line so that the entire definition (prototype, braces, body) is
-// a single line.
-extern Option<bool>
-nl_create_func_def_one_liner;
-
-// Whether to split one-line simple unbraced if statements into three lines by
-// adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
-extern Option<bool>
-nl_create_list_one_liner;
-
-// Whether to split one-line simple unbraced if statements into two lines by
-// adding a newline, as in 'if(b) <here> i++;'.
-extern Option<bool>
-nl_split_if_one_liner;
-
-// Whether to split one-line simple unbraced for statements into two lines by
-// adding a newline, as in 'for (...) <here> stmt;'.
-extern Option<bool>
-nl_split_for_one_liner;
-
-// Whether to split one-line simple unbraced while statements into two lines by
-// adding a newline, as in 'while (expr) <here> stmt;'.
-extern Option<bool>
-nl_split_while_one_liner;
-
-// Don't add a newline before a cpp-comment in a parameter list of a function
-// call.
-extern Option<bool>
-donot_add_nl_before_cpp_comment;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Blank line options
-
-// The maximum number of consecutive newlines (3 = 2 blank lines).
-extern BoundedOption<unsigned, 0, 16>
-nl_max;
-
-// The maximum number of consecutive newlines in a function.
-extern BoundedOption<unsigned, 0, 16>
-nl_max_blank_in_func;
-
-// The number of newlines inside an empty function body.
-// This option overrides eat_blanks_after_open_brace and
-// eat_blanks_before_close_brace, but is ignored when
-// nl_collapse_empty_body=true
-extern BoundedOption<unsigned, 0, 16>
-nl_inside_empty_func;
-
-// The number of newlines before a function prototype.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_func_body_proto;
-
-// The number of newlines before a multi-line function definition. Where
-// applicable, this option is overridden with eat_blanks_after_open_brace=true
-extern BoundedOption<unsigned, 0, 16>
-nl_before_func_body_def;
-
-// The number of newlines before a class constructor/destructor prototype.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_func_class_proto;
-
-// The number of newlines before a class constructor/destructor definition.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_func_class_def;
-
-// The number of newlines after a function prototype.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_func_proto;
-
-// The number of newlines after a function prototype, if not followed by
-// another function prototype.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_func_proto_group;
-
-// The number of newlines after a class constructor/destructor prototype.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_func_class_proto;
-
-// The number of newlines after a class constructor/destructor prototype,
-// if not followed by another constructor/destructor prototype.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_func_class_proto_group;
-
-// Whether one-line method definitions inside a class body should be treated
-// as if they were prototypes for the purposes of adding newlines.
-//
-// Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-// and nl_before_func_class_def for one-liners.
-extern Option<bool>
-nl_class_leave_one_liner_groups;
-
-// The number of newlines after '}' of a multi-line function body.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_func_body;
-
-// The number of newlines after '}' of a multi-line function body in a class
-// declaration. Also affects class constructors/destructors.
-//
-// Overrides nl_after_func_body.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_func_body_class;
-
-// The number of newlines after '}' of a single line function body. Also
-// affects class constructors/destructors.
-//
-// Overrides nl_after_func_body and nl_after_func_body_class.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_func_body_one_liner;
-
-// The number of blank lines after a block of variable definitions at the top
-// of a function body.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_func_var_def_blk;
-
-// The number of newlines before a block of typedefs. If nl_after_access_spec
-// is non-zero, that option takes precedence.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_typedef_blk_start;
-
-// The number of newlines after a block of typedefs.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_typedef_blk_end;
-
-// The maximum number of consecutive newlines within a block of typedefs.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_typedef_blk_in;
-
-// The number of newlines before a block of variable definitions not at the top
-// of a function body. If nl_after_access_spec is non-zero, that option takes
-// precedence.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_var_def_blk_start;
-
-// The number of newlines after a block of variable definitions not at the top
-// of a function body.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_var_def_blk_end;
-
-// The maximum number of consecutive newlines within a block of variable
-// definitions.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_var_def_blk_in;
-
-// The minimum number of newlines before a multi-line comment.
-// Doesn't apply if after a brace open or another multi-line comment.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_block_comment;
-
-// The minimum number of newlines before a single-line C comment.
-// Doesn't apply if after a brace open or other single-line C comments.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_c_comment;
-
-// The minimum number of newlines before a CPP comment.
-// Doesn't apply if after a brace open or other CPP comments.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_cpp_comment;
-
-// Whether to force a newline after a multi-line comment.
-extern Option<bool>
-nl_after_multiline_comment;
-
-// Whether to force a newline after a label's colon.
-extern Option<bool>
-nl_after_label_colon;
-
-// The number of newlines after '}' or ';' of a struct/enum/union definition.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_struct;
-
-// The number of newlines before a class definition.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_class;
-
-// The number of newlines after '}' or ';' of a class definition.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_class;
-
-// The number of newlines before a namespace.
-extern BoundedOption<unsigned, 0, 16>
-nl_before_namespace;
-
-// The number of newlines after '{' of a namespace. This also adds newlines
-// before the matching '}'.
-//
-// 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-//     applicable, otherwise no change.
-//
-// Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-extern BoundedOption<unsigned, 0, 16>
-nl_inside_namespace;
-
-// The number of newlines after '}' of a namespace.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_namespace;
-
-// The number of newlines before an access specifier label. This also includes
-// the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-// if after a brace open.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_before_access_spec;
-
-// The number of newlines after an access specifier label. This also includes
-// the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-// if after a brace open.
-//
-// 0: No change (default).
-//
-// Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-extern BoundedOption<unsigned, 0, 16>
-nl_after_access_spec;
-
-// The number of newlines between a function definition and the function
-// comment, as in '// comment\n <here> void foo() {...}'.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_comment_func_def;
-
-// The number of newlines after a try-catch-finally block that isn't followed
-// by a brace close.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_after_try_catch_finally;
-
-// (C#) The number of newlines before and after a property, indexer or event
-// declaration.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_around_cs_property;
-
-// (C#) The number of newlines between the get/set/add/remove handlers.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_between_get_set;
-
-// (C#) Add or remove newline between property and the '{'.
-extern Option<iarf_e>
-nl_property_brace;
-
-// Whether to remove blank lines after '{'.
-extern Option<bool>
-eat_blanks_after_open_brace;
-
-// Whether to remove blank lines before '}'.
-extern Option<bool>
-eat_blanks_before_close_brace;
-
-// How aggressively to remove extra newlines not in preprocessor.
-//
-// 0: No change (default)
-// 1: Remove most newlines not handled by other config
-// 2: Remove all newlines and reformat completely by config
-extern BoundedOption<unsigned, 0, 2>
-nl_remove_extra_newlines;
-
-// (Java) Add or remove newline after an annotation statement. Only affects
-// annotations that are after a newline.
-extern Option<iarf_e>
-nl_after_annotation;
-
-// (Java) Add or remove newline between two annotations.
-extern Option<iarf_e>
-nl_between_annotation;
-
-// The number of newlines before a whole-file #ifdef.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_before_whole_file_ifdef;
-
-// The number of newlines after a whole-file #ifdef.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_after_whole_file_ifdef;
-
-// The number of newlines before a whole-file #endif.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_before_whole_file_endif;
-
-// The number of newlines after a whole-file #endif.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_after_whole_file_endif;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Positioning options
-
-// The position of arithmetic operators in wrapped expressions.
-extern Option<token_pos_e>
-pos_arith;
-
-// The position of assignment in wrapped expressions. Do not affect '='
-// followed by '{'.
-extern Option<token_pos_e>
-pos_assign;
-
-// The position of Boolean operators in wrapped expressions.
-extern Option<token_pos_e>
-pos_bool;
-
-// The position of comparison operators in wrapped expressions.
-extern Option<token_pos_e>
-pos_compare;
-
-// The position of conditional operators, as in the '?' and ':' of
-// 'expr ? stmt : stmt', in wrapped expressions.
-extern Option<token_pos_e>
-pos_conditional;
-
-// The position of the comma in wrapped expressions.
-extern Option<token_pos_e>
-pos_comma;
-
-// The position of the comma in enum entries.
-extern Option<token_pos_e>
-pos_enum_comma;
-
-// The position of the comma in the base class list if there is more than one
-// line. Affects nl_class_init_args.
-extern Option<token_pos_e>
-pos_class_comma;
-
-// The position of the comma in the constructor initialization list.
-// Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-extern Option<token_pos_e>
-pos_constr_comma;
-
-// The position of trailing/leading class colon, between class and base class
-// list. Affects nl_class_colon.
-extern Option<token_pos_e>
-pos_class_colon;
-
-// The position of colons between constructor and member initialization.
-// Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-extern Option<token_pos_e>
-pos_constr_colon;
-
-// The position of shift operators in wrapped expressions.
-extern Option<token_pos_e>
-pos_shift;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Line splitting options
-
-// Try to limit code width to N columns.
-extern BoundedOption<unsigned, 0, 10000>
-code_width;
-
-// Whether to fully split long 'for' statements at semi-colons.
-extern Option<bool>
-ls_for_split_full;
-
-// Whether to fully split long function prototypes/calls at commas.
-// The option ls_code_width has priority over the option ls_func_split_full.
-extern Option<bool>
-ls_func_split_full;
-
-// Whether to split lines as close to code_width as possible and ignore some
-// groupings.
-// The option ls_code_width has priority over the option ls_func_split_full.
-extern Option<bool>
-ls_code_width;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Code alignment options (not left column spaces/tabs)
-
-// Whether to keep non-indenting tabs.
-extern Option<bool>
-align_keep_tabs;
-
-// Whether to use tabs for aligning.
-extern Option<bool>
-align_with_tabs;
-
-// Whether to bump out to the next tab when aligning.
-extern Option<bool>
-align_on_tabstop;
-
-// Whether to right-align numbers.
-extern Option<bool>
-align_number_right;
-
-// Whether to keep whitespace not required for alignment.
-extern Option<bool>
-align_keep_extra_space;
-
-// Whether to align variable definitions in prototypes and functions.
-extern Option<bool>
-align_func_params;
-
-// The span for aligning parameter definitions in function on parameter name.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 16>
-align_func_params_span;
-
-// The threshold for aligning function parameter definitions.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_func_params_thresh;
-
-// The gap for aligning function parameter definitions.
-extern BoundedOption<unsigned, 0, 16>
-align_func_params_gap;
-
-// The span for aligning constructor value.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 16>
-align_constr_value_span;
-
-// The threshold for aligning constructor value.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_constr_value_thresh;
-
-// The gap for aligning constructor value.
-extern BoundedOption<unsigned, 0, 16>
-align_constr_value_gap;
-
-// Whether to align parameters in single-line functions that have the same
-// name. The function names must already be aligned with each other.
-extern Option<bool>
-align_same_func_call_params;
-
-// The span for aligning function-call parameters for single line functions.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_same_func_call_params_span;
-
-// The threshold for aligning function-call parameters for single line
-// functions.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_same_func_call_params_thresh;
-
-// The span for aligning variable definitions.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_var_def_span;
-
-// How to consider (or treat) the '*' in the alignment of variable definitions.
-//
-// 0: Part of the type     'void *   foo;' (default)
-// 1: Part of the variable 'void     *foo;'
-// 2: Dangling             'void    *foo;'
-// Dangling: the '*' will not be taken into account when aligning.
-extern BoundedOption<unsigned, 0, 2>
-align_var_def_star_style;
-
-// How to consider (or treat) the '&' in the alignment of variable definitions.
-//
-// 0: Part of the type     'long &   foo;' (default)
-// 1: Part of the variable 'long     &foo;'
-// 2: Dangling             'long    &foo;'
-// Dangling: the '&' will not be taken into account when aligning.
-extern BoundedOption<unsigned, 0, 2>
-align_var_def_amp_style;
-
-// The threshold for aligning variable definitions.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_var_def_thresh;
-
-// The gap for aligning variable definitions.
-extern BoundedOption<unsigned, 0, 16>
-align_var_def_gap;
-
-// Whether to align the colon in struct bit fields.
-extern Option<bool>
-align_var_def_colon;
-
-// The gap for aligning the colon in struct bit fields.
-extern BoundedOption<unsigned, 0, 16>
-align_var_def_colon_gap;
-
-// Whether to align any attribute after the variable name.
-extern Option<bool>
-align_var_def_attribute;
-
-// Whether to align inline struct/enum/union variable definitions.
-extern Option<bool>
-align_var_def_inline;
-
-// The span for aligning on '=' in assignments.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_assign_span;
-
-// The span for aligning on '=' in function prototype modifier.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_assign_func_proto_span;
-
-// The threshold for aligning on '=' in assignments.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_assign_thresh;
-
-// How to apply align_assign_span to function declaration "assignments", i.e.
-// 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-//
-// 0: Align with other assignments (default)
-// 1: Align with each other, ignoring regular assignments
-// 2: Don't align
-extern BoundedOption<unsigned, 0, 2>
-align_assign_decl_func;
-
-// The span for aligning on '=' in enums.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_enum_equ_span;
-
-// The threshold for aligning on '=' in enums.
-// Use a negative number for absolute thresholds.
-//
-// 0: no limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_enum_equ_thresh;
-
-// The span for aligning class member definitions.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_var_class_span;
-
-// The threshold for aligning class member definitions.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_var_class_thresh;
-
-// The gap for aligning class member definitions.
-extern BoundedOption<unsigned, 0, 16>
-align_var_class_gap;
-
-// The span for aligning struct/union member definitions.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_var_struct_span;
-
-// The threshold for aligning struct/union member definitions.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_var_struct_thresh;
-
-// The gap for aligning struct/union member definitions.
-extern BoundedOption<unsigned, 0, 16>
-align_var_struct_gap;
-
-// The span for aligning struct initializer values.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_struct_init_span;
-
-// The span for aligning single-line typedefs.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 16>
-align_typedef_span;
-
-// The minimum space between the type and the synonym of a typedef.
-extern BoundedOption<unsigned, 0, 16>
-align_typedef_gap;
-
-// How to align typedef'd functions with other typedefs.
-//
-// 0: Don't mix them at all (default)
-// 1: Align the open parenthesis with the types
-// 2: Align the function type name with the other type names
-extern BoundedOption<unsigned, 0, 2>
-align_typedef_func;
-
-// How to consider (or treat) the '*' in the alignment of typedefs.
-//
-// 0: Part of the typedef type, 'typedef int * pint;' (default)
-// 1: Part of type name:        'typedef int   *pint;'
-// 2: Dangling:                 'typedef int  *pint;'
-// Dangling: the '*' will not be taken into account when aligning.
-extern BoundedOption<unsigned, 0, 2>
-align_typedef_star_style;
-
-// How to consider (or treat) the '&' in the alignment of typedefs.
-//
-// 0: Part of the typedef type, 'typedef int & intref;' (default)
-// 1: Part of type name:        'typedef int   &intref;'
-// 2: Dangling:                 'typedef int  &intref;'
-// Dangling: the '&' will not be taken into account when aligning.
-extern BoundedOption<unsigned, 0, 2>
-align_typedef_amp_style;
-
-// The span for aligning comments that end lines.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_right_cmt_span;
-
-// Minimum number of columns between preceding text and a trailing comment in
-// order for the comment to qualify for being aligned. Must be non-zero to have
-// an effect.
-extern BoundedOption<unsigned, 0, 16>
-align_right_cmt_gap;
-
-// If aligning comments, whether to mix with comments after '}' and #endif with
-// less than three spaces before the comment.
-extern Option<bool>
-align_right_cmt_mix;
-
-// Whether to only align trailing comments that are at the same brace level.
-extern Option<bool>
-align_right_cmt_same_level;
-
-// Minimum column at which to align trailing comments. Comments which are
-// aligned beyond this column, but which can be aligned in a lesser column,
-// may be "pulled in".
-//
-// 0: Ignore (default).
-extern BoundedOption<unsigned, 0, 200>
-align_right_cmt_at_col;
-
-// The span for aligning function prototypes.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_func_proto_span;
-
-// The threshold for aligning function prototypes.
-// Use a negative number for absolute thresholds.
-//
-// 0: No limit (default).
-extern BoundedOption<signed, -1000, 5000>
-align_func_proto_thresh;
-
-// Minimum gap between the return type and the function name.
-extern BoundedOption<unsigned, 0, 16>
-align_func_proto_gap;
-
-// Whether to align function prototypes on the 'operator' keyword instead of
-// what follows.
-extern Option<bool>
-align_on_operator;
-
-// Whether to mix aligning prototype and variable declarations. If true,
-// align_var_def_XXX options are used instead of align_func_proto_XXX options.
-extern Option<bool>
-align_mix_var_proto;
-
-// Whether to align single-line functions with function prototypes.
-// Uses align_func_proto_span.
-extern Option<bool>
-align_single_line_func;
-
-// Whether to align the open brace of single-line functions.
-// Requires align_single_line_func=true. Uses align_func_proto_span.
-extern Option<bool>
-align_single_line_brace;
-
-// Gap for align_single_line_brace.
-extern BoundedOption<unsigned, 0, 16>
-align_single_line_brace_gap;
-
-// (OC) The span for aligning Objective-C message specifications.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_oc_msg_spec_span;
-
-// Whether to align macros wrapped with a backslash and a newline. This will
-// not work right if the macro contains a multi-line comment.
-extern Option<bool>
-align_nl_cont;
-
-// Whether to align macro functions and variables together.
-extern Option<bool>
-align_pp_define_together;
-
-// The span for aligning on '#define' bodies.
-//
-// =0: Don't align (default)
-// >0: Number of lines (including comments) between blocks
-extern BoundedOption<unsigned, 0, 5000>
-align_pp_define_span;
-
-// The minimum space between label and value of a preprocessor define.
-extern BoundedOption<unsigned, 0, 16>
-align_pp_define_gap;
-
-// Whether to align lines that start with '<<' with previous '<<'.
-extern Option<bool>
-align_left_shift; // = true
-
-// Whether to align comma-separated statements following '<<' (as used to
-// initialize Eigen matrices).
-extern Option<bool>
-align_eigen_comma_init;
-
-// Whether to align text after 'asm volatile ()' colons.
-extern Option<bool>
-align_asm_colon;
-
-// (OC) Span for aligning parameters in an Objective-C message call
-// on the ':'.
-//
-// 0: Don't align.
-extern BoundedOption<unsigned, 0, 5000>
-align_oc_msg_colon_span;
-
-// (OC) Whether to always align with the first parameter, even if it is too
-// short.
-extern Option<bool>
-align_oc_msg_colon_first;
-
-// (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-// on the ':'.
-extern Option<bool>
-align_oc_decl_colon;
-
-// (OC) Whether to not align parameters in an Objectve-C message call if first
-// colon is not on next line of the message call (the same way Xcode does
-// aligment)
-extern Option<bool>
-align_oc_msg_colon_xcode_like;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Comment modification options
-
-// Try to wrap comments at N columns.
-extern BoundedOption<unsigned, 0, 256>
-cmt_width;
-
-// How to reflow comments.
-//
-// 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-// 1: No touching at all
-// 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
-extern BoundedOption<unsigned, 0, 2>
-cmt_reflow_mode;
-
-// Path to a file that contains regular expressions describing patterns for
-// which the end of one line and the beginning of the next will be folded into
-// the same sentence or paragraph during full comment reflow. The regular
-// expressions are described using ECMAScript syntax. The syntax for this
-// specification is as follows, where "..." indicates the custom regular
-// expression and "n" indicates the nth end_of_prev_line_regex and
-// beg_of_next_line_regex regular expression pair:
-//
-// end_of_prev_line_regex[1] = "...$"
-// beg_of_next_line_regex[1] = "^..."
-// end_of_prev_line_regex[2] = "...$"
-// beg_of_next_line_regex[2] = "^..."
-//             .
-//             .
-//             .
-// end_of_prev_line_regex[n] = "...$"
-// beg_of_next_line_regex[n] = "^..."
-//
-// Note that use of this option overrides the default reflow fold regular
-// expressions, which are internally defined as follows:
-//
-// end_of_prev_line_regex[1] = "[\w,\]\)]$"
-// beg_of_next_line_regex[1] = "^[\w,\[\(]"
-// end_of_prev_line_regex[2] = "\.$"
-// beg_of_next_line_regex[2] = "^[A-Z]"
-extern Option<string>
-cmt_reflow_fold_regex_file;
-
-// Whether to indent wrapped lines to the start of the encompassing paragraph
-// during full comment reflow (cmt_reflow_mode = 2). Overrides the value
-// specified by cmt_sp_after_star_cont.
-//
-// Note that cmt_align_doxygen_javadoc_tags overrides this option for
-// paragraphs associated with javadoc tags
-extern Option<bool>
-cmt_reflow_indent_to_paragraph_start;
-
-// Whether to convert all tabs to spaces in comments. If false, tabs in
-// comments are left alone, unless used for indenting.
-extern Option<bool>
-cmt_convert_tab_to_spaces;
-
-// TODO This description is confusing and should be revised.
-
-// Whether to apply changes to multi-line comments, including cmt_width,
-// keyword substitution and leading chars.
-extern Option<bool>
-cmt_indent_multi; // = true
-
-// Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
-// and corresponding fields such that groups of consecutive block tags,
-// parameter names, and descriptions align with one another. Overrides that
-// which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
-// be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
-// in order to achieve the desired alignment for line-wrapping.
-extern Option<bool>
-cmt_align_doxygen_javadoc_tags;
-
-// The number of spaces to insert after the star and before doxygen
-// javadoc-style tags (@param, @return, etc). Requires enabling
-// cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
-// cmt_sp_after_star_cont.
-extern BoundedOption<unsigned, 0, 16>
-cmt_sp_before_doxygen_javadoc_tags; // = 1
-
-// Whether to group c-comments that look like they are in a block.
-extern Option<bool>
-cmt_c_group;
-
-// Whether to put an empty '/*' on the first line of the combined c-comment.
-extern Option<bool>
-cmt_c_nl_start;
-
-// Whether to add a newline before the closing '*/' of the combined c-comment.
-extern Option<bool>
-cmt_c_nl_end;
-
-// Whether to change cpp-comments into c-comments.
-extern Option<bool>
-cmt_cpp_to_c;
-
-// Whether to group cpp-comments that look like they are in a block. Only
-// meaningful if cmt_cpp_to_c=true.
-extern Option<bool>
-cmt_cpp_group;
-
-// Whether to put an empty '/*' on the first line of the combined cpp-comment
-// when converting to a c-comment.
-//
-// Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-extern Option<bool>
-cmt_cpp_nl_start;
-
-// Whether to add a newline before the closing '*/' of the combined cpp-comment
-// when converting to a c-comment.
-//
-// Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-extern Option<bool>
-cmt_cpp_nl_end;
-
-// Whether to put a star on subsequent comment lines.
-extern Option<bool>
-cmt_star_cont;
-
-// The number of spaces to insert at the start of subsequent comment lines.
-extern BoundedOption<unsigned, 0, 16>
-cmt_sp_before_star_cont;
-
-// The number of spaces to insert after the star on subsequent comment lines.
-extern BoundedOption<unsigned, 0, 16>
-cmt_sp_after_star_cont;
-
-// TODO This description is confusing and should be revised.
-
-// For multi-line comments with a '*' lead, remove leading spaces if the first
-// and last lines of the comment are the same length.
-extern Option<bool>
-cmt_multi_check_last; // = true
-
-// TODO This description is confusing and should be revised.
-
-// For multi-line comments with a '*' lead, remove leading spaces if the first
-// and last lines of the comment are the same length AND if the length is
-// bigger as the first_len minimum.
-extern BoundedOption<unsigned, 1, 20>
-cmt_multi_first_len_minimum; // = 4
-
-// Path to a file that contains text to insert at the beginning of a file if
-// the file doesn't start with a C/C++ comment. If the inserted text contains
-// '$(filename)', that will be replaced with the current file's name.
-extern Option<string>
-cmt_insert_file_header;
-
-// Path to a file that contains text to insert at the end of a file if the
-// file doesn't end with a C/C++ comment. If the inserted text contains
-// '$(filename)', that will be replaced with the current file's name.
-extern Option<string>
-cmt_insert_file_footer;
-
-// Path to a file that contains text to insert before a function definition if
-// the function isn't preceded by a C/C++ comment. If the inserted text
-// contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-// replaced with, respectively, the name of the function, the javadoc '@param'
-// and '@return' stuff, or the name of the class to which the member function
-// belongs.
-extern Option<string>
-cmt_insert_func_header;
-
-// Path to a file that contains text to insert before a class if the class
-// isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-// that will be replaced with the class name.
-extern Option<string>
-cmt_insert_class_header;
-
-// Path to a file that contains text to insert before an Objective-C message
-// specification, if the method isn't preceded by a C/C++ comment. If the
-// inserted text contains '$(message)' or '$(javaparam)', these will be
-// replaced with, respectively, the name of the function, or the javadoc
-// '@param' and '@return' stuff.
-extern Option<string>
-cmt_insert_oc_msg_header;
-
-// TODO This description may be confusing; consider revising.
-
-// Whether a comment should be inserted if a preprocessor is encountered when
-// stepping backwards from a function name.
-//
-// Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-// cmt_insert_class_header.
-extern Option<bool>
-cmt_insert_before_preproc;
-
-// Whether a comment should be inserted if a function is declared inline to a
-// class definition.
-//
-// Applies to cmt_insert_func_header.
-extern Option<bool>
-cmt_insert_before_inlines; // = true
-
-// Whether a comment should be inserted if the function is a class constructor
-// or destructor.
-//
-// Applies to cmt_insert_func_header.
-extern Option<bool>
-cmt_insert_before_ctor_dtor;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Code modifying options (non-whitespace)
-
-// Add or remove braces on a single-line 'do' statement.
-extern Option<iarf_e>
-mod_full_brace_do;
-
-// Add or remove braces on a single-line 'for' statement.
-extern Option<iarf_e>
-mod_full_brace_for;
-
-// (Pawn) Add or remove braces on a single-line function definition.
-extern Option<iarf_e>
-mod_full_brace_function;
-
-// Add or remove braces on a single-line 'if' statement. Braces will not be
-// removed if the braced statement contains an 'else'.
-extern Option<iarf_e>
-mod_full_brace_if;
-
-// Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-// have, or do not have, braces. If true, braces will be added if any block
-// needs braces, and will only be removed if they can be removed from all
-// blocks.
-//
-// Overrides mod_full_brace_if.
-extern Option<bool>
-mod_full_brace_if_chain;
-
-// Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-// If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-// does not have an 'else if' or 'else'.
-extern Option<bool>
-mod_full_brace_if_chain_only;
-
-// Add or remove braces on single-line 'while' statement.
-extern Option<iarf_e>
-mod_full_brace_while;
-
-// Add or remove braces on single-line 'using ()' statement.
-extern Option<iarf_e>
-mod_full_brace_using;
-
-// Don't remove braces around statements that span N newlines
-extern BoundedOption<unsigned, 0, 5000>
-mod_full_brace_nl;
-
-// Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-// which span multiple lines.
-//
-// Affects:
-//   mod_full_brace_for
-//   mod_full_brace_if
-//   mod_full_brace_if_chain
-//   mod_full_brace_if_chain_only
-//   mod_full_brace_while
-//   mod_full_brace_using
-//
-// Does not affect:
-//   mod_full_brace_do
-//   mod_full_brace_function
-extern Option<bool>
-mod_full_brace_nl_block_rem_mlcond;
-
-// Add or remove unnecessary parenthesis on 'return' statement.
-extern Option<iarf_e>
-mod_paren_on_return;
-
-// (Pawn) Whether to change optional semicolons to real semicolons.
-extern Option<bool>
-mod_pawn_semicolon;
-
-// Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-// statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-extern Option<bool>
-mod_full_paren_if_bool;
-
-// Whether to remove superfluous semicolons.
-extern Option<bool>
-mod_remove_extra_semicolon;
-
-// If a function body exceeds the specified number of newlines and doesn't have
-// a comment after the close brace, a comment will be added.
-extern BoundedOption<unsigned, 0, 255>
-mod_add_long_function_closebrace_comment;
-
-// If a namespace body exceeds the specified number of newlines and doesn't
-// have a comment after the close brace, a comment will be added.
-extern BoundedOption<unsigned, 0, 255>
-mod_add_long_namespace_closebrace_comment;
-
-// If a class body exceeds the specified number of newlines and doesn't have a
-// comment after the close brace, a comment will be added.
-extern BoundedOption<unsigned, 0, 255>
-mod_add_long_class_closebrace_comment;
-
-// If a switch body exceeds the specified number of newlines and doesn't have a
-// comment after the close brace, a comment will be added.
-extern BoundedOption<unsigned, 0, 255>
-mod_add_long_switch_closebrace_comment;
-
-// If an #ifdef body exceeds the specified number of newlines and doesn't have
-// a comment after the #endif, a comment will be added.
-extern BoundedOption<unsigned, 0, 255>
-mod_add_long_ifdef_endif_comment;
-
-// If an #ifdef or #else body exceeds the specified number of newlines and
-// doesn't have a comment after the #else, a comment will be added.
-extern BoundedOption<unsigned, 0, 255>
-mod_add_long_ifdef_else_comment;
-
-// Whether to take care of the case by the mod_sort_xx options.
-extern Option<bool>
-mod_sort_case_sensitive;
-
-// Whether to sort consecutive single-line 'import' statements.
-extern Option<bool>
-mod_sort_import;
-
-// (C#) Whether to sort consecutive single-line 'using' statements.
-extern Option<bool>
-mod_sort_using;
-
-// Whether to sort consecutive single-line '#include' statements (C/C++) and
-// '#import' statements (Objective-C). Be aware that this has the potential to
-// break your code if your includes/imports have ordering dependencies.
-extern Option<bool>
-mod_sort_include;
-
-// Whether to prioritize '#include' and '#import' statements that contain
-// filename without extension when sorting is enabled.
-extern Option<bool>
-mod_sort_incl_import_prioritize_filename;
-
-// Whether to prioritize '#include' and '#import' statements that does not
-// contain extensions when sorting is enabled.
-extern Option<bool>
-mod_sort_incl_import_prioritize_extensionless;
-
-// Whether to prioritize '#include' and '#import' statements that contain
-// angle over quotes when sorting is enabled.
-extern Option<bool>
-mod_sort_incl_import_prioritize_angle_over_quotes;
-
-// Whether to ignore file extension in '#include' and '#import' statements
-// for sorting comparison.
-extern Option<bool>
-mod_sort_incl_import_ignore_extension;
-
-// Whether to group '#include' and '#import' statements when sorting is enabled.
-extern Option<bool>
-mod_sort_incl_import_grouping_enabled;
-
-// Whether to move a 'break' that appears after a fully braced 'case' before
-// the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-extern Option<bool>
-mod_move_case_break;
-
-// Add or remove braces around a fully braced case statement. Will only remove
-// braces if there are no variable declarations in the block.
-extern Option<iarf_e>
-mod_case_brace;
-
-// Whether to remove a void 'return;' that appears as the last statement in a
-// function.
-extern Option<bool>
-mod_remove_empty_return;
-
-// Add or remove the comma after the last value of an enumeration.
-extern Option<iarf_e>
-mod_enum_last_comma;
-
-// (OC) Whether to organize the properties. If true, properties will be
-// rearranged according to the mod_sort_oc_property_*_weight factors.
-extern Option<bool>
-mod_sort_oc_properties;
-
-// (OC) Weight of a class property modifier.
-extern Option<signed>
-mod_sort_oc_property_class_weight;
-
-// (OC) Weight of 'atomic' and 'nonatomic'.
-extern Option<signed>
-mod_sort_oc_property_thread_safe_weight;
-
-// (OC) Weight of 'readwrite' when organizing properties.
-extern Option<signed>
-mod_sort_oc_property_readwrite_weight;
-
-// (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-// 'weak', 'strong') when organizing properties.
-extern Option<signed>
-mod_sort_oc_property_reference_weight;
-
-// (OC) Weight of getter type ('getter=') when organizing properties.
-extern Option<signed>
-mod_sort_oc_property_getter_weight;
-
-// (OC) Weight of setter type ('setter=') when organizing properties.
-extern Option<signed>
-mod_sort_oc_property_setter_weight;
-
-// (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-// 'null_resettable') when organizing properties.
-extern Option<signed>
-mod_sort_oc_property_nullability_weight;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Preprocessor options
-
-// Add or remove indentation of preprocessor directives inside #if blocks
-// at brace level 0 (file-level).
-extern Option<iarf_e>
-pp_indent;
-
-// Whether to indent #if/#else/#endif at the brace level. If false, these are
-// indented from column 1.
-extern Option<bool>
-pp_indent_at_level;
-
-// Specifies the number of columns to indent preprocessors per level
-// at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-// the number of columns to indent preprocessors per level
-// at brace level > 0 (function-level).
-extern BoundedOption<unsigned, 0, 16>
-pp_indent_count; // = 1
-
-// Add or remove space after # based on pp_level of #if blocks.
-extern Option<iarf_e>
-pp_space;
-
-// Sets the number of spaces per level added with pp_space.
-extern BoundedOption<unsigned, 0, 16>
-pp_space_count;
-
-// The indent for '#region' and '#endregion' in C# and '#pragma region' in
-// C/C++. Negative values decrease indent down to the first column.
-extern BoundedOption<signed, -16, 16>
-pp_indent_region;
-
-// Whether to indent the code between #region and #endregion.
-extern Option<bool>
-pp_region_indent_code;
-
-// If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-// not at file-level. Negative values decrease indent down to the first column.
-//
-// =0: Indent preprocessors using output_tab_size
-// >0: Column at which all preprocessors will be indented
-extern BoundedOption<signed, -16, 16>
-pp_indent_if;
-
-// Whether to indent the code between #if, #else and #endif.
-extern Option<bool>
-pp_if_indent_code;
-
-// Whether to indent '#define' at the brace level. If false, these are
-// indented from column 1.
-extern Option<bool>
-pp_define_at_level;
-
-// Whether to ignore the '#define' body while formatting.
-extern Option<bool>
-pp_ignore_define_body;
-
-// TODO The following descriptions are confusing and suffer from sub-optimal
-// grammar, and should be revised; from here...
-
-// Whether to indent case statements between #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the case statements
-// directly inside of.
-extern Option<bool>
-pp_indent_case; // = true
-
-// Whether to indent whole function definitions between #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the function definition
-// is directly inside of.
-extern Option<bool>
-pp_indent_func_def; // = true
-
-// Whether to indent extern C blocks between #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the extern block is
-// directly inside of.
-extern Option<bool>
-pp_indent_extern; // = true
-
-// Whether to indent braces directly inside #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the braces are directly
-// inside of.
-extern Option<bool>
-pp_indent_brace; // = true
-
-// TODO ...until here.
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Sort includes options
-
-// The regex for include category with priority 0.
-extern Option<string>
-include_category_0;
-
-// The regex for include category with priority 1.
-extern Option<string>
-include_category_1;
-
-// The regex for include category with priority 2.
-extern Option<string>
-include_category_2;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Use or Do not Use options
-
-// true:  indent_func_call_param will be used (default)
-// false: indent_func_call_param will NOT be used
-extern Option<bool>
-use_indent_func_call_param; // = true
-
-// The value of the indentation for a continuation line is calculated
-// differently if the statement is:
-// - a declaration: your case with QString fileName ...
-// - an assignment: your case with pSettings = new QSettings( ...
-//
-// At the second case the indentation value might be used twice:
-// - at the assignment
-// - at the function call (if present)
-//
-// To prevent the double use of the indentation value, use this option with the
-// value 'true'.
-//
-// true:  indent_continue will be used only once
-// false: indent_continue will be used every time (default)
-extern Option<bool>
-use_indent_continue_only_once;
-
-// The value might be used twice:
-// - at the assignment
-// - at the opening brace
-//
-// To prevent the double use of the indentation value, use this option with the
-// value 'true'.
-//
-// true:  indentation will be used only once
-// false: indentation will be used every time (default)
-extern Option<bool>
-indent_cpp_lambda_only_once;
-
-// Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-// historic behavior, but is probably not the desired behavior, so this is off
-// by default.
-extern Option<bool>
-use_sp_after_angle_always;
-
-// Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-// this tries to format these so that they match Qt's normalized form (i.e. the
-// result of QMetaObject::normalizedSignature), which can slightly improve the
-// performance of the QObject::connect call, rather than how they would
-// otherwise be formatted.
-//
-// See options_for_QT.cpp for details.
-extern Option<bool>
-use_options_overriding_for_qt_macros; // = true
-
-// If true: the form feed character is removed from the list of whitespace
-// characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
-extern Option<bool>
-use_form_feed_no_more_as_whitespace_character;
-
-//END
-
-///////////////////////////////////////////////////////////////////////////////
-//BEGIN Warn levels - 1: error, 2: warning (default), 3: note
-
-// (C#) Warning is given if doing tab-to-\t replacement and we have found one
-// in a C# verbatim string literal.
-extern BoundedOption<unsigned, 1, 3>
-warn_level_tabs_found_in_verbatim_string_literals; // = LWARN
-
-// For debugging purpose only.
-
-// Limit the number of loops.
-// Used by uncrustify.cpp to exit from infinite loop.
-// 0: no limit.
-extern Option<signed>
-debug_max_number_of_loops;
-
-// Set the number of the line to protocol;
-// Used in the function prot_the_line if the 2. parameter is zero.
-// 0: nothing protocol.
-extern Option<signed>
-debug_line_number_to_protocol;
-
-// Set the number of second(s) before terminating formatting the current file,
-// 0: no timeout.
-// only for linux
-extern Option<signed>
-debug_timeout;
-
-// Set the number of characters to be printed if the text is too long,
-// 0: do not truncate.
-extern BoundedOption<unsigned, 0, 960>
-debug_truncate;
-
-//END
-
-} // namespace options
-
-} // namespace uncrustify
-
-#endif /* OPTIONS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.cpp
deleted file mode 100644
index f4a1d040..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * @file options_for_QT.cpp
- * Save the options which are needed to be changed to
- * process the SIGNAL and SLOT QT macros.
- * http://doc.qt.io/qt-4.8/qtglobal.html
- *
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
- * @license GPL v2+
- */
-
-#include "options_for_QT.h"
-
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LQT;
-
-using namespace uncrustify;
-
-// for the modification of options within the SIGNAL/SLOT call.
-bool   QT_SIGNAL_SLOT_found = false;
-size_t QT_SIGNAL_SLOT_level = 0;
-bool   restoreValues        = false;
-
-namespace
-{
-
-//-----------------------------------------------------------------------------
-class temporary_iarf_option
-{
-public:
-   temporary_iarf_option(Option<iarf_e> *option,
-                         iarf_e         override_value = IARF_REMOVE)
-      : m_option{option}
-      , m_override_value{override_value}
-   {}
-
-   void save_and_override();
-   void restore();
-
-private:
-   Option<iarf_e> *m_option;
-   const iarf_e   m_override_value;
-
-   iarf_e         m_saved_value = IARF_NOT_DEFINED;
-};
-
-
-//-----------------------------------------------------------------------------
-void temporary_iarf_option::save_and_override()
-{
-   m_saved_value = (*m_option)();
-   (*m_option)   = m_override_value;
-}
-
-
-//-----------------------------------------------------------------------------
-void temporary_iarf_option::restore()
-{
-   (*m_option)   = m_saved_value;
-   m_saved_value = IARF_NOT_DEFINED;
-}
-
-//-----------------------------------------------------------------------------
-temporary_iarf_option for_qt_options[] =
-{
-   { &options::sp_inside_fparen           },
-// Issue #481
-// connect( timer,SIGNAL( timeout() ),this,SLOT( timeoutImage() ) );
-   { &options::sp_inside_fparens          },
-   { &options::sp_paren_paren             },
-   { &options::sp_before_comma            },
-   { &options::sp_after_comma             },
-// Bug #654
-// connect(&mapper, SIGNAL(mapped(QString &)), this, SLOT(onSomeEvent(QString &)));
-   { &options::sp_before_byref            },
-   { &options::sp_before_unnamed_byref    },
-   { &options::sp_after_type              },
-// Issue #1969
-// connect( a, SIGNAL(b(c *)), this, SLOT(d(e *)) );
-   { &options::sp_before_ptr_star         },
-   { &options::sp_before_unnamed_ptr_star },
-// connect( a, SIGNAL(b(c< d >)), this, SLOT(e(f< g >)) );
-   { &options::sp_inside_angle            },
-};
-
-} // anonymous namespace
-
-
-//-----------------------------------------------------------------------------
-void save_set_options_for_QT(size_t level)
-{
-   log_rule_B("use_options_overriding_for_qt_macros");
-   assert(options::use_options_overriding_for_qt_macros());
-
-   LOG_FMT(LGUY, "save values, level=%zu\n", level);
-   // save the values
-   QT_SIGNAL_SLOT_level = level;
-
-   for (auto &opt : for_qt_options)
-   {
-      opt.save_and_override();
-   }
-
-   QT_SIGNAL_SLOT_found = true;
-}
-
-
-//-----------------------------------------------------------------------------
-void restore_options_for_QT(void)
-{
-   log_rule_B("use_options_overriding_for_qt_macros");
-   assert(options::use_options_overriding_for_qt_macros());
-
-   LOG_FMT(LGUY, "restore values\n");
-   // restore the values we had before SIGNAL/SLOT
-   QT_SIGNAL_SLOT_level = 0;
-
-   for (auto &opt : for_qt_options)
-   {
-      opt.restore();
-   }
-
-   QT_SIGNAL_SLOT_found = false;
-   restoreValues        = false;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.h
deleted file mode 100644
index c114eb75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @file options_for_QT.h
- * Save the options which are needed to be changed to
- * process the SIGNAL and SLOT QT macros.
- * http://doc.qt.io/qt-4.8/qtglobal.html
- *
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          January 2016
- * @license GPL v2+
- */
-
-#ifndef OPTIONS_FOR_QT_H_INCLUDED
-#define OPTIONS_FOR_QT_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-// TODO can we avoid those extern variables?
-extern bool   QT_SIGNAL_SLOT_found;
-extern size_t QT_SIGNAL_SLOT_level;
-extern bool   restoreValues;
-
-
-void save_set_options_for_QT(size_t level);
-
-
-void restore_options_for_QT(void);
-
-
-#endif /* OPTIONS_FOR_QT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.cpp
deleted file mode 100644
index fd60ebab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.cpp
+++ /dev/null
@@ -1,3319 +0,0 @@
-/**
- * @file output.cpp
- * Does all the output & comment formatting.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel October 2015, 2021
- * @license GPL v2+
- */
-
-#include "output.h"
-
-#include "align_tab_column.h"
-#include "braces.h"
-#include "indent.h"
-#include "prototypes.h"
-#include "tokenize.h"
-#include "unc_ctype.h"
-#include "unicode.h"
-
-#include <regex>
-#include <set>
-
-#ifdef WIN32
-#include <map>                    // to get std::map
-#endif // WIN32
-
-
-constexpr static auto LCURRENT = LOUTPUT;
-
-using namespace uncrustify;
-
-
-struct cmt_reflow
-{
-   chunk_t  *pc         = nullptr;
-   size_t   column      = 0;   //! Column of the comment start
-   size_t   brace_col   = 0;   //! Brace column (for indenting with tabs)
-   size_t   base_col    = 0;   //! Base column (for indenting with tabs)
-   size_t   word_count  = 0;   //! number of words on this line
-   size_t   xtra_indent = 0;   //! extra indent of non-first lines (0 or 1)
-   unc_text cont_text;         //! fixed text to output at the start of a line (0 to 3 chars)
-   bool     reflow = false;    //! reflow the current line
-};
-
-
-/**
- * A multiline comment
- * The only trick here is that we have to trim out whitespace characters
- * to get the comment to line up.
- */
-static void output_comment_multi(chunk_t *pc);
-
-
-static bool kw_fcn_filename(chunk_t *cmt, unc_text &out_txt);
-
-
-static bool kw_fcn_class(chunk_t *cmt, unc_text &out_txt);
-
-
-static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt);
-
-
-static bool kw_fcn_category(chunk_t *cmt, unc_text &out_txt);
-
-
-static bool kw_fcn_scope(chunk_t *cmt, unc_text &out_txt);
-
-
-static bool kw_fcn_function(chunk_t *cmt, unc_text &out_txt);
-
-
-/**
- * Adds the javadoc-style @param and @return stuff, based on the params and
- * return value for pc.
- * If the arg list is '()' or '(void)', then no @params are added.
- * Likewise, if the return value is 'void', then no @return is added.
- */
-static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt);
-
-
-static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt);
-
-
-/**
- * Output a multiline comment without any reformatting other than shifting
- * it left or right to get the column right.
- *
- * Trims trailing whitespaces.
- */
-static void output_comment_multi_simple(chunk_t *pc);
-
-
-/**
- * This renders the #if condition to a string buffer.
- *
- * @param[out] dst    unc_text buffer to be filled
- * @param[in]  ifdef  if conditional as chunk list
- */
-static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef);
-
-
-/**
- * Do keyword substitution on a comment.
- * NOTE: it is assumed that a comment will contain at most one of each type
- * of keyword.
- */
-static void do_kw_subst(chunk_t *pc);
-
-
-//! All output text is sent here, one char at a time.
-static void add_char(UINT32 ch, bool is_literal = false);
-
-
-static void add_text(const char *ascii_text);
-
-
-static void add_text(const unc_text &text, bool is_ignored, bool is_literal);
-
-
-/**
- * Count the number of characters to the end of the next chunk of text.
- * If it exceeds the limit, return true.
- */
-static bool next_word_exceeds_limit(const unc_text &text, size_t idx);
-
-
-/**
- * Output a comment to the column using indent_with_tabs and
- * indent_cmt_with_tabs as the rules.
- * base_col is the indent of the first line of the comment.
- * On the first line, column == base_col.
- * On subsequent lines, column >= base_col.
- *
- * @param brace_col  the brace-level indent of the comment
- * @param base_col   the indent of the start of the comment (multiline)
- * @param column     the column that we should end up in
- */
-static void cmt_output_indent(size_t brace_col, size_t base_col, size_t column);
-
-
-/**
- * Checks for and updates the lead chars.
- *
- * @param line the comment line
- *
- * @return 0: not present, >0: number of chars that are part of the lead
- */
-static size_t cmt_parse_lead(const unc_text &line, bool is_last);
-
-
-/**
- * Scans a multiline comment to determine the following:
- *  - the extra indent of the non-first line (0 or 1)
- *  - the continuation text ('' or '* ')
- *
- * The decision is based on:
- *  - cmt_indent_multi
- *  - cmt_star_cont
- *  - cmt_multi_first_len_minimum
- *  - the first line length
- *  - the second line leader length
- *  - the last line length (without leading space/tab)
- *
- * If the first and last line are the same length and don't contain any alnum
- * chars and (the first line len > 2 or the second leader is the same as the
- * first line length), then the indent is 0.
- *
- * If the leader on the second line is 1 wide or missing, then the indent is 1.
- *
- * Otherwise, the indent is 0.
- *
- * @param str        The comment string
- * @param len        Length of the comment
- * @param start_col  Starting column
- *
- * @return cmt.xtra_indent is set to 0 or 1
- */
-static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str);
-
-
-static int next_up(const unc_text &text, size_t idx, unc_text &tag);
-
-
-/**
- * Outputs the C comment at pc.
- * C comment combining is done here
- *
- * @return the last chunk output'd
- */
-static chunk_t *output_comment_c(chunk_t *pc);
-
-
-/**
- * Outputs the CPP comment at pc.
- * CPP comment combining is done here
- *
- * @return the last chunk output'd
- */
-static chunk_t *output_comment_cpp(chunk_t *pc);
-
-
-static void cmt_trim_whitespace(unc_text &line, bool in_preproc);
-
-
-/**
- * Outputs a comment. The initial opening '//' may be included in the text.
- * Subsequent openings (if combining comments), should not be included.
- * The closing (for C/D comments) should not be included.
- *
- * TODO:
- * If reflowing text, the comment should be added one word (or line) at a time.
- * A newline should only be sent if a blank line is encountered or if the next
- * line is indented beyond the current line (optional?).
- * If the last char on a line is a ':' or '.', then the next line won't be
- * combined.
- */
-static void add_comment_text(const unc_text &text, cmt_reflow &cmt, bool esc_close, size_t continuation_indent = 0);
-
-
-static void output_cmt_start(cmt_reflow &cmt, chunk_t *pc);
-
-
-/**
- * Checks to see if the current comment can be combined with the next comment.
- * The two can be combined if:
- *  1. They are the same type
- *  2. There is exactly one newline between then
- *  3. They are indented to the same level
- */
-static bool can_combine_comment(chunk_t *pc, cmt_reflow &cmt);
-
-
-#define LOG_CONTTEXT() \
-   LOG_FMT(LCONTTEXT, "%s(%d): set cont_text to '%s'\n", __func__, __LINE__, cmt.cont_text.c_str())
-
-
-static void add_spaces()
-{
-   while (cpd.spaces > 0)
-   {
-      write_char(' ');
-      cpd.spaces--;
-   }
-}
-
-
-static void add_char(UINT32 ch, bool is_literal)
-{
-   // If we did a '\r' and it isn't followed by a '\n', then output a newline
-   if (  (cpd.last_char == '\r')
-      && (ch != '\n'))
-   {
-      write_string(cpd.newline);
-      cpd.column      = 1;
-      cpd.did_newline = 1;
-      cpd.spaces      = 0;
-   }
-
-   // convert a newline into the LF/CRLF/CR sequence
-   if (ch == '\n')
-   {
-      add_spaces();
-      write_string(cpd.newline);
-      cpd.column      = 1;
-      cpd.did_newline = 1;
-      cpd.spaces      = 0;
-   }
-   else if (ch == '\r') // do not output the CARRIAGERETURN
-   {
-      // do not output '\r'
-      cpd.column      = 1;
-      cpd.did_newline = 1;
-      cpd.spaces      = 0;
-   }
-   else if (  (ch == '\t')
-           && cpd.output_tab_as_space)
-   {
-      size_t endcol = next_tab_column(cpd.column);
-
-      while (cpd.column < endcol)
-      {
-         add_char(' ');
-      }
-      return;
-   }
-   else
-   {
-      // explicitly disallow a tab after a space
-      if (  !is_literal
-         && ch == '\t'
-         && cpd.last_char == ' ')
-      {
-         log_rule_B("indent_with_tabs");
-
-         if (options::indent_with_tabs() == 0)
-         {
-            size_t endcol = next_tab_column(cpd.column);
-
-            while (cpd.column < endcol)
-            {
-               add_char(' ');
-            }
-            return;
-         }
-      }
-
-      if (  (ch == ' ')
-         && !cpd.output_trailspace)
-      {
-         cpd.spaces++;
-         cpd.column++;
-      }
-      else
-      {
-         add_spaces();
-         write_char(ch);
-
-         if (ch == '\t')
-         {
-            cpd.column = next_tab_column(cpd.column);
-         }
-         else
-         {
-            cpd.column++;
-         }
-      }
-   }
-   cpd.last_char = ch;
-} // add_char
-
-
-static void add_text(const char *ascii_text)
-{
-   char ch;
-
-   while ((ch = *ascii_text) != 0)
-   {
-      ascii_text++;
-      add_char(ch);
-   }
-}
-
-
-static void add_text(const unc_text &text, bool is_ignored = false, bool is_literal = false)
-{
-   for (size_t idx = 0; idx < text.size(); idx++)
-   {
-      int ch = text[idx];
-
-      if (is_ignored)
-      {
-         write_char(ch);
-      }
-      else
-      {
-         add_char(ch, is_literal);
-      }
-   }
-}
-
-
-static bool next_word_exceeds_limit(const unc_text &text, size_t idx)
-{
-   LOG_FMT(LCONTTEXT, "%s(%d): idx is %zu\n",
-           __func__, __LINE__, idx);
-   size_t length = 0;
-
-   // Count any whitespace
-   while (  (idx < text.size())
-         && unc_isspace(text[idx]))
-   {
-      idx++;
-      length++;
-   }
-
-   // Count non-whitespace
-   while (  (idx < text.size())
-         && !unc_isspace(text[idx]))
-   {
-      idx++;
-      length++;
-   }
-   return((cpd.column + length - 1) > options::cmt_width());
-}
-
-
-/**
- * Advance to a specific column
- * cpd.column is the current column
- *
- * @param column  The column to advance to
- */
-static void output_to_column(size_t column, bool allow_tabs)
-{
-   cpd.did_newline = 0;
-
-   if (allow_tabs)
-   {
-      // tab out as far as possible and then use spaces
-      size_t next_column = next_tab_column(cpd.column);
-
-      while (next_column <= column)
-      {
-         add_text("\t");
-         next_column = next_tab_column(cpd.column);
-      }
-   }
-
-   // space out the final bit
-   while (cpd.column < column)
-   {
-      add_text(" ");
-   }
-}
-
-
-static void cmt_output_indent(size_t brace_col, size_t base_col, size_t column)
-{
-   log_rule_B("indent_cmt_with_tabs");
-   log_rule_B("indent_with_tabs");
-   size_t iwt = options::indent_cmt_with_tabs() ? 2 :
-                (options::indent_with_tabs() ? 1 : 0);
-
-   size_t tab_col = (iwt == 0) ? 0 : ((iwt == 1) ? brace_col : base_col);
-
-   // LOG_FMT(LSYS, "%s(brace=%zd base=%zd col=%zd iwt=%zd) tab=%zd cur=%zd\n",
-   //        __func__, brace_col, base_col, column, iwt, tab_col, cpd.column);
-
-   cpd.did_newline = 0;
-
-   if (  iwt == 2
-      || (  cpd.column == 1
-         && iwt == 1))
-   {
-      // tab out as far as possible and then use spaces
-      while (next_tab_column(cpd.column) <= tab_col)
-      {
-         add_text("\t");
-      }
-   }
-
-   // space out the rest
-   while (cpd.column < column)
-   {
-      add_text(" ");
-   }
-} // cmt_output_indent
-
-
-void output_parsed(FILE *pfile)
-{
-   const char *eol_marker = get_eol_marker();
-
-   save_option_file(pfile, false, true);
-
-   fprintf(pfile, "# -=====-%s", eol_marker);
-   fprintf(pfile, "# number of loops               = %d\n", cpd.changes);
-   fprintf(pfile, "# -=====-%s", eol_marker);
-   fprintf(pfile, "# language                      = %s\n", language_name_from_flags(cpd.lang_flags));
-   fprintf(pfile, "# -=====-%s", eol_marker);
-   // MAXLENGTHOFTHENAME must be consider at the format line at the file
-   // output.cpp, line 427: fprintf(pfile, "# Line              Tag                Parent...
-   // and              430: ... fprintf(pfile, "%s# %3zu>%19.19s[%19.19s] ...
-   // here                                                xx xx   xx xx
-#ifdef WIN32
-   fprintf(pfile, "# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp     Nl  Text");
-#else // not WIN32
-   fprintf(pfile, "# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp      Flag   Nl  Text");
-#endif // ifdef WIN32
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-#ifdef WIN32
-      fprintf(pfile, "%s# %3d>%19.19s|%19.19s|%19.19s[%3d/%3d/%3d/%3d][%d/%d/%d][%d-%d]",
-              eol_marker, (int)pc->orig_line, get_token_name(pc->type),
-              get_token_name(get_chunk_parent_type(pc)), get_token_name(get_type_of_the_parent(pc)),
-              (int)pc->column, (int)pc->orig_col, (int)pc->orig_col_end, (int)pc->orig_prev_sp,
-              (int)pc->brace_level, (int)pc->level, (int)pc->pp_level, (int)pc->nl_count, pc->after_tab);
-#else // not WIN32
-      fprintf(pfile, "%s# %3zu>%19.19s|%19.19s|%19.19s[%3zu/%3zu/%3zu/%3d][%zu/%zu/%zu]",
-              eol_marker, pc->orig_line, get_token_name(pc->type),
-              get_token_name(get_chunk_parent_type(pc)), get_token_name(get_type_of_the_parent(pc)),
-              pc->column, pc->orig_col, pc->orig_col_end, pc->orig_prev_sp,
-              pc->brace_level, pc->level, pc->pp_level);
-      fprintf(pfile, "[%11llx]",
-              static_cast<pcf_flags_t::int_t>(pc->flags));
-      fprintf(pfile, "[%zu-%d]",
-              pc->nl_count, pc->after_tab);
-#endif // ifdef WIN32
-
-      if (  pc->type != CT_NEWLINE
-         && (pc->len() != 0))
-      {
-         for (size_t cnt = 0; cnt < pc->column; cnt++)
-         {
-            fprintf(pfile, " ");
-         }
-
-         if (pc->type != CT_NL_CONT)
-         {
-            fprintf(pfile, "%s", pc->text());
-         }
-         else
-         {
-            fprintf(pfile, "\\");
-         }
-      }
-   }
-
-   fprintf(pfile, "%s# -=====-%s", eol_marker, eol_marker);
-   fflush(pfile);
-} // output_parsed
-
-
-void output_parsed_csv(FILE *pfile)
-{
-   const char *eol_marker = get_eol_marker();
-
-   fprintf(pfile, "number of loops,%d,\n", cpd.changes);
-   fprintf(pfile, "language,%s,\n", language_name_from_flags(cpd.lang_flags));
-   fprintf(pfile, "Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,"
-           "Orig Col End,Orig Sp Before,Br,Lvl,pp,Flags,Nl Before,Nl After,Text,");
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      fprintf(pfile, "%s%zu,%s,%s,%s,%zu,%zu,%zu,%d,%zu,%zu,%zu,",
-              eol_marker, pc->orig_line, get_token_name(pc->type),
-              get_token_name(get_chunk_parent_type(pc)), get_token_name(get_type_of_the_parent(pc)),
-              pc->column, pc->orig_col, pc->orig_col_end, pc->orig_prev_sp,
-              pc->brace_level, pc->level, pc->pp_level);
-
-      auto pcf_flag_str = pcf_flags_str(pcf_flag_e(pc->flags));
-#ifdef WIN32
-      auto pcf_flag_str_start = pcf_flag_str.find("[") + 1;
-#else // not WIN32
-      auto pcf_flag_str_start = pcf_flag_str.find(":") + 1;
-#endif // ifdef WIN32
-      auto pcf_flag_str_end = pcf_flag_str.find("]");
-      auto pcf_names        = pcf_flag_str.substr(pcf_flag_str_start,
-                                                  pcf_flag_str_end - pcf_flag_str_start);
-      fprintf(pfile, "\"%s\",", pcf_names.c_str());
-      fprintf(pfile, "%zu,%d,",
-              pc->nl_count, pc->after_tab);
-
-      if (  pc->type != CT_NEWLINE
-         && (pc->len() != 0))
-      {
-         fprintf(pfile, "\"");
-
-         for (size_t cnt = 0; cnt < pc->column; cnt++)
-         {
-            fprintf(pfile, " ");
-         }
-
-         if (pc->type != CT_NL_CONT)
-         {
-            for (auto *ch = pc->text(); *ch != '\0'; ++ch)
-            {
-               fprintf(pfile, "%c", *ch);
-
-               if (*ch == '"')
-               {
-                  // need to escape the double-quote for csv-format
-                  fprintf(pfile, "\"");
-               }
-            }
-         }
-         else
-         {
-            fprintf(pfile, "\\");
-         }
-         fprintf(pfile, "\"");
-      }
-   }
-
-   fflush(pfile);
-} // output_parsed_csv
-
-
-void output_text(FILE *pfile)
-{
-   bool tracking = cpd.html_file != nullptr;                 // special for debugging
-
-   cpd.fout        = pfile;
-   cpd.did_newline = 1;
-   cpd.column      = 1;
-
-   if (cpd.bom)
-   {
-      write_bom();
-   }
-   chunk_t *pc;
-
-   if (cpd.frag_cols > 0)
-   {
-      size_t indent = cpd.frag_cols - 1;
-
-      // loop over the whole chunk list
-      for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-      {
-         pc->column        += indent;
-         pc->column_indent += indent;
-      }
-
-      cpd.frag_cols = 0;
-   }
-
-   if (tracking)
-   {
-      add_text("<html>\n");
-      add_text("<head>\n");
-      add_text("   <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/>\n");
-      add_text("   <title>Uncrustify: where do the Spaces options work</title>\n");
-      add_text("</head>\n");
-      add_text("<body lang=\"en-US\">\n");
-      add_text("<p>\n");
-      add_text("</p>\n");
-      add_text("<pre>\n");
-   }
-   bool write_in_tracking = false;
-
-   // loop over the whole chunk list
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      char copy[1000];
-      LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s', type is %s, orig_line is %zu, column is %zu, nl is %zu\n",
-              __func__, __LINE__, pc->elided_text(copy), get_token_name(pc->type), pc->orig_line, pc->column, pc->nl_count);
-      log_rule_B("cmt_convert_tab_to_spaces");
-      cpd.output_tab_as_space = (  options::cmt_convert_tab_to_spaces()
-                                && chunk_is_comment(pc));
-
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         for (size_t cnt = 0; cnt < pc->nl_count; cnt++)
-         {
-            if (  cnt > 0
-               && pc->nl_column > 1)
-            {
-               log_rule_B("indent_with_tabs");
-               output_to_column(pc->nl_column, (options::indent_with_tabs() == 2));
-            }
-            add_char('\n');
-         }
-
-         cpd.did_newline = 1;
-         cpd.column      = 1;
-         LOG_FMT(LOUTIND, " xx\n");
-      }
-      else if (chunk_is_token(pc, CT_NL_CONT))
-      {
-         // FIXME: this really shouldn't be done here!
-         if (!pc->flags.test(PCF_WAS_ALIGNED))
-         {
-            // Add or remove space before a backslash-newline at the end of a line.
-            log_rule_B("sp_before_nl_cont");
-
-            if (options::sp_before_nl_cont() & IARF_REMOVE)
-            {
-               log_rule_B("sp_before_nl_cont");
-               pc->column = cpd.column + (options::sp_before_nl_cont() == IARF_FORCE);
-            }
-            else
-            {
-               // Try to keep the same relative spacing
-               chunk_t *prev = chunk_get_prev(pc);
-
-               if (chunk_is_token(prev, CT_PP_IGNORE))
-               {
-                  /*
-                   * Want to completely leave alone PP_IGNORE'd blocks because
-                   * they likely have special column aligned newline
-                   * continuations (common in multiline macros)
-                   */
-                  pc->column = pc->orig_col;
-               }
-               else
-               {
-                  // Try to keep the same relative spacing
-                  while (  prev != nullptr
-                        && prev->orig_col == 0
-                        && prev->nl_count == 0)
-                  {
-                     prev = chunk_get_prev(prev);
-                  }
-
-                  if (  prev != nullptr
-                     && prev->nl_count == 0)
-                  {
-                     int orig_sp = (pc->orig_col - prev->orig_col_end);
-
-                     if ((int)(cpd.column + orig_sp) < 0)
-                     {
-#ifdef WIN32
-                        fprintf(stderr, "FATAL: negative value.\n   pc->orig_col is %d, prev->orig_col_end is %d\n",
-                                (int)pc->orig_col, (int)prev->orig_col_end);
-#else // not WIN32
-                        fprintf(stderr, "FATAL: negative value.\n   pc->orig_col is %zu, prev->orig_col_end is %zu\n",
-                                pc->orig_col, prev->orig_col_end);
-#endif // ifdef WIN32
-                        log_flush(true);
-                        exit(EX_SOFTWARE);
-                     }
-                     pc->column = cpd.column + orig_sp;
-
-                     // Add or remove space before a backslash-newline at the end of a line.
-                     log_rule_B("sp_before_nl_cont");
-
-                     if (  (options::sp_before_nl_cont() != IARF_IGNORE)
-                        && (pc->column < (cpd.column + 1)))
-                     {
-                        pc->column = cpd.column + 1;
-                     }
-                  }
-               }
-            }
-            output_to_column(pc->column, false);
-         }
-         else
-         {
-            log_rule_B("indent_with_tabs");
-            output_to_column(pc->column, (options::indent_with_tabs() == 2));
-         }
-         add_char('\\');
-         add_char('\n');
-         cpd.did_newline = 1;
-         cpd.column      = 1;
-         LOG_FMT(LOUTIND, " \\xx\n");
-      }
-      else if (chunk_is_token(pc, CT_COMMENT_MULTI))
-      {
-         log_rule_B("cmt_indent_multi");
-
-         if (options::cmt_indent_multi())
-         {
-            output_comment_multi(pc);
-         }
-         else
-         {
-            output_comment_multi_simple(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_COMMENT_CPP))
-      {
-         bool tmp = cpd.output_trailspace;
-         /*
-          * keep trailing spaces if they are still present in a chunk;
-          * note that tokenize() already strips spaces in comments,
-          * so if they made it up to here, they are to stay
-          */
-         cpd.output_trailspace = true;
-         pc                    = output_comment_cpp(pc);
-         cpd.output_trailspace = tmp;
-      }
-      else if (chunk_is_token(pc, CT_COMMENT))
-      {
-         pc = output_comment_c(pc);
-      }
-      else if (  chunk_is_token(pc, CT_JUNK)
-              || chunk_is_token(pc, CT_IGNORED))
-      {
-         LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, orig_col is %zu,\npc->text() >%s<, pc->str.size() is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), pc->str.size());
-         // do not adjust the column for junk
-         add_text(pc->str, true);
-      }
-      else if (pc->len() == 0)
-      {
-         // don't do anything for non-visible stuff
-         LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, column is %zu, non-visible stuff: type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->column, get_token_name(pc->type));
-      }
-      else
-      {
-         bool allow_tabs;
-         cpd.output_trailspace = (chunk_is_token(pc, CT_STRING_MULTI));
-
-         // indent to the 'level' first
-         if (cpd.did_newline)
-         {
-            log_rule_B("indent_with_tabs");
-
-            if (options::indent_with_tabs() == 1)
-            {
-               size_t lvlcol;
-
-               /*
-                * FIXME: it would be better to properly set column_indent in
-                * indent_text(), but this hack for '}' and '#' seems to work.
-                */
-               if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                  || chunk_is_token(pc, CT_CASE_COLON)
-                  || chunk_is_token(pc, CT_PREPROC))
-               {
-                  lvlcol = pc->column;
-               }
-               else
-               {
-                  lvlcol = pc->column_indent;
-
-                  if (lvlcol > pc->column)
-                  {
-                     lvlcol = pc->column;
-                  }
-               }
-
-               if (lvlcol > 1)
-               {
-                  output_to_column(lvlcol, true);
-               }
-            }
-            log_rule_B("indent_with_tabs");
-            allow_tabs = (options::indent_with_tabs() == 2)
-                         || (  chunk_is_comment(pc)
-                            && options::indent_with_tabs() != 0);
-
-            LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, column is %zu, column_indent is %zu, cpd.column is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->column, pc->column_indent, cpd.column);
-         }
-         else
-         {
-            /*
-             * Reformatting multi-line comments can screw up the column.
-             * Make sure we don't mess up the spacing on this line.
-             * This has to be done here because comments are not formatted
-             * until the output phase.
-             */
-            if (pc->column < cpd.column)
-            {
-               reindent_line(pc, cpd.column);
-            }
-            // not the first item on a line
-            chunk_t *prev = chunk_get_prev(pc);
-            log_rule_B("align_with_tabs");
-            allow_tabs = (  options::align_with_tabs()
-                         && pc->flags.test(PCF_WAS_ALIGNED)
-                         && ((prev->column + prev->len() + 1) != pc->column));
-
-            log_rule_B("align_keep_tabs");
-
-            if (options::align_keep_tabs())
-            {
-               allow_tabs |= pc->after_tab;
-            }
-            LOG_FMT(LOUTIND, "%s(%d): at column %zu(%s)\n",
-                    __func__, __LINE__, pc->column, (allow_tabs ? "true" : "FALSE"));
-         }
-         output_to_column(pc->column, allow_tabs);
-
-         if (write_in_tracking)
-         {
-            if (chunk_is_token(pc, CT_ANGLE_OPEN))
-            {
-               add_text("&lt;", false, false);
-            }
-            else if (chunk_is_token(pc, CT_ANGLE_CLOSE))
-            {
-               add_text("&gt;", false, false);
-            }
-            else
-            {
-               add_text(pc->str, false, chunk_is_token(pc, CT_STRING));
-            }
-            write_in_tracking = false;
-         }
-         else
-         {
-            add_text(pc->str, false, chunk_is_token(pc, CT_STRING));
-         }
-
-         if (chunk_is_token(pc, CT_PP_DEFINE))  // Issue #876
-         {
-            // If true, a <TAB> is inserted after #define.
-            log_rule_B("force_tab_after_define");
-
-            if (options::force_tab_after_define())
-            {
-               add_char('\t');
-            }
-         }
-         cpd.did_newline       = chunk_is_newline(pc);
-         cpd.output_trailspace = false;
-      }
-
-      if (pc->tracking != nullptr)
-      {
-         LOG_FMT(LGUY, " Tracking info are: \n");
-         LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->tracking->size());
-         add_text("<a title=\"");
-         char tempText[80];
-
-         for (size_t track = 0; track < pc->tracking->size(); track++)
-         {
-            track_list *A       = pc->tracking;
-            Track_nr   B        = A->at(track);
-            size_t     Bfirst   = B.first;
-            char       *Bsecond = B.second;
-
-            sprintf(tempText, "%zu", Bfirst);
-            add_text(tempText);
-            add_text(",");
-
-            if (track == pc->tracking->size() - 1)
-            {
-               sprintf(tempText, "%s", Bsecond);
-               add_text(tempText);
-            }
-            LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
-            LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
-         }
-
-         add_text("\"><font color=\"red\">M</font></a>");
-         write_in_tracking = true;
-      }
-   }
-
-   if (tracking)
-   {
-      add_text("</pre>\n");
-      add_text("</body>\n");
-      add_text("</html>\n");
-   }
-} // output_text
-
-
-static size_t cmt_parse_lead(const unc_text &line, bool is_last)
-{
-   size_t len = 0;
-
-   while (  len < 32
-         && len < line.size()) // TODO what is the meaning of 32?
-   {
-      if (  len > 0
-         && line[len] == '/')
-      {
-         // ignore combined comments
-         size_t tmp = len + 1;
-
-         while (  tmp < line.size()
-               && unc_isspace(line[tmp]))
-         {
-            tmp++;
-         }
-
-         if (  tmp < line.size()
-            && line[tmp] == '/')
-         {
-            return(1);
-         }
-         break;
-      }
-      else if (strchr("*|\\#+", line[len]) == nullptr)
-      {
-         break;  // none of the characters '*|\#+' found in line
-      }
-      len++;
-   }
-
-   if (len > 30)  // TODO: what is the meaning of 30?
-   {
-      return(1);
-   }
-
-   if (  len > 0
-      && (  len >= line.size()
-         || unc_isspace(line[len])))
-   {
-      return(len);
-   }
-
-   if (  len == 1
-      && line[0] == '*')
-   {
-      return(len);
-   }
-
-   if (  is_last
-      && len > 0)
-   {
-      return(len);
-   }
-   return(0);
-} // cmt_parse_lead
-
-
-/**
- * Eat whitespace characters starting at the specified index in the forward or reverse direction
- * within a single line
- * @param  str     the input string containing the comment text
- * @param  idx     the starting index
- * @param  forward if true, searches in the forward direction;
- *                 if false, searches in the reverse direction
- * @return         the first index at which a non-whitespace character is encountered, including
- *                 a newline character
- */
-template<typename String>
-static int eat_line_whitespace(const String &str,
-                               int idx, bool
-                               forward = true)
-{
-   auto advance_index = [&](int i)
-   {
-      return(forward ? i + 1 : i - 1);
-   };
-
-   auto index_in_range = [&](int i)
-   {
-      // TODO: the following BREAKS with source code formatting; uncrustify seems to
-      //       think that the following is a template. This will NEED to be fixed!!!
-      //       For now, reformulate the statement
-      //return(forward ? i<int(str.size()) : i> = 0);
-      return(forward ? (i < int(str.size())) : (i >= 0));
-   };
-
-   while (  index_in_range(idx)
-         && str[idx] != '\n'
-         && str[idx] != '\r'
-         && unc_isspace(str[idx]))
-   {
-      idx = advance_index(idx);
-   }
-   return(idx);
-} // eat_line_whitespace
-
-
-/**
- * Returns whether or not a javaparam tag is the leading
- * text in a comment line, with only a sequence of whitespace
- * and/or '*' characters preceding it
- * @param  str the input string containing the comment text
- * @param  idx the starting index
- * @return     true/false
- */
-template<typename String>
-static bool javaparam_tag_is_start_of_line(const String &str, int idx)
-{
-   idx = eat_line_whitespace(str,
-                             str[idx] == '@' ? idx - 1 : idx,
-                             false);
-
-   while (true)
-   {
-      if (  idx < 0
-         || str[idx] == '\n'
-         || str[idx] == '\r')
-      {
-         return(true);
-      }
-
-      if (str[idx] == '*')
-      {
-         idx = eat_line_whitespace(str,
-                                   idx - 1,
-                                   false);
-      }
-      else
-      {
-         return(false);
-      }
-   }
-} // javaparam_tag_is_start_of_line
-
-
-/**
- * Attempts to match a doxygen/javadoc-style comment tag
- * @param  str the input string containing the comment text
- * @param  idx the starting index
- * @return     the index of the character immediately following the matched tag,
- *             or -1 if no match is found
- */
-static int match_doxygen_javadoc_tag(const std::wstring &str, size_t idx)
-{
-   std::wsmatch match;
-
-   if (str[idx] == L'@')
-   {
-      std::wregex criteria(L"(@(?:author|"
-                           L"deprecated|"
-                           L"exception|"
-                           L"param(?:\\s*\\[\\s*(?:in\\s*,\\s*out|in|out)\\s*\\])?|"
-                           L"return|"
-                           L"see|"
-                           L"since|"
-                           L"throws|"
-                           L"version)\\b)");
-
-      if (  std::regex_search(str.cbegin() + idx, str.cend(), match, criteria)
-         && match[1].matched
-         && match.position(1) == std::wsmatch::difference_type(0))
-      {
-         std::set<std::wstring> block_tags =
-         {
-            L"@author",
-            L"@deprecated",
-            L"@exception",
-            L"@param",
-            L"@param[in]",
-            L"@param[in,out]",
-            L"@param[out]",
-            L"@return",
-            L"@see",
-            L"@since",
-            L"@throws",
-            L"@version"
-         };
-         std::wstring           result(match[1]);
-         result.erase(std::remove_if(result.begin(), result.end(), ::isspace), result.end());
-         auto                   &&it_block_tag = block_tags.find(result);
-
-         if (  it_block_tag != block_tags.end()
-            && javaparam_tag_is_start_of_line(str, idx))
-         {
-            return(int(idx + match[1].length()));
-         }
-      }
-   }
-   return(-1);
-} // match_javadoc_block_tag
-
-
-static void calculate_doxygen_javadoc_indent_alignment(const std::wstring &str,
-                                                       size_t             &doxygen_javadoc_param_name_indent,
-                                                       size_t             &doxygen_javadoc_continuation_indent)
-{
-   log_rule_B("cmt_align_doxygen_javadoc_tags");
-
-   doxygen_javadoc_continuation_indent = 0;
-   doxygen_javadoc_param_name_indent   = 0;
-
-   if (!options::cmt_align_doxygen_javadoc_tags())
-   {
-      return;
-   }
-
-   for (size_t idx = 0; idx < str.size(); ++idx)
-   {
-      int start_idx = idx;
-      int end_idx   = match_doxygen_javadoc_tag(str, start_idx);
-
-      if (end_idx > start_idx)
-      {
-         size_t block_tag_width = 1 + std::count_if(str.begin() + start_idx,
-                                                    str.begin() + end_idx,
-                                                    [](wchar_t ch) {
-            return(!unc_isspace(ch));
-         });
-
-         if (block_tag_width > doxygen_javadoc_param_name_indent)
-         {
-            doxygen_javadoc_param_name_indent = block_tag_width;
-         }
-         idx = eat_line_whitespace(str, end_idx);
-
-         size_t param_name_width = 0;
-
-         if (str.find(L"@param", start_idx) == size_t(start_idx))
-         {
-            param_name_width = 1;
-
-            while (true)
-            {
-               while (  !unc_isspace(str[idx])
-                     && str[idx] != ',')
-               {
-                  ++param_name_width;
-                  ++idx;
-               }
-               idx = eat_line_whitespace(str, idx);
-
-               if (str[idx] != ',')
-               {
-                  break;
-               }
-               param_name_width += 2;
-               idx               = eat_line_whitespace(str, idx + 1);
-            }
-         }
-
-         if (param_name_width > doxygen_javadoc_continuation_indent)
-         {
-            doxygen_javadoc_continuation_indent = param_name_width;
-         }
-      }
-   }
-
-   if (doxygen_javadoc_param_name_indent > 0)
-   {
-      log_rule_B("cmt_sp_before_doxygen_javadoc_tags");
-
-      doxygen_javadoc_param_name_indent   += options::cmt_sp_before_doxygen_javadoc_tags();
-      doxygen_javadoc_continuation_indent += doxygen_javadoc_param_name_indent;
-   }
-} // calculate_doxygen_javadoc_indent_alignment
-
-
-static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
-{
-   cmt.xtra_indent = 0;
-
-   log_rule_B("cmt_indent_multi");
-
-   if (!options::cmt_indent_multi())
-   {
-      return;
-   }
-   size_t idx      = 0;
-   size_t len      = str.size();
-   size_t last_len = 0;
-
-   log_rule_B("cmt_multi_check_last");
-
-   if (options::cmt_multi_check_last())
-   {
-      // find the last line length
-      for (idx = len - 1; idx > 0; idx--)
-      {
-         if (  str[idx] == '\n'
-            || str[idx] == '\r')
-         {
-            idx++;
-
-            while (  idx < len
-                  && (  str[idx] == ' '
-                     || str[idx] == '\t'))
-            {
-               idx++;
-            }
-            last_len = len - idx;
-            break;
-         }
-      }
-   }
-   // find the first line length
-   size_t first_len = 0;
-
-   for (idx = 0; idx < len; idx++)
-   {
-      if (  str[idx] == '\n'
-         || str[idx] == '\r')
-      {
-         first_len = idx;
-
-         while (  str[first_len - 1] == ' '
-               || str[first_len - 1] == '\t')
-         {
-            if (first_len == 0)
-            {
-               fprintf(stderr, "%s(%d): first_len is ZERO, cannot be decremented.\n",
-                       __func__, __LINE__);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            first_len--;
-         }
-
-         // handle DOS endings
-         if (  str[idx] == '\r'
-            && str[idx + 1] == '\n')
-         {
-            idx++;
-         }
-         idx++;
-         break;
-      }
-   }
-
-   // Scan the second line
-   size_t width = 0;
-
-   for ( ; idx < len - 1; idx++)
-   {
-      if (  str[idx] == ' '
-         || str[idx] == '\t')
-      {
-         if (width > 0)
-         {
-            break;
-         }
-         continue;
-      }
-
-      if (  str[idx] == '\n'
-         || str[idx] == '\r')
-      {
-         break;  // Done with second line
-      }
-
-      // Count the leading chars
-      if (  str[idx] == '*'
-         || str[idx] == '|'
-         || str[idx] == '\\'
-         || str[idx] == '#'
-         || str[idx] == '+')
-      {
-         width++;
-      }
-      else
-      {
-         if (  width != 1
-            || str[idx - 1] != '*')
-         {
-            width = 0;
-         }
-         break;
-      }
-   }
-
-   // LOG_FMT(LSYS, "%s: first=%d last=%d width=%d\n", __func__, first_len, last_len, width);
-
-   /*
-    * If the first and last line are the same length and don't contain any
-    * alphanumeric chars and (the first line len > cmt_multi_first_len_minimum
-    * or the second leader is the same as the first line length), then the
-    * indent is 0.
-    */
-   log_rule_B("cmt_multi_first_len_minimum");
-
-   if (  first_len == last_len
-      && (  first_len > options::cmt_multi_first_len_minimum()
-         || first_len == width))
-   {
-      return;
-   }
-   cmt.xtra_indent = (width == 2) ? 0 : 1;
-} // calculate_comment_body_indent
-
-
-// TODO: can we use search_next_chunk here?
-static chunk_t *get_next_function(chunk_t *pc)
-{
-   while ((pc = chunk_get_next(pc)) != nullptr)
-   {
-      if (  chunk_is_token(pc, CT_FUNC_DEF)
-         || chunk_is_token(pc, CT_FUNC_PROTO)
-         || chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-         || chunk_is_token(pc, CT_FUNC_CLASS_PROTO)
-         || chunk_is_token(pc, CT_OC_MSG_DECL))
-      {
-         return(pc);
-      }
-   }
-   return(nullptr);
-}
-
-
-static chunk_t *get_next_class(chunk_t *pc)
-{
-   return(chunk_get_next(chunk_search_next_cat(pc, CT_CLASS)));
-}
-
-
-static chunk_t *get_prev_category(chunk_t *pc)
-{
-   return(chunk_search_prev_cat(pc, CT_OC_CATEGORY));
-}
-
-
-static chunk_t *get_next_scope(chunk_t *pc)
-{
-   return(chunk_search_next_cat(pc, CT_OC_SCOPE));
-}
-
-
-static chunk_t *get_prev_oc_class(chunk_t *pc)
-{
-   return(chunk_search_prev_cat(pc, CT_OC_CLASS));
-}
-
-
-static int next_up(const unc_text &text, size_t idx, unc_text &tag)
-{
-   size_t offs = 0;
-
-   while (  idx < text.size()
-         && unc_isspace(text[idx]))
-   {
-      idx++;
-      offs++;
-   }
-
-   if (text.startswith(tag, idx))
-   {
-      return(offs);
-   }
-   return(-1);
-}
-
-
-static void add_comment_text(const unc_text &text,
-                             cmt_reflow     &cmt,
-                             bool           esc_close,
-                             size_t         continuation_indent)
-{
-   bool   was_star  = false;
-   bool   was_slash = false;
-   bool   in_word   = false;
-   size_t len       = text.size();
-   size_t ch_cnt    = 0; // chars since newline
-
-   // If the '//' is included write it first else we may wrap an empty line
-   size_t idx = 0;
-
-   if (text.startswith("//"))
-   {
-      add_text("//");
-      idx += 2;
-
-      while (unc_isspace(text[idx]))
-      {
-         add_char(text[idx++]);
-      }
-   }
-
-   for ( ; idx < len; idx++)  // TODO: avoid modifying idx in loop
-   {
-      // Split the comment
-      if (text[idx] == '\n')
-      {
-         in_word = false;
-         add_char('\n');
-         cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-
-         if (cmt.xtra_indent > 0)
-         {
-            add_char(' ');
-         }
-         // hack to get escaped newlines to align and not duplicate the leading '//'
-         int tmp = next_up(text, idx + 1, cmt.cont_text);
-
-         if (tmp < 0)
-         {
-            add_text(cmt.cont_text);
-         }
-         else
-         {
-            idx += tmp;
-         }
-         ch_cnt = 0;
-      }
-      else if (  cmt.reflow
-              && text[idx] == ' '
-              && options::cmt_width() > 0
-              && (  cpd.column > options::cmt_width()
-                 || (  ch_cnt > 1
-                    && next_word_exceeds_limit(text, idx))))
-      {
-         log_rule_B("cmt_width");
-         in_word = false;
-         add_char('\n');
-         cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-
-         if (cmt.xtra_indent > 0)
-         {
-            add_char(' ');
-         }
-         // The number of spaces to insert after the star on subsequent comment lines.
-         log_rule_B("cmt_sp_after_star_cont");
-
-         /**
-          * calculate the output column
-          */
-         size_t column = options::cmt_sp_after_star_cont();
-
-         if (  text[idx + 1] == 42                 // this is star *
-            && text[idx + 2] == 47)                // this is      /
-         {
-            LOG_FMT(LCONTTEXT, "%s(%d): we have a comment end\n",
-                    __func__, __LINE__);
-
-            column += cmt.column;
-         }
-         else
-         {
-            add_text(cmt.cont_text);
-
-            if (continuation_indent > 0)
-            {
-               if (options::cmt_align_doxygen_javadoc_tags())
-               {
-                  log_rule_B("cmt_align_doxygen_javadoc_tags");
-               }
-               else if (options::cmt_reflow_indent_to_paragraph_start())
-               {
-                  log_rule_B("cmt_reflow_indent_to_paragraph_start");
-               }
-               column += continuation_indent;
-
-               log_rule_B("cmt_sp_after_star_cont");
-
-               if (column >= options::cmt_sp_after_star_cont())
-               {
-                  column -= options::cmt_sp_after_star_cont();
-               }
-            }
-            /**
-             * count the number trailing spaces in the comment continuation text
-             */
-            size_t num_trailing_sp = 0;
-
-            while (  num_trailing_sp < cmt.cont_text.size()
-                  && unc_isspace(cmt.cont_text[cmt.cont_text.size() - 1 - num_trailing_sp]))
-            {
-               ++num_trailing_sp;
-            }
-            column += cpd.column;
-
-            if (column >= num_trailing_sp)
-            {
-               column -= num_trailing_sp;
-            }
-         }
-         output_to_column(column,
-                          false);
-         ch_cnt = 0;
-      }
-      else
-      {
-         // Escape a C closure in a CPP comment
-         if (  esc_close
-            && (  (  was_star
-                  && text[idx] == '/')
-               || (  was_slash
-                  && text[idx] == '*')))
-         {
-            add_char(' ');
-         }
-
-         if (  !in_word
-            && !unc_isspace(text[idx]))
-         {
-            cmt.word_count++;
-         }
-         in_word = !unc_isspace(text[idx]);
-
-         add_char(text[idx]);
-         was_star  = (text[idx] == '*');
-         was_slash = (text[idx] == '/');
-         ch_cnt++;
-      }
-   }
-} // add_comment_text
-
-
-static void output_cmt_start(cmt_reflow &cmt, chunk_t *pc)
-{
-   cmt.pc          = pc;
-   cmt.column      = pc->column;
-   cmt.brace_col   = pc->column_indent;
-   cmt.base_col    = pc->column_indent;
-   cmt.word_count  = 0;
-   cmt.xtra_indent = 0;
-   cmt.cont_text.clear();
-   cmt.reflow = false;
-
-   // Issue #2752
-   log_rule_B("cmt_insert_file_header");
-   log_rule_B("cmt_insert_file_footer");
-   log_rule_B("cmt_insert_func_header)");
-   log_rule_B("cmt_insert_class_header");
-   log_rule_B("cmt_insert_oc_msg_header");
-
-   if (  options::cmt_insert_file_header().size() > 0
-      || options::cmt_insert_file_footer().size() > 0
-      || options::cmt_insert_func_header().size() > 0
-      || options::cmt_insert_class_header().size() > 0
-      || options::cmt_insert_oc_msg_header().size() > 0)
-   {
-      LOG_FMT(LCONTTEXT, "%s(%d): cmt_insert_file\n", __func__, __LINE__);
-      do_kw_subst(pc);
-   }
-   else
-   {
-      LOG_FMT(LCONTTEXT, "%s(%d): no cmt_insert_file\n", __func__, __LINE__);
-   }
-
-   if (cmt.brace_col == 0)
-   {
-      log_rule_B("output_tab_size");
-      cmt.brace_col = 1 + (pc->brace_level * options::output_tab_size());
-   }
-   // LOG_FMT(LSYS, "%s: line %zd, brace=%zd base=%zd col=%zd orig=%zd aligned=%x\n",
-   //        __func__, pc->orig_line, cmt.brace_col, cmt.base_col, cmt.column, pc->orig_col,
-   //        pc->flags & (PCF_WAS_ALIGNED | PCF_RIGHT_COMMENT));
-
-   if (  get_chunk_parent_type(pc) == CT_COMMENT_START
-      || get_chunk_parent_type(pc) == CT_COMMENT_WHOLE)
-   {
-      log_rule_B("indent_col1_comment");
-
-      if (  !options::indent_col1_comment()
-         && pc->orig_col == 1
-         && !pc->flags.test(PCF_INSERTED))
-      {
-         cmt.column    = 1;
-         cmt.base_col  = 1;
-         cmt.brace_col = 1;
-      }
-   }
-   // tab aligning code
-   log_rule_B("indent_cmt_with_tabs");
-
-   if (  options::indent_cmt_with_tabs()
-      && (  get_chunk_parent_type(pc) == CT_COMMENT_END
-         || get_chunk_parent_type(pc) == CT_COMMENT_WHOLE))
-   {
-      cmt.column = align_tab_column(cmt.column - 1);
-      // LOG_FMT(LSYS, "%s: line %d, orig:%d new:%d\n",
-      //        __func__, pc->orig_line, pc->column, cmt.column);
-      pc->column = cmt.column;
-   }
-   cmt.base_col = cmt.column;
-
-   // LOG_FMT(LSYS, "%s: -- brace=%d base=%d col=%d\n",
-   //        __func__, cmt.brace_col, cmt.base_col, cmt.column);
-
-   // Bump out to the column
-   cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-} // output_cmt_start
-
-
-static bool can_combine_comment(chunk_t *pc, cmt_reflow &cmt)
-{
-   // We can't combine if there is something other than a newline next
-   if (get_chunk_parent_type(pc) == CT_COMMENT_START)
-   {
-      return(false);
-   }
-   // next is a newline for sure, make sure it is a single newline
-   chunk_t *next = chunk_get_next(pc);
-
-   if (  next != nullptr
-      && next->nl_count == 1)
-   {
-      // Make sure the comment is the same type at the same column
-      next = chunk_get_next(next);
-
-      if (  chunk_is_token(next, pc->type)
-         && (  (  next->column == 1
-               && pc->column == 1)
-            || (  next->column == cmt.base_col
-               && pc->column == cmt.base_col)
-            || (  next->column > cmt.base_col
-               && get_chunk_parent_type(pc) == CT_COMMENT_END)))
-      {
-         return(true);
-      }
-   }
-   return(false);
-} // can_combine_comment
-
-
-static chunk_t *output_comment_c(chunk_t *first)
-{
-   cmt_reflow cmt;
-
-   output_cmt_start(cmt, first);
-   log_rule_B("cmt_reflow_mode");
-   cmt.reflow = (options::cmt_reflow_mode() != 1);
-
-   // See if we can combine this comment with the next comment
-   log_rule_B("cmt_c_group");
-
-   if (  !options::cmt_c_group()
-      || !can_combine_comment(first, cmt))
-   {
-      // Just add the single comment
-      log_rule_B("cmt_star_cont");
-      cmt.cont_text = options::cmt_star_cont() ? " * " : "   ";
-      LOG_CONTTEXT();
-      add_comment_text(first->str, cmt, false);
-      return(first);
-   }
-   log_rule_B("cmt_star_cont");
-   cmt.cont_text = options::cmt_star_cont() ? " *" : "  ";
-   LOG_CONTTEXT();
-
-   add_text("/*");
-
-   log_rule_B("cmt_c_nl_start");
-
-   if (options::cmt_c_nl_start())
-   {
-      add_comment_text("\n", cmt, false);
-   }
-   chunk_t  *pc = first;
-   unc_text tmp;
-
-   while (can_combine_comment(pc, cmt))
-   {
-      LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s'\n",
-              __func__, __LINE__, pc->text());
-      tmp.set(pc->str, 2, pc->len() - 4);
-
-      if (  cpd.last_char == '*'
-         && (  tmp[0] == '/'
-            || tmp[0] != ' '))                 // Issue #1908
-      {
-         LOG_FMT(LCONTTEXT, "%s(%d): add_text a " "\n", __func__, __LINE__);
-         add_text(" ");
-      }
-      // In case of reflow, original comment could contain trailing spaces before closing the comment, we don't need them after reflow
-      LOG_FMT(LCONTTEXT, "%s(%d): trim\n", __func__, __LINE__);
-      cmt_trim_whitespace(tmp, false);
-      LOG_FMT(LCONTTEXT, "%s(%d): add_comment_text(tmp is '%s')\n",
-              __func__, __LINE__, tmp.c_str());
-      add_comment_text(tmp, cmt, false);
-      LOG_FMT(LCONTTEXT, "%s(%d): add_comment_text(newline)\n",
-              __func__, __LINE__);
-      add_comment_text("\n", cmt, false);
-      pc = chunk_get_next(pc);
-      pc = chunk_get_next(pc);
-   }
-   tmp.set(pc->str, 2, pc->len() - 4);
-
-   if (  cpd.last_char == '*'
-      && tmp[0] == '/')
-   {
-      add_text(" ");
-   }
-   // In case of reflow, original comment could contain trailing spaces before closing the comment, we don't need them after reflow
-   cmt_trim_whitespace(tmp, false);
-   add_comment_text(tmp, cmt, false);
-
-   log_rule_B("cmt_c_nl_end");
-
-   if (options::cmt_c_nl_end())
-   {
-      cmt.cont_text = " ";
-      LOG_CONTTEXT();
-      add_comment_text("\n", cmt, false);
-   }
-   add_comment_text("*/", cmt, false);
-   return(pc);
-} // output_comment_c
-
-
-static chunk_t *output_comment_cpp(chunk_t *first)
-{
-   cmt_reflow cmt;
-
-   output_cmt_start(cmt, first);
-   log_rule_B("cmt_reflow_mode");
-   cmt.reflow = (options::cmt_reflow_mode() != 1);
-
-   unc_text leadin = "//";             // default setting to keep previous behaviour
-
-   // If true, space is added with sp_cmt_cpp_start will be added after doxygen
-   // sequences like '///', '///<', '//!' and '//!<'.
-   log_rule_B("sp_cmt_cpp_doxygen");
-
-   if (options::sp_cmt_cpp_doxygen())  // special treatment for doxygen style comments (treat as unity)
-   {
-      const char *sComment = first->text();
-      bool       grouping  = (sComment[2] == '@');
-      size_t     brace     = 3;
-
-      if (  sComment[2] == '/'
-         || sComment[2] == '!') // doxygen style found!
-      {
-         leadin += sComment[2];                     // at least one additional char (either "///" or "//!")
-
-         if (sComment[3] == '<')                    // and a further one (either "///<" or "//!<")
-         {
-            leadin += '<';
-         }
-         else
-         {
-            grouping = (sComment[3] == '@');  // or a further one (grouping)
-            brace    = 4;
-         }
-      }
-
-      if (  grouping
-         && (  sComment[brace] == '{'
-            || sComment[brace] == '}'))
-      {
-         leadin += '@';
-         leadin += sComment[brace];
-      }
-   }
-   // Special treatment for Qt translator or meta-data comments (treat as unity)
-   // If true, space is added with sp_cmt_cpp_start will be added after Qt
-   // translator or meta-data comments like '//:', '//=', and '//~'.
-   log_rule_B("sp_cmt_cpp_qttr");
-
-   if (options::sp_cmt_cpp_qttr())
-   {
-      const int c = first->str[2];
-
-      if (  c == ':'
-         || c == '='
-         || c == '~')
-      {
-         leadin += c;
-      }
-   }
-   // CPP comments can't be grouped unless they are converted to C comments
-   log_rule_B("cmt_cpp_to_c");
-
-   if (!options::cmt_cpp_to_c())
-   {
-      auto const *cmt_text = first->str.c_str() + 2;
-      // Add or remove space after the opening of a C++ comment,
-      // i.e. '// A' vs. '//A'.
-      auto *sp_cmt = &options::sp_cmt_cpp_start;
-
-      cmt.cont_text = leadin;
-
-      // Get start of comment text
-      while (  *cmt_text != '\0'
-            && unc_isspace(*cmt_text))
-      {
-         ++cmt_text;
-      }
-
-      // Determine if we are dealing with a region marker
-      if (  (  !first->prev
-            || first->prev->orig_line != first->orig_line)
-         && (  strncmp(cmt_text, "BEGIN", 5) == 0
-            || strncmp(cmt_text, "END", 3) == 0))
-      {
-         // If sp_cmt_cpp_region is not ignore, use that instead of
-         // sp_cmt_cpp_start
-         if (options::sp_cmt_cpp_region() != IARF_IGNORE)
-         {
-            sp_cmt = &options::sp_cmt_cpp_region;
-         }
-      }
-      // Add or remove space after the opening of a C++ comment,
-      // i.e. '// A' vs. '//A'.
-      log_rule_B(sp_cmt->name());
-
-      if ((*sp_cmt)() != IARF_REMOVE)
-      {
-         cmt.cont_text += ' ';
-      }
-      LOG_CONTTEXT();
-
-      // Add or remove space after the opening of a C++ comment,
-      // i.e. '// A' vs. '//A'.
-      log_rule_B(sp_cmt->name());
-
-      if ((*sp_cmt)() == IARF_IGNORE)
-      {
-         add_comment_text(first->str, cmt, false);
-      }
-      else
-      {
-         size_t   iLISz = leadin.size();
-         unc_text tmp(first->str, 0, iLISz);
-         add_comment_text(tmp, cmt, false);
-
-         tmp.set(first->str, iLISz, first->len() - iLISz);
-
-         // Add or remove space after the opening of a C++ comment,
-         // i.e. '// A' vs. '//A'.
-         log_rule_B("sp_cmt_cpp_start");
-
-         if ((*sp_cmt)() & IARF_REMOVE)
-         {
-            while (  (tmp.size() > 0)
-                  && unc_isspace(tmp[0]))
-            {
-               tmp.pop_front();
-            }
-         }
-
-         if (tmp.size() > 0)
-         {
-            // Add or remove space after the opening of a C++ comment,
-            // i.e. '// A' vs. '//A'.
-            log_rule_B("sp_cmt_cpp_start");
-
-            if ((*sp_cmt)() & IARF_ADD)
-            {
-               if (  !unc_isspace(tmp[0])
-                  && (tmp[0] != '/'))
-               {
-                  add_comment_text(" ", cmt, false);
-               }
-            }
-            add_comment_text(tmp, cmt, false);
-         }
-      }
-      return(first);
-   }
-   // We are going to convert the CPP comments to C comments
-   log_rule_B("cmt_star_cont");
-   cmt.cont_text = options::cmt_star_cont() ? " * " : "   ";
-   LOG_CONTTEXT();
-
-   unc_text tmp;
-
-   // See if we can combine this comment with the next comment
-   log_rule_B("cmt_cpp_group");
-
-   if (  !options::cmt_cpp_group()
-      || !can_combine_comment(first, cmt))
-   {
-      // nothing to group: just output a single line
-      add_text("/*");
-
-      // patch # 32, 2012-03-23
-      // Add or remove space after the opening of a C++ comment,
-      // i.e. '// A' vs. '//A'.
-      log_rule_B("sp_cmt_cpp_start");
-
-      if (  !unc_isspace(first->str[2])
-         && (options::sp_cmt_cpp_start() & IARF_ADD))
-      {
-         add_char(' ');
-      }
-      tmp.set(first->str, 2, first->len() - 2);
-      add_comment_text(tmp, cmt, true);
-      add_text(" */");
-      return(first);
-   }
-   add_text("/*");
-
-   log_rule_B("cmt_cpp_nl_start");
-
-   if (options::cmt_cpp_nl_start())
-   {
-      add_comment_text("\n", cmt, false);
-   }
-   else
-   {
-      add_text(" ");
-   }
-   chunk_t *pc = first;
-   int     offs;
-
-   while (can_combine_comment(pc, cmt))
-   {
-      offs = unc_isspace(pc->str[2]) ? 1 : 0;
-      tmp.set(pc->str, 2 + offs, pc->len() - (2 + offs));
-
-      if (  cpd.last_char == '*'
-         && tmp[0] == '/')
-      {
-         add_text(" ");
-      }
-      add_comment_text(tmp, cmt, true);
-      add_comment_text("\n", cmt, false);
-      pc = chunk_get_next(chunk_get_next(pc));
-   }
-   offs = unc_isspace(pc->str[2]) ? 1 : 0;
-   tmp.set(pc->str, 2 + offs, pc->len() - (2 + offs));
-   add_comment_text(tmp, cmt, true);
-
-   log_rule_B("cmt_cpp_nl_end");
-
-   if (options::cmt_cpp_nl_end())
-   {
-      cmt.cont_text = "";
-      LOG_CONTTEXT();
-      add_comment_text("\n", cmt, false);
-   }
-   add_comment_text(" */", cmt, false);
-   return(pc);
-} // output_comment_cpp
-
-
-static void cmt_trim_whitespace(unc_text &line, bool in_preproc)
-{
-   // Remove trailing whitespace on the line
-   while (  line.size() > 0
-         && (  line.back() == ' '
-            || line.back() == '\t'))
-   {
-      line.pop_back();
-   }
-
-   // Shift back to the comment text, ...
-   if (  in_preproc             // if in a preproc ...
-      && line.size() > 1        // with a line that holds ...
-      && line.back() == '\\')   // a backslash-newline ...
-   {
-      bool do_space = false;
-
-      // If there was any space before the backslash, change it to 1 space
-      line.pop_back();
-
-      while (  line.size() > 0
-            && (  line.back() == ' '
-               || line.back() == '\t'))
-      {
-         do_space = true;
-         line.pop_back();
-      }
-
-      if (do_space)
-      {
-         line.append(' ');
-      }
-      line.append('\\');
-   }
-} // cmt_trim_whitespace
-
-
-/**
- * Return an indexed-map of reflow fold end of line/beginning of line regex pairs read
- * from file
- */
-static std::map<std::size_t, std::pair<std::wregex, std::wregex> > get_reflow_fold_regex_map()
-{
-   /**
-    * TODO: should the following be static to prevent initializing it multiple times?
-    */
-   static std::map<std::size_t, std::pair<std::wregex, std::wregex> > regex_map;
-
-   if (regex_map.empty())
-   {
-      if (!options::cmt_reflow_fold_regex_file().empty())
-      {
-         std::wstring raw_wstring(cpd.reflow_fold_regex.raw.begin(),
-                                  cpd.reflow_fold_regex.raw.end());
-
-         std::wregex criteria(L"\\s*(?:(?:(beg_of_next)|(end_of_prev))_line_regex)"
-                              "\\s*\\[\\s*([0-9]+)\\s*\\]\\s*=\\s*\"(.*)\"\\s*"
-                              "(?=\\r\\n|\\r|\\n|$)");
-         std::wsregex_iterator it_regex(raw_wstring.cbegin(), raw_wstring.cend(), criteria);
-         std::wsregex_iterator it_regex_end = std::wsregex_iterator();
-
-         while (it_regex != it_regex_end)
-         {
-            std::wsmatch match = *it_regex;
-
-            if (  ((  match[1].matched
-                   || match[2].matched))
-               && match[3].matched
-               && match[4].matched)
-            {
-               auto        &&index   = std::stoi(match[3].str());
-               std::wregex *p_wregex = match[1].matched ? &regex_map[index].second
-                                                        : &regex_map[index].first;
-               *p_wregex = match[4].str();
-            }
-            ++it_regex;
-         }
-      }
-      else
-      {
-         regex_map.emplace(0L, std::make_pair(L"[\\w,\\]\\)]$", L"^[\\w,\\[\\(]"));
-         regex_map.emplace(1L, std::make_pair(L"\\.$", L"^[A-Z]"));
-      }
-   }
-   return(regex_map);
-} // get_reflow_fold_regex_map
-
-
-static void output_comment_multi(chunk_t *pc)
-{
-   if (pc == nullptr)
-   {
-      return;
-   }
-   cmt_reflow cmt;
-
-   char       copy[1000];
-
-   LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s', type is %s, orig_col is %zu, column is %zu\n",
-           __func__, __LINE__, pc->elided_text(copy), get_token_name(pc->type), pc->orig_col, pc->column);
-
-   output_cmt_start(cmt, pc);
-   log_rule_B("cmt_reflow_mode");
-   cmt.reflow = (options::cmt_reflow_mode() != 1);
-
-   size_t cmt_col  = cmt.base_col;
-   int    col_diff = pc->orig_col - cmt.base_col;
-
-   calculate_comment_body_indent(cmt, pc->str);
-
-   log_rule_B("cmt_indent_multi");
-   log_rule_B("cmt_star_cont");
-   cmt.cont_text = !options::cmt_indent_multi() ? "" :
-                   (options::cmt_star_cont() ? "* " : "  ");
-   LOG_CONTTEXT();
-
-   std::wstring pc_wstring(pc->str.get().cbegin(),
-                           pc->str.get().cend());
-
-   size_t doxygen_javadoc_param_name_indent    = 0;
-   size_t doxygen_javadoc_continuation_indent  = 0;
-   size_t reflow_paragraph_continuation_indent = 0;
-
-   calculate_doxygen_javadoc_indent_alignment(pc_wstring,
-                                              doxygen_javadoc_param_name_indent,
-                                              doxygen_javadoc_continuation_indent);
-
-   size_t   line_count                   = 0;
-   size_t   ccol                         = pc->column; // the col of subsequent comment lines
-   size_t   cmt_idx                      = 0;
-   bool     nl_end                       = false;
-   bool     doxygen_javadoc_indent_align = false;
-   unc_text line;
-
-   /*
-    * Get a map of regex pairs that define expressions to match at both the end
-    * of the previous line and the beginning of the next line
-    */
-   auto &&cmt_reflow_regex_map = get_reflow_fold_regex_map();
-
-   line.clear();
-   LOG_FMT(LCONTTEXT, "%s(%d): pc->len() is %zu\n",
-           __func__, __LINE__, pc->len());
-   //LOG_FMT(LCONTTEXT, "%s(%d): pc->str is %s\n",
-   //        __func__, __LINE__, pc->str.c_str());
-
-   /**
-    * check for enable/disable processing comment strings that may
-    * both be embedded within the same multi-line comment
-    */
-   auto disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str);
-   auto enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->str);
-
-   while (cmt_idx < pc->len())
-   {
-      int ch = pc->str[cmt_idx];
-      cmt_idx++;
-
-      if (  cmt_idx > std::size_t(disable_processing_cmt_idx)
-         && enable_processing_cmt_idx > disable_processing_cmt_idx)
-      {
-         auto     length = enable_processing_cmt_idx - disable_processing_cmt_idx;
-         unc_text verbatim_text(pc->str,
-                                disable_processing_cmt_idx,
-                                length);
-
-         add_text(verbatim_text);
-
-         cmt_idx = enable_processing_cmt_idx;
-
-         /**
-          * check for additional enable/disable processing comment strings that may
-          * both be embedded within the same multi-line comment
-          */
-         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str,
-                                                                             enable_processing_cmt_idx);
-         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->str,
-                                                                           enable_processing_cmt_idx);
-
-         /**
-          * it's probably necessary to reset the line count to prevent line
-          * continuation characters from being added to the end of the current line
-          */
-         line_count = 0;
-      }
-
-      // handle the CRLF and CR endings. convert both to LF
-      if (ch == '\r')
-      {
-         ch = '\n';
-
-         if (  cmt_idx < pc->len()
-            && pc->str[cmt_idx] == '\n')
-         {
-            cmt_idx++;
-         }
-      }
-
-      // Find the start column
-      if (line.size() == 0)
-      {
-         nl_end = false;
-
-         if (ch == ' ')
-         {
-            ccol++;
-            continue;
-         }
-         else if (ch == '\t')
-         {
-            log_rule_B("input_tab_size");
-            ccol = calc_next_tab_column(ccol, options::input_tab_size());
-            continue;
-         }
-         else
-         {
-            LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
-         }
-      }
-
-      if (  ch == '@'
-         && options::cmt_align_doxygen_javadoc_tags())
-      {
-         int start_idx = cmt_idx - 1;
-         int end_idx   = match_doxygen_javadoc_tag(pc_wstring, start_idx);
-
-         if (end_idx > start_idx)
-         {
-            doxygen_javadoc_indent_align = true;
-
-            std::string match(pc->str.get().cbegin() + start_idx,
-                              pc->str.get().cbegin() + end_idx);
-
-            match.erase(std::remove_if(match.begin(),
-                                       match.end(),
-                                       ::isspace),
-                        match.end());
-
-            /**
-             * remove whitespace before the '@'
-             */
-            int line_size_before_indent = line.size();
-
-            while (  line_size_before_indent > 0
-                  && unc_isspace(line.back()))
-            {
-               line.pop_back();
-               --line_size_before_indent;
-            }
-            log_rule_B("cmt_sp_before_doxygen_javadoc_tags");
-
-            int indent = options::cmt_sp_before_doxygen_javadoc_tags();
-
-            while (indent-- > 0)
-            {
-               line.append(' ');
-            }
-            cmt_idx += (end_idx - start_idx);
-            line.append(match.c_str());
-
-            bool is_exception_tag = match.find("@exception") != std::string::npos;
-            bool is_param_tag     = match.find("@param") != std::string::npos;
-            bool is_throws_tag    = match.find("@throws") != std::string::npos;
-
-            if (  is_exception_tag
-               || is_param_tag
-               || is_throws_tag)
-            {
-               indent = int(doxygen_javadoc_param_name_indent) - int(line.size());
-
-               while (indent-- > -line_size_before_indent)
-               {
-                  line.append(' ');
-               }
-
-               while (true)
-               {
-                  cmt_idx = eat_line_whitespace(pc->str,
-                                                cmt_idx);
-
-                  while (  cmt_idx < pc->len()
-                        && !unc_isspace(pc->str[cmt_idx])
-                        && pc->str[cmt_idx] != ',')
-                  {
-                     line.append(pc->str[cmt_idx++]);
-                  }
-
-                  if (!is_param_tag)
-                  {
-                     break;
-                  }
-                  /**
-                   * check for the possibility that comma-separated parameter names are present
-                   */
-                  cmt_idx = eat_line_whitespace(pc->str,
-                                                cmt_idx);
-
-                  if (pc->str[cmt_idx] != ',')
-                  {
-                     break;
-                  }
-                  ++cmt_idx;
-                  line.append(", ");
-               }
-            }
-            cmt_idx = eat_line_whitespace(pc->str,
-                                          cmt_idx);
-            indent = int(doxygen_javadoc_continuation_indent) - int(line.size());
-
-            while (indent-- > -line_size_before_indent)
-            {
-               line.append(' ');
-            }
-
-            while (  cmt_idx < pc->len()
-                  && !unc_isspace(pc->str[cmt_idx]))
-            {
-               line.append(pc->str[cmt_idx++]);
-            }
-            continue;
-         }
-      }
-      /*
-       * Now see if we need/must fold the next line with the current to enable
-       * full reflow
-       */
-      log_rule_B("cmt_reflow_mode");
-
-      if (  options::cmt_reflow_mode() == 2
-         && ch == '\n'
-         && cmt_idx < pc->len())
-      {
-         int    next_nonempty_line = -1;
-         int    prev_nonempty_line = -1;
-         size_t nwidx              = line.size();
-
-         // strip trailing whitespace from the line collected so far
-         while (nwidx > 0)
-         {
-            nwidx--;
-
-            if (  prev_nonempty_line < 0
-               && !unc_isspace(line[nwidx])
-               && line[nwidx] != '*'    // block comment: skip '*' at end of line
-               && (pc->flags.test(PCF_IN_PREPROC)
-                   ? (  line[nwidx] != '\\'
-                     || (  line[nwidx + 1] != '\r'
-                        && line[nwidx + 1] != '\n'))
-                   : true))
-            {
-               prev_nonempty_line = nwidx; // last non-whitespace char in the previous line
-            }
-         }
-
-         for (size_t nxt_idx = cmt_idx;
-              (  nxt_idx < pc->len()
-              && pc->str[nxt_idx] != '\r'
-              && pc->str[nxt_idx] != '\n');
-              nxt_idx++)
-         {
-            if (  next_nonempty_line < 0
-               && !unc_isspace(pc->str[nxt_idx])
-               && pc->str[nxt_idx] != '*'
-               && (pc->flags.test(PCF_IN_PREPROC)
-                   ? (  pc->str[nxt_idx] != '\\'
-                     || (  pc->str[nxt_idx + 1] != '\r'
-                        && pc->str[nxt_idx + 1] != '\n'))
-                   : true))
-            {
-               next_nonempty_line = nxt_idx;  // first non-whitespace char in the next line
-            }
-         }
-
-         if (  options::cmt_reflow_indent_to_paragraph_start()
-            && next_nonempty_line >= 0
-            && (  prev_nonempty_line <= 0
-               || doxygen_javadoc_indent_align))
-         {
-            log_rule_B("cmt_reflow_indent_to_paragraph_start");
-
-            int cmt_star_indent = 0;
-
-            while (  next_nonempty_line > cmt_star_indent
-                  && pc->str[next_nonempty_line - cmt_star_indent - 1] != '*')
-            {
-               ++cmt_star_indent;
-            }
-            reflow_paragraph_continuation_indent = size_t(cmt_star_indent);
-         }
-
-         /*
-          * see if we should fold up; usually that'd be a YES, but there are a few
-          * situations where folding/reflowing by merging lines is frowned upon:
-          *
-          * - ASCII art in the comments (most often, these are drawings done in +-\/|.,*)
-          *
-          * - Doxygen/JavaDoc/etc. parameters: these often start with \ or @, at least
-          *   something clearly non-alphanumeric (you see where we're going with this?)
-          *
-          * - bullet lists that are closely spaced: bullets are always non-alphanumeric
-          *   characters, such as '-' or '+' (or, oh horror, '*' - that's bloody ambiguous
-          *   to parse :-( ... with or without '*' comment start prefix, that's the
-          *   question, then.)
-          *
-          * - semi-HTML formatted code, e.g. <pre>...</pre> comment sections (NDoc, etc.)
-          *
-          * - New lines which form a new paragraph without there having been added an
-          *   extra empty line between the last sentence and the new one.
-          *   A bit like this, really; so it is opportune to check if the last line ended
-          *   in a terminal (that would be the set '.:;!?') and the new line starts with
-          *   a capital.
-          *   Though new lines starting with comment delimiters, such as '(', should be
-          *   pulled up.
-          *
-          * So it bores down to this: the only folding (& reflowing) that's going to happen
-          * is when the next line starts with an alphanumeric character AND the last
-          * line didn't end with an non-alphanumeric character, except: ',' AND the next
-          * line didn't start with a '*' all of a sudden while the previous one didn't
-          * (the ambiguous '*'-for-bullet case!)
-          */
-         if (  prev_nonempty_line >= 0
-            && next_nonempty_line >= int(cmt_idx))
-         {
-            std::wstring prev_line(line.get().cbegin(),
-                                   line.get().cend());
-            std::wstring next_line(pc->str.get().cbegin() + next_nonempty_line,
-                                   pc->str.get().cend());
-
-            for (auto &&cmt_reflow_regex_map_entry : cmt_reflow_regex_map)
-            {
-               auto         &&cmt_reflow_regex_pair  = cmt_reflow_regex_map_entry.second;
-               auto         &&end_of_prev_line_regex = cmt_reflow_regex_pair.first;
-               auto         &&beg_of_next_line_regex = cmt_reflow_regex_pair.second;
-               std::wsmatch match[2];
-
-               if (  std::regex_search(prev_line, match[0], end_of_prev_line_regex)
-                  && match[0].position(0) + match[0].length(0) == std::wsmatch::difference_type(line.size())
-                  && std::regex_search(next_line, match[1], beg_of_next_line_regex)
-                  && match[1].position(0) == 0)
-               {
-                  // rewind the line to the last non-alpha:
-                  line.resize(prev_nonempty_line + 1);
-
-                  // roll the current line forward to the first non-alpha:
-                  cmt_idx = next_nonempty_line;
-                  // override the NL and make it a single whitespace:
-                  ch = ' ';
-
-                  break;
-               }
-            }
-         }
-      }
-
-      if (ch == '\n')
-      {
-         LOG_FMT(LCONTTEXT, "%s(%d):ch is newline\n", __func__, __LINE__);
-      }
-      else
-      {
-         LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
-      }
-      line.append(ch);
-
-      // If we just hit an end of line OR we just hit end-of-comment...
-      if (  ch == '\n'
-         || cmt_idx == pc->len())
-      {
-         if (ch == '\n')
-         {
-            LOG_FMT(LCONTTEXT, "%s(%d):ch is newline\n", __func__, __LINE__);
-         }
-         else
-         {
-            LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
-         }
-         line_count++;
-         LOG_FMT(LCONTTEXT, "%s(%d):line_count is %zu\n", __func__, __LINE__, line_count);
-
-         // strip trailing tabs and spaces before the newline
-         if (ch == '\n')
-         {
-            nl_end = true;
-            line.pop_back();
-            cmt_trim_whitespace(line, pc->flags.test(PCF_IN_PREPROC));
-         }
-
-         if (line_count == 1)
-         {
-            // this is the first line - add unchanged
-            add_comment_text(line, cmt, false);
-
-            if (nl_end)
-            {
-               add_char('\n');
-            }
-         }
-         else
-         {
-            /*
-             * This is not the first line, so we need to indent to the
-             * correct column. Each line is indented 0 or more spaces.
-             */
-            // Ensure ccol is not negative
-            if (static_cast<int>(ccol) >= col_diff)
-            {
-               ccol -= col_diff;
-            }
-
-            if (ccol < (cmt_col + 3))
-            {
-               ccol = cmt_col + 3;
-            }
-
-            if (line.size() == 0)
-            {
-               // Empty line - just a '\n'
-               log_rule_B("cmt_star_cont");
-
-               if (options::cmt_star_cont())
-               {
-                  // The number of spaces to insert at the start of subsequent comment lines.
-                  log_rule_B("cmt_sp_before_star_cont");
-                  cmt.column = cmt_col + options::cmt_sp_before_star_cont();
-                  cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-
-                  if (cmt.xtra_indent > 0)
-                  {
-                     add_char(' ');
-                  }
-                  // multiline comments can have empty lines with some spaces in them for alignment
-                  // while adding * symbol and aligning them we don't want to keep these trailing spaces
-                  unc_text tmp = unc_text(cmt.cont_text);
-                  cmt_trim_whitespace(tmp, false);
-                  add_text(tmp);
-               }
-               add_char('\n');
-            }
-            else
-            {
-               /*
-                * If this doesn't start with a '*' or '|'.
-                * '\name' is a common parameter documentation thing.
-                */
-               log_rule_B("cmt_indent_multi");
-
-               if (  options::cmt_indent_multi()
-                  && line[0] != '*'
-                  && line[0] != '|'
-                  && line[0] != '#'
-                  && (  line[0] != '\\'
-                     || unc_isalpha(line[1]))
-                  && line[0] != '+')
-               {
-                  // The number of spaces to insert at the start of subsequent comment lines.
-                  log_rule_B("cmt_sp_before_star_cont");
-                  size_t start_col = cmt_col + options::cmt_sp_before_star_cont();
-
-                  log_rule_B("cmt_star_cont");
-
-                  if (options::cmt_star_cont())
-                  {
-                     cmt.column = start_col;
-                     cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-
-                     if (cmt.xtra_indent > 0)
-                     {
-                        add_char(' ');
-                     }
-                     add_text(cmt.cont_text);
-                     // The number of spaces to insert after the star on subsequent comment lines.
-                     log_rule_B("cmt_sp_after_star_cont");
-                     output_to_column(ccol + options::cmt_sp_after_star_cont(), false);
-                  }
-                  else
-                  {
-                     cmt.column = ccol;
-                     cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-                  }
-               }
-               else
-               {
-                  // The number of spaces to insert at the start of subsequent comment lines.
-                  log_rule_B("cmt_sp_before_star_cont");
-                  cmt.column = cmt_col + options::cmt_sp_before_star_cont();
-                  cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-
-                  if (cmt.xtra_indent > 0)
-                  {
-                     add_char(' ');
-                  }
-                  size_t idx;
-
-                  // Checks for and updates the lead chars.
-                  // @return 0=not present, >0=number of chars that are part of the lead
-                  idx = cmt_parse_lead(line, (cmt_idx == pc->len()));
-
-                  if (idx > 0)
-                  {
-                     // >0=number of chars that are part of the lead
-                     cmt.cont_text.set(line, 0, idx);
-                     LOG_CONTTEXT();
-
-                     if (  (line.size() >= 2)
-                        && (line[0] == '*')
-                        && unc_isalnum(line[1]))
-                     {
-                        line.insert(1, ' ');
-                     }
-                  }
-                  else
-                  {
-                     // bug #653
-                     if (language_is_set(LANG_D))
-                     {
-                        // 0=no lead char present
-                        add_text(cmt.cont_text);
-                     }
-                  }
-               }
-               size_t continuation_indent = 0;
-
-               if (doxygen_javadoc_indent_align)
-               {
-                  continuation_indent = doxygen_javadoc_continuation_indent;
-               }
-               else if (reflow_paragraph_continuation_indent > 0)
-               {
-                  continuation_indent = reflow_paragraph_continuation_indent;
-               }
-               add_comment_text(line,
-                                cmt,
-                                false,
-                                continuation_indent);
-
-               if (nl_end)
-               {
-                  add_text("\n");
-               }
-            }
-         }
-         line.clear();
-         doxygen_javadoc_indent_align = false;
-         ccol                         = 1;
-      }
-   }
-} // output_comment_multi
-
-
-static bool kw_fcn_filename(chunk_t *cmt, unc_text &out_txt)
-{
-   UNUSED(cmt);
-   out_txt.append(path_basename(cpd.filename.c_str()));
-   return(true);
-}
-
-
-static bool kw_fcn_class(chunk_t *cmt, unc_text &out_txt)
-{
-   chunk_t *tmp = nullptr;
-
-   if (language_is_set(LANG_CPP | LANG_OC))
-   {
-      chunk_t *fcn = get_next_function(cmt);
-
-      if (chunk_is_token(fcn, CT_OC_MSG_DECL))
-      {
-         tmp = get_prev_oc_class(cmt);
-      }
-      else
-      {
-         tmp = get_next_class(cmt);
-      }
-   }
-   else if (language_is_set(LANG_OC))
-   {
-      tmp = get_prev_oc_class(cmt);
-   }
-
-   if (tmp == nullptr)
-   {
-      tmp = get_next_class(cmt);
-   }
-
-   if (tmp != nullptr)
-   {
-      out_txt.append(tmp->str);
-
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
-      {
-         if (tmp->type != CT_DC_MEMBER)
-         {
-            break;
-         }
-         tmp = chunk_get_next(tmp);
-
-         if (tmp != nullptr)
-         {
-            out_txt.append("::");
-            out_txt.append(tmp->str);
-         }
-      }
-      return(true);
-   }
-   return(false);
-} // kw_fcn_class
-
-
-static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt)
-{
-   chunk_t *fcn = get_next_function(cmt);
-
-   if (!fcn)
-   {
-      return(false);
-   }
-   out_txt.append(fcn->str);
-
-   chunk_t *tmp  = chunk_get_next_ncnnl(fcn);
-   chunk_t *word = nullptr;
-
-   while (tmp != nullptr)
-   {
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         || chunk_is_token(tmp, CT_SEMICOLON))
-      {
-         break;
-      }
-
-      if (chunk_is_token(tmp, CT_OC_COLON))
-      {
-         if (word != nullptr)
-         {
-            out_txt.append(word->str);
-            word = nullptr;
-         }
-         out_txt.append(":");
-      }
-
-      if (chunk_is_token(tmp, CT_WORD))
-      {
-         word = tmp;
-      }
-      tmp = chunk_get_next_ncnnl(tmp);
-   }
-   return(true);
-} // kw_fcn_message
-
-
-static bool kw_fcn_category(chunk_t *cmt, unc_text &out_txt)
-{
-   chunk_t *category = get_prev_category(cmt);
-
-   if (category)
-   {
-      out_txt.append('(');
-      out_txt.append(category->str);
-      out_txt.append(')');
-   }
-   return(true);
-} // kw_fcn_category
-
-
-static bool kw_fcn_scope(chunk_t *cmt, unc_text &out_txt)
-{
-   chunk_t *scope = get_next_scope(cmt);
-
-   if (scope)
-   {
-      out_txt.append(scope->str);
-      return(true);
-   }
-   return(false);
-} // kw_fcn_scope
-
-
-static bool kw_fcn_function(chunk_t *cmt, unc_text &out_txt)
-{
-   chunk_t *fcn = get_next_function(cmt);
-
-   if (fcn)
-   {
-      if (get_chunk_parent_type(fcn) == CT_OPERATOR)
-      {
-         out_txt.append("operator ");
-      }
-
-      if (  fcn->prev != nullptr
-         && fcn->prev->type == CT_DESTRUCTOR)
-      {
-         out_txt.append('~');
-      }
-      out_txt.append(fcn->str);
-      return(true);
-   }
-   return(false);
-}
-
-
-static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
-{
-   chunk_t *fcn = get_next_function(cmt);
-
-   if (!fcn)
-   {
-      return(false);
-   }
-   chunk_t *fpo;
-   chunk_t *fpc;
-   bool    has_param = true;
-   bool    need_nl   = false;
-
-   if (chunk_is_token(fcn, CT_OC_MSG_DECL))
-   {
-      chunk_t *tmp = chunk_get_next_ncnnl(fcn);
-      has_param = false;
-
-      while (tmp != nullptr)
-      {
-         if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-            || chunk_is_token(tmp, CT_SEMICOLON))
-         {
-            break;
-         }
-
-         if (has_param)
-         {
-            if (need_nl)
-            {
-               out_txt.append("\n");
-            }
-            need_nl = true;
-            out_txt.append("@param");
-            out_txt.append(" ");
-            out_txt.append(tmp->str);
-            out_txt.append(" TODO");
-         }
-         has_param = false;
-
-         if (chunk_is_token(tmp, CT_PAREN_CLOSE))
-         {
-            has_param = true;
-         }
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-      fpo = fpc = nullptr;
-   }
-   else
-   {
-      fpo = chunk_get_next_type(fcn, CT_FPAREN_OPEN, fcn->level);
-
-      if (fpo == nullptr)
-      {
-         return(true);
-      }
-      fpc = chunk_get_next_type(fpo, CT_FPAREN_CLOSE, fcn->level);
-
-      if (fpc == nullptr)
-      {
-         return(true);
-      }
-   }
-   chunk_t *tmp;
-
-   // Check for 'foo()' and 'foo(void)'
-   if (chunk_get_next_ncnnl(fpo) == fpc)
-   {
-      has_param = false;
-   }
-   else
-   {
-      tmp = chunk_get_next_ncnnl(fpo);
-
-      if (  (tmp == chunk_get_prev_ncnnl(fpc))
-         && chunk_is_str(tmp, "void", 4))
-      {
-         has_param = false;
-      }
-   }
-
-   if (has_param)
-   {
-      chunk_t *prev = nullptr;
-      tmp = fpo;
-
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
-      {
-         if (  chunk_is_token(tmp, CT_COMMA)
-            || tmp == fpc)
-         {
-            if (need_nl)
-            {
-               out_txt.append("\n");
-            }
-            need_nl = true;
-            out_txt.append("@param");
-
-            if (prev != nullptr)
-            {
-               out_txt.append(" ");
-               out_txt.append(prev->str);
-               out_txt.append(" TODO");
-            }
-            prev = nullptr;
-
-            if (tmp == fpc)
-            {
-               break;
-            }
-         }
-
-         if (chunk_is_token(tmp, CT_WORD))
-         {
-            prev = tmp;
-         }
-      }
-   }
-   // Do the return stuff
-   tmp = chunk_get_prev_ncnnl(fcn);
-
-   // For Objective-C we need to go to the previous chunk
-   if (  tmp != nullptr
-      && get_chunk_parent_type(tmp) == CT_OC_MSG_DECL
-      && chunk_is_token(tmp, CT_PAREN_CLOSE))
-   {
-      tmp = chunk_get_prev_ncnnl(tmp);
-   }
-
-   if (  tmp != nullptr
-      && !chunk_is_str(tmp, "void", 4))
-   {
-      if (need_nl)
-      {
-         out_txt.append("\n");
-      }
-      out_txt.append("@return TODO");
-   }
-   return(true);
-} // kw_fcn_javaparam
-
-
-static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt)
-{
-   chunk_t *fcn = get_next_function(cmt);
-
-   if (!fcn)
-   {
-      return(false);
-   }
-
-   if (fcn->flags.test(PCF_IN_CLASS))
-   {
-      // if inside a class, we need to find to the class name
-      chunk_t *tmp = chunk_get_prev_type(fcn, CT_BRACE_OPEN, fcn->level - 1);
-      tmp = chunk_get_prev_type(tmp, CT_CLASS, tmp->level);
-      tmp = chunk_get_next_ncnnl(tmp);
-
-      while (chunk_is_token(chunk_get_next_ncnnl(tmp), CT_DC_MEMBER))
-      {
-         tmp = chunk_get_next_ncnnl(tmp);
-         tmp = chunk_get_next_ncnnl(tmp);
-      }
-
-      if (tmp != nullptr)
-      {
-         out_txt.append(tmp->str);
-         return(true);
-      }
-   }
-   else
-   {
-      // if outside a class, we expect "CLASS::METHOD(...)"
-      chunk_t *tmp = chunk_get_prev_ncnnl(fcn);
-
-      if (chunk_is_token(tmp, CT_OPERATOR))
-      {
-         tmp = chunk_get_prev_ncnnl(tmp);
-      }
-
-      if (  tmp != nullptr
-         && (  chunk_is_token(tmp, CT_DC_MEMBER)
-            || chunk_is_token(tmp, CT_MEMBER)))
-      {
-         tmp = chunk_get_prev_ncnnl(tmp);
-         out_txt.append(tmp->str);
-         return(true);
-      }
-   }
-   return(false);
-} // kw_fcn_fclass
-
-
-struct kw_subst_t
-{
-   const char *tag;
-   bool       (*func)(chunk_t *cmt, unc_text &out_txt);
-};
-
-
-static const kw_subst_t kw_subst_table[] =
-{
-   { "$(filename)",  kw_fcn_filename  },
-   { "$(class)",     kw_fcn_class     },
-   { "$(message)",   kw_fcn_message   },
-   { "$(category)",  kw_fcn_category  },
-   { "$(scope)",     kw_fcn_scope     },
-   { "$(function)",  kw_fcn_function  },
-   { "$(javaparam)", kw_fcn_javaparam },
-   { "$(fclass)",    kw_fcn_fclass    },
-};
-
-
-static void do_kw_subst(chunk_t *pc)
-{
-   for (const auto &kw : kw_subst_table)
-   {
-      int idx = pc->str.find(kw.tag);
-
-      if (idx < 0)
-      {
-         continue;
-      }
-      unc_text tmp_txt;
-      tmp_txt.clear();
-
-      if (kw.func(pc, tmp_txt))
-      {
-         // if the replacement contains '\n' we need to fix the lead
-         if (tmp_txt.find("\n") >= 0)
-         {
-            size_t nl_idx = pc->str.rfind("\n", idx);
-
-            if (nl_idx > 0)
-            {
-               // idx and nl_idx are both positive
-               unc_text nl_txt;
-               nl_txt.append("\n");
-               nl_idx++;
-
-               while (  (nl_idx < static_cast<size_t>(idx))
-                     && !unc_isalnum(pc->str[nl_idx]))
-               {
-                  nl_txt.append(pc->str[nl_idx++]);
-               }
-               tmp_txt.replace("\n", nl_txt);
-            }
-         }
-         pc->str.replace(kw.tag, tmp_txt);
-      }
-   }
-} // do_kw_subst
-
-
-static void output_comment_multi_simple(chunk_t *pc)
-{
-   if (pc == nullptr)
-   {
-      return;
-   }
-   cmt_reflow cmt;
-
-   LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s', type is %s, orig_col is %zu, column is %zu\n",
-           __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column);
-
-   output_cmt_start(cmt, pc);
-
-   // The multiline comment is saved inside one chunk. If the comment is
-   // shifted all lines of the comment need to be shifted by the same amount.
-   // Save the difference of initial and current position to apply it on every
-   // line_column
-   const int col_diff = [pc]()
-   {
-      int diff = 0;
-
-      if (chunk_is_newline(chunk_get_prev(pc)))
-      {
-         // The comment should be indented correctly
-         diff = pc->column - pc->orig_col;
-      }
-      return(diff);
-   }();
-
-   /**
-    * check for enable/disable processing comment strings that may
-    * both be embedded within the same multi-line comment
-    */
-   auto     disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str);
-   auto     enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->str);
-
-   unc_text line;
-   size_t   line_count  = 0;
-   size_t   line_column = pc->column;
-   size_t   cmt_idx     = 0;
-
-   while (cmt_idx < pc->len())
-   {
-      int ch = pc->str[cmt_idx];
-      cmt_idx++;
-
-      if (  cmt_idx > std::size_t(disable_processing_cmt_idx)
-         && enable_processing_cmt_idx > disable_processing_cmt_idx)
-      {
-         auto     length = enable_processing_cmt_idx - disable_processing_cmt_idx;
-         unc_text verbatim_text(pc->str,
-                                disable_processing_cmt_idx,
-                                length);
-
-         add_text(verbatim_text);
-
-         cmt_idx = enable_processing_cmt_idx;
-
-         /**
-          * check for additional enable/disable processing comment strings that may
-          * both be embedded within the same multi-line comment
-          */
-         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str,
-                                                                             enable_processing_cmt_idx);
-         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->str,
-                                                                           enable_processing_cmt_idx);
-
-         line.clear();
-
-         continue;
-      }
-      // 1: step through leading tabs and spaces to find the start column
-      log_rule_B("cmt_convert_tab_to_spaces");
-
-      if (  line.size() == 0
-         && (  line_column < cmt.base_col
-            || options::cmt_convert_tab_to_spaces()))
-      {
-         if (ch == ' ')
-         {
-            line_column++;
-            continue;
-         }
-         else if (ch == '\t')
-         {
-            log_rule_B("input_tab_size");
-            line_column = calc_next_tab_column(line_column, options::input_tab_size());
-            continue;
-         }
-         else
-         {
-            LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
-         }
-      }
-
-      // 2: add chars to line, handle the CRLF and CR endings (convert both to LF)
-      if (ch == '\r')
-      {
-         ch = '\n';
-
-         if (  (cmt_idx < pc->len())
-            && (pc->str[cmt_idx] == '\n'))
-         {
-            cmt_idx++;
-         }
-      }
-      LOG_FMT(LCONTTEXT, "%s(%d):Line is %s\n", __func__, __LINE__, line.c_str());
-      line.append(ch);
-      LOG_FMT(LCONTTEXT, "%s(%d):Line is %s\n", __func__, __LINE__, line.c_str());
-
-      // If we just hit an end of line OR we just hit end-of-comment...
-      if (  ch == '\n'
-         || cmt_idx == pc->len())
-      {
-         line_count++;
-         LOG_FMT(LCONTTEXT, "%s(%d):line_count is %zu\n", __func__, __LINE__, line_count);
-
-         // strip trailing tabs and spaces before the newline
-         if (ch == '\n')
-         {
-            line.pop_back();
-
-            // Say we aren't in a preproc to prevent changing any bs-nl
-            cmt_trim_whitespace(line, false);
-
-            line.append('\n');
-         }
-
-         if (line.size() > 0)
-         {
-            // unless line contains only a single newline char, indent if the
-            // line consists of either:
-            if (  line.size() > 1 // more than a single newline char or
-               || ch != '\n')     // (end-of-comment) a single non newline char
-            {
-               if (line_count > 1)
-               {
-                  // apply comment column shift without underflowing
-                  line_column = (  col_diff < 0
-                                && (cast_abs(line_column, col_diff) > line_column))
-                                ? 0 : line_column + col_diff;
-               }
-               cmt.column = line_column;
-               cmt_output_indent(cmt.brace_col, cmt.base_col, cmt.column);
-            }
-            add_text(line);
-
-            line.clear();
-         }
-         line_column = 1;
-      }
-   }
-} // output_comment_multi_simple
-
-
-static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef)
-{
-   int column = -1;
-
-   dst.clear();
-
-   for (chunk_t *pc = ifdef; pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (column == -1)
-      {
-         column = pc->column;
-      }
-
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         || chunk_is_token(pc, CT_COMMENT_MULTI)
-         || chunk_is_token(pc, CT_COMMENT_CPP))
-      {
-         break;
-      }
-      else if (chunk_is_token(pc, CT_NL_CONT))
-      {
-         dst   += ' ';
-         column = -1;
-      }
-      else if (  chunk_is_token(pc, CT_COMMENT)
-              || chunk_is_token(pc, CT_COMMENT_EMBED))
-      {
-      }
-      else // if (chunk_is_token(pc, CT_JUNK)) || else
-      {
-         for (int spacing = pc->column - column; spacing > 0; spacing--)
-         {
-            dst += ' ';
-            column++;
-         }
-
-         dst.append(pc->str);
-         column += pc->len();
-      }
-   }
-} // generate_if_conditional_as_text
-
-
-void add_long_preprocessor_conditional_block_comment(void)
-{
-   chunk_t *pp_start = nullptr;
-   chunk_t *pp_end   = nullptr;
-
-   for (chunk_t *pc = chunk_get_head(); pc; pc = chunk_get_next_ncnnl(pc))
-   {
-      // just track the preproc level:
-      if (chunk_is_token(pc, CT_PREPROC))
-      {
-         pp_end = pp_start = pc;
-      }
-
-      if (  pc->type != CT_PP_IF
-         || !pp_start)
-      {
-         continue;
-      }
-#if 0
-      if (pc->flags.test(PCF_IN_PREPROC))
-      {
-         continue;
-      }
-#endif
-
-      chunk_t *br_close;
-      chunk_t *br_open = pc;
-      size_t  nl_count = 0;
-
-      chunk_t *tmp = pc;
-
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
-      {
-         // just track the preproc level:
-         if (chunk_is_token(tmp, CT_PREPROC))
-         {
-            pp_end = tmp;
-         }
-
-         if (chunk_is_newline(tmp))
-         {
-            nl_count += tmp->nl_count;
-         }
-         else if (  pp_end->pp_level == pp_start->pp_level
-                 && (  chunk_is_token(tmp, CT_PP_ENDIF)
-                    || ((chunk_is_token(br_open, CT_PP_IF)) ? (chunk_is_token(tmp, CT_PP_ELSE)) : 0)))
-         {
-            br_close = tmp;
-
-            LOG_FMT(LPPIF, "found #if / %s section on lines %zu and %zu, nl_count=%zu\n",
-                    (chunk_is_token(tmp, CT_PP_ENDIF) ? "#endif" : "#else"),
-                    br_open->orig_line, br_close->orig_line, nl_count);
-
-            // Found the matching #else or #endif - make sure a newline is next
-            tmp = chunk_get_next(tmp);
-
-            LOG_FMT(LPPIF, "next item type %d (is %s)\n",
-                    (tmp ? tmp->type : -1), (tmp ? chunk_is_newline(tmp) ? "newline"
-                                             : chunk_is_comment(tmp) ? "comment" : "other" : "---"));
-
-            if (  tmp == nullptr
-               || chunk_is_token(tmp, CT_NEWLINE)) // chunk_is_newline(tmp))
-            {
-               size_t nl_min;
-
-               if (chunk_is_token(br_close, CT_PP_ENDIF))
-               {
-                  log_rule_B("mod_add_long_ifdef_endif_comment");
-                  nl_min = options::mod_add_long_ifdef_endif_comment();
-               }
-               else
-               {
-                  log_rule_B("mod_add_long_ifdef_else_comment");
-                  nl_min = options::mod_add_long_ifdef_else_comment();
-               }
-               const char *txt = !tmp ? "EOF" : ((chunk_is_token(tmp, CT_PP_ENDIF)) ? "#endif" : "#else");
-               LOG_FMT(LPPIF, "#if / %s section candidate for augmenting when over NL threshold %zu != 0 (nl_count=%zu)\n",
-                       txt, nl_min, nl_count);
-
-               if (  nl_min > 0
-                  && nl_count > nl_min) // nl_count is 1 too large at all times as #if line was counted too
-               {
-                  // determine the added comment style
-                  c_token_t style = (language_is_set(LANG_CPP)) ?
-                                    CT_COMMENT_CPP : CT_COMMENT;
-
-                  unc_text str;
-                  generate_if_conditional_as_text(str, br_open);
-
-                  LOG_FMT(LPPIF, "#if / %s section over threshold %zu (nl_count=%zu) --> insert comment after the %s: %s\n",
-                          txt, nl_min, nl_count, txt, str.c_str());
-
-                  // Add a comment after the close brace
-                  insert_comment_after(br_close, style, str);
-               }
-            }
-
-            // checks both the #else and #endif for a given level, only then look further in the main loop
-            if (chunk_is_token(br_close, CT_PP_ENDIF))
-            {
-               break;
-            }
-         }
-      }
-   }
-} // add_long_preprocessor_conditional_block_comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.h
deleted file mode 100644
index 2af77ea1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file output.h
- * prototypes for output.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef OUTPUT_H_INCLUDED
-#define OUTPUT_H_INCLUDED
-
-#include "unc_text.h"
-
-#include <stdio.h>
-
-
-//! This renders the chunk list to a file.
-void output_parsed(FILE *pfile);
-
-
-//! This renders the chunk list to a file formatted as csv.
-void output_parsed_csv(FILE *pfile);
-
-
-//! This renders the chunk list to a file.
-void output_text(FILE *pfile);
-
-
-/**
- * See also it's preprocessor counterpart
- *   add_long_closebrace_comment
- * in braces.cpp
- *
- * Note: since this concerns itself with the preprocessor -- which is line-oriented --
- * it turns out that just looking at pc->pp_level is NOT the right thing to do.
- * See a --parsed dump if you don't believe this: an '#endif' will be one level
- * UP from the corresponding #ifdef when you look at the tokens 'ifdef' versus 'endif',
- * but it's a whole another story when you look at their CT_PREPROC ('#') tokens!
- *
- * Hence we need to track and seek matching CT_PREPROC pp_levels here, which complicates
- * things a little bit, but not much.
- */
-void add_long_preprocessor_conditional_block_comment(void);
-
-
-#endif /* OUTPUT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.cpp
deleted file mode 100644
index 51ee4710..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * @file parens.cpp
- * Adds or removes parens.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "parens.h"
-
-#include "log_rules.h"
-
-using namespace uncrustify;
-
-
-//! Add an open parenthesis after first and add a close parenthesis before the last
-static void add_parens_between(chunk_t *first, chunk_t *last);
-
-
-/**
- * Scans between two parens and adds additional parens if needed.
- * This function is recursive. If it hits another open paren, it'll call itself
- * with the new bounds.
- *
- * Adds optional parens in an IF or SWITCH conditional statement.
- *
- * This basically just checks for a CT_COMPARE that isn't surrounded by parens.
- * The edges for the compare are the open, close and any CT_BOOL tokens.
- *
- * This only handles VERY simple patterns:
- *   (!a && b)         => (!a && b)          -- no change
- *   (a && b == 1)     => (a && (b == 1))
- *   (a == 1 || b > 2) => ((a == 1) || (b > 2))
- *
- * FIXME: we really should bail if we transition between a preprocessor and
- *        a non-preprocessor
- */
-static void check_bool_parens(chunk_t *popen, chunk_t *pclose, int nest);
-
-
-void do_parens(void)
-{
-   constexpr static auto LCURRENT = LPARADD;
-
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("mod_full_paren_if_bool");
-
-   if (options::mod_full_paren_if_bool())
-   {
-      chunk_t *pc = chunk_get_head();
-
-      while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-      {
-         if (  pc->type != CT_SPAREN_OPEN
-            || (  get_chunk_parent_type(pc) != CT_IF
-               && get_chunk_parent_type(pc) != CT_ELSEIF
-               && get_chunk_parent_type(pc) != CT_SWITCH))
-         {
-            continue;
-         }
-         // Grab the close sparen
-         chunk_t *pclose = chunk_get_next_type(pc, CT_SPAREN_CLOSE, pc->level, scope_e::PREPROC);
-
-         if (pclose != nullptr)
-         {
-            check_bool_parens(pc, pclose, 0);
-            pc = pclose;
-         }
-      }
-   }
-}
-
-
-static void add_parens_between(chunk_t *first, chunk_t *last)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LPARADD, "%s: line %zu between %s [lvl=%zu] and %s [lvl=%zu]\n",
-           __func__, first->orig_line,
-           first->text(), first->level,
-           last->text(), last->level);
-
-   // Don't do anything if we have a bad sequence, ie "&& )"
-   chunk_t *first_n = chunk_get_next_ncnnl(first);
-
-   if (first_n == last)
-   {
-      return;
-   }
-   chunk_t pc;
-
-   set_chunk_type(&pc, CT_PAREN_OPEN);
-   pc.orig_line   = first_n->orig_line;
-   pc.orig_col    = first_n->orig_col;
-   pc.str         = "(";
-   pc.flags       = first_n->flags & PCF_COPY_FLAGS;
-   pc.level       = first_n->level;
-   pc.pp_level    = first_n->pp_level;
-   pc.brace_level = first_n->brace_level;
-
-   chunk_add_before(&pc, first_n);
-
-   chunk_t *last_p = chunk_get_prev_ncnnl(last, scope_e::PREPROC);
-
-   set_chunk_type(&pc, CT_PAREN_CLOSE);
-   pc.orig_line   = last_p->orig_line;
-   pc.orig_col    = last_p->orig_col;
-   pc.str         = ")";
-   pc.flags       = last_p->flags & PCF_COPY_FLAGS;
-   pc.level       = last_p->level;
-   pc.pp_level    = last_p->pp_level;
-   pc.brace_level = last_p->brace_level;
-
-   chunk_add_after(&pc, last_p);
-
-   for (chunk_t *tmp = first_n;
-        tmp != last_p;
-        tmp = chunk_get_next_ncnnl(tmp))
-   {
-      tmp->level++;
-   }
-
-   last_p->level++;
-} // add_parens_between
-
-
-static void check_bool_parens(chunk_t *popen, chunk_t *pclose, int nest)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *ref        = popen;
-   bool    hit_compare = false;
-
-   LOG_FMT(LPARADD, "%s(%d): popen on %zu, col %zu, pclose on %zu, col %zu, level=%zu\n",
-           __func__, nest,
-           popen->orig_line, popen->orig_col,
-           pclose->orig_line, pclose->orig_col,
-           popen->level);
-
-   chunk_t *pc = popen;
-
-   while (  (pc = chunk_get_next_ncnnl(pc)) != nullptr
-         && pc != pclose)
-   {
-      if (pc->flags.test(PCF_IN_PREPROC))
-      {
-         LOG_FMT(LPARADD2, " -- bail on PP %s [%s] at line %zu col %zu, level %zu\n",
-                 get_token_name(pc->type),
-                 pc->text(), pc->orig_line, pc->orig_col, pc->level);
-         return;
-      }
-
-      if (  chunk_is_token(pc, CT_BOOL)
-         || chunk_is_token(pc, CT_QUESTION)
-         || chunk_is_token(pc, CT_COND_COLON)
-         || chunk_is_token(pc, CT_COMMA))
-      {
-         LOG_FMT(LPARADD2, " -- %s [%s] at line %zu col %zu, level %zu\n",
-                 get_token_name(pc->type),
-                 pc->text(), pc->orig_line, pc->orig_col, pc->level);
-
-         if (hit_compare)
-         {
-            hit_compare = false;
-
-            if (!language_is_set(LANG_CS))
-            {
-               add_parens_between(ref, pc);
-            }
-         }
-         ref = pc;
-      }
-      else if (chunk_is_token(pc, CT_COMPARE))
-      {
-         LOG_FMT(LPARADD2, " -- compare [%s] at line %zu col %zu, level %zu\n",
-                 pc->text(), pc->orig_line, pc->orig_col, pc->level);
-         hit_compare = true;
-      }
-      else if (chunk_is_paren_open(pc))
-      {
-         chunk_t *next = chunk_skip_to_match(pc);
-
-         if (next != nullptr)
-         {
-            check_bool_parens(pc, next, nest + 1);
-            pc = next;
-         }
-      }
-      else if (  chunk_is_token(pc, CT_BRACE_OPEN)
-              || chunk_is_token(pc, CT_SQUARE_OPEN)
-              || chunk_is_token(pc, CT_ANGLE_OPEN))
-      {
-         // Skip [], {}, and <>
-         pc = chunk_skip_to_match(pc);
-      }
-   }
-
-   if (  hit_compare
-      && ref != popen
-      && !language_is_set(LANG_CS))
-   {
-      add_parens_between(ref, pclose);
-   }
-} // check_bool_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.h
deleted file mode 100644
index c0433f92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file parens.h
- * prototypes for parens.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef PARENS_H_INCLUDED
-#define PARENS_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-//! add parenthesis
-void do_parens(void);
-
-
-#endif /* PARENS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.cpp
deleted file mode 100644
index 42a3f840..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file parent_for_pp.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "parent_for_pp.h"
-
-#include "chunk_list.h"
-
-
-void do_parent_for_pp(void)
-{
-   LOG_FUNC_ENTRY();
-
-   vector<chunk_t *> viz;
-
-   chunk_t           *pc = chunk_get_head();
-
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-   {
-      // CT_PP_IF,            // #if, #ifdef, or #ifndef
-      // CT_PP_ELSE,          // #else or #elif
-      // CT_PP_ENDIF,         // #endif
-      if (chunk_is_token(pc, CT_PP_IF))
-      {
-         LOG_FMT(LMCB, "%s(%d): IF: orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-         log_pcf_flags(LMCB, pc->flags);
-         viz.push_back(pc);
-      }
-      else if (chunk_is_token(pc, CT_PP_ELSE))
-      {
-         LOG_FMT(LMCB, "%s(%d): ELSE: orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-         log_pcf_flags(LMCB, pc->flags);
-         size_t  level = pc->pp_level;
-         chunk_t *a    = viz.at(level - 1);
-         chunk_set_parent(pc, a);
-      }
-      else if (chunk_is_token(pc, CT_PP_ENDIF))
-      {
-         LOG_FMT(LMCB, "%s(%d): ENDIF: orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-         log_pcf_flags(LMCB, pc->flags);
-         size_t  level = pc->pp_level;
-         chunk_t *a    = viz.at(level);
-         chunk_set_parent(pc, a);
-         viz.pop_back();
-      }
-   }
-} // do_parent_for_pp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.h
deleted file mode 100644
index cb069680..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @file parent_for_pp.h
- * prototype for parent_for_pp.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#ifndef PARENT_FOR_PP_H_INCLUDED
-#define PARENT_FOR_PP_H_INCLUDED
-
-
-// mark the parent
-void do_parent_for_pp(void);
-
-
-#endif /* PARENT_FOR_PP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.cpp
deleted file mode 100644
index 0a22bf72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * @file pcf_flags.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "pcf_flags.h"
-
-static const char *pcf_names[] =
-{
-   "IN_PREPROC",        // 0
-   "IN_STRUCT",         // 1
-   "IN_ENUM",           // 2
-   "IN_FCN_DEF",        // 3
-   "IN_FCN_CALL",       // 4
-   "IN_SPAREN",         // 5
-   "IN_TEMPLATE",       // 6
-   "IN_TYPEDEF",        // 7
-   "IN_CONST_ARGS",     // 8
-   "IN_ARRAY_ASSIGN",   // 9
-   "IN_CLASS",          // 10
-   "IN_CLASS_BASE",     // 11
-   "IN_NAMESPACE",      // 12
-   "IN_FOR",            // 13
-   "IN_OC_MSG",         // 14
-   "IN_WHERE_SPEC",     // 15
-   "IN_DECLTYPE",       // 16
-   "FORCE_SPACE",       // 17
-   "STMT_START",        // 18
-   "EXPR_START",        // 19
-   "DONT_INDENT",       // 20
-   "ALIGN_START",       // 21
-   "WAS_ALIGNED",       // 22
-   "VAR_TYPE",          // 23
-   "VAR_DEF",           // 24
-   "VAR_1ST",           // 25
-   "VAR_INLINE",        // 26
-   "RIGHT_COMMENT",     // 27
-   "OLD_FCN_PARAMS",    // 28
-   "LVALUE",            // 29
-   "ONE_LINER",         // 30
-   "EMPTY_BODY",        // 31
-   "ANCHOR",            // 32
-   "PUNCTUATOR",        // 33
-   "INSERTED",          // 34
-   "LONG_BLOCK",        // 35
-   "OC_BOXED",          // 36
-   "KEEP_BRACE",        // 37
-   "OC_RTYPE",          // 38
-   "OC_ATYPE",          // 39
-   "WF_ENDIF",          // 40
-   "IN_QT_MACRO",       // 41
-   "IN_FCN_CTOR",       // 42                    Issue #2152
-   "IN_TRY_BLOCK",      // 43                    Issue #1734
-   "INCOMPLETE",        // 44
-   "IN_LAMBDA",         // 45
-   "WF_IF",             // 46
-};
-
-
-std::string pcf_flags_str(pcf_flags_t flags)
-{
-   char buffer[64];
-
-   // Generate hex representation first
-#ifdef WIN32
-   snprintf(buffer, 63, "[");
-#else // not WIN32
-   snprintf(buffer, 63, "[0x%llx:", (long long unsigned int)(flags));
-#endif // ifdef WIN32
-
-   // Add human-readable names
-   auto out   = std::string{ buffer };
-   auto first = true;
-
-   for (size_t i = 0; i < ARRAY_SIZE(pcf_names); ++i)
-   {
-      if (flags & static_cast<pcf_flag_e>(pcf_bit(i)))
-      {
-         if (first)
-         {
-            first = false;
-         }
-         else
-         {
-            out += ',';
-         }
-         out += pcf_names[i];
-      }
-   }
-
-   out += ']';
-   return(out);
-}
-
-
-void log_pcf_flags(log_sev_t sev, pcf_flags_t flags)
-{
-   if (!log_sev_on(sev))
-   {
-      return;
-   }
-   log_fmt(sev, "%s\n", pcf_flags_str(flags).c_str());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.h
deleted file mode 100644
index c0465c14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * @file pcf_flags.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#ifndef PCF_FLAGS_STR_INCLUDED
-#define PCF_FLAGS_STR_INCLUDED
-
-#include "enum_flags.h"
-#include "logger.h"
-
-#include <cstddef>      // do get the definition of size_t
-
-// and the ever-so-important array size macro
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x)    (sizeof(x) / sizeof((x)[0]))
-#endif
-
-using namespace std;
-
-
-constexpr auto pcf_bit(size_t b) -> decltype(0ULL)
-{
-   return(1ULL << b);
-}
-
-enum pcf_flag_e : decltype ( 0ULL )
-{
-// Copy flags are in the lower 17 bits
-   PCF_NONE            = 0ULL,
-   PCF_COPY_FLAGS      = 0x0001ffffULL,
-   PCF_IN_PREPROC      = pcf_bit(0),  //! in a preprocessor
-   PCF_IN_STRUCT       = pcf_bit(1),  //! in a struct
-   PCF_IN_ENUM         = pcf_bit(2),  //! in enum
-   PCF_IN_FCN_DEF      = pcf_bit(3),  //! inside function def parens
-   PCF_IN_FCN_CALL     = pcf_bit(4),  //! inside function call parens
-   PCF_IN_SPAREN       = pcf_bit(5),  //! inside for/if/while/switch parens
-   PCF_IN_TEMPLATE     = pcf_bit(6),
-   PCF_IN_TYPEDEF      = pcf_bit(7),
-   PCF_IN_CONST_ARGS   = pcf_bit(8),
-   PCF_IN_ARRAY_ASSIGN = pcf_bit(9),
-   PCF_IN_CLASS        = pcf_bit(10),
-   PCF_IN_CLASS_BASE   = pcf_bit(11),
-   PCF_IN_NAMESPACE    = pcf_bit(12),
-   PCF_IN_FOR          = pcf_bit(13),
-   PCF_IN_OC_MSG       = pcf_bit(14),
-   PCF_IN_WHERE_SPEC   = pcf_bit(15),  /* inside C# 'where' constraint clause on class or function def */
-   PCF_IN_DECLTYPE     = pcf_bit(16),
-
-// Non-Copy flags are in the upper 47 bits
-   PCF_FORCE_SPACE     = pcf_bit(17),  //! must have a space after this token
-   PCF_STMT_START      = pcf_bit(18),  //! marks the start of a statement
-   PCF_EXPR_START      = pcf_bit(19),
-   PCF_DONT_INDENT     = pcf_bit(20),  //! already aligned!
-   PCF_ALIGN_START     = pcf_bit(21),
-   PCF_WAS_ALIGNED     = pcf_bit(22),
-   PCF_VAR_TYPE        = pcf_bit(23),  //! part of a variable def type
-   PCF_VAR_DEF         = pcf_bit(24),  //! variable name in a variable def
-   PCF_VAR_1ST         = pcf_bit(25),  //! 1st variable def in a statement
-   PCF_VAR_1ST_DEF     = (PCF_VAR_DEF | PCF_VAR_1ST),
-   PCF_VAR_INLINE      = pcf_bit(26),  //! type was an inline struct/enum/union
-   PCF_RIGHT_COMMENT   = pcf_bit(27),
-   PCF_OLD_FCN_PARAMS  = pcf_bit(28),
-   PCF_LVALUE          = pcf_bit(29),  //! left of assignment
-   PCF_ONE_LINER       = pcf_bit(30),
-   PCF_ONE_CLASS       = (PCF_ONE_LINER | PCF_IN_CLASS),
-   PCF_EMPTY_BODY      = pcf_bit(31),
-   PCF_ANCHOR          = pcf_bit(32),  //! aligning anchor
-   PCF_PUNCTUATOR      = pcf_bit(33),
-   PCF_INSERTED        = pcf_bit(34),  //! chunk was inserted from another file
-   PCF_LONG_BLOCK      = pcf_bit(35),  //! the block is 'long' by some measure
-   PCF_OC_BOXED        = pcf_bit(36),  //! inside OC boxed expression
-   PCF_KEEP_BRACE      = pcf_bit(37),  //! do not remove brace
-   PCF_OC_RTYPE        = pcf_bit(38),  //! inside OC return type
-   PCF_OC_ATYPE        = pcf_bit(39),  //! inside OC arg type
-   PCF_WF_ENDIF        = pcf_bit(40),  //! #endif for whole file ifdef
-   PCF_IN_QT_MACRO     = pcf_bit(41),  //! in a QT-macro, i.e. SIGNAL, SLOT
-   PCF_IN_FCN_CTOR     = pcf_bit(42),  //! inside function constructor
-   PCF_IN_TRY_BLOCK    = pcf_bit(43),  //! inside Function-try-block
-   PCF_INCOMPLETE      = pcf_bit(44),  //! class/struct forward declaration
-   PCF_IN_LAMBDA       = pcf_bit(45),  //! inside a lambda expression
-   PCF_WF_IF           = pcf_bit(46),  //! #if for a whole file ifdef
-   PCF_NOT_POSSIBLE    = pcf_bit(47),  //! it is not possible to make an one_liner
-                                       //! because the line would be too long
-};
-
-UNC_DECLARE_FLAGS(pcf_flags_t, pcf_flag_e);
-UNC_DECLARE_OPERATORS_FOR_FLAGS(pcf_flags_t);
-
-std::string pcf_flags_str(pcf_flags_t flags);
-
-
-void log_pcf_flags(log_sev_t sev, pcf_flags_t flags);
-
-
-#endif /* PCF_FLAGS_STR_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/prototypes.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/prototypes.h
deleted file mode 100644
index dde8edc3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/prototypes.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * @file prototypes.h
- * Big jumble of prototypes used in Uncrustify.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef C_PARSE_PROTOTYPES_H_INCLUDED
-#define C_PARSE_PROTOTYPES_H_INCLUDED
-
-#include "chunk_list.h"
-#include "log_rules.h"
-#include "uncrustify_types.h"
-
-#include <deque>
-#include <string>
-
-
-/**
- * Advances to the next tab stop.
- * Column 1 is the left-most column.
- *
- * @param col     The current column
- * @param tabsize The tabsize
- * @return the next tabstop column
- */
-static inline size_t calc_next_tab_column(size_t col, size_t tabsize)
-{
-   if (col == 0)
-   {
-      col = 1;
-   }
-
-   if (cpd.frag_cols > 0)
-   {
-      col += cpd.frag_cols - 1;
-   }
-   col = 1 + ((((col - 1) / tabsize) + 1) * tabsize);
-
-   if (cpd.frag_cols > 0)
-   {
-      col -= cpd.frag_cols - 1;
-   }
-   return(col);
-}
-
-
-/**
- * Advances to the next tab stop for output.
- *
- * @param col  The current column
- * @return the next tabstop column
- */
-static inline size_t next_tab_column(size_t col)
-{
-   constexpr static auto LCURRENT = LINDENT;
-
-   log_rule_B("output_tab_size");
-   return(calc_next_tab_column(col, uncrustify::options::output_tab_size()));
-}
-
-
-#endif /* C_PARSE_PROTOTYPES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.cpp
deleted file mode 100644
index 6c9c41f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * @file punctuators.cpp
- * Manages the table of punctuators.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "punctuators.h"
-
-//#include "log_rules.h"
-#include "prototypes.h"
-
-#include <algorithm>
-
-constexpr static auto LCURRENT = LOTHER;
-
-using namespace std;
-using namespace uncrustify;
-
-
-/**
- *
- *   The file "punctuator_table.h" was generated by punc.py from this file.
- *   If you change one of the below symbol tables, re-run punc.py.
- *   $ python scripts/punc.py > src/punctuator_table.h
- *   now automatically with CMakeLists.txt
- *
- *   NOTE: the tables below do not need to be sorted.
- */
-
-#include "symbols_table.h"
-// must be positioned here, after all symbolsX[], because punc_table uses them
-#include "punctuator_table.h"
-
-
-const chunk_tag_t *find_punctuator(const char *str, int lang_flags)
-{
-   if (  str == nullptr
-      || str[0] == '\0')
-   {
-      return(nullptr);
-   }
-   const auto binary_find = [](const lookup_entry_t *first, const lookup_entry_t *last, const char &value)
-   {
-      const auto tmp = std::lower_bound(first, last, value,
-                                        lookup_entry_t::comperator());
-
-      return((value == tmp->ch) ? tmp : nullptr);
-   };
-
-   const chunk_tag_t *match  = nullptr;
-   const auto        *parent = punc_table; //!< graph in table form, initially point at first entry
-   auto              ch_idx  = int{};
-
-   while (  ch_idx < 6
-         && str[ch_idx] != '\0') //!< symbols6: max punc len = 6
-   {
-      // search for next parent node in all current child nodes
-      parent = binary_find(parent, next(parent, parent->left_in_group), str[ch_idx]);
-
-      if (parent == nullptr)
-      {
-         break; // no nodes found with the searched char
-      }
-      log_rule_B("enable_digraphs");
-
-      if (  parent->tag != nullptr
-         && (parent->tag->lang_flags & lang_flags) != 0  // punctuator lang and processing lang match
-         && (  (parent->tag->lang_flags & FLAG_DIG) == 0 // punctuator is not a di/tri-graph
-            || options::enable_digraphs()))              // or di/tri-graph processing is enabled
-      {
-         match = parent->tag;
-      }
-
-      if (parent->next_idx == 0)
-      {
-         break;                               // no child nodes, leaf reached
-      }
-      parent = &punc_table[parent->next_idx]; // point at the first child node
-      ch_idx++;
-      continue;
-   }
-   return(match);
-} // find_punctuator
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.h
deleted file mode 100644
index ed4c3fa5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @file punctuators.h
- */
-
-#ifndef PUNCTUATORS_H_INCLUDED
-#define PUNCTUATORS_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-struct lookup_entry_t
-{
-   char              ch;
-   char              left_in_group;
-   UINT16            next_idx;
-   const chunk_tag_t *tag;
-
-   struct comperator
-   {
-      static char get_char(const lookup_entry_t &v)
-      {
-         return(v.ch);
-      }
-
-
-      static char get_char(char t)
-      {
-         return(t);
-      }
-
-      template<typename T1, typename T2>
-      bool operator()(T1 const &t1, T2 const &t2)
-      {
-         return(get_char(t1) < get_char(t2));
-      }
-   };
-};
-
-
-/**
- * Checks if the first max. 6 chars of a given string match a punctuator
- *
- * @param str         string that will be checked, can be shorter than 6 chars
- * @param lang_flags  specifies from which language punctuators will be considered
- *
- * @retval            chunk tag of the found punctuator
- * @retval            nullptr if nothing found
- */
-const chunk_tag_t *find_punctuator(const char *str, int lang_flags);
-
-
-#endif /* PUNCTUATORS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.cpp
deleted file mode 100644
index d63e96e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file quick_align_again.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "quick_align_again.h"
-
-#include "align_stack.h"
-#include "chunk_list.h"
-
-
-void quick_align_again(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      char copy[1000];
-      LOG_FMT(LALAGAIN, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->elided_text(copy));
-
-      if (  pc->align.next != nullptr
-         && pc->flags.test(PCF_ALIGN_START))
-      {
-         AlignStack as;
-         as.Start(100, 0);
-         as.m_right_align = pc->align.right_align;
-         as.m_star_style  = static_cast<AlignStack::StarStyle>(pc->align.star_style);
-         as.m_amp_style   = static_cast<AlignStack::StarStyle>(pc->align.amp_style);
-         as.m_gap         = pc->align.gap;
-
-         LOG_FMT(LALAGAIN, "%s(%d):   pc->text() is '%s', orig_line is %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line);
-         as.Add(pc->align.start);
-         chunk_flags_set(pc, PCF_WAS_ALIGNED);
-
-         for (chunk_t *tmp = pc->align.next; tmp != nullptr; tmp = tmp->align.next)
-         {
-            chunk_flags_set(tmp, PCF_WAS_ALIGNED);
-            as.Add(tmp->align.start);
-            LOG_FMT(LALAGAIN, "%s(%d):    => tmp->text() is '%s', orig_line is %zu\n",
-                    __func__, __LINE__, tmp->text(), tmp->orig_line);
-         }
-
-         LOG_FMT(LALAGAIN, "\n");
-         as.End();
-      }
-   }
-} // quick_align_again
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.h
deleted file mode 100644
index b31a450a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @file quick_align_again.h
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef QUICK_ALIGN_AGAIN_H_INCLUDED
-#define QUICK_ALIGN_AGAIN_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-void quick_align_again(void);
-
-#endif /* QUICK_ALIGN_AGAIN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.cpp
deleted file mode 100644
index 23c51cfa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * @file remove_extra_returns.cpp
- *
- * @author  Guy Maurel
- *          October 2015, 2016
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#include "remove_extra_returns.h"
-
-#include "uncrustify.h"
-
-
-void remove_extra_returns(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      LOG_FMT(LRMRETURN, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-              get_token_name(pc->type), get_token_name(pc->parent_type));
-
-      if (  chunk_is_token(pc, CT_RETURN)
-         && !pc->flags.test(PCF_IN_PREPROC))
-      {
-         // we might be in a class, check it                                     Issue #2705
-         // look for a closing brace
-         bool    remove_it      = false;
-         chunk_t *closing_brace = chunk_get_next_type(pc, CT_BRACE_CLOSE, 1);
-         LOG_FMT(LRMRETURN, "%s(%d): on orig_line %zu, level is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->level);
-
-         if (closing_brace != nullptr)
-         {
-            if (get_chunk_parent_type(closing_brace) == CT_FUNC_CLASS_DEF)
-            {
-               // we have a class. Do nothing
-            }
-            else if (  get_chunk_parent_type(closing_brace) == CT_FUNC_DEF
-                    && pc->level < 2)
-            {
-               remove_it = true;
-            }
-         }
-         else
-         {
-            // it is not a class
-            // look for a closing brace
-            closing_brace = chunk_get_next_type(pc, CT_BRACE_CLOSE, 0);
-            LOG_FMT(LRMRETURN, "%s(%d): on orig_line %zu, level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->level);
-
-            if (closing_brace != nullptr)
-            {
-               if (get_chunk_parent_type(closing_brace) == CT_FUNC_DEF)
-               {
-                  remove_it = true;
-               }
-            }
-         }
-
-         if (remove_it)
-         {
-            chunk_t *semicolon = chunk_get_next_ncnnl(pc);
-
-            if (  semicolon != nullptr
-               && chunk_is_token(semicolon, CT_SEMICOLON))
-            {
-               LOG_FMT(LRMRETURN, "%s(%d): Removed 'return;' on orig_line %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               chunk_del(pc);
-               chunk_del(semicolon);
-               pc = closing_brace;
-            }
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-} // remove_extra_returns
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.h
deleted file mode 100644
index 800ba9ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file remove_extra_returns.h
- * prototypes for remove_extra_returns.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.h
- */
-
-#ifndef REMOVE_EXTRA_RETURNS_H_INCLUDED
-#define REMOVE_EXTRA_RETURNS_H_INCLUDED
-
-#include "chunk_list.h"
-
-
-/**
- * @brief Remove unnecessary returns
- * that is remove 'return;' that appears as the last statement in a function
- */
-void remove_extra_returns(void);
-
-
-#endif /* REMOVE_EXTRA_RETURNS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.cpp
deleted file mode 100644
index bfb65107..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * @file semicolons.cpp
- * Removes extra semicolons
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "semicolons.h"
-
-#include "prototypes.h"
-
-
-static void remove_semicolon(chunk_t *pc);
-
-
-/**
- * We are on a semicolon that is after an unidentified brace close.
- * Check for what is before the brace open.
- * Do not remove if it is a square close, word, type, or paren close.
- */
-static void check_unknown_brace_close(chunk_t *semi, chunk_t *brace_close);
-
-
-static void remove_semicolon(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LDELSEMI, "%s(%d): Removed semicolon: orig_line is %zu, orig_col is %zu",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
-   log_func_stack_inline(LDELSEMI);
-   // TODO: do we want to shift stuff back a column?
-   chunk_del(pc);
-}
-
-
-void remove_extra_semicolons(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = chunk_get_head();
-
-   while (pc != nullptr)
-   {
-      chunk_t *next = chunk_get_next_ncnnl(pc);
-      chunk_t *prev;
-
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && !pc->flags.test(PCF_IN_PREPROC)
-         && (prev = chunk_get_prev_ncnnl(pc)) != nullptr)
-      {
-         LOG_FMT(LSCANSEMI, "%s(%d): Semi orig_line is %zu, orig_col is %zu, parent is %s, prev = '%s' [%s/%s]\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(get_chunk_parent_type(pc)),
-                 prev->text(),
-                 get_token_name(prev->type), get_token_name(get_chunk_parent_type(prev)));
-
-         if (get_chunk_parent_type(pc) == CT_TYPEDEF)
-         {
-            // keep it
-         }
-         else if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-                 && (  get_chunk_parent_type(prev) == CT_IF
-                    || get_chunk_parent_type(prev) == CT_ELSEIF
-                    || get_chunk_parent_type(prev) == CT_ELSE
-                    || get_chunk_parent_type(prev) == CT_SWITCH
-                    || get_chunk_parent_type(prev) == CT_WHILE
-                    || get_chunk_parent_type(prev) == CT_USING_STMT
-                    || get_chunk_parent_type(prev) == CT_FOR
-                    || get_chunk_parent_type(prev) == CT_FUNC_DEF
-                    || get_chunk_parent_type(prev) == CT_OC_MSG_DECL
-                    || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF
-                    || get_chunk_parent_type(prev) == CT_NAMESPACE))
-         {
-            remove_semicolon(pc);
-         }
-         else if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-                 && get_chunk_parent_type(prev) == CT_NONE)
-         {
-            check_unknown_brace_close(pc, prev);
-         }
-         else if (  chunk_is_token(prev, CT_SEMICOLON)
-                 && get_chunk_parent_type(prev) != CT_FOR)
-         {
-            remove_semicolon(pc);
-         }
-         else if (  language_is_set(LANG_D)
-                 && (  get_chunk_parent_type(prev) == CT_ENUM
-                    || get_chunk_parent_type(prev) == CT_UNION
-                    || get_chunk_parent_type(prev) == CT_STRUCT))
-         {
-            remove_semicolon(pc);
-         }
-         else if (  language_is_set(LANG_JAVA)
-                 && get_chunk_parent_type(prev) == CT_SYNCHRONIZED)
-         {
-            remove_semicolon(pc);
-         }
-         else if (chunk_is_token(prev, CT_BRACE_OPEN))
-         {
-            remove_semicolon(pc);
-         }
-      }
-      pc = next;
-   }
-} // remove_extra_semicolons
-
-
-static void check_unknown_brace_close(chunk_t *semi, chunk_t *brace_close)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_prev_type(brace_close, CT_BRACE_OPEN, brace_close->level);
-
-   pc = chunk_get_prev_ncnnl(pc);
-
-   if (  pc != nullptr
-      && pc->type != CT_RETURN
-      && pc->type != CT_WORD
-      && pc->type != CT_TYPE
-      && pc->type != CT_SQUARE_CLOSE
-      && pc->type != CT_ANGLE_CLOSE
-      && pc->type != CT_TSQUARE
-      && !chunk_is_paren_close(pc))
-   {
-      remove_semicolon(semi);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.h
deleted file mode 100644
index c0542a76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file semicolons.h
- * prototypes for semicolons.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef SEMICOLONS_H_INCLUDED
-#define SEMICOLONS_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * Removes superfluous semicolons:
- *  - after brace close whose parent is IF, ELSE, SWITCH, WHILE, FOR, NAMESPACE
- *  - after another semicolon where parent is not FOR
- *  - (D) after brace close whose parent is ENUM/STRUCT/UNION
- *  - (Java) after brace close whose parent is SYNCHRONIZED
- *  - after an open brace
- *  - when not in a #DEFINE
- */
-void remove_extra_semicolons(void);
-
-
-#endif /* SEMICOLONS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.cpp
deleted file mode 100644
index bec55749..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.cpp
+++ /dev/null
@@ -1,698 +0,0 @@
-/**
- * @file sorting.cpp
- * Sorts chunks and imports
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "sorting.h"
-
-#include "newlines.h"
-#include "prototypes.h"
-
-#include <regex>
-
-constexpr static auto LCURRENT = LSORT;
-
-using namespace uncrustify;
-
-Option<std::string>  *include_category_options[] =
-{
-   &options::include_category_0,
-   &options::include_category_1,
-   &options::include_category_2,
-};
-constexpr static int kIncludeCategoriesCount = 3;
-
-
-struct include_category
-{
-   include_category(const std::string &pattern)
-      : regex(pattern)
-   {
-   }
-   std::regex regex;
-};
-
-
-include_category *include_categories[kIncludeCategoriesCount];
-
-
-/**
- * Compare two series of chunks, starting with the given ones.
- * @param pc1   first  instance to compare
- * @param pc2   second instance to compare
- * @param tcare take care of case (lower case/ upper case)   Issue #2091
- *
- * @retval == 0  both text elements are equal
- * @retval  > 0
- * @retval  < 0
- */
-static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare = false);
-
-
-/**
- * Sorting should be pretty rare and should usually only include a few chunks.
- * We need to minimize the number of swaps, as those are expensive.
- * So, we do a min sort.
- */
-static void do_the_sort(chunk_t **chunks, size_t num_chunks);
-
-
-#define MARK_CHANGE()    mark_change(__func__, __LINE__)
-
-
-static void mark_change(const char *func, size_t line)
-{
-   LOG_FUNC_ENTRY();
-   cpd.changes++;
-
-   if (cpd.pass_count == 0)
-   {
-      LOG_FMT(LCHANGE, "%s(%d): change %d on %s:%zu\n",
-              __func__, __LINE__, cpd.changes, func, line);
-   }
-}
-
-
-static void prepare_categories()
-{
-   for (int i = 0; i < kIncludeCategoriesCount; ++i)
-   {
-      const auto &cat_pattern = (*include_category_options[i])();
-
-      if (!cat_pattern.empty())
-      {
-         include_categories[i] = new include_category(cat_pattern);
-      }
-      else
-      {
-         include_categories[i] = nullptr;
-      }
-   }
-}
-
-
-static void cleanup_categories()
-{
-   for (auto &include_category : include_categories)
-   {
-      if (include_category == nullptr)
-      {
-         continue;
-      }
-      delete include_category;
-      include_category = NULL;
-   }
-}
-
-
-static int get_chunk_priority(chunk_t *pc)
-{
-   for (int i = 0; i < kIncludeCategoriesCount; i++)
-   {
-      if (include_categories[i] != nullptr)
-      {
-         if (std::regex_match(pc->text(), include_categories[i]->regex))
-         {
-            return(i);
-         }
-      }
-   }
-
-   return(kIncludeCategoriesCount);
-}
-
-
-/**
- * Returns true if the text contains filename without extension.
- */
-static bool text_contains_filename_without_ext(const char *text)
-{
-   std::string filepath             = cpd.filename;
-   size_t      slash_idx            = filepath.find_last_of("/\\");
-   std::string filename_without_ext = filepath;
-
-   if (  slash_idx != std::string::npos
-      && slash_idx < (filepath.size() - 1))
-   {
-      std::string filename = filepath.substr(slash_idx + 1);
-      size_t      dot_idx  = filename.find_last_of('.');
-      filename_without_ext = filename.substr(0, dot_idx);
-   }
-   const std::regex  special_chars      = std::regex(R"([-[\]{}()*+?.,\^$|#\s])");
-   const std::string sanitized_filename = std::regex_replace(filename_without_ext, special_chars, R"(\$&)");
-   const std::regex  filename_pattern   = std::regex("\\S?" + sanitized_filename + "\\b.*");
-
-   return(std::regex_match(text, filename_pattern));
-}
-
-
-/**
- * Get chunk text without the extension.
- */
-static unc_text get_text_without_ext(const unc_text &chunk_text)
-{
-   unc_text result = chunk_text;
-   int      idx    = result.rfind(".", result.size() - 1);
-
-   if (idx == -1)
-   {
-      return(result);
-   }
-   result.erase(idx, result.size() - idx);
-   return(result);
-}
-
-
-/**
- * Returns true if unc_text has "." which implies extension.
- */
-static bool has_dot(const unc_text &chunk_text)
-{
-   int idx = chunk_text.rfind(".", chunk_text.size() - 1);
-
-   return(idx != -1);
-}
-
-
-/**
- * Returns chunk string required for sorting.
- */
-static unc_text chunk_sort_str(chunk_t *pc)
-{
-   if (get_chunk_parent_type(pc) == CT_PP_INCLUDE)
-   {
-      return(unc_text{ pc->str, 0, pc->len() - 1 });
-   }
-   return(pc->str);
-}
-
-
-//! Compare two chunks
-static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSORT, "%s(%d): @begin pc1->len is %zu, line is %zu, column is %zu\n",
-           __func__, __LINE__, pc1->len(), pc1->orig_line, pc1->orig_col);
-   LOG_FMT(LSORT, "%s(%d): @begin pc2->len is %zu, line is %zu, column is %zu\n",
-           __func__, __LINE__, pc2->len(), pc2->orig_line, pc2->orig_col);
-
-   if (pc1 == pc2) // same chunk is always identical thus return 0 differences
-   {
-      return(0);
-   }
-
-   while (  pc1 != nullptr
-         && pc2 != nullptr)
-   {
-      auto const &s1_ext = chunk_sort_str(pc1);
-      auto const &s2_ext = chunk_sort_str(pc2);
-
-      log_rule_B("mod_sort_incl_import_ignore_extension");
-      auto const &s1 = (options::mod_sort_incl_import_ignore_extension()) ? get_text_without_ext(s1_ext) : s1_ext;
-      auto const &s2 = (options::mod_sort_incl_import_ignore_extension()) ? get_text_without_ext(s2_ext) : s2_ext;
-      log_rule_B("mod_sort_incl_import_prioritize_filename");
-
-      if (options::mod_sort_incl_import_prioritize_filename())
-      {
-         bool s1_contains_filename = text_contains_filename_without_ext(s1.c_str());
-         bool s2_contains_filename = text_contains_filename_without_ext(s2.c_str());
-
-         if (  s1_contains_filename
-            && !s2_contains_filename)
-         {
-            return(-1);
-         }
-         else if (  !s1_contains_filename
-                 && s2_contains_filename)
-         {
-            return(1);
-         }
-      }
-
-      if (options::mod_sort_incl_import_prioritize_extensionless())
-      {
-         log_rule_B("mod_sort_incl_import_prioritize_extensionless");
-         const bool s1_has_dot = has_dot(s1_ext);
-         const bool s2_has_dot = has_dot(s2_ext);
-
-         if (  s1_has_dot
-            && !s2_has_dot)
-         {
-            return(1);
-         }
-         else if (  !s1_has_dot
-                 && s2_has_dot)
-         {
-            return(-1);
-         }
-      }
-
-      if (options::mod_sort_incl_import_prioritize_angle_over_quotes())
-      {
-         log_rule_B("mod_sort_incl_import_prioritize_angle_over_quotes");
-
-         if (  s1.startswith("<")
-            && s2.startswith("\""))
-         {
-            return(-1);
-         }
-         else if (  s1.startswith("\"")
-                 && s2.startswith("<"))
-         {
-            return(1);
-         }
-      }
-      int ppc1 = get_chunk_priority(pc1);
-      int ppc2 = get_chunk_priority(pc2);
-
-      if (ppc1 != ppc2)
-      {
-         return(ppc1 - ppc2);
-      }
-      LOG_FMT(LSORT, "%s(%d): text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc1->text(), pc1->len(), pc1->orig_line, pc1->orig_col);
-      LOG_FMT(LSORT, "%s(%d): text is %s, pc2->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc2->text(), pc2->len(), pc2->orig_line, pc2->orig_col);
-
-      int ret_val = unc_text::compare(s1, s2, std::min(s1.size(), s2.size()), tcare);
-      LOG_FMT(LSORT, "%s(%d): ret_val is %d\n",
-              __func__, __LINE__, ret_val);
-
-      if (ret_val != 0)
-      {
-         return(ret_val);
-      }
-
-      if (pc1->len() != pc2->len())
-      {
-         return(pc1->len() - pc2->len());
-      }
-      // Same word, same length. Step to the next chunk.
-      pc1 = chunk_get_next(pc1);
-      LOG_FMT(LSORT, "%s(%d): text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc1->text(), pc1->len(), pc1->orig_line, pc1->orig_col);
-
-      if (chunk_is_token(pc1, CT_MEMBER))
-      {
-         pc1 = chunk_get_next(pc1);
-         LOG_FMT(LSORT, "%s(%d): text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-                 __func__, __LINE__, pc1->text(), pc1->len(), pc1->orig_line, pc1->orig_col);
-      }
-      pc2 = chunk_get_next(pc2);
-      LOG_FMT(LSORT, "%s(%d): text is %s, pc2->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc2->text(), pc2->len(), pc2->orig_line, pc2->orig_col);
-
-      if (chunk_is_token(pc2, CT_MEMBER))
-      {
-         pc2 = chunk_get_next(pc2);
-         LOG_FMT(LSORT, "%s(%d): text is %s, pc2->len is %zu, line is %zu, column is %zu\n",
-                 __func__, __LINE__, pc2->text(), pc2->len(), pc2->orig_line, pc2->orig_col);
-      }
-      LOG_FMT(LSORT, "%s(%d): >>>text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc1->text(), pc1->len(), pc1->orig_line, pc1->orig_col);
-      LOG_FMT(LSORT, "%s(%d): >>>text is %s, pc2->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc2->text(), pc2->len(), pc2->orig_line, pc2->orig_col);
-
-      // If we hit a newline or nullptr, we are done
-      if (  pc1 == nullptr
-         || chunk_is_newline(pc1)
-         || pc2 == nullptr
-         || chunk_is_newline(pc2))
-      {
-         break;
-      }
-   }
-
-   if (  pc1 == nullptr
-      || !chunk_is_newline(pc2))
-   {
-      return(-1);
-   }
-
-   if (!chunk_is_newline(pc1))
-   {
-      return(1);
-   }
-   return(0);
-} // compare_chunks
-
-
-/**
- * Sorting should be pretty rare and should usually only include a few chunks.
- * We need to minimize the number of swaps, as those are expensive.
- * So, we do a min sort.
- */
-static void do_the_sort(chunk_t **chunks, size_t num_chunks)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LSORT, "%s(%d): %zu chunks:",
-           __func__, __LINE__, num_chunks);
-
-   for (size_t idx = 0; idx < num_chunks; idx++)
-   {
-      LOG_FMT(LSORT, " [%s]", chunks[idx]->text());
-   }
-
-   LOG_FMT(LSORT, "\n");
-
-   size_t start_idx;
-
-   log_rule_B("mod_sort_case_sensitive");
-   bool take_care = options::mod_sort_case_sensitive();                    // Issue #2091
-
-   for (start_idx = 0; start_idx < (num_chunks - 1); start_idx++)
-   {
-      // Find the index of the minimum value
-      size_t min_idx = start_idx;
-
-      for (size_t idx = start_idx + 1; idx < num_chunks; idx++)
-      {
-         if (compare_chunks(chunks[idx], chunks[min_idx], take_care) < 0)  // Issue #2091
-         {
-            min_idx = idx;
-         }
-      }
-
-      // Swap the lines if the minimum isn't the first entry
-      if (min_idx != start_idx)
-      {
-         chunk_swap_lines(chunks[start_idx], chunks[min_idx]);
-         log_rule_B("mod_sort_incl_import_grouping_enabled");
-
-         if (options::mod_sort_incl_import_grouping_enabled())
-         {
-            chunk_t *pc = chunks[min_idx];
-            chunks[min_idx]   = chunks[start_idx];
-            chunks[start_idx] = pc;
-         }
-         else
-         {
-            // Don't need to swap, since we only want the side-effects
-            chunks[min_idx] = chunks[start_idx];
-         }
-      }
-   }
-} // do_the_sort
-
-
-/**
- * Remove blank lines between chunks.
- */
-static void remove_blank_lines_between_imports(chunk_t **chunks, size_t num_chunks)
-{
-   LOG_FUNC_ENTRY();
-
-   if (num_chunks < 2)
-   {
-      return;
-   }
-
-   for (size_t idx = 0; idx < (num_chunks - 1); idx++)
-   {
-      chunk_t *chunk1 = chunk_get_next_nl(chunks[idx]);
-      chunk1->nl_count = 1;
-      MARK_CHANGE();
-   }
-}
-
-
-/**
- * Delete chunks on line having chunk.
- */
-static void delete_chunks_on_line_having_chunk(chunk_t *chunk)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = chunk_first_on_line(chunk);
-
-   while (  pc != nullptr
-         && !chunk_is_comment(pc))
-   {
-      chunk_t *next_pc = chunk_get_next(pc);
-      LOG_FMT(LCHUNK, "%s(%d): Removed '%s' on orig_line %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line);
-
-      if (chunk_is_newline(pc))
-      {
-         chunk_del(pc);
-         break;
-      }
-      else
-      {
-         chunk_del(pc);
-      }
-      pc = next_pc;
-   }
-}
-
-
-/**
- * Dedupe import/include directives.
- */
-static void dedupe_imports(chunk_t **chunks, size_t num_chunks)
-{
-   LOG_FUNC_ENTRY();
-   log_rule_B("mod_sort_case_sensitive");
-
-   for (size_t idx = 1; idx < num_chunks; idx++)
-   {
-      auto const &s1 = chunk_sort_str(chunks[idx - 1]);
-      auto const &s2 = chunk_sort_str(chunks[idx]);
-
-      if (s1.size() != s2.size())
-      {
-         continue;
-      }
-      int ret_val = unc_text::compare(s1, s2, std::min(s1.size(), s2.size()), options::mod_sort_case_sensitive());
-
-      if (ret_val == 0)
-      {
-         delete_chunks_on_line_having_chunk(chunks[idx - 1]);
-      }
-   }
-}
-
-
-/**
- * Add blank line before the chunk.
- */
-static void blankline_add_before(chunk_t *pc)
-{
-   chunk_t *newline = newline_add_before(chunk_first_on_line(pc));
-
-   if (newline->nl_count < 2)
-   {
-      double_newline(newline);
-   }
-}
-
-
-/**
- * Group imports.
- */
-static void group_imports_by_adding_newlines(chunk_t **chunks, size_t num_chunks)
-{
-   LOG_FUNC_ENTRY();
-
-   // Group imports based on first character, typically quote or angle.
-   int c_idx      = -1;
-   int c_idx_last = -1;
-
-   for (size_t idx = 0; idx < num_chunks; idx++)
-   {
-      if (chunks[idx]->str.size() > 0)
-      {
-         c_idx = chunks[idx]->str.at(0);
-      }
-      else
-      {
-         c_idx = -1;
-      }
-
-      if (  c_idx_last != c_idx
-         && idx > 0)
-      {
-         blankline_add_before(chunks[idx]);
-      }
-      c_idx_last = c_idx;
-   }
-
-   // Group imports based on having extension.
-   bool chunk_has_dot      = false;
-   bool chunk_last_has_dot = false;
-
-   for (size_t idx = 0; idx < num_chunks; idx++)
-   {
-      chunk_has_dot = has_dot(chunks[idx]->str);
-
-      if (  chunk_last_has_dot != chunk_has_dot
-         && idx > 0)
-      {
-         blankline_add_before(chunks[idx]);
-      }
-      chunk_last_has_dot = chunk_has_dot;
-   }
-
-   // Group imports based on priority defined by config.
-   int chunk_pri      = -1;
-   int chunk_pri_last = -1;
-
-   for (size_t idx = 0; idx < num_chunks; idx++)
-   {
-      chunk_pri = get_chunk_priority(chunks[idx]);
-
-      if (  chunk_pri_last != chunk_pri
-         && idx > 0)
-      {
-         blankline_add_before(chunks[idx]);
-      }
-      chunk_pri_last = chunk_pri;
-   }
-
-   // Group imports that contain filename pattern.
-   bool chunk_has_filename      = false;
-   bool last_chunk_has_filename = false;
-
-   for (size_t idx = 0; idx < num_chunks; idx++)
-   {
-      auto const &chunk_text = chunk_sort_str(chunks[idx]);
-      chunk_has_filename = text_contains_filename_without_ext(chunk_text.c_str());
-
-      if (  !chunk_has_filename
-         && last_chunk_has_filename)
-      {
-         blankline_add_before(chunks[idx]);
-      }
-      last_chunk_has_filename = chunk_has_filename;
-   }
-} // group_imports_by_adding_newlines
-
-
-void sort_imports(void)
-{
-   LOG_FUNC_ENTRY();
-   const int max_number_to_sort                        = 1024;
-   const int max_lines_to_check_for_sort_after_include = 128;
-   const int max_gap_threshold_between_include_to_sort = 32;
-
-   chunk_t   *chunks[max_number_to_sort];
-   size_t    num_chunks  = 0;
-   chunk_t   *p_last     = nullptr;
-   chunk_t   *p_imp      = nullptr;
-   chunk_t   *p_imp_last = nullptr;
-
-   prepare_categories();
-
-   chunk_t *pc = chunk_get_head();
-
-   log_rule_B("mod_sort_incl_import_grouping_enabled");
-
-   while (pc != nullptr)
-   {
-      // Simple optimization to limit the sorting. Any MAX_LINES_TO_CHECK_AFTER_INCLUDE lines after last
-      // import is seen are ignore from sorting.
-      if (  options::mod_sort_incl_import_grouping_enabled()
-         && p_imp_last != nullptr
-         && (pc->orig_line - p_imp_last->orig_line) > max_lines_to_check_for_sort_after_include)
-      {
-         break;
-      }
-      chunk_t *next = chunk_get_next(pc);
-
-      if (chunk_is_newline(pc))
-      {
-         bool did_import = false;
-
-         if (  p_imp != nullptr
-            && p_last != nullptr
-            && (  chunk_is_token(p_last, CT_SEMICOLON)
-               || p_imp->flags.test(PCF_IN_PREPROC)))
-         {
-            if (num_chunks < max_number_to_sort)
-            {
-               LOG_FMT(LSORT, "%s(%d): p_imp is %s\n",
-                       __func__, __LINE__, p_imp->text());
-               chunks[num_chunks++] = p_imp;
-            }
-            else
-            {
-               fprintf(stderr, "Number of 'import' to be sorted is too big for the current value %d.\n", max_number_to_sort);
-               fprintf(stderr, "Please make a report.\n");
-               log_flush(true);
-               cpd.error_count++;
-               exit(2);
-            }
-            did_import = true;
-         }
-         log_rule_B("mod_sort_incl_import_grouping_enabled");
-
-         if (  !did_import
-            || (  !options::mod_sort_incl_import_grouping_enabled()
-               && pc->nl_count > 1)
-            || (  options::mod_sort_incl_import_grouping_enabled()
-               && p_imp_last != nullptr
-               && (pc->orig_line - p_imp_last->orig_line) > max_gap_threshold_between_include_to_sort)
-            || next == nullptr)
-         {
-            if (num_chunks > 1)
-            {
-               log_rule_B("mod_sort_incl_import_grouping_enabled");
-
-               if (options::mod_sort_incl_import_grouping_enabled())
-               {
-                  remove_blank_lines_between_imports(chunks, num_chunks);
-                  do_the_sort(chunks, num_chunks);
-                  group_imports_by_adding_newlines(chunks, num_chunks);
-                  dedupe_imports(chunks, num_chunks);
-               }
-               else
-               {
-                  do_the_sort(chunks, num_chunks);
-               }
-            }
-            num_chunks = 0;
-         }
-         p_imp_last = p_imp;
-         p_imp      = nullptr;
-         p_last     = nullptr;
-      }
-      else if (chunk_is_token(pc, CT_IMPORT))
-      {
-         log_rule_B("mod_sort_import");
-
-         if (options::mod_sort_import())
-         {
-            p_imp = chunk_get_next(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_USING))
-      {
-         log_rule_B("mod_sort_using");
-
-         if (options::mod_sort_using())
-         {
-            p_imp = chunk_get_next(pc);
-         }
-      }
-      else if (chunk_is_token(pc, CT_PP_INCLUDE))
-      {
-         log_rule_B("mod_sort_include");
-
-         if (options::mod_sort_include())
-         {
-            p_imp  = chunk_get_next(pc);
-            p_last = pc;
-         }
-      }
-      else if (!chunk_is_comment(pc))
-      {
-         p_last = pc;
-      }
-      pc = next;
-   }
-   cleanup_categories();
-} // sort_imports
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.h
deleted file mode 100644
index 5d767824..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file sorting.h
- * prototypes for sorting.cpp
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef SORTING_H_INCLUDED
-#define SORTING_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-/**
- * alphabetically sort the #include or #import
- * statements of a file
- *
- * @todo better use a chunk pointer parameter
- * instead of a global variable
- */
-void sort_imports(void);
-
-
-#endif /* SORTING_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.cpp
deleted file mode 100644
index 5383b811..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.cpp
+++ /dev/null
@@ -1,3649 +0,0 @@
-/**
- * @file space.cpp
- * Adds or removes inter-chunk spaces.
- *
- * Informations
- *   "Ignore" means do not change it.
- *   "Add" in the context of spaces means make sure there is at least 1.
- *   "Add" elsewhere means make sure one is present.
- *   "Remove" mean remove the space/brace/newline/etc.
- *   "Force" in the context of spaces means ensure that there is exactly 1.
- *   "Force" in other contexts means the same as "add".
- *
- *   Rmk: spaces = space + nl
- *
- * @author  Ben Gardner
- * @author  Guy Maurel, 2015-2021
- * @license GPL v2+
- */
-
-#include "space.h"
-
-#include "log_rules.h"
-#include "options_for_QT.h"
-#include "punctuators.h"
-
-#ifdef WIN32
-#include <algorithm>                   // to get max
-#endif // ifdef WIN32
-
-using namespace std;
-using namespace uncrustify;
-
-
-/**
- * Decides how to change inter-chunk spacing.
- * Note that the order of the if statements is VERY important.
- *
- * @param first   The first chunk
- * @param second  The second chunk
- *
- * @return IARF_IGNORE, IARF_ADD, IARF_REMOVE or IARF_FORCE
- */
-static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp);
-
-/**
- * Ensure to force the space between the \a first and the \a second chunks
- * if the PCF_FORCE_SPACE flag is set in the \a first.
- *
- * @param first   The first chunk
- * @param second  The second chunk
- * @param av      Av from the do_space()
- *
- * @return IARF_IGNORE, IARF_ADD, IARF_REMOVE or IARF_FORCE
- */
-static iarf_e ensure_force_space(chunk_t *first, chunk_t *second, iarf_e av);
-
-//! type that stores two chunks between those no space shall occur
-struct no_space_table_t
-{
-   c_token_t first;  //! first  chunk
-   c_token_t second; //! second chunk
-};
-
-
-/**
- * this table lists out all combos where a space MUST be present
- * CT_UNKNOWN is a wildcard.
- *
- * TODO: some of these are no longer needed.
- */
-const no_space_table_t add_space_table[] =
-{
-#include "add_space_table.h"
-};
-
-
-/**
- * this table lists out all combos where a space should NOT be present
- * CT_UNKNOWN is a wildcard.
- *
- * TODO: some of these are no longer needed.
- */
-const no_space_table_t no_space_table[] =
-{
-   { CT_OC_AT,          CT_UNKNOWN      },
-   { CT_INCDEC_BEFORE,  CT_WORD         },
-   { CT_UNKNOWN,        CT_INCDEC_AFTER },
-   { CT_UNKNOWN,        CT_LABEL_COLON  },
-   { CT_UNKNOWN,        CT_ACCESS_COLON },
-   { CT_UNKNOWN,        CT_SEMICOLON    },
-   { CT_UNKNOWN,        CT_D_TEMPLATE   },
-   { CT_D_TEMPLATE,     CT_UNKNOWN      },
-   { CT_MACRO_FUNC,     CT_FPAREN_OPEN  },
-   { CT_PAREN_OPEN,     CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_PAREN_CLOSE  },
-   { CT_FPAREN_OPEN,    CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_SPAREN_CLOSE },
-   { CT_SPAREN_OPEN,    CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_FPAREN_CLOSE },
-   { CT_UNKNOWN,        CT_COMMA        },
-   { CT_POS,            CT_UNKNOWN      },
-   { CT_STAR,           CT_UNKNOWN      },
-   { CT_VBRACE_CLOSE,   CT_UNKNOWN      },
-   { CT_VBRACE_OPEN,    CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_VBRACE_CLOSE },
-   { CT_UNKNOWN,        CT_VBRACE_OPEN  },
-   { CT_PREPROC,        CT_UNKNOWN      },
-   { CT_PREPROC_INDENT, CT_UNKNOWN      },
-   { CT_NEG,            CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_SQUARE_OPEN  },
-   { CT_UNKNOWN,        CT_SQUARE_CLOSE },
-   { CT_SQUARE_OPEN,    CT_UNKNOWN      },
-   { CT_PAREN_CLOSE,    CT_WORD         },
-   { CT_PAREN_CLOSE,    CT_FUNC_DEF     },
-   { CT_PAREN_CLOSE,    CT_FUNC_CALL    },
-   { CT_PAREN_CLOSE,    CT_ADDR         },
-   { CT_PAREN_CLOSE,    CT_FPAREN_OPEN  },
-   { CT_OC_SEL_NAME,    CT_OC_SEL_NAME  },
-   { CT_TYPENAME,       CT_TYPE         },
-};
-
-
-/*
- * this function is called for every chunk in the input file.
- * Thus it is important to keep this function efficient
- */
-static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, first->text() '%s', type is %s\n",
-           __func__, __LINE__, first->orig_line, first->orig_col, first->text(), get_token_name(first->type));
-
-   min_sp = 1;
-
-   if (  chunk_is_token(first, CT_IGNORED)
-      || chunk_is_token(second, CT_IGNORED))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_PP_IGNORE)
-      && chunk_is_token(second, CT_PP_IGNORE))
-   {
-      // Leave spacing alone between PP_IGNORE tokens as we don't want the default behavior (which is ADD).
-      log_rule_short("PP_IGNORE");
-      return(IARF_IGNORE);
-   }
-
-   if (  chunk_is_token(first, CT_PP)
-      || chunk_is_token(second, CT_PP))
-   {
-      // Add or remove space around preprocessor '##' concatenation operator.
-      log_rule("sp_pp_concat");
-      return(options::sp_pp_concat());
-   }
-
-   if (chunk_is_token(first, CT_POUND))
-   {
-      // Add or remove space after preprocessor '#' stringify operator.
-      // Also affects the '#@' charizing operator.
-      log_rule("sp_pp_stringify");
-      return(options::sp_pp_stringify());
-   }
-
-   if (  chunk_is_token(second, CT_POUND)
-      && second->flags.test(PCF_IN_PREPROC)
-      && get_chunk_parent_type(first) != CT_MACRO_FUNC)
-   {
-      // Add or remove space before preprocessor '#' stringify operator
-      // as in '#define x(y) L#y'.
-      log_rule("sp_before_pp_stringify");
-      return(options::sp_before_pp_stringify());
-   }
-
-   if (  chunk_is_token(first, CT_SPACE)
-      || chunk_is_token(second, CT_SPACE))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (chunk_is_token(first, CT_DECLSPEC))  // Issue 1289
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(second, CT_NEWLINE)
-      || chunk_is_token(second, CT_VBRACE_OPEN))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_VBRACE_OPEN)
-      && second->type != CT_NL_CONT
-      && second->type != CT_SEMICOLON) // # Issue 1158
-   {
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   if (  chunk_is_token(first, CT_VBRACE_CLOSE)
-      && second->type != CT_NL_CONT)
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (chunk_is_token(second, CT_VSEMICOLON))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (chunk_is_token(first, CT_MACRO_FUNC))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (chunk_is_token(second, CT_NL_CONT))
-   {
-      // Add or remove space before a backslash-newline at the end of a line.
-      log_rule("sp_before_nl_cont");
-      return(options::sp_before_nl_cont());
-   }
-
-   if (  chunk_is_token(first, CT_D_ARRAY_COLON)
-      || chunk_is_token(second, CT_D_ARRAY_COLON))
-   {
-      // (D) Add or remove around the D named array initializer ':' operator.
-      log_rule("sp_d_array_colon");
-      return(options::sp_d_array_colon());
-   }
-
-   if (  chunk_is_token(first, CT_CASE)
-      && ((  CharTable::IsKw1(second->str[0])
-          || chunk_is_token(second, CT_NUMBER))))
-   {
-      // Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-      // sense here.
-      log_rule("sp_case_label");
-      return(options::sp_case_label() | IARF_ADD);
-   }
-
-   if (chunk_is_token(first, CT_FOR_COLON))
-   {
-      // java
-      // Add or remove space after ':' in a Java/C++11 range-based 'for',
-      // as in 'for (Type var : expr)'.
-      log_rule("sp_after_for_colon");
-      return(options::sp_after_for_colon());
-   }
-
-   if (chunk_is_token(second, CT_FOR_COLON))
-   {
-      // java
-      // Add or remove space before ':' in a Java/C++11 range-based 'for',
-      // as in 'for (Type var : expr)'.
-      log_rule("sp_before_for_colon");
-      return(options::sp_before_for_colon());
-   }
-
-   if (  chunk_is_token(first, CT_QUESTION)
-      && chunk_is_token(second, CT_COND_COLON))
-   {
-      if (options::sp_cond_ternary_short() != IARF_IGNORE)
-      {
-         // In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-         // and ':'.
-         // Overrides all other sp_cond_* options.
-         log_rule("sp_cond_ternary_short");
-         return(options::sp_cond_ternary_short());
-      }
-   }
-
-   if (  chunk_is_token(first, CT_QUESTION)
-      || chunk_is_token(second, CT_QUESTION))
-   {
-      if (  chunk_is_token(second, CT_QUESTION)
-         && (options::sp_cond_question_before() != IARF_IGNORE))
-      {
-         // Add or remove space before the '?' in 'b ? t : f'.
-         // Overrides sp_cond_question.
-         log_rule("sp_cond_question_before");
-         return(options::sp_cond_question_before());
-      }
-
-      if (  chunk_is_token(first, CT_QUESTION)
-         && (options::sp_cond_question_after() != IARF_IGNORE))
-      {
-         // Add or remove space after the '?' in 'b ? t : f'.
-         // Overrides sp_cond_question.
-         log_rule("sp_cond_question_after");
-         return(options::sp_cond_question_after());
-      }
-      // Issue #2596
-      // Add or remove space around the '?' in 'b ? t : f'.
-      // replace "if (chunk_is_token(first, CT_PAREN_CLOSE) && chunk_is_token(second, CT_QUESTION))"
-      log_rule("sp_cond_question");
-      return(options::sp_cond_question());
-   }
-
-   if (  chunk_is_token(first, CT_COND_COLON)
-      || chunk_is_token(second, CT_COND_COLON))
-   {
-      if (  chunk_is_token(second, CT_COND_COLON)
-         && (options::sp_cond_colon_before() != IARF_IGNORE))
-      {
-         // Add or remove space before the ':' in 'b ? t : f'.
-         // Overrides sp_cond_colon.
-         log_rule("sp_cond_colon_before");
-         return(options::sp_cond_colon_before());
-      }
-
-      if (  chunk_is_token(first, CT_COND_COLON)
-         && (options::sp_cond_colon_after() != IARF_IGNORE))
-      {
-         // Add or remove space after the ':' in 'b ? t : f'.
-         // Overrides sp_cond_colon.
-         log_rule("sp_cond_colon_after");
-         return(options::sp_cond_colon_after());
-      }
-      // Issue #2596
-      // replace "if (chunk_is_token(first, CT_WORD) && chunk_is_token(second, CT_COND_COLON))"
-      // Add or remove space around the ':' in 'b ? t : f'.
-      log_rule("sp_cond_colon");
-      return(options::sp_cond_colon());
-   }
-
-   if (  chunk_is_token(first, CT_RANGE)
-      || chunk_is_token(second, CT_RANGE))
-   {
-      // (D) Add or remove space around the D '..' operator.
-      log_rule("sp_range");
-      return(options::sp_range());
-   }
-
-   if (  chunk_is_token(first, CT_COLON)
-      && get_chunk_parent_type(first) == CT_SQL_EXEC)
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   // Macro stuff can only return IGNORE, ADD, or FORCE
-   if (chunk_is_token(first, CT_MACRO))
-   {
-      // Add or remove space between a macro name and its definition.
-      log_rule("sp_macro");
-      iarf_e arg = options::sp_macro();
-      return(arg | ((arg != IARF_IGNORE) ? IARF_ADD : IARF_IGNORE));
-   }
-
-   if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_MACRO_FUNC)
-   {
-      // Add or remove space between a macro function ')' and its definition.
-      log_rule("sp_macro_func");
-      iarf_e arg = options::sp_macro_func();
-      return(arg | ((arg != IARF_IGNORE) ? IARF_ADD : IARF_IGNORE));
-   }
-
-   if (chunk_is_token(first, CT_PREPROC))
-   {
-      // Remove spaces, unless we are ignoring. See indent_preproc()
-      if (options::pp_space() == IARF_IGNORE)
-      {
-         log_rule("pp_space");
-         log_rule_short("IGNORE");
-         return(IARF_IGNORE);
-      }
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (chunk_is_token(second, CT_SEMICOLON))
-   {
-      if (chunk_is_token(first, CT_VBRACE_OPEN))
-      {
-         // Add or remove space before ';'.
-         log_rule("sp_before_semi");
-         return(options::sp_before_semi());
-      }
-
-      if (get_chunk_parent_type(second) == CT_FOR)
-      {
-         if (  chunk_is_token(first, CT_SPAREN_OPEN) // a
-            || chunk_is_token(first, CT_SEMICOLON))  // b
-         {
-            // empty, ie for (;;)
-            //               ^ is first    // a
-            //                ^ is second  // a
-            // or
-            //                ^ is first   // b
-            //                 ^ is second // b
-            // Add or remove space before a semicolon of an empty part of a for statement.
-            log_rule("sp_before_semi_for_empty");
-            return(options::sp_before_semi_for_empty());
-         }
-
-         if (options::sp_before_semi_for() != IARF_IGNORE)
-         {
-            // Add or remove space before ';' in non-empty 'for' statements.
-            log_rule("sp_before_semi_for");
-            return(options::sp_before_semi_for());
-         }
-      }
-      iarf_e arg = options::sp_before_semi();
-
-      if (  chunk_is_token(first, CT_VBRACE_OPEN)                  // Issue #2942
-         && chunk_is_token(first->prev, CT_SPAREN_CLOSE)
-         && get_chunk_parent_type(first) != CT_WHILE_OF_DO)
-      {
-         // Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-         log_rule("sp_special_semi");
-         arg = arg | options::sp_special_semi();
-      }
-      else
-      {
-         // Add or remove space before ';'.
-         log_rule("sp_before_semi");
-      }
-      return(arg);
-   }
-
-   if (  (  chunk_is_token(second, CT_COMMENT)
-         || chunk_is_token(second, CT_COMMENT_CPP))
-      && (  chunk_is_token(first, CT_PP_ELSE)
-         || chunk_is_token(first, CT_PP_ENDIF)))
-   {
-      if (options::sp_endif_cmt() != IARF_IGNORE)
-      {
-         set_chunk_type(second, CT_COMMENT_ENDIF);
-         // Add or remove space between #else or #endif and a trailing comment.
-         log_rule("sp_endif_cmt");
-         return(options::sp_endif_cmt());
-      }
-   }
-
-   if (  (options::sp_before_tr_emb_cmt() != IARF_IGNORE)
-      && (  get_chunk_parent_type(second) == CT_COMMENT_END
-         || get_chunk_parent_type(second) == CT_COMMENT_EMBED))
-   {
-      // Add or remove space before a trailing or embedded comment.
-      // Number of spaces before a trailing or embedded comment.
-      log_rule("sp_num_before_tr_emb_cmt");
-      min_sp = options::sp_num_before_tr_emb_cmt();
-      return(options::sp_before_tr_emb_cmt());
-   }
-
-   if (get_chunk_parent_type(second) == CT_COMMENT_END)
-   {
-      switch (second->orig_prev_sp)
-      {
-      case 0:
-         log_rule_short("orig_prev_sp-REMOVE");
-         return(IARF_REMOVE);
-
-      case 1:
-         log_rule_short("orig_prev_sp-FORCE");
-         return(IARF_FORCE);
-
-      default:
-         log_rule_short("orig_prev_sp-ADD");
-         return(IARF_ADD);
-      }
-   }
-
-   // "for (;;)" vs. "for (;; )" and "for (a;b;c)" vs. "for (a; b; c)"
-   if (chunk_is_token(first, CT_SEMICOLON))
-   {
-      if (get_chunk_parent_type(first) == CT_FOR)
-      {
-         if (  (options::sp_after_semi_for_empty() != IARF_IGNORE)
-            && chunk_is_token(second, CT_SPAREN_CLOSE))
-         {
-            // Add or remove space after the final semicolon of an empty part of a for
-            // statement, as in 'for ( ; ; <here> )'.
-            log_rule("sp_after_semi_for_empty");
-            return(options::sp_after_semi_for_empty());
-         }
-
-         if (  (options::sp_after_semi_for() != IARF_IGNORE)
-            && second->type != CT_SPAREN_CLOSE)  // Issue 1324
-         {
-            // Add or remove space after ';' in non-empty 'for' statements.
-            log_rule("sp_after_semi_for");
-            return(options::sp_after_semi_for());
-         }
-      }
-      else if (  !chunk_is_comment(second)
-              && second->type != CT_BRACE_CLOSE) // issue #197
-      {
-         // Add or remove space after ';', except when followed by a comment.
-         log_rule("sp_after_semi");
-         return(options::sp_after_semi());
-      }
-      // Let the comment spacing rules handle this
-   }
-
-   // puts a space in the rare '+-' or '-+'
-   if (  (  chunk_is_token(first, CT_NEG)
-         || chunk_is_token(first, CT_POS)
-         || chunk_is_token(first, CT_ARITH)
-         || chunk_is_token(first, CT_SHIFT))
-      && (  chunk_is_token(second, CT_NEG)
-         || chunk_is_token(second, CT_POS)
-         || chunk_is_token(second, CT_ARITH)
-         || chunk_is_token(second, CT_SHIFT)))
-   {
-      log_rule_short("ADD");
-      return(IARF_ADD);
-   }
-
-   // "return(a);" vs. "return (foo_t)a + 3;" vs. "return a;" vs. "return;"
-   if (chunk_is_token(first, CT_RETURN))
-   {
-      if (  chunk_is_token(second, CT_PAREN_OPEN)
-         && get_chunk_parent_type(second) == CT_RETURN)
-      {
-         // Add or remove space between 'return' and '('.
-         log_rule("sp_return_paren");
-         return(options::sp_return_paren());
-      }
-      else if (  chunk_is_token(second, CT_BRACE_OPEN)
-              && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
-      {
-         // Add or remove space between 'return' and '{'.
-         log_rule("sp_return_brace");
-         return(options::sp_return_brace());
-      }
-      // everything else requires a space
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   // "sizeof(foo_t)" vs. "sizeof (foo_t)"
-   if (chunk_is_token(first, CT_SIZEOF))
-   {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
-      {
-         // Add or remove space between 'sizeof' and '('.
-         log_rule("sp_sizeof_paren");
-         return(options::sp_sizeof_paren());
-      }
-
-      if (chunk_is_token(second, CT_ELLIPSIS))
-      {
-         // Add or remove space between 'sizeof' and '...'.
-         log_rule("sp_sizeof_ellipsis");
-         return(options::sp_sizeof_ellipsis());
-      }
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   // "decltype(foo_t)" vs. "decltype (foo_t)"
-   if (chunk_is_token(first, CT_DECLTYPE))
-   {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
-      {
-         // Add or remove space between 'decltype' and '('.
-         log_rule("sp_decltype_paren");
-         return(options::sp_decltype_paren());
-      }
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   // handle '::'
-   if (chunk_is_token(first, CT_DC_MEMBER))
-   {
-      // Add or remove space after the '::' operator.
-      log_rule("sp_after_dc");
-      return(options::sp_after_dc());
-   }
-
-   // Issue #889
-   // mapped_file_source abc((int) ::CW2A(sTemp));
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && chunk_is_token(second, CT_DC_MEMBER)
-      && second->next != nullptr
-      && second->next->type == CT_FUNC_CALL)
-   {
-      log_rule("sp_after_cast");
-      return(options::sp_after_cast());
-   }
-
-   if (chunk_is_token(second, CT_DC_MEMBER))
-   {
-      /* '::' at the start of an identifier is not member access, but global scope operator.
-       * Detect if previous chunk is keyword
-       */
-      switch (first->type)
-      {
-      case CT_SBOOL:
-      case CT_SASSIGN:
-      case CT_ARITH:
-      case CT_SHIFT:
-      case CT_CASE:
-      case CT_CLASS:
-      case CT_DELETE:
-      case CT_FRIEND:
-      case CT_NAMESPACE:
-      case CT_NEW:
-      case CT_SARITH:
-      case CT_SCOMPARE:
-      case CT_OPERATOR:
-      case CT_ACCESS:
-      case CT_QUALIFIER:
-      case CT_RETURN:
-      case CT_SIZEOF:
-      case CT_DECLTYPE:
-      case CT_STRUCT:
-      case CT_THROW:
-      case CT_TYPEDEF:
-      case CT_TYPENAME:
-      case CT_UNION:
-      case CT_USING:
-         log_rule_short("FORCE");
-         return(IARF_FORCE);
-
-      default:
-         break;
-      }
-
-      if (  (  chunk_is_token(first, CT_WORD)
-            || chunk_is_token(first, CT_TYPE)
-            || chunk_is_token(first, CT_PAREN_CLOSE)
-            || CharTable::IsKw1(first->str[0]))
-         && (strcmp(first->text(), "void") != 0)) // Issue 1249
-      {
-         // Add or remove space before the '::' operator.
-         log_rule("sp_before_dc");
-         return(options::sp_before_dc());
-      }
-   }
-
-   // "a,b" vs. "a, b"
-   if (chunk_is_token(first, CT_COMMA))
-   {
-      if (get_chunk_parent_type(first) == CT_TYPE)
-      {
-         // C# multidimensional array type: ',,' vs. ', ,' or ',]' vs. ', ]'
-         if (chunk_is_token(second, CT_COMMA))
-         {
-            // (C#) Add or remove space between ',' in multidimensional array type
-            // like 'int[,,]'.
-            log_rule("sp_between_mdatype_commas");
-            return(options::sp_between_mdatype_commas());
-         }
-         // (C#) Add or remove space between ',' and ']' in multidimensional array type
-         // like 'int[,,]'.
-         log_rule("sp_after_mdatype_commas");
-         return(options::sp_after_mdatype_commas());
-      }
-
-      // Fix for issue #1243
-      // Don't add extra space after comma immediately followed by Angle close
-      if (chunk_is_token(second, CT_ANGLE_CLOSE))
-      {
-         log_rule_short("IGNORE");
-         return(IARF_IGNORE);
-      }
-      // Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-      log_rule("sp_after_comma");
-      return(options::sp_after_comma());
-   }
-
-   // test if we are within a SIGNAL/SLOT call
-   if (QT_SIGNAL_SLOT_found)
-   {
-      if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-         && (  chunk_is_token(second, CT_FPAREN_CLOSE)
-            || chunk_is_token(second, CT_COMMA)))
-      {
-         if (second->level == QT_SIGNAL_SLOT_level)
-         {
-            restoreValues = true;
-         }
-      }
-   }
-
-   if (chunk_is_token(second, CT_COMMA))
-   {
-      if (  chunk_is_token(first, CT_SQUARE_OPEN)
-         && get_chunk_parent_type(first) == CT_TYPE)
-      {
-         // Only for C#.
-         // (C#) Add or remove space between '[' and ',' in multidimensional array type
-         // like 'int[,,]'.
-         log_rule("sp_before_mdatype_commas");
-         return(options::sp_before_mdatype_commas());
-      }
-
-      if (  options::sp_paren_comma() != IARF_IGNORE
-         && (  chunk_is_token(first, CT_PAREN_OPEN)
-            || chunk_is_token(first, CT_FPAREN_OPEN)))
-      {
-         // Add or remove space between an open parenthesis and comma,
-         // i.e. '(,' vs. '( ,'.
-         log_rule("sp_paren_comma");
-         return(options::sp_paren_comma());
-      }
-      // Add or remove space before ','.
-      log_rule("sp_before_comma");
-      return(options::sp_before_comma());
-   }
-
-   if (chunk_is_token(second, CT_ELLIPSIS))
-   {
-      // type followed by a ellipsis
-      chunk_t *tmp = first;
-
-      if (  chunk_is_token(tmp, CT_PTR_TYPE)
-         || chunk_is_token(tmp, CT_BYREF))
-      {
-         tmp = chunk_get_prev_ncnnl(tmp);
-      }
-
-      if (  chunk_is_token(tmp, CT_TYPE)
-         || chunk_is_token(tmp, CT_QUALIFIER))
-      {
-         // Add or remove space between a type and '...'.
-         log_rule("sp_type_ellipsis");
-         return(options::sp_type_ellipsis());
-      }
-
-      // non-punc followed by a ellipsis
-      if (  !first->flags.test(PCF_PUNCTUATOR)
-         && (options::sp_before_ellipsis() != IARF_IGNORE))
-      {
-         // Add or remove space before the variadic '...' when preceded by a
-         // non-punctuator.
-         log_rule("sp_before_ellipsis");
-         return(options::sp_before_ellipsis());
-      }
-
-      if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-         || chunk_is_token(first, CT_PAREN_CLOSE))
-      {
-         // Add or remove space between ')' and '...'.
-         log_rule("sp_paren_ellipsis");
-         return(options::sp_paren_ellipsis());
-      }
-
-      if (chunk_is_token(first, CT_TAG_COLON))
-      {
-         log_rule_short("FORCE");
-         return(IARF_FORCE);
-      }
-   }
-
-   if (chunk_is_token(first, CT_ELLIPSIS))
-   {
-      if (CharTable::IsKw1(second->str[0]))
-      {
-         log_rule_short("FORCE");
-         return(IARF_FORCE);
-      }
-
-      if (  chunk_is_token(second, CT_PAREN_OPEN)
-         && first->prev != nullptr
-         && chunk_is_token(first->prev, CT_SIZEOF))
-      {
-         // Add or remove space between 'sizeof...' and '('.
-         log_rule("sp_sizeof_ellipsis_paren");
-         return(options::sp_sizeof_ellipsis_paren());
-      }
-   }
-
-   if (chunk_is_token(first, CT_TAG_COLON))
-   {
-      // (Pawn) Add or remove space after the tag keyword.
-      log_rule("sp_after_tag");
-      return(options::sp_after_tag());
-   }
-
-   if (chunk_is_token(second, CT_TAG_COLON))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   // handle '~'
-   if (chunk_is_token(first, CT_DESTRUCTOR))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_CATCH)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
-      && (options::sp_oc_catch_paren() != IARF_IGNORE))
-   {
-      // (OC) Add or remove space between '@catch' and '('
-      // in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-      log_rule("sp_oc_catch_paren");
-      return(options::sp_oc_catch_paren());
-   }
-
-   if (  language_is_set(LANG_OC)
-      && (  chunk_is_token(first, CT_PAREN_CLOSE)
-         || chunk_is_token(first, CT_OC_CLASS)
-         || chunk_is_token(first, CT_WORD))
-      && chunk_is_token(second, CT_ANGLE_OPEN)
-      && (  get_chunk_parent_type(second) == CT_OC_PROTO_LIST
-         || get_chunk_parent_type(second) == CT_OC_GENERIC_SPEC)
-      && (options::sp_before_oc_proto_list() != IARF_IGNORE))
-   {
-      // (OC) Add or remove space before Objective-C protocol list
-      // as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-      log_rule("sp_before_oc_proto_list");
-      return(options::sp_before_oc_proto_list());
-   }
-
-   if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_OC_CLASS)
-      && chunk_is_token(second, CT_PAREN_OPEN)
-      && (options::sp_oc_classname_paren() != IARF_IGNORE))
-   {
-      // (OC) Add or remove space between class name and '('
-      // in '@interface className(categoryName)<ProtocolName>:BaseClass'
-      log_rule("sp_oc_classname_paren");
-      return(options::sp_oc_classname_paren());
-   }
-
-   if (  chunk_is_token(first, CT_CATCH)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
-      && (options::sp_catch_paren() != IARF_IGNORE))
-   {
-      // Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-      // If set to ignore, sp_before_sparen is used.
-      log_rule("sp_catch_paren");
-      return(options::sp_catch_paren());
-   }
-
-   if (  chunk_is_token(first, CT_D_VERSION_IF)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
-      && (options::sp_version_paren() != IARF_IGNORE))
-   {
-      // (D) Add or remove space between 'version' and '('
-      // in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-      log_rule("sp_version_paren");
-      return(options::sp_version_paren());
-   }
-
-   if (  chunk_is_token(first, CT_D_SCOPE_IF)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
-      && (options::sp_scope_paren() != IARF_IGNORE))
-   {
-      // (D) Add or remove space between 'scope' and '('
-      // in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-      log_rule("sp_scope_paren");
-      return(options::sp_scope_paren());
-   }
-
-   if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_SYNCHRONIZED)
-      && chunk_is_token(second, CT_SPAREN_OPEN))
-   {
-      // (OC) Add or remove space between '@synchronized' and the open parenthesis,
-      // i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-      log_rule("sp_after_oc_synchronized");
-      return(options::sp_after_oc_synchronized());
-   }
-
-   // "if (" vs. "if("
-   if (chunk_is_token(second, CT_SPAREN_OPEN))
-   {
-      // Add or remove space before '(' of control statements ('if', 'for', 'switch',
-      // 'while', etc.).
-      log_rule("sp_before_sparen");
-      return(options::sp_before_sparen());
-   }
-
-   if (  chunk_is_token(first, CT_LAMBDA)
-      || chunk_is_token(second, CT_LAMBDA))
-   {
-      // Add or remove space around assignment operator '=', '+=', etc.
-      log_rule("sp_assign (lambda)");
-      return(options::sp_assign());
-   }
-
-   // Handle the special lambda case for C++11:
-   //    [=](Something arg){.....}
-   // Add or remove space around '=' in C++11 lambda capture specifications.
-   // Overrides sp_assign.
-   if (  (options::sp_cpp_lambda_assign() != IARF_IGNORE)
-      && (  (  chunk_is_token(first, CT_SQUARE_OPEN)
-            && get_chunk_parent_type(first) == CT_CPP_LAMBDA
-            && chunk_is_token(second, CT_ASSIGN))
-         || (  chunk_is_token(first, CT_ASSIGN)
-            && chunk_is_token(second, CT_SQUARE_CLOSE)
-            && get_chunk_parent_type(second) == CT_CPP_LAMBDA)))
-   {
-      log_rule("sp_cpp_lambda_assign");
-      return(options::sp_cpp_lambda_assign());
-   }
-
-   if (  chunk_is_token(first, CT_SQUARE_CLOSE)
-      && get_chunk_parent_type(first) == CT_CPP_LAMBDA)
-   {
-      // Handle the special lambda case for C++11:
-      //    [](Something arg){.....}
-      // Add or remove space after the capture specification of a C++11 lambda when
-      // an argument list is present, as in '[] <here> (int x){ ... }'.
-      if (chunk_is_token(second, CT_LPAREN_OPEN))
-      {
-         log_rule("sp_cpp_lambda_square_paren");
-         return(options::sp_cpp_lambda_square_paren());
-      }
-      else if (chunk_is_token(second, CT_BRACE_OPEN))
-      {
-         // Add or remove space after the capture specification of a C++11 lambda with
-         // no argument list is present, as in '[] <here> { ... }'.
-         log_rule("sp_cpp_lambda_square_brace");
-         return(options::sp_cpp_lambda_square_brace());
-      }
-   }
-
-   if (chunk_is_token(first, CT_LPAREN_OPEN))
-   {
-      // Add or remove space after the opening parenthesis of a argument list
-      // of a C++11 lambda, as in '[]( <here> int x ){ ... }'.
-      log_rule("sp_cpp_lambda_argument_list");
-      return(options::sp_cpp_lambda_argument_list());
-   }
-
-   if (chunk_is_token(first, CT_LPAREN_CLOSE))
-   {
-      if (chunk_is_token(second, CT_BRACE_OPEN))
-      {
-         // Add or remove space after the argument list of a C++11 lambda, as in
-         // '[](int x) <here> { ... }'.
-         log_rule("sp_cpp_lambda_paren_brace");
-         return(options::sp_cpp_lambda_paren_brace());
-      }
-   }
-
-   if (chunk_is_token(second, CT_LPAREN_CLOSE))
-   {
-      // Add or remove space before the closing parenthesis of a argument list
-      // of a C++11 lambda, as in '[]( int x <here> ){ ... }'.
-      log_rule("sp_cpp_lambda_argument_list");
-      return(options::sp_cpp_lambda_argument_list());
-   }
-
-   if (  chunk_is_token(first, CT_BRACE_CLOSE)
-      && get_chunk_parent_type(first) == CT_CPP_LAMBDA
-      && chunk_is_token(second, CT_FPAREN_OPEN))
-   {
-      // Add or remove space between a lambda body and its call operator of an
-      // immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-      log_rule("sp_cpp_lambda_fparen");
-      return(options::sp_cpp_lambda_fparen());
-   }
-
-   if (  chunk_is_token(first, CT_ENUM)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
-   {
-      // Add or remove space in 'NS_ENUM ('.
-      if (options::sp_enum_paren() != IARF_IGNORE)
-      {
-         log_rule("sp_enum_paren");
-         return(options::sp_enum_paren());
-      }
-   }
-
-   if (chunk_is_token(second, CT_ASSIGN))
-   {
-      if (second->flags.test(PCF_IN_ENUM))
-      {
-         // Add or remove space before assignment '=' in enum.
-         // Overrides sp_enum_assign.
-         if (options::sp_enum_before_assign() != IARF_IGNORE)
-         {
-            log_rule("sp_enum_before_assign");
-            return(options::sp_enum_before_assign());
-         }
-         // Add or remove space around assignment '=' in enum.
-         log_rule("sp_enum_assign");
-         return(options::sp_enum_assign());
-      }
-
-      // Add or remove space around assignment operator '=' in a prototype.
-      // If set to ignore, use sp_assign.
-      if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(second) == CT_FUNC_PROTO)
-      {
-         log_rule("sp_assign_default");
-         return(options::sp_assign_default());
-      }
-
-      // Add or remove space before assignment operator '=', '+=', etc.
-      // Overrides sp_assign.
-      if (options::sp_before_assign() != IARF_IGNORE)
-      {
-         log_rule("sp_before_assign");
-         return(options::sp_before_assign());
-      }
-      // Add or remove space around assignment operator '=', '+=', etc.
-      log_rule("sp_assign");
-      return(options::sp_assign());
-   }
-
-   if (chunk_is_token(second, CT_ASSIGN_DEFAULT_ARG))
-   {
-      // Add or remove space around assignment operator '=' in a prototype.
-      // If set to ignore, use sp_assign.
-      if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(second) == CT_FUNC_PROTO)
-      {
-         log_rule("sp_assign_default");
-         return(options::sp_assign_default());
-      }
-
-      // Add or remove space before assignment operator '=', '+=', etc.
-      // Overrides sp_assign.
-      if (options::sp_before_assign() != IARF_IGNORE)
-      {
-         log_rule("sp_before_assign");
-         return(options::sp_before_assign());
-      }
-      // Add or remove space around assignment operator '=', '+=', etc.
-      log_rule("sp_assign");
-      return(options::sp_assign());
-   }
-
-   if (chunk_is_token(first, CT_ASSIGN))
-   {
-      if (first->flags.test(PCF_IN_ENUM))
-      {
-         // Add or remove space after assignment '=' in enum.
-         // Overrides sp_enum_assign.
-         if (options::sp_enum_after_assign() != IARF_IGNORE)
-         {
-            log_rule("sp_enum_after_assign");
-            return(options::sp_enum_after_assign());
-         }
-         // Add or remove space around assignment '=' in enum.
-         log_rule("sp_enum_assign");
-         return(options::sp_enum_assign());
-      }
-
-      // Add or remove space around assignment operator '=' in a prototype.
-      // If set to ignore, use sp_assign.
-      if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(first) == CT_FUNC_PROTO)
-      {
-         log_rule("sp_assign_default");
-         return(options::sp_assign_default());
-      }
-
-      // Add or remove space after assignment operator '=', '+=', etc.
-      // Overrides sp_assign.
-      if (options::sp_after_assign() != IARF_IGNORE)
-      {
-         log_rule("sp_after_assign");
-         return(options::sp_after_assign());
-      }
-      // Add or remove space around assignment operator '=', '+=', etc.
-      log_rule("sp_assign");
-      return(options::sp_assign());
-   }
-
-   if (  chunk_is_token(first, CT_TRAILING_RET)
-      || chunk_is_token(first, CT_CPP_LAMBDA_RET)
-      || chunk_is_token(second, CT_TRAILING_RET)
-      || chunk_is_token(second, CT_CPP_LAMBDA_RET))
-   {
-      // Add or remove space around trailing return operator '->'.
-      log_rule("sp_trailing_return");
-      return(options::sp_trailing_return());
-   }
-
-   if (chunk_is_token(first, CT_ASSIGN_DEFAULT_ARG))
-   {
-      // Add or remove space around assignment operator '=' in a prototype.
-      // If set to ignore, use sp_assign.
-      if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(first) == CT_FUNC_PROTO)
-      {
-         log_rule("sp_assign_default");
-         return(options::sp_assign_default());
-      }
-
-      // Add or remove space after assignment operator '=', '+=', etc.
-      // Overrides sp_assign.
-      if (options::sp_after_assign() != IARF_IGNORE)
-      {
-         log_rule("sp_after_assign");
-         return(options::sp_after_assign());
-      }
-      // Add or remove space around assignment operator '=', '+=', etc.
-      log_rule("sp_assign");
-      return(options::sp_assign());
-   }
-
-   if (chunk_is_token(first, CT_BIT_COLON))
-   {
-      if (  first->flags.test(PCF_IN_ENUM)
-         || first->parent_type == CT_ENUM)
-      {
-         // Add or remove space around assignment ':' in enum.
-         log_rule("sp_enum_colon");
-         return(options::sp_enum_colon());
-      }
-   }
-
-   if (chunk_is_token(second, CT_BIT_COLON))
-   {
-      if (  second->flags.test(PCF_IN_ENUM)
-         || second->parent_type == CT_ENUM)
-      {
-         // Add or remove space around assignment ':' in enum.
-         log_rule("sp_enum_colon");
-         return(options::sp_enum_colon());
-      }
-   }
-
-   if (  chunk_is_token(first, CT_OC_AVAILABLE_VALUE)
-      || chunk_is_token(second, CT_OC_AVAILABLE_VALUE))
-   {
-      log_rule_short("IGNORE");
-      return(IARF_IGNORE);
-   }
-
-   if (chunk_is_token(second, CT_OC_BLOCK_CARET))
-   {
-      // (OC) Add or remove space before a block pointer caret,
-      // i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-      log_rule("sp_before_oc_block_caret");
-      return(options::sp_before_oc_block_caret());
-   }
-
-   if (chunk_is_token(first, CT_OC_BLOCK_CARET))
-   {
-      // (OC) Add or remove space after a block pointer caret,
-      // i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-      log_rule("sp_after_oc_block_caret");
-      return(options::sp_after_oc_block_caret());
-   }
-
-   if (chunk_is_token(second, CT_OC_MSG_FUNC))
-   {
-      if (  (options::sp_after_oc_msg_receiver() == IARF_REMOVE)
-         && (  (first->type != CT_SQUARE_CLOSE)
-            && (first->type != CT_FPAREN_CLOSE)
-            && (first->type != CT_PAREN_CLOSE)))
-      {
-         log_rule_short("FORCE");
-         return(IARF_FORCE);
-      }
-      // (OC) Add or remove space between the receiver and selector in a message,
-      // as in '[receiver selector ...]'.
-      log_rule("sp_after_oc_msg_receiver");
-      return(options::sp_after_oc_msg_receiver());
-   }
-
-   // c++17 structured bindings e.g., "auto [x, y, z]" vs. a[x, y, z]" or "auto const [x, y, z]" vs. "auto const[x, y, z]"
-   if (  language_is_set(LANG_CPP)
-      && (  chunk_is_token(first, CT_BYREF)
-         || chunk_is_token(first, CT_QUALIFIER)
-         || chunk_is_token(first, CT_TYPE))
-      && chunk_is_token(second, CT_SQUARE_OPEN)
-      && get_chunk_parent_type(second) != CT_OC_MSG
-      && get_chunk_parent_type(second) != CT_CS_SQ_STMT)
-   {
-      // Add or remove space before C++17 structured bindings.
-      log_rule("sp_cpp_before_struct_binding");
-      return(options::sp_cpp_before_struct_binding());
-   }
-
-   // "a [x]" vs. "a[x]"
-   if (  chunk_is_token(second, CT_SQUARE_OPEN)
-      && (  get_chunk_parent_type(second) != CT_OC_MSG
-         && get_chunk_parent_type(second) != CT_CS_SQ_STMT
-         && get_chunk_parent_type(second) != CT_CPP_LAMBDA))
-   {
-      if (  second->flags.test(PCF_IN_SPAREN)
-         && (chunk_is_token(first, CT_IN)))
-      {
-         log_rule_short("FORCE");
-         return(IARF_FORCE);
-      }
-
-      if (chunk_is_token(first, CT_ASM_COLON))
-      {
-         // Add or remove space before '[' for asm block.
-         log_rule("sp_before_square_asm_block");
-         return(options::sp_before_square_asm_block());
-      }
-
-      if (first->flags.test(PCF_VAR_DEF))
-      {
-         // Add or remove space before '[' for a variable definition.
-         log_rule("sp_before_vardef_square");
-         return(options::sp_before_vardef_square());
-      }
-      // Add or remove space before '[' (except '[]').
-      log_rule("sp_before_square");
-      return(options::sp_before_square());
-   }
-
-   // "byte[]" vs. "byte []"
-   if (chunk_is_token(second, CT_TSQUARE))
-   {
-      // Add or remove space before '[]'.
-      log_rule("sp_before_squares");
-      return(options::sp_before_squares());
-   }
-
-   if (  (options::sp_angle_shift() != IARF_IGNORE)
-      && chunk_is_token(first, CT_ANGLE_CLOSE)
-      && chunk_is_token(second, CT_ANGLE_CLOSE))
-   {
-      // Add or remove space between '>' and '>' in '>>' (template stuff).
-      log_rule("sp_angle_shift");
-      return(options::sp_angle_shift());
-   }
-
-   // spacing around template < > stuff
-   if (  chunk_is_token(first, CT_ANGLE_OPEN)
-      || chunk_is_token(second, CT_ANGLE_CLOSE))
-   {
-      if (  chunk_is_token(first, CT_ANGLE_OPEN)
-         && chunk_is_token(second, CT_ANGLE_CLOSE))
-      {
-         // Add or remove space inside '<>'.
-         log_rule("sp_inside_angle_empty");
-         return(options::sp_inside_angle_empty());
-      }
-      // Add or remove space inside '<' and '>'.
-      log_rule("sp_inside_angle");
-      iarf_e op = options::sp_inside_angle();
-
-      // special: if we're not supporting digraphs, then we shouldn't create them!
-      if (  (op == IARF_REMOVE)
-         && !options::enable_digraphs()
-         && chunk_is_token(first, CT_ANGLE_OPEN)
-         && chunk_is_token(second, CT_DC_MEMBER))
-      {
-         op = IARF_IGNORE;
-      }
-      // TODO log_rule??
-      return(op);
-   }
-
-   if (chunk_is_token(second, CT_ANGLE_OPEN))
-   {
-      if (  chunk_is_token(first, CT_TEMPLATE)
-         && (options::sp_template_angle() != IARF_IGNORE))
-      {
-         // Add or remove space between 'template' and '<'.
-         // If set to ignore, sp_before_angle is used.
-         log_rule("sp_template_angle");
-         return(options::sp_template_angle());
-      }
-
-      if (first->type != CT_QUALIFIER)
-      {
-         // Add or remove space before '<'.
-         log_rule("sp_before_angle");
-         return(options::sp_before_angle());
-      }
-   }
-
-   if (chunk_is_token(first, CT_ANGLE_CLOSE))
-   {
-      if (  chunk_is_token(second, CT_WORD)
-         || CharTable::IsKw1(second->str[0]))
-      {
-         // Add or remove space between '>' and a word as in 'List<byte> m;' or
-         // 'template <typename T> static ...'.
-         if (options::sp_angle_word() != IARF_IGNORE)
-         {
-            log_rule("sp_angle_word");
-            return(options::sp_angle_word());
-         }
-      }
-
-      if (  chunk_is_token(second, CT_FPAREN_OPEN)
-         || chunk_is_token(second, CT_PAREN_OPEN))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(second);
-
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
-         {
-            // Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-            log_rule("sp_angle_paren_empty");
-            return(options::sp_angle_paren_empty());
-         }
-         // Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-         log_rule("sp_angle_paren");
-         return(options::sp_angle_paren());
-      }
-
-      if (chunk_is_token(second, CT_DC_MEMBER))
-      {
-         // Add or remove space before the '::' operator.
-         log_rule("sp_before_dc");
-         return(options::sp_before_dc());
-      }
-
-      if (  second->type != CT_BYREF
-         && second->type != CT_PTR_TYPE
-         && second->type != CT_BRACE_OPEN
-         && second->type != CT_PAREN_CLOSE)
-      {
-         if (  chunk_is_token(second, CT_CLASS_COLON)
-            && options::sp_angle_colon() != IARF_IGNORE)
-         {
-            // Add or remove space between '>' and ':'.
-            log_rule("sp_angle_colon");
-            return(options::sp_angle_colon());
-         }
-
-         // Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-         // historic behavior, but is probably not the desired behavior, so this is off
-         // by default.
-         if (  chunk_is_token(second, CT_FPAREN_CLOSE)
-            && options::sp_inside_fparen() != IARF_IGNORE
-            && !options::use_sp_after_angle_always())
-         {
-            // Add or remove space between '>' and ')'.
-            log_rule("sp_inside_fparen");
-            return(options::sp_inside_fparen());
-         }
-         // Add or remove space after '>'.
-         log_rule("sp_after_angle");
-         return(options::sp_after_angle());
-      }
-   }
-
-   if (chunk_is_token(first, CT_BYREF))
-   {
-      if (  options::sp_after_byref_func() != IARF_IGNORE
-         && (  get_chunk_parent_type(first) == CT_FUNC_DEF
-            || get_chunk_parent_type(first) == CT_FUNC_PROTO))
-      {
-         // Add or remove space after a reference sign '&', if followed by a function
-         // prototype or function definition.
-         log_rule("sp_after_byref_func");
-         return(options::sp_after_byref_func());
-      }
-
-      if (  (  CharTable::IsKw1(second->str[0])
-            && (  options::sp_after_byref() != IARF_IGNORE
-               || (  !chunk_is_token(second, CT_FUNC_PROTO)
-                  && !chunk_is_token(second, CT_FUNC_DEF))))
-         || chunk_is_token(second, CT_PAREN_OPEN))
-      {
-         // Add or remove space after reference sign '&', if followed by a word.
-         log_rule("sp_after_byref");
-         return(options::sp_after_byref());
-      }
-   }
-
-   if (  chunk_is_token(second, CT_BYREF)
-      && !chunk_is_token(first, CT_PAREN_OPEN))
-   {
-      // Add or remove space before a reference sign '&', if followed by a function
-      // prototype or function definition.
-      if (options::sp_before_byref_func() != IARF_IGNORE)
-      {
-         chunk_t *next = chunk_get_next(second);
-
-         if (  next != nullptr
-            && (  get_chunk_parent_type(next) == CT_FUNC_DEF
-               || get_chunk_parent_type(next) == CT_FUNC_PROTO))
-         {
-            log_rule("sp_before_byref_func");
-            return(options::sp_before_byref_func());
-         }
-      }
-
-      // Add or remove space before a reference sign '&' that isn't followed by a
-      // variable name. If set to 'ignore', sp_before_byref is used instead.
-      if (options::sp_before_unnamed_byref() != IARF_IGNORE)
-      {
-         chunk_t *next = chunk_get_next_nc(second);
-
-         if (  next != nullptr
-            && next->type != CT_WORD)
-         {
-            log_rule("sp_before_unnamed_byref");
-            return(options::sp_before_unnamed_byref());
-         }
-      }
-      // Add or remove space before a reference sign '&'.
-      log_rule("sp_before_byref");
-      return(options::sp_before_byref());
-   }
-
-   if (chunk_is_token(first, CT_SPAREN_CLOSE))
-   {
-      if (chunk_is_token(second, CT_BRACE_OPEN))
-      {
-         if (get_chunk_parent_type(second) == CT_CATCH)
-         {
-            if (  language_is_set(LANG_OC)
-               && (options::sp_oc_catch_brace() != IARF_IGNORE))
-            {
-               // (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-               // and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-               // If set to ignore, sp_catch_brace is used.
-               // only to help the vim command }}
-               log_rule("sp_oc_catch_brace");
-               return(options::sp_oc_catch_brace());
-            }
-
-            if (options::sp_catch_brace() != IARF_IGNORE)
-            {
-               // Add or remove space before the '{' of a 'catch' statement, if the '{' and
-               // 'catch' are on the same line, as in 'catch (decl) <here> {'.
-               log_rule("sp_catch_brace");
-               return(options::sp_catch_brace());
-            }
-         }
-
-         if (options::sp_sparen_brace() != IARF_IGNORE)
-         {
-            // Add or remove space between ')' and '{' of of control statements.
-            log_rule("sp_sparen_brace");
-            return(options::sp_sparen_brace());
-         }
-      }
-
-      if (  !chunk_is_comment(second)
-         && (options::sp_after_sparen() != IARF_IGNORE))
-      {
-         // Add or remove space after ')' of control statements.
-         log_rule("sp_after_sparen");
-         return(options::sp_after_sparen());
-      }
-   }
-
-   if (  chunk_is_token(second, CT_FPAREN_OPEN)
-      && get_chunk_parent_type(first) == CT_OPERATOR
-      && (options::sp_after_operator_sym() != IARF_IGNORE))
-   {
-      if (  (options::sp_after_operator_sym_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(second);
-
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
-         {
-            // Overrides sp_after_operator_sym when the operator has no arguments, as in
-            // 'operator *()'.
-            log_rule("sp_after_operator_sym_empty");
-            return(options::sp_after_operator_sym_empty());
-         }
-      }
-      // Add or remove space between the operator symbol and the open parenthesis, as
-      // in 'operator ++('.
-      log_rule("sp_after_operator_sym");
-      return(options::sp_after_operator_sym());
-   }
-
-   // Issue #2270
-   // Translations under vala
-   if (  language_is_set(LANG_VALA)
-      && chunk_is_token(first, CT_FUNC_CALL))
-   {
-      if (  chunk_is_str(first, "_", 1)
-         && chunk_is_token(second, CT_FPAREN_OPEN)
-         && (options::sp_vala_after_translation() != IARF_IGNORE))
-      {
-         // Add or remove space after '_'.
-         log_rule("sp_vala_after_translation");
-         return(options::sp_vala_after_translation());
-      }
-   }
-
-   if (  chunk_is_token(first, CT_MACRO_OPEN)
-      || chunk_is_token(first, CT_MACRO_CLOSE)
-      || chunk_is_token(first, CT_MACRO_ELSE))
-   {
-      if (chunk_is_token(second, CT_FPAREN_OPEN))
-      {
-         // TODO: provide some test data to check this block
-         // Add or remove space between function name and '(' on function calls.
-         log_rule("sp_func_call_paren");
-         return(options::sp_func_call_paren());
-      }
-      log_rule_short("IGNORE");
-      return(IARF_IGNORE);
-   }
-
-   // spaces between function and open paren
-   if (  chunk_is_token(first, CT_FUNC_CALL)
-      || chunk_is_token(first, CT_FUNC_CTOR_VAR)
-      || chunk_is_token(first, CT_CNG_HASINC)
-      || chunk_is_token(first, CT_CNG_HASINCN)
-      || (  chunk_is_token(first, CT_BRACE_CLOSE)
-         && first->parent_type == CT_BRACED_INIT_LIST
-         && chunk_is_token(second, CT_FPAREN_OPEN)))
-   {
-      if (  (options::sp_func_call_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(second);
-
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
-         {
-            // Add or remove space between function name and '()' on function calls without
-            // parameters. If set to 'ignore' (the default), sp_func_call_paren is used.
-            log_rule("sp_func_call_paren_empty");
-            return(options::sp_func_call_paren_empty());
-         }
-      }
-      // Add or remove space between function name and '(' on function calls.
-      log_rule("sp_func_call_paren");
-      return(options::sp_func_call_paren());
-   }
-
-   if (chunk_is_token(first, CT_FUNC_CALL_USER))
-   {
-      // Add or remove space between the user function name and '(' on function
-      // calls. You need to set a keyword to be a user function in the config file,
-      // like:
-      //   set func_call_user tr _ i18n
-      log_rule("sp_func_call_user_paren");
-      return(options::sp_func_call_user_paren());
-   }
-
-   if (  chunk_is_token(first, CT_ATTRIBUTE)
-      && chunk_is_paren_open(second))
-   {
-      // Add or remove space between '__attribute__' and '('.
-      log_rule("sp_attribute_paren");
-      return(options::sp_attribute_paren());
-   }
-
-   if (chunk_is_token(first, CT_FUNC_DEF))
-   {
-      if (  (options::sp_func_def_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(second);
-
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
-         {
-            // Add or remove space between function name and '()' on function definition
-            // without parameters.
-            log_rule("sp_func_def_paren_empty");
-            return(options::sp_func_def_paren_empty());
-         }
-      }
-      // Add or remove space between function name and '(' on function definition.
-      log_rule("sp_func_def_paren");
-      return(options::sp_func_def_paren());
-   }
-
-   if (  chunk_is_token(first, CT_CPP_CAST)
-      || chunk_is_token(first, CT_TYPE_WRAP))
-   {
-      // Add or remove space between the type and open parenthesis in a C++ cast,
-      // i.e. 'int(exp)' vs. 'int (exp)'.
-      log_rule("sp_cpp_cast_paren");
-      return(options::sp_cpp_cast_paren());
-   }
-
-   if (  chunk_is_token(first, CT_SPAREN_CLOSE)
-      && chunk_is_token(second, CT_WHEN))
-   {
-      // TODO: provide some test data to check this block
-      log_rule_short("FORCE");
-      return(IARF_FORCE); // TODO: make this configurable?
-   }
-
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && (  chunk_is_token(second, CT_PAREN_OPEN)
-         || chunk_is_token(second, CT_FPAREN_OPEN)))
-   {
-      // "(int)a" vs. "(int) a" or "cast(int)a" vs. "cast(int) a"
-      if (  get_chunk_parent_type(first) == CT_C_CAST
-         || get_chunk_parent_type(first) == CT_D_CAST)
-      {
-         // Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-         // '(int)a' vs. '(int) a'.
-         log_rule("sp_after_cast");
-         return(options::sp_after_cast());
-      }
-      // Must be an indirect/chained function call?
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);  // TODO: make this configurable?
-   }
-
-   // handle the space between parens in fcn type 'void (*f)(void)'
-   if (chunk_is_token(first, CT_TPAREN_CLOSE))
-   {
-      // Add or remove space between the ')' and '(' in a function type, as in
-      // 'void (*x)(...)'.
-      log_rule("sp_after_tparen_close");
-      return(options::sp_after_tparen_close());
-   }
-
-   // ")(" vs. ") ("
-   if (  (  chunk_is_str(first, ")", 1)
-         && chunk_is_str(second, "(", 1))
-      || (  chunk_is_paren_close(first)
-         && chunk_is_paren_open(second)))
-   {
-      // Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-      log_rule("sp_cparen_oparen");
-      return(options::sp_cparen_oparen());
-   }
-
-   if (  chunk_is_token(first, CT_FUNC_PROTO)
-      || (  chunk_is_token(second, CT_FPAREN_OPEN)
-         && get_chunk_parent_type(second) == CT_FUNC_PROTO))
-   {
-      if (  (options::sp_func_proto_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(second);
-
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
-         {
-            // Add or remove space between function name and '()' on function declaration
-            // without parameters.
-            log_rule("sp_func_proto_paren_empty");
-            return(options::sp_func_proto_paren_empty());
-         }
-      }
-      // Add or remove space between function name and '(' on function declaration.
-      log_rule("sp_func_proto_paren");
-      return(options::sp_func_proto_paren());
-   }
-
-   // Issue #2437
-   if (  chunk_is_token(first, CT_FUNC_TYPE)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
-   {
-      // Add or remove space between function name and '(' with a typedef specifier.
-      log_rule("sp_func_type_paren");
-      return(options::sp_func_type_paren());
-   }
-
-   if (  chunk_is_token(first, CT_FUNC_CLASS_DEF)
-      || chunk_is_token(first, CT_FUNC_CLASS_PROTO))
-   {
-      if (  (options::sp_func_class_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
-      {
-         chunk_t *next = chunk_get_next_ncnnl(second);
-
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
-         {
-            // Add or remove space between a constructor without parameters or destructor
-            // and '()'.
-            log_rule("sp_func_class_paren_empty");
-            return(options::sp_func_class_paren_empty());
-         }
-      }
-      // Add or remove space between a constructor/destructor and the open
-      // parenthesis.
-      log_rule("sp_func_class_paren");
-      return(options::sp_func_class_paren());
-   }
-
-   if (  chunk_is_token(first, CT_CLASS)
-      && !first->flags.test(PCF_IN_OC_MSG))
-   {
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   if (  chunk_is_token(first, CT_BRACE_OPEN)
-      && chunk_is_token(second, CT_BRACE_CLOSE))
-   {
-      // Add or remove space inside '{}'.
-      log_rule("sp_inside_braces_empty");
-      return(options::sp_inside_braces_empty());
-   }
-
-   if (  (  chunk_is_token(first, CT_TYPE)                           // Issue #2428
-         || chunk_is_token(first, CT_ANGLE_CLOSE))
-      && chunk_is_token(second, CT_BRACE_OPEN)
-      && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
-   {
-      iarf_flags_t arg = iarf_flags_t{ options::sp_type_brace_init_lst() };
-
-      if (  arg != IARF_IGNORE
-         || get_chunk_parent_type(first) != CT_DECLTYPE)
-      {
-         // 'int{9}' vs. 'int {9}'
-         // Add or remove space between type and open brace of an unnamed temporary
-         // direct-list-initialization.
-         log_rule("sp_type_brace_init_lst");
-         return(arg);
-      }
-   }
-
-   if (  (  chunk_is_token(first, CT_WORD)                           // Issue #2428
-         || chunk_is_token(first, CT_SQUARE_CLOSE)
-         || chunk_is_token(first, CT_TSQUARE))
-      && chunk_is_token(second, CT_BRACE_OPEN)
-      && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
-   {
-      // Add or remove space between a variable and '{' for C++ uniform
-      // initialization.
-      auto arg = iarf_flags_t{ options::sp_word_brace_init_lst() };
-
-      if (  arg != IARF_IGNORE
-         || get_chunk_parent_type(first) != CT_DECLTYPE)
-      {
-         // 'a{9}' vs. 'a {9}'
-         // Add or remove space between variable/word and open brace of an unnamed
-         // temporary direct-list-initialization.
-         log_rule("sp_word_brace_init_lst");
-         return(arg);
-      }
-   }
-
-   if (chunk_is_token(second, CT_BRACE_CLOSE))
-   {
-      if (get_chunk_parent_type(second) == CT_ENUM)
-      {
-         // Add or remove space inside enum '{' and '}'.
-         log_rule("sp_inside_braces_enum");
-         return(options::sp_inside_braces_enum());
-      }
-
-      if (  get_chunk_parent_type(second) == CT_STRUCT
-         || get_chunk_parent_type(second) == CT_UNION)
-      {
-         // Fix for issue #1240  adding space in struct initializers
-         chunk_t *tmp = chunk_get_prev_ncnnl(chunk_skip_to_match_rev(second));
-
-         if (chunk_is_token(tmp, CT_ASSIGN))
-         {
-            // TODO: provide some test data to check this block
-            log_rule_short("IGNORE");
-            return(IARF_IGNORE);
-         }
-         // Add or remove space inside struct/union '{' and '}'.
-         log_rule("sp_inside_braces_struct");
-         return(options::sp_inside_braces_struct());
-      }
-      else if (  get_chunk_parent_type(second) == CT_OC_AT
-              && options::sp_inside_braces_oc_dict() != IARF_IGNORE)
-      {
-         // (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-         log_rule("sp_inside_braces_oc_dict");
-         return(options::sp_inside_braces_oc_dict());
-      }
-
-      if (get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
-      {
-         // Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-         // only to help the vim command }}}}
-         if (  options::sp_brace_brace() != IARF_IGNORE
-            && chunk_is_token(first, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(first) == CT_BRACED_INIT_LIST)
-         {
-            log_rule("sp_brace_brace");
-            return(options::sp_brace_brace());
-         }
-
-         if (options::sp_before_type_brace_init_lst_close() != IARF_IGNORE)
-         {
-            // Add or remove space before close brace in an unnamed temporary
-            // direct-list-initialization.
-            log_rule("sp_before_type_brace_init_lst_close");
-            return(options::sp_before_type_brace_init_lst_close());
-         }
-
-         if (options::sp_inside_type_brace_init_lst() != IARF_IGNORE)
-         {
-            // Add or remove space inside an unnamed temporary direct-list-initialization.
-            log_rule("sp_inside_type_brace_init_lst");
-            return(options::sp_inside_type_brace_init_lst());
-         }
-      }
-      // Add or remove space inside '{' and '}'.
-      log_rule("sp_inside_braces");
-      return(options::sp_inside_braces());
-   }
-
-   if (chunk_is_token(first, CT_D_CAST))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_PP_DEFINED)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      // Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-      log_rule("sp_defined_paren");
-      return(options::sp_defined_paren());
-   }
-
-   if (chunk_is_token(first, CT_THROW))
-   {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
-      {
-         // Add or remove space between 'throw' and '(' in 'throw (something)'.
-         log_rule("sp_throw_paren");
-         return(options::sp_throw_paren());
-      }
-      // Add or remove space between 'throw' and anything other than '(' as in
-      // '@throw [...];'.
-      log_rule("sp_after_throw");
-      return(options::sp_after_throw());
-   }
-
-   if (  chunk_is_token(first, CT_THIS)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      // Add or remove space between 'this' and '(' in 'this (something)'.
-      log_rule("sp_this_paren");
-      return(options::sp_this_paren());
-   }
-
-   if (  chunk_is_token(first, CT_STATE)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule_short("ADD");
-      return(IARF_ADD);
-   }
-
-   if (  chunk_is_token(first, CT_DELEGATE)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_MEMBER)
-      || chunk_is_token(second, CT_MEMBER))
-   {
-      // Add or remove space around the '.' or '->' operators.
-      log_rule("sp_member");
-      return(options::sp_member());
-   }
-
-   if (chunk_is_token(first, CT_C99_MEMBER))
-   {
-      // always remove space(s) after then '.' of a C99-member
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_SUPER)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      // Add or remove space between 'super' and '(' in 'super (something)'.
-      log_rule("sp_super_paren");
-      return(options::sp_super_paren());
-   }
-
-   if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      if (get_chunk_parent_type(second) == CT_DOUBLE_BRACE)
-      {
-         // (Java) Add or remove space between ')' and '{{' of double brace initializer.
-         // only to help the vim command }}
-         log_rule("sp_fparen_dbrace");
-         return(options::sp_fparen_dbrace());
-      }
-
-      // To fix issue #1234
-      // check for initializers and add space or ignore based on the option.
-      if (get_chunk_parent_type(first) == CT_FUNC_CALL)
-      {
-         chunk_t *tmp = chunk_get_prev_type(first, get_chunk_parent_type(first), first->level);
-         tmp = chunk_get_prev_ncnnl(tmp);
-
-         if (chunk_is_token(tmp, CT_NEW))
-         {
-            // Add or remove space between ')' and '{' of s function call in object
-            // initialization.
-            // Overrides sp_fparen_brace.
-            log_rule("sp_fparen_brace_initializer");
-            return(options::sp_fparen_brace_initializer());
-         }
-      }
-      // Add or remove space between ')' and '{' of function.
-      log_rule("sp_fparen_brace");
-      return(options::sp_fparen_brace());
-   }
-
-   if (  chunk_is_token(first, CT_D_TEMPLATE)
-      || chunk_is_token(second, CT_D_TEMPLATE))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_ELSE)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      // Add or remove space between 'else' and '{' if on the same line.
-      log_rule("sp_else_brace");
-      return(options::sp_else_brace());
-   }
-
-   if (  chunk_is_token(first, CT_ELSE)
-      && chunk_is_token(second, CT_ELSEIF))
-   {
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   if (  chunk_is_token(first, CT_FINALLY)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      // Add or remove space between 'finally' and '{' if on the same line.
-      log_rule("sp_finally_brace");
-      return(options::sp_finally_brace());
-   }
-
-   if (  chunk_is_token(first, CT_TRY)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      // Add or remove space between 'try' and '{' if on the same line.
-      log_rule("sp_try_brace");
-      return(options::sp_try_brace());
-   }
-
-   if (  chunk_is_token(first, CT_GETSET)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      // Add or remove space between get/set and '{' if on the same line.
-      log_rule("sp_getset_brace");
-      return(options::sp_getset_brace());
-   }
-
-   if (  chunk_is_token(first, CT_WORD)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      if (get_chunk_parent_type(first) == CT_NAMESPACE)
-      {
-         // Add or remove space between a variable and '{' for a namespace.
-         log_rule("sp_word_brace_ns");
-         return(options::sp_word_brace_ns());
-      }
-   }
-
-   if (  chunk_is_token(second, CT_PAREN_OPEN)
-      && get_chunk_parent_type(second) == CT_INVARIANT)
-   {
-      // (D) Add or remove space between 'invariant' and '('.
-      log_rule("sp_invariant_paren");
-      return(options::sp_invariant_paren());
-   }
-
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(first) != CT_DECLTYPE)
-   {
-      if (get_chunk_parent_type(first) == CT_INVARIANT)
-      {
-         // (D) Add or remove space after the ')' in 'invariant (C) c'.
-         log_rule("sp_after_invariant_paren");
-         return(options::sp_after_invariant_paren());
-      }
-
-      // "(struct foo) {...}" vs. "(struct foo){...}"
-      if (chunk_is_token(second, CT_BRACE_OPEN))
-      {
-         // Add or remove space between ')' and '{'.
-         log_rule("sp_paren_brace");
-         return(options::sp_paren_brace());
-      }
-
-      // D-specific: "delegate(some thing) dg
-      if (get_chunk_parent_type(first) == CT_DELEGATE)
-      {
-         log_rule_short("ADD");
-         return(IARF_ADD);
-      }
-
-      // PAWN-specific: "state (condition) next"
-      if (get_chunk_parent_type(first) == CT_STATE)
-      {
-         log_rule_short("ADD");
-         return(IARF_ADD);
-      }
-
-      /* C++ new operator: new(bar) Foo */
-      if (get_chunk_parent_type(first) == CT_NEW)
-      {
-         // Add or remove space between ')' and type in 'new(foo) BAR'.
-         log_rule("sp_after_newop_paren");
-         return(options::sp_after_newop_paren());
-      }
-   }
-
-   /* "((" vs. "( (" or "))" vs. ") )" */
-   // Issue #1342
-   if (  (  chunk_is_str(first, "(", 1)
-         && chunk_is_str(second, "(", 1))
-      || (  chunk_is_str(first, ")", 1)
-         && chunk_is_str(second, ")", 1)))
-   {
-      if (get_chunk_parent_type(second) == CT_FUNC_CALL_USER)
-      {
-         // Add or remove space between nested parentheses with user functions,
-         // i.e. '((' vs. '( ('.
-         log_rule("sp_func_call_user_paren_paren");
-         return(options::sp_func_call_user_paren_paren());
-      }
-      // Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-      log_rule("sp_paren_paren");
-      return(options::sp_paren_paren());
-   }
-
-   // "foo(...)" vs. "foo( ... )"
-   if (  chunk_is_token(first, CT_FPAREN_OPEN)
-      || chunk_is_token(second, CT_FPAREN_CLOSE))
-   {
-      if (  (get_chunk_parent_type(first) == CT_FUNC_CALL_USER)
-         || (  (get_chunk_parent_type(second) == CT_FUNC_CALL_USER)
-            && (  (chunk_is_token(first, CT_WORD))
-               || (chunk_is_token(first, CT_SQUARE_CLOSE)))))
-      {
-         // Add or remove space inside user function '(' and ')'.
-         log_rule("sp_func_call_user_inside_fparen");
-         return(options::sp_func_call_user_inside_fparen());
-      }
-
-      if (  chunk_is_token(first, CT_FPAREN_OPEN)
-         && chunk_is_token(second, CT_FPAREN_CLOSE))
-      {
-         // Add or remove space inside empty function '()'.
-         log_rule("sp_inside_fparens");
-         return(options::sp_inside_fparens());
-      }
-      // Add or remove space inside function '(' and ')'.
-      log_rule("sp_inside_fparen");
-      return(options::sp_inside_fparen());
-   }
-
-   // "foo(...)" vs. "foo( ... )"
-   if (  chunk_is_token(first, CT_TPAREN_OPEN)
-      || chunk_is_token(second, CT_TPAREN_CLOSE))
-   {
-      // Add or remove space inside the first parentheses in a function type, as in
-      // 'void (*x)(...)'.
-      log_rule("sp_inside_tparen");
-      return(options::sp_inside_tparen());
-   }
-
-   if (chunk_is_token(first, CT_PAREN_CLOSE))
-   {
-      if (  first->flags.test(PCF_OC_RTYPE) // == CT_OC_RTYPE)
-         && (  get_chunk_parent_type(first) == CT_OC_MSG_DECL
-            || get_chunk_parent_type(first) == CT_OC_MSG_SPEC))
-      {
-         // (OC) Add or remove space after the first (type) in message specs,
-         // i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-         log_rule("sp_after_oc_return_type");
-         return(options::sp_after_oc_return_type());
-      }
-
-      if (  get_chunk_parent_type(first) == CT_OC_MSG_SPEC
-         || get_chunk_parent_type(first) == CT_OC_MSG_DECL)
-      {
-         // (OC) Add or remove space after the (type) in message specs,
-         // i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-         log_rule("sp_after_oc_type");
-         return(options::sp_after_oc_type());
-      }
-
-      if (  get_chunk_parent_type(first) == CT_OC_SEL
-         && second->type != CT_SQUARE_CLOSE)
-      {
-         // (OC) Add or remove space between '@selector(x)' and the following word,
-         // i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-         log_rule("sp_after_oc_at_sel_parens");
-         return(options::sp_after_oc_at_sel_parens());
-      }
-   }
-
-   if (options::sp_inside_oc_at_sel_parens() != IARF_IGNORE)
-   {
-      if (  (  chunk_is_token(first, CT_PAREN_OPEN)
-            && (  get_chunk_parent_type(first) == CT_OC_SEL
-               || get_chunk_parent_type(first) == CT_OC_PROTOCOL))
-         || (  chunk_is_token(second, CT_PAREN_CLOSE)
-            && (  get_chunk_parent_type(second) == CT_OC_SEL
-               || get_chunk_parent_type(second) == CT_OC_PROTOCOL)))
-      {
-         // (OC) Add or remove space inside '@selector' parentheses,
-         // i.e. '@selector(foo)' vs. '@selector( foo )'.
-         // Also applies to '@protocol()' constructs.
-         log_rule("sp_inside_oc_at_sel_parens");
-         return(options::sp_inside_oc_at_sel_parens());
-      }
-   }
-
-   if (  chunk_is_token(second, CT_PAREN_OPEN)
-      && (  chunk_is_token(first, CT_OC_SEL)
-         || chunk_is_token(first, CT_OC_PROTOCOL)))
-   {
-      // (OC) Add or remove space between '@selector' and '(',
-      // i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-      // Also applies to '@protocol()' constructs.
-      log_rule("sp_after_oc_at_sel");
-      return(options::sp_after_oc_at_sel());
-   }
-
-   /*
-    * C cast:   "(int)"      vs. "( int )"
-    * D cast:   "cast(int)"  vs. "cast( int )"
-    * CPP cast: "int(a + 3)" vs. "int( a + 3 )"
-    */
-   if (chunk_is_token(first, CT_PAREN_OPEN))
-   {
-      if (  get_chunk_parent_type(first) == CT_C_CAST
-         || get_chunk_parent_type(first) == CT_CPP_CAST
-         || get_chunk_parent_type(first) == CT_D_CAST)
-      {
-         // Add or remove spaces inside cast parentheses.
-         log_rule("sp_inside_paren_cast");
-         return(options::sp_inside_paren_cast());
-      }
-
-      if (get_chunk_parent_type(first) == CT_NEW)
-      {
-         if (options::sp_inside_newop_paren_open() != IARF_IGNORE)
-         {
-            // Add or remove space after the open parenthesis of the new operator,
-            // as in 'new(foo) BAR'.
-            // Overrides sp_inside_newop_paren.
-            log_rule("sp_inside_newop_paren_open");
-            return(options::sp_inside_newop_paren_open());
-         }
-
-         if (options::sp_inside_newop_paren() != IARF_IGNORE)
-         {
-            // Add or remove space inside parenthesis of the new operator
-            // as in 'new(foo) BAR'.
-            log_rule("sp_inside_newop_paren");
-            return(options::sp_inside_newop_paren());
-         }
-      }
-      log_rule("sp_inside_paren");
-      return(options::sp_inside_paren());
-   }
-
-   if (chunk_is_token(second, CT_PAREN_CLOSE))
-   {
-      if (  get_chunk_parent_type(second) == CT_C_CAST
-         || get_chunk_parent_type(second) == CT_CPP_CAST
-         || get_chunk_parent_type(second) == CT_D_CAST)
-      {
-         // Add or remove spaces inside cast parentheses.
-         log_rule("sp_inside_paren_cast");
-         return(options::sp_inside_paren_cast());
-      }
-
-      if (get_chunk_parent_type(second) == CT_NEW)
-      {
-         if (options::sp_inside_newop_paren_close() != IARF_IGNORE)
-         {
-            // Add or remove space before the close parenthesis of the new operator,
-            // as in 'new(foo) BAR'.
-            // Overrides sp_inside_newop_paren.
-            log_rule("sp_inside_newop_paren_close");
-            return(options::sp_inside_newop_paren_close());
-         }
-
-         if (options::sp_inside_newop_paren() != IARF_IGNORE)
-         {
-            // Add or remove space inside parenthesis of the new operator
-            // as in 'new(foo) BAR'.
-            log_rule("sp_inside_newop_paren");
-            return(options::sp_inside_newop_paren());
-         }
-      }
-      // Add or remove space inside '(' and ')'.
-      log_rule("sp_inside_paren");
-      return(options::sp_inside_paren());
-   }
-
-   if (  chunk_is_token(first, CT_SQUARE_OPEN)
-      && chunk_is_token(second, CT_SQUARE_CLOSE))
-   {
-      // Add or remove space inside '[]'.
-      log_rule("sp_inside_square_empty");
-      return(options::sp_inside_square_empty());
-   }
-
-   // "[3]" vs. "[ 3 ]" or for objective-c "@[@3]" vs. "@[ @3 ]"
-   if (  chunk_is_token(first, CT_SQUARE_OPEN)
-      || chunk_is_token(second, CT_SQUARE_CLOSE))
-   {
-      if (  language_is_set(LANG_OC)
-         && (  (  get_chunk_parent_type(first) == CT_OC_AT
-               && chunk_is_token(first, CT_SQUARE_OPEN))
-            || (  get_chunk_parent_type(second) == CT_OC_AT
-               && chunk_is_token(second, CT_SQUARE_CLOSE)))
-         && (options::sp_inside_square_oc_array() != IARF_IGNORE))
-      {
-         // (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-         // ']'. If set to ignore, sp_inside_square is used.
-         log_rule("sp_inside_square_oc_array");
-         return(options::sp_inside_square_oc_array());
-      }
-      // Add or remove space inside a non-empty '[' and ']'.
-      log_rule("sp_inside_square");
-      return(options::sp_inside_square());
-   }
-
-   if (  chunk_is_token(first, CT_SQUARE_CLOSE)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
-   {
-      // Add or remove space between ']' and '(' when part of a function call.
-      log_rule("sp_square_fparen");
-      return(options::sp_square_fparen());
-   }
-
-   // "if(...)" vs. "if( ... )"
-   if (  chunk_is_token(second, CT_SPAREN_CLOSE)
-      && (options::sp_inside_sparen_close() != IARF_IGNORE))
-   {
-      // Add or remove space before ')' of control statements.
-      // Overrides sp_inside_sparen.
-      log_rule("sp_inside_sparen_close");
-      return(options::sp_inside_sparen_close());
-   }
-
-   if (  chunk_is_token(first, CT_SPAREN_OPEN)
-      && (options::sp_inside_sparen_open() != IARF_IGNORE))
-   {
-      // Add or remove space after '(' of control statements.
-      // Overrides sp_inside_sparen.
-      log_rule("sp_inside_sparen_open");
-      return(options::sp_inside_sparen_open());
-   }
-
-   if (  chunk_is_token(first, CT_SPAREN_OPEN)
-      || chunk_is_token(second, CT_SPAREN_CLOSE))
-   {
-      // Add or remove space inside '(' and ')' of control statements.
-      log_rule("sp_inside_sparen");
-      return(options::sp_inside_sparen());
-   }
-
-   if (chunk_is_token(first, CT_CLASS_COLON))
-   {
-      //chunk_t *a = chunk_get_prev_type(first, CT_OC_INTF, first->level, scope_e::ALL);
-      //chunk_t *b = chunk_get_prev_type(first, CT_OC_IMPL, first->level, scope_e::ALL);
-      //bool B_a = a != nullptr;
-      //bool B_b = b != nullptr;
-      if (  get_chunk_parent_type(first) == CT_OC_CLASS
-         && (  !chunk_get_prev_type(first, CT_OC_INTF, first->level, scope_e::ALL)
-            && !chunk_get_prev_type(first, CT_OC_IMPL, first->level, scope_e::ALL)))
-      {
-         if (options::sp_after_oc_colon() != IARF_IGNORE)
-         {
-            // TODO: provide some test data to check this block
-            // (OC) Add or remove space after the colon in message specs,
-            // i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-            log_rule("sp_after_oc_colon");
-            return(options::sp_after_oc_colon());
-         }
-      }
-
-      if (options::sp_after_class_colon() != IARF_IGNORE)
-      {
-         // Add or remove space after class ':'.
-         log_rule("sp_after_class_colon");
-         return(options::sp_after_class_colon());
-      }
-   }
-
-   if (chunk_is_token(second, CT_CLASS_COLON))
-   {
-      if (  get_chunk_parent_type(second) == CT_OC_CLASS
-         && (  !chunk_get_prev_type(second, CT_OC_INTF, second->level, scope_e::ALL)
-            && !chunk_get_prev_type(second, CT_OC_IMPL, second->level, scope_e::ALL)))
-      {
-         if (  get_chunk_parent_type(second) == CT_OC_CLASS
-            && !chunk_get_prev_type(second, CT_OC_INTF, second->level, scope_e::ALL))
-         {
-            if (options::sp_before_oc_colon() != IARF_IGNORE)
-            {
-               // TODO: provide some test data to check this block
-               // (OC) Add or remove space before the colon in message specs,
-               // i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-               log_rule("sp_before_oc_colon");
-               return(options::sp_before_oc_colon());
-            }
-         }
-      }
-
-      if (options::sp_before_class_colon() != IARF_IGNORE)
-      {
-         // Add or remove space before class ':'.
-         log_rule("sp_before_class_colon");
-         return(options::sp_before_class_colon());
-      }
-   }
-
-   if (  (options::sp_after_constr_colon() != IARF_IGNORE)
-      && chunk_is_token(first, CT_CONSTR_COLON))
-   {
-      min_sp = options::indent_ctor_init_leading() - 1; // default indent is 1 space
-
-      // Add or remove space after class constructor ':'.
-      log_rule("sp_after_constr_colon");
-      return(options::sp_after_constr_colon());
-   }
-
-   if (  (options::sp_before_constr_colon() != IARF_IGNORE)
-      && chunk_is_token(second, CT_CONSTR_COLON))
-   {
-      // Add or remove space before class constructor ':'.
-      log_rule("sp_before_constr_colon");
-      return(options::sp_before_constr_colon());
-   }
-
-   if (  (options::sp_before_case_colon() != IARF_IGNORE)
-      && chunk_is_token(second, CT_CASE_COLON))
-   {
-      // Add or remove space before case ':'.
-      log_rule("sp_before_case_colon");
-      return(options::sp_before_case_colon());
-   }
-
-   if (chunk_is_token(first, CT_DOT))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (chunk_is_token(second, CT_DOT))
-   {
-      log_rule_short("ADD");
-      return(IARF_ADD);
-   }
-
-   if (  chunk_is_token(first, CT_NULLCOND)
-      || chunk_is_token(second, CT_NULLCOND))
-   {
-      // TODO: provide some test data to check this block
-      // LANG_CS  null conditional operator
-      // Add or remove space around the '.' or '->' operators.
-      log_rule("sp_member");
-      return(options::sp_member());
-   }
-
-   if (  chunk_is_token(first, CT_ARITH)
-      || chunk_is_token(first, CT_SHIFT)
-      || chunk_is_token(first, CT_CARET)
-      || chunk_is_token(second, CT_ARITH)
-      || chunk_is_token(second, CT_SHIFT)
-      || chunk_is_token(second, CT_CARET))
-   {
-      // Add or remove space around arithmetic operators '+' and '-'.
-      // Overrides sp_arith.
-      if (options::sp_arith_additive() != IARF_IGNORE)
-      {
-         auto arith_char = (  chunk_is_token(first, CT_ARITH)
-                           || chunk_is_token(first, CT_SHIFT)
-                           || chunk_is_token(first, CT_CARET))
-                           ? first->str[0] : second->str[0];
-
-         if (  arith_char == '+'
-            || arith_char == '-')
-         {
-            log_rule("sp_arith_additive");
-            return(options::sp_arith_additive());
-         }
-      }
-      // Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-      // '<<', and so forth).
-      log_rule("sp_arith");
-      return(options::sp_arith());
-   }
-
-   if (  chunk_is_token(first, CT_BOOL)
-      || chunk_is_token(second, CT_BOOL))
-   {
-      // Add or remove space around boolean operators '&&' and '||'.
-      iarf_e arg = options::sp_bool();
-
-      if (  (options::pos_bool() != TP_IGNORE)
-         && first->orig_line != second->orig_line
-         && arg != IARF_REMOVE)
-      {
-         arg = arg | IARF_ADD;
-      }
-      // TODO check it
-      log_rule("sp_bool");
-      return(arg);
-   }
-
-   if (  chunk_is_token(first, CT_COMPARE)
-      || chunk_is_token(second, CT_COMPARE))
-   {
-      // Add or remove space around compare operator '<', '>', '==', etc.
-      log_rule("sp_compare");
-      return(options::sp_compare());
-   }
-
-   if (  chunk_is_token(first, CT_PAREN_OPEN)
-      && chunk_is_token(second, CT_PTR_TYPE))
-   {
-      // TODO: provide some test data to check this block
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      && (options::sp_ptr_star_paren() != IARF_IGNORE)
-      && (  chunk_is_token(second, CT_FPAREN_OPEN)
-         || chunk_is_token(second, CT_TPAREN_OPEN)))
-   {
-      // Add or remove space after a pointer star '*', if followed by an open
-      // parenthesis, as in 'void* (*)().
-      log_rule("sp_ptr_star_paren");
-      return(options::sp_ptr_star_paren());
-   }
-
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      && chunk_is_token(second, CT_PTR_TYPE)
-      && (options::sp_between_ptr_star() != IARF_IGNORE))
-   {
-      // Add or remove space between pointer stars '*'.
-      log_rule("sp_between_ptr_star");
-      return(options::sp_between_ptr_star());
-   }
-
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      && (options::sp_after_ptr_star_func() != IARF_IGNORE)
-      && (  get_chunk_parent_type(first) == CT_FUNC_DEF
-         || get_chunk_parent_type(first) == CT_FUNC_PROTO
-         || get_chunk_parent_type(first) == CT_FUNC_VAR))
-   {
-      // Add or remove space after a pointer star '*', if followed by a function
-      // prototype or function definition.
-      log_rule("sp_after_ptr_star_func");
-      return(options::sp_after_ptr_star_func());
-   }
-
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      && CharTable::IsKw1(second->str[0]))
-   {
-      chunk_t *prev = chunk_get_prev(first);
-
-      if (chunk_is_token(prev, CT_IN))
-      {
-         // Add or remove space after the '*' (dereference) unary operator. This does
-         // not affect the spacing after a '*' that is part of a type.
-         log_rule("sp_deref");
-         return(options::sp_deref());
-      }
-
-      if (  (  get_chunk_parent_type(first) == CT_FUNC_VAR
-            || get_chunk_parent_type(first) == CT_FUNC_TYPE)
-         && options::sp_after_ptr_block_caret() != IARF_IGNORE)
-      {
-         // Add or remove space after pointer caret '^', if followed by a word.
-         log_rule("sp_after_ptr_block_caret");
-         return(options::sp_after_ptr_block_caret());
-      }
-
-      if (  chunk_is_token(second, CT_QUALIFIER)
-         && (options::sp_after_ptr_star_qualifier() != IARF_IGNORE))
-      {
-         // Add or remove space after pointer star '*', if followed by a qualifier.
-         log_rule("sp_after_ptr_star_qualifier");
-         return(options::sp_after_ptr_star_qualifier());
-      }
-
-      // Add or remove space after pointer star '*', if followed by a word.
-      if (options::sp_after_ptr_star() != IARF_IGNORE)
-      {
-         log_rule("sp_after_ptr_star");
-         return(options::sp_after_ptr_star());
-      }
-   }
-
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      // Add or remove space after pointer star '*', if followed by a word.
-      log_rule("sp_after_ptr_star");
-      return(options::sp_after_ptr_star());
-   }
-
-   if (  chunk_is_token(second, CT_PTR_TYPE)
-      && first->type != CT_IN)
-   {
-      if (  language_is_set(LANG_CS)
-         && chunk_is_nullable(second))
-      {
-         min_sp = 0;
-         log_rule_short("REMOVE");
-         return(IARF_REMOVE);
-      }
-
-      // Add or remove space before a pointer star '*', if followed by a function
-      // prototype or function definition.
-      if (options::sp_before_ptr_star_func() != IARF_IGNORE)
-      {
-         // Find the next non-'*' chunk
-         chunk_t *next = second;
-
-         do
-         {
-            next = chunk_get_next(next);
-         } while (chunk_is_token(next, CT_PTR_TYPE));
-
-         if (  chunk_is_token(next, CT_FUNC_DEF)
-            || chunk_is_token(next, CT_FUNC_PROTO))
-         {
-            log_rule("sp_before_ptr_star_func");
-            return(options::sp_before_ptr_star_func());
-         }
-      }
-
-      // Add or remove space before pointer star '*' that isn't followed by a
-      // variable name. If set to 'ignore', sp_before_ptr_star is used instead.
-      if (options::sp_before_unnamed_ptr_star() != IARF_IGNORE)
-      {
-         chunk_t *next = chunk_get_next_nc(second);
-
-         while (chunk_is_token(next, CT_PTR_TYPE))
-         {
-            next = chunk_get_next_nc(next);
-         }
-
-         if (  next != nullptr
-            && next->type != CT_WORD)
-         {
-            log_rule("sp_before_unnamed_ptr_star");
-            return(options::sp_before_unnamed_ptr_star());
-         }
-      }
-
-      // Add or remove space before pointer star '*'.
-      if (options::sp_before_ptr_star() != IARF_IGNORE)
-      {
-         log_rule("sp_before_ptr_star");
-         return(options::sp_before_ptr_star());
-      }
-   }
-
-   if (chunk_is_token(first, CT_OPERATOR))
-   {
-      // Add or remove space between 'operator' and operator sign.
-      log_rule("sp_after_operator");
-      return(options::sp_after_operator());
-   }
-
-   if (  chunk_is_token(second, CT_FUNC_PROTO)
-      || chunk_is_token(second, CT_FUNC_DEF))
-   {
-      if (  first->type != CT_PTR_TYPE
-         && first->type != CT_BYREF)
-      {
-         // Add or remove space between return type and function name. A
-         // minimum of 1 is forced except for pointer/reference return types.
-         log_rule("sp_type_func | ADD");
-         return(options::sp_type_func() | IARF_ADD);
-      }
-      // Add or remove space between return type and function name. A
-      // minimum of 1 is forced except for pointer/reference return types.
-      log_rule("sp_type_func");
-      return(options::sp_type_func());
-   }
-
-   // "(int)a" vs. "(int) a" or "cast(int)a" vs. "cast(int) a"
-   if (  (  get_chunk_parent_type(first) == CT_C_CAST
-         || get_chunk_parent_type(first) == CT_D_CAST)
-      && chunk_is_token(first, CT_PAREN_CLOSE))
-   {
-      log_rule("sp_after_cast");
-      return(options::sp_after_cast());
-   }
-
-   if (chunk_is_token(first, CT_BRACE_CLOSE))
-   {
-      if (chunk_is_token(second, CT_ELSE))
-      {
-         // Add or remove space between '}' and 'else' if on the same line.
-         log_rule("sp_brace_else");
-         return(options::sp_brace_else());
-      }
-
-      if (  language_is_set(LANG_OC)
-         && chunk_is_token(second, CT_CATCH)
-         && (options::sp_oc_brace_catch() != IARF_IGNORE))
-      {
-         // TODO: provide some test data to check this block
-         // (OC) Add or remove space between '}' and '@catch' if on the same line.
-         // If set to ignore, sp_brace_catch is used.
-         log_rule("sp_oc_brace_catch");
-         return(options::sp_oc_brace_catch());
-      }
-
-      if (chunk_is_token(second, CT_CATCH))
-      {
-         // TODO: provide some test data to check this block
-         // Add or remove space between '}' and 'catch' if on the same line.
-         log_rule("sp_brace_catch");
-         return(options::sp_brace_catch());
-      }
-
-      if (chunk_is_token(second, CT_FINALLY))
-      {
-         // Add or remove space between '}' and 'finally' if on the same line.
-         log_rule("sp_brace_finally");
-         return(options::sp_brace_finally());
-      }
-   }
-
-   if (chunk_is_token(first, CT_BRACE_OPEN))
-   {
-      if (get_chunk_parent_type(first) == CT_ENUM)
-      {
-         // Add or remove space inside enum '{' and '}'.
-         log_rule("sp_inside_braces_enum");
-         return(options::sp_inside_braces_enum());
-      }
-
-      if (  get_chunk_parent_type(first) == CT_STRUCT
-         || get_chunk_parent_type(first) == CT_UNION)
-      {
-         // Fix for issue #1240  adding space in struct initializers
-         chunk_t *tmp = chunk_get_prev_ncnnl(first);
-
-         if (chunk_is_token(tmp, CT_ASSIGN))
-         {
-            // TODO: provide some test data to check this block
-            log_rule_short("IGNORE");
-            return(IARF_IGNORE);
-         }
-         // Add or remove space inside struct/union '{' and '}'.
-         log_rule("sp_inside_braces_struct");
-         return(options::sp_inside_braces_struct());
-      }
-      else if (  get_chunk_parent_type(first) == CT_OC_AT
-              && options::sp_inside_braces_oc_dict() != IARF_IGNORE)
-      {
-         // (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-         log_rule("sp_inside_braces_oc_dict");
-         return(options::sp_inside_braces_oc_dict());
-      }
-
-      if (get_chunk_parent_type(first) == CT_BRACED_INIT_LIST)
-      {
-         // Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-         // only to help the vim command }}}}
-         if (  options::sp_brace_brace() != IARF_IGNORE
-            && chunk_is_token(second, CT_BRACE_OPEN)
-            && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
-         {
-            log_rule("sp_brace_brace");
-            return(options::sp_brace_brace());
-         }
-
-         if (options::sp_after_type_brace_init_lst_open() != IARF_IGNORE)
-         {
-            // Add or remove space after open brace in an unnamed temporary
-            // direct-list-initialization.
-            log_rule("sp_after_type_brace_init_lst_open");
-            return(options::sp_after_type_brace_init_lst_open());
-         }
-
-         if (options::sp_inside_type_brace_init_lst() != IARF_IGNORE)
-         {
-            // Add or remove space inside an unnamed temporary direct-list-initialization.
-            log_rule("sp_inside_type_brace_init_lst");
-            return(options::sp_inside_type_brace_init_lst());
-         }
-      }
-
-      if (!chunk_is_comment(second))
-      {
-         // Add or remove space inside '{' and '}'.
-         log_rule("sp_inside_braces");
-         return(options::sp_inside_braces());
-      }
-   }
-
-   if (  chunk_is_token(first, CT_BRACE_CLOSE)
-      && first->flags.test(PCF_IN_TYPEDEF)
-      && (  get_chunk_parent_type(first) == CT_ENUM
-         || get_chunk_parent_type(first) == CT_STRUCT
-         || get_chunk_parent_type(first) == CT_UNION))
-   {
-      // Add or remove space between '}' and the name of a typedef on the same line.
-      log_rule("sp_brace_typedef");
-      return(options::sp_brace_typedef());
-   }
-
-   if (  chunk_is_token(second, CT_PAREN_OPEN)
-      && get_chunk_parent_type(second) == CT_TEMPLATE)
-   {
-      // (D) Add or remove space before the parenthesis in the D constructs
-      // 'template Foo(' and 'class Foo('.
-      log_rule("sp_before_template_paren");
-      return(options::sp_before_template_paren());
-   }
-
-   // Issue #3080
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_DECLTYPE
-      && (  chunk_is_token(second, CT_WORD)
-         || chunk_is_token(second, CT_BRACE_OPEN)
-         || chunk_is_token(second, CT_FUNC_CALL)))
-   {
-      iarf_e arg = options::sp_after_decltype();
-      // Add or remove space between 'decltype(...)' and word, brace or function call.
-      log_rule("sp_after_decltype");
-      return(arg);
-   }
-
-   // Issue #3080
-   if (  !language_is_set(LANG_D)
-      && chunk_is_token(first, CT_PAREN_CLOSE)
-      && chunk_is_token(second, CT_WORD))
-   {
-      // Add or remove space between type and word.
-      log_rule("sp_after_type");
-      return(options::sp_after_type());
-   }
-
-   if (  language_is_set(LANG_VALA)
-      && chunk_is_token(second, CT_QUESTION))
-   {
-      // TODO: provide some test data to check this block
-      // Issue #2090
-      // (D) Add or remove space between a type and '?'.
-      log_rule("sp_type_question");
-      return(options::sp_type_question());
-   }
-
-   // see if the D template expression is used as a type
-   if (  language_is_set(LANG_D)
-      && chunk_is_token(first, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_D_TEMPLATE)
-   {
-      if (get_chunk_parent_type(second) == CT_USING_ALIAS)
-      {
-         log_rule("sp_after_type | ADD");
-         return(options::sp_after_type() | IARF_ADD);
-      }
-
-      if (chunk_is_token(second, CT_WORD))
-      {
-         chunk_t *open_paren = chunk_skip_to_match_rev(first);
-         chunk_t *type       = chunk_get_prev(chunk_get_prev(open_paren));
-
-         if (chunk_is_token(type, CT_TYPE))
-         {
-            log_rule("sp_after_type");
-            return(options::sp_after_type());
-         }
-      }
-   }
-
-   if (  !chunk_is_token(second, CT_PTR_TYPE)
-      && (  chunk_is_token(first, CT_QUALIFIER)
-         || chunk_is_token(first, CT_TYPE)))
-   {
-      // Add or remove space between type and word. In cases where total removal of
-      // whitespace would be a syntax error, a value of 'remove' is treated the same
-      // as 'force'.
-      //
-      // This also affects some other instances of space following a type that are
-      // not covered by other options; for example, between the return type and
-      // parenthesis of a function type template argument, between the type and
-      // parenthesis of an array parameter, or between 'decltype(...)' and the
-      // following word.
-      iarf_e arg = options::sp_after_type();
-      log_rule("sp_after_type");
-      return(arg);
-   }
-
-   // If nothing claimed the PTR_TYPE, then return ignore
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      || chunk_is_token(second, CT_PTR_TYPE))
-   {
-      log_rule_short("IGNORE");
-      return(IARF_IGNORE);
-   }
-
-   if (chunk_is_token(first, CT_NOT))
-   {
-      // Add or remove space after the '!' (not) unary operator.
-      log_rule("sp_not");
-      return(options::sp_not());
-   }
-
-   if (chunk_is_token(first, CT_INV))
-   {
-      // Add or remove space after the '~' (invert) unary operator.
-      log_rule("sp_inv");
-      return(options::sp_inv());
-   }
-
-   if (chunk_is_token(first, CT_ADDR))
-   {
-      // Add or remove space after the '&' (address-of) unary operator. This does not
-      // affect the spacing after a '&' that is part of a type.
-      log_rule("sp_addr");
-      return(options::sp_addr());
-   }
-
-   if (chunk_is_token(first, CT_DEREF))
-   {
-      // Add or remove space after the '*' (dereference) unary operator. This does
-      // not affect the spacing after a '*' that is part of a type.
-      log_rule("sp_deref");
-      return(options::sp_deref());
-   }
-
-   if (  chunk_is_token(first, CT_POS)
-      || chunk_is_token(first, CT_NEG))
-   {
-      // Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-      log_rule("sp_sign");
-      return(options::sp_sign());
-   }
-
-   if (  chunk_is_token(first, CT_INCDEC_BEFORE)
-      || chunk_is_token(second, CT_INCDEC_AFTER))
-   {
-      // Add or remove space between '++' and '--' the word to which it is being
-      // applied, as in '(--x)' or 'y++;'.
-      log_rule("sp_incdec");
-      return(options::sp_incdec());
-   }
-
-   if (chunk_is_token(second, CT_CS_SQ_COLON))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (chunk_is_token(first, CT_CS_SQ_COLON))
-   {
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   if (chunk_is_token(first, CT_OC_SCOPE))
-   {
-      // (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-      // or '+(int) bar;'.
-      log_rule("sp_after_oc_scope");
-      return(options::sp_after_oc_scope());
-   }
-
-   if (chunk_is_token(first, CT_OC_DICT_COLON))
-   {
-      // (OC) Add or remove space after the colon in immutable dictionary expression
-      // 'NSDictionary *test = @{@"foo" :@"bar"};'.
-      log_rule("sp_after_oc_dict_colon");
-      return(options::sp_after_oc_dict_colon());
-   }
-
-   if (chunk_is_token(second, CT_OC_DICT_COLON))
-   {
-      // (OC) Add or remove space before the colon in immutable dictionary expression
-      // 'NSDictionary *test = @{@"foo" :@"bar"};'.
-      log_rule("sp_before_oc_dict_colon");
-      return(options::sp_before_oc_dict_colon());
-   }
-
-   if (chunk_is_token(first, CT_OC_COLON))
-   {
-      if (first->flags.test(PCF_IN_OC_MSG))
-      {
-         // (OC) Add or remove space after the colon in message specs,
-         // i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-         log_rule("sp_after_send_oc_colon");
-         return(options::sp_after_send_oc_colon());
-      }
-      // (OC) Add or remove space after the colon in message specs,
-      // i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-      log_rule("sp_after_oc_colon");
-      return(options::sp_after_oc_colon());
-   }
-
-   if (chunk_is_token(second, CT_OC_COLON))
-   {
-      if (  first->flags.test(PCF_IN_OC_MSG)
-         && (  chunk_is_token(first, CT_OC_MSG_FUNC)
-            || chunk_is_token(first, CT_OC_MSG_NAME)))
-      {
-         // (OC) Add or remove space before the colon in message specs,
-         // i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-         log_rule("sp_before_send_oc_colon");
-         return(options::sp_before_send_oc_colon());
-      }
-      // (OC) Add or remove space before the colon in message specs,
-      // i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-      log_rule("sp_before_oc_colon");
-      return(options::sp_before_oc_colon());
-   }
-
-   if (  chunk_is_token(second, CT_COMMENT)
-      && get_chunk_parent_type(second) == CT_COMMENT_EMBED)
-   {
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   if (chunk_is_token(first, CT_COMMENT))
-   {
-      log_rule_short("FORCE");
-      return(IARF_FORCE);
-   }
-
-   if (  chunk_is_token(first, CT_NEW)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      // c# new Constraint, c++ new operator
-      // Add or remove space between 'new' and '(' in 'new()'.
-      log_rule("sp_between_new_paren");
-      return(options::sp_between_new_paren());
-   }
-
-   if (  chunk_is_token(first, CT_NEW)
-      || chunk_is_token(first, CT_DELETE)
-      || (  chunk_is_token(first, CT_TSQUARE)
-         && get_chunk_parent_type(first) == CT_DELETE))
-   {
-      // Add or remove space after 'new', 'delete' and 'delete[]'.
-      log_rule("sp_after_new");
-      return(options::sp_after_new());
-   }
-
-   if (  chunk_is_token(first, CT_ANNOTATION)
-      && chunk_is_paren_open(second))
-   {
-      // (Java) Add or remove space between an annotation and the open parenthesis.
-      log_rule("sp_annotation_paren");
-      return(options::sp_annotation_paren());
-   }
-
-   if (chunk_is_token(first, CT_OC_PROPERTY))
-   {
-      // (OC) Add or remove space after '@property'.
-      log_rule("sp_after_oc_property");
-      return(options::sp_after_oc_property());
-   }
-
-   if (  chunk_is_token(first, CT_EXTERN)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      // (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-      log_rule("sp_extern_paren");
-      return(options::sp_extern_paren());
-   }
-
-   if (  chunk_is_token(second, CT_TYPE)
-      && (  (  chunk_is_token(first, CT_STRING)
-            && get_chunk_parent_type(first) == CT_EXTERN)
-         || (  chunk_is_token(first, CT_FPAREN_CLOSE)
-            && get_chunk_parent_type(first) == CT_ATTRIBUTE)))
-   {
-      log_rule_short("FORCE");
-      return(IARF_FORCE);  /* TODO: make this configurable? */
-   }
-
-   if (chunk_is_token(first, CT_NOEXCEPT))
-   {
-      // Add or remove space after 'noexcept'.
-      log_rule("sp_after_noexcept");
-      return(options::sp_after_noexcept());
-   }
-
-   // Issue #2138
-   if (chunk_is_token(first, CT_FPAREN_CLOSE))
-   {
-      if (chunk_is_token(second, CT_QUALIFIER))
-      {
-         // Add or remove space between ')' and a qualifier such as 'const'.
-         log_rule("sp_paren_qualifier");
-         return(options::sp_paren_qualifier());
-      }
-      else if (chunk_is_token(second, CT_NOEXCEPT))
-      {
-         // Add or remove space between ')' and 'noexcept'.
-         log_rule("sp_paren_noexcept");
-         return(options::sp_paren_noexcept());
-      }
-   }
-
-   // Issue #2098
-   if (  chunk_is_token(first, CT_PP_PRAGMA)
-      && chunk_is_token(second, CT_PREPROC_BODY))
-   {
-      log_rule_short("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   // Issue #1733
-   if (  chunk_is_token(first, CT_OPERATOR_VAL)
-      && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule_short("IGNORE");
-      return(IARF_IGNORE);
-   }
-
-   // Issue #995
-   if (  chunk_is_token(first, CT_DO)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      // Add or remove space between 'do' and '{'.
-      log_rule("sp_do_brace_open");
-      return(options::sp_do_brace_open());
-   }
-
-   // Issue #995
-   if (  chunk_is_token(first, CT_WHILE_OF_DO)
-      && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      // Add or remove space between 'while' and '('.
-      if (options::sp_while_paren_open() != IARF_IGNORE)
-      {
-         log_rule("sp_while_paren_open");
-         return(options::sp_while_paren_open());
-      }
-      log_rule("sp_before_sparen");
-      return(options::sp_before_sparen());
-   }
-
-   // Issue #995
-   if (  chunk_is_token(first, CT_BRACE_CLOSE)
-      && chunk_is_token(second, CT_WHILE_OF_DO))
-   {
-      // Add or remove space between '}' and 'while.
-      log_rule("sp_brace_close_while");
-      return(options::sp_brace_close_while());
-   }
-
-   // TODO: have a look to Issue #2186, why NEWLINE?
-   // Issue #2524
-   if (  chunk_is_token(first, CT_NEWLINE)
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule_short("IGNORE");
-      return(IARF_IGNORE);
-   }
-
-   // =============================================================
-   // categorie 1
-   // this table lists out all combos where a space should NOT be present
-   // CT_UNKNOWN is a wildcard.
-   for (auto it : no_space_table)
-   {
-      if (  (  it.first == CT_UNKNOWN
-            || it.first == first->type)
-         && (  it.second == CT_UNKNOWN
-            || it.second == second->type))
-      {
-         log_rule("REMOVE from no_space_table");
-         return(IARF_REMOVE);
-      }
-   }
-
-   // =============================================================
-   // categorie 2
-   // this table lists out all combos where a space MUST be present
-   for (auto it : add_space_table)
-   {
-      if (  it.first == first->type
-         && it.second == second->type)
-      {
-         // TODO: if necessary create a new option
-         log_rule("ADD from add_space_table");
-         return(IARF_ADD);
-      }
-   }
-
-   // Issue #2386
-   if (  chunk_is_token(first, CT_FORM_FEED)
-      || chunk_is_token(second, CT_FORM_FEED))
-   {
-      log_rule_short("IGNORE");
-      return(IARF_IGNORE);
-   }
-
-   // TODO: if necessary create a new option
-   if (  chunk_is_token(first, CT_MACRO_FUNC_CALL)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
-   {
-      log_rule("IGNORE");
-      return(IARF_IGNORE);
-   }
-   // =============================================================
-   // categorie 3
-   // these lines are only useful for debugging uncrustify itself
-   LOG_FMT(LSPACE, "\n\n%s(%d): WARNING: unrecognize do_space:\n",
-           __func__, __LINE__);
-   LOG_FMT(LSPACE, "   first->orig_line  is %zu, first->orig_col  is %zu, first->text()  '%s', first->type is  %s\n",
-           first->orig_line, first->orig_col, first->text(), get_token_name(first->type));
-   LOG_FMT(LSPACE, "   second->orig_line is %zu, second->orig_col is %zu, second->text() '%s', second->type is %s\n",
-           second->orig_line, second->orig_col, second->text(), get_token_name(second->type));
-   LOG_FMT(LSPACE, "   Please make a call at https://github.com/uncrustify/uncrustify/issues/new\n");
-   LOG_FMT(LSPACE, "   or merge the line:\n");
-   LOG_FMT(LSPACE, "   {%s,    %s},\n",
-           get_token_name(first->type), get_token_name(second->type));
-   LOG_FMT(LSPACE, "   in the file <Path_to_uncrustify>/src/add_space_table.h\n");
-
-   log_rule_short("ADD as default value");
-   return(IARF_ADD);
-} // do_space
-
-
-static iarf_e ensure_force_space(chunk_t *first, chunk_t *second, iarf_e av)
-{
-   if (first->flags.test(PCF_FORCE_SPACE))
-   {
-      LOG_FMT(LSPACE, "%s(%d): <force between '%s' and '%s'>",
-              __func__, __LINE__, first->text(), second->text());
-      return(av | IARF_ADD);
-   }
-   return(av);
-}
-
-
-static iarf_e do_space_ensured(chunk_t *first, chunk_t *second, int &min_sp)
-{
-   iarf_e aa = ensure_force_space(first, second, do_space(first, second, min_sp));
-
-   return(aa);
-}
-
-
-void space_text(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *pc = chunk_get_head();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-   chunk_t *next;
-   size_t  prev_column;
-   size_t  column = pc->column;
-
-   while (pc != nullptr)
-   {
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
-      }
-      else
-      {
-         char copy[1000];
-         LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, '%s' type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type));
-      }
-
-      if (  (options::use_options_overriding_for_qt_macros())
-         && (  (strcmp(pc->text(), "SIGNAL") == 0)
-            || (strcmp(pc->text(), "SLOT") == 0)))
-      {
-         LOG_FMT(LSPACE, "%s(%d): orig_col is %zu, type is %s SIGNAL/SLOT found\n",
-                 __func__, __LINE__, pc->orig_line, get_token_name(pc->type));
-         chunk_flags_set(pc, PCF_IN_QT_MACRO); // flag the chunk for a second processing
-
-         // save the values
-         save_set_options_for_QT(pc->level);
-      }
-
-      // Bug # 637
-      // If true, vbrace tokens are dropped to the previous token and skipped.
-      if (options::sp_skip_vbrace_tokens())
-      {
-         next = chunk_get_next(pc);
-
-         while (  chunk_is_blank(next)
-               && !chunk_is_newline(next)
-               && (  chunk_is_token(next, CT_VBRACE_OPEN)
-                  || chunk_is_token(next, CT_VBRACE_CLOSE)))
-         {
-            LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, Skip %s (%zu+%zu)\n",
-                    __func__, __LINE__, next->orig_line, next->orig_col, get_token_name(next->type),
-                    pc->column, pc->str.size());
-            next->column = pc->column + pc->str.size();
-            next         = chunk_get_next(next);
-         }
-      }
-      else
-      {
-         next = pc->next;
-      }
-
-      if (!next)
-      {
-         break;
-      }
-
-      // Issue # 481
-      // Whether to balance spaces inside nested parentheses.
-      if (  QT_SIGNAL_SLOT_found
-         && options::sp_balance_nested_parens())
-      {
-         chunk_t *nn = next->next;                                          // Issue #2734
-
-         if (  nn != nullptr
-            && chunk_is_token(nn, CT_SPACE))
-         {
-            chunk_del(nn); // remove the space
-         }
-      }
-
-      /*
-       * If the current chunk contains a newline, do not change the column
-       * of the next item
-       */
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         || chunk_is_token(pc, CT_NL_CONT)
-         || chunk_is_token(pc, CT_COMMENT_MULTI))
-      {
-         column = next->column;
-      }
-      else
-      {
-         // Set to the minimum allowed column
-         if (pc->nl_count == 0)
-         {
-            column += pc->len();
-         }
-         else
-         {
-            column = pc->orig_col_end;
-         }
-         prev_column = column;
-
-         /*
-          * Apply a general safety check
-          * If the two chunks combined will tokenize differently, then we
-          * must force a space.
-          * Two chunks -- "()" and "[]" will always tokenize differently.
-          * They are always safe to not have a space after them.
-          */
-         chunk_flags_clr(pc, PCF_FORCE_SPACE);
-
-         if (  (pc->len() > 0)
-            && !chunk_is_str(pc, "[]", 2)
-            && !chunk_is_str(pc, "{{", 2)
-            && !chunk_is_str(pc, "}}", 2)
-            && !chunk_is_str(pc, "()", 2)
-            && !pc->str.startswith("@\""))
-         {
-            // Find the next non-empty chunk on this line
-            chunk_t *tmp = next;
-
-            // TODO: better use chunk_search here
-            while (  tmp != nullptr
-                  && (tmp->len() == 0)
-                  && !chunk_is_newline(tmp))
-            {
-               tmp = chunk_get_next(tmp);
-            }
-
-            if (  tmp != nullptr
-               && tmp->len() > 0)
-            {
-               bool kw1 = CharTable::IsKw2(pc->str[pc->len() - 1]);
-               bool kw2 = CharTable::IsKw1(next->str[0]);
-
-               if (  kw1
-                  && kw2)
-               {
-                  // back-to-back words need a space
-                  LOG_FMT(LSPACE, "%s(%d): back-to-back words need a space: pc->text() '%s', next->text() '%s'\n",
-                          __func__, __LINE__, pc->text(), next->text());
-                  chunk_flags_set(pc, PCF_FORCE_SPACE);
-               }
-               // TODO:  what is the meaning of 4
-               else if (  !kw1
-                       && !kw2
-                       && (pc->len() < 4)
-                       && (next->len() < 4))
-               {
-                  // We aren't dealing with keywords. concat and try punctuators
-                  char buf[9];
-                  memcpy(buf, pc->text(), pc->len());
-                  memcpy(buf + pc->len(), next->text(), next->len());
-                  buf[pc->len() + next->len()] = 0;
-
-                  const chunk_tag_t *ct;
-                  ct = find_punctuator(buf, cpd.lang_flags);
-
-                  if (  ct != nullptr
-                     && (strlen(ct->tag) != pc->len()))
-                  {
-                     // punctuator parsed to a different size..
-
-                     /*
-                      * C++11 allows '>>' to mean '> >' in templates:
-                      *   some_func<vector<string>>();
-                      */
-                     // (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-                     // that sp_angle_shift cannot remove the space without this option.
-                     if (  (  (  language_is_set(LANG_CPP)
-                              && options::sp_permit_cpp11_shift())
-                           || (language_is_set(LANG_JAVA | LANG_CS | LANG_VALA | LANG_OC)))
-                        && chunk_is_token(pc, CT_ANGLE_CLOSE)
-                        && chunk_is_token(next, CT_ANGLE_CLOSE))
-                     {
-                        // allow '>' and '>' to become '>>'
-                     }
-                     else if (strcmp(ct->tag, "[]") == 0)
-                     {
-                        // this is OK
-                     }
-                     else
-                     {
-                        LOG_FMT(LSPACE, "%s(%d): : pc->text() is %s, next->text() is %s\n",
-                                __func__, __LINE__, pc->text(), next->text());
-                        chunk_flags_set(pc, PCF_FORCE_SPACE);
-                     }
-                  }
-               }
-            }
-         }
-         int min_sp;
-         LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, pc-text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         iarf_e av = do_space_ensured(pc, next, min_sp);
-         min_sp = max(1, min_sp);
-
-         switch (av)
-         {
-         case IARF_FORCE:
-            column += min_sp;  // add exactly the specified number of spaces
-            break;
-
-         case IARF_ADD:
-         {
-            int delta = min_sp;
-
-            if (  next->orig_col >= pc->orig_col_end
-               && pc->orig_col_end != 0)
-            {
-               // Keep the same relative spacing, minimum 1
-               delta = next->orig_col - pc->orig_col_end;
-
-               if (delta < min_sp)
-               {
-                  delta = min_sp;
-               }
-            }
-            column += delta;
-            break;
-         }
-
-         case IARF_REMOVE:
-            // the symbols will be back-to-back "a+3"
-            break;
-
-         case IARF_IGNORE:
-
-            // Keep the same relative spacing, if possible
-            if (  next->orig_col >= pc->orig_col_end
-               && pc->orig_col_end != 0)
-            {
-               column += next->orig_col - pc->orig_col_end;
-            }
-            else
-            {
-               // preserve the position if virtual brace
-               // Issue #1854
-               if (chunk_is_token(pc, CT_VBRACE_OPEN))
-               {
-                  column = next->orig_col;
-               }
-            }
-            break;
-
-         default:
-            // If we got here, something is wrong...
-            break;
-         } // switch
-
-         if (  chunk_is_comment(next)
-            && chunk_is_newline(chunk_get_next(next))
-            && column < next->orig_col)
-         {
-            /*
-             * do some comment adjustments if sp_before_tr_emb_cmt and
-             * sp_endif_cmt did not apply.
-             */
-            // Add or remove space between #else or #endif and a trailing comment.
-            if (  (  options::sp_before_tr_emb_cmt() == IARF_IGNORE
-                  || (  get_chunk_parent_type(next) != CT_COMMENT_END
-                     && get_chunk_parent_type(next) != CT_COMMENT_EMBED))
-               && (  options::sp_endif_cmt() == IARF_IGNORE
-                  || (  pc->type != CT_PP_ELSE
-                     && pc->type != CT_PP_ENDIF)))
-            {
-               if (options::indent_relative_single_line_comments())
-               {
-                  // Try to keep relative spacing between tokens
-                  LOG_FMT(LSPACE, "%s(%d): <relative adj>", __func__, __LINE__);
-                  LOG_FMT(LSPACE, "%s(%d): pc is '%s', pc->orig_col is %zu, next->orig_col is %zu, pc->orig_col_end is %zu\n",
-                          __func__, __LINE__, pc->text(),
-                          pc->orig_col, next->orig_col, pc->orig_col_end);
-                  column = pc->column + (next->orig_col - pc->orig_col_end);
-               }
-               else
-               {
-                  /*
-                   * If there was a space, we need to force one, otherwise
-                   * try to keep the comment in the same column.
-                   */
-                  size_t col_min = pc->column + pc->len() + ((next->orig_prev_sp > 0) ? 1 : 0);
-                  column = next->orig_col;
-
-                  if (column < col_min)
-                  {
-                     column = col_min;
-                  }
-                  LOG_FMT(LSPACE, "%s(%d): <relative set>", __func__, __LINE__);
-               }
-            }
-         }
-         next->column = column;
-
-         LOG_FMT(LSPACE, " rule = %s @ %zu => %zu\n",
-                 (av == IARF_IGNORE) ? "IGNORE" :
-                 (av == IARF_ADD) ? "ADD" :
-                 (av == IARF_REMOVE) ? "REMOVE" : "FORCE",
-                 column - prev_column, next->column);
-
-         if (restoreValues)    // guy 2015-09-22
-         {
-            restore_options_for_QT();
-         }
-      }
-      pc = next;
-
-      if (QT_SIGNAL_SLOT_found)
-      {
-         // flag the chunk for a second processing
-         chunk_flags_set(pc, PCF_IN_QT_MACRO);
-      }
-   }
-} // space_text
-
-
-void space_text_balance_nested_parens(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *first = chunk_get_head();
-
-   while (first != nullptr)
-   {
-      chunk_t *next = chunk_get_next(first);
-
-      if (next == nullptr)
-      {
-         break;
-      }
-
-      // if there are two successive opening parenthesis
-      if (  chunk_is_str(first, "(", 1)
-         && chunk_is_str(next, "(", 1))
-      {
-         // insert a space between them
-         space_add_after(first, 1);
-
-         // test after the closing parens   Issue #1703
-         chunk_t *closing = chunk_get_next_type(first, (c_token_t)(first->type + 1), first->level);
-
-         if (closing->orig_col == closing->prev->orig_col_end)
-         {
-            space_add_after(closing->prev, 1);
-         }
-      }
-      else if (  chunk_is_str(first, ")", 1)
-              && chunk_is_str(next, ")", 1))
-      {
-         // insert a space between the two closing parens
-         space_add_after(first, 1);
-
-         // test after the opening parens   Issue #1703
-         chunk_t *opening = chunk_get_prev_type(next, (c_token_t)(next->type - 1), next->level);
-
-         if (opening->orig_col_end == opening->next->orig_col)
-         {
-            space_add_after(opening, 1);
-         }
-      }
-      first = next;
-   }
-} // space_text_balance_nested_parens
-
-
-size_t space_needed(chunk_t *first, chunk_t *second)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPACE, "%s(%d)\n", __func__, __LINE__);
-
-   int min_sp;
-
-   switch (do_space_ensured(first, second, min_sp))
-   {
-   case IARF_ADD:
-   case IARF_FORCE:
-      return(max(1, min_sp));
-
-   case IARF_REMOVE:
-      return(0);
-
-   case IARF_IGNORE:
-   default:
-      return(second->orig_col > (first->orig_col + first->len()));
-   }
-}
-
-
-size_t space_col_align(chunk_t *first, chunk_t *second)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LSPACE, "%s(%d): first->orig_line is %zu, orig_col is %zu, [%s/%s], text() '%s' <==>\n",
-           __func__, __LINE__, first->orig_line, first->orig_col,
-           get_token_name(first->type), get_token_name(get_chunk_parent_type(first)),
-           first->text());
-   LOG_FMT(LSPACE, "%s(%d): second->orig_line is %zu, orig_col is %zu [%s/%s], text() '%s',",
-           __func__, __LINE__, second->orig_line, second->orig_col,
-           get_token_name(second->type), get_token_name(get_chunk_parent_type(second)),
-           second->text());
-   log_func_stack_inline(LSPACE);
-
-   int    min_sp;
-   iarf_e av = do_space_ensured(first, second, min_sp);
-
-   LOG_FMT(LSPACE, "%s(%d): av is %s\n", __func__, __LINE__, to_string(av));
-   size_t coldiff;
-
-   if (first->nl_count)
-   {
-      LOG_FMT(LSPACE, "%s(%d):    nl_count is %zu, orig_col_end is %zu\n", __func__, __LINE__, first->nl_count, first->orig_col_end);
-      coldiff = first->orig_col_end - 1;
-   }
-   else
-   {
-      LOG_FMT(LSPACE, "%s(%d):    len is %zu\n", __func__, __LINE__, first->len());
-      coldiff = first->len();
-   }
-   LOG_FMT(LSPACE, "%s(%d):    => coldiff is %zu\n", __func__, __LINE__, coldiff);
-
-   LOG_FMT(LSPACE, "%s(%d):    => av is %s\n", __func__, __LINE__,
-           (av == IARF_IGNORE) ? "IGNORE" :
-           (av == IARF_ADD) ? "ADD" :
-           (av == IARF_REMOVE) ? "REMOVE" : "FORCE");
-
-   switch (av)
-   {
-   case IARF_ADD:
-   case IARF_FORCE:
-      coldiff++;
-      break;
-
-   case IARF_REMOVE:
-      break;
-
-   case IARF_IGNORE:                // Issue #2064
-      LOG_FMT(LSPACE, "%s(%d):    => first->orig_line  is %zu\n", __func__, __LINE__, first->orig_line);
-      LOG_FMT(LSPACE, "%s(%d):    => second->orig_line is %zu\n", __func__, __LINE__, second->orig_line);
-      LOG_FMT(LSPACE, "%s(%d):    => first->text()     is '%s'\n", __func__, __LINE__, first->text());
-      LOG_FMT(LSPACE, "%s(%d):    => second->text()    is '%s'\n", __func__, __LINE__, second->text());
-      LOG_FMT(LSPACE, "%s(%d):    => first->orig_col   is %zu\n", __func__, __LINE__, first->orig_col);
-      LOG_FMT(LSPACE, "%s(%d):    => second->orig_col  is %zu\n", __func__, __LINE__, second->orig_col);
-      LOG_FMT(LSPACE, "%s(%d):    => first->len()      is %zu\n", __func__, __LINE__, first->len());
-
-      if (  first->orig_line == second->orig_line
-         && second->orig_col > (first->orig_col + first->len()))
-      {
-         coldiff++;
-      }
-      break;
-
-   default:
-      // If we got here, something is wrong...
-      break;
-   }
-   LOG_FMT(LSPACE, "%s(%d):    => coldiff is %zu\n", __func__, __LINE__, coldiff);
-   return(coldiff);
-} // space_col_align
-
-
-void space_add_after(chunk_t *pc, size_t count)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *next = chunk_get_next(pc);
-
-   // don't add at the end of the file or before a newline
-   if (  next == nullptr
-      || chunk_is_newline(next))
-   {
-      return;
-   }
-
-   // Limit to 16 spaces
-   if (count > 16)
-   {
-      count = 16;
-   }
-
-   // Two CT_SPACE in a row -- use the max of the two
-   if (chunk_is_token(next, CT_SPACE))
-   {
-      if (next->len() < count)
-      {
-         while (next->len() < count)
-         {
-            next->str.append(' ');
-         }
-      }
-      return;
-   }
-   chunk_t sp;
-
-   set_chunk_type(&sp, CT_SPACE);
-   sp.flags = pc->flags & PCF_COPY_FLAGS;
-   sp.str   = "                ";       // 16 spaces
-   sp.str.resize(count);
-   sp.level       = pc->level;
-   sp.brace_level = pc->brace_level;
-   sp.pp_level    = pc->pp_level;
-   sp.column      = pc->column + pc->len();
-   sp.orig_line   = pc->orig_line;
-   sp.orig_col    = pc->orig_col;
-
-   chunk_add_after(&sp, pc);
-} // space_add_after
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.h
deleted file mode 100644
index e856f135..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file space.h
- * prototypes for space.cpp
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef SPACE_H_INCLUDED
-#define SPACE_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * Marches through the whole file and checks to see how many spaces should be
- * between two chunks
- */
-void space_text(void);
-
-
-//! Marches through the whole file and adds spaces around nested parenthesis
-void space_text_balance_nested_parens(void);
-
-
-//! Determines if a space is required between two chunks
-size_t space_needed(chunk_t *first, chunk_t *second);
-
-
-/**
- * Calculates the column difference between two chunks.
- * The rules are bent a bit here, as IARF_IGNORE and IARF_ADD become IARF_FORCE.
- * So the column difference is either first->len or first->len + 1.
- *
- * @param first   The first chunk
- * @param second  The second chunk
- *
- * @return the column difference between the two chunks
- */
-size_t space_col_align(chunk_t *first, chunk_t *second);
-
-
-void space_add_after(chunk_t *pc, size_t count);
-
-
-#endif /* SPACE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/symbols_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/symbols_table.h
deleted file mode 100644
index 1a864478..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/symbols_table.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @file symbols
- * Manages the table of punctuators.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-/**
- *
- *   Contet of the generated "punctuator_table.h" file is based off this.
- *
- *   NOTE: the tables below do not need to be sorted.
- */
-
-// 6-char symbols
-static const chunk_tag_t symbols6[] =
-{
-   { R"_(??(??))_", CT_TSQUARE, LANG_C | LANG_CPP | LANG_OC | FLAG_DIG }, // trigraph []
-   { R"_(??!??!)_", CT_BOOL,    LANG_C | LANG_CPP | LANG_OC | FLAG_DIG }, // trigraph ||
-   { R"_(??=??=)_", CT_PP,      LANG_C | LANG_CPP | LANG_OC | FLAG_DIG }, // trigraph ##
-};
-
-/* 5-char symbols */
-static const chunk_tag_t symbols5[] =
-{
-   { R"_(??!=)_", CT_ASSIGN, LANG_C | LANG_CPP | LANG_OC | FLAG_DIG }, // trigraph |=
-   { R"_(??'=)_", CT_ASSIGN, LANG_C | LANG_CPP | LANG_OC | FLAG_DIG }, // trigraph ^=
-   { R"_(??=@)_", CT_POUND,  LANG_C | LANG_CPP | LANG_OC | FLAG_DIG }, // trigraph #@ MS extension
-};
-
-/* 4-char symbols */
-static const chunk_tag_t symbols4[] =
-{
-   { "!<>=",      CT_COMPARE, LANG_D                                 },
-   { ">>>=",      CT_ASSIGN,  LANG_D | LANG_JAVA | LANG_PAWN         },
-   { R"_(<::>)_", CT_TSQUARE, LANG_C | LANG_CPP | LANG_OC | FLAG_DIG },   // digraph []
-   { R"_(%:%:)_", CT_PP,      LANG_C | LANG_CPP | LANG_OC | FLAG_DIG },   // digraph ##
-};
-
-// 3-char symbols
-static const chunk_tag_t symbols3[] =
-{
-   { "!<=",      CT_COMPARE,      LANG_D                                                       },
-   { "!<>",      CT_COMPARE,      LANG_D                                                       },
-   { "!==",      CT_COMPARE,      LANG_D | LANG_ECMA                                           },
-   { "!>=",      CT_COMPARE,      LANG_D                                                       },
-   { "<=>",      CT_COMPARE,      LANG_CPP                                                     },
-   { "->*",      CT_MEMBER,       LANG_C | LANG_CPP | LANG_OC | LANG_D                         },
-   { "...",      CT_ELLIPSIS,     LANG_C | LANG_CPP | LANG_OC | LANG_D | LANG_PAWN | LANG_JAVA },
-   { "<<=",      CT_ASSIGN,       LANG_ALL                                                     },
-   { "<>=",      CT_COMPARE,      LANG_D                                                       },
-   { "===",      CT_COMPARE,      LANG_D | LANG_ECMA                                           },
-   { ">>=",      CT_ASSIGN,       LANG_ALL                                                     },
-   { ">>>",      CT_ARITH,        LANG_D | LANG_JAVA | LANG_PAWN | LANG_ECMA                   },
-   { "%:@",      CT_POUND,        LANG_C | LANG_CPP | LANG_OC                                  },           // digraph  #@ MS extension
-   { R"_(??=)_", CT_POUND,        LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph #
-   { R"_(??=)_", CT_COMPARE,      LANG_CS                                                      },           // cs: Null-Coalescing Assignment Operator
-   { R"_(??()_", CT_SQUARE_OPEN,  LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph [
-   { R"_(??))_", CT_SQUARE_CLOSE, LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph ]
-   { R"_(??')_", CT_CARET,        LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph ^
-   { R"_(??<)_", CT_BRACE_OPEN,   LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph {
-   { R"_(??>)_", CT_BRACE_CLOSE,  LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph }
-   { R"_(??-)_", CT_INV,          LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph ~
-   { R"_(??!)_", CT_ARITH,        LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       },           // trigraph |
-};
-// { R"_(??/)_", CT_UNKNOWN,      LANG_C | LANG_CPP | LANG_OC | FLAG_DIG                       }, // trigraph '\'
-
-// 2-char symbols
-static const chunk_tag_t symbols2[] =
-{
-   { "!<",      CT_COMPARE,      LANG_D                                 },                     // 0
-   { "!=",      CT_COMPARE,      LANG_ALL                               },                     // 1
-   { "!>",      CT_COMPARE,      LANG_D                                 },                     // 2
-   { "!~",      CT_COMPARE,      LANG_D                                 },                     // 3
-   { "##",      CT_PP,           LANG_C | LANG_CPP | LANG_OC            },                     // 4
-   { "#@",      CT_POUND,        LANG_C | LANG_CPP | LANG_OC            },                     // MS extension
-   { "%=",      CT_ASSIGN,       LANG_ALL                               },                     // 6
-   { "&&",      CT_BOOL,         LANG_ALL                               },                     // 7
-   { "&=",      CT_ASSIGN,       LANG_ALL                               },                     // 8
-   { "*=",      CT_ASSIGN,       LANG_ALL                               },                     // 9
-   { "++",      CT_INCDEC_AFTER, LANG_ALL                               },                     // 10
-   { "+=",      CT_ASSIGN,       LANG_ALL                               },                     // 11
-   { "--",      CT_INCDEC_AFTER, LANG_ALL                               },                     // 12
-   { "-=",      CT_ASSIGN,       LANG_ALL                               },                     // 13
-   { "->",      CT_MEMBER,       LANG_ALLC                              },                     // 14
-   { ".*",      CT_MEMBER,       LANG_C | LANG_CPP | LANG_OC | LANG_D   },                     // 15
-   { "..",      CT_RANGE,        LANG_D                                 },                     // 16
-   { "?.",      CT_NULLCOND,     LANG_CS                                },                     // null conditional operator
-   { "/=",      CT_ASSIGN,       LANG_ALL                               },                     // 18
-   { "::",      CT_DC_MEMBER,    LANG_ALLC                              },                     // 19
-   { "<<",      CT_SHIFT,        LANG_ALL                               },                     // 20
-   { "<=",      CT_COMPARE,      LANG_ALL                               },                     // 21
-   { "<>",      CT_COMPARE,      LANG_D                                 },                     // 22
-   { "==",      CT_COMPARE,      LANG_ALL                               },                     // 23
-   { ">=",      CT_COMPARE,      LANG_ALL                               },                     // 24
-   { ">>",      CT_SHIFT,        LANG_ALL                               },                     // 25
-   { "[]",      CT_TSQUARE,      LANG_ALL                               },                     // 26
-   { "^=",      CT_ASSIGN,       LANG_ALL                               },                     // 27
-   { "|=",      CT_ASSIGN,       LANG_ALL                               },                     // 28
-   { "||",      CT_BOOL,         LANG_ALL                               },                     // 29
-   { "~=",      CT_COMPARE,      LANG_D                                 },                     // 30
-   { "~~",      CT_COMPARE,      LANG_D                                 },                     // 31
-   { "=>",      CT_LAMBDA,       LANG_VALA | LANG_CS | LANG_D           },                     // 32
-   { "??",      CT_COMPARE,      LANG_CS | LANG_VALA                    },                     // 33
-   { R"_(<%)_", CT_BRACE_OPEN,   LANG_C | LANG_CPP | LANG_OC | FLAG_DIG },                     // digraph {
-   { R"_(%>)_", CT_BRACE_CLOSE,  LANG_C | LANG_CPP | LANG_OC | FLAG_DIG },                     // digraph }
-   { R"_(<:)_", CT_SQUARE_OPEN,  LANG_C | LANG_CPP | LANG_OC | FLAG_DIG },                     // digraph [
-   { R"_(:>)_", CT_SQUARE_CLOSE, LANG_C | LANG_CPP | LANG_OC | FLAG_DIG },                     // digraph ]
-   { R"_(%:)_", CT_POUND,        LANG_C | LANG_CPP | LANG_OC | FLAG_DIG },                     // digraph #
-};
-
-// *INDENT-OFF*
-// 1-char symbols
-static const chunk_tag_t symbols1[] =
-{
-   { R"_()_", CT_FORM_FEED,    LANG_ALL                            },
-   { "!",       CT_NOT,          LANG_ALL                            },
-   { "#",       CT_POUND,        LANG_ALL & ~(LANG_JAVA | LANG_ECMA) },
-   { "$",       CT_COMPARE,      LANG_D                              },
-   { "%",       CT_ARITH,        LANG_ALL                            },
-   { "&",       CT_AMP,          LANG_ALL                            },
-   { "(",       CT_PAREN_OPEN,   LANG_ALL                            },
-   { ")",       CT_PAREN_CLOSE,  LANG_ALL                            },
-   { "*",       CT_STAR,         LANG_ALL                            },
-   { "+",       CT_PLUS,         LANG_ALL                            },
-   { ",",       CT_COMMA,        LANG_ALL                            },
-   { "-",       CT_MINUS,        LANG_ALL                            },
-   { ".",       CT_DOT,          LANG_ALL                            },
-   { "/",       CT_ARITH,        LANG_ALL                            },
-   { ":",       CT_COLON,        LANG_ALL                            },
-   { ";",       CT_SEMICOLON,    LANG_ALL                            },
-   { "<",       CT_ANGLE_OPEN,   LANG_ALL                            },
-   { "=",       CT_ASSIGN,       LANG_ALL                            },
-   { ">",       CT_ANGLE_CLOSE,  LANG_ALL                            },
-   { "@",       CT_OC_AT,        LANG_OC                             },
-   { "?",       CT_QUESTION,     LANG_ALL                            },
-   { "[",       CT_SQUARE_OPEN,  LANG_ALL                            },
-   { "]",       CT_SQUARE_CLOSE, LANG_ALL                            },
-   { "^",       CT_CARET,        LANG_ALL                            },
-   { "{",       CT_BRACE_OPEN,   LANG_ALL                            },
-   { "|",       CT_ARITH,        LANG_ALL                            },
-   { "}",       CT_BRACE_CLOSE,  LANG_ALL                            },
-   { "~",       CT_INV,          LANG_ALL                            },
-};
-// *INDENT-ON*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/token_enum.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/token_enum.h
deleted file mode 100644
index 81caf0d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/token_enum.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/**
- * @file token_enum.h
- * List of the different tokens used in the program.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015
- * @license GPL v2+
- */
-
-#ifndef TOKEN_ENUM_H_INCLUDED
-#define TOKEN_ENUM_H_INCLUDED
-
-/**
- * abbreviations used:
- * CT = chunk type
- */
-
-
-/**
- * This is an enum of all the different chunks/tokens/elements that the
- * program can work with. The parser and scanner assigns one of these to
- * each chunk/token.
- */
-enum c_token_t
-{
-   CT_NONE,
-   CT_PARENT_NOT_SET,
-   CT_EOF,
-   CT_UNKNOWN,
-
-   CT_JUNK,          // junk collected when parsing is disabled
-
-   CT_WHITESPACE,    // whitespace without any newlines
-   CT_SPACE,         // a fixed number of spaces to support weird spacing rules
-   CT_NEWLINE,       // CRA, one or more newlines
-   CT_NL_CONT,       // CRA, backslash-newline
-   CT_FORM_FEED,     // character 12
-   CT_COMMENT_CPP,   // C++ comment (always followed by CT_NEWLINE)
-   CT_COMMENT,       // C-comment, single line
-   CT_COMMENT_MULTI, // Multi-lined comment
-   CT_COMMENT_EMBED, // comment parent_type: non-newline before and after
-   CT_COMMENT_START, // comment parent_type: newline before
-   CT_COMMENT_END,   // comment parent_type: newline after
-   CT_COMMENT_WHOLE, // comment parent_type: newline before and after
-   CT_COMMENT_ENDIF, // C-comment, single line, after ENDIF
-
-   CT_IGNORED,       // a chunk of ignored text
-
-   CT_WORD,          // variable, type, function name, etc
-   CT_NUMBER,
-   CT_NUMBER_FP,
-   CT_STRING,        // quoted string "hi" or 'a' or <in> for include
-   CT_STRING_MULTI,  // quoted string with embedded newline
-   CT_IF,            // built-in keywords
-   CT_ELSE,
-   CT_ELSEIF,
-   CT_CONSTEXPR,     // only when preceded by 'if' (otherwise CT_QUALIFIER)
-   CT_FOR,
-   CT_WHILE,
-   CT_WHILE_OF_DO,
-   CT_SWITCH,
-   CT_CASE,
-   CT_DO,
-   CT_SYNCHRONIZED,
-   CT_VOLATILE,
-   CT_TYPEDEF,
-   CT_STRUCT,
-   CT_ENUM,
-   CT_ENUM_CLASS,
-   CT_SIZEOF,
-   CT_DECLTYPE,
-   CT_RETURN,
-   CT_BREAK,
-   CT_UNION,
-   CT_GOTO,
-   CT_CONTINUE,
-   CT_C_CAST,              // C-style cast:   "(int)5.6"
-   CT_CPP_CAST,            // C++-style cast: "int(5.6)"
-   CT_D_CAST,              // D-style cast:   "cast(type)" and "const(type)"
-   CT_TYPE_CAST,           // static_cast<type>(exp)
-   CT_TYPENAME,            // typename type
-   CT_TEMPLATE,            // template<...>
-   CT_WHERE_SPEC,          // 'where' : used in C# generic constraint
-
-   CT_ASSIGN,              // =, +=, /=, etc
-   CT_ASSIGN_NL,           // Assign followed by a newline - fake item for indenting
-   CT_SASSIGN,             // 'and_eq'
-
-   CT_ASSIGN_DEFAULT_ARG,  // Default argument such as
-                           // Foo( int Foo = 5 );
-   CT_ASSIGN_FUNC_PROTO,   // function prototype modifier such as
-                           // void* operator new(std::size_t) = delete;
-                           // Foo( const Foo & ) = default;
-                           // Foo( const Foo & ) = 0;
-
-   CT_COMPARE,             // ==, !=, <=, >=
-   CT_SCOMPARE,            // compare op that is a string 'is', 'neq'
-   CT_BOOL,                // || or &&
-   CT_SBOOL,               // or, and
-   CT_ARITH,               // +, -, /, etc
-   CT_SARITH,              // 'not', 'xor'
-   CT_SHIFT,               // <<, >>
-   CT_CARET,               // ^
-   CT_DEREF,               // * dereference
-   CT_INCDEC_BEFORE,       // ++a or --a
-   CT_INCDEC_AFTER,        // a++ or a--
-   CT_MEMBER,              // . or ->
-   CT_DC_MEMBER,           // ::
-   CT_C99_MEMBER,          // . in structure stuff
-   CT_INV,                 // ~
-   CT_DESTRUCTOR,          // ~
-   CT_NOT,                 // !
-   CT_D_TEMPLATE,          // ! as in Foo!(A)
-   CT_ADDR,                // &
-   CT_NEG,                 // - as in -1
-   CT_POS,                 // + as in +1
-   CT_STAR,                // * : raw char to be changed
-   CT_PLUS,                // + : raw char to be changed
-   CT_MINUS,               // - : raw char to be changed
-   CT_AMP,                 // & : raw char to be changed
-   CT_BYREF,               // & in function def/proto params
-
-   // CT_BITWISE_AND,         // &   // is a CT_ARITH
-   // CT_BITWISE_OR,          // |   // is a CT_ARITH
-   // CT_BITWISE_EXCLUSIVE_OR,// ^   // is a CT_ARITH
-   // CT_BITWISE_NOT,         // ~   // is a CT_ARITH
-
-   CT_POUND,               // #
-   CT_PREPROC,             // # at the start of a line
-   CT_PREPROC_INDENT,      // # at the start of a line that gets indented: #region
-   CT_PREPROC_BODY,        // body of every preproc EXCEPT #define
-   CT_PP,                  // ##
-   CT_ELLIPSIS,            // ...
-   CT_RANGE,               // ..
-   CT_NULLCOND,            // ?.
-
-   CT_SEMICOLON,
-   CT_VSEMICOLON,          // virtual semicolon for PAWN
-   CT_COLON,
-   CT_ASM_COLON,
-   CT_CASE_COLON,
-   CT_CASE_ELLIPSIS,       // '...' in `case 1 ... 5`:
-   CT_CLASS_COLON,         // colon after a class def
-   CT_CONSTR_COLON,        // colon after a constructor
-   CT_D_ARRAY_COLON,       // D named array initializer colon
-   CT_COND_COLON,          // conditional colon in  'b ? t : f'
-   CT_WHERE_COLON,         // C# where-constraint colon (after the type)
-   CT_QUESTION,
-   CT_COMMA,
-
-   CT_ASM,
-   CT_ATTRIBUTE,
-   CT_AUTORELEASEPOOL,     // OC: Autorelease Pool Blocks, used by iOS
-   CT_OC_AVAILABLE,
-   CT_OC_AVAILABLE_VALUE,
-   CT_CATCH,
-   CT_WHEN,
-   CT_WHERE,            // C# where clause
-   CT_CLASS,
-   CT_DELETE,
-   CT_EXPORT,
-   CT_FRIEND,
-   CT_NAMESPACE,
-   CT_PACKAGE,
-   CT_NEW,              // may turn into CT_PBRACED if followed by a '('
-   CT_OPERATOR,
-   CT_OPERATOR_VAL,
-   CT_ASSIGN_OPERATOR,  // the value after 'operator' such as:
-                        // Foo &operator= ( const Foo & );
-   CT_ACCESS,
-   CT_ACCESS_COLON,
-   CT_THROW,
-   CT_NOEXCEPT,
-   CT_TRY,
-   CT_BRACED_INIT_LIST,
-   CT_USING,
-   CT_USING_STMT,       // using (xxx) ...
-   CT_USING_ALIAS,      // using identifier attr(optional) = type-id
-   CT_D_WITH,           // D: parenthetis+braced
-   CT_D_MODULE,
-   CT_SUPER,
-   CT_DELEGATE,
-   CT_BODY,
-   CT_DEBUG,
-   CT_DEBUGGER,
-   CT_INVARIANT,
-   CT_UNITTEST,
-   CT_UNSAFE,
-   CT_FINALLY,
-   CT_FIXED,            // C# fixed
-   CT_IMPORT,
-   CT_D_SCOPE,
-   CT_D_SCOPE_IF,
-   CT_LAZY,
-   CT_D_MACRO,
-   CT_D_VERSION,        // turns into CT_D_VERSION_IF if not followed by '='
-   CT_D_VERSION_IF,     // version(x) { }
-
-   // note for parenthetis/brace/square pairs: close MUST be open + 1
-   CT_PAREN_OPEN,
-   CT_PAREN_CLOSE,
-
-   CT_ANGLE_OPEN,       // template<T*>
-   CT_ANGLE_CLOSE,
-
-   CT_SPAREN_OPEN,      // 'special' parenthetis after if/for/switch/while/synchronized/catch
-   CT_SPAREN_CLOSE,
-
-   CT_PPAREN_OPEN,      // 'protect' parenthetis to protect a type such as (*int)
-   CT_PPAREN_CLOSE,     // used at align_func_param
-
-   CT_FPAREN_OPEN,      // 'function' parenthetis after fcn/macro fcn
-   CT_FPAREN_CLOSE,
-
-   CT_LPAREN_OPEN,      // lambda-declarator parenthetis
-   CT_LPAREN_CLOSE,
-
-   CT_TPAREN_OPEN,      // 'type' parenthetis used in function types
-   CT_TPAREN_CLOSE,
-
-   CT_BRACE_OPEN,       // {...}
-   CT_BRACE_CLOSE,
-
-   CT_VBRACE_OPEN,      // virtual brace, i.e. brace inserted by uncrustify
-   CT_VBRACE_CLOSE,
-
-   CT_SQUARE_OPEN,      // [...]
-   CT_SQUARE_CLOSE,
-
-   CT_TSQUARE,          // special case of []
-
-   CT_MACRO_OPEN,       // stuff specified via custom-pair
-   CT_MACRO_CLOSE,
-   CT_MACRO_ELSE,
-
-   // aggregate types
-   CT_LABEL,              // a non-case label
-   CT_LABEL_COLON,        // the colon for a label
-   CT_FUNCTION,           // function - unspecified, call mark_function()
-   CT_FUNC_CALL,          // function call
-   CT_FUNC_CALL_USER,     // function call (special user)
-   CT_FUNC_DEF,           // function definition/implementation
-   CT_FUNC_TYPE,          // function type - foo in "typedef void (*foo)(void)"
-   CT_FUNC_VAR,           // foo and parent type of first parens in "void (*foo)(void)"
-   CT_FUNC_PROTO,         // function prototype
-   CT_FUNC_START,         // global DC member for functions(void ::func())
-   CT_FUNC_CLASS_DEF,     // ctor or dtor for a class
-   CT_FUNC_CLASS_PROTO,   // ctor or dtor for a class
-   CT_FUNC_CTOR_VAR,      // variable or class initialization
-   CT_FUNC_WRAP,          // macro that wraps the function name
-   CT_PROTO_WRAP,         // macro: "RETVAL PROTO_WRAP( fcn_name, (PARAMS))". Parens for PARAMS are optional.
-   CT_MACRO_FUNC,         // function-like macro
-   CT_MACRO_FUNC_CALL,    // function-like macro call
-   CT_MACRO,              // a macro def
-   CT_QUALIFIER,          // static, const, etc
-   CT_EXTERN,             // extern
-   CT_DECLSPEC,           // __declspec
-   CT_ALIGN,              // paren'd qualifier: align(4) struct a { }
-   CT_TYPE,
-   CT_PTR_TYPE,           // a '*' as part of a type
-   CT_TYPE_WRAP,          // macro that wraps a type name
-   CT_CPP_LAMBDA,         // parent for '[=](...){...}'
-   CT_CPP_LAMBDA_RET,     // '->' in '[=](...) -> type {...}'
-   CT_EXECUTION_CONTEXT,  // Keyword for use in lambda statement: [] CT_EXECUTION_CONTEXT ()->{}
-   CT_TRAILING_RET,       // '->' in 'auto fname(...) -> type;'
-                          // '->' in 'auto fname(...) const -> type;'
-   CT_BIT_COLON,          // a ':' in a variable declaration
-
-   CT_OC_DYNAMIC,
-   CT_OC_END,           // ObjC: @end
-   CT_OC_IMPL,          // ObjC: @implementation
-   CT_OC_INTF,          // ObjC: @interface
-   CT_OC_PROTOCOL,      // ObjC: @protocol or @protocol()
-   CT_OC_PROTO_LIST,    // ObjC: protocol list < > (parent token only)
-   CT_OC_GENERIC_SPEC,  // ObjC: specification of generic  < >
-   CT_OC_PROPERTY,      // ObjC: @property
-   CT_OC_CLASS,         // ObjC: the name after @interface or @implementation
-   CT_OC_CLASS_EXT,     // ObjC: a pair of empty parens after the class name in a @interface or @implementation
-   CT_OC_CATEGORY,      // ObjC: the category name in parens after the class name in a @interface or @implementation
-   CT_OC_SCOPE,         // ObjC: the '-' or '+' in '-(void) func: (int) i;'
-   CT_OC_MSG,           // ObjC: parent type to '[', ']' and ';' in '[class func : param name: param];'
-   CT_OC_MSG_CLASS,     // ObjC: 'class' in  '[class func : param name: param];' (see also PCF_IN_OC_MSG)
-   CT_OC_MSG_FUNC,      // ObjC: 'func' in  '[class func : param name: param];' (see also PCF_IN_OC_MSG)
-   CT_OC_MSG_NAME,      // ObjC: 'name' in  '[class func : param name: param];' (see also PCF_IN_OC_MSG)
-   CT_OC_MSG_SPEC,      // ObjC: msg spec '-(void) func: (int) i;'
-   CT_OC_MSG_DECL,      // ObjC: msg decl '-(void) func: (int) i { }'
-   CT_OC_RTYPE,         // ObjC: marks parens of the return type after scope
-   CT_OC_ATYPE,         // ObjC: marks parens of the arg type after scope
-   CT_OC_COLON,         // ObjC: the colon in a msg spec
-   CT_OC_DICT_COLON,    // ObjC: colon in dictionary constant: "KEY: VALUE"
-   CT_OC_SEL,           // ObjC: @selector
-   CT_OC_SEL_NAME,      // ObjC: selector name
-   CT_OC_BLOCK,         // ObjC: block parent type.
-   CT_OC_BLOCK_ARG,     // ObjC: block arguments parent type.
-   CT_OC_BLOCK_TYPE,    // ObjC: block declaration parent type, e.g. mainly the '(^block_t)' in 'void (^block_t)(int arg);'
-   CT_OC_BLOCK_EXPR,    // ObjC: block expression with arg: '^(int arg) { arg++; };' and without (called a block literal): '^{ ... };'
-   CT_OC_BLOCK_CARET,   // ObjC: block pointer caret: '^'
-   CT_OC_AT,            // ObjC: boxed constants using '@'
-   CT_OC_PROPERTY_ATTR, // ObjC: property attribute (strong, weak, readonly, etc...)
-
-   // start PP types
-   CT_PP_DEFINE,        // #define
-   CT_PP_DEFINED,       // #if defined
-   CT_PP_INCLUDE,       // #include
-   CT_PP_IF,            // #if, #ifdef, or #ifndef
-   CT_PP_ELSE,          // #else or #elif
-   CT_PP_ENDIF,         // #endif
-   CT_PP_ASSERT,
-   CT_PP_EMIT,
-   CT_PP_ENDINPUT,
-   CT_PP_ERROR,
-   CT_PP_FILE,
-   CT_PP_LINE,
-   CT_PP_SECTION,
-   CT_PP_ASM,           // start of assembly code section
-   CT_PP_UNDEF,
-   CT_PP_PROPERTY,
-
-   CT_PP_BODYCHUNK,     // everything after this gets put in CT_PREPROC_BODY
-
-   CT_PP_PRAGMA,        // pragma's should not be altered
-   CT_PP_REGION,        // C# #region
-   CT_PP_ENDREGION,     // C# #endregion
-   CT_PP_REGION_INDENT, // Dummy token for indenting a C# #region
-   CT_PP_IF_INDENT,     // Dummy token for indenting a #if stuff
-   CT_PP_IGNORE,        // Dummy token for ignoring a certain preprocessor directive (do not do any processing)
-   CT_PP_OTHER,         // #line, #error, #pragma, etc
-   // end PP types
-
-   // PAWN stuff
-   CT_CHAR,
-   CT_DEFINED,
-   CT_FORWARD,
-   CT_NATIVE,
-   CT_STATE,
-   CT_STOCK,
-   CT_TAGOF,
-   CT_DOT,
-   CT_TAG,
-   CT_TAG_COLON,
-
-   // C-sharp
-   CT_LOCK,             // lock/unlock
-   CT_AS,
-   CT_IN,               // "foreach (T c in x)" or "foo(in char c)" or "in { ..."
-   CT_BRACED,           // simple braced items: try {}
-   CT_THIS,             // may turn into CT_PBRACED if followed by a '('
-   CT_BASE,             // C# thingy
-   CT_DEFAULT,          // may be changed into CT_CASE
-   CT_GETSET,           // must be followed by CT_BRACE_OPEN or reverts to CT_WORD
-   CT_GETSET_EMPTY,     // get/set/add/remove followed by a semicolon
-   CT_CONCAT,           // The '~' between strings
-   CT_CS_SQ_STMT,       // '[assembly: xxx]' or '[Attribute()]' or '[Help()]', etc
-   CT_CS_SQ_COLON,      // the colon in one of those [] thingys
-   CT_CS_PROPERTY,      // word or ']' followed by '{'
-
-   // Embedded SQL - always terminated with a semicolon
-   CT_SQL_EXEC,         // the 'EXEC' in 'EXEC SQL ...'
-   CT_SQL_BEGIN,        // the 'BEGINN' in 'EXEC SQL BEGIN ...'
-   CT_SQL_END,          // the 'END' in 'EXEC SQL END ...'
-   CT_SQL_WORD,         // CT_WORDs in the 'EXEC SQL' statement
-   CT_SQL_ASSIGN,       // :=
-
-   // Vala stuff
-   CT_CONSTRUCT,        // braced "construct { }" or qualifier "(construct int x)"
-   CT_LAMBDA,
-
-   // Java
-   CT_ASSERT,       // assert EXP1 [ : EXP2 ] ;
-   CT_ANNOTATION,   // @interface or @something(...)
-   CT_FOR_COLON,    // colon in "for ( TYPE var: EXPR ) { ... }"
-   CT_DOUBLE_BRACE, // parent for double brace
-
-   /* Clang */
-   CT_CNG_HASINC,   // Clang: __has_include()
-   CT_CNG_HASINCN,  // Clang: __has_include_next()
-
-   // extensions for Qt macros
-   CT_Q_EMIT,       // guy 2015-10-16
-   CT_Q_FOREACH,    // guy 2015-09-23
-   CT_Q_FOREVER,    // guy 2015-10-18
-   CT_Q_GADGET,     // guy 2016-05-04
-   CT_Q_OBJECT,     // guy 2015-10-16
-
-   // Machine Modes
-   CT_MODE,         // guy 2016-03-11
-   CT_DI,           // guy 2016-03-11
-   CT_HI,           // guy 2016-03-11
-   CT_QI,           // guy 2016-03-11
-   CT_SI,           // guy 2016-03-11
-   CT_NOTHROW,      // guy 2016-03-11
-   CT_WORD_,        // guy 2016-03-11
-
-   CT_TOKEN_COUNT_  // NOTE: Keep this the last entry because it's used as a counter.
-};
-
-#endif /* TOKEN_ENUM_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.cpp
deleted file mode 100644
index f0a4e2d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.cpp
+++ /dev/null
@@ -1,2866 +0,0 @@
-/**
- * @file tokenize.cpp
- * This file breaks up the text stream into tokens or chunks.
- *
- * Each routine needs to set pc.len and pc.type.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "tokenize.h"
-
-#include "keywords.h"
-#include "prototypes.h"
-#include "punctuators.h"
-#include "unc_ctype.h"
-
-#include <regex>
-
-#ifdef WIN32
-#include <stack>            // to get std::stack
-#endif // WIN32
-
-
-#define LE_COUNT(x)    cpd.le_counts[static_cast<size_t>(LE_ ## x)]
-
-constexpr static auto LCURRENT = LTOK;
-
-using namespace std;
-using namespace uncrustify;
-
-
-struct tok_info
-{
-   tok_info()
-      : last_ch(0)
-      , idx(0)
-      , row(1)
-      , col(1)
-   {
-   }
-
-   size_t last_ch;
-   size_t idx;
-   size_t row;
-   size_t col;
-};
-
-
-struct tok_ctx
-{
-   tok_ctx(const deque<int> &d)
-      : data(d)
-   {
-   }
-
-
-   //! save before trying to parse something that may fail
-   void save()
-   {
-      save(s);
-   }
-
-
-   void save(tok_info &info)
-   {
-      info = c;
-   }
-
-
-   //! restore previous saved state
-   void restore()
-   {
-      restore(s);
-   }
-
-
-   void restore(const tok_info &info)
-   {
-      c = info;
-   }
-
-
-   bool more()
-   {
-      return(c.idx < data.size());
-   }
-
-
-   size_t peek()
-   {
-      return(more() ? data[c.idx] : 0);
-   }
-
-
-   size_t peek(size_t idx)
-   {
-      idx += c.idx;
-      return((idx < data.size()) ? data[idx] : 0);
-   }
-
-
-   size_t get()
-   {
-      if (more())
-      {
-         size_t ch = data[c.idx++];
-
-         switch (ch)
-         {
-         case '\t':
-            log_rule_B("input_tab_size");
-            c.col = calc_next_tab_column(c.col, options::input_tab_size());
-            break;
-
-         case '\n':
-
-            if (c.last_ch != '\r')
-            {
-               c.row++;
-               c.col = 1;
-            }
-            break;
-
-         case '\r':
-            c.row++;
-            c.col = 1;
-            break;
-
-         default:
-            c.col++;
-            break;
-         }
-         c.last_ch = ch;
-         return(ch);
-      }
-      return(0);
-   }
-
-
-   bool expect(size_t ch)
-   {
-      if (peek() == ch)
-      {
-         get();
-         return(true);
-      }
-      return(false);
-   }
-
-
-   const deque<int> &data;
-   tok_info         c; //! current
-   tok_info         s; //! saved
-};
-
-
-/**
- * Count the number of characters in a quoted string.
- * The next bit of text starts with a quote char " or ' or <.
- * Count the number of characters until the matching character.
- *
- * @param pc  The structure to update, str is an input.
- *
- * @return Whether a string was parsed
- */
-static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow_escape);
-
-
-/**
- * Literal string, ends with single "
- * Two "" don't end the string.
- *
- * @param pc  The structure to update, str is an input.
- *
- * @return Whether a string was parsed
- */
-static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc);
-
-
-/**
- * VALA verbatim string, ends with three quotes (""")
- *
- * @param pc  The structure to update, str is an input.
- */
-static void parse_verbatim_string(tok_ctx &ctx, chunk_t &pc);
-
-
-static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t len);
-
-
-/**
- * Parses a C++0x 'R' string. R"( xxx )" R"tag(  )tag" u8R"(x)" uR"(x)"
- * Newlines may be in the string.
- *
- * @param pc  structure to update, str is an input.
- */
-static bool parse_cr_string(tok_ctx &ctx, chunk_t &pc, size_t q_idx);
-
-
-/**
- * Count the number of whitespace characters.
- *
- * @param pc  The structure to update, str is an input.
- *
- * @return Whether whitespace was parsed
- */
-static bool parse_whitespace(tok_ctx &ctx, chunk_t &pc);
-
-
-/**
- * Called when we hit a backslash.
- * If there is nothing but whitespace until the newline, then this is a
- * backslash newline
- *
- * @param pc  structure to update, str is an input
- */
-static bool parse_bs_newline(tok_ctx &ctx, chunk_t &pc);
-
-
-/**
- * Parses any number of tab or space chars followed by a newline.
- * Does not change pc.len if a newline isn't found.
- * This is not the same as parse_whitespace() because it only consumes until
- * a single newline is encountered.
- */
-static bool parse_newline(tok_ctx &ctx);
-
-
-/**
- * PAWN #define is different than C/C++.
- *   #define PATTERN REPLACEMENT_TEXT
- * The PATTERN may not contain a space or '[' or ']'.
- * A generic whitespace check should be good enough.
- * Do not change the pattern.
- *
- * @param pc  structure to update, str is an input
- */
-static void parse_pawn_pattern(tok_ctx &ctx, chunk_t &pc, c_token_t tt);
-
-
-static bool parse_ignored(tok_ctx &ctx, chunk_t &pc);
-
-
-/**
- * Skips the next bit of whatever and returns the type of block.
- *
- * pc.str is the input text.
- * pc.len in the output length.
- * pc.type is the output type
- * pc.column is output column
- *
- * @param pc  The structure to update, str is an input.
- * @param prev_pc  The previous structure
- *
- * @return true/false - whether anything was parsed
- */
-static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc);
-
-
-/**
- * Parses all legal D string constants.
- *
- * Quoted strings:
- *   r"Wysiwyg"      # WYSIWYG string
- *   x"hexstring"    # Hexadecimal array
- *   `Wysiwyg`       # WYSIWYG string
- *   'char'          # single character
- *   "reg_string"    # regular string
- *
- * Non-quoted strings:
- * \x12              # 1-byte hex constant
- * \u1234            # 2-byte hex constant
- * \U12345678        # 4-byte hex constant
- * \123              # octal constant
- * \&amp;            # named entity
- * \n                # single character
- *
- * @param pc  The structure to update, str is an input.
- *
- * @return Whether a string was parsed
- */
-static bool d_parse_string(tok_ctx &ctx, chunk_t &pc);
-
-
-/**
- * Figure of the length of the comment at text.
- * The next bit of text starts with a '/', so it might be a comment.
- * There are three types of comments:
- *  - C comments that start with  '/ *' and end with '* /'
- *  - C++ comments that start with //
- *  - D nestable comments '/+' '+/'
- *
- * @param pc  The structure to update, str is an input.
- *
- * @return Whether a comment was parsed
- */
-static bool parse_comment(tok_ctx &ctx, chunk_t &pc);
-
-
-/**
- * Figure of the length of the code placeholder at text, if present.
- * This is only for Xcode which sometimes inserts temporary code placeholder chunks, which in plaintext <#look like this#>.
- *
- * @param pc  The structure to update, str is an input.
- *
- * @return Whether a placeholder was parsed.
- */
-static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc);
-
-
-/**
- * Parse any attached suffix, which may be a user-defined literal suffix.
- * If for a string, explicitly exclude common format and scan specifiers, ie,
- * PRIx32 and SCNx64.
- */
-static void parse_suffix(tok_ctx &ctx, chunk_t &pc, bool forstring);
-
-
-//! check if a symbol holds a boolean value
-static bool is_bin(int ch);
-static bool is_bin_(int ch);
-
-
-//! check if a symbol holds a octal value
-static bool is_oct(int ch);
-static bool is_oct_(int ch);
-
-
-//! check if a symbol holds a decimal value;
-static bool is_dec(int ch);
-static bool is_dec_(int ch);
-
-
-//! check if a symbol holds a hexadecimal value
-static bool is_hex(int ch);
-static bool is_hex_(int ch);
-
-
-/**
- * Count the number of characters in the number.
- * The next bit of text starts with a number (0-9 or '.'), so it is a number.
- * Count the number of characters in the number.
- *
- * This should cover all number formats for all languages.
- * Note that this is not a strict parser. It will happily parse numbers in
- * an invalid format.
- *
- * For example, only D allows underscores in the numbers, but they are
- * allowed in all formats.
- *
- * @param[in,out] pc  The structure to update, str is an input.
- *
- * @return Whether a number was parsed
- */
-static bool parse_number(tok_ctx &ctx, chunk_t &pc);
-
-
-static bool d_parse_string(tok_ctx &ctx, chunk_t &pc)
-{
-   size_t ch = ctx.peek();
-
-   if (  ch == '"'
-      || ch == '\'')
-   {
-      return(parse_string(ctx, pc, 0, true));
-   }
-
-   if (ch == '`')
-   {
-      return(parse_string(ctx, pc, 0, false));
-   }
-
-   if (  (  ch == 'r'
-         || ch == 'x')
-      && ctx.peek(1) == '"')
-   {
-      return(parse_string(ctx, pc, 1, false));
-   }
-
-   if (ch != '\\')
-   {
-      return(false);
-   }
-   ctx.save();
-   int cnt;
-
-   pc.str.clear();
-
-   while (ctx.peek() == '\\')
-   {
-      pc.str.append(ctx.get());
-
-      // Check for end of file
-      switch (ctx.peek())
-      {
-      case 'x':  // \x HexDigit HexDigit
-         cnt = 3;
-
-         while (cnt--)
-         {
-            pc.str.append(ctx.get());
-         }
-         break;
-
-      case 'u':  // \u HexDigit (x4)
-         cnt = 5;
-
-         while (cnt--)
-         {
-            pc.str.append(ctx.get());
-         }
-         break;
-
-      case 'U':  // \U HexDigit (x8)
-         cnt = 9;
-
-         while (cnt--)
-         {
-            pc.str.append(ctx.get());
-         }
-         break;
-
-      case '0':
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-         // handle up to 3 octal digits
-         pc.str.append(ctx.get());
-         ch = ctx.peek();
-
-         if (  (ch >= '0')
-            && (ch <= '7'))
-         {
-            pc.str.append(ctx.get());
-            ch = ctx.peek();
-
-            if (  (ch >= '0')
-               && (ch <= '7'))
-            {
-               pc.str.append(ctx.get());
-            }
-         }
-         break;
-
-      case '&':
-         // \& NamedCharacterEntity ;
-         pc.str.append(ctx.get());
-
-         while (unc_isalpha(ctx.peek()))
-         {
-            pc.str.append(ctx.get());
-         }
-
-         if (ctx.peek() == ';')
-         {
-            pc.str.append(ctx.get());
-         }
-         break;
-
-      default:
-         // Everything else is a single character
-         pc.str.append(ctx.get());
-         break;
-      } // switch
-   }
-
-   if (pc.str.size() < 1)
-   {
-      ctx.restore();
-      return(false);
-   }
-   set_chunk_type(&pc, CT_STRING);
-   return(true);
-} // d_parse_string
-
-
-#if 0
-
-
-//! A string-in-string search.  Like strstr() with a haystack length.
-static const char *str_search(const char *needle, const char *haystack, int haystack_len)
-{
-   int needle_len = strlen(needle);
-
-   while (haystack_len-- >= needle_len)
-   {
-      if (memcmp(needle, haystack, needle_len) == 0)
-      {
-         return(haystack);
-      }
-      haystack++;
-   }
-   return(NULL);
-}
-#endif
-
-
-static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
-{
-   bool   is_d    = language_is_set(LANG_D);
-   bool   is_cs   = language_is_set(LANG_CS);
-   size_t d_level = 0;
-
-   // does this start with '/ /' or '/ *' or '/ +' (d)
-   if (  (ctx.peek() != '/')
-      || (  (ctx.peek(1) != '*')
-         && (ctx.peek(1) != '/')
-         && (  (ctx.peek(1) != '+')
-            || !is_d)))
-   {
-      return(false);
-   }
-   ctx.save();
-
-   // account for opening two chars
-   pc.str = ctx.get();   // opening '/'
-   size_t ch = ctx.get();
-
-   pc.str.append(ch);    // second char
-
-   if (ch == '/')
-   {
-      set_chunk_type(&pc, CT_COMMENT_CPP);
-
-      while (true)
-      {
-         int bs_cnt = 0;
-
-         while (ctx.more())
-         {
-            ch = ctx.peek();
-
-            if (  (ch == '\r')
-               || (ch == '\n'))
-            {
-               break;
-            }
-
-            if (  (ch == '\\')
-               && !is_cs) // backslashes aren't special in comments in C#
-            {
-               bs_cnt++;
-            }
-            else
-            {
-               bs_cnt = 0;
-            }
-            pc.str.append(ctx.get());
-         }
-
-         /*
-          * If we hit an odd number of backslashes right before the newline,
-          * then we keep going.
-          */
-         if (  ((bs_cnt & 1) == 0)
-            || !ctx.more())
-         {
-            break;
-         }
-
-         if (ctx.peek() == '\r')
-         {
-            pc.str.append(ctx.get());
-         }
-
-         if (ctx.peek() == '\n')
-         {
-            pc.str.append(ctx.get());
-         }
-         pc.nl_count++;
-         cpd.did_newline = true;
-      }
-   }
-   else if (!ctx.more())
-   {
-      // unexpected end of file
-      ctx.restore();
-      return(false);
-   }
-   else if (ch == '+')
-   {
-      set_chunk_type(&pc, CT_COMMENT);
-      d_level++;
-
-      while (  d_level > 0
-            && ctx.more())
-      {
-         if (  (ctx.peek() == '+')
-            && (ctx.peek(1) == '/'))
-         {
-            pc.str.append(ctx.get());  // store the '+'
-            pc.str.append(ctx.get());  // store the '/'
-            d_level--;
-            continue;
-         }
-
-         if (  (ctx.peek() == '/')
-            && (ctx.peek(1) == '+'))
-         {
-            pc.str.append(ctx.get());  // store the '/'
-            pc.str.append(ctx.get());  // store the '+'
-            d_level++;
-            continue;
-         }
-         ch = ctx.get();
-         pc.str.append(ch);
-
-         if (  (ch == '\n')
-            || (ch == '\r'))
-         {
-            set_chunk_type(&pc, CT_COMMENT_MULTI);
-            pc.nl_count++;
-
-            if (ch == '\r')
-            {
-               if (ctx.peek() == '\n')
-               {
-                  ++LE_COUNT(CRLF);
-                  pc.str.append(ctx.get());  // store the '\n'
-               }
-               else
-               {
-                  ++LE_COUNT(CR);
-               }
-            }
-            else
-            {
-               ++LE_COUNT(LF);
-            }
-         }
-      }
-   }
-   else  // must be '/ *'
-   {
-      set_chunk_type(&pc, CT_COMMENT);
-
-      while (ctx.more())
-      {
-         if (  (ctx.peek() == '*')
-            && (ctx.peek(1) == '/'))
-         {
-            pc.str.append(ctx.get());  // store the '*'
-            pc.str.append(ctx.get());  // store the '/'
-
-            tok_info ss;
-            ctx.save(ss);
-            size_t   oldsize = pc.str.size();
-
-            // If there is another C comment right after this one, combine them
-            while (  (ctx.peek() == ' ')
-                  || (ctx.peek() == '\t'))
-            {
-               pc.str.append(ctx.get());
-            }
-
-            if (  (ctx.peek() != '/')
-               || (ctx.peek(1) != '*'))
-            {
-               // undo the attempt to join
-               ctx.restore(ss);
-               pc.str.resize(oldsize);
-               break;
-            }
-         }
-         ch = ctx.get();
-         pc.str.append(ch);
-
-         if (  (ch == '\n')
-            || (ch == '\r'))
-         {
-            set_chunk_type(&pc, CT_COMMENT_MULTI);
-            pc.nl_count++;
-
-            if (ch == '\r')
-            {
-               if (ctx.peek() == '\n')
-               {
-                  ++LE_COUNT(CRLF);
-                  pc.str.append(ctx.get());  // store the '\n'
-               }
-               else
-               {
-                  ++LE_COUNT(CR);
-               }
-            }
-            else
-            {
-               ++LE_COUNT(LF);
-            }
-         }
-      }
-   }
-
-   if (cpd.unc_off)
-   {
-      bool found_enable_marker = (find_enable_processing_comment_marker(pc.str) >= 0);
-
-      if (found_enable_marker)
-      {
-         const auto &ontext = options::enable_processing_cmt();
-
-         LOG_FMT(LBCTRL, "%s(%d): Found '%s' on line %zu\n",
-                 __func__, __LINE__, ontext.c_str(), pc.orig_line);
-         cpd.unc_off = false;
-      }
-   }
-   else
-   {
-      auto position_disable_processing_cmt = find_disable_processing_comment_marker(pc.str);
-      bool found_disable_marker            = (position_disable_processing_cmt >= 0);
-
-      if (found_disable_marker)
-      {
-         /**
-          * the user may wish to disable processing part of a multiline comment,
-          * in which case we'll handle at a late time. Check to see if processing
-          * is re-enabled elsewhere in this comment
-          */
-         auto position_enable_processing_cmt = find_enable_processing_comment_marker(pc.str);
-
-         if (position_enable_processing_cmt < position_disable_processing_cmt)
-         {
-            const auto &offtext = options::disable_processing_cmt();
-
-            LOG_FMT(LBCTRL, "%s(%d): Found '%s' on line %zu\n",
-                    __func__, __LINE__, offtext.c_str(), pc.orig_line);
-            cpd.unc_off = true;
-            // Issue #842
-            cpd.unc_off_used = true;
-         }
-      }
-   }
-   return(true);
-} // parse_comment
-
-
-static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc)
-{
-   if (  (ctx.peek() != '<')
-      || (ctx.peek(1) != '#'))
-   {
-      return(false);
-   }
-   ctx.save();
-
-   // account for opening two chars '<#'
-   pc.str = ctx.get();
-   pc.str.append(ctx.get());
-
-   // grab everything until '#>', fail if not found.
-   size_t last1 = 0;
-
-   while (ctx.more())
-   {
-      size_t last2 = last1;
-      last1 = ctx.get();
-      pc.str.append(last1);
-
-      if (  (last2 == '#')
-         && (last1 == '>'))
-      {
-         set_chunk_type(&pc, CT_WORD);
-         return(true);
-      }
-   }
-   ctx.restore();
-   return(false);
-}
-
-
-static void parse_suffix(tok_ctx &ctx, chunk_t &pc, bool forstring = false)
-{
-   if (CharTable::IsKw1(ctx.peek()))
-   {
-      size_t slen    = 0;
-      size_t oldsize = pc.str.size();
-
-      // don't add the suffix if we see L" or L' or S"
-      size_t p1 = ctx.peek();
-      size_t p2 = ctx.peek(1);
-
-      if (  forstring
-         && (  (  (p1 == 'L')
-               && (  (p2 == '"')
-                  || (p2 == '\'')))
-            || (  (p1 == 'S')
-               && (p2 == '"'))))
-      {
-         return;
-      }
-      tok_info ss;
-      ctx.save(ss);
-
-      while (  ctx.more()
-            && CharTable::IsKw2(ctx.peek()))
-      {
-         slen++;
-         pc.str.append(ctx.get());
-      }
-
-      if (  forstring
-         && slen >= 4
-         && (  pc.str.startswith("PRI", oldsize)
-            || pc.str.startswith("SCN", oldsize)))
-      {
-         ctx.restore(ss);
-         pc.str.resize(oldsize);
-      }
-   }
-}
-
-
-static bool is_bin(int ch)
-{
-   return(  (ch == '0')
-         || (ch == '1'));
-}
-
-
-static bool is_bin_(int ch)
-{
-   return(  is_bin(ch)
-         || ch == '_'
-         || ch == '\'');
-}
-
-
-static bool is_oct(int ch)
-{
-   return(  (ch >= '0')
-         && (ch <= '7'));
-}
-
-
-static bool is_oct_(int ch)
-{
-   return(  is_oct(ch)
-         || ch == '_'
-         || ch == '\'');
-}
-
-
-static bool is_dec(int ch)
-{
-   return(  (ch >= '0')
-         && (ch <= '9'));
-}
-
-
-static bool is_dec_(int ch)
-{
-   // number separators: JAVA: "_", C++14: "'"
-   return(  is_dec(ch)
-         || (ch == '_')
-         || (ch == '\''));
-}
-
-
-static bool is_hex(int ch)
-{
-   return(  (  (ch >= '0')
-            && (ch <= '9'))
-         || (  (ch >= 'a')
-            && (ch <= 'f'))
-         || (  (ch >= 'A')
-            && (ch <= 'F')));
-}
-
-
-static bool is_hex_(int ch)
-{
-   return(  is_hex(ch)
-         || ch == '_'
-         || ch == '\'');
-}
-
-
-static bool parse_number(tok_ctx &ctx, chunk_t &pc)
-{
-   /*
-    * A number must start with a digit or a dot, followed by a digit
-    * (signs handled elsewhere)
-    */
-   if (  !is_dec(ctx.peek())
-      && (  (ctx.peek() != '.')
-         || !is_dec(ctx.peek(1))))
-   {
-      return(false);
-   }
-   bool is_float = (ctx.peek() == '.');
-
-   if (  is_float
-      && (ctx.peek(1) == '.')) // make sure it isn't '..'
-   {
-      return(false);
-   }
-   /*
-    * Check for Hex, Octal, or Binary
-    * Note that only D, C++14 and Pawn support binary
-    * Fixes the issue # 1591
-    * In c# the numbers starting with 0 are not treated as octal numbers.
-    */
-   bool did_hex = false;
-
-   if (  ctx.peek() == '0'
-      && !language_is_set(LANG_CS))
-   {
-      size_t  ch;
-      chunk_t pc_temp;
-
-      pc.str.append(ctx.get());  // store the '0'
-      pc_temp.str.append('0');
-
-      // MS constant might have an "h" at the end. Look for it
-      ctx.save();
-
-      while (  ctx.more()
-            && CharTable::IsKw2(ctx.peek()))
-      {
-         ch = ctx.get();
-         pc_temp.str.append(ch);
-      }
-      ch = pc_temp.str[pc_temp.len() - 1];
-      ctx.restore();
-      LOG_FMT(LGUY, "%s(%d): pc_temp:%s\n", __func__, __LINE__, pc_temp.text());
-
-      if (ch == 'h') // TODO can we combine this in analyze_character
-      {
-         // we have an MS hexadecimal number with "h" at the end
-         LOG_FMT(LGUY, "%s(%d): MS hexadecimal number\n", __func__, __LINE__);
-         did_hex = true;
-
-         do
-         {
-            pc.str.append(ctx.get()); // store the rest
-         } while (is_hex_(ctx.peek()));
-
-         pc.str.append(ctx.get());    // store the h
-         LOG_FMT(LGUY, "%s(%d): pc:%s\n", __func__, __LINE__, pc.text());
-      }
-      else
-      {
-         switch (unc_toupper(ctx.peek()))
-         {
-         case 'X':               // hex
-            did_hex = true;
-
-            do
-            {
-               pc.str.append(ctx.get());  // store the 'x' and then the rest
-            } while (is_hex_(ctx.peek()));
-
-            break;
-
-         case 'B':               // binary
-
-            do
-            {
-               pc.str.append(ctx.get());  // store the 'b' and then the rest
-            } while (is_bin_(ctx.peek()));
-
-            break;
-
-         case '0':               // octal or decimal
-         case '1':
-         case '2':
-         case '3':
-         case '4':
-         case '5':
-         case '6':
-         case '7':
-         case '8':
-         case '9':
-
-            do
-            {
-               pc.str.append(ctx.get());
-            } while (is_oct_(ctx.peek()));
-
-            break;
-
-         default:
-            // either just 0 or 0.1 or 0UL, etc
-            break;
-         } // switch
-      }
-   }
-   else
-   {
-      // Regular int or float
-      while (is_dec_(ctx.peek()))
-      {
-         pc.str.append(ctx.get());
-      }
-   }
-
-   // Check if we stopped on a decimal point & make sure it isn't '..'
-   if (  (ctx.peek() == '.')
-      && (ctx.peek(1) != '.'))
-   {
-      // Issue #1265, 5.clamp()
-      tok_info ss;
-      ctx.save(ss);
-
-      while (  ctx.more()
-            && CharTable::IsKw2(ctx.peek(1)))
-      {
-         // skip characters to check for paren open
-         ctx.get();
-      }
-
-      if (ctx.peek(1) == '(')
-      {
-         ctx.restore(ss);
-         set_chunk_type(&pc, CT_NUMBER);
-         return(true);
-      }
-      else
-      {
-         ctx.restore(ss);
-      }
-      pc.str.append(ctx.get());
-      is_float = true;
-
-      if (did_hex)
-      {
-         while (is_hex_(ctx.peek()))
-         {
-            pc.str.append(ctx.get());
-         }
-      }
-      else
-      {
-         while (is_dec_(ctx.peek()))
-         {
-            pc.str.append(ctx.get());
-         }
-      }
-   }
-   /*
-    * Check exponent
-    * Valid exponents per language (not that it matters):
-    * C/C++/D/Java: eEpP
-    * C#/Pawn:      eE
-    */
-   size_t tmp = unc_toupper(ctx.peek());
-
-   if (  (tmp == 'E')
-      || (tmp == 'P'))
-   {
-      is_float = true;
-      pc.str.append(ctx.get());
-
-      if (  (ctx.peek() == '+')
-         || (ctx.peek() == '-'))
-      {
-         pc.str.append(ctx.get());
-      }
-
-      while (is_dec_(ctx.peek()))
-      {
-         pc.str.append(ctx.get());
-      }
-   }
-
-   /*
-    * Check the suffixes
-    * Valid suffixes per language (not that it matters):
-    *        Integer       Float
-    * C/C++: uUlL64        lLfF
-    * C#:    uUlL          fFdDMm
-    * D:     uUL           ifFL
-    * Java:  lL            fFdD
-    * Pawn:  (none)        (none)
-    *
-    * Note that i, f, d, and m only appear in floats.
-    */
-   while (1)
-   {
-      size_t tmp2 = unc_toupper(ctx.peek());
-
-      if (  (tmp2 == 'I')
-         || (tmp2 == 'F')
-         || (tmp2 == 'D')
-         || (tmp2 == 'M'))
-      {
-         is_float = true;
-      }
-      else if (  (tmp2 != 'L')
-              && (tmp2 != 'U'))
-      {
-         break;
-      }
-      pc.str.append(ctx.get());
-   }
-
-   // skip the Microsoft-specific '32' and '64' suffix
-   if (  (  (ctx.peek() == '3')
-         && (ctx.peek(1) == '2'))
-      || (  (ctx.peek() == '6')
-         && (ctx.peek(1) == '4')))
-   {
-      pc.str.append(ctx.get());
-      pc.str.append(ctx.get());
-   }
-   set_chunk_type(&pc, is_float ? CT_NUMBER_FP : CT_NUMBER);
-
-   /*
-    * If there is anything left, then we are probably dealing with garbage or
-    * some sick macro junk. Eat it.
-    */
-   parse_suffix(ctx, pc);
-
-   return(true);
-} // parse_number
-
-
-static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow_escape)
-{
-   log_rule_B("string_escape_char");
-   const size_t escape_char = options::string_escape_char();
-
-   log_rule_B("string_escape_char2");
-   const size_t escape_char2 = options::string_escape_char2();
-
-   log_rule_B("string_replace_tab_chars");
-   const bool should_escape_tabs = (  allow_escape
-                                   && options::string_replace_tab_chars()
-                                   && language_is_set(LANG_ALLC));
-
-   pc.str.clear();
-
-   while (quote_idx-- > 0)
-   {
-      pc.str.append(ctx.get());
-   }
-   set_chunk_type(&pc, CT_STRING);
-   const size_t termination_character = CharTable::Get(ctx.peek()) & 0xff;
-
-   pc.str.append(ctx.get());                          // store the "
-
-   bool escaped = false;
-
-   while (ctx.more())
-   {
-      const size_t ch = ctx.get();
-
-      // convert char 9 (\t) to chars \t
-      if (  (ch == '\t')
-         && should_escape_tabs)
-      {
-         const size_t lastcol = ctx.c.col - 1;
-         ctx.c.col = lastcol + 2;
-         pc.str.append(escape_char);
-         pc.str.append('t');
-         continue;
-      }
-      pc.str.append(ch);
-
-      if (ch == '\n')
-      {
-         pc.nl_count++;
-         set_chunk_type(&pc, CT_STRING_MULTI);
-      }
-      else if (  ch == '\r'
-              && ctx.peek() != '\n')
-      {
-         pc.str.append(ctx.get());
-         pc.nl_count++;
-         set_chunk_type(&pc, CT_STRING_MULTI);
-      }
-
-      // if last char in prev loop was escaped the one in the current loop isn't
-      if (escaped)
-      {
-         escaped = false;
-         continue;
-      }
-
-      // see if the current char is a escape char
-      if (allow_escape)
-      {
-         if (ch == escape_char)
-         {
-            escaped = (escape_char != 0);
-            continue;
-         }
-
-         if (  ch == escape_char2
-            && (ctx.peek() == termination_character))
-         {
-            escaped = allow_escape;
-            continue;
-         }
-      }
-
-      if (ch == termination_character)
-      {
-         break;
-      }
-   }
-   parse_suffix(ctx, pc, true);
-   return(true);
-} // parse_string
-
-enum cs_string_t
-{
-   CS_STRING_NONE         = 0,
-   CS_STRING_STRING       = 1 << 0,    // is any kind of string
-   CS_STRING_VERBATIM     = 1 << 1,    // @"" style string
-   CS_STRING_INTERPOLATED = 1 << 2,    // $"" or $@"" style string
-};
-
-static cs_string_t operator|=(cs_string_t &value, cs_string_t other)
-{
-   return(value = static_cast<cs_string_t>(value | other));
-}
-
-
-static cs_string_t parse_cs_string_start(tok_ctx &ctx, chunk_t &pc)
-{
-   cs_string_t stringType = CS_STRING_NONE;
-   int         offset     = 0;
-
-   if (ctx.peek(offset) == '$')
-   {
-      stringType |= CS_STRING_INTERPOLATED;
-      ++offset;
-   }
-
-   if (ctx.peek(offset) == '@')
-   {
-      stringType |= CS_STRING_VERBATIM;
-      ++offset;
-   }
-
-   if (ctx.peek(offset) == '"')
-   {
-      stringType |= CS_STRING_STRING;
-
-      set_chunk_type(&pc, CT_STRING);
-
-      for (int i = 0; i <= offset; ++i)
-      {
-         pc.str.append(ctx.get());
-      }
-   }
-   else
-   {
-      stringType = CS_STRING_NONE;
-   }
-   return(stringType);
-} // parse_cs_string_start
-
-
-struct CsStringParseState
-{
-   cs_string_t type;
-   int         braceDepth;
-
-
-   CsStringParseState(cs_string_t stringType)
-   {
-      type       = stringType;
-      braceDepth = 0;
-   }
-};
-
-
-/**
- * C# strings are complex enough (mostly due to interpolation and nesting) that they need a custom parser.
- */
-static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc)
-{
-   cs_string_t stringType = parse_cs_string_start(ctx, pc);
-
-   if (stringType == 0)
-   {
-      return(false);
-   }
-   // an interpolated string can contain {expressions}, which can contain $"strings", which in turn
-   // can contain {expressions}, so we must track both as they are interleaved, in order to properly
-   // parse the outermost string.
-
-   std::stack<CsStringParseState> parseState; // each entry is a nested string
-
-   parseState.push(CsStringParseState(stringType));
-
-   log_rule_B("string_replace_tab_chars");
-   bool should_escape_tabs = options::string_replace_tab_chars();
-
-   while (ctx.more())
-   {
-      if (parseState.top().braceDepth > 0)
-      {
-         // all we can do when in an expr is look for expr close with }, or a new string opening. must do this first
-         // so we can peek and potentially consume chars for new string openings, before the ch=get() happens later,
-         // which is needed for newline processing.
-
-         if (ctx.peek() == '}')
-         {
-            pc.str.append(ctx.get());
-
-            if (ctx.peek() == '}')
-            {
-               pc.str.append(ctx.get()); // in interpolated string, `}}` is escape'd `}`
-            }
-            else
-            {
-               --parseState.top().braceDepth;
-            }
-            continue;
-         }
-         stringType = parse_cs_string_start(ctx, pc);
-
-         if (stringType)
-         {
-            parseState.push(CsStringParseState(stringType));
-            continue;
-         }
-      }
-      int lastcol = ctx.c.col;
-      int ch      = ctx.get();
-
-      pc.str.append(ch);
-
-      if (ch == '\n')
-      {
-         set_chunk_type(&pc, CT_STRING_MULTI);
-         pc.nl_count++;
-      }
-      else if (ch == '\r')
-      {
-         set_chunk_type(&pc, CT_STRING_MULTI);
-      }
-      else if (parseState.top().braceDepth > 0)
-      {
-         // do nothing. if we're in a brace, we only want the newline handling, and skip the rest.
-      }
-      else if (  (ch == '\t')
-              && should_escape_tabs)
-      {
-         if (parseState.top().type & CS_STRING_VERBATIM)
-         {
-            if (!cpd.warned_unable_string_replace_tab_chars)
-            {
-               cpd.warned_unable_string_replace_tab_chars = true;
-
-               log_rule_B("warn_level_tabs_found_in_verbatim_string_literals");
-               log_sev_t warnlevel = (log_sev_t)options::warn_level_tabs_found_in_verbatim_string_literals();
-
-               /*
-                * a tab char can't be replaced with \\t because escapes don't
-                * work in here-strings. best we can do is warn.
-                */
-               LOG_FMT(warnlevel, "%s(%d): %s: orig_line is %zu, orig_col is %zu, Detected non-replaceable tab char in literal string\n",
-                       __func__, __LINE__, cpd.filename.c_str(), pc.orig_line, pc.orig_col);
-               LOG_FMT(warnlevel, "%s(%d): Warning is given if doing tab-to-\\t replacement and we have found one in a C# verbatim string literal.\n",
-                       __func__, __LINE__);
-
-               if (warnlevel < LWARN)
-               {
-                  cpd.error_count++;
-               }
-            }
-         }
-         else
-         {
-            ctx.c.col = lastcol + 2;
-            pc.str.pop_back(); // remove \t
-            pc.str.append("\\t");
-
-            continue;
-         }
-      }
-      else if (  ch == '\\'
-              && !(parseState.top().type & CS_STRING_VERBATIM))
-      {
-         // catch escaped quote in order to avoid ending string (but also must handle \\ to avoid accidental 'escape' seq of `\\"`)
-         if (  ctx.peek() == '"'
-            || ctx.peek() == '\\')
-         {
-            pc.str.append(ctx.get());
-         }
-      }
-      else if (ch == '"')
-      {
-         if (  (parseState.top().type & CS_STRING_VERBATIM)
-            && (ctx.peek() == '"'))
-         {
-            // in verbatim string, `""` is escape'd `"`
-            pc.str.append(ctx.get());
-         }
-         else
-         {
-            // end of string
-            parseState.pop();
-
-            if (parseState.empty())
-            {
-               break;
-            }
-         }
-      }
-      else if (parseState.top().type & CS_STRING_INTERPOLATED)
-      {
-         if (ch == '{')
-         {
-            if (ctx.peek() == '{')
-            {
-               pc.str.append(ctx.get()); // in interpolated string, `{{` is escape'd `{`
-            }
-            else
-            {
-               ++parseState.top().braceDepth;
-            }
-         }
-      }
-   }
-   return(true);
-} // parse_cs_string
-
-
-static void parse_verbatim_string(tok_ctx &ctx, chunk_t &pc)
-{
-   set_chunk_type(&pc, CT_STRING);
-
-   // consume the initial """
-   pc.str = ctx.get();
-   pc.str.append(ctx.get());
-   pc.str.append(ctx.get());
-
-   // go until we hit a zero (end of file) or a """
-   while (ctx.more())
-   {
-      size_t ch = ctx.get();
-      pc.str.append(ch);
-
-      if (  (ch == '"')
-         && (ctx.peek() == '"')
-         && (ctx.peek(1) == '"'))
-      {
-         pc.str.append(ctx.get());
-         pc.str.append(ctx.get());
-         break;
-      }
-
-      if (  (ch == '\n')
-         || (ch == '\r'))
-      {
-         set_chunk_type(&pc, CT_STRING_MULTI);
-         pc.nl_count++;
-      }
-   }
-}
-
-
-static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t len)
-{
-   if (a_idx != b_idx)
-   {
-      while (len-- > 0)
-      {
-         if (d[a_idx] != d[b_idx])
-         {
-            return(false);
-         }
-      }
-   }
-   return(true);
-}
-
-
-static bool parse_cr_string(tok_ctx &ctx, chunk_t &pc, size_t q_idx)
-{
-   size_t tag_idx = ctx.c.idx + q_idx + 1;
-   size_t tag_len = 0;
-
-   ctx.save();
-
-   // Copy the prefix + " to the string
-   pc.str.clear();
-   int cnt = q_idx + 1;
-
-   while (cnt--)
-   {
-      pc.str.append(ctx.get());
-   }
-
-   // Add the tag and get the length of the tag
-   while (  ctx.more()
-         && (ctx.peek() != '('))
-   {
-      tag_len++;
-      pc.str.append(ctx.get());
-   }
-
-   if (ctx.peek() != '(')
-   {
-      ctx.restore();
-      return(false);
-   }
-   set_chunk_type(&pc, CT_STRING);
-
-   while (ctx.more())
-   {
-      if (  (ctx.peek() == ')')
-         && (ctx.peek(tag_len + 1) == '"')
-         && tag_compare(ctx.data, tag_idx, ctx.c.idx + 1, tag_len))
-      {
-         cnt = tag_len + 2;   // for the )"
-
-         while (cnt--)
-         {
-            pc.str.append(ctx.get());
-         }
-         parse_suffix(ctx, pc);
-         return(true);
-      }
-
-      if (ctx.peek() == '\n')
-      {
-         pc.str.append(ctx.get());
-         pc.nl_count++;
-         set_chunk_type(&pc, CT_STRING_MULTI);
-      }
-      else
-      {
-         pc.str.append(ctx.get());
-      }
-   }
-   ctx.restore();
-   return(false);
-} // parse_cr_string
-
-
-/**
- * Count the number of characters in a word.
- * The first character is already valid for a keyword
- *
- * @param pc   The structure to update, str is an input.
- * @return     Whether a word was parsed (always true)
- */
-static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
-{
-   static unc_text intr_txt("@interface");
-
-   // The first character is already valid
-   pc.str.clear();
-   pc.str.append(ctx.get());
-
-   while (ctx.more())
-   {
-      size_t ch = ctx.peek();
-
-      if (CharTable::IsKw2(ch))
-      {
-         pc.str.append(ctx.get());
-      }
-      else if (  (ch == '\\')
-              && (unc_tolower(ctx.peek(1)) == 'u'))
-      {
-         pc.str.append(ctx.get());
-         pc.str.append(ctx.get());
-         skipcheck = true;
-      }
-      else
-      {
-         break;
-      }
-
-      // HACK: Non-ASCII character are only allowed in identifiers
-      if (ch > 0x7f)
-      {
-         skipcheck = true;
-      }
-   }
-   set_chunk_type(&pc, CT_WORD);
-
-   if (skipcheck)
-   {
-      return(true);
-   }
-
-   // Detect pre-processor functions now
-   if (  cpd.in_preproc == CT_PP_DEFINE
-      && cpd.preproc_ncnl_count == 1)
-   {
-      if (ctx.peek() == '(')
-      {
-         set_chunk_type(&pc, CT_MACRO_FUNC);
-      }
-      else
-      {
-         set_chunk_type(&pc, CT_MACRO);
-
-         log_rule_B("pp_ignore_define_body");
-
-         if (options::pp_ignore_define_body())
-         {
-            /*
-             * We are setting the PP_IGNORE preproc state because the following
-             * chunks are part of the macro body and will have to be ignored.
-             */
-            cpd.in_preproc = CT_PP_IGNORE;
-         }
-      }
-   }
-   else
-   {
-      // '@interface' is reserved, not an interface itself
-      if (  language_is_set(LANG_JAVA)
-         && pc.str.startswith("@")
-         && !pc.str.equals(intr_txt))
-      {
-         set_chunk_type(&pc, CT_ANNOTATION);
-      }
-      else
-      {
-         // Turn it into a keyword now
-         // Issue #1460 will return "COMMENT_CPP"
-         set_chunk_type(&pc, find_keyword_type(pc.text(), pc.str.size()));
-
-         /* Special pattern: if we're trying to redirect a preprocessor directive to PP_IGNORE,
-          * then ensure we're actually part of a preprocessor before doing the swap, or we'll
-          * end up with a function named 'define' as PP_IGNORE. This is necessary because with
-          * the config 'set' feature, there's no way to do a pair of tokens as a word
-          * substitution. */
-         if (  pc.type == CT_PP_IGNORE
-            && !cpd.in_preproc)
-         {
-            set_chunk_type(&pc, find_keyword_type(pc.text(), pc.str.size()));
-         }
-         else if (pc.type == CT_COMMENT_CPP)   // Issue #1460
-         {
-            size_t ch;
-            bool   is_cs = language_is_set(LANG_CS);
-
-            // read until EOL
-            while (true)
-            {
-               int bs_cnt = 0;
-
-               while (ctx.more())
-               {
-                  ch = ctx.peek();
-
-                  if (  (ch == '\r')
-                     || (ch == '\n'))
-                  {
-                     break;
-                  }
-
-                  if (  (ch == '\\')
-                     && !is_cs) // backslashes aren't special in comments in C#
-                  {
-                     bs_cnt++;
-                  }
-                  else
-                  {
-                     bs_cnt = 0;
-                  }
-                  pc.str.append(ctx.get());
-               }
-
-               /*
-                * If we hit an odd number of backslashes right before the newline,
-                * then we keep going.
-                */
-               if (  ((bs_cnt & 1) == 0)
-                  || !ctx.more())
-               {
-                  break;
-               }
-
-               if (ctx.peek() == '\r')
-               {
-                  pc.str.append(ctx.get());
-               }
-
-               if (ctx.peek() == '\n')
-               {
-                  pc.str.append(ctx.get());
-               }
-               pc.nl_count++;
-               cpd.did_newline = true;
-            }
-            // Store off the end column
-            pc.orig_col_end = ctx.c.col;
-         }
-      }
-   }
-   return(true);
-} // parse_word
-
-
-static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
-{
-   size_t nested = 0;
-   size_t offset = 0;
-   size_t parens = 0;
-   auto   ch1    = ctx.peek(offset++);
-
-   while (ch1)
-   {
-      auto ch2 = ctx.peek(offset++);
-
-      while (  ch2 == ' '
-            || ch2 == '\n'
-            || ch2 == '\r'
-            || ch2 == '\t')
-      {
-         ch2 = ctx.peek(offset++);
-      }
-
-      if (  nested == 0
-         && ch2 != '[')
-      {
-         break;
-      }
-
-      if (ch1 == '(')
-      {
-         ++parens;
-         ch1 = ch2;
-         continue;
-      }
-
-      if (ch1 == ')')
-      {
-         if (parens == 0)
-         {
-            break;
-         }
-         --parens;
-         ch1 = ch2;
-         continue;
-      }
-
-      if (  ch1 != '['
-         && ch1 != ']')
-      {
-         ch1 = ch2;
-         continue;
-      }
-
-      if (ch2 != ch1)
-      {
-         if (parens == 0)
-         {
-            break;
-         }
-         ch1 = ch2;
-         continue;
-      }
-
-      if (ch1 == '[')
-      {
-         if (  nested != 0
-            && parens == 0)
-         {
-            break;
-         }
-         ++nested;
-      }
-      else if (--nested == 0)
-      {
-         return(offset);
-      }
-      ch1 = ctx.peek(offset++);
-   }
-   return(0);
-} // parse_attribute_specifier_sequence
-
-
-static bool extract_attribute_specifier_sequence(tok_ctx &ctx, chunk_t &pc, size_t length)
-{
-   pc.str.clear();
-
-   while (length--)
-   {
-      pc.str.append(ctx.get());
-   }
-   set_chunk_type(&pc, CT_ATTRIBUTE);
-   return(true);
-} // extract_attribute_specifier_sequence
-
-
-static bool parse_whitespace(tok_ctx &ctx, chunk_t &pc)
-{
-   size_t nl_count = 0;
-   size_t ch       = 0;
-
-   // REVISIT: use a better whitespace detector?
-   while (  ctx.more()
-         && unc_isspace(ctx.peek()))
-   {
-      ch = ctx.get();   // throw away the whitespace char
-
-      switch (ch)
-      {
-      case '\r':
-
-         if (ctx.expect('\n'))
-         {
-            // CRLF ending
-            ++LE_COUNT(CRLF);
-         }
-         else
-         {
-            // CR ending
-            ++LE_COUNT(CR);
-         }
-         nl_count++;
-         pc.orig_prev_sp = 0;
-         break;
-
-      case '\n':
-         // LF ending
-         ++LE_COUNT(LF);
-         nl_count++;
-         pc.orig_prev_sp = 0;
-         break;
-
-      case '\t':
-         log_rule_B("input_tab_size");
-         pc.orig_prev_sp += calc_next_tab_column(cpd.column, options::input_tab_size()) - cpd.column;
-         break;
-
-      case ' ':
-         pc.orig_prev_sp++;
-         break;
-
-      default:
-         break;
-      }
-   }
-
-   if (ch != 0)
-   {
-      pc.str.clear();
-      set_chunk_type(&pc, nl_count ? CT_NEWLINE : CT_WHITESPACE);
-      pc.nl_count  = nl_count;
-      pc.after_tab = (ctx.c.last_ch == '\t');
-      return(true);
-   }
-   return(false);
-} // parse_whitespace
-
-
-static bool parse_bs_newline(tok_ctx &ctx, chunk_t &pc)
-{
-   ctx.save();
-   ctx.get(); // skip the '\'
-
-   size_t ch;
-
-   while (  ctx.more()
-         && unc_isspace(ch = ctx.peek()))
-   {
-      ctx.get();
-
-      if (  (ch == '\r')
-         || (ch == '\n'))
-      {
-         if (ch == '\r')
-         {
-            ctx.expect('\n');
-         }
-         set_chunk_type(&pc, CT_NL_CONT);
-         pc.str      = "\\";
-         pc.nl_count = 1;
-         return(true);
-      }
-   }
-   ctx.restore();
-   return(false);
-}
-
-
-static bool parse_newline(tok_ctx &ctx)
-{
-   ctx.save();
-
-   // Eat whitespace
-   while (  (ctx.peek() == ' ')
-         || (ctx.peek() == '\t'))
-   {
-      ctx.get();
-   }
-
-   if (  (ctx.peek() == '\r')
-      || (ctx.peek() == '\n'))
-   {
-      if (!ctx.expect('\n'))
-      {
-         ctx.get();
-         ctx.expect('\n');
-      }
-      return(true);
-   }
-   ctx.restore();
-   return(false);
-}
-
-
-static void parse_pawn_pattern(tok_ctx &ctx, chunk_t &pc, c_token_t tt)
-{
-   pc.str.clear();
-   set_chunk_type(&pc, tt);
-
-   while (!unc_isspace(ctx.peek()))
-   {
-      // end the pattern on an escaped newline
-      if (ctx.peek() == '\\')
-      {
-         size_t ch = ctx.peek(1);
-
-         if (  (ch == '\n')
-            || (ch == '\r'))
-         {
-            break;
-         }
-      }
-      pc.str.append(ctx.get());
-   }
-}
-
-
-static bool parse_off_newlines(tok_ctx &ctx, chunk_t &pc)
-{
-   size_t nl_count = 0;
-
-   // Parse off newlines/blank lines
-   while (parse_newline(ctx))
-   {
-      nl_count++;
-   }
-
-   if (nl_count > 0)
-   {
-      pc.nl_count = nl_count;
-      set_chunk_type(&pc, CT_NEWLINE);
-      return(true);
-   }
-   return(false);
-}
-
-
-static bool parse_macro(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
-{
-   if (parse_off_newlines(ctx, pc))
-   {
-      return(true);
-   }
-
-   if (parse_comment(ctx, pc))  // allow CT_COMMENT_MULTI within macros
-   {
-      return(true);
-   }
-   ctx.save();
-   pc.str.clear();
-
-   bool continued = (  chunk_is_token(prev_pc, CT_NL_CONT)
-                    || chunk_is_token(prev_pc, CT_COMMENT_MULTI));
-
-   while (ctx.more())
-   {
-      size_t pk = ctx.peek(), pk1 = ctx.peek(1);
-      bool   nl = (  pk == '\n'
-                  || pk == '\r');
-      bool   nl_cont = (  pk == '\\'
-                       && (  pk1 == '\n'
-                          || pk1 == '\r'));
-
-      if (  (  nl_cont
-            || (  continued
-               && nl))
-         && pc.str.size() > 0)
-      {
-         set_chunk_type(&pc, CT_IGNORED);
-         return(true);
-      }
-      else if (nl)
-      {
-         break;
-      }
-      pc.str.append(ctx.get());
-   }
-   pc.str.clear();
-   ctx.restore();
-   return(false);
-} // parse_macro
-
-
-static bool parse_ignored(tok_ctx &ctx, chunk_t &pc)
-{
-   if (parse_off_newlines(ctx, pc))
-   {
-      return(true);
-   }
-   // See if the UO_enable_processing_cmt or #pragma endasm / #endasm text is on this line
-   ctx.save();
-   pc.str.clear();
-
-   while (  ctx.more()
-         && (ctx.peek() != '\r')
-         && (ctx.peek() != '\n'))
-   {
-      pc.str.append(ctx.get());
-   }
-
-   if (pc.str.size() == 0)
-   {
-      // end of file?
-      return(false);
-   }
-
-   // HACK: turn on if we find '#endasm' or '#pragma' and 'endasm' separated by blanks
-   if (  (  (  (pc.str.find("#pragma ") >= 0)
-            || (pc.str.find("#pragma	") >= 0))
-         && (  (pc.str.find(" endasm") >= 0)
-            || (pc.str.find("	endasm") >= 0)))
-      || (pc.str.find("#endasm") >= 0))
-   {
-      cpd.unc_off = false;
-      ctx.restore();
-      pc.str.clear();
-      return(false);
-   }
-   // Note that we aren't actually making sure this is in a comment, yet
-   log_rule_B("enable_processing_cmt");
-   const auto &ontext = options::enable_processing_cmt();
-
-   if (!ontext.empty())
-   {
-      bool found_enable_pattern = false;
-
-      if (  ontext != UNCRUSTIFY_ON_TEXT
-         && options::processing_cmt_as_regex())
-      {
-         std::wstring pc_wstring(pc.str.get().cbegin(),
-                                 pc.str.get().cend());
-         std::wregex  criteria(std::wstring(ontext.cbegin(),
-                                            ontext.cend()));
-
-         found_enable_pattern = std::regex_search(pc_wstring.cbegin(),
-                                                  pc_wstring.cend(),
-                                                  criteria);
-      }
-      else
-      {
-         found_enable_pattern = (pc.str.find(ontext.c_str()) >= 0);
-      }
-
-      if (!found_enable_pattern)
-      {
-         set_chunk_type(&pc, CT_IGNORED);
-         return(true);
-      }
-   }
-   ctx.restore();
-
-   // parse off whitespace leading to the comment
-   if (parse_whitespace(ctx, pc))
-   {
-      set_chunk_type(&pc, CT_IGNORED);
-      return(true);
-   }
-
-   // Look for the ending comment and let it pass
-   if (  parse_comment(ctx, pc)
-      && !cpd.unc_off)
-   {
-      return(true);
-   }
-   // Reset the chunk & scan to until a newline
-   pc.str.clear();
-
-   while (  ctx.more()
-         && (ctx.peek() != '\r')
-         && (ctx.peek() != '\n'))
-   {
-      pc.str.append(ctx.get());
-   }
-
-   if (pc.str.size() > 0)
-   {
-      set_chunk_type(&pc, CT_IGNORED);
-      return(true);
-   }
-   return(false);
-} // parse_ignored
-
-
-static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
-{
-   if (!ctx.more())
-   {
-      return(false);
-   }
-   // Save off the current column
-   set_chunk_type(&pc, CT_NONE);
-   pc.orig_line = ctx.c.row;
-   pc.column    = ctx.c.col;
-   pc.orig_col  = ctx.c.col;
-   pc.nl_count  = 0;
-   pc.flags     = PCF_NONE;
-
-   // If it is turned off, we put everything except newlines into CT_UNKNOWN
-   if (cpd.unc_off)
-   {
-      if (parse_ignored(ctx, pc))
-      {
-         return(true);
-      }
-   }
-   log_rule_B("disable_processing_nl_cont");
-
-   // Parse macro blocks
-   if (options::disable_processing_nl_cont())
-   {
-      if (parse_macro(ctx, pc, prev_pc))
-      {
-         return(true);
-      }
-   }
-
-   // Parse whitespace
-   if (parse_whitespace(ctx, pc))
-   {
-      return(true);
-   }
-
-   // Handle unknown/unhandled preprocessors
-   if (  cpd.in_preproc > CT_PP_BODYCHUNK
-      && cpd.in_preproc <= CT_PP_OTHER)
-   {
-      pc.str.clear();
-      tok_info ss;
-      ctx.save(ss);
-      // Chunk to a newline or comment
-      set_chunk_type(&pc, CT_PREPROC_BODY);
-      size_t last = 0;
-
-      while (ctx.more())
-      {
-         size_t ch = ctx.peek();
-
-         // Fix for issue #1752
-         // Ignoring extra spaces after ' \ ' for preproc body continuations
-         if (  last == '\\'
-            && ch == ' ')
-         {
-            ctx.get();
-            continue;
-         }
-
-         if (  (ch == '\n')
-            || (ch == '\r'))
-         {
-            // Back off if this is an escaped newline
-            if (last == '\\')
-            {
-               ctx.restore(ss);
-               pc.str.pop_back();
-            }
-            break;
-         }
-
-         // Quit on a C or C++ comment start           Issue #1966
-         if (  (ch == '/')
-            && (  (ctx.peek(1) == '/')
-               || (ctx.peek(1) == '*')))
-         {
-            break;
-         }
-         last = ch;
-         ctx.save(ss);
-
-         pc.str.append(ctx.get());
-      }
-
-      if (pc.str.size() > 0)
-      {
-         return(true);
-      }
-   }
-
-   // Detect backslash-newline
-   if (  (ctx.peek() == '\\')
-      && parse_bs_newline(ctx, pc))
-   {
-      return(true);
-   }
-
-   // Parse comments
-   if (parse_comment(ctx, pc))
-   {
-      return(true);
-   }
-
-   // Parse code placeholders
-   if (parse_code_placeholder(ctx, pc))
-   {
-      return(true);
-   }
-
-   if (language_is_set(LANG_CS))
-   {
-      if (parse_cs_string(ctx, pc))
-      {
-         return(true);
-      }
-
-      // check for non-keyword identifiers such as @if @switch, etc
-      if (  (ctx.peek() == '@')
-         && CharTable::IsKw1(ctx.peek(1)))
-      {
-         parse_word(ctx, pc, true);
-         return(true);
-      }
-   }
-
-   // handle VALA """ strings """
-   if (  language_is_set(LANG_VALA)
-      && (ctx.peek() == '"')
-      && (ctx.peek(1) == '"')
-      && (ctx.peek(2) == '"'))
-   {
-      parse_verbatim_string(ctx, pc);
-      return(true);
-   }
-   /*
-    * handle C++(11) string/char literal prefixes u8|u|U|L|R including all
-    * possible combinations and optional R delimiters: R"delim(x)delim"
-    */
-   auto ch = ctx.peek();
-
-   if (  language_is_set(LANG_C | LANG_CPP)
-      && (  ch == 'u'
-         || ch == 'U'
-         || ch == 'R'
-         || ch == 'L'))
-   {
-      auto idx     = size_t{};
-      auto is_real = false;
-
-      if (  ch == 'u'
-         && ctx.peek(1) == '8')
-      {
-         idx = 2;
-      }
-      else if (  unc_tolower(ch) == 'u'
-              || ch == 'L')
-      {
-         idx++;
-      }
-
-      if (  language_is_set(LANG_C | LANG_CPP)
-         && ctx.peek(idx) == 'R')
-      {
-         idx++;
-         is_real = true;
-      }
-      const auto quote = ctx.peek(idx);
-
-      if (is_real)
-      {
-         if (  quote == '"'
-            && parse_cr_string(ctx, pc, idx))
-         {
-            return(true);
-         }
-      }
-      else if (  (  quote == '"'
-                 || quote == '\'')
-              && parse_string(ctx, pc, idx, true))
-      {
-         return(true);
-      }
-   }
-
-   // PAWN specific stuff
-   if (language_is_set(LANG_PAWN))
-   {
-      if (  cpd.preproc_ncnl_count == 1
-         && (  cpd.in_preproc == CT_PP_DEFINE
-            || cpd.in_preproc == CT_PP_EMIT))
-      {
-         parse_pawn_pattern(ctx, pc, CT_MACRO);
-         return(true);
-      }
-
-      // Check for PAWN strings: \"hi" or !"hi" or !\"hi" or \!"hi"
-      if (  (ctx.peek() == '\\')
-         || (ctx.peek() == '!'))
-      {
-         if (ctx.peek(1) == '"')
-         {
-            parse_string(ctx, pc, 1, (ctx.peek() == '!'));
-            return(true);
-         }
-
-         if (  (  (ctx.peek(1) == '\\')
-               || (ctx.peek(1) == '!'))
-            && (ctx.peek(2) == '"'))
-         {
-            parse_string(ctx, pc, 2, false);
-            return(true);
-         }
-      }
-
-      // handle PAWN preprocessor args %0 .. %9
-      if (  cpd.in_preproc == CT_PP_DEFINE
-         && (ctx.peek() == '%')
-         && unc_isdigit(ctx.peek(1)))
-      {
-         pc.str.clear();
-         pc.str.append(ctx.get());
-         pc.str.append(ctx.get());
-         set_chunk_type(&pc, CT_WORD);
-         return(true);
-      }
-   }
-   // Parse strings and character constants
-
-//parse_word(ctx, pc_temp, true);
-//ctx.restore(ctx.c);
-   if (parse_number(ctx, pc))
-   {
-      return(true);
-   }
-
-   if (language_is_set(LANG_D))
-   {
-      // D specific stuff
-      if (d_parse_string(ctx, pc))
-      {
-         return(true);
-      }
-   }
-   else
-   {
-      // Not D stuff
-
-      // Check for L'a', L"abc", 'a', "abc", <abc> strings
-      ch = ctx.peek();
-      size_t ch1 = ctx.peek(1);
-
-      if (  (  (  (ch == 'L')
-               || (ch == 'S'))
-            && (  (ch1 == '"')
-               || (ch1 == '\'')))
-         || (ch == '"')
-         || (ch == '\'')
-         || (  (ch == '<')
-            && cpd.in_preproc == CT_PP_INCLUDE))
-      {
-         parse_string(ctx, pc, unc_isalpha(ch) ? 1 : 0, true);
-         set_chunk_parent(&pc, CT_PP_INCLUDE);
-         return(true);
-      }
-
-      if (  (ch == '<')
-         && cpd.in_preproc == CT_PP_DEFINE)
-      {
-         if (chunk_is_token(chunk_get_tail(), CT_MACRO))
-         {
-            // We have "#define XXX <", assume '<' starts an include string
-            parse_string(ctx, pc, 0, false);
-            return(true);
-         }
-      }
-
-      /* Inside clang's __has_include() could be "path/to/file.h" or system-style <path/to/file.h> */
-      if (  (ch == '(')
-         && (chunk_get_tail() != nullptr)
-         && (  chunk_is_token(chunk_get_tail(), CT_CNG_HASINC)
-            || chunk_is_token(chunk_get_tail(), CT_CNG_HASINCN)))
-      {
-         parse_string(ctx, pc, 0, false);
-         return(true);
-      }
-   }
-
-   // Check for Objective C literals and VALA identifiers ('@1', '@if')
-   if (  language_is_set(LANG_OC | LANG_VALA)
-      && (ctx.peek() == '@'))
-   {
-      size_t nc = ctx.peek(1);
-
-      if (nc == 'R') // Issue #2720
-      {
-         if (ctx.peek(2) == '"')
-         {
-            if (parse_cr_string(ctx, pc, 2)) // Issue #3027
-            {
-               return(true);
-            }
-            // parse string without escaping
-            parse_string(ctx, pc, 2, false);
-            return(true);
-         }
-      }
-
-      if (  (nc == '"')
-         || (nc == '\''))
-      {
-         // literal string
-         parse_string(ctx, pc, 1, true);
-         return(true);
-      }
-
-      if (  (nc >= '0')
-         && (nc <= '9'))
-      {
-         // literal number
-         pc.str.append(ctx.get());  // store the '@'
-         parse_number(ctx, pc);
-         return(true);
-      }
-   }
-
-   // Check for pawn/ObjectiveC/Java and normal identifiers
-   if (  CharTable::IsKw1(ctx.peek())
-      || (  (ctx.peek() == '\\')
-         && (unc_tolower(ctx.peek(1)) == 'u'))
-      || (  (ctx.peek() == '@')
-         && CharTable::IsKw1(ctx.peek(1))))
-   {
-      parse_word(ctx, pc, false);
-      return(true);
-   }
-
-   // Check for C++11/14/17/20 attribute specifier sequences
-   if (  language_is_set(LANG_CPP)
-      && ctx.peek() == '[')
-   {
-      if (  !language_is_set(LANG_OC)
-         || !chunk_is_token(prev_pc, CT_OC_AT))
-      {
-         if (auto length = parse_attribute_specifier_sequence(ctx))
-         {
-            extract_attribute_specifier_sequence(ctx, pc, length);
-            return(true);
-         }
-      }
-   }
-   // see if we have a punctuator
-   char punc_txt[7];
-
-   punc_txt[0] = ctx.peek();
-   punc_txt[1] = ctx.peek(1);
-   punc_txt[2] = ctx.peek(2);
-   punc_txt[3] = ctx.peek(3);
-   punc_txt[4] = ctx.peek(4);
-   punc_txt[5] = ctx.peek(5);
-   punc_txt[6] = '\0';
-   const chunk_tag_t *punc;
-
-   if ((punc = find_punctuator(punc_txt, cpd.lang_flags)) != nullptr)
-   {
-      int cnt = strlen(punc->tag);
-
-      while (cnt--)
-      {
-         pc.str.append(ctx.get());
-      }
-      set_chunk_type(&pc, punc->type);
-      pc.flags |= PCF_PUNCTUATOR;
-      return(true);
-   }
-   /* When parsing C/C++ files and running into some unknown token,
-    * check if matches Objective-C as a last resort, before
-    * considering it as garbage.
-    */
-   int probe_lang_flags = 0;
-
-   if (language_is_set(LANG_C | LANG_CPP))
-   {
-      probe_lang_flags = cpd.lang_flags | LANG_OC;
-   }
-
-   if (probe_lang_flags != 0)
-   {
-      if ((punc = find_punctuator(punc_txt, probe_lang_flags)) != NULL)
-      {
-         cpd.lang_flags = probe_lang_flags;
-         int cnt = strlen(punc->tag);
-
-         while (cnt--)
-         {
-            pc.str.append(ctx.get());
-         }
-         set_chunk_type(&pc, punc->type);
-         pc.flags |= PCF_PUNCTUATOR;
-         return(true);
-      }
-   }
-   // throw away this character
-   set_chunk_type(&pc, CT_UNKNOWN);
-   pc.str.append(ctx.get());
-
-   LOG_FMT(LWARN, "%s:%zu Garbage in col %d: %x\n",
-           cpd.filename.c_str(), pc.orig_line, (int)ctx.c.col, pc.str[0]);
-   cpd.error_count++;
-   return(true);
-} // parse_next
-
-
-int find_disable_processing_comment_marker(const unc_text &text,
-                                           std::size_t    start_idx)
-{
-   log_rule_B("disable_processing_cmt");
-   const auto &offtext = options::disable_processing_cmt();
-   int        idx      = -1;
-
-   if (  !offtext.empty()
-      && start_idx < text.size())
-   {
-      if (  offtext != UNCRUSTIFY_OFF_TEXT
-         && options::processing_cmt_as_regex())
-      {
-         std::wsmatch match;
-         std::wstring pc_wstring(text.get().cbegin() + start_idx,
-                                 text.get().cend());
-         std::wregex  criteria(std::wstring(offtext.cbegin(),
-                                            offtext.cend()));
-
-         std::regex_search(pc_wstring.cbegin(),
-                           pc_wstring.cend(),
-                           match,
-                           criteria);
-
-         if (!match.empty())
-         {
-            idx = int(match.position() + start_idx);
-         }
-      }
-      else
-      {
-         idx = text.find(offtext.c_str(),
-                         start_idx);
-
-         if (idx >= 0)
-         {
-            idx += int(offtext.size());
-         }
-      }
-
-      /**
-       *  update the position to the start of the current line
-       */
-      while (  idx > 0
-            && text[idx - 1] != '\n')
-      {
-         --idx;
-      }
-   }
-   return(idx);
-} // find_disable_processing_comment_marker
-
-
-int find_enable_processing_comment_marker(const unc_text &text,
-                                          std::size_t    start_idx)
-{
-   log_rule_B("enable_processing_cmt");
-   const auto &ontext = options::enable_processing_cmt();
-   int        idx     = -1;
-
-   if (  !ontext.empty()
-      && start_idx < text.size())
-   {
-      if (  ontext != UNCRUSTIFY_ON_TEXT
-         && options::processing_cmt_as_regex())
-      {
-         std::wsmatch match;
-         std::wstring pc_wstring(text.get().cbegin() + start_idx,
-                                 text.get().cend());
-         std::wregex  criteria(std::wstring(ontext.cbegin(),
-                                            ontext.cend()));
-
-         std::regex_search(pc_wstring.cbegin(),
-                           pc_wstring.cend(),
-                           match,
-                           criteria);
-
-         if (!match.empty())
-         {
-            idx = int(start_idx + match.position() + match.size());
-         }
-      }
-      else
-      {
-         idx = text.find(ontext.c_str(),
-                         start_idx);
-
-         if (idx >= 0)
-         {
-            idx += int(ontext.size());
-         }
-      }
-
-      /**
-       * update the position to the end of the current line
-       */
-      if (idx >= 0)
-      {
-         while (  idx < int(text.size())
-               && text[idx] != '\n')
-         {
-            ++idx;
-         }
-      }
-   }
-   return(idx);
-} // find_enable_processing_comment_marker
-
-
-void tokenize(const deque<int> &data, chunk_t *ref)
-{
-   tok_ctx ctx(data);
-   chunk_t chunk;
-   chunk_t *pc          = nullptr;
-   chunk_t *rprev       = nullptr;
-   bool    last_was_tab = false;
-   size_t  prev_sp      = 0;
-   int     num_stripped = 0;                    // Issue #1966
-
-   cpd.unc_stage = unc_stage_e::TOKENIZE;
-
-   while (ctx.more())
-   {
-      chunk.reset();
-      chunk.pp_level = 0;
-
-      if (!parse_next(ctx, chunk, pc))
-      {
-         LOG_FMT(LERR, "%s:%zu Bailed before the end?\n",
-                 cpd.filename.c_str(), ctx.c.row);
-         cpd.error_count++;
-         break;
-      }
-
-      if (  language_is_set(LANG_JAVA)
-         && chunk.type == CT_MEMBER
-         && !memcmp(chunk.text(), "->", 2))
-      {
-         chunk.type = CT_LAMBDA;
-      }
-
-      // Don't create an entry for whitespace
-      if (chunk.type == CT_WHITESPACE)
-      {
-         last_was_tab = chunk.after_tab;
-         prev_sp      = chunk.orig_prev_sp;
-         continue;
-      }
-      chunk.orig_prev_sp = prev_sp;
-      prev_sp            = 0;
-
-      if (chunk.type == CT_NEWLINE)
-      {
-         last_was_tab    = chunk.after_tab;
-         chunk.after_tab = false;
-         chunk.str.clear();
-      }
-      else if (chunk.type == CT_NL_CONT)
-      {
-         last_was_tab    = chunk.after_tab;
-         chunk.after_tab = false;
-         chunk.str       = "\\\n";
-      }
-      else
-      {
-         chunk.after_tab = last_was_tab;
-         last_was_tab    = false;
-      }
-
-      if (chunk.type != CT_IGNORED)
-      {
-         // Issue #1338
-         // Strip trailing whitespace (for CPP comments and PP blocks)
-         num_stripped = 0;                     // Issue #1966
-
-         while (  (chunk.str.size() > 0)
-               && (  (chunk.str[chunk.str.size() - 1] == ' ')
-                  || (chunk.str[chunk.str.size() - 1] == '\t')))
-         {
-            // If comment contains backslash '\' followed by whitespace chars, keep last one;
-            // this will prevent it from turning '\' into line continuation.
-            if (  (chunk.str.size() > 1)
-               && (chunk.str[chunk.str.size() - 2] == '\\'))
-            {
-               break;
-            }
-            chunk.str.pop_back();
-            num_stripped++;                    // Issue #1966
-         }
-      }
-      // Store off the end column
-      chunk.orig_col_end = ctx.c.col;
-
-      if (  (  chunk.type == CT_COMMENT_MULTI                  // Issue #1966
-            || chunk.type == CT_COMMENT
-            || chunk.type == CT_COMMENT_CPP)
-         && (pc != nullptr)
-         && chunk_is_token(pc, CT_PP_IGNORE))
-      {
-         chunk.orig_col_end -= num_stripped;
-      }
-      // Add the chunk to the list
-      rprev = pc;
-
-      if (rprev != nullptr)
-      {
-         chunk_flags_set(pc, rprev->flags & PCF_COPY_FLAGS);
-
-         // a newline can't be in a preprocessor
-         if (chunk_is_token(pc, CT_NEWLINE))
-         {
-            chunk_flags_clr(pc, PCF_IN_PREPROC);
-         }
-      }
-
-      if (ref != nullptr)
-      {
-         chunk.flags |= PCF_INSERTED;
-      }
-      else
-      {
-         chunk.flags &= ~PCF_INSERTED;
-      }
-      pc = chunk_add_before(&chunk, ref);
-
-      // A newline marks the end of a preprocessor
-      if (chunk_is_token(pc, CT_NEWLINE)) // || chunk_is_token(pc, CT_COMMENT_MULTI))
-      {
-         cpd.in_preproc         = CT_NONE;
-         cpd.preproc_ncnl_count = 0;
-      }
-
-      // Disable indentation when #asm directive found
-      if (chunk_is_token(pc, CT_PP_ASM))
-      {
-         LOG_FMT(LBCTRL, "Found a directive %s on line %zu\n", "#asm", pc->orig_line);
-         cpd.unc_off = true;
-      }
-
-      // Special handling for preprocessor stuff
-      if (cpd.in_preproc != CT_NONE)
-      {
-         chunk_flags_set(pc, PCF_IN_PREPROC);
-
-         // Count words after the preprocessor
-         if (  !chunk_is_comment(pc)
-            && !chunk_is_newline(pc))
-         {
-            cpd.preproc_ncnl_count++;
-         }
-
-         // Disable indentation if a #pragma asm directive is found
-         if (cpd.in_preproc == CT_PP_PRAGMA)
-         {
-            if (memcmp(pc->text(), "asm", 3) == 0)
-            {
-               LOG_FMT(LBCTRL, "Found a pragma %s on line %zu\n", "asm", pc->orig_line);
-               cpd.unc_off = true;
-            }
-         }
-
-         // Figure out the type of preprocessor for #include parsing
-         if (cpd.in_preproc == CT_PREPROC)
-         {
-            if (  pc->type < CT_PP_DEFINE
-               || pc->type > CT_PP_OTHER)
-            {
-               set_chunk_type(pc, CT_PP_OTHER);
-            }
-            cpd.in_preproc = pc->type;
-         }
-         else if (cpd.in_preproc == CT_PP_IGNORE)
-         {
-            // ASSERT(options::pp_ignore_define_body());
-            if (  !chunk_is_token(pc, CT_NL_CONT)
-               && !chunk_is_token(pc, CT_COMMENT_CPP)
-               && !chunk_is_token(pc, CT_COMMENT)
-               && !chunk_is_token(pc, CT_COMMENT_MULTI))     // Issue #1966
-            {
-               set_chunk_type(pc, CT_PP_IGNORE);
-            }
-         }
-         else if (  cpd.in_preproc == CT_PP_DEFINE
-                 && chunk_is_token(pc, CT_PAREN_CLOSE)
-                 && options::pp_ignore_define_body())
-         {
-            log_rule_B("pp_ignore_define_body");
-            // When we have a PAREN_CLOSE in a PP_DEFINE we should be terminating a MACRO_FUNC
-            // arguments list. Therefore we can enter the PP_IGNORE state and ignore next chunks.
-            cpd.in_preproc = CT_PP_IGNORE;
-         }
-      }
-      else
-      {
-         // Check for a preprocessor start
-         if (  chunk_is_token(pc, CT_POUND)
-            && (  rprev == nullptr
-               || chunk_is_token(rprev, CT_NEWLINE)))
-         {
-            set_chunk_type(pc, CT_PREPROC);
-            chunk_flags_set(pc, PCF_IN_PREPROC);
-            cpd.in_preproc = CT_PREPROC;
-         }
-      }
-
-      if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
-      }
-      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
-      {
-         LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, type is %s, orig_col_end is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->orig_col_end);
-      }
-      else
-      {
-         char copy[1000];
-         LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s, orig_col_end is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type), pc->orig_col_end);
-      }
-   }
-   // Set the cpd.newline string for this file
-   log_rule_B("newlines");
-
-   if (  options::newlines() == LE_LF
-      || (  options::newlines() == LE_AUTO
-         && (LE_COUNT(LF) >= LE_COUNT(CRLF))
-         && (LE_COUNT(LF) >= LE_COUNT(CR))))
-   {
-      // LF line ends
-      cpd.newline = "\n";
-      LOG_FMT(LLINEENDS, "Using LF line endings\n");
-   }
-   else if (  options::newlines() == LE_CRLF
-           || (  options::newlines() == LE_AUTO
-              && (LE_COUNT(CRLF) >= LE_COUNT(LF))
-              && (LE_COUNT(CRLF) >= LE_COUNT(CR))))
-   {
-      // CRLF line ends
-      cpd.newline = "\r\n";
-      LOG_FMT(LLINEENDS, "Using CRLF line endings\r\n");
-   }
-   else
-   {
-      // CR line ends
-      cpd.newline = "\r";
-      LOG_FMT(LLINEENDS, "Using CR line endings\n");
-   }
-} // tokenize
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.h
deleted file mode 100644
index 896dd511..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * @file tokenize.h
- * prototypes for tokenize.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef TOKENIZE_H_INCLUDED
-#define TOKENIZE_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * Test the input string to see if it satisfies the criteria
- * specified by the disable_processing_cmt option
- * @param  text      the string to which a match will be attempted
- * @param  start_idx the starting index within the string from which the
- *                   search will be performed
- * @return           returns a non-negative position index that points to the beginning
- *                   of the line containing the marker, if found
- */
-int find_disable_processing_comment_marker(const unc_text &text, std::size_t start_idx = 0);
-
-
-/**
- * Test the input string to see if it satisfies the criteria
- * specified by the enable_processing_cmt option
- * @param  text      the string to which a match will be attempted
- * @param  start_idx the starting index within the string from which the
- *                   search will be performed
- * @return           returns a non-negative position index that points to the end
- *                   of the line containing the marker, if found
- */
-int find_enable_processing_comment_marker(const unc_text &text, std::size_t start_idx = 0);
-
-
-/**
- * @brief Parse the text into chunks
- *
- * This function parses or tokenizes the whole buffer into a list.
- * It has to do some tricks to parse preprocessors.
- *
- * If output_text() were called immediately after, two things would happen:
- *  - trailing whitespace are removed.
- *  - leading space & tabs are converted to the appropriate format.
- *
- * All the tokens are inserted before ref. If ref is NULL, they are inserted
- * at the end of the list.  Line numbers are relative to the start of the data.
- */
-void tokenize(const std::deque<int> &data, chunk_t *ref);
-
-
-#endif /* TOKENIZE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.cpp
deleted file mode 100644
index 5f7362b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.cpp
+++ /dev/null
@@ -1,1724 +0,0 @@
-/**
- * @file tokenize_cleanup.cpp
- * Looks at simple sequences to refine the chunk types.
- * Examples:
- *  - change '[' + ']' into '[]'/
- *  - detect "version = 10;" vs "version (xxx) {"
- *
- * @author  Ben Gardner
- * @author  Guy Maurel 2015, 2021
- * @license GPL v2+
- */
-
-#include "tokenize_cleanup.h"
-
-#include "combine.h"
-#include "combine_skip.h"
-#include "flag_braced_init_list.h"
-#include "flag_decltype.h"
-#include "keywords.h"
-#include "prototypes.h"
-#include "punctuators.h"
-#include "space.h"
-#include "unc_ctype.h"
-
-
-using namespace uncrustify;
-
-
-/**
- * Mark types in a single template argument.
- *
- * @param start  chunk to start check at
- * @param end    chunk to end check at
- */
-static void check_template_arg(chunk_t *start, chunk_t *end);
-
-
-/**
- * Mark types in template argument(s).
- *
- * @param start  chunk to start check at
- * @param end    chunk to end check at
- */
-static void check_template_args(chunk_t *start, chunk_t *end);
-
-
-/**
- * If there is nothing but CT_WORD and CT_MEMBER, then it's probably a
- * template thingy.  Otherwise, it's likely a comparison.
- *
- * @param start  chunk to start check at
- */
-static void check_template(chunk_t *start, bool in_type_cast);
-
-
-/**
- * Convert '>' + '>' into '>>'
- * If we only have a single '>', then change it to CT_COMPARE.
- *
- * @param pc  chunk to start at
- */
-static chunk_t *handle_double_angle_close(chunk_t *pc);
-
-
-/**
- * Marks ObjC specific chunks in propery declaration, by setting
- * parent types and chunk types.
- */
-static void cleanup_objc_property(chunk_t *start);
-
-
-/**
- * Marks ObjC specific chunks in propery declaration (getter/setter attribute)
- * Will mark 'test4Setter'and ':' in '@property (setter=test4Setter:, strong) int test4;' as CT_OC_SEL_NAME
- */
-static void mark_selectors_in_property_with_open_paren(chunk_t *open_paren);
-
-
-/**
- * Marks ObjC specific chunks in propery declaration ( attributes)
- * Changes all the CT_WORD and CT_TYPE to CT_OC_PROPERTY_ATTR
- */
-static void mark_attributes_in_property_with_open_paren(chunk_t *open_paren);
-
-
-static chunk_t *handle_double_angle_close(chunk_t *pc)
-{
-   chunk_t *next = chunk_get_next(pc);
-
-   if (next != nullptr)
-   {
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         && chunk_is_token(next, CT_ANGLE_CLOSE)
-         && get_chunk_parent_type(pc) == CT_NONE
-         && (pc->orig_col_end + 1) == next->orig_col
-         && get_chunk_parent_type(next) == CT_NONE)
-      {
-         pc->str.append('>');
-         set_chunk_type(pc, CT_SHIFT);
-         pc->orig_col_end = next->orig_col_end;
-
-         chunk_t *tmp = chunk_get_next_ncnnl(next);
-         chunk_del(next);
-         next = tmp;
-      }
-      else
-      {
-         // bug #663
-         set_chunk_type(pc, CT_COMPARE);
-      }
-   }
-   return(next);
-}
-
-
-void split_off_angle_close(chunk_t *pc)
-{
-   const chunk_tag_t *ct = find_punctuator(pc->text() + 1, cpd.lang_flags);
-
-   if (ct == nullptr)
-   {
-      return;
-   }
-   chunk_t nc = *pc;
-
-   pc->str.resize(1);
-   pc->orig_col_end = pc->orig_col + 1;
-   set_chunk_type(pc, CT_ANGLE_CLOSE);
-
-   set_chunk_type(&nc, ct->type);
-   nc.str.pop_front();
-   nc.orig_col++;
-   nc.column++;
-   chunk_add_after(&nc, pc);
-}
-
-
-void tokenize_trailing_return_types(void)
-{
-   // Issue #2330
-   // auto max(int a, int b) -> int;
-   // Issue #2460
-   // auto f01() -> bool;
-   // auto f02() noexcept -> bool;
-   // auto f03() noexcept(true) -> bool;
-   // auto f04() noexcept(false) -> bool;
-   // auto f05() noexcept -> bool = delete;
-   // auto f06() noexcept(true) -> bool = delete;
-   // auto f07() noexcept(false) -> bool = delete;
-   // auto f11() const -> bool;
-   // auto f12() const noexcept -> bool;
-   // auto f13() const noexcept(true) -> bool;
-   // auto f14() const noexcept(false) -> bool;
-   // auto f15() const noexcept -> bool = delete;
-   // auto f16() const noexcept(true) -> bool = delete;
-   // auto f17() const noexcept(false) -> bool = delete;
-   // auto f21() throw() -> bool;
-   // auto f22() throw() -> bool = delete;
-   // auto f23() const throw() -> bool;
-   // auto f24() const throw() -> bool = delete;
-   chunk_t *pc;
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      char copy[1000];
-      LOG_FMT(LNOTE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
-
-      if (  chunk_is_token(pc, CT_MEMBER)
-         && (strcmp(pc->text(), "->") == 0))
-      {
-         chunk_t *tmp = chunk_get_prev_ncnnl(pc);
-         chunk_t *tmp_2;
-         chunk_t *open_paren;
-
-         if (chunk_is_token(tmp, CT_QUALIFIER))
-         {
-            // auto max(int a, int b) const -> int;
-            // auto f11() const -> bool;
-            tmp = chunk_get_prev_ncnnl(tmp);
-         }
-         else if (chunk_is_token(tmp, CT_NOEXCEPT))
-         {
-            // noexcept is present
-            tmp_2 = chunk_get_prev_ncnnl(tmp);
-
-            if (chunk_is_token(tmp_2, CT_QUALIFIER))
-            {
-               // auto f12() const noexcept -> bool;
-               // auto f15() const noexcept -> bool = delete;
-               tmp = chunk_get_prev_ncnnl(tmp_2);
-            }
-            else
-            {
-               // auto f02() noexcept -> bool;
-               // auto f05() noexcept -> bool = delete;
-               tmp = tmp_2;
-            }
-         }
-         else if (chunk_is_token(tmp, CT_PAREN_CLOSE))
-         {
-            open_paren = chunk_get_prev_type(tmp, CT_PAREN_OPEN, tmp->level);
-            tmp        = chunk_get_prev_ncnnl(open_paren);
-
-            if (chunk_is_token(tmp, CT_NOEXCEPT))
-            {
-               // noexcept is present
-               tmp_2 = chunk_get_prev_ncnnl(tmp);
-
-               if (chunk_is_token(tmp_2, CT_QUALIFIER))
-               {
-                  // auto f13() const noexcept(true) -> bool;
-                  // auto f14() const noexcept(false) -> bool;
-                  // auto f16() const noexcept(true) -> bool = delete;
-                  // auto f17() const noexcept(false) -> bool = delete;
-                  tmp = chunk_get_prev_ncnnl(tmp_2);
-               }
-               else
-               {
-                  // auto f03() noexcept(true) -> bool;
-                  // auto f04() noexcept(false) -> bool;
-                  // auto f06() noexcept(true) -> bool = delete;
-                  // auto f07() noexcept(false) -> bool = delete;
-                  tmp = tmp_2;
-               }
-            }
-            else if (chunk_is_token(tmp, CT_THROW))
-            {
-               // throw is present
-               tmp_2 = chunk_get_prev_ncnnl(tmp);
-
-               if (chunk_is_token(tmp_2, CT_QUALIFIER))
-               {
-                  // auto f23() const throw() -> bool;
-                  // auto f24() const throw() -> bool = delete;
-                  tmp = chunk_get_prev_ncnnl(tmp_2);
-               }
-               else
-               {
-                  // auto f21() throw() -> bool;
-                  // auto f22() throw() -> bool = delete;
-                  tmp = tmp_2;
-               }
-            }
-            else
-            {
-               LOG_FMT(LNOTE, "%s(%d): NOT COVERED\n", __func__, __LINE__);
-            }
-         }
-         else
-         {
-            LOG_FMT(LNOTE, "%s(%d): NOT COVERED\n", __func__, __LINE__);
-         }
-
-         if (  chunk_is_token(tmp, CT_FPAREN_CLOSE)
-            && (  get_chunk_parent_type(tmp) == CT_FUNC_PROTO
-               || get_chunk_parent_type(tmp) == CT_FUNC_DEF))
-         {
-            set_chunk_type(pc, CT_TRAILING_RET);
-            LOG_FMT(LNOTE, "%s(%d): set trailing return type for text() is '%s'\n",
-                    __func__, __LINE__, tmp->text());
-         }
-      }
-   }
-} // tokenize_trailing_return_types
-
-
-void tokenize_cleanup(void)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *prev = nullptr;
-   chunk_t *next;
-   bool    in_type_cast = false;
-
-   cpd.unc_stage = unc_stage_e::TOKENIZE_CLEANUP;
-
-   /*
-    * Since [] is expected to be TSQUARE for the 'operator', we need to make
-    * this change in the first pass.
-    */
-   chunk_t *pc;
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (chunk_is_token(pc, CT_SQUARE_OPEN))
-      {
-         next = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(next, CT_SQUARE_CLOSE))
-         {
-            // Change '[' + ']' into '[]'
-            set_chunk_type(pc, CT_TSQUARE);
-            pc->str = "[]";
-            /*
-             * bug #664: The original orig_col_end of CT_SQUARE_CLOSE is
-             * stored at orig_col_end of CT_TSQUARE.
-             * pc->orig_col_end += 1;
-             */
-            pc->orig_col_end = next->orig_col_end;
-            chunk_del(next);
-         }
-      }
-
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && pc->flags.test(PCF_IN_PREPROC)
-         && !chunk_get_next_ncnnl(pc, scope_e::PREPROC))
-      {
-         LOG_FMT(LNOTE, "%s(%d): %s:%zu Detected a macro that ends with a semicolon. Possible failures if used.\n",
-                 __func__, __LINE__, cpd.filename.c_str(), pc->orig_line);
-      }
-   }
-
-   // change := to CT_SQL_ASSIGN Issue #527
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
-   {
-      if (chunk_is_token(pc, CT_COLON))
-      {
-         next = chunk_get_next_ncnnl(pc);
-
-         if (chunk_is_token(next, CT_ASSIGN))
-         {
-            // Change ':' + '=' into ':='
-            set_chunk_type(pc, CT_SQL_ASSIGN);
-            pc->str          = ":=";
-            pc->orig_col_end = next->orig_col_end;
-            chunk_del(next);
-         }
-      }
-   }
-
-   // We can handle everything else in the second pass
-   pc   = chunk_get_head();
-   next = chunk_get_next_ncnnl(pc);
-
-   while (  pc != nullptr
-         && next != nullptr)
-   {
-      if (  chunk_is_token(pc, CT_DOT)
-         && language_is_set(LANG_ALLC))
-      {
-         set_chunk_type(pc, CT_MEMBER);
-      }
-
-      if (  chunk_is_token(pc, CT_NULLCOND)
-         && language_is_set(LANG_CS))
-      {
-         set_chunk_type(pc, CT_MEMBER);
-      }
-
-      // Determine the version stuff (D only)
-      if (chunk_is_token(pc, CT_D_VERSION))
-      {
-         if (chunk_is_token(next, CT_PAREN_OPEN))
-         {
-            set_chunk_type(pc, CT_D_VERSION_IF);
-         }
-         else
-         {
-            if (next->type != CT_ASSIGN)
-            {
-               LOG_FMT(LERR, "%s(%d): %s:%zu: version: Unexpected token %s\n",
-                       __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, get_token_name(next->type));
-               cpd.error_count++;
-            }
-            set_chunk_type(pc, CT_WORD);
-         }
-      }
-
-      // Determine the scope stuff (D only)
-      if (chunk_is_token(pc, CT_D_SCOPE))
-      {
-         if (chunk_is_token(next, CT_PAREN_OPEN))
-         {
-            set_chunk_type(pc, CT_D_SCOPE_IF);
-         }
-         else
-         {
-            set_chunk_type(pc, CT_TYPE);
-         }
-      }
-
-      /*
-       * Change CT_BASE before CT_PAREN_OPEN to CT_WORD.
-       * public myclass() : base() {}
-       * -or-
-       * var x = (T)base.y;
-       */
-      if (  chunk_is_token(pc, CT_BASE)
-         && (  chunk_is_token(next, CT_PAREN_OPEN)
-            || chunk_is_token(next, CT_DOT)))
-      {
-         set_chunk_type(pc, CT_WORD);
-      }
-
-      if (  chunk_is_token(pc, CT_ENUM)
-         && (  chunk_is_token(next, CT_STRUCT)
-            || chunk_is_token(next, CT_CLASS)))
-      {
-         set_chunk_type(next, CT_ENUM_CLASS);
-      }
-      chunk_t *next_non_attr = language_is_set(LANG_CPP) ? skip_attribute_next(next) : next;
-
-      /*
-       * Change CT_WORD after CT_ENUM, CT_UNION, CT_STRUCT, or CT_CLASS to CT_TYPE
-       * Change CT_WORD before CT_WORD to CT_TYPE
-       */
-      if (chunk_is_token(next_non_attr, CT_WORD))
-      {
-         if (  chunk_is_token(pc, CT_ENUM)
-            || chunk_is_token(pc, CT_ENUM_CLASS)
-            || chunk_is_token(pc, CT_UNION)
-            || chunk_is_token(pc, CT_STRUCT)
-            || chunk_is_token(pc, CT_CLASS))
-         {
-            set_chunk_type(next_non_attr, CT_TYPE);
-         }
-
-         if (chunk_is_token(pc, CT_WORD))
-         {
-            set_chunk_type(pc, CT_TYPE);
-         }
-      }
-
-      /*
-       * change extern to qualifier if extern isn't followed by a string or
-       * an open parenthesis
-       */
-      if (chunk_is_token(pc, CT_EXTERN))
-      {
-         if (chunk_is_token(next, CT_STRING))
-         {
-            // Probably 'extern "C"'
-         }
-         else if (chunk_is_token(next, CT_PAREN_OPEN))
-         {
-            // Probably 'extern (C)'
-         }
-         else
-         {
-            // Something else followed by a open brace
-            chunk_t *tmp = chunk_get_next_ncnnl(next);
-
-            if (  tmp == nullptr
-               || tmp->type != CT_BRACE_OPEN)
-            {
-               set_chunk_type(pc, CT_QUALIFIER);
-            }
-         }
-      }
-
-      /*
-       * Change CT_STAR to CT_PTR_TYPE if preceded by
-       *     CT_TYPE, CT_QUALIFIER, or CT_PTR_TYPE
-       * or by a
-       *     CT_WORD which is preceded by CT_DC_MEMBER: '::aaa *b'
-       */
-      if (  (chunk_is_token(next, CT_STAR))
-         || (  language_is_set(LANG_CPP)
-            && (chunk_is_token(next, CT_CARET)))
-         || (  language_is_set(LANG_CS)
-            && (chunk_is_token(next, CT_QUESTION))
-            && (strcmp(pc->text(), "null") != 0)))
-      {
-         if (  chunk_is_token(pc, CT_TYPE)
-            || chunk_is_token(pc, CT_QUALIFIER)
-            || chunk_is_token(pc, CT_PTR_TYPE))
-         {
-            set_chunk_type(next, CT_PTR_TYPE);
-         }
-      }
-
-      if (  chunk_is_token(pc, CT_TYPE_CAST)
-         && chunk_is_token(next, CT_ANGLE_OPEN))
-      {
-         set_chunk_parent(next, CT_TYPE_CAST);
-         in_type_cast = true;
-      }
-
-      if (chunk_is_token(pc, CT_DECLTYPE))
-      {
-         flag_cpp_decltype(pc);
-      }
-
-      // Change angle open/close to CT_COMPARE, if not a template thingy
-      if (  chunk_is_token(pc, CT_ANGLE_OPEN)
-         && pc->parent_type != CT_TYPE_CAST)
-      {
-         /*
-          * pretty much all languages except C use <> for something other than
-          * comparisons.  "#include<xxx>" is handled elsewhere.
-          */
-         if (language_is_set(LANG_OC | LANG_CPP | LANG_CS | LANG_JAVA | LANG_VALA))
-         {
-            // bug #663
-            check_template(pc, in_type_cast);
-         }
-         else
-         {
-            // convert CT_ANGLE_OPEN to CT_COMPARE
-            set_chunk_type(pc, CT_COMPARE);
-         }
-      }
-
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         && pc->parent_type != CT_TEMPLATE)
-      {
-         if (in_type_cast)
-         {
-            in_type_cast = false;
-            set_chunk_parent(pc, CT_TYPE_CAST);
-         }
-         else
-         {
-            next = handle_double_angle_close(pc);
-         }
-      }
-
-      if (language_is_set(LANG_D))
-      {
-         // Check for the D string concat symbol '~'
-         if (  chunk_is_token(pc, CT_INV)
-            && (  chunk_is_token(prev, CT_STRING)
-               || chunk_is_token(prev, CT_WORD)
-               || chunk_is_token(next, CT_STRING)))
-         {
-            set_chunk_type(pc, CT_CONCAT);
-         }
-
-         // Check for the D template symbol '!' (word + '!' + word or '(')
-         if (  chunk_is_token(pc, CT_NOT)
-            && chunk_is_token(prev, CT_WORD)
-            && (  chunk_is_token(next, CT_PAREN_OPEN)
-               || chunk_is_token(next, CT_WORD)
-               || chunk_is_token(next, CT_TYPE)
-               || chunk_is_token(next, CT_NUMBER)
-               || chunk_is_token(next, CT_NUMBER_FP)
-               || chunk_is_token(next, CT_STRING)
-               || chunk_is_token(next, CT_STRING_MULTI)))
-         {
-            set_chunk_type(pc, CT_D_TEMPLATE);
-         }
-
-         // handle "version(unittest) { }" vs "unittest { }"
-         if (  chunk_is_token(pc, CT_UNITTEST)
-            && chunk_is_token(prev, CT_PAREN_OPEN))
-         {
-            set_chunk_type(pc, CT_WORD);
-         }
-
-         // handle 'static if' and merge the tokens
-         if (  chunk_is_token(pc, CT_IF)
-            && chunk_is_str(prev, "static", 6))
-         {
-            // delete PREV and merge with IF
-            pc->str.insert(0, ' ');
-            pc->str.insert(0, prev->str);
-            pc->orig_col  = prev->orig_col;
-            pc->orig_line = prev->orig_line;
-            chunk_t *to_be_deleted = prev;
-            prev = chunk_get_prev_ncnnl(prev);
-
-            if (prev != nullptr)
-            {
-               chunk_del(to_be_deleted);
-            }
-         }
-      }
-
-      if (language_is_set(LANG_CPP))
-      {
-         // Change Word before '::' into a type
-         if (  chunk_is_token(pc, CT_WORD)
-            && chunk_is_token(next, CT_DC_MEMBER))
-         {
-            prev = chunk_get_prev(pc);
-
-            if (prev == nullptr)                  // Issue #3010
-            {
-               set_chunk_type(pc, CT_TYPE);
-            }
-            else
-            {
-               if (chunk_is_token(prev, CT_COLON))
-               {
-                  // nothing to do
-               }
-               else
-               {
-                  set_chunk_type(pc, CT_TYPE);
-               }
-            }
-         }
-
-         // Set parent type for 'if constexpr'
-         if (  chunk_is_token(prev, CT_IF)
-            && chunk_is_token(pc, CT_QUALIFIER)
-            && chunk_is_str(pc, "constexpr", 9))
-         {
-            set_chunk_type(pc, CT_CONSTEXPR);
-         }
-      }
-
-      // Change get/set to CT_WORD if not followed by a brace open
-      if (  chunk_is_token(pc, CT_GETSET)
-         && next->type != CT_BRACE_OPEN)
-      {
-         if (  chunk_is_token(next, CT_SEMICOLON)
-            && (  chunk_is_token(prev, CT_BRACE_CLOSE)
-               || chunk_is_token(prev, CT_BRACE_OPEN)
-               || chunk_is_token(prev, CT_SEMICOLON)))
-         {
-            set_chunk_type(pc, CT_GETSET_EMPTY);
-            set_chunk_parent(next, CT_GETSET);
-         }
-         else
-         {
-            set_chunk_type(pc, CT_WORD);
-         }
-      }
-
-      /*
-       * Interface is only a keyword in MS land if followed by 'class' or 'struct'
-       * likewise, 'class' may be a member name in Java.
-       */
-      if (  chunk_is_token(pc, CT_CLASS)
-         && !CharTable::IsKw1(next->str[0]))
-      {
-         if (  chunk_is_not_token(next, CT_DC_MEMBER)
-            && chunk_is_not_token(next, CT_ATTRIBUTE))                       // Issue #2570
-         {
-            set_chunk_type(pc, CT_WORD);
-         }
-         else if (  chunk_is_token(prev, CT_DC_MEMBER)
-                 || chunk_is_token(prev, CT_TYPE))
-         {
-            set_chunk_type(pc, CT_TYPE);
-         }
-         else if (chunk_is_token(next, CT_DC_MEMBER))
-         {
-            chunk_t *next2 = chunk_get_next_nblank(next);
-
-            if (  chunk_is_token(next2, CT_INV)      // CT_INV hasn't turned into CT_DESTRUCTOR just yet
-               || (  chunk_is_token(next2, CT_CLASS) // constructor isn't turned into CT_FUNC* just yet
-                  && !strcmp(pc->text(), next2->text())))
-            {
-               set_chunk_type(pc, CT_TYPE);
-            }
-         }
-      }
-
-      /*
-       * Change item after operator (>=, ==, etc) to a CT_OPERATOR_VAL
-       * Usually the next item is part of the operator.
-       * In a few cases the next few tokens are part of it:
-       *  operator +       - common case
-       *  operator >>      - need to combine '>' and '>'
-       *  operator ()
-       *  operator []      - already converted to TSQUARE
-       *  operator new []
-       *  operator delete []
-       *  operator const char *
-       *  operator const B&
-       *  operator std::allocator<U>
-       *
-       * In all cases except the last, this will put the entire operator value
-       * in one chunk.
-       */
-      if (chunk_is_token(pc, CT_OPERATOR))
-      {
-         chunk_t *tmp2 = chunk_get_next(next);
-
-         // Handle special case of () operator -- [] already handled
-         if (chunk_is_token(next, CT_PAREN_OPEN))
-         {
-            chunk_t *tmp = chunk_get_next(next);
-
-            if (chunk_is_token(tmp, CT_PAREN_CLOSE))
-            {
-               next->str = "()";
-               set_chunk_type(next, CT_OPERATOR_VAL);
-               chunk_del(tmp);
-               next->orig_col_end += 1;
-            }
-         }
-         else if (  chunk_is_token(next, CT_ANGLE_CLOSE)
-                 && chunk_is_token(tmp2, CT_ANGLE_CLOSE)
-                 && tmp2->orig_col == next->orig_col_end)
-         {
-            next->str.append('>');
-            next->orig_col_end++;
-            set_chunk_type(next, CT_OPERATOR_VAL);
-            chunk_del(tmp2);
-         }
-         else if (next->flags.test(PCF_PUNCTUATOR))
-         {
-            set_chunk_type(next, CT_OPERATOR_VAL);
-         }
-         else
-         {
-            set_chunk_type(next, CT_TYPE);
-
-            /*
-             * Replace next with a collection of all tokens that are part of
-             * the type.
-             */
-            tmp2 = next;
-            chunk_t *tmp;
-
-            while ((tmp = chunk_get_next(tmp2)) != nullptr)
-            {
-               if (  tmp->type != CT_WORD
-                  && tmp->type != CT_TYPE
-                  && tmp->type != CT_QUALIFIER
-                  && tmp->type != CT_STAR
-                  && tmp->type != CT_CARET
-                  && tmp->type != CT_AMP
-                  && tmp->type != CT_TSQUARE)
-               {
-                  break;
-               }
-               // Change tmp into a type so that space_needed() works right
-               make_type(tmp);
-               size_t num_sp = space_needed(tmp2, tmp);
-
-               while (num_sp-- > 0)
-               {
-                  next->str.append(" ");
-               }
-               next->str.append(tmp->str);
-               tmp2 = tmp;
-            }
-
-            while ((tmp2 = chunk_get_next(next)) != tmp)
-            {
-               chunk_del(tmp2);
-            }
-            set_chunk_type(next, CT_OPERATOR_VAL);
-
-            next->orig_col_end = next->orig_col + next->len();
-         }
-         set_chunk_parent(next, CT_OPERATOR);
-
-         LOG_FMT(LOPERATOR, "%s(%d): %zu:%zu operator '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, next->text());
-      }
-
-      // Change private, public, protected into either a qualifier or label
-      if (chunk_is_token(pc, CT_ACCESS))
-      {
-         // Handle Qt slots - maybe should just check for a CT_WORD?
-         if (  chunk_is_str(next, "slots", 5)
-            || chunk_is_str(next, "Q_SLOTS", 7))
-         {
-            chunk_t *tmp = chunk_get_next(next);
-
-            if (chunk_is_token(tmp, CT_COLON))
-            {
-               next = tmp;
-            }
-         }
-
-         if (chunk_is_token(next, CT_COLON))
-         {
-            set_chunk_type(next, CT_ACCESS_COLON);
-            chunk_t *tmp;
-
-            if ((tmp = chunk_get_next_ncnnl(next)) != nullptr)
-            {
-               chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
-            }
-         }
-         else
-         {
-            set_chunk_type(pc, (  chunk_is_str(pc, "signals", 7)
-                               || chunk_is_str(pc, "Q_SIGNALS", 9))
-                           ? CT_WORD : CT_QUALIFIER);
-         }
-      }
-
-      // Look for <newline> 'EXEC' 'SQL'
-      if (  (  chunk_is_str_case(pc, "EXEC", 4)
-            && chunk_is_str_case(next, "SQL", 3))
-         || (  (*pc->str.c_str() == '$')
-            && pc->type != CT_SQL_WORD
-               /* but avoid breaking tokenization for C# 6 interpolated strings. */
-            && (  !language_is_set(LANG_CS)
-               || (  chunk_is_token(pc, CT_STRING)
-                  && (!pc->str.startswith("$\""))
-                  && (!pc->str.startswith("$@\""))))))
-      {
-         chunk_t *tmp = chunk_get_prev(pc);
-
-         if (chunk_is_newline(tmp))
-         {
-            if (*pc->str.c_str() == '$')
-            {
-               set_chunk_type(pc, CT_SQL_EXEC);
-
-               if (pc->len() > 1)
-               {
-                  // SPLIT OFF '$'
-                  chunk_t nc;
-
-                  nc = *pc;
-                  pc->str.resize(1);
-                  pc->orig_col_end = pc->orig_col + 1;
-
-                  set_chunk_type(&nc, CT_SQL_WORD);
-                  nc.str.pop_front();
-                  nc.orig_col++;
-                  nc.column++;
-                  chunk_add_after(&nc, pc);
-
-                  next = chunk_get_next(pc);
-               }
-            }
-            tmp = chunk_get_next(next);
-
-            if (chunk_is_str_case(tmp, "BEGIN", 5))
-            {
-               set_chunk_type(pc, CT_SQL_BEGIN);
-            }
-            else if (chunk_is_str_case(tmp, "END", 3))
-            {
-               set_chunk_type(pc, CT_SQL_END);
-            }
-            else
-            {
-               set_chunk_type(pc, CT_SQL_EXEC);
-            }
-
-            // Change words into CT_SQL_WORD until CT_SEMICOLON
-            while (tmp != nullptr)
-            {
-               if (chunk_is_token(tmp, CT_SEMICOLON))
-               {
-                  break;
-               }
-
-               if (  (tmp->len() > 0)
-                  && (  unc_isalpha(*tmp->str.c_str())
-                     || (*tmp->str.c_str() == '$')))
-               {
-                  set_chunk_type(tmp, CT_SQL_WORD);
-               }
-               tmp = chunk_get_next_ncnnl(tmp);
-            }
-         }
-      }
-
-      // handle MS abomination 'for each'
-      if (  chunk_is_token(pc, CT_FOR)
-         && chunk_is_str(next, "each", 4)
-         && (next == chunk_get_next(pc)))
-      {
-         // merge the two with a space between
-         pc->str.append(' ');
-         pc->str         += next->str;
-         pc->orig_col_end = next->orig_col_end;
-         chunk_del(next);
-         next = chunk_get_next_ncnnl(pc);
-
-         // label the 'in'
-         if (chunk_is_token(next, CT_PAREN_OPEN))
-         {
-            chunk_t *tmp = chunk_get_next_ncnnl(next);
-
-            while (  tmp != nullptr
-                  && tmp->type != CT_PAREN_CLOSE)
-            {
-               if (chunk_is_str(tmp, "in", 2))
-               {
-                  set_chunk_type(tmp, CT_IN);
-                  break;
-               }
-               tmp = chunk_get_next_ncnnl(tmp);
-            }
-         }
-      }
-
-      /*
-       * ObjectiveC allows keywords to be used as identifiers in some situations
-       * This is a dirty hack to allow some of the more common situations.
-       */
-      if (language_is_set(LANG_OC))
-      {
-         if (  (  chunk_is_token(pc, CT_IF)
-               || chunk_is_token(pc, CT_FOR)
-               || chunk_is_token(pc, CT_WHILE))
-            && !chunk_is_token(next, CT_PAREN_OPEN))
-         {
-            set_chunk_type(pc, CT_WORD);
-         }
-
-         if (  chunk_is_token(pc, CT_DO)
-            && (  chunk_is_token(prev, CT_MINUS)
-               || chunk_is_token(next, CT_SQUARE_CLOSE)))
-         {
-            set_chunk_type(pc, CT_WORD);
-         }
-
-         // Fix self keyword back to word when mixing c++/objective-c
-         if (  chunk_is_token(pc, CT_THIS)
-            && !strcmp(pc->text(), "self")
-            && (  chunk_is_token(next, CT_COMMA)
-               || chunk_is_token(next, CT_PAREN_CLOSE)))
-         {
-            set_chunk_type(pc, CT_WORD);
-         }
-
-         // Fix self keyword back to word when mixing c++/objective-c
-         if (  chunk_is_token(pc, CT_THIS)
-            && !strcmp(pc->text(), "self")
-            && (  chunk_is_token(next, CT_COMMA)
-               || chunk_is_token(next, CT_PAREN_CLOSE)))
-         {
-            set_chunk_type(pc, CT_WORD);
-         }
-      }
-
-      // Another hack to clean up more keyword abuse
-      if (  chunk_is_token(pc, CT_CLASS)
-         && (  chunk_is_token(prev, CT_DOT)
-            || chunk_is_token(next, CT_DOT)
-            || chunk_is_token(prev, CT_MEMBER)  // Issue #3031
-            || chunk_is_token(next, CT_MEMBER)))
-      {
-         set_chunk_type(pc, CT_WORD);
-      }
-
-      // Detect Objective C class name
-      if (  chunk_is_token(pc, CT_OC_IMPL)
-         || chunk_is_token(pc, CT_OC_INTF)
-         || chunk_is_token(pc, CT_OC_PROTOCOL))
-      {
-         if (next->type != CT_PAREN_OPEN)
-         {
-            set_chunk_type(next, CT_OC_CLASS);
-         }
-         set_chunk_parent(next, pc->type);
-
-         chunk_t *tmp = chunk_get_next_ncnnl(next);
-
-         if (tmp != nullptr)
-         {
-            chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
-         }
-         tmp = chunk_get_next_type(pc, CT_OC_END, pc->level);
-
-         if (tmp != nullptr)
-         {
-            set_chunk_parent(tmp, pc->type);
-         }
-      }
-
-      if (chunk_is_token(pc, CT_OC_INTF))
-      {
-         chunk_t *tmp = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-
-         while (  tmp != nullptr
-               && tmp->type != CT_OC_END)
-         {
-            if (get_token_pattern_class(tmp->type) != pattern_class_e::NONE)
-            {
-               LOG_FMT(LOBJCWORD, "%s(%d): @interface %zu:%zu change '%s' (%s) to CT_WORD\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, tmp->text(),
-                       get_token_name(tmp->type));
-               set_chunk_type(tmp, CT_WORD);
-            }
-            tmp = chunk_get_next_ncnnl(tmp, scope_e::PREPROC);
-         }
-      }
-
-      /*
-       * Detect Objective-C categories and class extensions:
-       *   @interface ClassName (CategoryName)
-       *   @implementation ClassName (CategoryName)
-       *   @interface ClassName ()
-       *   @implementation ClassName ()
-       */
-      if (  (  get_chunk_parent_type(pc) == CT_OC_IMPL
-            || get_chunk_parent_type(pc) == CT_OC_INTF
-            || chunk_is_token(pc, CT_OC_CLASS))
-         && chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         set_chunk_parent(next, get_chunk_parent_type(pc));
-
-         chunk_t *tmp = chunk_get_next(next);
-
-         if (  tmp != nullptr
-            && tmp->next != nullptr)
-         {
-            if (chunk_is_token(tmp, CT_PAREN_CLOSE))
-            {
-               //set_chunk_type(tmp, CT_OC_CLASS_EXT);
-               set_chunk_parent(tmp, get_chunk_parent_type(pc));
-            }
-            else
-            {
-               set_chunk_type(tmp, CT_OC_CATEGORY);
-               set_chunk_parent(tmp, get_chunk_parent_type(pc));
-            }
-         }
-         tmp = chunk_get_next_type(pc, CT_PAREN_CLOSE, pc->level);
-
-         if (tmp != nullptr)
-         {
-            set_chunk_parent(tmp, get_chunk_parent_type(pc));
-         }
-      }
-
-      /*
-       * Detect Objective C @property:
-       *   @property NSString *stringProperty;
-       *   @property(nonatomic, retain) NSMutableDictionary *shareWith;
-       */
-      if (chunk_is_token(pc, CT_OC_PROPERTY))
-      {
-         if (next->type != CT_PAREN_OPEN)
-         {
-            chunk_flags_set(next, PCF_STMT_START | PCF_EXPR_START);
-         }
-         else
-         {
-            cleanup_objc_property(pc);
-         }
-      }
-
-      /*
-       * Detect Objective C @selector:
-       *   @selector(msgNameWithNoArg)
-       *   @selector(msgNameWith1Arg:)
-       *   @selector(msgNameWith2Args:arg2Name:)
-       */
-      if (  chunk_is_token(pc, CT_OC_SEL)
-         && chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         set_chunk_parent(next, pc->type);
-
-         chunk_t *tmp = chunk_get_next(next);
-
-         if (tmp != nullptr)
-         {
-            set_chunk_type(tmp, CT_OC_SEL_NAME);
-            set_chunk_parent(tmp, pc->type);
-
-            while ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
-            {
-               if (chunk_is_token(tmp, CT_PAREN_CLOSE))
-               {
-                  set_chunk_parent(tmp, CT_OC_SEL);
-                  break;
-               }
-               set_chunk_type(tmp, CT_OC_SEL_NAME);
-               set_chunk_parent(tmp, pc->type);
-            }
-         }
-      }
-
-      // Handle special preprocessor junk
-      if (chunk_is_token(pc, CT_PREPROC))
-      {
-         set_chunk_parent(pc, next->type);
-      }
-
-      // Detect "pragma region" and "pragma endregion"
-      if (  chunk_is_token(pc, CT_PP_PRAGMA)
-         && chunk_is_token(next, CT_PREPROC_BODY))
-      {
-         if (  (strncmp(next->str.c_str(), "region", 6) == 0)
-            || (strncmp(next->str.c_str(), "endregion", 9) == 0))
-         // TODO: probably better use strncmp
-         {
-            set_chunk_type(pc, (*next->str.c_str() == 'r') ? CT_PP_REGION : CT_PP_ENDREGION);
-
-            set_chunk_parent(prev, pc->type);
-         }
-      }
-
-      // Change 'default(' into a sizeof-like statement
-      if (  language_is_set(LANG_CS)
-         && chunk_is_token(pc, CT_DEFAULT)
-         && chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         set_chunk_type(pc, CT_SIZEOF);
-      }
-
-      if (  chunk_is_token(pc, CT_UNSAFE)
-         && next->type != CT_BRACE_OPEN)
-      {
-         set_chunk_type(pc, CT_QUALIFIER);
-      }
-
-      if (  (  chunk_is_token(pc, CT_USING)
-            || (  chunk_is_token(pc, CT_TRY)
-               && language_is_set(LANG_JAVA)))
-         && chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         set_chunk_type(pc, CT_USING_STMT);
-      }
-
-      // Add minimal support for C++0x rvalue references
-      if (  chunk_is_token(pc, CT_BOOL)
-         && language_is_set(LANG_CPP)
-         && chunk_is_str(pc, "&&", 2))
-      {
-         if (chunk_is_token(prev, CT_TYPE))
-         {
-            // Issue # 1002
-            if (!pc->flags.test(PCF_IN_TEMPLATE))
-            {
-               set_chunk_type(pc, CT_BYREF);
-            }
-         }
-      }
-
-      /*
-       * HACK: treat try followed by a colon as a qualifier to handle this:
-       *   A::A(int) try : B() { } catch (...) { }
-       */
-      if (  chunk_is_token(pc, CT_TRY)
-         && chunk_is_str(pc, "try", 3)
-         && chunk_is_token(next, CT_COLON))
-      {
-         set_chunk_type(pc, CT_QUALIFIER);
-      }
-
-      /*
-       * If Java's 'synchronized' is in a method declaration, it should be
-       * a qualifier.
-       */
-      if (  language_is_set(LANG_JAVA)
-         && chunk_is_token(pc, CT_SYNCHRONIZED)
-         && next->type != CT_PAREN_OPEN)
-      {
-         set_chunk_type(pc, CT_QUALIFIER);
-      }
-
-      // change CT_DC_MEMBER + CT_FOR into CT_DC_MEMBER + CT_FUNC_CALL
-      if (  chunk_is_token(pc, CT_FOR)
-         && chunk_is_token(pc->prev, CT_DC_MEMBER))
-      {
-         set_chunk_type(pc, CT_FUNC_CALL);
-      }
-      // TODO: determine other stuff here
-
-      prev = pc;
-      pc   = next;
-      next = chunk_get_next_ncnnl(pc);
-   }
-} // tokenize_cleanup
-
-
-bool invalid_open_angle_template(chunk_t *prev)
-{
-   if (prev == nullptr)
-   {
-      return(false);
-   }
-   // A template requires a word/type right before the open angle
-   return(  prev->type != CT_WORD
-         && prev->type != CT_TYPE
-         && prev->type != CT_COMMA
-         && prev->type != CT_QUALIFIER
-         && prev->type != CT_OPERATOR_VAL
-         && get_chunk_parent_type(prev) != CT_OPERATOR);
-}
-
-
-static void check_template(chunk_t *start, bool in_type_cast)
-{
-   LOG_FMT(LTEMPL, "%s(%d): orig_line %zu, orig_col %zu:\n",
-           __func__, __LINE__, start->orig_line, start->orig_col);
-
-   chunk_t *prev = chunk_get_prev_ncnnl(start, scope_e::PREPROC);
-
-   if (prev == nullptr)
-   {
-      return;
-   }
-   chunk_t *end;
-   chunk_t *pc;
-
-   if (chunk_is_token(prev, CT_TEMPLATE))
-   {
-      LOG_FMT(LTEMPL, "%s(%d): CT_TEMPLATE:\n", __func__, __LINE__);
-
-      // We have: "template< ... >", which is a template declaration
-      size_t level  = 1;
-      size_t parens = 0;
-
-      for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
-           pc != nullptr;
-           pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
-      {
-         LOG_FMT(LTEMPL, "%s(%d): type is %s, level is %zu\n",
-                 __func__, __LINE__, get_token_name(pc->type), level);
-
-         if (  (pc->str[0] == '>')
-            && (pc->len() > 1))
-         {
-            if (pc->str[1] == '=')                         // Issue #1462 and #2565
-            {
-               LOG_FMT(LTEMPL, "%s(%d): do not split '%s' at orig_line %zu, orig_col %zu\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-            }
-            else
-            {
-               LOG_FMT(LTEMPL, "%s(%d): {split '%s' at orig_line %zu, orig_col %zu}\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-               split_off_angle_close(pc);
-            }
-         }
-
-         if (chunk_is_token(pc, CT_DECLTYPE))
-         {
-            flag_cpp_decltype(pc);
-         }
-         else if (chunk_is_token(pc, CT_PAREN_OPEN))
-         {
-            ++parens;
-         }
-         else if (chunk_is_token(pc, CT_PAREN_CLOSE))
-         {
-            --parens;
-         }
-
-         if (parens == 0)
-         {
-            if (chunk_is_str(pc, "<", 1))
-            {
-               level++;
-            }
-            else if (chunk_is_str(pc, ">", 1))
-            {
-               if (level == 0)
-               {
-                  fprintf(stderr, "%s(%d): level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
-               level--;
-
-               if (level == 0)
-               {
-                  break;
-               }
-            }
-         }
-      }
-
-      end = pc;
-   }
-   else
-   {
-      /*
-       * We may have something like "a< ... >", which is a template where
-       * '...' may consist of anything except a semicolon, unbalanced
-       * parens, or braces (with one exception being braced initializers
-       * embedded within decltypes).
-       *
-       * For example, braces may be encountered as such in the following
-       * snippet of valid C++ code:
-       *
-       * template<typename T,
-       *          typename = enable_if_t<is_same<typename decay<T>::type,
-       *                                          decltype (make_index_sequence<5> { })>::value>>
-       * void foo(T &&arg)
-       * {
-       *
-       * }
-       *
-       * Finally, if we are inside an 'if' statement and hit a CT_BOOL,
-       * then it isn't a template.
-       */
-
-      if (invalid_open_angle_template(prev))
-      {
-         LOG_FMT(LTEMPL, "%s(%d): - after type %s + ( - Not a template\n",
-                 __func__, __LINE__, get_token_name(prev->type));
-         set_chunk_type(start, CT_COMPARE);
-         return;
-      }
-      LOG_FMT(LTEMPL, "%s(%d): - prev->type is %s -\n",
-              __func__, __LINE__, get_token_name(prev->type));
-
-      // Scan back and make sure we aren't inside square parenthesis
-      bool in_if         = false;
-      bool hit_semicolon = false;
-      pc = start;
-
-      while ((pc = chunk_get_prev_ncnnl(pc, scope_e::PREPROC)) != nullptr)
-      {
-         if (  (  chunk_is_token(pc, CT_SEMICOLON)
-               && hit_semicolon)
-            || chunk_is_token(pc, CT_SQUARE_CLOSE))
-         {
-            break;
-         }
-
-         if (chunk_is_token(pc, CT_DECLTYPE))
-         {
-            flag_cpp_decltype(pc);
-         }
-
-         if (chunk_is_token(pc, CT_BRACE_OPEN))
-         {
-            if (  !pc->flags.test(PCF_IN_DECLTYPE)
-               || !detect_cpp_braced_init_list(pc->prev, pc))
-            {
-               break;
-            }
-            flag_cpp_braced_init_list(pc->prev, pc);
-         }
-
-         if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(pc) != CT_BRACED_INIT_LIST
-            && !pc->flags.test(PCF_IN_DECLTYPE))
-         {
-            break;
-         }
-
-         if (  chunk_is_token(pc, CT_SEMICOLON)
-            && !hit_semicolon)
-         {
-            hit_semicolon = true;
-         }
-
-         if (  (  (  chunk_is_token(pc, CT_IF)
-                  || chunk_is_token(pc, CT_RETURN)
-                  || chunk_is_token(pc, CT_WHILE)
-                  || chunk_is_token(pc, CT_WHILE_OF_DO))
-               && !hit_semicolon)
-            || (  chunk_is_token(pc, CT_FOR)
-               && hit_semicolon))
-         {
-            in_if = true;
-            break;
-         }
-      }
-      /*
-       * Scan forward to the angle close
-       * If we have a comparison in there, then it can't be a template.
-       */
-      const int max_token_count = 1024;
-      c_token_t tokens[max_token_count];
-      size_t    num_tokens = 1;
-
-      tokens[0] = CT_ANGLE_OPEN;
-
-      for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
-           pc != nullptr;
-           pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
-      {
-         constexpr static auto LCURRENT = LTEMPL;
-
-         LOG_FMT(LTEMPL, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, type is %s, num_tokens is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), num_tokens);
-
-         log_rule_B("tok_split_gte");
-
-         if (chunk_is_token(pc, CT_BRACE_OPEN))                     // Issue #2886
-         {
-            // look for the closing brace
-            chunk_t *A = chunk_skip_to_match(pc);
-            LOG_FMT(LTEMPL, "%s(%d): A->orig_line is %zu, A->orig_col is %zu, type is %s\n",
-                    __func__, __LINE__, A->orig_line, A->orig_col, get_token_name(A->type));
-            pc = chunk_get_next(A);
-         }
-
-         if (  (tokens[num_tokens - 1] == CT_ANGLE_OPEN)
-            && (pc->str[0] == '>')
-            && (pc->len() > 1)
-            && (  options::tok_split_gte()
-               || (  (  chunk_is_str(pc, ">>", 2)
-                     || chunk_is_str(pc, ">>>", 3))
-                  && (  num_tokens >= 2
-                     || (  num_tokens >= 1
-                        && in_type_cast)))))
-         {
-            LOG_FMT(LTEMPL, "%s(%d): {split '%s' at orig_line %zu, orig_col %zu}\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-
-            split_off_angle_close(pc);
-         }
-
-         if (chunk_is_str(pc, "<", 1))
-         {
-            if (  num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN)
-               && invalid_open_angle_template(pc->prev))
-            {
-               set_chunk_type(pc, CT_COMPARE); // Issue #3127
-            }
-            else
-            {
-               tokens[num_tokens] = CT_ANGLE_OPEN;
-               num_tokens++;
-            }
-         }
-         else if (chunk_is_str(pc, ">", 1))
-         {
-            if (num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN))
-            {
-               handle_double_angle_close(pc);
-            }
-            else if (--num_tokens <= 0)
-            {
-               break;
-            }
-            else if (tokens[num_tokens] != CT_ANGLE_OPEN)
-            {
-               break; // unbalanced parentheses
-            }
-         }
-         else if (  in_if
-                 && (  chunk_is_token(pc, CT_BOOL)
-                    || chunk_is_token(pc, CT_COMPARE)))
-         {
-            break;
-         }
-         else if (chunk_is_token(pc, CT_BRACE_OPEN))
-         {
-            if (  !pc->flags.test(PCF_IN_DECLTYPE)
-               || !detect_cpp_braced_init_list(pc->prev, pc))
-            {
-               break;
-            }
-            auto brace_open  = chunk_get_next_ncnnl(pc);
-            auto brace_close = chunk_skip_to_match(brace_open);
-
-            set_chunk_parent(brace_open, CT_BRACED_INIT_LIST);
-            set_chunk_parent(brace_close, CT_BRACED_INIT_LIST);
-         }
-         else if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                 && get_chunk_parent_type(pc) != CT_BRACED_INIT_LIST
-                 && !pc->flags.test(PCF_IN_DECLTYPE))
-         {
-            break;
-         }
-         else if (chunk_is_token(pc, CT_SEMICOLON))
-         {
-            break;
-         }
-         else if (chunk_is_token(pc, CT_PAREN_OPEN))
-         {
-            if (num_tokens >= max_token_count - 1)
-            {
-               break;
-            }
-            tokens[num_tokens] = CT_PAREN_OPEN;
-            num_tokens++;
-         }
-         else if (  chunk_is_token(pc, CT_QUESTION)                    // Issue #2949
-                 && language_is_set(LANG_CPP))
-         {
-            break;
-         }
-         else if (chunk_is_token(pc, CT_PAREN_CLOSE))
-         {
-            if (num_tokens == 0)
-            {
-               fprintf(stderr, "%s(%d): num_tokens is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            num_tokens--;
-
-            if (tokens[num_tokens] != CT_PAREN_OPEN)
-            {
-               break;  // unbalanced parentheses
-            }
-         }
-      }
-
-      end = pc;
-   }
-
-   if (chunk_is_token(end, CT_ANGLE_CLOSE))
-   {
-      pc = chunk_get_next_ncnnl(end, scope_e::PREPROC);
-
-      if (  pc == nullptr
-         || pc->type != CT_NUMBER)
-      {
-         LOG_FMT(LTEMPL, "%s(%d): Template detected\n", __func__, __LINE__);
-         LOG_FMT(LTEMPL, "%s(%d):     from orig_line %zu, orig_col %zu\n",
-                 __func__, __LINE__, start->orig_line, start->orig_col);
-         LOG_FMT(LTEMPL, "%s(%d):     to   orig_line %zu, orig_col %zu\n",
-                 __func__, __LINE__, end->orig_line, end->orig_col);
-         set_chunk_parent(start, CT_TEMPLATE);
-
-         check_template_args(start, end);
-
-         set_chunk_parent(end, CT_TEMPLATE);
-         chunk_flags_set(end, PCF_IN_TEMPLATE);
-         return;
-      }
-   }
-   LOG_FMT(LTEMPL, "%s(%d): - Not a template: end = %s\n",
-           __func__, __LINE__, (end != nullptr) ? get_token_name(end->type) : "<null>");
-   set_chunk_type(start, CT_COMPARE);
-} // check_template
-
-
-static void check_template_arg(chunk_t *start, chunk_t *end)
-{
-   LOG_FMT(LTEMPL, "%s(%d): Template argument detected\n", __func__, __LINE__);
-   LOG_FMT(LTEMPL, "%s(%d):     from orig_line %zu, orig_col %zu\n",
-           __func__, __LINE__, start->orig_line, start->orig_col);
-   LOG_FMT(LTEMPL, "%s(%d):     to   orig_line %zu, orig_col %zu\n",
-           __func__, __LINE__, end->orig_line, end->orig_col);
-
-   // Issue #1127
-   // MyFoo<mySize * 2> foo1;
-   // MyFoo<2*mySize * 2> foo1;
-   // Issue #1346
-   // use it as ONE line:
-   //   typename std::enable_if<!std::is_void<T>::value,
-   //   QVector<T> >::type dummy(const std::function<T*(const S&)>&
-   //   pFunc, const QVector<S>& pItems)
-   // we need two runs
-   // 1. run to test if expression is numeric
-   bool    expressionIsNumeric = false;
-   chunk_t *pc                 = start;
-
-   while (pc != end)
-   {
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      // a test "if (next == nullptr)" is not necessary
-      chunk_flags_set(pc, PCF_IN_TEMPLATE);
-
-      if (  chunk_is_token(pc, CT_DECLTYPE)
-         || chunk_is_token(pc, CT_SIZEOF))
-      {
-         expressionIsNumeric = true;
-         break;
-      }
-
-      if (next->type != CT_PAREN_OPEN)
-      {
-         if (  chunk_is_token(pc, CT_NUMBER)
-            || chunk_is_token(pc, CT_ARITH)
-            || chunk_is_token(pc, CT_SHIFT))
-         {
-            expressionIsNumeric = true;
-            break;
-         }
-      }
-      pc = next;
-   }
-   LOG_FMT(LTEMPL, "%s(%d): expressionIsNumeric is %s\n",
-           __func__, __LINE__, expressionIsNumeric ? "TRUE" : "FALSE");
-
-   // 2. run to do the work
-   if (!expressionIsNumeric)
-   {
-      pc = start;
-
-      while (pc != end)
-      {
-         chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-         // a test "if (next == nullptr)" is not necessary
-         chunk_flags_set(pc, PCF_IN_TEMPLATE);
-
-         if (next->type != CT_PAREN_OPEN)
-         {
-            make_type(pc);
-         }
-         pc = next;
-      }
-   }
-} // check_template_arg
-
-
-static void check_template_args(chunk_t *start, chunk_t *end)
-{
-   std::vector<c_token_t> tokens;
-
-   // Scan for commas
-   chunk_t *pc;
-
-   for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
-        pc != nullptr && pc != end;
-        pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
-   {
-      switch (pc->type)
-      {
-      case CT_COMMA:
-
-         if (tokens.empty())
-         {
-            // Check current argument
-            check_template_args(start, pc);
-            start = pc;
-         }
-         break;
-
-      case CT_ANGLE_OPEN:
-      case CT_PAREN_OPEN:
-         tokens.push_back(pc->type);
-         break;
-
-      case CT_ANGLE_CLOSE:
-
-         if (  !tokens.empty()
-            && tokens.back() == CT_ANGLE_OPEN)
-         {
-            tokens.pop_back();
-         }
-         break;
-
-      case CT_PAREN_CLOSE:
-
-         if (  !tokens.empty()
-            && tokens.back() == CT_PAREN_OPEN)
-         {
-            tokens.pop_back();
-         }
-         break;
-
-      default:
-         break;
-      }
-   }
-
-   // Check whatever is left
-   check_template_arg(start, end);
-} // check_template_args
-
-
-static void cleanup_objc_property(chunk_t *start)
-{
-   assert(chunk_is_token(start, CT_OC_PROPERTY));
-
-   chunk_t *open_paren = chunk_get_next_type(start, CT_PAREN_OPEN, start->level);
-
-   if (open_paren == nullptr)
-   {
-      LOG_FMT(LTEMPL, "%s(%d): Property is not followed by openning paren\n", __func__, __LINE__);
-      return;
-   }
-   set_chunk_parent(open_paren, start->type);
-
-   chunk_t *tmp = chunk_get_next_type(start, CT_PAREN_CLOSE, start->level);
-
-   if (tmp != nullptr)
-   {
-      set_chunk_parent(tmp, start->type);
-      tmp = chunk_get_next_ncnnl(tmp);
-
-      if (tmp != nullptr)
-      {
-         chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
-
-         tmp = chunk_get_next_type(tmp, CT_SEMICOLON, start->level);
-
-         if (tmp != nullptr)
-         {
-            set_chunk_parent(tmp, start->type);
-         }
-      }
-   }
-   mark_selectors_in_property_with_open_paren(open_paren);
-   mark_attributes_in_property_with_open_paren(open_paren);
-}
-
-
-static void mark_selectors_in_property_with_open_paren(chunk_t *open_paren)
-{
-   assert(chunk_is_token(open_paren, CT_PAREN_OPEN));
-
-   chunk_t *tmp = open_paren;
-
-   while (  tmp != nullptr
-         && tmp->type != CT_PAREN_CLOSE)
-   {
-      if (  chunk_is_token(tmp, CT_WORD)
-         && (  chunk_is_str(tmp, "setter", 6)
-            || chunk_is_str(tmp, "getter", 6)))
-      {
-         tmp = tmp->next;
-
-         while (  tmp != nullptr
-               && tmp->type != CT_COMMA
-               && tmp->type != CT_PAREN_CLOSE)
-         {
-            if (  chunk_is_token(tmp, CT_WORD)
-               || chunk_is_str(tmp, ":", 1))
-            {
-               set_chunk_type(tmp, CT_OC_SEL_NAME);
-            }
-            tmp = tmp->next;
-         }
-      }
-      else
-      {
-         tmp = tmp->next;
-      }
-   }
-}
-
-
-static void mark_attributes_in_property_with_open_paren(chunk_t *open_paren)
-{
-   assert(chunk_is_token(open_paren, CT_PAREN_OPEN));
-
-   chunk_t *tmp = open_paren;
-
-   while (  tmp != nullptr
-         && tmp->type != CT_PAREN_CLOSE)
-   {
-      if (  (  chunk_is_token(tmp, CT_COMMA)
-            || chunk_is_token(tmp, CT_PAREN_OPEN))
-         && (  chunk_is_token(tmp->next, CT_WORD)
-            || chunk_is_token(tmp->next, CT_TYPE)))
-      {
-         set_chunk_type(tmp->next, CT_OC_PROPERTY_ATTR);
-      }
-      tmp = tmp->next;
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.h
deleted file mode 100644
index 4d85cfc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file tokenize_cleanup.h
- * prototypes for tokenize_cleanup.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef TOKENIZ_CLEANUP_H_INCLUDED
-#define TOKENIZ_CLEANUP_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * @brief clean up tokens
- *
- * Change certain token types based on simple sequence.
- * Example: change '[' + ']' to '[]'
- * Note that level info is not yet available, so it is OK to do all
- * processing that doesn't need to know level info. (that's very little!)
- */
-void tokenize_cleanup(void);
-
-
-void tokenize_trailing_return_types(void);
-
-
-void split_off_angle_close(chunk_t *pc);
-
-
-#endif /* TOKENIZ_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_ctype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_ctype.h
deleted file mode 100644
index 50b7a6f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_ctype.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file unc_ctype.h
- * The ctype function are only required to handle values 0-255 and EOF.
- * A char is sign-extended when cast to an int.
- * With some C libraries, these values cause a crash.
- * These wrappers will properly handle all char values.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef UNC_CTYPE_H_INCLUDED
-#define UNC_CTYPE_H_INCLUDED
-
-#include "options.h"
-
-#include <cctype>                    // to get std::tolower
-
-// TODO: better avoid inline and move implementation to cpp file
-
-
-//! Test anything EOF (-1) to 0-255
-static inline int unc_fix_ctype(int ch)
-{
-   if (  ch >= -1
-      && ch <= 255)
-   {
-      return(ch);
-   }
-   return(0);                                // Issue #3025
-}
-
-
-//! check if a character is a space
-static inline int unc_isspace(int ch)
-{
-   if (  (ch == 12)                          // Issue #2386
-      && uncrustify::options::use_form_feed_no_more_as_whitespace_character())
-   {
-      return(0);
-   }
-   else
-   {
-      return(isspace(unc_fix_ctype(ch)));
-   }
-}
-
-
-//! check if a character is a printing character
-static inline int unc_isprint(int ch)
-{
-   return(isprint(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is an alphabetic character (a letter).
-static inline int unc_isalpha(int ch)
-{
-   return(isalpha(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is an alphanumeric character.
-static inline int unc_isalnum(int ch)
-{
-   return(isalnum(unc_fix_ctype(ch)));
-}
-
-
-//! convert a character to upper case
-static inline int unc_toupper(int ch)
-{
-   return(toupper(unc_fix_ctype(ch)));
-}
-
-
-//! convert a character to lower case
-static inline int unc_tolower(int ch)
-{
-   return(tolower(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is a hexadecimal digit
-static inline int unc_isxdigit(int ch)
-{
-   return(isxdigit(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is a decimal digit
-static inline int unc_isdigit(int ch)
-{
-   return(isdigit(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is upper case
-static inline int unc_isupper(int ch)
-{
-   return(  isalpha(unc_fix_ctype(ch))
-         && (unc_toupper(unc_fix_ctype(ch)) == ch));
-}
-
-
-#endif /* UNC_CTYPE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.cpp
deleted file mode 100644
index 1f96a67c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.cpp
+++ /dev/null
@@ -1,759 +0,0 @@
-/**
- * @file unc_text.cpp
- * A simple class that handles the chunk text.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "unc_text.h"
-
-#include "unc_ctype.h"
-#include "unicode.h" // encode_utf8()
-
-#include <algorithm>
-#include <stdexcept>
-
-
-using namespace std;
-
-
-static constexpr const int_fast8_t UTF8_BLOCKS = 6;  // 6 -> max utf8 blocks per char
-
-
-static size_t fix_len_idx(size_t size, size_t idx, size_t len);
-
-//! converts \n and \r chars are into NL and CR UTF8 symbols before encode_utf8 is called
-static void toLogTextUtf8(int c, unc_text::log_type &container);
-
-/**
- * calculates the size a 'log_type' container needs to have in order to take
- * in values of a 'unc_text::value_type' up to idx
- * (without \0, with symbols for the converted \n and \r chars)
- *
- * throws if char is greater than 0x7fffffff
- */
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t end);
-
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t start, size_t end);
-
-
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t start, size_t end)
-{
-   size_t c1_idx = 0;
-
-   for (size_t i = start; i < end; ++i)
-   {
-      auto ch = c0[i];
-
-      if (ch == '\n')
-      {
-         ch = 0x2424;  // NL symbol
-      }
-      else if (ch == '\r')
-      {
-         ch = 0x240d;  // CR symbol
-      }
-
-      if (ch < 0x80)              // 1-byte sequence
-      {
-         c1_idx += 1;
-      }
-      else if (ch < 0x0800)       // 2-byte sequence
-      {
-         c1_idx += 2;
-      }
-      else if (ch < 0x10000)      // 3-byte sequence
-      {
-         c1_idx += 3;
-      }
-      else if (ch < 0x200000)     // 4-byte sequence
-      {
-         c1_idx += 4;
-      }
-      else if (ch < 0x4000000)    // 5-byte sequence
-      {
-         c1_idx += 5;
-      }
-      else if (ch <= 0x7fffffff)  // 6-byte sequence
-      {
-         c1_idx += 6;
-      }
-      else
-      {
-         throw out_of_range(string(__func__) + ":" + to_string(__LINE__)
-                            + " - ch value too big, can't convert to utf8");
-      }
-   }
-
-   return(c1_idx);
-} // getLogTextUTF8Len
-
-
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t end)
-{
-   return(getLogTextUtf8Len(c0, 0, end));
-}
-
-
-static void toLogTextUtf8(int c, unc_text::log_type &container)
-{
-   if (c == '\n')
-   {
-      c = 0x2424; // NL symbol
-   }
-   else if (c == '\r')
-   {
-      c = 0x240d; // CR symbol
-   }
-   encode_utf8(c, container);
-}
-
-
-static size_t fix_len_idx(size_t size, size_t idx, size_t len)
-{
-   if (idx >= size)
-   {
-      return(0);
-   }
-   const size_t left = size - idx;
-
-   return((len > left) ? left : len);
-}
-
-
-unc_text::unc_text()
-{
-   m_logtext = log_type{ '\0' };
-}
-
-
-unc_text::unc_text(const unc_text &ref)
-{
-   set(ref);
-}
-
-
-unc_text::unc_text(const unc_text &ref, size_t idx, size_t len)
-{
-   set(ref, idx, len);
-}
-
-
-unc_text::unc_text(const char *ascii_text)
-{
-   set(ascii_text);
-}
-
-
-unc_text::unc_text(const std::string &ascii_text)
-{
-   set(ascii_text);
-}
-
-
-unc_text::unc_text(const value_type &data, size_t idx, size_t len)
-{
-   set(data, idx, len);
-}
-
-
-size_t unc_text::size() const
-{
-   return(m_chars.size());
-}
-
-
-unc_text &unc_text::operator=(int ch)
-{
-   set(ch);
-   return(*this);
-}
-
-
-unc_text &unc_text::operator=(const unc_text &ref)
-{
-   set(ref);
-   return(*this);
-}
-
-
-unc_text &unc_text::operator=(const std::string &ascii_text)
-{
-   set(ascii_text);
-   return(*this);
-}
-
-
-unc_text &unc_text::operator=(const char *ascii_text)
-{
-   set(ascii_text);
-   return(*this);
-}
-
-
-unc_text &unc_text::operator+=(int ch)
-{
-   append(ch);
-   return(*this);
-}
-
-
-unc_text &unc_text::operator+=(const unc_text &ref)
-{
-   append(ref);
-   return(*this);
-}
-
-
-unc_text &unc_text::operator+=(const std::string &ascii_text)
-{
-   append(ascii_text);
-   return(*this);
-}
-
-
-unc_text &unc_text::operator+=(const char *ascii_text)
-{
-   append(ascii_text);
-   return(*this);
-}
-
-
-const unc_text::value_type &unc_text::get() const
-{
-   return(m_chars);
-}
-
-
-int unc_text::operator[](size_t idx) const
-{
-   return((idx < m_chars.size()) ? m_chars[idx] : 0);
-}
-
-
-const int &unc_text::at(size_t idx) const
-{
-   return(m_chars.at(idx));
-}
-
-
-const int &unc_text::back() const
-{
-   return(m_chars.back());
-}
-
-
-void unc_text::push_back(int ch)
-{
-   append(ch);
-}
-
-
-void unc_text::pop_back()
-{
-   if (size() == 0)
-   {
-      return;
-   }
-   m_chars.pop_back();
-   update_logtext();
-}
-
-
-void unc_text::pop_front()
-{
-   if (size() == 0)
-   {
-      return;
-   }
-   m_chars.pop_front();
-   update_logtext();
-}
-
-
-void unc_text::update_logtext()
-{
-   // make a pessimistic guess at the size
-   m_logtext.clear();
-   m_logtext.reserve(m_chars.size() * 3);
-
-   for (int m_char : m_chars)
-   {
-      toLogTextUtf8(m_char, m_logtext);
-   }
-
-   m_logtext.push_back(0);
-}
-
-
-int unc_text::compare(const unc_text &ref1, const unc_text &ref2, size_t len, bool tcare)
-{
-   const size_t len1    = ref1.size();
-   const size_t len2    = ref2.size();
-   const auto   max_idx = std::min({ len, len1, len2 });
-   size_t       idx     = 0;
-
-   for ( ; idx < max_idx; idx++)
-   {
-      // exactly the same character ?
-      if (ref1.m_chars[idx] == ref2.m_chars[idx])
-      {
-         continue;
-      }
-      int diff;                                             // Issue #2091
-
-      if (tcare)
-      {
-         diff = ref1.m_chars[idx] - ref2.m_chars[idx];
-      }
-      else
-      {
-         diff = unc_tolower(ref1.m_chars[idx]) - unc_tolower(ref2.m_chars[idx]);
-      }
-
-      if (diff == 0)
-      {
-         /*
-          * if we're comparing the same character but in different case
-          * we want to favor lower case before upper case (e.g. a before A)
-          * so the order is the reverse of ASCII order (we negate).
-          */
-         return(-(ref1.m_chars[idx] - ref2.m_chars[idx]));
-      }
-      // return the case-insensitive diff to sort alphabetically
-      return(diff);
-   }
-
-   if (idx == len)
-   {
-      return(0);
-   }
-   // underflow save: return(len1 - len2);
-   return((len1 > len2) ? (len1 - len2) : -static_cast<int>(len2 - len1));
-} // unc_text::compare
-
-
-bool unc_text::equals(const unc_text &ref) const
-{
-   const size_t len = size();
-
-   if (ref.size() != len)
-   {
-      return(false);
-   }
-
-   for (size_t idx = 0; idx < len; idx++)
-   {
-      if (m_chars[idx] != ref.m_chars[idx])
-      {
-         return(false);
-      }
-   }
-
-   return(true);
-}
-
-
-const char *unc_text::c_str() const
-{
-   return(reinterpret_cast<const char *>(&m_logtext[0]));
-}
-
-
-void unc_text::set(int ch)
-{
-   m_logtext.clear();
-   toLogTextUtf8(ch, m_logtext);
-   m_logtext.push_back('\0');
-
-
-   m_chars.clear();
-   m_chars.push_back(ch);
-}
-
-
-void unc_text::set(const unc_text &ref)
-{
-   m_chars   = ref.m_chars;
-   m_logtext = ref.m_logtext;
-}
-
-
-void unc_text::set(const unc_text &ref, size_t idx, size_t len)
-{
-   const auto ref_size = ref.size();
-
-   if (len == ref_size)
-   {
-      m_chars = ref.m_chars;
-      update_logtext();
-      return;
-   }
-   m_chars.resize(len);
-
-   len = fix_len_idx(ref_size, idx, len);
-
-   for (size_t di = 0;
-        len > 0;
-        di++, idx++, len--)
-   {
-      m_chars[di] = ref.m_chars[idx];
-   }
-
-   update_logtext();
-}
-
-
-void unc_text::set(const string &ascii_text)
-{
-   const size_t len = ascii_text.size();
-
-   m_chars.resize(len);
-
-   for (size_t idx = 0; idx < len; idx++)
-   {
-      m_chars[idx] = ascii_text[idx];
-   }
-
-   update_logtext();
-}
-
-
-void unc_text::set(const char *ascii_text)
-{
-   const size_t len = strlen(ascii_text);
-
-   m_chars.resize(len);
-
-   for (size_t idx = 0; idx < len; idx++)
-   {
-      m_chars[idx] = *ascii_text++;
-   }
-
-   update_logtext();
-}
-
-
-void unc_text::set(const value_type &data, size_t idx, size_t len)
-{
-   m_chars.resize(len);
-
-   len = fix_len_idx(data.size(), idx, len);
-
-   for (size_t di = 0;
-        len > 0;
-        di++, idx++, len--)
-   {
-      m_chars[di] = data[idx];
-   }
-
-   update_logtext();
-}
-
-
-void unc_text::resize(size_t new_size)
-{
-   if (size() == new_size)
-   {
-      return;
-   }
-   const auto log_new_size = getLogTextUtf8Len(m_chars, new_size);
-
-   m_logtext.resize(log_new_size + 1); // one extra for \0
-   m_logtext[log_new_size] = '\0';
-
-
-   m_chars.resize(new_size);
-}
-
-
-void unc_text::clear()
-{
-   m_logtext.clear();
-   m_logtext.push_back('\0');
-
-
-   m_chars.clear();
-}
-
-
-void unc_text::insert(size_t idx, int ch)
-{
-   if (idx >= m_chars.size())
-   {
-      throw out_of_range(string(__func__) + ":" + to_string(__LINE__)
-                         + " - idx >= m_chars.size()");
-   }
-   log_type utf8converted;
-
-   utf8converted.reserve(UTF8_BLOCKS);
-   toLogTextUtf8(ch, utf8converted);
-
-   const auto utf8_idx = getLogTextUtf8Len(m_chars, idx);
-
-   m_logtext.pop_back(); // remove '\0'
-   m_logtext.insert(std::next(std::begin(m_logtext), utf8_idx),
-                    std::begin(utf8converted), std::end(utf8converted));
-   m_logtext.push_back('\0');
-
-
-   m_chars.insert(std::next(std::begin(m_chars), idx), ch);
-}
-
-
-void unc_text::insert(size_t idx, const unc_text &ref)
-{
-   if (ref.size() == 0)
-   {
-      return;
-   }
-
-   if (idx >= m_chars.size())
-   {
-      throw out_of_range(string(__func__) + ":" + to_string(__LINE__)
-                         + " - idx >= m_chars.size()");
-   }
-   const auto utf8_idx = getLogTextUtf8Len(m_chars, idx);
-
-   // (A+B) remove \0 from both containers, add back a single at the end
-   m_logtext.pop_back(); // A
-   m_logtext.insert(std::next(std::begin(m_logtext), utf8_idx),
-                    std::begin(ref.m_logtext),
-                    std::prev(std::end(ref.m_logtext))); // B
-   m_logtext.push_back('\0');
-
-
-   m_chars.insert(std::next(std::begin(m_chars), idx),
-                  std::begin(ref.m_chars), std::end(ref.m_chars));
-}
-
-
-void unc_text::append(int ch)
-{
-   m_logtext.pop_back();
-
-   if (  ch < 0x80
-      && ch != '\n'
-      && ch != '\r')
-   {
-      m_logtext.push_back(ch);
-   }
-   else
-   {
-      log_type utf8converted;
-      utf8converted.reserve(UTF8_BLOCKS);
-      toLogTextUtf8(ch, utf8converted);
-
-      m_logtext.insert(std::end(m_logtext),
-                       std::begin(utf8converted), std::end(utf8converted));
-   }
-   m_logtext.push_back('\0');
-
-
-   m_chars.push_back(ch);
-}
-
-
-void unc_text::append(const unc_text &ref)
-{
-   if (ref.size() == 0)
-   {
-      return;
-   }
-   m_logtext.pop_back();
-   m_logtext.insert(std::end(m_logtext),
-                    std::begin(ref.m_logtext), std::end(ref.m_logtext));
-
-   m_chars.insert(m_chars.end(), ref.m_chars.begin(), ref.m_chars.end());
-}
-
-
-void unc_text::append(const string &ascii_text)
-{
-   unc_text tmp(ascii_text);
-
-   append(tmp);
-}
-
-
-void unc_text::append(const char *ascii_text)
-{
-   unc_text tmp(ascii_text);
-
-   append(tmp);
-}
-
-
-void unc_text::append(const value_type &data, size_t idx, size_t len)
-{
-   unc_text tmp(data, idx, len);
-
-   append(tmp);
-}
-
-
-bool unc_text::startswith(const char *text, size_t idx) const
-{
-   const auto orig_idx = idx;
-
-   for ( ;
-         (  idx < size()
-         && *text);
-         idx++, text++)
-   {
-      if (*text != m_chars[idx])
-      {
-         return(false);
-      }
-   }
-
-   return(  idx != orig_idx
-         && (*text == 0));
-}
-
-
-bool unc_text::startswith(const unc_text &text, size_t idx) const
-{
-   size_t     si       = 0;
-   const auto orig_idx = idx;
-
-   for ( ;
-         (  idx < size()
-         && si < text.size());
-         idx++, si++)
-   {
-      if (text.m_chars[si] != m_chars[idx])
-      {
-         return(false);
-      }
-   }
-
-   return(  idx != orig_idx
-         && (si == text.size()));
-}
-
-
-int unc_text::find(const char *search_txt, size_t start_idx) const
-{
-   const size_t t_len = strlen(search_txt); // the length of 'text' we are looking for
-   const size_t s_len = size();             // the length of the string we are looking in
-
-   if (  s_len < t_len                      // search_txt longer than the string we are looking in
-      || start_idx + t_len - 1 >= s_len)    // starting position to high to find search_txt
-   {
-      return(-1);
-   }
-   const size_t end_idx = s_len - t_len;
-
-   for (size_t idx = start_idx; idx <= end_idx; idx++)
-   {
-      bool match = true;
-
-      for (size_t ii = 0; ii < t_len; ii++)
-      {
-         if (m_chars[idx + ii] != search_txt[ii])
-         {
-            match = false;
-            break;
-         }
-      }
-
-      if (match) // 'text' found at position 'idx'
-      {
-         return(idx);
-      }
-   }
-
-   return(-1);  //  'text' not found
-}
-
-
-int unc_text::rfind(const char *search_txt, size_t start_idx) const
-{
-   const size_t t_len = strlen(search_txt); // the length of 'text' we are looking for
-   const size_t s_len = size();             // the length of the string we are looking in
-
-   if (  s_len < t_len                      // search_txt longer than the string we are looking in
-      || start_idx < t_len - 1)             // starting position to low to find search_txt
-   {
-      return(-1);
-   }
-   const size_t end_idx = s_len - t_len;
-
-   if (start_idx > end_idx)
-   {
-      start_idx = end_idx;
-   }
-
-   for (auto idx = static_cast<int>(start_idx); idx >= 0; idx--)
-   {
-      bool match = true;
-
-      for (size_t ii = 0; ii < t_len; ii++)
-      {
-         if (m_chars[idx + ii] != search_txt[ii])
-         {
-            match = false;
-            break;
-         }
-      }
-
-      if (match)
-      {
-         return(idx);
-      }
-   }
-
-   return(-1);
-}
-
-
-void unc_text::erase(size_t start_idx, size_t len)
-{
-   if (len == 0)
-   {
-      return;
-   }
-   const size_t end_idx = start_idx + len - 1;
-
-   if (end_idx >= m_chars.size())
-   {
-      throw out_of_range(string(__func__) + ":" + to_string(__LINE__)
-                         + " - idx + len >= m_chars.size()");
-   }
-   const auto pos_s = getLogTextUtf8Len(m_chars, start_idx);
-   const auto pos_e = pos_s + getLogTextUtf8Len(m_chars, start_idx, end_idx);
-
-   m_logtext.pop_back();
-   m_logtext.erase(std::next(std::begin(m_logtext), pos_s),
-                   std::next(std::begin(m_logtext), pos_e + 1));
-   m_logtext.push_back('\0');
-
-
-   m_chars.erase(std::next(std::begin(m_chars), start_idx),
-                 std::next(std::begin(m_chars), end_idx + 1));
-}
-
-
-int unc_text::replace(const char *search_text, const unc_text &replace_text)
-{
-   const size_t s_len = strlen(search_text);
-   const size_t r_len = replace_text.size();
-
-   int          rcnt = 0;
-   int          fidx = find(search_text);
-
-   while (fidx >= 0)
-   {
-      rcnt++;
-      erase(static_cast<size_t>(fidx), s_len);
-
-      (static_cast<size_t>(fidx) >= m_chars.size())
-      ? append(replace_text)
-      : insert(static_cast<size_t>(fidx), replace_text);
-
-      fidx = find(search_text, static_cast<size_t>(fidx) + r_len);
-   }
-   return(rcnt);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.h
deleted file mode 100644
index dd678f16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * @file unc_text.h
- * A simple class that handles the chunk text.
- * At the start of processing, the entire file is decoded into a std::vector of ints.
- * This class is intended to hold sections of that large std::vector.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef UNC_TEXT_H_INCLUDED
-#define UNC_TEXT_H_INCLUDED
-
-#include "base_types.h"
-
-#include <deque>
-#include <string>
-#include <vector>
-
-
-/**
- *  abbreviations used:
- * - unc_text - uncrustify text
- */
-
-class unc_text
-{
-public:
-   typedef std::deque<int>      value_type; // double encoded list of int values
-   typedef std::vector<UINT8>   log_type;
-
-
-   unc_text();
-
-   unc_text(const unc_text &ref);
-
-   unc_text(const unc_text &ref, size_t idx, size_t len = 0);
-
-   unc_text(const char *ascii_text);
-
-   unc_text(const std::string &ascii_text);
-
-   unc_text(const value_type &data, size_t idx = 0, size_t len = 0);
-
-
-   ~unc_text() = default;
-
-
-   void resize(size_t new_size);
-
-
-   void clear();
-
-
-   //! grab the number of characters
-   size_t size() const;
-
-
-   void set(int ch);
-
-   void set(const unc_text &ref);
-
-   void set(const unc_text &ref, size_t idx, size_t len = 0);
-
-   void set(const std::string &ascii_text);
-
-   void set(const char *ascii_text);
-
-   void set(const value_type &data, size_t idx = 0, size_t len = 0);
-
-
-   unc_text &operator=(int ch);
-
-   unc_text &operator=(const unc_text &ref);
-
-   unc_text &operator=(const std::string &ascii_text);
-
-   unc_text &operator=(const char *ascii_text);
-
-
-   void insert(size_t idx, int ch);
-
-   void insert(size_t idx, const unc_text &ref);
-
-
-   void erase(size_t idx, size_t len = 1);
-
-
-   //! Add a unc_text character to an unc_text
-   void append(int ch);
-
-   void append(const unc_text &ref);
-
-   //! Add a string to an unc_text
-   void append(const std::string &ascii_text);
-
-   /**
-    * Add a variable length string to an unc_text.
-    * The variable length string format is similar as for printf
-    *
-    * @note the overall length of the string must not exceed 256 characters
-    *
-    *	@param ascii_text  a variable length string
-    */
-   void append(const char *ascii_text);
-
-   void append(const value_type &data, size_t idx = 0, size_t len = 0);
-
-
-   unc_text &operator+=(int ch);
-
-   unc_text &operator+=(const unc_text &ref);
-
-   unc_text &operator+=(const std::string &ascii_text);
-
-   unc_text &operator+=(const char *ascii_text);
-
-
-   //! Returns the UTF-8 string for logging
-   const char *c_str() const;
-
-
-   /**
-    * compares the content of two unc_text instances
-    *
-    * @param ref1  first  instance to compare
-    * @param ref2  second instance to compare
-    * @param len   number of character to compare
-    * @param tcare take care of case (lower case/ upper case)                  Issue #2091
-    *
-    * @retval == 0  both text elements are equal
-    * @retval  > 0
-    * @retval  < 0
-    */
-   static int compare(const unc_text &ref1, const unc_text &ref2, size_t len = 0, bool tcare = false);
-
-
-   bool equals(const unc_text &ref) const;
-
-
-   //! grab the data as a series of ints for outputting to a file
-   const value_type &get() const;
-
-
-   int operator[](size_t idx) const;
-
-
-   // throws an exception if out of bounds
-   const int &at(size_t idx) const;
-
-
-   //! returns the last element of the character list
-   const int &back() const;
-
-
-   void push_back(int ch);
-
-
-   void pop_back();
-
-
-   void pop_front();
-
-
-   bool startswith(const unc_text &text, size_t idx = 0) const;
-
-   bool startswith(const char *text, size_t idx = 0) const;
-
-
-   /**
-    * look for 'text', beginning with position 'sidx'
-    *
-    * @param text  text to search for
-    * @param idx   position to start search
-    *
-    * @return == -1 if not found
-    * @return >=  0 the position
-    */
-   int find(const char *text, size_t idx = 0) const;
-
-
-   int rfind(const char *text, size_t idx = 0) const;
-
-
-   int replace(const char *oldtext, const unc_text &newtext);
-
-
-protected:
-   void update_logtext();
-
-   value_type m_chars;           //! this contains the non-encoded 31-bit chars
-   log_type   m_logtext;         //! logging text, utf8 encoded - updated in c_str()
-};
-
-
-#endif /* UNC_TEXT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.cpp
deleted file mode 100644
index 83e50c7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.cpp
+++ /dev/null
@@ -1,496 +0,0 @@
-/**
- * @file unc_tools.cpp
- * This file contains lot of tools for debugging
- *
- * @author  Guy Maurel
- *          October 2015- 2021
- * @license GPL v2+
- */
-
-#include "unc_tools.h"
-
-#include "args.h"
-#include "output.h"
-
-
-/*
- * the test suite Coveralls: https://coveralls.io
- * will complains because these functions are only
- * used at developement time.
- * Don't worry about unsed lines for the functions:
- *   prot_the_line
- *   prot_the_source
- *   examine_Data
- *   dump_out
- *   dump_in
- */
-
-static size_t counter = 0;
-static size_t tokenCounter;
-
-
-/* protocol of the line
- * examples:
- *   prot_the_line(__func__, __LINE__, pc->orig_line);
- *   prot_the_line(__func__, __LINE__, 0, 0);
- *   prot_the_line(__func__, __LINE__, 6, 5);
- *   prot_the_source(__LINE__);
- *   log_pcf_flags(LSYS, pc->flags);
- *
- * if actual_line is zero, use the option debug_line_number_to_protocol.
- * if the value is zero, don't make any protocol and return.
- *
- * if partNumber is zero, all the tokens of the line are shown,
- * if partNumber is NOT zero, only the token with this partNumber is shown.
- *
- *   prot_the_line_pc(pc_sub, __func__, __LINE__, 6, 5);
- * to get a protocol of a sub branch, which begins with pc_sub
- */
-void prot_the_line(const char *func_name, int theLine, unsigned int actual_line, size_t partNumber)
-{
-   prot_the_line_pc(chunk_get_head(), func_name, theLine, actual_line, partNumber);
-}
-
-
-void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsigned int actual_line, size_t partNumber)
-{
-   if (actual_line == 0)
-   {
-      // use the option debug_line_number_to_protocol.
-      actual_line = options::debug_line_number_to_protocol();
-
-      if (actual_line == 0)
-      {
-         // don't make any protocol.
-         return;
-      }
-   }
-   counter++;
-   tokenCounter = 0;
-   LOG_FMT(LGUY, "Prot_the_line:(%s:%d)(%zu)\n", func_name, theLine, counter);
-
-   for (chunk_t *pc = pc_sub; pc != nullptr; pc = pc->next)
-   {
-      if (pc->orig_line == actual_line)
-      {
-         tokenCounter++;
-
-         if (  partNumber == 0
-            || partNumber == tokenCounter)
-         {
-            LOG_FMT(LGUY, " orig_line is %d, (%zu) ", actual_line, tokenCounter);
-
-            if (chunk_is_token(pc, CT_VBRACE_OPEN))
-            {
-               LOG_FMT(LGUY, "<VBRACE_OPEN>, ");
-            }
-            else if (chunk_is_token(pc, CT_NEWLINE))
-            {
-               LOG_FMT(LGUY, "<NL>(nl_count is %zu), ", pc->nl_count);
-            }
-            else if (chunk_is_token(pc, CT_VBRACE_CLOSE))
-            {
-               LOG_FMT(LGUY, "<CT_VBRACE_CLOSE>, ");
-            }
-            else if (chunk_is_token(pc, CT_VBRACE_OPEN))
-            {
-               LOG_FMT(LGUY, "<CT_VBRACE_OPEN>, ");
-            }
-            else if (chunk_is_token(pc, CT_SPACE))
-            {
-               LOG_FMT(LGUY, "<CT_SPACE>, ");
-            }
-            else if (chunk_is_token(pc, CT_IGNORED))
-            {
-               LOG_FMT(LGUY, "<IGNORED> ");
-            }
-            else
-            {
-               LOG_FMT(LGUY, "text() '%s', ", pc->text());
-            }
-            LOG_FMT(LGUY, " column is %zu, pp_level is %zu, type is %s, parent_type is %s, orig_col is %zu,",
-                    pc->column, pc->pp_level, get_token_name(pc->type),
-                    get_token_name(get_chunk_parent_type(pc)), pc->orig_col);
-
-            if (chunk_is_token(pc, CT_IGNORED))
-            {
-               LOG_FMT(LGUY, "\n");
-            }
-            else
-            {
-               LOG_FMT(LGUY, " pc->flags: ");
-               log_pcf_flags(LGUY, pc->flags);
-            }
-
-            if (pc->tracking != nullptr)
-            {
-               LOG_FMT(LGUY, " Tracking info are: \n");
-               LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->tracking->size());
-
-               for (size_t track = 0; track < pc->tracking->size(); track++)
-               {
-                  track_list *A       = pc->tracking;
-                  Track_nr   B        = A->at(track);
-                  size_t     Bfirst   = B.first;
-                  char       *Bsecond = B.second;
-
-                  LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
-                  LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
-               }
-            }
-         }
-      }
-   }
-
-   LOG_FMT(LGUY, "\n");
-} // prot_the_line_pc
-
-
-void prot_all_lines(const char *func_name, int theLine)
-{
-   counter++;
-   tokenCounter = 0;
-   size_t lineNumber = 1;
-
-   LOG_FMT(LGUY, "Prot_all_lines:(%s:%d)(%zu)\n", func_name, theLine, counter);
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = pc->next)
-   {
-      tokenCounter++;
-
-      LOG_FMT(LGUY, " orig_line is %zu,%zu, pp_level is %zu, ", lineNumber, tokenCounter, pc->pp_level);
-
-      if (chunk_is_token(pc, CT_VBRACE_OPEN))
-      {
-         LOG_FMT(LGUY, "<VBRACE_OPEN>, ");
-      }
-      else if (chunk_is_token(pc, CT_NEWLINE))
-      {
-         LOG_FMT(LGUY, "<NL>(nl_count is %zu), ", pc->nl_count);
-         tokenCounter = 0;
-         lineNumber   = lineNumber + pc->nl_count;
-      }
-      else if (chunk_is_token(pc, CT_VBRACE_CLOSE))
-      {
-         LOG_FMT(LGUY, "<CT_VBRACE_CLOSE>, ");
-      }
-      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
-      {
-         LOG_FMT(LGUY, "<CT_VBRACE_OPEN>, ");
-      }
-      else if (chunk_is_token(pc, CT_SPACE))
-      {
-         LOG_FMT(LGUY, "<CT_SPACE>, ");
-      }
-      else if (chunk_is_token(pc, CT_IGNORED))
-      {
-         LOG_FMT(LGUY, "<IGNORED> ");
-      }
-      else
-      {
-         LOG_FMT(LGUY, "text() '%s', ", pc->text());
-      }
-      LOG_FMT(LGUY, " column is %zu, type is %s\n",
-              pc->column, get_token_name(pc->type));
-   }
-} // prot_all_lines
-
-
-void prot_the_source(int theLine)
-{
-   counter++;
-   LOG_FMT(LGUY, "Prot_the_source:(%d)(%zu)\n", theLine, counter);
-   output_text(stderr);
-}
-
-
-// examples:
-//   examine_Data(__func__, __LINE__, n);
-void examine_Data(const char *func_name, int theLine, int what)
-{
-   LOG_FMT(LGUY, "\n%s:", func_name);
-
-   chunk_t *pc;
-
-   switch (what)
-   {
-   case 1:
-
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
-      {
-         if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-            || chunk_is_token(pc, CT_TSQUARE))
-         {
-            LOG_FMT(LGUY, "\n");
-            LOG_FMT(LGUY, "1:(%d),", theLine);
-            LOG_FMT(LGUY, "%s, orig_col=%zu, orig_col_end=%zu\n", pc->text(), pc->orig_col, pc->orig_col_end);
-         }
-      }
-
-      break;
-
-   case 2:
-      LOG_FMT(LGUY, "2:(%d)\n", theLine);
-
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
-      {
-         if (pc->orig_line == 7)
-         {
-            if (chunk_is_token(pc, CT_NEWLINE))
-            {
-               LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->orig_line, pc->orig_col);
-            }
-            else
-            {
-               LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->orig_line, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column);
-            }
-         }
-      }
-
-      break;
-
-   case 3:
-      LOG_FMT(LGUY, "3:(%d)\n", theLine);
-
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
-      {
-         if (chunk_is_token(pc, CT_NEWLINE))
-         {
-            LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->orig_line, pc->orig_col);
-         }
-         else
-         {
-            LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->orig_line, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column);
-         }
-      }
-
-      break;
-
-   case 4:
-      LOG_FMT(LGUY, "4:(%d)\n", theLine);
-
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
-      {
-         if (pc->orig_line == 6)
-         {
-            if (chunk_is_token(pc, CT_NEWLINE))
-            {
-               LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->orig_line, pc->orig_col);
-            }
-            else
-            {
-               LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->orig_line, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column);
-            }
-         }
-      }
-
-      break;
-
-   default:
-      break;
-   } // switch
-}    // examine_Data
-
-
-void dump_out(unsigned int type)
-{
-   char dumpFileName[300];
-
-   if (cpd.dumped_file == nullptr)
-   {
-      sprintf(dumpFileName, "%s.%u", cpd.filename.c_str(), type);
-   }
-   else
-   {
-      sprintf(dumpFileName, "%s.%u", cpd.dumped_file, type);
-   }
-   FILE *D_file = fopen(dumpFileName, "w");
-
-   if (D_file != nullptr)
-   {
-      for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = pc->next)
-      {
-         fprintf(D_file, "[%p]\n", pc);
-         fprintf(D_file, "  type %s\n", get_token_name(pc->type));
-         fprintf(D_file, "  orig_line %zu\n", pc->orig_line);
-         fprintf(D_file, "  orig_col %zu\n", pc->orig_col);
-         fprintf(D_file, "  orig_col_end %zu\n", pc->orig_col_end);
-
-         if (pc->orig_prev_sp != 0)
-         {
-            fprintf(D_file, "  orig_prev_sp %u\n", pc->orig_prev_sp);
-         }
-
-         if (pc->column != 0)
-         {
-            fprintf(D_file, "  column %zu\n", pc->column);
-         }
-
-         if (pc->column_indent != 0)
-         {
-            fprintf(D_file, "  column_indent %zu\n", pc->column_indent);
-         }
-
-         if (pc->nl_count != 0)
-         {
-            fprintf(D_file, "  nl_count %zu\n", pc->nl_count);
-         }
-
-         if (pc->level != 0)
-         {
-            fprintf(D_file, "  level %zu\n", pc->level);
-         }
-
-         if (pc->brace_level != 0)
-         {
-            fprintf(D_file, "  brace_level %zu\n", pc->brace_level);
-         }
-
-         if (pc->pp_level != 0)
-         {
-            fprintf(D_file, "  pp_level %zu\n", pc->pp_level);
-         }
-
-         if (pc->after_tab != 0)
-         {
-            fprintf(D_file, "  after_tab %d\n", pc->after_tab);
-         }
-
-         if (pc->type != CT_NEWLINE)
-         {
-            fprintf(D_file, "  text %s\n", pc->text());
-         }
-      }
-
-      fclose(D_file);
-   }
-} // dump_out
-
-
-void dump_in(unsigned int type)
-{
-   char    buffer[256];
-   bool    aNewChunkIsFound = false;
-   chunk_t chunk;
-   char    dumpFileName[300];
-
-   if (cpd.dumped_file == nullptr)
-   {
-      sprintf(dumpFileName, "%s.%u", cpd.filename.c_str(), type);
-   }
-   else
-   {
-      sprintf(dumpFileName, "%s.%u", cpd.dumped_file, type);
-   }
-   FILE *D_file = fopen(dumpFileName, "r");
-
-   if (D_file != nullptr)
-   {
-      unsigned int lineNumber = 0;
-
-      while (fgets(buffer, sizeof(buffer), D_file) != nullptr)
-      {
-         ++lineNumber;
-
-         if (aNewChunkIsFound)
-         {
-            // look for the next chunk
-            char first = buffer[0];
-
-            if (first == '[')
-            {
-               aNewChunkIsFound = false;
-               // add the chunk in the list
-               chunk_add_before(&chunk, nullptr);
-               chunk.reset();
-               aNewChunkIsFound = true;
-               continue;
-            }
-            // the line as the form
-            // part value
-            // Split the line
-            const int max_parts_count = 3;
-            char      *parts[max_parts_count];
-            int       parts_count = Args::SplitLine(buffer, parts, max_parts_count - 1);
-
-            if (parts_count != 2)
-            {
-               exit(EX_SOFTWARE);
-            }
-
-            if (strcasecmp(parts[0], "type") == 0)
-            {
-               c_token_t tokenName = find_token_name(parts[1]);
-               set_chunk_type(&chunk, tokenName);
-            }
-            else if (strcasecmp(parts[0], "orig_line") == 0)
-            {
-               chunk.orig_line = strtol(parts[1], nullptr, 0);
-            }
-            else if (strcasecmp(parts[0], "orig_col") == 0)
-            {
-               chunk.orig_col = strtol(parts[1], nullptr, 0);
-            }
-            else if (strcasecmp(parts[0], "orig_col_end") == 0)
-            {
-               chunk.orig_col_end = strtol(parts[1], nullptr, 0);
-            }
-            else if (strcasecmp(parts[0], "orig_prev_sp") == 0)
-            {
-               chunk.orig_prev_sp = strtol(parts[1], nullptr, 0);
-            }
-            else if (strcasecmp(parts[0], "column") == 0)
-            {
-               chunk.column = strtol(parts[1], nullptr, 0);
-            }
-            else if (strcasecmp(parts[0], "nl_count") == 0)
-            {
-               chunk.nl_count = strtol(parts[1], nullptr, 0);
-            }
-            else if (strcasecmp(parts[0], "text") == 0)
-            {
-               if (chunk.type != CT_NEWLINE)
-               {
-                  chunk.str = parts[1];
-               }
-            }
-            else
-            {
-               fprintf(stderr, "on line=%d, for '%s'\n", lineNumber, parts[0]);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-         }
-         else
-         {
-            // look for a new chunk
-            char first = buffer[0];
-
-            if (first == '[')
-            {
-               aNewChunkIsFound = true;
-               chunk.reset();
-            }
-         }
-      }
-      // add the last chunk in the list
-      chunk_add_before(&chunk, nullptr);
-      fclose(D_file);
-   }
-   else
-   {
-      fprintf(stderr, "FATAL: file not found '%s'\n", dumpFileName);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-} // dump_in
-
-
-size_t number = 0;
-
-
-size_t get_A_Number()
-{
-   number = number + 1;
-   return(number);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.h
deleted file mode 100644
index 3ee393d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file unc_tools.h
- *
- * @author  Guy Maurel
- *          October 2015, 2016, 2017, 2018, 2019, 2020, 2021
- * @license GPL v2+
- */
-
-#ifndef UNC_TOOLS_H_INCLUDED
-#define UNC_TOOLS_H_INCLUDED
-
-#include "prototypes.h"
-
-#if defined DEBUG
-#define PROT_THE_LINE    prot_the_line(__func__, __LINE__, 0, 0);
-#else
-#define PROT_THE_LINE    /* do nothing */;
-#endif
-
-
-void prot_the_line(const char *func_name, int theLine, unsigned int actual_line, size_t partNumber);
-
-
-void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsigned int actual_line, size_t partNumber);
-
-
-void prot_all_lines(const char *func_name, int theLine);
-
-
-void prot_the_source(int theLine);
-
-
-void examine_Data(const char *func_name, int theLine, int what);
-
-
-//! dump the chunk list to a file
-void dump_out(unsigned int type);
-
-
-//! create chunk list from a file
-void dump_in(unsigned int type);
-
-
-size_t get_A_Number();
-
-#endif /* UNC_TOOLS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.cpp
deleted file mode 100644
index bc01f53e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.cpp
+++ /dev/null
@@ -1,2648 +0,0 @@
-/**
- * @file uncrustify.cpp
- * This file takes an input C/C++/D/Java file and reformats it.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#define DEFINE_CHAR_TABLE
-
-#include "uncrustify.h"
-
-#include "align.h"
-#include "align_nl_cont.h"
-#include "align_preprocessor.h"
-#include "align_trailing_comments.h"
-#include "args.h"
-#include "backup.h"
-#include "brace_cleanup.h"
-#include "braces.h"
-#include "combine.h"
-#include "compat.h"
-#include "detect.h"
-#include "enum_cleanup.h"
-#include "indent.h"
-#include "keywords.h"
-#include "lang_pawn.h"
-#include "newlines.h"
-#include "output.h"
-#include "parens.h"
-#include "parent_for_pp.h"
-#include "remove_extra_returns.h"
-#include "semicolons.h"
-#include "sorting.h"
-#include "space.h"
-#include "token_names.h"
-#include "tokenize.h"
-#include "tokenize_cleanup.h"
-#include "unc_ctype.h"
-#include "unc_tools.h"
-#include "uncrustify_version.h"
-#include "unicode.h"
-#include "universalindentgui.h"
-#include "width.h"
-
-#include <fcntl.h>
-#include <map>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>    // provides strcasecmp()
-#endif
-#ifdef HAVE_UTIME_H
-#include <time.h>
-#endif
-
-
-// VS throws an error if an attribute newer than the requested standard level
-// is used; everyone else just ignores it (or warns) like they are supposed to
-
-#if __cplusplus >= 201703L
-#define NODISCARD    [[nodiscard]]
-#elif defined (__has_cpp_attribute)
-#if __has_cpp_attribute(nodiscard)
-#define NODISCARD    [[nodiscard]]
-#else
-#define NODISCARD
-#endif
-#else
-#define NODISCARD
-#endif
-
-constexpr static auto LCURRENT = LUNC;
-
-using namespace std;
-using namespace uncrustify;
-
-
-// Global data
-cp_data_t cpd;
-
-
-static size_t language_flags_from_name(const char *tag);
-
-
-/**
- * Find the language for the file extension
- * Defaults to C
- *
- * @param filename   The name of the file
- * @return           LANG_xxx
- */
-static size_t language_flags_from_filename(const char *filename);
-
-
-static bool read_stdin(file_mem &fm);
-
-
-static void uncrustify_start(const deque<int> &data);
-
-
-static bool ends_with(const char *filename, const char *tag, bool case_sensitive);
-
-
-/**
- * Does a source file.
- *
- * @param filename_in  the file to read
- * @param filename_out nullptr (stdout) or the file to write
- * @param parsed_file  nullptr or the filename for the parsed debug info
- * @param no_backup    don't create a backup, if filename_out == filename_in
- * @param keep_mtime   don't change the mtime (dangerous)
- */
-static void do_source_file(const char *filename_in, const char *filename_out, const char *parsed_file, bool no_backup, bool keep_mtime);
-
-
-static void add_file_header();
-
-
-static void add_file_footer();
-
-
-static void add_func_header(c_token_t type, file_mem &fm);
-
-
-static void add_msg_header(c_token_t type, file_mem &fm);
-
-
-static void process_source_list(const char *source_list, const char *prefix, const char *suffix, bool no_backup, bool keep_mtime);
-
-
-static const char *make_output_filename(char *buf, size_t buf_size, const char *filename, const char *prefix, const char *suffix);
-
-
-//! compare the content of two files
-static bool file_content_matches(const string &filename1, const string &filename2);
-
-
-static string fix_filename(const char *filename);
-
-
-static bool bout_content_matches(const file_mem &fm, bool report_status);
-
-
-/**
- * Loads a file into memory
- *
- * @param filename  name of file to load
- *
- * @retval true   file was loaded successfully
- * @retval false  file could not be loaded
- */
-static int load_mem_file(const char *filename, file_mem &fm);
-
-
-/**
- * Try to load the file from the config folder first and then by name
- *
- * @param filename  name of file to load
- *
- * @retval true   file was loaded successfully
- * @retval false  file could not be loaded
- */
-static int load_mem_file_config(const std::string &filename, file_mem &fm);
-
-
-//! print uncrustify version number and terminate
-static void version_exit(void);
-
-
-const char *path_basename(const char *path)
-{
-   if (path == nullptr)
-   {
-      return("");
-   }
-   const char *last_path = path;
-   char       ch;
-
-   while ((ch = *path) != 0) // check for end of string
-   {
-      path++;
-
-      // Check both slash types to support Linux and Windows
-      if (  (ch == '/')
-         || (ch == '\\'))
-      {
-         last_path = path;
-      }
-   }
-   return(last_path);
-}
-
-
-int path_dirname_len(const char *filename)
-{
-   if (filename == nullptr)
-   {
-      return(0);
-   }
-   // subtracting addresses like this works only on big endian systems
-   return(static_cast<int>(path_basename(filename) - filename));
-}
-
-
-void usage_error(const char *msg)
-{
-   if (msg != nullptr)
-   {
-      fprintf(stderr, "%s\n", msg);
-      log_flush(true);
-   }
-   fprintf(stderr, "Try running with -h for usage information\n");
-   log_flush(true);
-}
-
-
-static void tease()
-{
-   fprintf(stdout,
-           "There are currently %d options and minimal documentation.\n"
-           "Try UniversalIndentGUI and good luck.\n", (int)get_option_count());
-}
-
-
-void usage(const char *argv0)
-{
-   fprintf(stdout,
-           "Usage:\n"
-           "%s [options] [files ...]\n"
-           "\n"
-           "If no input files are specified, the input is read from stdin\n"
-           "If reading from stdin, you should specify the language using -l\n"
-           "or specify a filename using --assume for automatic language detection.\n"
-           "\n"
-           "If -F is used or files are specified on the command line,\n"
-           "the output filename is 'prefix/filename' + suffix\n"
-           "\n"
-           "When reading from stdin or doing a single file via the '-f' option,\n"
-           "the output is dumped to stdout, unless redirected with -o FILE.\n"
-           "\n"
-           "Errors are always dumped to stderr\n"
-           "\n"
-           "The '-f' and '-o' options may not be used with '-F' or '--replace'.\n"
-           "The '--prefix' and '--suffix' options may not be used with '--replace'.\n"
-           "\n"
-           "Basic Options:\n"
-           " -c CFG       : Use the config file CFG, or defaults if CFG is set to '-'.\n"
-           " -f FILE      : Process the single file FILE (output to stdout, use with -o).\n"
-           " -o FILE      : Redirect stdout to FILE.\n"
-           " -F FILE      : Read files to process from FILE, one filename per line (- is stdin).\n"
-           " --check      : Do not output the new text, instead verify that nothing changes when\n"
-           "                the file(s) are processed.\n"
-           "                The status of every file is printed to stderr.\n"
-           "                The exit code is EXIT_SUCCESS if there were no changes, EXIT_FAILURE otherwise.\n"
-           " files        : Files to process (can be combined with -F).\n"
-           " --suffix SFX : Append SFX to the output filename. The default is '.uncrustify'\n"
-           " --prefix PFX : Prepend PFX to the output filename path.\n"
-           " --replace    : Replace source files (creates a backup).\n"
-           " --no-backup  : Do not create backup and md5 files. Useful if files are under source control.\n"
-           " --if-changed : Write to stdout (or create output FILE) only if a change was detected.\n"
-#ifdef HAVE_UTIME_H
-           " --mtime      : Preserve mtime on replaced files.\n"
-#endif
-           " -l           : Language override: C, CPP, D, CS, JAVA, PAWN, OC, OC+, VALA.\n"
-           " -t           : Load a file with types (usually not needed).\n"
-           " -q           : Quiet mode - no output on stderr (-L will override).\n"
-           " --frag       : Code fragment, assume the first line is indented correctly.\n"
-           " --assume FN  : Uses the filename FN for automatic language detection if reading\n"
-           "                from stdin unless -l is specified.\n"
-           "\n"
-           "Config/Help Options:\n"
-           " -h -? --help --usage     : Print this message and exit.\n"
-           " --version                : Print the version and exit.\n"
-           " --count-options          : Print the number of available options and exit.\n"
-           " --show-config            : Print out option documentation and exit.\n"
-           " --update-config          : Output a new config file. Use with -o FILE.\n"
-           " --update-config-with-doc : Output a new config file. Use with -o FILE.\n"
-           " --universalindent        : Output a config file for Universal Indent GUI.\n"
-           " --detect                 : Detects the config from a source file. Use with '-f FILE'.\n"
-           "                            Detection is fairly limited.\n"
-           " --set <option>=<value>   : Sets a new value to a config option.\n"
-           "\n"
-           "Debug Options:\n"
-           " -p FILE               : Dump debug info into FILE, or to stdout if FILE is set to '-'.\n"
-           "                         Must be used in combination with '-f FILE'\n"
-           " -L SEV                : Set the log severity (see log_levels.h; note 'A' = 'all')\n"
-           " -s                    : Show the log severity in the logs.\n"
-           " --decode              : Decode remaining args (chunk flags) and exit.\n"
-           " --tracking_space FILE : Prepare tracking informations for debugging.\n"
-           "                         Cannot be used with the -o option'\n"
-           "\n"
-           "Usage Examples\n"
-           "cat foo.d | uncrustify -q -c my.cfg -l d\n"
-           "uncrustify -c my.cfg -f foo.d\n"
-           "uncrustify -c my.cfg -f foo.d -L0-2,20-23,51\n"
-           "uncrustify -c my.cfg -f foo.d -o foo.d\n"
-           "uncrustify -c my.cfg foo.d\n"
-           "uncrustify -c my.cfg --replace foo.d\n"
-           "uncrustify -c my.cfg --no-backup foo.d\n"
-           "uncrustify -c my.cfg --prefix=out -F files.txt\n"
-           "\n"
-           "Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable\n"
-           "      processing of parts of the source file (these can be overridden with\n"
-           "      enable_processing_cmt and disable_processing_cmt).\n"
-           "\n"
-           ,
-           path_basename(argv0));
-   tease();
-} // usage
-
-
-static void version_exit(void)
-{
-   printf("%s\n", UNCRUSTIFY_VERSION);
-   exit(EX_OK);
-}
-
-
-NODISCARD static int redir_stdout(const char *output_file)
-{
-   FILE *my_stdout = stdout;  // Reopen stdout
-
-   if (output_file != nullptr)
-   {
-      my_stdout = freopen(output_file, "wb", stdout);
-
-      if (my_stdout == nullptr)
-      {
-         LOG_FMT(LERR, "Unable to open %s for write: %s (%d)\n",
-                 output_file, strerror(errno), errno);
-         cpd.error_count++;
-         usage_error();
-         return(EX_IOERR);
-      }
-      LOG_FMT(LNOTE, "Redirecting output to %s\n", output_file);
-   }
-   return(EXIT_SUCCESS);
-}
-
-// Currently, the crash handler is only supported while building under MSVC
-#if defined (WIN32) && defined (_MSC_VER)
-
-
-void setup_crash_handling()
-{
-   // prevent crash popup. uncrustify is a batch processing tool and a popup is unacceptable.
-   ::SetErrorMode(::GetErrorMode() | SEM_NOGPFAULTERRORBOX);
-
-   struct local
-   {
-      static LONG WINAPI crash_filter(_In_ struct _EXCEPTION_POINTERS *exceptionInfo)
-      {
-         __try
-         {
-            LOG_FMT(LERR, "crash_filter: exception 0x%08X at [%d:%d] (ip=%p)",
-                    exceptionInfo->ExceptionRecord->ExceptionCode,
-                    cpd.line_number, cpd.column,
-                    exceptionInfo->ExceptionRecord->ExceptionAddress);
-            log_func_stack(LERR, " [CallStack:", "]\n", 0);
-
-            // treat an exception the same as a parse failure. exceptions can result from parse failures where we
-            // do not have specific handling (null-checks for particular parse paths etc.) and callers generally
-            // won't care about the difference. they just want to know it failed.
-            exit(EXIT_FAILURE);
-         }
-         __except (EXCEPTION_EXECUTE_HANDLER)
-         {
-            // have to be careful of crashes in crash handling code
-         }
-
-         // safety - note that this will not flush like we need, but at least will get the right return code
-         ::ExitProcess(EXIT_FAILURE);
-      }
-   };
-
-   // route all crashes through our own handler
-   ::SetUnhandledExceptionFilter(local::crash_filter);
-}
-
-#else
-
-
-void setup_crash_handling()
-{
-   // TODO: unixes
-}
-
-#endif
-
-
-int main(int argc, char *argv[])
-{
-   // initialize the global data
-   cpd.unc_off_used = false;
-
-   setup_crash_handling();
-
-   init_keywords();
-
-   // check keyword sort
-   assert(keywords_are_sorted());
-
-   // Build options map
-   register_options();
-
-   // If ran without options show the usage info and exit */
-   if (argc == 1)
-   {
-      usage(argv[0]);
-      return(EXIT_SUCCESS);
-   }
-#ifdef DEBUG
-   // make sure we have 'name' not too big
-   const int max_name_length = 19;
-
-   // maxLengthOfTheName must be consider at the format line at the file
-   // output.cpp, line 427: fprintf(pfile, "# Line              Tag                Parent...
-   // and              430: ... fprintf(pfile, "%s# %3zu>%19.19s[%19.19s] ...
-   // here                                                xx xx   xx xx
-   for (size_t token = 0; token < ARRAY_SIZE(token_names); token++)
-   {
-      const size_t name_length = strlen(token_names[token]);
-
-      if (name_length > max_name_length)
-      {
-         fprintf(stderr, "%s(%d): The token name '%s' is too long (%d)\n",
-                 __func__, __LINE__, token_names[token], static_cast<int>(name_length));
-         fprintf(stderr, "%s(%d): the max token name length is %d\n",
-                 __func__, __LINE__, max_name_length);
-         log_flush(true);
-         exit(EX_SOFTWARE);
-      }
-   }
-
-   // make sure we have token_names.h in sync with token_enum.h
-   assert(ARRAY_SIZE(token_names) == CT_TOKEN_COUNT_);
-#endif // DEBUG
-
-   Args arg(argc, argv);
-
-   if (  arg.Present("--version")
-      || arg.Present("-v"))
-   {
-      version_exit();
-   }
-
-   if (  arg.Present("--help")
-      || arg.Present("-h")
-      || arg.Present("--usage")
-      || arg.Present("-?"))
-   {
-      usage(argv[0]);
-      return(EXIT_SUCCESS);
-   }
-
-   if (arg.Present("--count-options"))
-   {
-      tease();
-      return(EXIT_SUCCESS);
-   }
-
-   if (arg.Present("--show-config"))
-   {
-      save_option_file(stdout, true);
-      return(EXIT_SUCCESS);
-   }
-   cpd.do_check   = arg.Present("--check");
-   cpd.if_changed = arg.Present("--if-changed");
-
-#ifdef WIN32
-   // tell Windows not to change what I write to stdout
-   UNUSED(_setmode(_fileno(stdout), _O_BINARY));
-#endif
-
-   // Init logging
-   log_init(cpd.do_check ? stdout : stderr);
-   log_mask_t mask;
-
-   if (arg.Present("-q"))
-   {
-      logmask_from_string("", mask);
-      log_set_mask(mask);
-   }
-   const char *p_arg;
-
-   if (  ((p_arg = arg.Param("-L")) != nullptr)
-      || ((p_arg = arg.Param("--log")) != nullptr))
-   {
-      logmask_from_string(p_arg, mask);
-      log_set_mask(mask);
-   }
-   cpd.frag = arg.Present("--frag");
-
-   if (arg.Present("--decode"))
-   {
-      size_t idx = 1;
-
-      while ((p_arg = arg.Unused(idx)) != nullptr)
-      {
-         log_pcf_flags(LSYS, static_cast<pcf_flag_e>(strtoul(p_arg, nullptr, 16)));
-      }
-      return(EXIT_SUCCESS);
-   }
-   // Get the config file name
-   string cfg_file;
-
-   if (  ((p_arg = arg.Param("--config")) != nullptr)
-      || ((p_arg = arg.Param("-c")) != nullptr))
-   {
-      cfg_file = p_arg;
-   }
-   else if (!unc_getenv("UNCRUSTIFY_CONFIG", cfg_file))
-   {
-      // Try to find a config file at an alternate location
-      string home;
-
-      if (unc_homedir(home))
-      {
-         struct stat tmp_stat = {};
-
-         const auto  path0 = home + "/.uncrustify.cfg";
-         const auto  path1 = home + "/uncrustify.cfg";
-
-         if (stat(path0.c_str(), &tmp_stat) == 0)
-         {
-            cfg_file = path0;
-         }
-         else if (stat(path1.c_str(), &tmp_stat) == 0)
-         {
-            cfg_file = path1;
-         }
-      }
-   }
-   // Get the parsed file name
-   const char *parsed_file;
-
-   if (  ((parsed_file = arg.Param("--parsed")) != nullptr)
-      || ((parsed_file = arg.Param("-p")) != nullptr))
-   {
-      if (  parsed_file[0] == '-'
-         && !parsed_file[1])
-      {
-         LOG_FMT(LNOTE, "Will print parsed data to stdout\n");
-      }
-      else
-      {
-         LOG_FMT(LNOTE, "Will export parsed data to: %s\n", parsed_file);
-      }
-   }
-
-   // Enable log severities
-   if (  arg.Present("-s")
-      || arg.Present("--show"))
-   {
-      log_show_sev(true);
-   }
-   // Load type files
-   size_t idx = 0;
-
-   while ((p_arg = arg.Params("-t", idx)) != nullptr)
-   {
-      load_keyword_file(p_arg);
-   }
-   // add types
-   idx = 0;
-
-   while ((p_arg = arg.Params("--type", idx)) != nullptr)
-   {
-      add_keyword(p_arg, CT_TYPE);
-   }
-   bool arg_l_is_set = false;
-
-   // Check for a language override
-   if ((p_arg = arg.Param("-l")) != nullptr)
-   {
-      arg_l_is_set   = true;
-      cpd.lang_flags = language_flags_from_name(p_arg);
-
-      if (cpd.lang_flags == 0)
-      {
-         LOG_FMT(LWARN, "Ignoring unknown language: %s\n", p_arg);
-      }
-      else
-      {
-         cpd.lang_forced = true;
-      }
-   }
-   // Get the source file name
-   const char *source_file;
-
-   if (  ((source_file = arg.Param("--file")) == nullptr)
-      && ((source_file = arg.Param("-f")) == nullptr))
-   {
-      // not using a single file, source_file is nullptr
-   }
-   // Get a source file list
-   const char *source_list;
-
-   if (  ((source_list = arg.Param("--files")) == nullptr)
-      && ((source_list = arg.Param("-F")) == nullptr))
-   {
-      // not using a file list, source_list is nullptr
-   }
-   const char  *prefix = arg.Param("--prefix");
-   const char  *suffix = arg.Param("--suffix");
-   const char  *assume = arg.Param("--assume");
-
-   bool        no_backup        = arg.Present("--no-backup");
-   bool        replace          = arg.Present("--replace");
-   bool        keep_mtime       = arg.Present("--mtime");
-   bool        update_config    = arg.Present("--update-config");
-   bool        update_config_wd = arg.Present("--update-config-with-doc");
-   bool        detect           = arg.Present("--detect");
-   bool        pfile_csv        = arg.Present("--debug-csv-format");
-
-   std::string parsed_file_csv;
-
-   if (pfile_csv)
-   {
-      if (  parsed_file == nullptr
-         || (  parsed_file[0] == '-'
-            && !parsed_file[1]))
-      {
-         fprintf(stderr,
-                 "FAIL: --debug-csv-format option must be used in combination with '-p FILE', where FILE\n"
-                 "      is not set to '-'\n");
-         log_flush(true);
-         exit(EX_CONFIG);
-      }
-      else if (!ends_with(parsed_file, ".csv", false))
-      {
-         parsed_file_csv = parsed_file;
-
-         // user-specified parsed filename does not end in a ".csv" extension, so add it
-         parsed_file_csv += ".csv";
-         parsed_file      = parsed_file_csv.c_str();
-      }
-   }
-   // Grab the output override
-   const char *output_file = arg.Param("-o");
-
-   // for debugging tracking
-   cpd.html_file = arg.Param("--tracking_space");
-
-   LOG_FMT(LDATA, "%s\n", UNCRUSTIFY_VERSION);
-   LOG_FMT(LDATA, "config_file = %s\n", cfg_file.c_str());
-   LOG_FMT(LDATA, "output_file = %s\n", (output_file != NULL) ? output_file : "null");
-   LOG_FMT(LDATA, "source_file = %s\n", (source_file != NULL) ? source_file : "null");
-   LOG_FMT(LDATA, "source_list = %s\n", (source_list != NULL) ? source_list : "null");
-   LOG_FMT(LDATA, "tracking    = %s\n", (cpd.html_file != NULL) ? cpd.html_file : "null");
-   LOG_FMT(LDATA, "prefix      = %s\n", (prefix != NULL) ? prefix : "null");
-   LOG_FMT(LDATA, "suffix      = %s\n", (suffix != NULL) ? suffix : "null");
-   LOG_FMT(LDATA, "assume      = %s\n", (assume != NULL) ? assume : "null");
-   LOG_FMT(LDATA, "replace     = %s\n", replace ? "true" : "false");
-   LOG_FMT(LDATA, "no_backup   = %s\n", no_backup ? "true" : "false");
-   LOG_FMT(LDATA, "detect      = %s\n", detect ? "true" : "false");
-   LOG_FMT(LDATA, "check       = %s\n", cpd.do_check ? "true" : "false");
-   LOG_FMT(LDATA, "if_changed  = %s\n", cpd.if_changed ? "true" : "false");
-
-   if (  cpd.do_check
-      && (  output_file
-         || replace
-         || no_backup
-         || keep_mtime
-         || update_config
-         || update_config_wd
-         || detect
-         || prefix
-         || suffix
-         || cpd.if_changed))
-   {
-      usage_error("Cannot use --check with output options.");
-      return(EX_NOUSER);
-   }
-
-   if (!cpd.do_check)
-   {
-      if (replace)
-      {
-         if (  prefix != nullptr
-            || suffix != nullptr)
-         {
-            usage_error("Cannot use --replace with --prefix or --suffix");
-            return(EX_NOINPUT);
-         }
-
-         if (  source_file != nullptr
-            || output_file != nullptr)
-         {
-            usage_error("Cannot use --replace with -f or -o");
-            return(EX_NOINPUT);
-         }
-      }
-      else if (!no_backup)
-      {
-         if (  prefix == nullptr
-            && suffix == nullptr)
-         {
-            suffix = ".uncrustify";
-         }
-      }
-   }
-
-   /*
-    * Try to load the config file, if available.
-    * It is optional for "--universalindent", "--parsed" and "--detect", but
-    * required for everything else.
-    */
-   if (  !cfg_file.empty()
-      && cfg_file[0] != '-')
-   {
-      cpd.filename = cfg_file;
-
-      if (!load_option_file(cpd.filename.c_str()))
-      {
-         usage_error("Unable to load the config file");
-         return(EX_IOERR);
-      }
-      // test if all options are compatible to each other
-      log_rule_B("nl_max");
-
-      if (options::nl_max() > 0)
-      {
-         // test if one/some option(s) is/are not too big for that
-         log_rule_B("nl_func_var_def_blk");
-
-         if (options::nl_func_var_def_blk() >= options::nl_max())
-         {
-            fprintf(stderr, "The option 'nl_func_var_def_blk' is too big against the option 'nl_max'\n");
-            log_flush(true);
-            exit(EX_CONFIG);
-         }
-      }
-   }
-   // Set config options using command line arguments.
-   idx = 0;
-
-   const size_t max_args_length = 256;
-
-   while ((p_arg = arg.Params("--set", idx)) != nullptr)
-   {
-      size_t argLength = strlen(p_arg);
-
-      if (argLength > max_args_length)
-      {
-         fprintf(stderr, "The buffer is to short for the set argument '%s'\n", p_arg);
-         log_flush(true);
-         exit(EX_SOFTWARE);
-      }
-      char buffer[max_args_length];
-      strcpy(buffer, p_arg);
-
-      // Tokenize and extract key and value
-      const char *token  = strtok(buffer, "=");
-      const char *option = token;
-
-      token = strtok(nullptr, "=");
-      const char *value = token;
-
-      if (  option != nullptr
-         && value != nullptr
-         && strtok(nullptr, "=") == nullptr)   // end of argument reached
-      {
-         if (auto *opt = uncrustify::find_option(option))
-         {
-            if (!opt->read(value))
-            {
-               return(EXIT_FAILURE);
-            }
-         }
-         else
-         {
-            fprintf(stderr, "Unknown option '%s' to override.\n", buffer);
-            log_flush(true);
-            return(EXIT_FAILURE);
-         }
-      }
-      else
-      {
-         // TODO: consider using defines like EX_USAGE from sysexits.h
-         usage_error("Error while parsing --set");
-         return(EX_USAGE);
-      }
-   }
-
-   if (arg.Present("--universalindent"))
-   {
-      FILE *pfile = stdout;
-
-      if (output_file != nullptr)
-      {
-         pfile = fopen(output_file, "w");
-
-         if (pfile == nullptr)
-         {
-            fprintf(stderr, "Unable to open %s for write: %s (%d)\n",
-                    output_file, strerror(errno), errno);
-            log_flush(true);
-            return(EXIT_FAILURE);
-         }
-      }
-      print_universal_indent_cfg(pfile);
-      fclose(pfile);
-
-      return(EXIT_SUCCESS);
-   }
-   // Set the number of second(s) before terminating formatting the current file.
-#ifdef WIN32
-   if (options::debug_timeout() > 0)
-   {
-      fprintf(stderr, "The option 'debug_timeout' is not available under Windows.\n");
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-#else
-   if (options::debug_timeout() > 0)
-   {
-      alarm(options::debug_timeout());
-   }
-#endif // ifdef WIN32
-
-   if (detect)
-   {
-      file_mem fm;
-
-      if (  source_file == nullptr
-         || source_list != nullptr)
-      {
-         fprintf(stderr, "The --detect option requires a single input file\n");
-         log_flush(true);
-         return(EXIT_FAILURE);
-      }
-
-      // Do some simple language detection based on the filename extension
-      if (  !cpd.lang_forced
-         || cpd.lang_flags == 0)
-      {
-         cpd.lang_flags = language_flags_from_filename(source_file);
-      }
-
-      // Try to read in the source file
-      if (load_mem_file(source_file, fm) < 0)
-      {
-         LOG_FMT(LERR, "Failed to load (%s)\n", source_file);
-         cpd.error_count++;
-         return(EXIT_FAILURE);
-      }
-      uncrustify_start(fm.data);
-      detect_options();
-      uncrustify_end();
-
-      if (auto error = redir_stdout(output_file))
-      {
-         return(error);
-      }
-      save_option_file(stdout, update_config_wd);
-      return(EXIT_SUCCESS);
-   }
-
-   if (  update_config
-      || update_config_wd)
-   {
-      // TODO: complain if file-processing related options are present
-      if (auto error = redir_stdout(output_file))
-      {
-         return(error);
-      }
-      save_option_file(stdout, update_config_wd);
-      return(EXIT_SUCCESS);
-   }
-
-   /*
-    * Everything beyond this point aside from dumping the parse tree is silly
-    * without a config file, so complain and bail if we don't have one.
-    */
-   if (  cfg_file.empty()
-      && !parsed_file)
-   {
-      usage_error("Specify the config file with '-c file' or set UNCRUSTIFY_CONFIG");
-      return(EX_IOERR);
-   }
-   // Done parsing args
-
-   // Check for unused args (ignore them)
-   idx   = 1;
-   p_arg = arg.Unused(idx);
-
-   // Check args - for multifile options
-   if (  source_list != nullptr
-      || p_arg != nullptr)
-   {
-      if (source_file != nullptr)
-      {
-         usage_error("Cannot specify both the single file option and a multi-file option.");
-         return(EX_NOUSER);
-      }
-
-      if (output_file != nullptr)
-      {
-         usage_error("Cannot specify -o with a multi-file option.");
-         return(EX_NOHOST);
-      }
-   }
-   // This relies on cpd.filename being the config file name
-   load_header_files();
-
-   if (  cpd.do_check
-      || cpd.if_changed)
-   {
-      cpd.bout = new deque<UINT8>();
-   }
-   idx = 1;
-
-   if (  source_file == nullptr
-      && source_list == nullptr
-      && arg.Unused(idx) == nullptr)
-   {
-      if (!arg_l_is_set)                     // Issue #3064
-      {
-         if (assume == nullptr)
-         {
-            LOG_FMT(LERR, "If reading from stdin, you should specify the language using -l\n");
-            LOG_FMT(LERR, "or specify a filename using --assume for automatic language detection.\n");
-            return(EXIT_FAILURE);
-         }
-      }
-
-      if (cpd.lang_flags == 0)
-      {
-         if (assume != nullptr)
-         {
-            cpd.lang_flags = language_flags_from_filename(assume);
-         }
-         else
-         {
-            cpd.lang_flags = LANG_C;
-         }
-      }
-
-      if (!cpd.do_check)
-      {
-         if (auto error = redir_stdout(output_file))
-         {
-            return(error);
-         }
-      }
-      file_mem fm;
-
-      if (!read_stdin(fm))
-      {
-         LOG_FMT(LERR, "Failed to read stdin\n");
-         cpd.error_count++;
-         return(100);
-      }
-      cpd.filename = "stdin";
-
-      // Done reading from stdin
-      LOG_FMT(LSYS, "Parsing: %d bytes (%d chars) from stdin as language %s\n",
-              (int)fm.raw.size(), (int)fm.data.size(),
-              language_name_from_flags(cpd.lang_flags));
-
-      uncrustify_file(fm, stdout, parsed_file);
-   }
-   else if (source_file != nullptr)
-   {
-      // Doing a single file
-      do_source_file(source_file, output_file, parsed_file, no_backup, keep_mtime);
-   }
-   else
-   {
-      if (parsed_file != nullptr)  // Issue #930
-      {
-         fprintf(stderr, "FAIL: -p option must be used with the -f option\n");
-         log_flush(true);
-         exit(EX_CONFIG);
-      }
-
-      // Doing multiple files, TODO: multiple threads for parallel processing
-      if (prefix != nullptr)
-      {
-         LOG_FMT(LSYS, "Output prefix: %s/\n", prefix);
-      }
-
-      if (suffix != nullptr)
-      {
-         LOG_FMT(LSYS, "Output suffix: %s\n", suffix);
-      }
-      // Do the files on the command line first
-      idx = 1;
-
-      while ((p_arg = arg.Unused(idx)) != nullptr)
-      {
-         char outbuf[1024];
-         do_source_file(p_arg,
-                        make_output_filename(outbuf, sizeof(outbuf), p_arg, prefix, suffix),
-                        nullptr, no_backup, keep_mtime);
-      }
-
-      if (source_list != nullptr)
-      {
-         process_source_list(source_list, prefix, suffix, no_backup, keep_mtime);
-      }
-   }
-   clear_keyword_file();
-
-   if (cpd.error_count != 0)
-   {
-      return(EXIT_FAILURE);
-   }
-
-   if (  cpd.do_check
-      && cpd.check_fail_cnt != 0)
-   {
-      return(EXIT_FAILURE);
-   }
-   return(EXIT_SUCCESS);
-} // main
-
-
-static void process_source_list(const char *source_list,
-                                const char *prefix, const char *suffix,
-                                bool no_backup, bool keep_mtime)
-{
-   bool from_stdin = strcmp(source_list, "-") == 0;
-   FILE *p_file    = from_stdin ? stdin : fopen(source_list, "r");
-
-   if (p_file == nullptr)
-   {
-      LOG_FMT(LERR, "%s: fopen(%s) failed: %s (%d)\n",
-              __func__, source_list, strerror(errno), errno);
-      cpd.error_count++;
-      return;
-   }
-   char linebuf[256];
-   int  line = 0;
-
-   while (fgets(linebuf, sizeof(linebuf), p_file) != nullptr)
-   {
-      line++;
-      char *fname = linebuf;
-      int  len    = strlen(fname);
-
-      while (  len > 0
-            && unc_isspace(*fname))
-      {
-         fname++;
-         len--;
-      }
-
-      while (  len > 0
-            && unc_isspace(fname[len - 1]))
-      {
-         len--;
-      }
-      fname[len] = 0;
-
-      while (len-- > 0)
-      {
-         if (fname[len] == '\\')
-         {
-            fname[len] = '/';
-         }
-      }
-      LOG_FMT(LFILELIST, "%3d] %s\n", line, fname);
-
-      if (fname[0] != '#')
-      {
-         char outbuf[1024];
-         do_source_file(fname,
-                        make_output_filename(outbuf, sizeof(outbuf), fname, prefix, suffix),
-                        nullptr, no_backup, keep_mtime);
-      }
-   }
-
-   if (!from_stdin)
-   {
-      fclose(p_file);
-   }
-} // process_source_list
-
-
-static bool read_stdin(file_mem &fm)
-{
-   deque<UINT8> dq;
-   char         buf[4096];
-
-   fm.raw.clear();
-   fm.data.clear();
-   fm.enc = char_encoding_e::e_ASCII;
-
-   // Re-open stdin in binary mode to preserve newline characters
-#ifdef WIN32
-   _setmode(_fileno(stdin), _O_BINARY);
-#endif
-
-   while (!feof(stdin))
-   {
-      int len = fread(buf, 1, sizeof(buf), stdin);
-
-      for (int idx = 0; idx < len; idx++)
-      {
-         dq.push_back(buf[idx]);
-      }
-   }
-   // Copy the raw data from the deque to the vector
-   fm.raw.insert(fm.raw.end(), dq.begin(), dq.end());
-   return(decode_unicode(fm.raw, fm.data, fm.enc, fm.bom));
-}
-
-
-static void make_folders(const string &filename)
-{
-   int  last_idx = 0;
-   char outname[4096];
-
-   snprintf(outname, sizeof(outname), "%s", filename.c_str());
-
-   for (int idx = 0; outname[idx] != 0; idx++)
-   {
-      if (  (outname[idx] == '/')
-         || (outname[idx] == '\\'))
-      {
-         outname[idx] = PATH_SEP;
-      }
-
-      // search until end of subpath is found
-      if (  idx > last_idx
-         && (outname[idx] == PATH_SEP))
-      {
-         outname[idx] = 0; // mark the end of the subpath
-
-         // create subfolder if it is not the start symbol of a path
-         // and not a Windows drive letter
-         if (  (strcmp(&outname[last_idx], ".") != 0)
-            && (strcmp(&outname[last_idx], "..") != 0)
-            && (!(  last_idx == 0
-                 && idx == 2
-                 && outname[1] == ':')))
-         {
-            int status;    // Coverity CID 75999
-            status = mkdir(outname, 0750);
-
-            if (  status != 0
-               && errno != EEXIST)
-            {
-               LOG_FMT(LERR, "%s: Unable to create %s: %s (%d)\n",
-                       __func__, outname, strerror(errno), errno);
-               cpd.error_count++;
-               return;
-            }
-         }
-         outname[idx] = PATH_SEP; // reconstruct full path to search for next subpath
-      }
-
-      if (outname[idx] == PATH_SEP)
-      {
-         last_idx = idx + 1;
-      }
-   }
-} // make_folders
-
-
-static int load_mem_file(const char *filename, file_mem &fm)
-{
-   int         retval = -1;
-   struct stat my_stat;
-   FILE        *p_file;
-
-   fm.raw.clear();
-   fm.data.clear();
-   fm.enc = char_encoding_e::e_ASCII;
-
-   // Grab the stat info for the file, return if it cannot be read
-   if (stat(filename, &my_stat) < 0)
-   {
-      return(-1);
-   }
-#ifdef HAVE_UTIME_H
-   // Save off modification time (mtime)
-   fm.utb.modtime = my_stat.st_mtime;
-#endif
-
-   // Try to read in the file
-   p_file = fopen(filename, "rb");
-
-   if (p_file == nullptr)
-   {
-      return(-1);
-   }
-   fm.raw.resize(my_stat.st_size);
-
-   if (my_stat.st_size == 0) // check if file is empty
-   {
-      retval = 0;
-      fm.bom = false;
-      fm.enc = char_encoding_e::e_ASCII;
-      fm.data.clear();
-   }
-   else
-   {
-      // read the raw data
-      if (fread(&fm.raw[0], fm.raw.size(), 1, p_file) != 1)
-      {
-         LOG_FMT(LERR, "%s: fread(%s) failed: %s (%d)\n",
-                 __func__, filename, strerror(errno), errno);
-         cpd.error_count++;
-      }
-      else if (!decode_unicode(fm.raw, fm.data, fm.enc, fm.bom))
-      {
-         LOG_FMT(LERR, "%s: failed to decode the file '%s'\n", __func__, filename);
-         cpd.error_count++;
-      }
-      else
-      {
-         LOG_FMT(LNOTE, "%s: '%s' encoding looks like %s (%d)\n", __func__, filename,
-                 fm.enc == char_encoding_e::e_ASCII ? "ASCII" :
-                 fm.enc == char_encoding_e::e_BYTE ? "BYTES" :
-                 fm.enc == char_encoding_e::e_UTF8 ? "UTF-8" :
-                 fm.enc == char_encoding_e::e_UTF16_LE ? "UTF-16-LE" :
-                 fm.enc == char_encoding_e::e_UTF16_BE ? "UTF-16-BE" : "Error",
-                 (int)fm.enc);
-         retval = 0;
-      }
-   }
-   fclose(p_file);
-   return(retval);
-} // load_mem_file
-
-
-static int load_mem_file_config(const std::string &filename, file_mem &fm)
-{
-   int  retval;
-   char buf[1024];
-
-   snprintf(buf, sizeof(buf), "%.*s%s",
-            path_dirname_len(cpd.filename.c_str()), cpd.filename.c_str(), filename.c_str());
-
-   retval = load_mem_file(buf, fm);
-
-   if (retval < 0)
-   {
-      retval = load_mem_file(filename.c_str(), fm);
-
-      if (retval < 0)
-      {
-         LOG_FMT(LERR, "Failed to load (%s) or (%s)\n", buf, filename.c_str());
-         cpd.error_count++;
-      }
-   }
-   return(retval);
-}
-
-
-int load_header_files()
-{
-   int retval = 0;
-
-   log_rule_B("cmt_insert_file_header");
-
-   if (!options::cmt_insert_file_header().empty())
-   {
-      // try to load the file referred to by the options string
-      retval |= load_mem_file_config(options::cmt_insert_file_header(),
-                                     cpd.file_hdr);
-   }
-   log_rule_B("cmt_insert_file_footer");
-
-   if (!options::cmt_insert_file_footer().empty())
-   {
-      retval |= load_mem_file_config(options::cmt_insert_file_footer(),
-                                     cpd.file_ftr);
-   }
-   log_rule_B("cmt_insert_func_header");
-
-   if (!options::cmt_insert_func_header().empty())
-   {
-      retval |= load_mem_file_config(options::cmt_insert_func_header(),
-                                     cpd.func_hdr);
-   }
-   log_rule_B("cmt_insert_class_header");
-
-   if (!options::cmt_insert_class_header().empty())
-   {
-      retval |= load_mem_file_config(options::cmt_insert_class_header(),
-                                     cpd.class_hdr);
-   }
-   log_rule_B("cmt_insert_oc_msg_header");
-
-   if (!options::cmt_insert_oc_msg_header().empty())
-   {
-      retval |= load_mem_file_config(options::cmt_insert_oc_msg_header(),
-                                     cpd.oc_msg_hdr);
-   }
-   log_rule_B("cmt_reflow_fold_regex_file");
-
-   if (!options::cmt_reflow_fold_regex_file().empty())
-   {
-      retval |= load_mem_file_config(options::cmt_reflow_fold_regex_file(),
-                                     cpd.reflow_fold_regex);
-   }
-   return(retval);
-} // load_header_files
-
-
-static const char *make_output_filename(char *buf, size_t buf_size,
-                                        const char *filename,
-                                        const char *prefix,
-                                        const char *suffix)
-{
-   int len = 0;
-
-   if (prefix != nullptr)
-   {
-      len = snprintf(buf, buf_size, "%s/", prefix);
-   }
-   snprintf(&buf[len], buf_size - len, "%s%s", filename,
-            (suffix != nullptr) ? suffix : "");
-
-   return(buf);
-}
-
-
-static bool file_content_matches(const string &filename1, const string &filename2)
-{
-   struct stat st1, st2;
-   int         fd1, fd2;
-
-   // Check the file sizes first
-   if (  (stat(filename1.c_str(), &st1) != 0)
-      || (stat(filename2.c_str(), &st2) != 0)
-      || st1.st_size != st2.st_size)
-   {
-      return(false);
-   }
-
-   if ((fd1 = open(filename1.c_str(), O_RDONLY)) < 0)
-   {
-      return(false);
-   }
-
-   if ((fd2 = open(filename2.c_str(), O_RDONLY)) < 0)
-   {
-      close(fd1);
-      return(false);
-   }
-   int   len1 = 0;
-   int   len2 = 0;
-   UINT8 buf1[1024];
-   UINT8 buf2[1024];
-
-   memset(buf1, 0, sizeof(buf1));
-   memset(buf2, 0, sizeof(buf2));
-
-   while (  len1 >= 0
-         && len2 >= 0)
-   {
-      if (len1 == 0)
-      {
-         len1 = read(fd1, buf1, sizeof(buf1));
-      }
-
-      if (len2 == 0)
-      {
-         len2 = read(fd2, buf2, sizeof(buf2));
-      }
-
-      if (  len1 <= 0
-         || len2 <= 0)
-      {
-         break; // reached end of either files
-         // TODO: what is if one file is longer than the other, do we miss that ?
-      }
-      int minlen = (len1 < len2) ? len1 : len2;
-
-      if (memcmp(buf1, buf2, minlen) != 0)
-      {
-         break; // found a difference
-      }
-      len1 -= minlen;
-      len2 -= minlen;
-   }
-   close(fd1);
-   close(fd2);
-
-   return(  len1 == 0
-         && len2 == 0);
-} // file_content_matches
-
-
-static string fix_filename(const char *filename)
-{
-   char   *tmp_file;
-   string rv;
-
-   // Create 'outfile.uncrustify'
-   tmp_file = new char[strlen(filename) + 16 + 1]; // + 1 for '//  + 1 for '/* + 1 for '\0' */' '
-
-   if (tmp_file != nullptr)
-   {
-      sprintf(tmp_file, "%s.uncrustify", filename);
-   }
-   rv = tmp_file;
-   delete[] tmp_file;
-   return(rv);
-}
-
-
-static bool bout_content_matches(const file_mem &fm, bool report_status)
-{
-   bool is_same = true;
-
-   // compare the old data vs the new data
-   if (cpd.bout->size() != fm.raw.size())
-   {
-      if (report_status)
-      {
-         fprintf(stderr, "FAIL: %s (File size changed from %u to %u)\n",
-                 cpd.filename.c_str(), static_cast<int>(fm.raw.size()),
-                 static_cast<int>(cpd.bout->size()));
-         log_flush(true);
-      }
-      is_same = false;
-   }
-   else
-   {
-      for (int idx = 0; idx < static_cast<int>(fm.raw.size()); idx++)
-      {
-         if (fm.raw[idx] != (*cpd.bout)[idx])
-         {
-            if (report_status)
-            {
-               fprintf(stderr, "FAIL: %s (Difference at byte %u)\n",
-                       cpd.filename.c_str(), idx);
-               log_flush(true);
-            }
-            is_same = false;
-            break;
-         }
-      }
-   }
-
-   if (  is_same
-      && report_status)
-   {
-      fprintf(stdout, "PASS: %s (%u bytes)\n",
-              cpd.filename.c_str(), static_cast<int>(fm.raw.size()));
-   }
-   return(is_same);
-} // bout_content_matches
-
-
-static void do_source_file(const char *filename_in,
-                           const char *filename_out,
-                           const char *parsed_file,
-                           bool       no_backup,
-                           bool       keep_mtime)
-{
-   FILE     *pfout      = nullptr;
-   bool     did_open    = false;
-   bool     need_backup = false;
-   file_mem fm;
-   string   filename_tmp;
-
-   // Do some simple language detection based on the filename extension
-   if (  !cpd.lang_forced
-      || cpd.lang_flags == 0)
-   {
-      cpd.lang_flags = language_flags_from_filename(filename_in);
-   }
-
-   // Try to read in the source file
-   if (load_mem_file(filename_in, fm) < 0)
-   {
-      LOG_FMT(LERR, "Failed to load (%s)\n", filename_in);
-      cpd.error_count++;
-      return;
-   }
-   LOG_FMT(LSYS, "Parsing: %s as language %s\n",
-           filename_in, language_name_from_flags(cpd.lang_flags));
-
-   cpd.filename = filename_in;
-
-   /*
-    * If we're only going to write on an actual change, then build the output
-    * buffer now and if there were changes, run it through the normal file
-    * write path.
-    *
-    * Future: many code paths could be simplified if 'bout' were always used and not
-    * optionally selected in just for do_check and if_changed.
-    */
-   if (cpd.if_changed)
-   {
-      /*
-       * Cleanup is deferred because we need 'bout' preserved long enough
-       * to write it to a file (if it changed).
-       */
-      uncrustify_file(fm, nullptr, parsed_file, true);
-
-      if (bout_content_matches(fm, false))
-      {
-         uncrustify_end();
-         return;
-      }
-   }
-
-   if (!cpd.do_check)
-   {
-      if (filename_out == nullptr)
-      {
-         pfout = stdout;
-      }
-      else
-      {
-         // If the out file is the same as the in file, then use a temp file
-         filename_tmp = filename_out;
-
-         if (strcmp(filename_in, filename_out) == 0)
-         {
-            // Create 'outfile.uncrustify'
-            filename_tmp = fix_filename(filename_out);
-
-            if (!no_backup)
-            {
-               if (backup_copy_file(filename_in, fm.raw) != EX_OK)
-               {
-                  LOG_FMT(LERR, "%s: Failed to create backup file for %s\n",
-                          __func__, filename_in);
-                  cpd.error_count++;
-                  return;
-               }
-               need_backup = true;
-            }
-         }
-         make_folders(filename_tmp);
-
-         pfout = fopen(filename_tmp.c_str(), "wb");
-
-         if (pfout == nullptr)
-         {
-            LOG_FMT(LERR, "%s: Unable to create %s: %s (%d)\n",
-                    __func__, filename_tmp.c_str(), strerror(errno), errno);
-            cpd.error_count++;
-            return;
-         }
-         did_open = true;
-         //LOG_FMT(LSYS, "Output file %s\n", filename_out);
-      }
-   }
-
-   if (cpd.if_changed)
-   {
-      for (deque<UINT8>::const_iterator i = cpd.bout->begin(), end = cpd.bout->end(); i != end; ++i)
-      {
-         fputc(*i, pfout);
-      }
-
-      uncrustify_end();
-   }
-   else
-   {
-      uncrustify_file(fm, pfout, parsed_file);
-   }
-
-   if (did_open)
-   {
-      fclose(pfout);
-
-      if (need_backup)
-      {
-         backup_create_md5_file(filename_in);
-      }
-
-      if (filename_tmp != filename_out)
-      {
-         // We need to compare and then do a rename (but avoid redundant test when if_changed set)
-         if (  !cpd.if_changed
-            && file_content_matches(filename_tmp, filename_out))
-         {
-            // No change - remove tmp file
-            UNUSED(unlink(filename_tmp.c_str()));
-         }
-         else
-         {
-            // Change - rename filename_tmp to filename_out
-
-#ifdef WIN32
-            /*
-             * Atomic rename in windows can't go through stdio rename() func because underneath
-             * it calls MoveFileExW without MOVEFILE_REPLACE_EXISTING.
-             */
-            if (!MoveFileEx(filename_tmp.c_str(), filename_out, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED))
-#else
-            if (rename(filename_tmp.c_str(), filename_out) != 0)
-#endif
-            {
-               LOG_FMT(LERR, "%s: Unable to rename '%s' to '%s'\n",
-                       __func__, filename_tmp.c_str(), filename_out);
-               cpd.error_count++;
-            }
-         }
-      }
-
-      if (keep_mtime)
-      {
-#ifdef HAVE_UTIME_H
-         // update mtime -- don't care if it fails
-         fm.utb.actime = time(nullptr);
-         UNUSED(utime(filename_in, &fm.utb));
-#endif
-      }
-   }
-} // do_source_file
-
-
-static void add_file_header()
-{
-   if (!chunk_is_comment(chunk_get_head()))
-   {
-      // TODO: detect the typical #ifndef FOO / #define FOO sequence
-      tokenize(cpd.file_hdr.data, chunk_get_head());
-   }
-}
-
-
-static void add_file_footer()
-{
-   chunk_t *pc = chunk_get_tail();
-
-   // Back up if the file ends with a newline
-   if (  pc != nullptr
-      && chunk_is_newline(pc))
-   {
-      pc = chunk_get_prev(pc);
-   }
-
-   if (  pc != nullptr
-      && (  !chunk_is_comment(pc)
-         || !chunk_is_newline(chunk_get_prev(pc))))
-   {
-      pc = chunk_get_tail();
-
-      if (!chunk_is_newline(pc))
-      {
-         LOG_FMT(LSYS, "Adding a newline at the end of the file\n");
-         newline_add_after(pc);
-      }
-      tokenize(cpd.file_ftr.data, nullptr);
-   }
-}
-
-
-static void add_func_header(c_token_t type, file_mem &fm)
-{
-   chunk_t *pc;
-   chunk_t *ref;
-   chunk_t *tmp;
-   bool    do_insert;
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnlnp(pc))
-   {
-      if (pc->type != type)
-      {
-         continue;
-      }
-      log_rule_B("cmt_insert_before_inlines");
-
-      if (  pc->flags.test(PCF_IN_CLASS)
-         && !options::cmt_insert_before_inlines())
-      {
-         continue;
-      }
-      // Check for one liners for classes. Declarations only. Walk down the chunks.
-      ref = pc;
-
-      if (  chunk_is_token(ref, CT_CLASS)
-         && get_chunk_parent_type(ref) == CT_NONE
-         && ref->next)
-      {
-         ref = ref->next;
-
-         if (  chunk_is_token(ref, CT_TYPE)
-            && get_chunk_parent_type(ref) == type
-            && ref->next)
-         {
-            ref = ref->next;
-
-            if (  chunk_is_token(ref, CT_SEMICOLON)
-               && ref->level == pc->level)
-            {
-               continue;
-            }
-         }
-      }
-      // Check for one liners for functions. There'll be a closing brace w/o any newlines. Walk down the chunks.
-      ref = pc;
-
-      if (  chunk_is_token(ref, CT_FUNC_DEF)
-         && get_chunk_parent_type(ref) == CT_NONE
-         && ref->next)
-      {
-         int found_brace = 0;                                 // Set if a close brace is found before a newline
-
-         while (  ref->type != CT_NEWLINE
-               && (ref = ref->next)) // TODO: is the assignment of ref wanted here?, better move it to the loop
-         {
-            if (chunk_is_token(ref, CT_BRACE_CLOSE))
-            {
-               found_brace = 1;
-               break;
-            }
-         }
-
-         if (found_brace)
-         {
-            continue;
-         }
-      }
-      do_insert = false;
-
-      /*
-       * On a function proto or def. Back up to a close brace or semicolon on
-       * the same level
-       */
-      ref = pc;
-
-      while ((ref = chunk_get_prev(ref)) != nullptr)
-      {
-         // Bail if we change level or find an access specifier colon
-         if (  ref->level != pc->level
-            || chunk_is_token(ref, CT_ACCESS_COLON))
-         {
-            do_insert = true;
-            break;
-         }
-
-         // If we hit an angle close, back up to the angle open
-         if (chunk_is_token(ref, CT_ANGLE_CLOSE))
-         {
-            ref = chunk_get_prev_type(ref, CT_ANGLE_OPEN, ref->level, scope_e::PREPROC);
-            continue;
-         }
-
-         // Bail if we hit a preprocessor and cmt_insert_before_preproc is false
-         if (ref->flags.test(PCF_IN_PREPROC))
-         {
-            tmp = chunk_get_prev_type(ref, CT_PREPROC, ref->level);
-
-            if (  tmp != nullptr
-               && get_chunk_parent_type(tmp) == CT_PP_IF)
-            {
-               tmp = chunk_get_prev_nnl(tmp);
-
-               log_rule_B("cmt_insert_before_preproc");
-
-               if (  chunk_is_comment(tmp)
-                  && !options::cmt_insert_before_preproc())
-               {
-                  break;
-               }
-            }
-         }
-
-         // Ignore 'right' comments
-         if (  chunk_is_comment(ref)
-            && chunk_is_newline(chunk_get_prev(ref)))
-         {
-            break;
-         }
-
-         if (  ref->level == pc->level
-            && (  ref->flags.test(PCF_IN_PREPROC)
-               || chunk_is_token(ref, CT_SEMICOLON)
-               || chunk_is_token(ref, CT_BRACE_CLOSE)))
-         {
-            do_insert = true;
-            break;
-         }
-      }
-
-      if (  ref == nullptr
-         && !chunk_is_comment(chunk_get_head())
-         && get_chunk_parent_type(chunk_get_head()) == type)
-      {
-         /**
-          * In addition to testing for preceding semicolons, closing braces, etc.,
-          * we need to also account for the possibility that the function declaration
-          * or definition occurs at the very beginning of the file
-          */
-         tokenize(fm.data, chunk_get_head());
-      }
-      else if (do_insert)
-      {
-         // Insert between after and ref
-         chunk_t *after = chunk_get_next_ncnnl(ref);
-         tokenize(fm.data, after);
-
-         for (tmp = chunk_get_next(ref); tmp != after; tmp = chunk_get_next(tmp))
-         {
-            tmp->level = after->level;
-         }
-      }
-   }
-} // add_func_header
-
-
-static void add_msg_header(c_token_t type, file_mem &fm)
-{
-   chunk_t *pc;
-   chunk_t *ref;
-   chunk_t *tmp;
-   bool    do_insert;
-
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnlnp(pc))
-   {
-      if (pc->type != type)
-      {
-         continue;
-      }
-      do_insert = false;
-
-      /*
-       * On a message declaration back up to a Objective-C scope
-       * the same level
-       */
-      ref = pc;
-
-      while ((ref = chunk_get_prev(ref)) != nullptr)
-      {
-         // ignore the CT_TYPE token that is the result type
-         if (  ref->level != pc->level
-            && (  chunk_is_token(ref, CT_TYPE)
-               || chunk_is_token(ref, CT_PTR_TYPE)))
-         {
-            continue;
-         }
-
-         // If we hit a parentheses around return type, back up to the open parentheses
-         if (chunk_is_token(ref, CT_PAREN_CLOSE))
-         {
-            ref = chunk_get_prev_type(ref, CT_PAREN_OPEN, ref->level, scope_e::PREPROC);
-            continue;
-         }
-
-         // Bail if we hit a preprocessor and cmt_insert_before_preproc is false
-         if (ref->flags.test(PCF_IN_PREPROC))
-         {
-            tmp = chunk_get_prev_type(ref, CT_PREPROC, ref->level);
-
-            if (  tmp != nullptr
-               && get_chunk_parent_type(tmp) == CT_PP_IF)
-            {
-               tmp = chunk_get_prev_nnl(tmp);
-
-               log_rule_B("cmt_insert_before_preproc");
-
-               if (  chunk_is_comment(tmp)
-                  && !options::cmt_insert_before_preproc())
-               {
-                  break;
-               }
-            }
-         }
-
-         if (  ref->level == pc->level
-            && (  ref->flags.test(PCF_IN_PREPROC)
-               || chunk_is_token(ref, CT_OC_SCOPE)))
-         {
-            ref = chunk_get_prev(ref);
-
-            if (ref != nullptr)
-            {
-               // Ignore 'right' comments
-               if (  chunk_is_newline(ref)
-                  && chunk_is_comment(chunk_get_prev(ref)))
-               {
-                  break;
-               }
-               do_insert = true;
-            }
-            break;
-         }
-      }
-
-      if (do_insert)
-      {
-         // Insert between after and ref
-         chunk_t *after = chunk_get_next_ncnnl(ref);
-         tokenize(fm.data, after);
-
-         for (tmp = chunk_get_next(ref); tmp != after; tmp = chunk_get_next(tmp))
-         {
-            tmp->level = after->level;
-         }
-      }
-   }
-} // add_msg_header
-
-
-static void uncrustify_start(const deque<int> &data)
-{
-   // Parse the text into chunks
-   tokenize(data, nullptr);
-   PROT_THE_LINE
-
-   cpd.unc_stage = unc_stage_e::HEADER;
-
-   // Get the column for the fragment indent
-   if (cpd.frag)
-   {
-      chunk_t *pc = chunk_get_head();
-
-      cpd.frag_cols = (pc != nullptr) ? pc->orig_col : 0;
-   }
-
-   // Add the file header
-   if (!cpd.file_hdr.data.empty())
-   {
-      add_file_header();
-   }
-
-   // Add the file footer
-   if (!cpd.file_ftr.data.empty())
-   {
-      add_file_footer();
-   }
-   /*
-    * Change certain token types based on simple sequence.
-    * Example: change '[' + ']' to '[]'
-    * Note that level info is not yet available, so it is OK to do all
-    * processing that doesn't need to know level info. (that's very little!)
-    */
-   tokenize_cleanup();
-
-   /*
-    * Detect the brace and paren levels and insert virtual braces.
-    * This handles all that nasty preprocessor stuff
-    */
-   brace_cleanup();
-
-   // At this point, the level information is available and accurate.
-
-   if (language_is_set(LANG_PAWN))
-   {
-      pawn_prescan();
-   }
-   // Re-type chunks, combine chunks
-   fix_symbols();
-   tokenize_trailing_return_types();
-
-   mark_comments();
-
-   // Look at all colons ':' and mark labels, :? sequences, etc.
-   combine_labels();
-
-   enum_cleanup();
-} // uncrustify_start
-
-
-void uncrustify_file(const file_mem &fm, FILE *pfout,
-                     const char *parsed_file, bool defer_uncrustify_end)
-{
-   const deque<int> &data = fm.data;
-
-   // Save off the encoding and whether a BOM is required
-   cpd.bom = fm.bom;
-   cpd.enc = fm.enc;
-
-   log_rule_B("utf8_force");
-   log_rule_B("utf8_byte");
-
-   if (  options::utf8_force()
-      || (  (cpd.enc == char_encoding_e::e_BYTE)
-         && options::utf8_byte()))
-   {
-      cpd.enc = char_encoding_e::e_UTF8;
-   }
-   iarf_e av;
-
-   switch (cpd.enc)
-   {
-   case char_encoding_e::e_UTF8:
-      log_rule_B("utf8_bom");
-      av = options::utf8_bom();
-      break;
-
-   case char_encoding_e::e_UTF16_LE:
-   case char_encoding_e::e_UTF16_BE:
-      av = IARF_FORCE;
-      break;
-
-   default:
-      av = IARF_IGNORE;
-      break;
-   }
-
-   if (av == IARF_REMOVE)
-   {
-      cpd.bom = false;
-   }
-   else if (av != IARF_IGNORE)
-   {
-      cpd.bom = true;
-   }
-   // Check for embedded 0's (represents a decoding failure or corrupt file)
-   size_t count_line   = 1;
-   size_t count_column = 1;
-
-   for (int idx = 0; idx < static_cast<int>(data.size()) - 1; idx++)
-   {
-      if (data[idx] == 0)
-      {
-         LOG_FMT(LERR, "An embedded 0 was found in '%s' %zu:%zu.\n",
-                 cpd.filename.c_str(), count_line, count_column);
-         LOG_FMT(LERR, "The file may be encoded in an unsupported Unicode format.\n");
-         LOG_FMT(LERR, "Aborting.\n");
-         cpd.error_count++;
-         return;
-      }
-      count_column++;
-
-      if (data[idx] == '\n')
-      {
-         count_line++;
-         count_column = 1;
-      }
-   }
-
-   uncrustify_start(data);
-
-   cpd.unc_stage = unc_stage_e::OTHER;
-
-   /*
-    * Done with detection. Do the rest only if the file will go somewhere.
-    * The detection code needs as few changes as possible.
-    */
-   {
-      // Add comments before function defs and classes
-      if (!cpd.func_hdr.data.empty())
-      {
-         add_func_header(CT_FUNC_DEF, cpd.func_hdr);
-
-         log_rule_B("cmt_insert_before_ctor_dtor");
-
-         if (options::cmt_insert_before_ctor_dtor())
-         {
-            add_func_header(CT_FUNC_CLASS_DEF, cpd.func_hdr);
-         }
-      }
-
-      if (!cpd.class_hdr.data.empty())
-      {
-         add_func_header(CT_CLASS, cpd.class_hdr);
-      }
-
-      if (!cpd.oc_msg_hdr.data.empty())
-      {
-         add_msg_header(CT_OC_MSG_DECL, cpd.oc_msg_hdr);
-      }
-      do_parent_for_pp();
-      do_braces();  // Change virtual braces into real braces...
-
-      // Scrub extra semicolons
-      log_rule_B("mod_remove_extra_semicolon");
-
-      if (options::mod_remove_extra_semicolon())
-      {
-         remove_extra_semicolons();
-      }
-      // Remove unnecessary returns
-      log_rule_B("mod_remove_empty_return");
-
-      if (options::mod_remove_empty_return())
-      {
-         remove_extra_returns();
-      }
-      // Add parens
-      do_parens();
-
-      // Modify line breaks as needed
-      bool first = true;
-      int  old_changes;
-
-      log_rule_B("nl_remove_extra_newlines");
-
-      if (options::nl_remove_extra_newlines() == 2)
-      {
-         newlines_remove_newlines();
-      }
-      cpd.pass_count = 3;
-
-      do
-      {
-         old_changes = cpd.changes;
-
-         LOG_FMT(LNEWLINE, "Newline loop start: %d\n", cpd.changes);
-
-         annotations_newlines();
-         newlines_cleanup_dup();
-         newlines_sparens();
-         newlines_cleanup_braces(first);
-         newlines_cleanup_angles();                           // Issue #1167
-
-         log_rule_B("nl_after_multiline_comment");
-
-         if (options::nl_after_multiline_comment())
-         {
-            newline_after_multiline_comment();
-         }
-         log_rule_B("nl_after_label_colon");
-
-         if (options::nl_after_label_colon())
-         {
-            newline_after_label_colon();
-         }
-         newlines_insert_blank_lines();
-
-         log_rule_B("pos_bool");
-
-         if (options::pos_bool() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_BOOL, options::pos_bool());
-         }
-         log_rule_B("pos_compare");
-
-         if (options::pos_compare() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_COMPARE, options::pos_compare());
-         }
-         log_rule_B("pos_conditional");
-
-         if (options::pos_conditional() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_COND_COLON, options::pos_conditional());
-            newlines_chunk_pos(CT_QUESTION, options::pos_conditional());
-         }
-         log_rule_B("pos_comma");
-         log_rule_B("pos_enum_comma");
-
-         if (  options::pos_comma() != TP_IGNORE
-            || options::pos_enum_comma() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_COMMA, options::pos_comma());
-         }
-         log_rule_B("pos_assign");
-
-         if (options::pos_assign() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_ASSIGN, options::pos_assign());
-         }
-         log_rule_B("pos_arith");
-
-         if (options::pos_arith() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_ARITH, options::pos_arith());
-            newlines_chunk_pos(CT_CARET, options::pos_arith());
-         }
-         log_rule_B("pos_shift");
-
-         if (options::pos_shift() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_SHIFT, options::pos_shift());
-         }
-         newlines_class_colon_pos(CT_CLASS_COLON);
-         newlines_class_colon_pos(CT_CONSTR_COLON);
-
-         log_rule_B("nl_squeeze_ifdef");
-
-         if (options::nl_squeeze_ifdef())
-         {
-            newlines_squeeze_ifdef();
-         }
-         log_rule_B("nl_squeeze_paren_close");
-
-         if (options::nl_squeeze_paren_close())
-         {
-            newlines_squeeze_paren_close();
-         }
-         do_blank_lines();
-         newlines_eat_start_end();
-         newlines_functions_remove_extra_blank_lines();
-         newlines_cleanup_dup();
-         first = false;
-      } while (  old_changes != cpd.changes
-              && cpd.pass_count-- > 0);
-
-      mark_comments();
-
-      // Add balanced spaces around nested params
-      log_rule_B("sp_balance_nested_parens");
-
-      if (options::sp_balance_nested_parens())
-      {
-         space_text_balance_nested_parens();
-      }
-      // Scrub certain added semicolons
-      log_rule_B("mod_pawn_semicolon");
-
-      if (  language_is_set(LANG_PAWN)
-         && options::mod_pawn_semicolon())
-      {
-         pawn_scrub_vsemi();
-      }
-      // Sort imports/using/include
-      log_rule_B("mod_sort_import");
-      log_rule_B("mod_sort_include");
-      log_rule_B("mod_sort_using");
-
-      if (  options::mod_sort_import()
-         || options::mod_sort_include()
-         || options::mod_sort_using())
-      {
-         sort_imports();
-      }
-      // Fix same-line inter-chunk spacing
-      space_text();
-
-      // Do any aligning of preprocessors
-      log_rule_B("align_pp_define_span");
-
-      if (options::align_pp_define_span() > 0)
-      {
-         align_preprocessor();
-      }
-      // Indent the text
-      indent_preproc();
-      indent_text();
-
-      // Insert trailing comments after certain close braces
-      log_rule_B("mod_add_long_switch_closebrace_comment");
-      log_rule_B("mod_add_long_function_closebrace_comment");
-      log_rule_B("mod_add_long_class_closebrace_comment");
-      log_rule_B("mod_add_long_namespace_closebrace_comment");
-
-      if (  (options::mod_add_long_switch_closebrace_comment() > 0)
-         || (options::mod_add_long_function_closebrace_comment() > 0)
-         || (options::mod_add_long_class_closebrace_comment() > 0)
-         || (options::mod_add_long_namespace_closebrace_comment() > 0))
-      {
-         add_long_closebrace_comment();
-      }
-      // Insert trailing comments after certain preprocessor conditional blocks
-      log_rule_B("mod_add_long_ifdef_else_comment");
-      log_rule_B("mod_add_long_ifdef_endif_comment");
-
-      if (  (options::mod_add_long_ifdef_else_comment() > 0)
-         || (options::mod_add_long_ifdef_endif_comment() > 0))
-      {
-         add_long_preprocessor_conditional_block_comment();
-      }
-      // Align everything else, reindent and break at code_width
-      first = true;
-
-      do
-      {
-         align_all();
-         indent_text();
-         old_changes = cpd.changes;
-
-         log_rule_B("code_width");
-
-         if (options::code_width() > 0)
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): Code_width loop start: %d\n",
-                    __func__, __LINE__, cpd.changes);
-            log_rule_B("debug_max_number_of_loops");
-
-            if (options::debug_max_number_of_loops() > 0)
-            {
-               if (cpd.changes > options::debug_max_number_of_loops())                 // Issue #2432
-               {
-                  LOG_FMT(LNEWLINE, "%s(%d): too many loops. Make a report, please.\n",
-                          __func__, __LINE__);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
-            }
-            do_code_width();
-
-            if (  old_changes != cpd.changes
-               && first)
-            {
-               // retry line breaks caused by splitting 1-liners
-               newlines_cleanup_braces(false);
-               newlines_insert_blank_lines();
-               newlines_functions_remove_extra_blank_lines();
-               newlines_remove_disallowed();
-               first = false;
-            }
-         }
-      } while (old_changes != cpd.changes);
-
-      // And finally, align the backslash newline stuff
-      align_right_comments();
-
-      log_rule_B("align_nl_cont");
-
-      if (options::align_nl_cont())
-      {
-         align_backslash_newline();
-      }
-      // which output is to be done?
-
-      if (cpd.html_file == nullptr)
-      {
-         // Now render it all to the output file
-         output_text(pfout);
-      }
-      else
-      {
-         // create the tracking file
-         FILE *t_file;
-         t_file = fopen(cpd.html_file, "wb");
-         output_text(t_file);
-         fclose(t_file);
-         exit(EX_OK);
-      }
-   }
-
-   // Special hook for dumping parsed data for debugging
-   if (parsed_file != nullptr)
-   {
-      FILE *p_file;
-
-      if (  parsed_file[0] == '-'
-         && !parsed_file[1])
-      {
-         p_file = stdout;
-      }
-      else
-      {
-         p_file = fopen(parsed_file, "wb");
-      }
-
-      if (p_file != nullptr)
-      {
-         if (ends_with(parsed_file, ".csv", false))
-         {
-            output_parsed_csv(p_file);
-         }
-         else
-         {
-            output_parsed(p_file);
-         }
-
-         if (p_file != stdout)
-         {
-            fclose(p_file);
-         }
-      }
-      else
-      {
-         LOG_FMT(LERR, "%s: Failed to open '%s' for write: %s (%d)\n",
-                 __func__, parsed_file, strerror(errno), errno);
-         cpd.error_count++;
-      }
-   }
-
-   if (  cpd.do_check
-      && !bout_content_matches(fm, true))
-   {
-      cpd.check_fail_cnt++;
-   }
-
-   if (!defer_uncrustify_end)
-   {
-      uncrustify_end();
-   }
-} // uncrustify_file
-
-
-void uncrustify_end()
-{
-   // Free all the memory
-   chunk_t *pc;
-
-   cpd.unc_stage = unc_stage_e::CLEANUP;
-
-   while ((pc = chunk_get_head()) != nullptr)
-   {
-      chunk_del(pc);
-   }
-
-   if (cpd.bout)
-   {
-      cpd.bout->clear();
-   }
-   // Clean up some state variables
-   cpd.unc_off     = false;
-   cpd.al_cnt      = 0;
-   cpd.did_newline = true;
-   cpd.pp_level    = 0;
-   cpd.changes     = 0;
-   cpd.in_preproc  = CT_NONE;
-   memset(cpd.le_counts, 0, sizeof(cpd.le_counts));
-   cpd.preproc_ncnl_count                     = 0;
-   cpd.ifdef_over_whole_file                  = 0;
-   cpd.warned_unable_string_replace_tab_chars = false;
-}
-
-
-const char *get_token_name(c_token_t token)
-{
-   if (  token >= 0
-      && (token < static_cast<int> ARRAY_SIZE(token_names))
-      && (token_names[token] != nullptr))
-   {
-      return(token_names[token]);
-   }
-   return("???");
-}
-
-
-c_token_t find_token_name(const char *text)
-{
-   if (  text != nullptr
-      && (*text != 0))
-   {
-      for (int idx = 1; idx < static_cast<int> ARRAY_SIZE(token_names); idx++)
-      {
-         if (strcasecmp(text, token_names[idx]) == 0)
-         {
-            return(static_cast<c_token_t>(idx));
-         }
-      }
-   }
-   return(CT_NONE);
-}
-
-
-static bool ends_with(const char *filename, const char *tag, bool case_sensitive = true)
-{
-   int len1 = strlen(filename);
-   int len2 = strlen(tag);
-
-   return(  len2 <= len1
-         && (  (  case_sensitive
-               && (strcmp(&filename[len1 - len2], tag) == 0))
-            || (  !case_sensitive
-               && (strcasecmp(&filename[len1 - len2], tag) == 0))));
-}
-
-
-struct lang_name_t
-{
-   const char *name;
-   size_t     lang;
-};
-
-static lang_name_t language_names[] =
-{
-   { "C",        LANG_C                        },
-   { "CPP",      LANG_CPP                      },
-   { "D",        LANG_D                        },
-   { "CS",       LANG_CS                       },
-   { "VALA",     LANG_VALA                     },
-   { "JAVA",     LANG_JAVA                     },
-   { "PAWN",     LANG_PAWN                     },
-   { "OC",       LANG_OC                       },
-   { "OC+",      LANG_OC | LANG_CPP            },
-   { "CS+",      LANG_CS | LANG_CPP            },
-   { "ECMA",     LANG_ECMA                     },
-   { "C-Header", LANG_OC | LANG_CPP | FLAG_HDR },
-};
-
-
-static size_t language_flags_from_name(const char *name)
-{
-   for (const auto &language : language_names)
-   {
-      if (strcasecmp(name, language.name) == 0)
-      {
-         return(language.lang);
-      }
-   }
-
-   return(0);
-}
-
-
-const char *language_name_from_flags(size_t lang)
-{
-   // Check for an exact match first
-   for (auto &language_name : language_names)
-   {
-      if (language_name.lang == lang)
-      {
-         return(language_name.name);
-      }
-   }
-
-   // Check for the first set language bit
-   for (auto &language_name : language_names)
-   {
-      if ((language_name.lang & lang) != 0)
-      {
-         return(language_name.name);
-      }
-   }
-
-   return("???");
-}
-
-
-//! type to map a programming language to a typically used filename extension
-struct lang_ext_t
-{
-   const char *ext;  //! filename extension typically used for ...
-   const char *name; //! a programming language
-};
-
-//! known filename extensions linked to the corresponding programming language
-struct lang_ext_t language_exts[] =
-{
-   { ".c",    "C"        },
-   { ".cpp",  "CPP"      },
-   { ".d",    "D"        },
-   { ".cs",   "CS"       },
-   { ".vala", "VALA"     },
-   { ".java", "JAVA"     },
-   { ".pawn", "PAWN"     },
-   { ".p",    "PAWN"     },
-   { ".sma",  "PAWN"     },
-   { ".inl",  "PAWN"     },
-   { ".h",    "C-Header" },
-   { ".cxx",  "CPP"      },
-   { ".hpp",  "CPP"      },
-   { ".hxx",  "CPP"      },
-   { ".cc",   "CPP"      },
-   { ".cp",   "CPP"      },
-   { ".C",    "CPP"      },
-   { ".CPP",  "CPP"      },
-   { ".c++",  "CPP"      },
-   { ".di",   "D"        },
-   { ".m",    "OC"       },
-   { ".mm",   "OC+"      },
-   { ".sqc",  "C"        },  // embedded SQL
-   { ".es",   "ECMA"     },
-};
-
-
-const char *get_file_extension(int &idx)
-{
-   const char *val = nullptr;
-
-   if (idx < static_cast<int> ARRAY_SIZE(language_exts))
-   {
-      val = language_exts[idx].ext;
-   }
-   idx++;
-   return(val);
-}
-
-
-typedef std::map<string, string> extension_map_t;
-/**
- * maps a file extension to a language flag.
- *
- * @note The "." need to be included, as in ".c". The file extensions
- *       ARE case sensitive.
- */
-static extension_map_t g_ext_map;
-
-
-const char *extension_add(const char *ext_text, const char *lang_text)
-{
-   size_t lang_flags = language_flags_from_name(lang_text);
-
-   if (lang_flags)
-   {
-      const char *lang_name = language_name_from_flags(lang_flags);
-      g_ext_map[string(ext_text)] = lang_name;
-      return(lang_name);
-   }
-   return(nullptr);
-}
-
-
-void print_extensions(FILE *pfile)
-{
-   for (auto &language : language_names)
-   {
-      bool did_one = false;
-
-      for (auto &extension_val : g_ext_map)
-      {
-         if (strcmp(extension_val.second.c_str(), language.name) == 0)
-         {
-            if (!did_one)
-            {
-               fprintf(pfile, "file_ext %s", extension_val.second.c_str());
-               did_one = true;
-            }
-            fprintf(pfile, " %s", extension_val.first.c_str());
-         }
-      }
-
-      if (did_one)
-      {
-         fprintf(pfile, "\n");
-      }
-   }
-}
-
-
-// TODO: better use enum lang_t for source file language
-static size_t language_flags_from_filename(const char *filename)
-{
-   // check custom extensions first
-   for (const auto &extension_val : g_ext_map)
-   {
-      if (ends_with(filename, extension_val.first.c_str()))
-      {
-         return(language_flags_from_name(extension_val.second.c_str()));
-      }
-   }
-
-   for (auto &lanugage : language_exts)
-   {
-      if (ends_with(filename, lanugage.ext))
-      {
-         return(language_flags_from_name(lanugage.name));
-      }
-   }
-
-   // check again without case sensitivity
-   for (auto &extension_val : g_ext_map)
-   {
-      if (ends_with(filename, extension_val.first.c_str(), false))
-      {
-         return(language_flags_from_name(extension_val.second.c_str()));
-      }
-   }
-
-   for (auto &lanugage : language_exts)
-   {
-      if (ends_with(filename, lanugage.ext, false))
-      {
-         return(language_flags_from_name(lanugage.name));
-      }
-   }
-
-   return(LANG_C);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.h
deleted file mode 100644
index d193a264..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file uncrustify.h
- * prototypes for uncrustify.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef UNCRUSTIFY_H_INCLUDED
-#define UNCRUSTIFY_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-#include <stdio.h>
-
-int load_header_files(void);
-
-
-void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file, bool defer_uncrustify_end = false);
-
-
-void uncrustify_end();
-
-
-const char *get_token_name(c_token_t token);
-
-
-/**
- * Gets the tag text for a language
- *
- * @param lang  The LANG_xxx enum
- *
- * @return A string
- */
-const char *language_name_from_flags(size_t lang);
-
-
-/**
- * Grab the token id for the text.
- *
- * @return token, will be CT_NONE on failure to match
- */
-c_token_t find_token_name(const char *text);
-
-std::string pcf_flags_str(pcf_flags_t flags);
-
-
-void log_pcf_flags(log_sev_t sev, pcf_flags_t flags);
-
-
-/**
- * Replace the brain-dead and non-portable basename().
- * Returns a pointer to the character after the last '/'.
- * The returned value always points into path, unless path is nullptr.
- *
- * Input            Returns
- * nullptr       => ""
- * "/some/path/" => ""
- * "/some/path"  => "path"
- * "afile"       => "afile"
- *
- * @param path  The path to look at
- *
- * @return Pointer to the character after the last path separator
- */
-const char *path_basename(const char *path);
-
-
-/**
- * Returns the length of the directory part of the filename.
- *
- * @param filename  filename including full path
- *
- * @return character size of path
- */
-int path_dirname_len(const char *filename);
-
-
-void usage(const char *argv0);
-
-
-void usage_error(const char *msg = nullptr);
-
-
-/**
- * Set idx = 0 before the first call.
- * Done when returns nullptr
- */
-const char *get_file_extension(int &idx);
-
-
-//! Prints custom file extensions to the file
-void print_extensions(FILE *pfile);
-
-
-const char *extension_add(const char *ext_text, const char *lang_text);
-
-
-#endif /* UNCRUSTIFY_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_emscripten.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_emscripten.cpp
deleted file mode 100644
index d7b89081..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_emscripten.cpp
+++ /dev/null
@@ -1,1217 +0,0 @@
-/*
- * uncrustify_emscripten.cpp - JavaScript Emscripten binding interface
- *
- *  Created on: May 8, 2016
- *      Author: Daniel Chumak
- *
- * INTERFACE:
- * ============================================================================
- * unsure about these:
- *   --check       TODO ???
- *   --decode      TODO ???
- *   --detect      TODO needs uncrustify start and end which both are static
- *
- *
- * will not be included:
- * ----------------------------------------------------------------------------
- *   -t ( define via multiple --type )
- *   -d ( define via multiple --define )
- *   --assume ( no files available to guess the lang. based on the filename ending )
- *   --files ( no batch processing will be available )
- *   --prefix
- *   --suffix
- *   --assume
- *   --no-backup
- *   --replace
- *   --mtime
- *   --universalindent
- *   -help, -h, --usage, -?
- *
- *
- * done:
- * ----------------------------------------------------------------------------
- *   --update-config ( use show_config() )
- *   --update-config-with-doc ( show_config( bool withDoc = true ) )
- *   --version, -v ( use get_version() )
- *   --log, -L ( use log_type_enable( log_sev_t sev, bool value ) )
- *   -q ( use quiet() )
- *   --config, -c ( use loadConfig( string _cfg ) )
- *   --file, -f ( use uncrustify( string _file ) )
- *   --show ( use log_type_show_name( bool ) )
- *   --frag ( use uncrustify( string _file, bool frag = true ) )
- *   --type ( use add_keyword( string _type, c_token_t type ) )
- *   -l ( use uncrustify() )
- *   --parsed, -p  ( use debug() )
- */
-
-
-#if defined (__linux__)
-
-
-#include "keywords.h"
-#include "log_levels.h"
-#include "logger.h"
-#include "option.h"
-#include "options.h"
-#include "output.h"
-#include "prototypes.h"
-#include "uncrustify.h"
-#include "uncrustify_version.h"
-#include "unicode.h"
-
-#include <iostream>
-#include <map>
-#include <memory>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unordered_map>
-#include <vector>
-
-
-#ifdef EMSCRIPTEN
-#include <emscripten/bind.h>
-#include <emscripten/val.h>
-using namespace emscripten;
-#else
-#define EMSCRIPTEN_BINDINGS(module)    void dummyFcn()
-template<class T>
-struct base {};
-struct emscripten
-{
-   template<class... Args>
-   emscripten value(Args...) { return{}; }
-
-   template<class... Args>
-   static emscripten function(Args...) { return{}; }
-
-   template<class... Args>
-   emscripten property(Args...) { return{}; }
-};
-using Dummy = emscripten;
-
-
-template<class T>
-Dummy enum_(char const *const)
-{
-   return(Dummy{});
-}
-
-
-template<class T>
-Dummy register_vector(char const *const)
-{
-   return(Dummy{});
-}
-
-
-template<class... Args>
-Dummy class_(char const *const)
-{
-   return(Dummy{});
-}
-
-
-template<class T>
-Dummy select_overload(T)
-{
-   return(Dummy{});
-}
-#endif
-
-using namespace std;
-using namespace uncrustify;
-
-namespace
-{
-
-/**
- * Loads options from a file represented as a single char array.
- * Modifies: input char array, cpd.line_number
- * Expects: \0 terminated char array
- *
- * @param configString char array that holds the whole config
- * @return EXIT_SUCCESS on success
- */
-int load_option_fileChar(char *configString)
-{
-   char *delimPos       = &configString[0];
-   char *subStringStart = &configString[0];
-
-   cpd.line_number = 0;
-
-   // TODO: handle compat_level
-   int compat_level = 0;
-
-   while (true)
-   {
-      delimPos = strchr(delimPos, '\n');
-
-      if (delimPos == nullptr)
-      {
-         break;
-      }
-      // replaces \n with \0 -> string including multiple terminated substrings
-      *delimPos = '\0';
-
-
-      process_option_line(subStringStart, "", compat_level);
-
-      delimPos++;
-      subStringStart = delimPos;
-   }
-   //get last line, expectation: ends with \0
-   process_option_line(subStringStart, "", compat_level);
-
-   return(EXIT_SUCCESS);
-}
-
-
-/**
- * adds a new keyword to Uncrustify's dynamic keyword map (dkwm, keywords.cpp)
- *
- * @param tag:  keyword that is going to be added
- * @param type: type of the keyword
- */
-void _add_keyword(string tag, c_token_t type)
-{
-   if (tag.empty())
-   {
-      LOG_FMT(LERR, "%s: input string is empty\n", __func__);
-      return;
-   }
-   add_keyword(tag, type);
-}
-
-
-//! clears Uncrustify's dynamic keyword map (dkwm, keywords.cpp)
-void clear_keywords()
-{
-   clear_keyword_file();
-}
-
-
-/**
- * Show or hide the severity prefix "<1>"
- *
- * @param b: true=show, false=hide
- */
-void show_log_type(bool b)
-{
-   log_show_sev(b);
-}
-
-
-//! returns the UNCRUSTIFY_VERSION string
-string get_version()
-{
-   return(UNCRUSTIFY_VERSION);
-}
-
-
-//! disables all logging messages
-void set_quiet()
-{
-   // set empty mask
-   log_set_mask({});
-}
-
-
-/**
- * resets value of an option to its default
- *
- * @param name:  name of the option
- * @return options enum value of the found option or -1 if option was not found
- */
-int reset_option(string name)
-{
-   if (name.empty())
-   {
-      LOG_FMT(LERR, "%s: name string is empty\n", __func__);
-      return(-1);
-   }
-   const auto option = find_option(name.c_str());
-
-   if (option == nullptr)
-   {
-      LOG_FMT(LERR, "Option %s not found\n", name.c_str());
-      return(-1);
-   }
-   option->reset();
-   return(0);
-}
-
-
-/**
- * sets value of an option
- *
- * @param name:  name of the option
- * @param value: value that is going to be set
- * @return options enum value of the found option or -1 if option was not found
- */
-int set_option(string name, string value)
-{
-   if (name.empty())
-   {
-      LOG_FMT(LERR, "%s: name string is empty\n", __func__);
-      return(-1);
-   }
-
-   if (value.empty())
-   {
-      LOG_FMT(LERR, "%s: value string is empty\n", __func__);
-      return(-1);
-   }
-   const auto option = find_option(name.c_str());
-
-   if (option == nullptr)
-   {
-      LOG_FMT(LERR, "Option %s not found\n", name.c_str());
-      return(-1);
-   }
-
-   if (!option->read(value.c_str()))
-   {
-      LOG_FMT(
-         LERR,
-         "Failed to set value %s for option: %s of type: %s\n",
-         name.c_str(),
-         value.c_str(),
-         to_string(option->type())
-         );
-      return(-1);
-   }
-   return(0);
-}
-
-
-/**
- * returns value of an option
- *
- * @param name: name of the option
- * @return currently set value of the option
- */
-string get_option(string name)
-{
-   if (name.empty())
-   {
-      LOG_FMT(LERR, "%s: input string is empty\n", __func__);
-      return("");
-   }
-   const auto option = find_option(name.c_str());
-
-   if (option == nullptr)
-   {
-      LOG_FMT(LWARN, "Option %s not found\n", name.c_str());
-      return("");
-   }
-   return(option->str());
-}
-
-
-/**
- * returns the config file string based on the current configuration
- *
- * @param withDoc:          false=without documentation,
- *                          true=with documentation text lines
- * @param only_not_default: false=containing all options,
- *                          true=containing only options with non default values
- * @return returns the config file string based on the current configuration
- */
-string show_config(bool withDoc, bool only_not_default)
-{
-   char   *buf;
-   size_t len;
-
-   FILE   *stream = open_memstream(&buf, &len);
-
-   if (stream == nullptr)
-   {
-      LOG_FMT(LERR, "Failed to open_memstream\n");
-      fflush(stream);
-      fclose(stream);
-      free(buf);
-      return("");
-   }
-   save_option_file(stream, withDoc, only_not_default);
-
-   fflush(stream);
-   fclose(stream);
-
-   string out(buf);
-
-   free(buf);
-
-   return(out);
-}
-
-
-/**
- * returns the config file string with all options based on the current configuration
- *
- * @param withDoc: false= without documentation, true=with documentation text lines
- * @return returns the config file string with all options based on the current configuration
- */
-string show_config(bool withDoc)
-{
-   return(show_config(withDoc, false));
-}
-
-
-//!returns the config file string with all options and without documentation based on the current configuration
-string show_config()
-{
-   return(show_config(false, false));
-}
-
-
-std::vector<OptionGroup *> get_groups()
-{
-   std::vector<OptionGroup *> groups;
-
-   groups.reserve(5);
-
-   for (size_t i = 0; true; ++i)
-   {
-      OptionGroup *group = get_option_group(i);
-
-      if (!group)
-      {
-         break;
-      }
-      groups.push_back(group);
-   }
-
-   return(groups);
-}
-
-
-std::vector<GenericOption *> get_options()
-{
-   std::vector<GenericOption *> options;
-
-   options.reserve(get_option_count());
-
-   for (size_t i = 0; true; ++i)
-   {
-      OptionGroup *group = get_option_group(i);
-
-      if (!group)
-      {
-         break;
-      }
-      options.insert(
-         end(options),
-         begin(group->options),
-         end(group->options)
-         );
-   }
-
-   return(options);
-}
-
-
-//! resets all options to their default values
-void reset_options()
-{
-   auto options = get_options();
-
-   for (auto *option : options)
-   {
-      option->reset();
-   }
-}
-
-
-/**
- * initializes the current libUncrustify instance,
- * used only for emscripten binding here and will be automatically called while
- * module initialization
- */
-void _initialize()
-{
-   register_options();
-   log_init(stdout);
-
-   LOG_FMT(LSYS, "Initialized libUncrustify - " UNCRUSTIFY_VERSION "\n");
-}
-
-
-//! destroys the current libUncrustify instance
-void destruct()
-{
-   clear_keyword_file();
-}
-
-
-/**
- * reads option file string, sets the defined options
- *
- * @return returns EXIT_SUCCESS on success
- */
-int _loadConfig(intptr_t _cfg)
-{
-   // reset everything in case a config was loaded previously
-   clear_keyword_file();
-   reset_options();
-
-   // embind complains about char* so we use an int to get the pointer and cast
-   // it, memory management is done in /emscripten/postfix_module.js
-   char *cfg = reinterpret_cast<char *>(_cfg);
-
-   if (load_option_fileChar(cfg) != EXIT_SUCCESS)
-   {
-      LOG_FMT(LERR, "unable to load the config\n");
-      return(EXIT_FAILURE);
-   }
-   // This relies on cpd.filename being the config file name
-   load_header_files();
-
-   LOG_FMT(LSYS, "finished loading config\n");
-   return(EXIT_SUCCESS);
-}
-
-
-/**
- * format string
- *
- * @param file: pointer to the file char* string that is going to be formatted
- * @param langIDX: specifies in which language the input file is written
- * @param frag: true=fragmented code input, false=unfragmented code input
- * @param defer: true=do not perform cleanup of Uncrustify structures
- *
- * @return pointer to the formatted file char* string
- */
-intptr_t _uncrustify(intptr_t _file, lang_flag_e langIDX, bool frag, bool defer)
-{
-   // Problem: uncrustify originally is not a lib and uses global vars such as
-   // cpd.error_count for the whole program execution
-   // to know if errors occurred during the formating step we reset this var here
-   cpd.error_count = 0;
-   cpd.filename    = "stdin";
-   cpd.frag        = frag;
-
-   if (langIDX == 0)   // 0 == undefined
-   {
-      LOG_FMT(LWARN, "language of input file not defined, C++ will be assumed\n");
-      cpd.lang_flags = LANG_CPP;
-   }
-   else
-   {
-      cpd.lang_flags = langIDX;
-   }
-   // embind complains about char* so we use an intptr_t to get the pointer and
-   // cast it, memory management is done in /emscripten/postfix_module.js
-   char     *file = reinterpret_cast<char *>(_file);
-
-   file_mem fm;
-
-   fm.raw.clear();
-   fm.data.clear();
-   fm.enc = char_encoding_e::e_ASCII;
-   fm.raw = vector<UINT8>();
-
-   char c;
-
-   for (auto idx = 0; (c = file[idx]) != 0; ++idx)
-   {
-      fm.raw.push_back(c);
-   }
-
-   if (!decode_unicode(fm.raw, fm.data, fm.enc, fm.bom))
-   {
-      LOG_FMT(LERR, "Failed to read code\n");
-      return(0);
-   }
-   // Done reading from stdin
-   LOG_FMT(LSYS, "Parsing: %d bytes (%d chars) from stdin as language %s\n",
-           (int)fm.raw.size(), (int)fm.data.size(),
-           language_name_from_flags(cpd.lang_flags));
-
-
-   char   *buf = nullptr;
-   size_t len  = 0;
-
-   // uncrustify uses FILE instead of streams for its outputs
-   // to redirect FILE writes into a char* open_memstream is used
-   // windows lacks open_memstream, only UNIX/BSD is supported
-   // apparently emscripten has its own implementation, if that is not working
-   // see: stackoverflow.com/questions/10305095#answer-10341073
-   FILE *stream = open_memstream(&buf, &len);
-
-   if (stream == nullptr)
-   {
-      LOG_FMT(LERR, "Failed to open_memstream\n");
-      return(0);
-   }
-   // TODO One way to implement the --parsed, -p functionality would
-   // be to let the uncrustify_file function run, throw away the formated
-   // output and return the debug as a string. For this uncrustify_file would
-   // need to accept a stream, FILE or a char array pointer in which the output
-   // will be stored.
-   // Another option would be to check, inside the uncrustify_file function,
-   // if the current filename string matches stdout or stderr and use those as
-   // output locations. This is the easier fix but the debug info in the
-   // browsers console is littered with other unneeded text.
-   // Finally, the ugliest solution, would be also possible to re-route
-   // either stdout or stderr inside the Module var of emscripten to a js
-   // function which passes the debug output into a dedicated output js target.
-   // This therefore would introduce the dependency on the user to always have
-   // the output js target available.
-   uncrustify_file(fm, stream, nullptr, defer);
-
-   fflush(stream);
-   fclose(stream);
-
-   if (cpd.error_count != 0)
-   {
-      LOG_FMT(LWARN, "%d errors occurred during formating\n", cpd.error_count);
-   }
-
-   if (len == 0)
-   {
-      return(0);
-   }
-   // buf is deleted inside js code
-   return(reinterpret_cast<intptr_t>(buf));
-} // uncrustify
-
-
-/**
- * format string
- *
- * @param file: pointer to the file char* string that is going to be formatted
- * @param langIDX: specifies in which language the input file is written
- * @param frag: true=fragmented code input, false=unfragmented code input
- *
- * @return pointer to the formatted file char* string
- */
-intptr_t _uncrustify(intptr_t file, lang_flag_e langIDX, bool frag)
-{
-   return(_uncrustify(file, langIDX, frag, false));
-}
-
-
-/**
- * format string, assume unfragmented code input
- *
- * @param file: pointer to the file char* string that is going to be formatted
- * @param langIDX: specifies in which language the input file is written
- *
- * @return pointer to the formatted file char* string
- */
-intptr_t _uncrustify(intptr_t file, lang_flag_e langIDX)
-{
-   return(_uncrustify(file, langIDX, false, false));
-}
-
-
-/**
- * generate debug output
- *
- * @param file: pointer to the file char* string that is going to be formatted
- * @param langIDX: specifies in which language the input file is written
- * @param frag: true=fragmented code input, false=unfragmented code input
- *
- * @return pointer to the debug file char* string
- */
-intptr_t _debug(intptr_t _file, lang_flag_e langIDX, bool frag)
-{
-   auto formatted_str_ptr = _uncrustify(_file, langIDX, frag, true);
-   char *formatted_str    = reinterpret_cast<char *>(formatted_str_ptr);
-
-   // Lazy solution: Throw away the formated file output.
-   // Maybe later add option to return both formatted file string and debug
-   // file string together ... somehow.
-   free(formatted_str);
-
-   char   *buf    = nullptr;
-   size_t len     = 0;
-   FILE   *stream = open_memstream(&buf, &len);
-
-   if (stream == nullptr)
-   {
-      LOG_FMT(LERR, "Failed to open_memstream\n");
-      return(0);
-   }
-   output_parsed(stream);
-   fflush(stream);
-   fclose(stream);
-
-   // start deferred _uncrustify cleanup
-   uncrustify_end();
-
-   if (len == 0)
-   {
-      return(0);
-   }
-   // buf is deleted inside js code
-   return(reinterpret_cast<intptr_t>(buf));
-} // uncrustify
-
-
-/**
- * generate debug output, assume unfragmented code input
- *
- * @param file: pointer to the file char* string that is going to be formatted
- * @param langIDX: specifies in which language the input file is written
- *
- * @return pointer to the debug file char* string
- */
-intptr_t _debug(intptr_t _file, lang_flag_e langIDX)
-{
-   return(_debug(_file, langIDX, false));
-}
-
-} // namespace
-
-EMSCRIPTEN_BINDINGS(MainModule)
-{
-   // region enum bindings
-   enum_<option_type_e>("OptionType")
-      .value("BOOL", option_type_e::BOOL)
-      .value("IARF", option_type_e::IARF)
-      .value("LINEEND", option_type_e::LINEEND)
-      .value("TOKENPOS", option_type_e::TOKENPOS)
-      .value("NUM", option_type_e::NUM)
-      .value("UNUM", option_type_e::UNUM)
-      .value("STRING", option_type_e::STRING);
-
-   enum_<iarf_e>("IARF")
-      .value("IGNORE", IARF_IGNORE)
-      .value("ADD", IARF_ADD)
-      .value("REMOVE", IARF_REMOVE)
-      .value("FORCE", IARF_FORCE);
-
-   enum_<line_end_e>("LineEnd")
-      .value("LF", line_end_e::LF)
-      .value("CRLF", line_end_e::CRLF)
-      .value("CR", line_end_e::CR)
-      .value("AUTO", line_end_e::AUTO);
-
-   enum_<token_pos_e>("TokenPos")
-      .value("IGNORE", token_pos_e::IGNORE)
-      .value("BREAK", token_pos_e::BREAK)
-      .value("FORCE", token_pos_e::FORCE)
-      .value("LEAD", token_pos_e::LEAD)
-      .value("TRAIL", token_pos_e::TRAIL)
-      .value("JOIN", token_pos_e::JOIN)
-      .value("LEAD_BREAK", token_pos_e::LEAD_BREAK)
-      .value("LEAD_FORCE", token_pos_e::LEAD_FORCE)
-      .value("TRAIL_BREAK", token_pos_e::TRAIL_BREAK)
-      .value("TRAIL_FORCE", token_pos_e::TRAIL_FORCE);
-
-   enum_<log_sev_t>("LogType")
-      .value("SYS", log_sev_t::LSYS)
-      .value("ERR", log_sev_t::LERR)
-      .value("WARN", log_sev_t::LWARN)
-      .value("NOTE", log_sev_t::LNOTE)
-      .value("INFO", log_sev_t::LINFO)
-      .value("DATA", log_sev_t::LDATA)
-      .value("FILELIST", log_sev_t::LFILELIST)
-      .value("LINEENDS", log_sev_t::LLINEENDS)
-      .value("CASTS", log_sev_t::LCASTS)
-      .value("ALBR", log_sev_t::LALBR)
-      .value("ALTD", log_sev_t::LALTD)
-      .value("ALPP", log_sev_t::LALPP)
-      .value("ALPROTO", log_sev_t::LALPROTO)
-      .value("ALNLC", log_sev_t::LALNLC)
-      .value("ALTC", log_sev_t::LALTC)
-      .value("ALADD", log_sev_t::LALADD)
-      .value("ALASS", log_sev_t::LALASS)
-      .value("FVD", log_sev_t::LFVD)
-      .value("FVD2", log_sev_t::LFVD2)
-      .value("INDENT", log_sev_t::LINDENT)
-      .value("INDENT2", log_sev_t::LINDENT2)
-      .value("INDPSE", log_sev_t::LINDPSE)
-      .value("INDPC", log_sev_t::LINDPC)
-      .value("NEWLINE", log_sev_t::LNEWLINE)
-      .value("PF", log_sev_t::LPF)
-      .value("STMT", log_sev_t::LSTMT)
-      .value("TOK", log_sev_t::LTOK)
-      .value("ALRC", log_sev_t::LALRC)
-      .value("CMTIND", log_sev_t::LCMTIND)
-      .value("INDLINE", log_sev_t::LINDLINE)
-      .value("SIB", log_sev_t::LSIB)
-      .value("RETURN", log_sev_t::LRETURN)
-      .value("BRDEL", log_sev_t::LBRDEL)
-      .value("FCN", log_sev_t::LFCN)
-      .value("FCNP", log_sev_t::LFCNP)
-      .value("PCU", log_sev_t::LPCU)
-      .value("DYNKW", log_sev_t::LDYNKW)
-      .value("OUTIND", log_sev_t::LOUTIND)
-      .value("BCSAFTER", log_sev_t::LBCSAFTER)
-      .value("BCSPOP", log_sev_t::LBCSPOP)
-      .value("BCSPUSH", log_sev_t::LBCSPUSH)
-      .value("BCSSWAP", log_sev_t::LBCSSWAP)
-      .value("FTOR", log_sev_t::LFTOR)
-      .value("AS", log_sev_t::LAS)
-      .value("PPIS", log_sev_t::LPPIS)
-      .value("TYPEDEF", log_sev_t::LTYPEDEF)
-      .value("VARDEF", log_sev_t::LVARDEF)
-      .value("DEFVAL", log_sev_t::LDEFVAL)
-      .value("PVSEMI", log_sev_t::LPVSEMI)
-      .value("PFUNC", log_sev_t::LPFUNC)
-      .value("SPLIT", log_sev_t::LSPLIT)
-      .value("FTYPE", log_sev_t::LFTYPE)
-      .value("TEMPL", log_sev_t::LTEMPL)
-      .value("PARADD", log_sev_t::LPARADD)
-      .value("PARADD2", log_sev_t::LPARADD2)
-      .value("BLANKD", log_sev_t::LBLANKD)
-      .value("TEMPFUNC", log_sev_t::LTEMPFUNC)
-      .value("SCANSEMI", log_sev_t::LSCANSEMI)
-      .value("DELSEMI", log_sev_t::LDELSEMI)
-      .value("FPARAM", log_sev_t::LFPARAM)
-      .value("NL1LINE", log_sev_t::LNL1LINE)
-      .value("PFCHK", log_sev_t::LPFCHK)
-      .value("AVDB", log_sev_t::LAVDB)
-      .value("SORT", log_sev_t::LSORT)
-      .value("SPACE", log_sev_t::LSPACE)
-      .value("ALIGN", log_sev_t::LALIGN)
-      .value("ALAGAIN", log_sev_t::LALAGAIN)
-      .value("OPERATOR", log_sev_t::LOPERATOR)
-      .value("ASFCP", log_sev_t::LASFCP)
-      .value("INDLINED", log_sev_t::LINDLINED)
-      .value("BCTRL", log_sev_t::LBCTRL)
-      .value("RMRETURN", log_sev_t::LRMRETURN)
-      .value("PPIF", log_sev_t::LPPIF)
-      .value("MCB", log_sev_t::LMCB)
-      .value("BRCH", log_sev_t::LBRCH)
-      .value("FCNR", log_sev_t::LFCNR)
-      .value("OCCLASS", log_sev_t::LOCCLASS)
-      .value("OCMSG", log_sev_t::LOCMSG)
-      .value("BLANK", log_sev_t::LBLANK)
-      .value("OBJCWORD", log_sev_t::LOBJCWORD)
-      .value("CHANGE", log_sev_t::LCHANGE)
-      .value("CONTTEXT", log_sev_t::LCONTTEXT)
-      .value("ANNOT", log_sev_t::LANNOT)
-      .value("OCBLK", log_sev_t::LOCBLK)
-      .value("FLPAREN", log_sev_t::LFLPAREN)
-      .value("OCMSGD", log_sev_t::LOCMSGD)
-      .value("INDENTAG", log_sev_t::LINDENTAG)
-      .value("NFD", log_sev_t::LNFD)
-      .value("JDBI", log_sev_t::LJDBI)
-      .value("SETPAR", log_sev_t::LSETPAR)
-      .value("SETTYP", log_sev_t::LSETTYP)
-      .value("SETFLG", log_sev_t::LSETFLG)
-      .value("NLFUNCT", log_sev_t::LNLFUNCT)
-      .value("CHUNK", log_sev_t::LCHUNK)
-      .value("GUY98", log_sev_t::LGUY98)
-      .value("GUY", log_sev_t::LGUY);
-
-   enum_<c_token_t>("TokenType")
-      .value("NONE", c_token_t::CT_NONE)
-      .value("EOF", c_token_t::CT_EOF)
-      .value("UNKNOWN", c_token_t::CT_UNKNOWN)
-      .value("JUNK", c_token_t::CT_JUNK)
-      .value("WHITESPACE", c_token_t::CT_WHITESPACE)
-      .value("SPACE", c_token_t::CT_SPACE)
-      .value("NEWLINE", c_token_t::CT_NEWLINE)
-      .value("NL_CONT", c_token_t::CT_NL_CONT)
-      .value("COMMENT_CPP", c_token_t::CT_COMMENT_CPP)
-      .value("COMMENT", c_token_t::CT_COMMENT)
-      .value("COMMENT_MULTI", c_token_t::CT_COMMENT_MULTI)
-      .value("COMMENT_EMBED", c_token_t::CT_COMMENT_EMBED)
-      .value("COMMENT_START", c_token_t::CT_COMMENT_START)
-      .value("COMMENT_END", c_token_t::CT_COMMENT_END)
-      .value("COMMENT_WHOLE", c_token_t::CT_COMMENT_WHOLE)
-      .value("COMMENT_ENDIF", c_token_t::CT_COMMENT_ENDIF)
-      .value("IGNORED", c_token_t::CT_IGNORED)
-      .value("WORD", c_token_t::CT_WORD)
-      .value("NUMBER", c_token_t::CT_NUMBER)
-      .value("NUMBER_FP", c_token_t::CT_NUMBER_FP)
-      .value("STRING", c_token_t::CT_STRING)
-      .value("STRING_MULTI", c_token_t::CT_STRING_MULTI)
-      .value("IF", c_token_t::CT_IF)
-      .value("ELSE", c_token_t::CT_ELSE)
-      .value("ELSEIF", c_token_t::CT_ELSEIF)
-      .value("FOR", c_token_t::CT_FOR)
-      .value("WHILE", c_token_t::CT_WHILE)
-      .value("WHILE_OF_DO", c_token_t::CT_WHILE_OF_DO)
-      .value("SWITCH", c_token_t::CT_SWITCH)
-      .value("CASE", c_token_t::CT_CASE)
-      .value("DO", c_token_t::CT_DO)
-      .value("SYNCHRONIZED", c_token_t::CT_SYNCHRONIZED)
-      .value("VOLATILE", c_token_t::CT_VOLATILE)
-      .value("TYPEDEF", c_token_t::CT_TYPEDEF)
-      .value("STRUCT", c_token_t::CT_STRUCT)
-      .value("ENUM", c_token_t::CT_ENUM)
-      .value("ENUM_CLASS", c_token_t::CT_ENUM_CLASS)
-      .value("SIZEOF", c_token_t::CT_SIZEOF)
-      .value("DECLTYPE", c_token_t::CT_DECLTYPE)
-      .value("RETURN", c_token_t::CT_RETURN)
-      .value("BREAK", c_token_t::CT_BREAK)
-      .value("UNION", c_token_t::CT_UNION)
-      .value("GOTO", c_token_t::CT_GOTO)
-      .value("CONTINUE", c_token_t::CT_CONTINUE)
-      .value("C_CAST", c_token_t::CT_C_CAST)
-      .value("CPP_CAST", c_token_t::CT_CPP_CAST)
-      .value("D_CAST", c_token_t::CT_D_CAST)
-      .value("TYPE_CAST", c_token_t::CT_TYPE_CAST)
-      .value("TYPENAME", c_token_t::CT_TYPENAME)
-      .value("TEMPLATE", c_token_t::CT_TEMPLATE)
-      .value("WHERE_SPEC", c_token_t::CT_WHERE_SPEC)
-      .value("ASSIGN", c_token_t::CT_ASSIGN)
-      .value("ASSIGN_NL", c_token_t::CT_ASSIGN_NL)
-      .value("SASSIGN", c_token_t::CT_SASSIGN)
-      .value("ASSIGN_DEFAULT_ARG", c_token_t::CT_ASSIGN_DEFAULT_ARG)
-      .value("ASSIGN_FUNC_PROTO", c_token_t::CT_ASSIGN_FUNC_PROTO)
-      .value("COMPARE", c_token_t::CT_COMPARE)
-      .value("SCOMPARE", c_token_t::CT_SCOMPARE)
-      .value("BOOL", c_token_t::CT_BOOL)
-      .value("SBOOL", c_token_t::CT_SBOOL)
-      .value("ARITH", c_token_t::CT_ARITH)
-      .value("SARITH", c_token_t::CT_SARITH)
-      .value("CARET", c_token_t::CT_CARET)
-      .value("DEREF", c_token_t::CT_DEREF)
-      .value("INCDEC_BEFORE", c_token_t::CT_INCDEC_BEFORE)
-      .value("INCDEC_AFTER", c_token_t::CT_INCDEC_AFTER)
-      .value("MEMBER", c_token_t::CT_MEMBER)
-      .value("DC_MEMBER", c_token_t::CT_DC_MEMBER)
-      .value("C99_MEMBER", c_token_t::CT_C99_MEMBER)
-      .value("INV", c_token_t::CT_INV)
-      .value("DESTRUCTOR", c_token_t::CT_DESTRUCTOR)
-      .value("NOT", c_token_t::CT_NOT)
-      .value("D_TEMPLATE", c_token_t::CT_D_TEMPLATE)
-      .value("ADDR", c_token_t::CT_ADDR)
-      .value("NEG", c_token_t::CT_NEG)
-      .value("POS", c_token_t::CT_POS)
-      .value("STAR", c_token_t::CT_STAR)
-      .value("PLUS", c_token_t::CT_PLUS)
-      .value("MINUS", c_token_t::CT_MINUS)
-      .value("AMP", c_token_t::CT_AMP)
-      .value("BYREF", c_token_t::CT_BYREF)
-      .value("POUND", c_token_t::CT_POUND)
-      .value("PREPROC", c_token_t::CT_PREPROC)
-      .value("PREPROC_INDENT", c_token_t::CT_PREPROC_INDENT)
-      .value("PREPROC_BODY", c_token_t::CT_PREPROC_BODY)
-      .value("PP", c_token_t::CT_PP)
-      .value("ELLIPSIS", c_token_t::CT_ELLIPSIS)
-      .value("RANGE", c_token_t::CT_RANGE)
-      .value("NULLCOND", c_token_t::CT_NULLCOND)
-      .value("SEMICOLON", c_token_t::CT_SEMICOLON)
-      .value("VSEMICOLON", c_token_t::CT_VSEMICOLON)
-      .value("COLON", c_token_t::CT_COLON)
-      .value("ASM_COLON", c_token_t::CT_ASM_COLON)
-      .value("CASE_COLON", c_token_t::CT_CASE_COLON)
-      .value("CLASS_COLON", c_token_t::CT_CLASS_COLON)
-      .value("CONSTR_COLON", c_token_t::CT_CONSTR_COLON)
-      .value("D_ARRAY_COLON", c_token_t::CT_D_ARRAY_COLON)
-      .value("COND_COLON", c_token_t::CT_COND_COLON)
-      .value("WHERE_COLON", c_token_t::CT_WHERE_COLON)
-      .value("QUESTION", c_token_t::CT_QUESTION)
-      .value("COMMA", c_token_t::CT_COMMA)
-      .value("ASM", c_token_t::CT_ASM)
-      .value("ATTRIBUTE", c_token_t::CT_ATTRIBUTE)
-      .value("AUTORELEASEPOOL", c_token_t::CT_AUTORELEASEPOOL)
-      .value("OC_AVAILABLE", c_token_t::CT_OC_AVAILABLE)
-      .value("OC_AVAILABLE_VALUE", c_token_t::CT_OC_AVAILABLE_VALUE)
-      .value("CATCH", c_token_t::CT_CATCH)
-      .value("WHEN", c_token_t::CT_WHEN)
-      .value("WHERE", c_token_t::CT_WHERE)
-      .value("CLASS", c_token_t::CT_CLASS)
-      .value("DELETE", c_token_t::CT_DELETE)
-      .value("EXPORT", c_token_t::CT_EXPORT)
-      .value("FRIEND", c_token_t::CT_FRIEND)
-      .value("NAMESPACE", c_token_t::CT_NAMESPACE)
-      .value("PACKAGE", c_token_t::CT_PACKAGE)
-      .value("NEW", c_token_t::CT_NEW)
-      .value("OPERATOR", c_token_t::CT_OPERATOR)
-      .value("OPERATOR_VAL", c_token_t::CT_OPERATOR_VAL)
-      .value("ASSIGN_OPERATOR", c_token_t::CT_ASSIGN_OPERATOR)
-      .value("ACCESS", c_token_t::CT_ACCESS)
-      .value("ACCESS_COLON", c_token_t::CT_ACCESS_COLON)
-      .value("THROW", c_token_t::CT_THROW)
-      .value("NOEXCEPT", c_token_t::CT_NOEXCEPT)
-      .value("TRY", c_token_t::CT_TRY)
-      .value("BRACED_INIT_LIST", c_token_t::CT_BRACED_INIT_LIST)
-      .value("USING", c_token_t::CT_USING)
-      .value("USING_STMT", c_token_t::CT_USING_STMT)
-      .value("USING_ALIAS", c_token_t::CT_USING_ALIAS)
-      .value("D_WITH", c_token_t::CT_D_WITH)
-      .value("D_MODULE", c_token_t::CT_D_MODULE)
-      .value("SUPER", c_token_t::CT_SUPER)
-      .value("DELEGATE", c_token_t::CT_DELEGATE)
-      .value("BODY", c_token_t::CT_BODY)
-      .value("DEBUG", c_token_t::CT_DEBUG)
-      .value("DEBUGGER", c_token_t::CT_DEBUGGER)
-      .value("INVARIANT", c_token_t::CT_INVARIANT)
-      .value("UNITTEST", c_token_t::CT_UNITTEST)
-      .value("UNSAFE", c_token_t::CT_UNSAFE)
-      .value("FINALLY", c_token_t::CT_FINALLY)
-      .value("FIXED", c_token_t::CT_FIXED)
-      .value("IMPORT", c_token_t::CT_IMPORT)
-      .value("D_SCOPE", c_token_t::CT_D_SCOPE)
-      .value("D_SCOPE_IF", c_token_t::CT_D_SCOPE_IF)
-      .value("LAZY", c_token_t::CT_LAZY)
-      .value("D_MACRO", c_token_t::CT_D_MACRO)
-      .value("D_VERSION", c_token_t::CT_D_VERSION)
-      .value("D_VERSION_IF", c_token_t::CT_D_VERSION_IF)
-      .value("PAREN_OPEN", c_token_t::CT_PAREN_OPEN)
-      .value("PAREN_CLOSE", c_token_t::CT_PAREN_CLOSE)
-      .value("ANGLE_OPEN", c_token_t::CT_ANGLE_OPEN)
-      .value("ANGLE_CLOSE", c_token_t::CT_ANGLE_CLOSE)
-      .value("SPAREN_OPEN", c_token_t::CT_SPAREN_OPEN)
-      .value("SPAREN_CLOSE", c_token_t::CT_SPAREN_CLOSE)
-      .value("FPAREN_OPEN", c_token_t::CT_FPAREN_OPEN)
-      .value("FPAREN_CLOSE", c_token_t::CT_FPAREN_CLOSE)
-      .value("TPAREN_OPEN", c_token_t::CT_TPAREN_OPEN)
-      .value("TPAREN_CLOSE", c_token_t::CT_TPAREN_CLOSE)
-      .value("BRACE_OPEN", c_token_t::CT_BRACE_OPEN)
-      .value("BRACE_CLOSE", c_token_t::CT_BRACE_CLOSE)
-      .value("VBRACE_OPEN", c_token_t::CT_VBRACE_OPEN)
-      .value("VBRACE_CLOSE", c_token_t::CT_VBRACE_CLOSE)
-      .value("SQUARE_OPEN", c_token_t::CT_SQUARE_OPEN)
-      .value("SQUARE_CLOSE", c_token_t::CT_SQUARE_CLOSE)
-      .value("TSQUARE", c_token_t::CT_TSQUARE)
-      .value("MACRO_OPEN", c_token_t::CT_MACRO_OPEN)
-      .value("MACRO_CLOSE", c_token_t::CT_MACRO_CLOSE)
-      .value("MACRO_ELSE", c_token_t::CT_MACRO_ELSE)
-      .value("LABEL", c_token_t::CT_LABEL)
-      .value("LABEL_COLON", c_token_t::CT_LABEL_COLON)
-      .value("FUNCTION", c_token_t::CT_FUNCTION)
-      .value("FUNC_CALL", c_token_t::CT_FUNC_CALL)
-      .value("FUNC_CALL_USER", c_token_t::CT_FUNC_CALL_USER)
-      .value("FUNC_DEF", c_token_t::CT_FUNC_DEF)
-      .value("FUNC_TYPE", c_token_t::CT_FUNC_TYPE)
-      .value("FUNC_VAR", c_token_t::CT_FUNC_VAR)
-      .value("FUNC_PROTO", c_token_t::CT_FUNC_PROTO)
-      .value("FUNC_START", c_token_t::CT_FUNC_START)
-      .value("FUNC_CLASS_DEF", c_token_t::CT_FUNC_CLASS_DEF)
-      .value("FUNC_CLASS_PROTO", c_token_t::CT_FUNC_CLASS_PROTO)
-      .value("FUNC_CTOR_VAR", c_token_t::CT_FUNC_CTOR_VAR)
-      .value("FUNC_WRAP", c_token_t::CT_FUNC_WRAP)
-      .value("PROTO_WRAP", c_token_t::CT_PROTO_WRAP)
-      .value("MACRO_FUNC", c_token_t::CT_MACRO_FUNC)
-      .value("MACRO", c_token_t::CT_MACRO)
-      .value("QUALIFIER", c_token_t::CT_QUALIFIER)
-      .value("EXTERN", c_token_t::CT_EXTERN)
-      .value("DECLSPEC", c_token_t::CT_DECLSPEC)
-      .value("ALIGN", c_token_t::CT_ALIGN)
-      .value("TYPE", c_token_t::CT_TYPE)
-      .value("PTR_TYPE", c_token_t::CT_PTR_TYPE)
-      .value("TYPE_WRAP", c_token_t::CT_TYPE_WRAP)
-      .value("CPP_LAMBDA", c_token_t::CT_CPP_LAMBDA)
-      .value("CPP_LAMBDA_RET", c_token_t::CT_CPP_LAMBDA_RET)
-      .value("TRAILING_RET", c_token_t::CT_TRAILING_RET)
-      .value("BIT_COLON", c_token_t::CT_BIT_COLON)
-      .value("OC_DYNAMIC", c_token_t::CT_OC_DYNAMIC)
-      .value("OC_END", c_token_t::CT_OC_END)
-      .value("OC_IMPL", c_token_t::CT_OC_IMPL)
-      .value("OC_INTF", c_token_t::CT_OC_INTF)
-      .value("OC_PROTOCOL", c_token_t::CT_OC_PROTOCOL)
-      .value("OC_PROTO_LIST", c_token_t::CT_OC_PROTO_LIST)
-      .value("OC_GENERIC_SPEC", c_token_t::CT_OC_GENERIC_SPEC)
-      .value("OC_PROPERTY", c_token_t::CT_OC_PROPERTY)
-      .value("OC_CLASS", c_token_t::CT_OC_CLASS)
-      .value("OC_CLASS_EXT", c_token_t::CT_OC_CLASS_EXT)
-      .value("OC_CATEGORY", c_token_t::CT_OC_CATEGORY)
-      .value("OC_SCOPE", c_token_t::CT_OC_SCOPE)
-      .value("OC_MSG", c_token_t::CT_OC_MSG)
-      .value("OC_MSG_CLASS", c_token_t::CT_OC_MSG_CLASS)
-      .value("OC_MSG_FUNC", c_token_t::CT_OC_MSG_FUNC)
-      .value("OC_MSG_NAME", c_token_t::CT_OC_MSG_NAME)
-      .value("OC_MSG_SPEC", c_token_t::CT_OC_MSG_SPEC)
-      .value("OC_MSG_DECL", c_token_t::CT_OC_MSG_DECL)
-      .value("OC_RTYPE", c_token_t::CT_OC_RTYPE)
-      .value("OC_ATYPE", c_token_t::CT_OC_ATYPE)
-      .value("OC_COLON", c_token_t::CT_OC_COLON)
-      .value("OC_DICT_COLON", c_token_t::CT_OC_DICT_COLON)
-      .value("OC_SEL", c_token_t::CT_OC_SEL)
-      .value("OC_SEL_NAME", c_token_t::CT_OC_SEL_NAME)
-      .value("OC_BLOCK", c_token_t::CT_OC_BLOCK)
-      .value("OC_BLOCK_ARG", c_token_t::CT_OC_BLOCK_ARG)
-      .value("OC_BLOCK_TYPE", c_token_t::CT_OC_BLOCK_TYPE)
-      .value("OC_BLOCK_EXPR", c_token_t::CT_OC_BLOCK_EXPR)
-      .value("OC_BLOCK_CARET", c_token_t::CT_OC_BLOCK_CARET)
-      .value("OC_AT", c_token_t::CT_OC_AT)
-      .value("OC_PROPERTY_ATTR", c_token_t::CT_OC_PROPERTY_ATTR)
-      .value("PP_DEFINE", c_token_t::CT_PP_DEFINE)
-      .value("PP_DEFINED", c_token_t::CT_PP_DEFINED)
-      .value("PP_INCLUDE", c_token_t::CT_PP_INCLUDE)
-      .value("PP_IF", c_token_t::CT_PP_IF)
-      .value("PP_ELSE", c_token_t::CT_PP_ELSE)
-      .value("PP_ENDIF", c_token_t::CT_PP_ENDIF)
-      .value("PP_ASSERT", c_token_t::CT_PP_ASSERT)
-      .value("PP_EMIT", c_token_t::CT_PP_EMIT)
-      .value("PP_ENDINPUT", c_token_t::CT_PP_ENDINPUT)
-      .value("PP_ERROR", c_token_t::CT_PP_ERROR)
-      .value("PP_FILE", c_token_t::CT_PP_FILE)
-      .value("PP_LINE", c_token_t::CT_PP_LINE)
-      .value("PP_SECTION", c_token_t::CT_PP_SECTION)
-      .value("PP_ASM", c_token_t::CT_PP_ASM)
-      .value("PP_UNDEF", c_token_t::CT_PP_UNDEF)
-      .value("PP_PROPERTY", c_token_t::CT_PP_PROPERTY)
-      .value("PP_BODYCHUNK", c_token_t::CT_PP_BODYCHUNK)
-      .value("PP_PRAGMA", c_token_t::CT_PP_PRAGMA)
-      .value("PP_REGION", c_token_t::CT_PP_REGION)
-      .value("PP_ENDREGION", c_token_t::CT_PP_ENDREGION)
-      .value("PP_REGION_INDENT", c_token_t::CT_PP_REGION_INDENT)
-      .value("PP_IF_INDENT", c_token_t::CT_PP_IF_INDENT)
-      .value("PP_IGNORE", c_token_t::CT_PP_IGNORE)
-      .value("PP_OTHER", c_token_t::CT_PP_OTHER)
-      .value("CHAR", c_token_t::CT_CHAR)
-      .value("DEFINED", c_token_t::CT_DEFINED)
-      .value("FORWARD", c_token_t::CT_FORWARD)
-      .value("NATIVE", c_token_t::CT_NATIVE)
-      .value("STATE", c_token_t::CT_STATE)
-      .value("STOCK", c_token_t::CT_STOCK)
-      .value("TAGOF", c_token_t::CT_TAGOF)
-      .value("DOT", c_token_t::CT_DOT)
-      .value("TAG", c_token_t::CT_TAG)
-      .value("TAG_COLON", c_token_t::CT_TAG_COLON)
-      .value("LOCK", c_token_t::CT_LOCK)
-      .value("AS", c_token_t::CT_AS)
-      .value("IN", c_token_t::CT_IN)
-      .value("BRACED", c_token_t::CT_BRACED)
-      .value("THIS", c_token_t::CT_THIS)
-      .value("BASE", c_token_t::CT_BASE)
-      .value("DEFAULT", c_token_t::CT_DEFAULT)
-      .value("GETSET", c_token_t::CT_GETSET)
-      .value("GETSET_EMPTY", c_token_t::CT_GETSET_EMPTY)
-      .value("CONCAT", c_token_t::CT_CONCAT)
-      .value("CS_SQ_STMT", c_token_t::CT_CS_SQ_STMT)
-      .value("CS_SQ_COLON", c_token_t::CT_CS_SQ_COLON)
-      .value("CS_PROPERTY", c_token_t::CT_CS_PROPERTY)
-      .value("SQL_EXEC", c_token_t::CT_SQL_EXEC)
-      .value("SQL_BEGIN", c_token_t::CT_SQL_BEGIN)
-      .value("SQL_END", c_token_t::CT_SQL_END)
-      .value("SQL_WORD", c_token_t::CT_SQL_WORD)
-      .value("SQL_ASSIGN", c_token_t::CT_SQL_ASSIGN)
-      .value("CONSTRUCT", c_token_t::CT_CONSTRUCT)
-      .value("LAMBDA", c_token_t::CT_LAMBDA)
-      .value("ASSERT", c_token_t::CT_ASSERT)
-      .value("ANNOTATION", c_token_t::CT_ANNOTATION)
-      .value("FOR_COLON", c_token_t::CT_FOR_COLON)
-      .value("DOUBLE_BRACE", c_token_t::CT_DOUBLE_BRACE)
-      .value("CNG_HASINC", c_token_t::CT_CNG_HASINC)
-      .value("CNG_HASINCN", c_token_t::CT_CNG_HASINCN)
-      .value("Q_EMIT", c_token_t::CT_Q_EMIT)
-      .value("Q_FOREACH", c_token_t::CT_Q_FOREACH)
-      .value("Q_FOREVER", c_token_t::CT_Q_FOREVER)
-      .value("Q_GADGET", c_token_t::CT_Q_GADGET)
-      .value("Q_OBJECT", c_token_t::CT_Q_OBJECT)
-      .value("MODE", c_token_t::CT_MODE)
-      .value("DI", c_token_t::CT_DI)
-      .value("HI", c_token_t::CT_HI)
-      .value("QI", c_token_t::CT_QI)
-      .value("SI", c_token_t::CT_SI)
-      .value("NOTHROW", c_token_t::CT_NOTHROW)
-      .value("WORD_", c_token_t::CT_WORD_);
-
-   enum_<lang_flag_e>("Language")
-      .value("C", lang_flag_e::LANG_C)
-      .value("CPP", lang_flag_e::LANG_CPP)
-      .value("D", lang_flag_e::LANG_D)
-      .value("CS", lang_flag_e::LANG_CS)
-      .value("JAVA", lang_flag_e::LANG_JAVA)
-      .value("OC", lang_flag_e::LANG_OC)
-      .value("VALA", lang_flag_e::LANG_VALA)
-      .value("PAWN", lang_flag_e::LANG_PAWN)
-      .value("ECMA", lang_flag_e::LANG_ECMA);
-
-   // endregion enum bindings
-
-   register_vector<std::string>("strings");
-
-   class_<GenericOption>("GenericOption")
-      .function("type", &GenericOption::type)
-      .function("description", select_overload<std::string(const GenericOption &)>(
-                   [](const GenericOption &o)
-   {
-      return((o.description() != nullptr) ? string(o.description()) : "");
-   }))
-      .function("name", select_overload<std::string(const GenericOption &)>(
-                   [](const GenericOption &o)
-   {
-      return((o.name() != nullptr) ? string(o.name()) : "");
-   }))
-      .function("possible_values", select_overload<std::vector<std::string>(const GenericOption &)>(
-                   [](const GenericOption &o)
-   {
-      std::vector<std::string> strings;
-
-      auto ptr = o.possibleValues();
-
-      for (auto c = *ptr; c; c = *++ptr)
-      {
-         strings.push_back(std::string{ c });
-      }
-
-      return(strings);
-   }))
-      .function("default", &GenericOption::defaultStr)
-      .function("min", &GenericOption::minStr)
-      .function("max", &GenericOption::maxStr)
-      .function("is_default", &GenericOption::isDefault)
-      .function("reset", &GenericOption::reset)
-      .function("set", select_overload<bool(GenericOption &o, const std::string &s)>(
-                   [](GenericOption &o, const std::string &s)
-   {
-      return(o.read(s.c_str()));
-   }))
-      .function("value", &GenericOption::str);
-
-   register_vector<GenericOption *>("options");
-
-   class_<Option<iarf_e>, base<GenericOption> >("OptionIARF")
-      .function("value", &Option<iarf_e>::operator());
-
-   class_<Option<line_end_e>, base<GenericOption> >("OptionLineEnd")
-      .function("value", &Option<line_end_e>::operator());
-
-   class_<Option<token_pos_e>, base<GenericOption> >("OptionTokenPos")
-      .function("value", &Option<token_pos_e>::operator());
-
-   class_<Option<unsigned>, base<GenericOption> >("OptionUnsigned")
-      .function("value", &Option<unsigned>::operator());
-
-   class_<Option<signed>, base<GenericOption> >("OptionSigned")
-      .function("value", &Option<signed>::operator());
-
-   class_<Option<std::string>, base<GenericOption> >("OptionString")
-      .function("value", &Option<std::string>::operator());
-
-   class_<OptionGroup>("OptionGroup")
-      .property("description", select_overload<std::string(const OptionGroup &)>(
-                   [](const OptionGroup &g)
-   {
-      return(std::string(g.description));
-   }))
-      .property("options", &OptionGroup::options);
-
-   register_vector<OptionGroup *>("groups");
-
-   emscripten::function("get_options", &get_options);
-   emscripten::function("get_groups", &get_groups);
-
-   emscripten::function("_initialize", &_initialize);
-   emscripten::function("destruct", &destruct);
-
-   emscripten::function("get_version", &get_version);
-
-   emscripten::function("add_keyword", &_add_keyword);
-   emscripten::function("clear_keywords", &clear_keywords);
-
-   emscripten::function("reset_options", &reset_options);
-   emscripten::function("option_reset_value", &reset_option);
-   emscripten::function("option_set_value", &set_option);
-   emscripten::function("option_get_value", &get_option);
-
-   emscripten::function("_load_config", &_loadConfig);
-   emscripten::function("show_config", select_overload<string(bool, bool)>(&show_config));
-   emscripten::function("show_config", select_overload<string(bool)>(&show_config));
-   emscripten::function("show_config", select_overload<string()>(&show_config));
-
-   emscripten::function("log_type_enable", &log_set_sev);
-   emscripten::function("log_type_show_name", &show_log_type);
-   emscripten::function("quiet", &set_quiet);
-
-   emscripten::function("_uncrustify", select_overload<intptr_t(intptr_t, lang_flag_e, bool, bool)>(&_uncrustify));
-   emscripten::function("_uncrustify", select_overload<intptr_t(intptr_t, lang_flag_e, bool)>(&_uncrustify));
-   emscripten::function("_uncrustify", select_overload<intptr_t(intptr_t, lang_flag_e)>(&_uncrustify));
-
-   emscripten::function("_debug", select_overload<intptr_t(intptr_t, lang_flag_e, bool)>(&_debug));
-   emscripten::function("_debug", select_overload<intptr_t(intptr_t, lang_flag_e)>(&_debug));
-};
-
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_limits.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_limits.h
deleted file mode 100644
index a03591e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_limits.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-namespace uncrustify
-{
-
-namespace limits
-{
-
-static constexpr int MAX_OPTION_NAME_LEN = 32;
-static constexpr int AL_SIZE             = 8000;
-
-} // namespace limits
-
-} // namespace uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.cpp
deleted file mode 100644
index bd57f2d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * @file uncrustify_types.cpp
- * Defines some types for the uncrustify program
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "uncrustify_types.h"
-
-
-const char *get_brace_stage_name(brace_stage_e brace_stage)
-{
-   switch (brace_stage)
-   {
-   case brace_stage_e::NONE:
-      return("NONE");
-
-   case brace_stage_e::PAREN1:
-      return("PAREN1");
-
-   case brace_stage_e::OP_PAREN1:
-      return("OP_PAREN1");
-
-   case brace_stage_e::WOD_PAREN:
-      return("WOD_PAREN");
-
-   case brace_stage_e::WOD_SEMI:
-      return("WOD_SEMI");
-
-   case brace_stage_e::BRACE_DO:
-      return("BRACE_DO");
-
-   case brace_stage_e::BRACE2:
-      return("BRACE2");
-
-   case brace_stage_e::ELSE:
-      return("ELSE");
-
-   case brace_stage_e::ELSEIF:
-      return("ELSEIF");
-
-   case brace_stage_e::WHILE:
-      return("WHILE");
-
-   case brace_stage_e::CATCH:
-      return("CATCH");
-
-   case brace_stage_e::CATCH_WHEN:
-      return("CATCH_WHEN");
-   }
-   return("?????");
-} // get_brace_stage_name
-
-
-const char *get_unc_stage_name(unc_stage_e unc_stage)
-{
-   switch (unc_stage)
-   {
-   case unc_stage_e::TOKENIZE:
-      return("TOKENIZE");
-
-   case unc_stage_e::HEADER:
-      return("HEADER");
-
-   case unc_stage_e::TOKENIZE_CLEANUP:
-      return("TOKENIZE_CLEANUP");
-
-   case unc_stage_e::BRACE_CLEANUP:
-      return("BRACE_CLEANUP");
-
-   case unc_stage_e::FIX_SYMBOLS:
-      return("FIX_SYMBOLS");
-
-   case unc_stage_e::MARK_COMMENTS:
-      return("MARK_COMMENTS");
-
-   case unc_stage_e::COMBINE_LABELS:
-      return("COMBINE_LABELS");
-
-   case unc_stage_e::OTHER:
-      return("OTHER");
-
-   case unc_stage_e::CLEANUP:
-      return("CLEANUP");
-   }
-   return("?????");
-} // get_unc_stage_name
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.h
deleted file mode 100644
index 1aeb43c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.h
+++ /dev/null
@@ -1,402 +0,0 @@
-/**
- * @file uncrustify_types.h
- *
- * Defines some types for the uncrustify program
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef UNCRUSTIFY_TYPES_H_INCLUDED
-#define UNCRUSTIFY_TYPES_H_INCLUDED
-
-#include "options.h"
-#include "pcf_flags.h"
-#include "token_enum.h"    // c_token_t
-#include "unc_text.h"
-#include "uncrustify_limits.h"
-
-#include <assert.h>
-
-#ifdef HAVE_UTIME_H
-#include <utime.h>
-#endif
-
-
-class ParseFrame;
-
-
-/**
- * abbreviations used:
- *   SS = star style
- */
-
-/**
- * special strings to mark a part of the input file where
- * uncrustify shall not change anything
- */
-#define UNCRUSTIFY_OFF_TEXT    " *INDENT-OFF*"
-#define UNCRUSTIFY_ON_TEXT     " *INDENT-ON*"
-
-//! returns type (with removed reference) of a variable
-#define noref_decl_t(X)              std::remove_reference<decltype((X))>::type
-
-//! returns type (with removed const and reference) of a variable
-#define nocref_decl_t(X)             std::remove_const<noref_decl_t((X))>::type
-
-//! static casts Y to the type (with removed reference) of X
-#define s_cast_noref_decl_t(X, Y)    static_cast<nocref_decl_t(X)>(Y)
-
-//! performs abs on Y after static casting it to the type (with removed reference) of X
-#define cast_abs(X, Y)               s_cast_noref_decl_t(X, abs(Y))
-
-/**
- * @brief Macro to inform the compiler that a variable is intentionally
- * not in use.
- *
- * @param [in] variableName: The unused variable.
- */
-#define UNUSED(variableName)         ((void)variableName)
-
-
-//! Brace stage enum used in brace_cleanup
-enum class brace_stage_e : unsigned int
-{
-   NONE,
-   PAREN1,      //! expected paren after if/catch (C++)/for/switch/synchronized/while
-   OP_PAREN1,   //! optional paren after catch (C#)
-   WOD_PAREN,   //! while of do parens
-   WOD_SEMI,    //! semicolon after while of do
-   BRACE_DO,    //! do
-   BRACE2,      //! if/catch/else/finally/for/switch/synchronized/while
-   ELSE,        //! expecting 'else' after 'if'
-   ELSEIF,      //! expecting 'if' after 'else'
-   WHILE,       //! expecting 'while' after 'do'
-   CATCH,       //! expecting 'catch' or 'finally' after 'try'
-   CATCH_WHEN,  //! optional 'when' after 'catch'
-};
-
-
-enum class char_encoding_e : unsigned int
-{
-   e_ASCII,     //! 0-127
-   e_BYTE,      //! 0-255, not UTF-8
-   e_UTF8,      //! utf 8 bit wide
-   e_UTF16_LE,  //! utf 16 bit wide, little endian
-   e_UTF16_BE   //! utf 16 bit wide, big endian
-};
-
-
-struct chunk_t; //forward declaration
-
-
-/**
- * Sort of like the aligning stuff, but the token indent is relative to the
- * indent of another chunk. This is needed, as that chunk may be aligned and
- * so the indent cannot be determined in the indent code.
- */
-struct indent_ptr_t
-{
-   chunk_t *ref;
-   int     delta;
-};
-
-
-struct align_ptr_t
-{
-   chunk_t *next;       //! nullptr or the chunk that should be under this one
-   bool    right_align; //! AlignStack.m_right_align
-   size_t  star_style;  //! AlignStack.m_star_style
-   size_t  amp_style;   //! AlignStack.m_amp_style
-   int     gap;         //! AlignStack.m_gap
-
-   /*
-    * col_adj is the amount to alter the column for the token.
-    * For example, a dangling '*' would be set to -1.
-    * A right-aligned word would be a positive value.
-    */
-   int     col_adj;
-   chunk_t *ref;
-   chunk_t *start;
-};
-
-
-// for debugging purpose only
-typedef std::pair<size_t, char *>   Track_nr;         // track for "trackNumber" and "rule"
-typedef std::vector<Track_nr>       track_list;       // liste for many tracks
-
-// This is the main type of this program
-struct chunk_t
-{
-   chunk_t()
-   {
-      reset();
-   }
-
-
-   //! sets all elements of the struct to their default value
-   void reset()
-   {
-      memset(&align, 0, sizeof(align));
-      memset(&indent, 0, sizeof(indent));
-      next          = nullptr;
-      prev          = nullptr;
-      parent        = nullptr;
-      type          = CT_NONE;
-      parent_type   = CT_NONE;
-      orig_line     = 0;
-      orig_col      = 0;
-      orig_col_end  = 0;
-      orig_prev_sp  = 0;
-      flags         = PCF_NONE;
-      column        = 0;
-      column_indent = 0;
-      nl_count      = 0;
-      nl_column     = 0;
-      level         = 0;
-      brace_level   = 0;
-      pp_level      = 999;                           // use a big value to find some errors
-      after_tab     = false;
-      // for debugging purpose only
-      tracking = nullptr;
-      str.clear();
-   }
-
-
-   //! provides the number of characters of string
-   size_t len() const
-   {
-      return(str.size());
-   }
-
-
-   //! provides the content of a string a zero terminated character pointer
-   const char *text() const
-   {
-      return(str.c_str());
-   }
-
-
-   // Issue #2984, fill up, if necessary, a copie of the first chars of the text() string
-   const char *elided_text(char *for_the_copy)
-   {
-      const char *test_it       = text();
-      size_t     test_it_length = strlen(test_it);
-
-      size_t     truncate_value = uncrustify::options::debug_truncate();
-
-      if (truncate_value != 0)
-      {
-         if (test_it_length > truncate_value)
-         {
-            memset(for_the_copy, 0, 1000);
-
-            if (test_it_length < truncate_value + 30)
-            {
-               strncpy(for_the_copy, test_it, truncate_value - 30);
-               for_the_copy[truncate_value - 30] = 0;
-            }
-            else
-            {
-               strncpy(for_the_copy, test_it, truncate_value);
-               for_the_copy[truncate_value] = 0;
-            }
-            char *message = strcat(for_the_copy, " ... <The string is truncated>");
-
-            return(message);
-         }
-         else
-         {
-            return(test_it);
-         }
-      }
-      return(test_it);
-   }
-
-   chunk_t      *next;            //! pointer to next chunk in list
-   chunk_t      *prev;            //! pointer to previous chunk in list
-   chunk_t      *parent;          //! pointer to parent chunk(not always set)
-   align_ptr_t  align;
-   indent_ptr_t indent;
-   c_token_t    type;             //! type of the chunk itself
-   c_token_t    parent_type;      //! type of the parent chunk usually CT_NONE
-                                  //! might be different from parent->parent_type (above)
-   size_t       orig_line;        //! line number of chunk in input file
-   size_t       orig_col;         //! column where chunk started in the input file, is always > 0
-   size_t       orig_col_end;     //! column where chunk ended in the input file, is always > 1
-   UINT32       orig_prev_sp;     //! whitespace before this token
-   pcf_flags_t  flags;            //! see PCF_xxx
-   size_t       column;           //! column of chunk
-   size_t       column_indent;    /** if 1st on a line, set to the 'indent'
-                                   * column, which may be less than the real
-                                   * column used to indent with tabs          */
-   size_t       nl_count;         //! number of newlines in CT_NEWLINE
-   size_t       nl_column;        //! column of the subsequent newline entries(all of them should have the same column)
-   size_t       level;            /** nest level in {, (, or [
-                                   * only to help vim command } */
-   size_t       brace_level;      //! nest level in braces only
-   size_t       pp_level;         //! nest level in preprocessor
-   bool         after_tab;        //! whether this token was after a tab
-   unc_text     str;              //! the token text
-
-   // for debugging purpose only
-   track_list   *tracking;
-};
-
-
-//! list of all programming languages Uncrustify supports
-enum lang_flag_e
-{
-   LANG_C    = 0x0001,
-   LANG_CPP  = 0x0002,
-   LANG_D    = 0x0004,
-   LANG_CS   = 0x0008,     //! C# (C-Sharp)
-   LANG_JAVA = 0x0010,
-   LANG_OC   = 0x0020,     //! Objective-C
-   LANG_VALA = 0x0040,
-   LANG_PAWN = 0x0080,
-   LANG_ECMA = 0x0100,     //! ECMA Script (JavaScript)
-
-   LANG_ALLC = 0x017f,     /** LANG_C    | LANG_CPP | LANG_D    | LANG_CS   |
-                            *  LANG_JAVA | LANG_OC  | LANG_VALA | LANG_ECMA   */
-   LANG_ALL  = 0x0fff,     //! applies to all languages
-
-   FLAG_HDR  = 0x2000,     /*<< Header file for C family languages */
-   FLAG_DIG  = 0x4000,     //! digraph/trigraph
-   FLAG_PP   = 0x8000,     //! only appears in a preprocessor
-};
-
-//! Pattern classes for special keywords
-enum class pattern_class_e : unsigned int
-{
-   NONE,
-   BRACED,   /** keyword + braced statement:
-              *    do, try, finally, body, unittest, unsafe, volatile
-              *    add, get, remove, set                                      */
-   PBRACED,  /** keyword + parens + braced statement:
-              *    if, elseif, switch, for, while, synchronized,
-              *    using, lock, with, version, CT_D_SCOPE_IF                  */
-   OPBRACED, /** keyword + optional parens + braced statement:
-              *    catch, version, debug                                      */
-   VBRACED,  /** keyword + value + braced statement:
-              *    namespace                                                  */
-   PAREN,    /** keyword + parens:
-              *    while-of-do                                                */
-   OPPAREN,  /** keyword + optional parens:
-              *    invariant (D lang)                                         */
-   ELSE,     /** Special case of pattern_class_e::BRACED for handling CT_IF
-              *    else                                                       */
-};
-
-//! used to link language keywords with some addition information
-struct chunk_tag_t
-{
-   const char *tag;        //! name of the keyword e.g. "bool"
-   c_token_t  type;        //! uncrustify type assigned to that keyword
-   size_t     lang_flags;  //! programming language that uses this keyword
-};
-
-
-struct align_t
-{
-   size_t    col;
-   c_token_t type;
-   size_t    len;    //! length of the token + space
-};
-
-//! holds information and data of a file
-struct file_mem
-{
-   std::vector<UINT8> raw;  //! raw content of file
-   std::deque<int>    data; //! processed content of file
-   bool               bom;
-   char_encoding_e    enc;  //! character encoding of file ASCII, utf, etc.
-#ifdef HAVE_UTIME_H
-   struct utimbuf     utb;
-#endif
-};
-
-enum class unc_stage_e : unsigned int
-{
-   TOKENIZE,
-   HEADER,
-   TOKENIZE_CLEANUP,
-   BRACE_CLEANUP,
-   FIX_SYMBOLS,
-   MARK_COMMENTS,
-   COMBINE_LABELS,
-   OTHER,
-   CLEANUP
-};
-
-struct cp_data_t
-{
-   std::deque<UINT8> *bout;
-   FILE              *fout;
-   int               last_char;
-   bool              do_check;
-   unc_stage_e       unc_stage;
-   int               check_fail_cnt;       //! total failure count
-   bool              if_changed;
-
-   UINT32            error_count;       //! counts how many errors occurred so far
-   std::string       filename;
-
-   file_mem          file_hdr;          // for cmt_insert_file_header
-   file_mem          file_ftr;          // for cmt_insert_file_footer
-   file_mem          func_hdr;          // for cmt_insert_func_header
-   file_mem          oc_msg_hdr;        // for cmt_insert_oc_msg_header
-   file_mem          class_hdr;         // for cmt_insert_class_header
-   file_mem          reflow_fold_regex; // for cmt_reflow_fold_regex_file
-
-   size_t            lang_flags;        //! defines the language of the source input
-   bool              lang_forced;       //! overwrites automatic language detection
-
-   bool              unc_off;
-   bool              unc_off_used;       //! true if the `disable_processing_cmt` option was actively used in the processed file
-   UINT32            line_number;
-   size_t            column;             //! column for parsing
-   UINT16            spaces;             //! space count on output
-
-   int               ifdef_over_whole_file;
-
-   bool              frag;          //! activates code fragment option
-   UINT32            frag_cols;
-
-   // stuff to auto-detect line endings
-   UINT32            le_counts[uncrustify::line_end_styles];
-   unc_text          newline;
-
-   int               did_newline;       //! flag indicates if a newline was added or converted
-   c_token_t         in_preproc;
-   int               preproc_ncnl_count;
-   bool              output_trailspace;
-   bool              output_tab_as_space;
-
-   bool              bom;
-   char_encoding_e   enc;
-
-   // bumped up when a line is split or indented
-   int               changes;
-   int               pass_count;       //! indicates how often the chunk list shall be processed
-
-   align_t           al[uncrustify::limits::AL_SIZE];
-   size_t            al_cnt;
-   bool              al_c99_array;
-
-   bool              warned_unable_string_replace_tab_chars;
-
-   int               pp_level;       // TODO: can this ever be -1?
-
-   const char        *phase_name;
-   const char        *dumped_file;
-   const char        *html_file = nullptr; // for debugging purpose only
-};
-
-extern cp_data_t cpd;  // TODO: can we avoid this external variable?
-
-const char *get_brace_stage_name(brace_stage_e brace_stage);
-
-const char *get_unc_stage_name(unc_stage_e unc_stage);
-
-#endif /* UNCRUSTIFY_TYPES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_version.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_version.h.in
deleted file mode 100644
index 079e0fa6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_version.h.in
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file uncrustify_version.h
- * Simply defines UNCRUSTIFY_VERSION.
- * I don't particularly like how autoconf and friends handle the version...
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef UNCRUSTIFY_VERSION_H_INCLUDED
-#define UNCRUSTIFY_VERSION_H_INCLUDED
-
-#ifdef DEBUG
-#define UNCRUSTIFY_VERSION    "Uncrustify_d-@UNCRUSTIFY_VERSION@"
-#else
-#define UNCRUSTIFY_VERSION    "Uncrustify-@UNCRUSTIFY_VERSION@"
-#endif
-
-#endif /* UNCRUSTIFY_VERSION_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.cpp
deleted file mode 100644
index 172cda28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.cpp
+++ /dev/null
@@ -1,580 +0,0 @@
-/**
- * @file unicode.cpp
- * Detects, read and writes characters in the proper format.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "unicode.h"
-
-
-using namespace std;
-
-
-//! See if all characters are ASCII (0-127)
-static bool is_ascii(const vector<UINT8> &data, size_t &non_ascii_cnt, size_t &zero_cnt);
-
-
-//! Convert the array of bytes into an array of ints
-static bool decode_bytes(const vector<UINT8> &in_data, deque<int> &out_data);
-
-
-/**
- * Decode UTF-8 sequences from in_data and put the chars in out_data.
- * If there are any decoding errors, then return false.
- */
-static bool decode_utf8(const vector<UINT8> &in_data, deque<int> &out_data);
-
-
-/**
- * Extract 2 bytes from the stream and increment idx by 2
- *
- * @param in   byte vector with input data
- * @param idx  index points to working position in vector
- */
-static int get_word(const vector<UINT8> &in_data, size_t &idx, bool be);
-
-
-/**
- * Decode a UTF-16 sequence.
- * Sets enc based on the BOM.
- * Must have the BOM as the first two bytes.
- */
-static bool decode_utf16(const vector<UINT8> &in_data, deque<int> &out_data, char_encoding_e &enc);
-
-
-/**
- * Looks for the BOM of UTF-16 BE/LE and UTF-8.
- * If found, set enc and return true.
- * Sets enc to char_encoding_e::e_ASCII and returns false if not found.
- */
-static bool decode_bom(const vector<UINT8> &in_data, char_encoding_e &enc);
-
-
-//! Write for ASCII and BYTE encoding
-static void write_byte(int ch);
-
-
-//! Writes a single character to a file using UTF-8 encoding
-static void write_utf8(int ch);
-
-
-static void write_utf16(int ch, bool be);
-
-
-static bool is_ascii(const vector<UINT8> &data, size_t &non_ascii_cnt, size_t &zero_cnt)
-{
-   non_ascii_cnt = 0;
-   zero_cnt      = 0;
-
-   for (unsigned char value : data)
-   {
-      if (value & 0x80)
-      {
-         non_ascii_cnt++;
-      }
-
-      if (!value)
-      {
-         zero_cnt++;
-      }
-   }
-
-   return((non_ascii_cnt + zero_cnt) == 0);
-}
-
-
-static bool decode_bytes(const vector<UINT8> &in_data, deque<int> &out_data)
-{
-   out_data.resize(in_data.size());
-
-   for (size_t idx = 0; idx < in_data.size(); idx++)
-   {
-      out_data[idx] = in_data[idx];
-   }
-
-   return(true);
-}
-
-
-void encode_utf8(int ch, vector<UINT8> &res)
-{
-   if (ch < 0)
-   {
-      // illegal code - do not store
-   }
-   else if (ch < 0x80)
-   {
-      // 0xxxxxxx
-      res.push_back(ch);
-   }
-   else if (ch < 0x0800)
-   {
-      // 110xxxxx 10xxxxxx
-      res.push_back(0xC0 | (ch >> 6));
-      res.push_back(0x80 | (ch & 0x3f));
-   }
-   else if (ch < 0x10000)
-   {
-      // 1110xxxx 10xxxxxx 10xxxxxx
-      res.push_back(0xE0 | (ch >> 12));
-      res.push_back(0x80 | ((ch >> 6) & 0x3f));
-      res.push_back(0x80 | (ch & 0x3f));
-   }
-   else if (ch < 0x200000)
-   {
-      // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-      res.push_back(0xF0 | (ch >> 18));
-      res.push_back(0x80 | ((ch >> 12) & 0x3f));
-      res.push_back(0x80 | ((ch >> 6) & 0x3f));
-      res.push_back(0x80 | (ch & 0x3f));
-   }
-   else if (ch < 0x4000000)
-   {
-      // 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-      res.push_back(0xF8 | (ch >> 24));
-      res.push_back(0x80 | ((ch >> 18) & 0x3f));
-      res.push_back(0x80 | ((ch >> 12) & 0x3f));
-      res.push_back(0x80 | ((ch >> 6) & 0x3f));
-      res.push_back(0x80 | (ch & 0x3f));
-   }
-   else // (ch <= 0x7fffffff)
-   {
-      // 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-      res.push_back(0xFC | (ch >> 30));
-      res.push_back(0x80 | ((ch >> 24) & 0x3f));
-      res.push_back(0x80 | ((ch >> 18) & 0x3f));
-      res.push_back(0x80 | ((ch >> 12) & 0x3f));
-      res.push_back(0x80 | ((ch >> 6) & 0x3f));
-      res.push_back(0x80 | (ch & 0x3f));
-   }
-} // encode_utf8
-
-
-static bool decode_utf8(const vector<UINT8> &in_data, deque<int> &out_data)
-{
-   size_t idx = 0;
-   int    cnt;
-
-   out_data.clear();
-
-   // check for UTF-8 BOM silliness and skip
-   if (in_data.size() >= 3)
-   {
-      if (  (in_data[0] == 0xef)
-         && (in_data[1] == 0xbb)
-         && (in_data[2] == 0xbf))
-      {
-         idx = 3;  // skip it
-      }
-   }
-
-   while (idx < in_data.size())
-   {
-      int ch = in_data[idx++];
-
-      if (ch < 0x80)                   // 1-byte sequence
-      {
-         out_data.push_back(ch);
-         continue;
-      }
-      else if ((ch & 0xE0) == 0xC0)    // 2-byte sequence
-      {
-         ch &= 0x1F;
-         cnt = 1;
-      }
-      else if ((ch & 0xF0) == 0xE0)    // 3-byte sequence
-      {
-         ch &= 0x0F;
-         cnt = 2;
-      }
-      else if ((ch & 0xF8) == 0xF0)    // 4-byte sequence
-      {
-         ch &= 0x07;
-         cnt = 3;
-      }
-      else if ((ch & 0xFC) == 0xF8)    // 5-byte sequence
-      {
-         ch &= 0x03;
-         cnt = 4;
-      }
-      else if ((ch & 0xFE) == 0xFC)    // 6-byte sequence
-      {
-         ch &= 0x01;
-         cnt = 5;
-      }
-      else
-      {
-         // invalid UTF-8 sequence
-         return(false);
-      }
-
-      while (  cnt-- > 0
-            && idx < in_data.size())
-      {
-         int tmp = in_data[idx++];
-
-         if ((tmp & 0xC0) != 0x80)
-         {
-            // invalid UTF-8 sequence
-            return(false);
-         }
-         ch = (ch << 6) | (tmp & 0x3f);
-      }
-
-      if (cnt >= 0)
-      {
-         // short UTF-8 sequence
-         return(false);
-      }
-      out_data.push_back(ch);
-   }
-   return(true);
-} // decode_utf8
-
-
-static int get_word(const vector<UINT8> &in_data, size_t &idx, bool be)
-{
-   int ch;
-
-   if ((idx + 2) > in_data.size())
-   {
-      ch = -1;
-   }
-   else if (be)
-   {
-      ch = (in_data[idx] << 8) | in_data[idx + 1];
-   }
-   else
-   {
-      ch = in_data[idx] | (in_data[idx + 1] << 8);
-   }
-   idx += 2;
-   return(ch);
-}
-
-
-static bool decode_utf16(const vector<UINT8> &in_data, deque<int> &out_data, char_encoding_e &enc)
-{
-   out_data.clear();
-
-   if (in_data.size() & 1)
-   {
-      // can't have and odd length
-      return(false);
-   }
-
-   if (in_data.size() < 2)
-   {
-      // we require the BOM or at least 1 char
-      return(false);
-   }
-   size_t idx = 2;
-
-   if (  (in_data[0] == 0xfe)
-      && (in_data[1] == 0xff))
-   {
-      enc = char_encoding_e::e_UTF16_BE;
-   }
-   else if (  (in_data[0] == 0xff)
-           && (in_data[1] == 0xfe))
-   {
-      enc = char_encoding_e::e_UTF16_LE;
-   }
-   else
-   {
-      /*
-       * If we have a few words, we can take a guess, assuming the first few
-       * chars are ASCII
-       */
-      enc = char_encoding_e::e_ASCII;
-      idx = 0;
-
-      if (in_data.size() >= 6)
-      {
-         if (  (in_data[0] == 0)
-            && (in_data[2] == 0)
-            && (in_data[4] == 0))
-         {
-            enc = char_encoding_e::e_UTF16_BE;
-         }
-         else if (  (in_data[1] == 0)
-                 && (in_data[3] == 0)
-                 && (in_data[5] == 0))
-         {
-            enc = char_encoding_e::e_UTF16_LE;
-         }
-      }
-
-      if (enc == char_encoding_e::e_ASCII)
-      {
-         return(false);
-      }
-   }
-   bool be = (enc == char_encoding_e::e_UTF16_BE);
-
-   while (idx < in_data.size())
-   {
-      int ch = get_word(in_data, idx, be);
-
-      if ((ch & 0xfc00) == 0xd800)
-      {
-         ch  &= 0x3ff;
-         ch <<= 10;
-         int tmp = get_word(in_data, idx, be);
-
-         if ((tmp & 0xfc00) != 0xdc00)
-         {
-            return(false);
-         }
-         ch |= (tmp & 0x3ff);
-         ch += 0x10000;
-         out_data.push_back(ch);
-      }
-      else if (  (  ch >= 0
-                 && ch < 0xD800)
-              || ch >= 0xE000)
-      {
-         out_data.push_back(ch);
-      }
-      else
-      {
-         // invalid character
-         return(false);
-      }
-   }
-   return(true);
-} // decode_utf16
-
-
-static bool decode_bom(const vector<UINT8> &in_data, char_encoding_e &enc)
-{
-   enc = char_encoding_e::e_ASCII;
-
-   if (in_data.size() >= 2)
-   {
-      if (  (in_data[0] == 0xfe)
-         && (in_data[1] == 0xff))
-      {
-         enc = char_encoding_e::e_UTF16_BE;
-         return(true);
-      }
-
-      if (  (in_data[0] == 0xff)
-         && (in_data[1] == 0xfe))
-      {
-         enc = char_encoding_e::e_UTF16_LE;
-         return(true);
-      }
-
-      if (  (in_data.size() >= 3)
-         && (in_data[0] == 0xef)
-         && (in_data[1] == 0xbb)
-         && (in_data[2] == 0xbf))
-      {
-         enc = char_encoding_e::e_UTF8;
-         return(true);
-      }
-   }
-   return(false);
-}
-
-
-bool decode_unicode(const vector<UINT8> &in_data, deque<int> &out_data, char_encoding_e &enc, bool &has_bom)
-{
-   // check for a BOM
-   if (decode_bom(in_data, enc))
-   {
-      has_bom = true;
-
-      if (enc == char_encoding_e::e_UTF8)
-      {
-         return(decode_utf8(in_data, out_data));
-      }
-      return(decode_utf16(in_data, out_data, enc));
-   }
-   has_bom = false;
-
-   // Check for simple ASCII
-   size_t non_ascii_cnt;
-   size_t zero_cnt;
-
-   if (is_ascii(in_data, non_ascii_cnt, zero_cnt))
-   {
-      enc = char_encoding_e::e_ASCII;
-      return(decode_bytes(in_data, out_data));
-   }
-
-   // There are a lot of 0's in UTF-16 (~50%)
-   if (  (zero_cnt > (in_data.size() / 4))
-      && (zero_cnt <= (in_data.size() / 2)))
-   {
-      // likely is UTF-16
-      if (decode_utf16(in_data, out_data, enc))
-      {
-         return(true);
-      }
-   }
-
-   if (decode_utf8(in_data, out_data))
-   {
-      enc = char_encoding_e::e_UTF8;
-      return(true);
-   }
-   // it is an unrecognized byte sequence
-   enc = char_encoding_e::e_BYTE;
-   return(decode_bytes(in_data, out_data));
-} // decode_unicode
-
-
-static void write_byte(int ch)
-{
-   if ((ch & 0xff) == ch)
-   {
-      if (cpd.fout)
-      {
-         fputc(ch, cpd.fout);
-      }
-
-      if (cpd.bout)
-      {
-         cpd.bout->push_back(static_cast<UINT8>(ch));
-      }
-   }
-   else
-   {
-      // illegal code - do not store
-   }
-}
-
-
-static void write_utf8(int ch)
-{
-   vector<UINT8> vv;
-
-   vv.reserve(6);
-
-   encode_utf8(ch, vv);
-
-   for (unsigned char char_val : vv)
-   {
-      write_byte(char_val);
-   }
-}
-
-
-static void write_utf16(int ch, bool be)
-{
-   // U+0000 to U+D7FF and U+E000 to U+FFFF
-   if (  (  ch >= 0
-         && ch < 0xD800)
-      || (  ch >= 0xE000
-         && ch < 0x10000))
-   {
-      if (be)
-      {
-         write_byte(ch >> 8);
-         write_byte(ch & 0xff);
-      }
-      else
-      {
-         write_byte(ch & 0xff);
-         write_byte(ch >> 8);
-      }
-   }
-   else if (  ch >= 0x10000
-           && ch < 0x110000)
-   {
-      int v1 = ch - 0x10000;
-      int w1 = 0xD800 + (v1 >> 10);
-      int w2 = 0xDC00 + (v1 & 0x3ff);
-
-      if (be)
-      {
-         write_byte(w1 >> 8);
-         write_byte(w1 & 0xff);
-         write_byte(w2 >> 8);
-         write_byte(w2 & 0xff);
-      }
-      else
-      {
-         write_byte(w1 & 0xff);
-         write_byte(w1 >> 8);
-         write_byte(w2 & 0xff);
-         write_byte(w2 >> 8);
-      }
-   }
-   else
-   {
-      // illegal code - do not store
-   }
-} // write_utf16
-
-
-void write_bom(void)
-{
-   switch (cpd.enc)
-   {
-   case char_encoding_e::e_UTF8:
-      write_byte(0xef);
-      write_byte(0xbb);
-      write_byte(0xbf);
-      break;
-
-   case char_encoding_e::e_UTF16_LE:
-      write_utf16(0xfeff, false);
-      break;
-
-   case char_encoding_e::e_UTF16_BE:
-      write_utf16(0xfeff, true);
-      break;
-
-   default:
-      // char_encoding_e::e_ASCII
-      // char_encoding_e::e_BYTE
-      // do nothing
-      // Coveralls will complain
-      break;
-   }
-}
-
-
-void write_char(int ch)
-{
-   if (ch >= 0)
-   {
-      switch (cpd.enc)
-      {
-      case char_encoding_e::e_BYTE:
-         write_byte(ch & 0xff);
-         break;
-
-      case char_encoding_e::e_ASCII:
-      default:
-         write_byte(ch);
-         break;
-
-      case char_encoding_e::e_UTF8:
-         write_utf8(ch);
-         break;
-
-      case char_encoding_e::e_UTF16_LE:
-         write_utf16(ch, false);
-         break;
-
-      case char_encoding_e::e_UTF16_BE:
-         write_utf16(ch, true);
-         break;
-      }
-   }
-}
-
-
-void write_string(const unc_text &text)
-{
-   for (size_t idx = 0; idx < text.size(); idx++)
-   {
-      write_char(text[idx]);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.h
deleted file mode 100644
index e9cbd97c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file unicode.h
- * prototypes for unicode.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef UNICODE_H_INCLUDED
-#define UNICODE_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-void write_bom(void);
-
-
-/**
- * @param ch the 31-bit char value
- */
-void write_char(int ch);
-
-
-void write_string(const unc_text &text);
-
-
-//! Figure out the encoding and convert to an int sequence
-bool decode_unicode(const std::vector<UINT8> &in_data, std::deque<int> &out_data, char_encoding_e &enc, bool &has_bom);
-
-
-void encode_utf8(int ch, std::vector<UINT8> &res);
-
-
-#endif /* UNICODE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.cpp
deleted file mode 100644
index eff612be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/**
- * @file universalindentgui.cpp
- * Exports the config file for UniversalIndentGUI
- *
- * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
- * @license GPL v2+
- */
-#include "universalindentgui.h"
-
-#include "error_types.h"
-#include "log_rules.h"
-#include "prototypes.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_version.h"
-
-#include <cstdio>
-#include <vector>
-
-
-constexpr static auto LCURRENT = LOTHER;
-
-using namespace std;
-
-
-std::vector<uncrustify::OptionGroup *> get_option_groups()
-{
-   std::vector<uncrustify::OptionGroup *> groups;
-   size_t                                 i = 0;
-
-   while (auto *const g = uncrustify::get_option_group(i))
-   {
-      groups.push_back(g);
-      ++i;
-   }
-   return(groups);
-}
-
-
-void print_option_choices(FILE *pfile, uncrustify::GenericOption *option,
-                          char const *key = "Choices")
-{
-   fprintf(pfile, "%s=", key);
-
-   for (auto c = option->possibleValues(); *c; ++c)
-   {
-      fprintf(pfile, "%s=%s%c", option->name(), *c, c[1] ? '|' : '\n');
-   }
-}
-
-
-void print_universal_indent_cfg(FILE *pfile)
-{
-   const char *p_name;
-   char       ch      = '=';
-   const auto &groups = get_option_groups();
-   size_t     idx;
-
-#if defined (DEBUG) && !defined (WIN32)
-   vector<size_t> allGroups;
-   allGroups.reserve(16);
-   // first run to get the first option number of each group/categorie
-   size_t optionNumber         = 0;
-   bool   firstOptionNumberSet = false;
-
-   for (idx = 0; idx < groups.size(); ++idx)
-   {
-      const auto *p_grp = groups[idx];
-
-      for (auto *const option : p_grp->options)
-      {
-         UNUSED(option);
-
-         if (!firstOptionNumberSet)
-         {
-            allGroups[idx]       = optionNumber;
-            firstOptionNumberSet = true;
-         }
-         optionNumber++;
-      } // for (auto *const option : p_grp->options)
-
-      firstOptionNumberSet = false;
-   } // end of first run
-
-//#else
-//   UNUSED(allGroups);
-#endif // DEBUG
-
-   // second run
-   // Dump the header and the categories
-   fprintf(pfile, "[header]\n");
-
-   // Add all the categories
-   //const auto &groups = get_option_groups();
-   ch = '=';
-
-   fprintf(pfile, "categories");
-   idx = 0;
-#if defined (DEBUG) && !defined (WIN32)
-   optionNumber = 0;
-#endif // DEBUG
-
-   for (auto *const g : groups)
-   {
-      fputc(ch, pfile);
-      ch = '|';
-
-#if defined (DEBUG) && !defined (WIN32)
-      fprintf(pfile, "(%zu)", allGroups[idx]);
-#endif // DEBUG
-
-      // Write description, stripping leading and trailing newlines
-      for (auto dc = g->description + 1; *(dc + 1); ++dc)
-      {
-         fputc(*dc, pfile);
-      }
-
-      idx++;
-   }
-
-   fprintf(pfile, "\n");
-
-   fprintf(pfile,
-           "cfgFileParameterEnding=cr\n"
-           "configFilename=uncrustify.cfg\n");
-
-
-   // Add all the recognized file extensions
-   ch = '=';
-   int fileIdx = 0;
-   fprintf(pfile, "fileTypes");
-
-   while ((p_name = get_file_extension(fileIdx)) != nullptr)
-   {
-      fprintf(pfile, "%c*%s", ch, p_name);
-      ch = '|';
-   }
-   fprintf(pfile, "\n");
-
-   // Add the rest of the constant file header
-   fprintf(pfile,
-           "indenterFileName=uncrustify\n"
-           "indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)\n"
-           "inputFileName=indentinput\n"
-           "inputFileParameter=\"-f \"\n"
-           "manual=http://uncrustify.sourceforge.net/config.txt\n"
-           "outputFileName=indentoutput\n"
-           "outputFileParameter=\"-o \"\n"
-           "stringparaminquotes=false\n"
-           "parameterOrder=ipo\n"
-           "showHelpParameter=-h\n"
-           "stringparaminquotes=false\n"
-           "useCfgFileParameter=\"-c \"\n");
-
-   fprintf(pfile, "version=%s\n", UNCRUSTIFY_VERSION);
-
-   ch = '=';
-
-   // Now add each option
-   for (idx = 0; idx < groups.size(); ++idx)
-   {
-      const auto *p_grp = groups[idx];
-
-      for (auto *const option : p_grp->options)
-      {
-         /*
-          * Create a better readable name from the options name
-          * by replacing '_' by a space and use some upper case characters.
-          */
-         char *optionNameReadable = new char[strlen(option->name()) + 1];
-         strcpy(optionNameReadable, option->name());
-
-         bool was_space = true;
-
-         for (char *character = optionNameReadable; *character != 0; character++)
-         {
-            if (*character == '_')
-            {
-               *character = ' ';
-               was_space  = true;
-            }
-            else if (was_space)
-            {
-               *character = unc_toupper(*character);
-               was_space  = false;
-            }
-         }
-
-         fprintf(pfile, "\n[%s]\n", optionNameReadable);
-         fprintf(pfile, "Category=%zu\n", idx);
-#if defined (DEBUG) && !defined (WIN32)
-         fprintf(pfile, "Description=\"<html>(%zu)", optionNumber);
-#else // DEBUG
-         fprintf(pfile, "Description=\"<html>");
-#endif // DEBUG
-
-         // Skip first character, which is always a newline
-         const char *tmp = option->description() + 1;
-         ch = 0;
-
-         // Output the description which may contain forbidden chars, skipping
-         // the last character which is always an extra newline
-         while (  *tmp != 0
-               && *(tmp + 1) != 0)
-         {
-            switch (*tmp)
-            {
-            case '<':
-               fputs("&lt;", pfile);
-               break;
-
-            case '>':
-               fputs("&gt;", pfile);
-               break;
-
-            case '&':
-               fputs("&amp;", pfile);
-               break;
-
-            case '\n':
-               fputs("<br/>", pfile);
-               break;
-
-            default:
-               fputc(*tmp, pfile);
-            }
-            tmp++;
-         }
-         const auto ds = option->defaultStr();
-
-         if (!ds.empty())
-         {
-            fprintf(pfile, "<br/><br/>Default: %s", ds.c_str());
-         }
-         fprintf(pfile, "</html>\"\n");
-
-         // Handle some options independent of their type and most by their type.
-         log_rule_B("indent_with_tabs");
-
-         if (option == &uncrustify::options::indent_with_tabs)
-         {
-            // Indenting with tabs selector becomes a multiple selector and not
-            // only a number. Also it is by default enabled.
-            fprintf(pfile, "Enabled=true\n");
-            fprintf(pfile, "EditorType=multiple\n");
-            fprintf(pfile, "Choices=\"%s=0|%s=1|%s=2\"\n",
-                    option->name(), option->name(), option->name());
-#if defined (DEBUG) && !defined (WIN32)
-            fprintf(pfile, "ChoicesReadable=\"(%zu)Spaces only|(%zu)Indent with tabs, align with spaces|(%zu)Indent and align with tabs\"\n",
-                    optionNumber, optionNumber, optionNumber);
-#else // DEBUG
-            fprintf(pfile, "ChoicesReadable=\"Spaces only|Indent with tabs, align with spaces|Indent and align with tabs\"\n");
-#endif // DEBUG
-            fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-         }
-         else
-         {
-            // All not specially handled options are created only dependent by
-            // their type.
-            fprintf(pfile, "Enabled=false\n");
-
-            switch (option->type())
-            {
-            case uncrustify::OT_BOOL:
-               fprintf(pfile, "EditorType=boolean\n");
-               print_option_choices(pfile, option, "TrueFalse");
-               fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-               break;
-
-            case uncrustify::OT_IARF:
-               fprintf(pfile, "EditorType=multiple\n");
-               print_option_choices(pfile, option);
-#if defined (DEBUG) && !defined (WIN32)
-               fprintf(pfile, "ChoicesReadable=\"(%zu)Ignore %s|(%zu)Add %s|(%zu)Remove %s|(%zu)Force %s\"\n",
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable);
-#else // DEBUG
-               //                                0         1      2         3
-               fprintf(pfile, "ChoicesReadable=\"Ignore %s|Add %s|Remove %s|Force %s\"\n",
-                       optionNameReadable, optionNameReadable, optionNameReadable, optionNameReadable);
-#endif // DEBUG
-               fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-               break;
-
-            case uncrustify::OT_NUM:
-               fprintf(pfile, "EditorType=numeric\n");
-               fprintf(pfile, "CallName=\"%s=\"\n", option->name());
-               fprintf(pfile, "MinVal=%s\n", option->minStr().c_str());
-               fprintf(pfile, "MaxVal=%s\n", option->maxStr().c_str());
-               fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-               break;
-
-            case uncrustify::OT_UNUM:
-               fprintf(pfile, "EditorType=numeric\n");
-               fprintf(pfile, "CallName=\"%s=\"\n", option->name());
-               fprintf(pfile, "MinVal=%s\n", option->minStr().c_str());
-               fprintf(pfile, "MaxVal=%s\n", option->maxStr().c_str());
-               fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-               break;
-
-            case uncrustify::OT_LINEEND:
-               fprintf(pfile, "EditorType=multiple\n");
-               print_option_choices(pfile, option);
-#if defined (DEBUG) && !defined (WIN32)
-               fprintf(pfile, "ChoicesReadable=\"(%zu)Newlines Unix|(%zu)Newlines Win|(%zu)Newlines Mac|(%zu)Newlines Auto\"\n",
-                       optionNumber, optionNumber, optionNumber, optionNumber);
-#else // DEBUG
-               fprintf(pfile, "ChoicesReadable=\"Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto\"\n");
-#endif // DEBUG
-               fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-               break;
-
-            case uncrustify::OT_TOKENPOS:
-               fprintf(pfile, "EditorType=multiple\n");
-               // Issue #2300-a
-               print_option_choices(pfile, option);
-#if defined (DEBUG) && !defined (WIN32)
-               fprintf(pfile, "ChoicesReadable=\"(%zu)Ignore %s|(%zu)Break %s|(%zu)Force %s|(%zu)Lead %s|(%zu)Trail %s|",
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable);
-#else // DEBUG
-               //                                0         1        2        4       8
-               fprintf(pfile, "ChoicesReadable=\"Ignore %s|Break %s|Force %s|Lead %s|Trail %s|",
-                       optionNameReadable, optionNameReadable, optionNameReadable,
-                       optionNameReadable, optionNameReadable);
-#endif // DEBUG
-               //                                16      5             6             9              10
-#if defined (DEBUG) && !defined (WIN32)
-               fprintf(pfile, "(%zu)Join %s|(%zu)Lead Break %s|(%zu)Lead Force %s|(%zu)Trail Break %s|(%zu)Trail Force %s\"\n",
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable,
-                       optionNumber, optionNameReadable);
-#else // DEBUG
-               fprintf(pfile, "Join %s|Lead Break %s|Lead Force %s|Trail Break %s|Trail Force %s\"\n",
-                       optionNameReadable, optionNameReadable, optionNameReadable,
-                       optionNameReadable, optionNameReadable);
-#endif // DEBUG
-               fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-               break;
-
-            case uncrustify::OT_STRING:
-            {
-               fprintf(pfile, "CallName=%s=\n", option->name());
-               fprintf(pfile, "EditorType=string\n");
-               fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
-               break;
-            }
-
-            default:
-               fprintf(stderr, "FATAL: Illegal option type %d for '%s'\n",
-                       static_cast<int>(option->type()), option->name());
-               log_flush(true);
-               exit(EX_SOFTWARE);
-               break;
-            } // switch
-         }
-#if defined (DEBUG) && !defined (WIN32)
-         optionNumber++;
-#endif // DEBUG
-         delete[] optionNameReadable;
-      } // for (auto *const option : p_grp->options)
-   }
-} // print_universal_indent_cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.h
deleted file mode 100644
index 35a65167..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @file universalindentgui.h
- * prototypes for universalindentgui.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef UNIVERSALINDENTGUI_H_INCLUDED
-#define UNIVERSALINDENTGUI_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-void print_universal_indent_cfg(FILE *pfile);
-
-
-#endif /* UNIVERSALINDENTGUI_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.cpp
deleted file mode 100644
index c5ed4b2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.cpp
+++ /dev/null
@@ -1,916 +0,0 @@
-/**
- * @file width.cpp
- * Limits line width.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "width.h"
-
-#include "indent.h"
-#include "newlines.h"
-#include "prototypes.h"
-
-
-constexpr static auto LCURRENT = LSPLIT;
-
-using namespace uncrustify;
-
-
-/**
- * abbreviations used:
- * - fparen = function parenthesis
- */
-
-struct cw_entry
-{
-   chunk_t *pc;
-   size_t  pri;
-};
-
-
-struct token_pri
-{
-   c_token_t tok;
-   size_t    pri;
-};
-
-
-static inline bool is_past_width(chunk_t *pc);
-
-
-//! Split right after the chunk
-static void split_before_chunk(chunk_t *pc);
-
-
-static size_t get_split_pri(c_token_t tok);
-
-
-/**
- * Checks to see if pc is a better spot to split.
- * This should only be called going BACKWARDS (ie prev)
- * A lower level wins
- *
- * Splitting Preference:
- *  - semicolon
- *  - comma
- *  - boolean op
- *  - comparison
- *  - arithmetic op
- *  - assignment
- *  - concatenated strings
- *  - ? :
- *  - function open paren not followed by close paren
- */
-static void try_split_here(cw_entry &ent, chunk_t *pc);
-
-
-/**
- * Scan backwards to find the most appropriate spot to split the line
- * and insert a newline.
- *
- * See if this needs special function handling.
- * Scan backwards and find the best token for the split.
- *
- * @param start The first chunk that exceeded the limit
- */
-static bool split_line(chunk_t *pc);
-
-
-/**
- * Figures out where to split a function def/proto/call
- *
- * For function prototypes and definition. Also function calls where
- * level == brace_level:
- *   - find the open function parenthesis
- *     + if it doesn't have a newline right after it
- *       * see if all parameters will fit individually after the paren
- *       * if not, throw a newline after the open paren & return
- *   - scan backwards to the open fparen or comma
- *     + if there isn't a newline after that item, add one & return
- *     + otherwise, add a newline before the start token
- *
- * @param start   the offending token
- * @return        the token that should have a newline
- *                inserted before it
- */
-static void split_fcn_params(chunk_t *start);
-
-
-/**
- * Figures out where to split a template
- *
- *
- * @param start   the offending token
- */
-static void split_template(chunk_t *start);
-
-
-/**
- * Splits the parameters at every comma that is at the fparen level.
- *
- * @param start   the offending token
- */
-static void split_fcn_params_full(chunk_t *start);
-
-
-/**
- * A for statement is too long.
- * Step backwards and forwards to find the semicolons
- * Try splitting at the semicolons first.
- * If that doesn't work, then look for a comma at paren level.
- * If that doesn't work, then look for an assignment at paren level.
- * If that doesn't work, then give up.
- */
-static void split_for_stmt(chunk_t *start);
-
-
-static inline bool is_past_width(chunk_t *pc)
-{
-   // allow char to sit at last column by subtracting 1
-   LOG_FMT(LSPLIT, "%s(%d): orig_line is %zu, orig_col is %zu, for %s\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-   log_rule_B("code_width");
-   return((pc->column + pc->len() - 1) > options::code_width());
-}
-
-
-static void split_before_chunk(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): text() '%s'\n", __func__, __LINE__, pc->text());
-
-   if (  !chunk_is_newline(pc)
-      && !chunk_is_newline(chunk_get_prev(pc)))
-   {
-      newline_add_before(pc);
-      // reindent needs to include the indent_continue value and was off by one
-      log_rule_B("indent_columns");
-      log_rule_B("indent_continue");
-      reindent_line(pc, pc->brace_level * options::indent_columns() +
-                    abs(options::indent_continue()) + 1);
-      cpd.changes++;
-   }
-}
-
-
-void do_code_width(void)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d)\n", __func__, __LINE__);
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      if (  !chunk_is_newline(pc)
-         && !chunk_is_comment(pc)
-         && chunk_is_not_token(pc, CT_SPACE)
-         && is_past_width(pc))
-      {
-         if (  chunk_is_token(pc, CT_VBRACE_CLOSE) // don't break if a vbrace close
-            && chunk_is_last_on_line(*pc))         // is the last chunk on its line
-         {
-            continue;
-         }
-         bool split_OK = split_line(pc);
-
-         if (split_OK)
-         {
-            LOG_FMT(LSPLIT, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         }
-         else
-         {
-            LOG_FMT(LSPLIT, "%s(%d): Bailed! orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-            break;
-         }
-      }
-   }
-}
-
-
-static const token_pri pri_table[] =
-{
-   { CT_SEMICOLON,    1 },
-   { CT_COMMA,        2 },
-   { CT_BOOL,         3 },
-   { CT_COMPARE,      4 },
-   { CT_SHIFT,        5 },
-   { CT_ARITH,        6 },
-   { CT_CARET,        7 },
-   { CT_ASSIGN,       8 },
-   { CT_STRING,       9 },
-   { CT_FOR_COLON,   10 },
-   //{ CT_DC_MEMBER, 11 },
-   //{ CT_MEMBER,    11 },
-   { CT_QUESTION,    20 }, // allow break in ? : for ls_code_width
-   { CT_COND_COLON,  20 },
-   { CT_FPAREN_OPEN, 21 }, // break after function open paren not followed by close paren
-   { CT_QUALIFIER,   25 },
-   { CT_CLASS,       25 },
-   { CT_STRUCT,      25 },
-   { CT_TYPE,        25 },
-   { CT_TYPENAME,    25 },
-   { CT_VOLATILE,    25 },
-};
-
-
-static size_t get_split_pri(c_token_t tok)
-{
-   for (auto token : pri_table)
-   {
-      if (token.tok == tok)
-      {
-         return(token.pri);
-      }
-   }
-
-   return(0);
-}
-
-
-static void try_split_here(cw_entry &ent, chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LSPLIT, "%s(%d): at %s, orig_col=%zu\n", __func__, __LINE__, pc->text(), pc->orig_col);
-   size_t pc_pri = get_split_pri(pc->type);
-
-   LOG_FMT(LSPLIT, "%s(%d): pc_pri is %zu\n", __func__, __LINE__, pc_pri);
-
-   if (pc_pri == 0)
-   {
-      LOG_FMT(LSPLIT, "%s(%d): pc_pri is 0, return\n", __func__, __LINE__);
-      return;
-   }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-   // Can't split after a newline
-   chunk_t *prev = chunk_get_prev(pc);
-
-   if (  prev == nullptr
-      || (  chunk_is_newline(prev)
-         && chunk_is_not_token(pc, CT_STRING)))
-   {
-      if (prev != nullptr)
-      {
-         LOG_FMT(LSPLIT, "%s(%d): Can't split after a newline, orig_line is %zu, return\n",
-                 __func__, __LINE__, prev->orig_line);
-      }
-      return;
-   }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-
-   // Can't split a function without arguments
-   if (chunk_is_token(pc, CT_FPAREN_OPEN))
-   {
-      chunk_t *next = chunk_get_next(pc);
-
-      if (chunk_is_token(next, CT_FPAREN_CLOSE))
-      {
-         LOG_FMT(LSPLIT, "%s(%d): Can't split a function without arguments, return\n", __func__, __LINE__);
-         return;
-      }
-   }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-
-   // Only split concatenated strings
-   if (chunk_is_token(pc, CT_STRING))
-   {
-      chunk_t *next = chunk_get_next(pc);
-
-      if (chunk_is_not_token(next, CT_STRING))
-      {
-         LOG_FMT(LSPLIT, "%s(%d): Only split concatenated strings, return\n", __func__, __LINE__);
-         return;
-      }
-   }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-
-   // keep common groupings unless ls_code_width
-   log_rule_B("ls_code_width");
-
-   if (  !options::ls_code_width()
-      && pc_pri >= 20)
-   {
-      LOG_FMT(LSPLIT, "%s(%d): keep common groupings unless ls_code_width, return\n", __func__, __LINE__);
-      return;
-   }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-
-   // don't break after last term of a qualified type
-   if (pc_pri == 25)
-   {
-      chunk_t *next = chunk_get_next(pc);
-
-      if (  chunk_is_not_token(next, CT_WORD)
-         && (get_split_pri(next->type) != 25))
-      {
-         LOG_FMT(LSPLIT, "%s(%d): don't break after last term of a qualified type, return\n", __func__, __LINE__);
-         return;
-      }
-   }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-   // Check levels first
-   bool change = false;
-
-   if (  ent.pc == nullptr
-      || pc->level < ent.pc->level)
-   {
-      LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-      change = true;
-   }
-   else
-   {
-      if (  pc->level >= ent.pc->level
-         && pc_pri < ent.pri)
-      {
-         LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-         change = true;
-      }
-   }
-   LOG_FMT(LSPLIT, "%s(%d): change is %s\n", __func__, __LINE__, change ? "TRUE" : "FALSE");
-
-   if (change)
-   {
-      LOG_FMT(LSPLIT, "%s(%d): do the change\n", __func__, __LINE__);
-      ent.pc  = pc;
-      ent.pri = pc_pri;
-   }
-} // try_split_here
-
-
-static bool split_line(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): start->text() '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->orig_col, get_token_name(start->type));
-   LOG_FMT(LSPLIT, "   start->flags ");
-   log_pcf_flags(LSPLIT, start->flags);
-   LOG_FMT(LSPLIT, "   start->parent_type %s, (PCF_IN_FCN_DEF is %s), (PCF_IN_FCN_CALL is %s)\n",
-           get_token_name(get_chunk_parent_type(start)),
-           start->flags.test((PCF_IN_FCN_DEF)) ? "TRUE" : "FALSE",
-           start->flags.test((PCF_IN_FCN_CALL)) ? "TRUE" : "FALSE");
-
-   // break at maximum line length if ls_code_width is true
-   // Issue #2432
-   if (start->flags.test(PCF_ONE_LINER))
-   {
-      LOG_FMT(LSPLIT, "%s(%d): ** ONCE LINER SPLIT **\n", __func__, __LINE__);
-      undo_one_liner(start);
-      newlines_cleanup_braces(false);
-      // Issue #1352
-      cpd.changes++;
-      return(false);
-   }
-   LOG_FMT(LSPLIT, "%s(%d): before ls_code_width\n", __func__, __LINE__);
-
-   log_rule_B("ls_code_width");
-
-   if (options::ls_code_width())
-   {
-   }
-   // Check to see if we are in a for statement
-   else if (start->flags.test(PCF_IN_FOR))
-   {
-      LOG_FMT(LSPLIT, " ** FOR SPLIT **\n");
-      split_for_stmt(start);
-
-      if (!is_past_width(start))
-      {
-         return(true);
-      }
-      LOG_FMT(LSPLIT, "%s(%d): for split didn't work\n", __func__, __LINE__);
-   }
-
-   /*
-    * If this is in a function call or prototype, split on commas or right
-    * after the open parenthesis
-    */
-   else if (  start->flags.test(PCF_IN_FCN_DEF)
-           || get_chunk_parent_type(start) == CT_FUNC_PROTO            // Issue #1169
-           || (  (start->level == (start->brace_level + 1))
-              && start->flags.test(PCF_IN_FCN_CALL)))
-   {
-      LOG_FMT(LSPLIT, " ** FUNC SPLIT **\n");
-
-      log_rule_B("ls_func_split_full");
-
-      if (options::ls_func_split_full())
-      {
-         split_fcn_params_full(start);
-
-         if (!is_past_width(start))
-         {
-            return(true);
-         }
-      }
-      split_fcn_params(start);
-      return(true);
-   }
-
-   /*
-    * If this is in a template, split on commas, Issue #1170
-    */
-   else if (start->flags.test(PCF_IN_TEMPLATE))
-   {
-      LOG_FMT(LSPLIT, " ** TEMPLATE SPLIT **\n");
-      split_template(start);
-      return(true);
-   }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-   // Try to find the best spot to split the line
-   cw_entry ent;
-
-   memset(&ent, 0, sizeof(ent));
-   chunk_t *pc = start;
-   chunk_t *prev;
-
-   while (  ((pc = chunk_get_prev(pc)) != nullptr)
-         && !chunk_is_newline(pc))
-   {
-      LOG_FMT(LSPLIT, "%s(%d): at %s, orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-
-      if (chunk_is_not_token(pc, CT_SPACE))
-      {
-         try_split_here(ent, pc);
-
-         // break at maximum line length
-         log_rule_B("ls_code_width");
-
-         if (  ent.pc != nullptr
-            && (options::ls_code_width()))
-         {
-            break;
-         }
-      }
-   }
-
-   if (ent.pc == nullptr)
-   {
-      LOG_FMT(LSPLIT, "%s(%d):    TRY_SPLIT yielded NO SOLUTION for orig_line %zu at '%s' [%s]\n",
-              __func__, __LINE__, start->orig_line, start->text(), get_token_name(start->type));
-   }
-   else
-   {
-      LOG_FMT(LSPLIT, "%s(%d):    TRY_SPLIT yielded '%s' [%s] on orig_line %zu\n",
-              __func__, __LINE__, ent.pc->text(), get_token_name(ent.pc->type), ent.pc->orig_line);
-      LOG_FMT(LSPLIT, "%s(%d): ent at '%s', orig_col is %zu\n",
-              __func__, __LINE__, ent.pc->text(), ent.pc->orig_col);
-   }
-
-   // Break before the token instead of after it according to the pos_xxx rules
-   if (ent.pc == nullptr)
-   {
-      pc = nullptr;
-   }
-   else
-   {
-      log_rule_B("pos_arith");
-      log_rule_B("pos_assign");
-      log_rule_B("pos_compare");
-      log_rule_B("pos_conditional");
-      log_rule_B("pos_shift");
-      log_rule_B("pos_bool");
-
-      if (  (  chunk_is_token(ent.pc, CT_SHIFT)
-            && (options::pos_shift() & TP_LEAD))
-         || (  (  chunk_is_token(ent.pc, CT_ARITH)
-               || chunk_is_token(ent.pc, CT_CARET))
-            && (options::pos_arith() & TP_LEAD))
-         || (  chunk_is_token(ent.pc, CT_ASSIGN)
-            && (options::pos_assign() & TP_LEAD))
-         || (  chunk_is_token(ent.pc, CT_COMPARE)
-            && (options::pos_compare() & TP_LEAD))
-         || (  (  chunk_is_token(ent.pc, CT_COND_COLON)
-               || chunk_is_token(ent.pc, CT_QUESTION))
-            && (options::pos_conditional() & TP_LEAD))
-         || (  chunk_is_token(ent.pc, CT_BOOL)
-            && (options::pos_bool() & TP_LEAD)))
-      {
-         pc = ent.pc;
-      }
-      else
-      {
-         pc = chunk_get_next(ent.pc);
-      }
-      LOG_FMT(LSPLIT, "%s(%d): at '%s', orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_col);
-   }
-
-   if (pc == nullptr)
-   {
-      pc = start;
-
-      // Don't break before a close, comma, or colon
-      if (  chunk_is_token(start, CT_PAREN_CLOSE)
-         || chunk_is_token(start, CT_PAREN_OPEN)
-         || chunk_is_token(start, CT_FPAREN_CLOSE)
-         || chunk_is_token(start, CT_FPAREN_OPEN)
-         || chunk_is_token(start, CT_SPAREN_CLOSE)
-         || chunk_is_token(start, CT_SPAREN_OPEN)
-         || chunk_is_token(start, CT_ANGLE_CLOSE)
-         || chunk_is_token(start, CT_BRACE_CLOSE)
-         || chunk_is_token(start, CT_COMMA)
-         || chunk_is_token(start, CT_SEMICOLON)
-         || chunk_is_token(start, CT_VSEMICOLON)
-         || start->len() == 0)
-      {
-         LOG_FMT(LSPLIT, " ** NO GO **\n");
-
-         // TODO: Add in logic to handle 'hard' limits by backing up a token
-         return(true);
-      }
-   }
-   // add a newline before pc
-   prev = chunk_get_prev(pc);
-
-   if (  prev != nullptr
-      && !chunk_is_newline(pc)
-      && !chunk_is_newline(prev))
-   {
-      //int plen = (pc->len() < 5) ? pc->len() : 5;
-      //int slen = (start->len() < 5) ? start->len() : 5;
-      //LOG_FMT(LSPLIT, " '%.*s' [%s], started on token '%.*s' [%s]\n",
-      //        plen, pc->text(), get_token_name(pc->type),
-      //        slen, start->text(), get_token_name(start->type));
-      LOG_FMT(LSPLIT, "%s(%d): text() '%s', type %s, started on token '%s', type %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type),
-              start->text(), get_token_name(start->type));
-
-      split_before_chunk(pc);
-   }
-   return(true);
-} // split_line
-
-
-/*
- * The for statement split algorithm works as follows:
- *   1. Step backwards and forwards to find the semicolons
- *   2. Try splitting at the semicolons first.
- *   3. If that doesn't work, then look for a comma at paren level.
- *   4. If that doesn't work, then look for an assignment at paren level.
- *   5. If that doesn't work, then give up.
- */
-static void split_for_stmt(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   // how many semicolons (1 or 2) do we need to find
-   log_rule_B("ls_for_split_full");
-   size_t  max_cnt     = options::ls_for_split_full() ? 2 : 1;
-   chunk_t *open_paren = nullptr;
-   size_t  nl_cnt      = 0;
-
-   LOG_FMT(LSPLIT, "%s: starting on %s, line %zu\n",
-           __func__, start->text(), start->orig_line);
-
-   // Find the open paren so we know the level and count newlines
-   chunk_t *pc = start;
-
-   while ((pc = chunk_get_prev(pc)) != nullptr)
-   {
-      if (chunk_is_token(pc, CT_SPAREN_OPEN))
-      {
-         open_paren = pc;
-         break;
-      }
-
-      if (pc->nl_count > 0)
-      {
-         nl_cnt += pc->nl_count;
-      }
-   }
-
-   if (open_paren == nullptr)
-   {
-      LOG_FMT(LSPLIT, "No open paren\n");
-      return;
-   }
-   // see if we started on the semicolon
-   int     count = 0;
-   chunk_t *st[2];
-
-   pc = start;
-
-   if (  chunk_is_token(pc, CT_SEMICOLON)
-      && get_chunk_parent_type(pc) == CT_FOR)
-   {
-      st[count++] = pc;
-   }
-
-   // first scan backwards for the semicolons
-   while (  (count < static_cast<int>(max_cnt))
-         && ((pc = chunk_get_prev(pc)) != nullptr)
-         && pc->flags.test(PCF_IN_SPAREN))
-   {
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && get_chunk_parent_type(pc) == CT_FOR)
-      {
-         st[count++] = pc;
-      }
-   }
-   // And now scan forward
-   pc = start;
-
-   while (  (count < static_cast<int>(max_cnt))
-         && ((pc = chunk_get_next(pc)) != nullptr)
-         && pc->flags.test(PCF_IN_SPAREN))
-   {
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && get_chunk_parent_type(pc) == CT_FOR)
-      {
-         st[count++] = pc;
-      }
-   }
-
-   while (--count >= 0)
-   {
-      // TODO: st[0] may be uninitialized here
-      LOG_FMT(LSPLIT, "%s(%d): split before %s\n", __func__, __LINE__, st[count]->text());
-      split_before_chunk(chunk_get_next(st[count]));
-   }
-
-   if (  !is_past_width(start)
-      || nl_cnt > 0)
-   {
-      return;
-   }
-   // Still past width, check for commas at parenthese level
-   pc = open_paren;
-
-   while ((pc = chunk_get_next(pc)) != start)
-   {
-      if (  chunk_is_token(pc, CT_COMMA)
-         && (pc->level == (open_paren->level + 1)))
-      {
-         split_before_chunk(chunk_get_next(pc));
-
-         if (!is_past_width(pc))
-         {
-            return;
-         }
-      }
-   }
-   // Still past width, check for a assignments at parenthese level
-   pc = open_paren;
-
-   while ((pc = chunk_get_next(pc)) != start)
-   {
-      if (  chunk_is_token(pc, CT_ASSIGN)
-         && (pc->level == (open_paren->level + 1)))
-      {
-         split_before_chunk(chunk_get_next(pc));
-
-         if (!is_past_width(pc))
-         {
-            return;
-         }
-      }
-   }
-   // Oh, well. We tried.
-} // split_for_stmt
-
-
-static void split_fcn_params_full(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): %s\n", __func__, __LINE__, start->text());
-
-   // Find the opening function parenthesis
-   chunk_t *fpo = start;
-
-   LOG_FMT(LSPLIT, "  %s(%d): Find the opening function parenthesis\n", __func__, __LINE__);
-
-   while ((fpo = chunk_get_prev(fpo)) != nullptr)
-   {
-      LOG_FMT(LSPLIT, "%s(%d): %s, orig_col is %zu, level is %zu\n",
-              __func__, __LINE__, fpo->text(), fpo->orig_col, fpo->level);
-
-      if (  chunk_is_token(fpo, CT_FPAREN_OPEN)
-         && (fpo->level == start->level - 1))
-      {
-         break;  // opening parenthesis found. Issue #1020
-      }
-   }
-   // Now break after every comma
-   chunk_t *pc = fpo;
-
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-   {
-      if (pc->level <= fpo->level)
-      {
-         break;
-      }
-
-      if (  (pc->level == (fpo->level + 1))
-         && chunk_is_token(pc, CT_COMMA))
-      {
-         split_before_chunk(chunk_get_next(pc));
-      }
-   }
-}
-
-
-static void split_fcn_params(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): start->text() is '%s', orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->orig_col);
-   chunk_t *fpo = start;
-
-   if (!chunk_is_token(start, CT_FPAREN_OPEN))
-   {
-      // Find the opening function parenthesis
-      LOG_FMT(LSPLIT, "%s(%d): Find the opening function parenthesis\n", __func__, __LINE__);
-
-      while (  ((fpo = chunk_get_prev(fpo)) != nullptr)
-            && chunk_is_not_token(fpo, CT_FPAREN_OPEN))
-      {
-         // do nothing
-         LOG_FMT(LSPLIT, "%s(%d): '%s', orig_col is %zu, level is %zu\n",
-                 __func__, __LINE__, fpo->text(), fpo->orig_col, fpo->level);
-      }
-   }
-   chunk_t *pc     = chunk_get_next_ncnnl(fpo);
-   size_t  min_col = pc->column;
-
-   log_rule_B("code_width");
-   LOG_FMT(LSPLIT, "    mincol is %zu, max_width is %zu\n",
-           min_col, options::code_width() - min_col);
-
-   int cur_width = 0;
-   int last_col  = -1;
-
-   LOG_FMT(LSPLIT, "%s(%d):look forward until CT_COMMA or CT_FPAREN_CLOSE\n", __func__, __LINE__);
-
-   while (pc != nullptr)
-   {
-      LOG_FMT(LSPLIT, "%s(%d): pc->text() '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
-
-      if (chunk_is_newline(pc))
-      {
-         cur_width = 0;
-         last_col  = -1;
-      }
-      else
-      {
-         if (last_col < 0)
-         {
-            last_col = pc->column;
-            LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
-                    __func__, __LINE__, last_col);
-         }
-         cur_width += (pc->column - last_col) + pc->len();
-         last_col   = pc->column + pc->len();
-
-         LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
-                 __func__, __LINE__, last_col);
-
-         if (  chunk_is_token(pc, CT_COMMA)
-            || chunk_is_token(pc, CT_FPAREN_CLOSE))
-         {
-            if (cur_width == 0)
-            {
-               fprintf(stderr, "%s(%d): cur_width is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            cur_width--;
-            LOG_FMT(LSPLIT, "%s(%d): cur_width is %d\n",
-                    __func__, __LINE__, cur_width);
-
-            log_rule_B("code_width");
-
-            if (  ((last_col - 1) > static_cast<int>(options::code_width()))
-               || chunk_is_token(pc, CT_FPAREN_CLOSE))
-            {
-               break;
-            }
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-   // back up until the prev is a comma
-   chunk_t *prev = pc;
-
-   LOG_FMT(LSPLIT, "%s(%d): back up until the prev is a comma, begin is '%s', level is %zu\n",
-           __func__, __LINE__, prev->text(), prev->level);
-
-   while ((prev = chunk_get_prev(prev)) != nullptr)
-   {
-      LOG_FMT(LSPLIT, "%s(%d): prev->text() is '%s', prev->orig_line is %zu, prev->orig_col is %zu\n",
-              __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col);
-      LOG_FMT(LSPLIT, "%s(%d): prev->level is %zu, prev '%s', prev->type is %s\n",
-              __func__, __LINE__, prev->level, prev->text(), get_token_name(prev->type));
-
-      if (  chunk_is_newline(prev)
-         || chunk_is_token(prev, CT_COMMA))
-      {
-         LOG_FMT(LSPLIT, "%s(%d): found at %zu\n",
-                 __func__, __LINE__, prev->orig_col);
-         break;
-      }
-      LOG_FMT(LSPLIT, "%s(%d): last_col is %d, prev->len() is %zu\n",
-              __func__, __LINE__, last_col, prev->len());
-      last_col -= prev->len();
-      LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
-              __func__, __LINE__, last_col);
-
-      if (chunk_is_token(prev, CT_FPAREN_OPEN))
-      {
-         pc = chunk_get_next(prev);
-
-         log_rule_B("indent_paren_nl");
-
-         if (!options::indent_paren_nl())
-         {
-            log_rule_B("indent_columns");
-            min_col = pc->brace_level * options::indent_columns() + 1;
-            LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
-                    __func__, __LINE__, min_col);
-
-            log_rule_B("indent_continue");
-
-            if (options::indent_continue() == 0)
-            {
-               log_rule_B("indent_columns");
-               min_col += options::indent_columns();
-            }
-            else
-            {
-               min_col += abs(options::indent_continue());
-            }
-            LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
-                    __func__, __LINE__, min_col);
-         }
-
-         // Don't split "()"
-         if (pc->type != c_token_t(prev->type + 1))
-         {
-            break;
-         }
-      }
-   }
-
-   if (  prev != nullptr
-      && !chunk_is_newline(prev))
-   {
-      LOG_FMT(LSPLIT, "%s(%d): -- ended on %s --\n",
-              __func__, __LINE__, get_token_name(prev->type));
-      LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
-              __func__, __LINE__, min_col);
-      pc = chunk_get_next(prev);
-      newline_add_before(pc);
-      reindent_line(pc, min_col);
-      cpd.changes++;
-   }
-} // split_fcn_params
-
-
-static void split_template(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "  %s(%d): start %s\n", __func__, __LINE__, start->text());
-   LOG_FMT(LSPLIT, "  %s(%d): back up until the prev is a comma\n", __func__, __LINE__);
-
-   // back up until the prev is a comma
-   chunk_t *prev = start;
-
-   while ((prev = chunk_get_prev(prev)) != nullptr)
-   {
-      LOG_FMT(LSPLIT, "  %s(%d): prev '%s'\n", __func__, __LINE__, prev->text());
-
-      if (  chunk_is_newline(prev)
-         || chunk_is_token(prev, CT_COMMA))
-      {
-         break;
-      }
-   }
-
-   if (  prev != nullptr
-      && !chunk_is_newline(prev))
-   {
-      LOG_FMT(LSPLIT, "  %s(%d):", __func__, __LINE__);
-      LOG_FMT(LSPLIT, " -- ended on %s --\n", get_token_name(prev->type));
-      chunk_t *pc = chunk_get_next(prev);
-      newline_add_before(pc);
-      size_t  min_col = 1;
-
-      log_rule_B("indent_continue");
-
-      if (options::indent_continue() == 0)
-      {
-         log_rule_B("indent_columns");
-         min_col += options::indent_columns();
-      }
-      else
-      {
-         min_col += abs(options::indent_continue());
-      }
-      reindent_line(pc, min_col);
-      cpd.changes++;
-   }
-} // split_templatefcn_params
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.h
deleted file mode 100644
index 3c5ad0b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file width.h
- * prototypes for width.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-#ifndef WIDTH_H_INCLUDED
-#define WIDTH_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * Step forward until a token goes beyond the limit and then call split_line()
- * to split the line at or before that point.
- */
-void do_code_width(void);
-
-
-#endif /* WIDTH_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/windows_compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/windows_compat.h
deleted file mode 100644
index 8210adab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/windows_compat.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * @file windows_compat.h
- * Hacks to work with different versions of windows.
- * This is only included if WIN32 is set.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef WINDOWS_COMPAT_H_INCLUDED
-#define WINDOWS_COMPAT_H_INCLUDED
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include "windows.h"
-
-#define HAVE_SYS_STAT_H
-
-#define NO_MACRO_VARARG
-
-typedef char                 CHAR;
-
-typedef signed char          INT8;
-typedef short                INT16;
-typedef int                  INT32;
-
-typedef unsigned char        UINT8;
-typedef unsigned short       UINT16;
-typedef unsigned int         UINT32;
-typedef unsigned long long   UINT64;
-
-#ifndef PRIx64
-#define PRIx64    "llx"
-#endif
-
-#ifndef PRIu64
-#define PRIu64    "llu"
-#endif
-
-// Make sure to keep GNU style attributes if they are supported; other
-// included headers may have chosen to rely on them. This is essential
-// if building with libc++ headers, where attributes are relied upon
-// if they are supported (see _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION).
-#ifndef __GNUC__
-// eliminate GNU's attribute
-#define __attribute__(x)
-#endif
-
-/*
- * MSVC compilers before VC7 don't have __func__ at all; later ones call it
- * __FUNCTION__.
- */
-#ifdef _MSC_VER
-#if _MSC_VER < 1300
-#define __func__    "???"
-#else
-#define __func__    __FUNCTION__
-#endif
-#else // _MSC_VER
-#ifndef __GNUC__
-#define __func__    "???"
-#endif // __GNUC__
-#endif // _MSC_VER
-
-#include "stdio.h"
-#include "string.h"
-
-#undef snprintf
-#define snprintf       _snprintf
-
-#undef vsnprintf
-#define vsnprintf      _vsnprintf
-
-#undef strcasecmp
-#define strcasecmp     _strcmpi
-
-#undef strncasecmp
-#define strncasecmp    _strnicmp
-
-#undef strdup
-#define strdup         _strdup
-
-#undef fileno
-#define fileno         _fileno
-
-// includes for _setmode()
-#include <direct.h>
-#include <fcntl.h>
-#include <io.h>
-
-// on windows the file permissions have no meaning thus neglect them
-#define mkdir(x, y)    _mkdir(x)
-
-#define PATH_SEP    '\\'
-
-#endif /* WINDOWS_COMPAT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/.editorconfig
deleted file mode 100644
index fcea945e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# This blocks editorconfig from finding the repo root .editorconfig.
-# We don't want to use that because test files are by their very nature
-# unformatted files and we don't want to leave this up to the editors.
-
-root = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/CMakeLists.txt
deleted file mode 100644
index 0dae0096..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-find_package(Git QUIET)
-
-# sorted by lexicographic order
-set(test_suites
-    c-sharp.test
-    c.test
-    cpp.test
-    d.test
-    ecma.test
-    imported.test
-    java.test
-    objective-c.test
-    pawn.test
-    vala.test
-)
-
-if (NOT ENABLE_CODECOVERAGE)
-  list(APPEND test_suites staging.test)
-endif()
-
-set(stdoc
-  "Create a separate CTest test for each test case"
-  " this is slower, especially with Python 3"
-)
-option("UNCRUSTIFY_SEPARATE_TESTS" "${stdoc}" OFF)
-if (UNCRUSTIFY_SEPARATE_TESTS)
-  set(tests_ctest_file "${CMAKE_CURRENT_BINARY_DIR}/tests.cmake")
-  set_property(DIRECTORY PROPERTY TEST_INCLUDE_FILE ${tests_ctest_file})
-
-  add_custom_command(
-    OUTPUT ${tests_ctest_file}
-    COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py
-      --executable $<TARGET_FILE:uncrustify>
-      --git ${GIT_EXECUTABLE}
-      --python ${PYTHON_EXECUTABLE}
-      --write-ctest ${tests_ctest_file}
-      --cmake-config "$<CONFIGURATION>"
-    VERBATIM
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${test_suites}
-  )
-
-  add_custom_target(register_tests ALL DEPENDS ${tests_ctest_file})
-else()
-  foreach(suite IN LISTS test_suites)
-    string(REPLACE ".test" "" lang "${suite}")
-    add_test(NAME ${lang}
-      COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py ${lang}
-        --executable $<TARGET_FILE:uncrustify>
-        -d --git ${GIT_EXECUTABLE}
-        --result-dir ${CMAKE_CURRENT_BINARY_DIR}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-  endforeach()
-endif()
-
-if (NOT ENABLE_CODECOVERAGE)
-  add_test(
-    NAME sources_format
-    COMMAND ${PYTHON_EXECUTABLE} run_sources_tests.py
-      --executable $<TARGET_FILE:uncrustify>
-      -d --git ${GIT_EXECUTABLE}
-      --result-dir ${CMAKE_CURRENT_BINARY_DIR}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  )
-endif()
-
-add_test(
-  NAME cli_options
-  COMMAND ${PYTHON_EXECUTABLE}
-    test_cli_options.py
-    --config $<CONFIG>
-    --build ${uncrustify_BINARY_DIR}
-    --diff
-  ${_configs}
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli
-)
-
-add_custom_target(update-cli-options
-  COMMAND ${PYTHON_EXECUTABLE}
-    test_cli_options.py
-    --config $<CONFIG>
-    --build ${uncrustify_BINARY_DIR}
-    --apply
-  DEPENDS uncrustify
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli
-)
-
-add_test(NAME sanity COMMAND uncrustify --help)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c-sharp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c-sharp.test
deleted file mode 100644
index 13706e2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c-sharp.test
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Test cases specifically for the C# language.
-#
-# Range: 10000 - 19999
-# test.name  config.file  input.file
-
-10000  mono.cfg                             cs/simple.cs
-10001  getset.cfg                           cs/getset.cs
-10002  ben_032.cfg                          cs/simple.cs
-10003  ben_033.cfg                          cs/region.cs
-10010  ben_034.cfg                          cs/var-member.cs
-10011  indent_columns-3.cfg                 cs/strings.cs
-10013  625_where-constraints.cfg            cs/625_where-constraints.cs
-
-10020  region-0.cfg                         cs/region.cs
-10021  region-1.cfg                         cs/region.cs
-10022  region-2.cfg                         cs/region.cs
-10023  region-3.cfg                         cs/region.cs
-
-10030  sort_imports.cfg                     cs/sort_using.cs
-10031  mod_sort_using-t.cfg                 cs/bug_i_935.cs
-10032  sort_using_categ.cfg                 cs/sort_using_categ.cs
-
-10040  tcf.cfg                              cs/tcf.cs
-10041  tcf.cfg                              cs/gs.cs
-10042  ben_036.cfg                          cs/exception-filters.cs
-
-10050  cs_generics.cfg                      cs/generics.cs
-
-10060  ben_037.cfg                          cs/unsafe.cs
-10065  UNI-1975.cfg                         cs/UNI-1975.cs
-
-10070  ben_038.cfg                          cs/utf16le.cs
-10071  ben_038.cfg                          cs/utf16be.cs
-10072  ben_038.cfg                          cs/utf16le_no_bom.cs
-10073  ben_038.cfg                          cs/utf16be_no_bom.cs
-10074  UNI-2020.cfg                         cs/UNI-2020.cs
-
-10080  ben_042.cfg                          cs/property.cs
-
-10090  ben_043.cfg                          cs/string_multi.cs
-
-10100  empty.cfg                            cs/bug_600.cs
-10101  sf607.cfg                            cs/sf607.cs
-
-10110  mda_space_a.cfg                      cs/mdarray_space.cs
-10111  sp_after_comma-a.cfg                 cs/mdarray_space.cs
-10112  mda_space_c.cfg                      cs/mdarray_space.cs
-
-10119  empty.cfg                            cs/preserveTabs.cs
-10120  empty.cfg                            cs/cmt_backslash_eol.cs
-
-10130  sp_between_new_paren.cfg             cs/sp_between_new_paren.cs
-
-10140  ben_044.cfg                          cs/remove_semi.cs
-
-10150  ben_045.cfg                          cs/operator-null-conditional.cs
-10151  sp_assign-a.cfg                      cs/operator_null-coalescing-assignment.cs
-
-10200  empty.cfg                            cs/logger.cs
-
-10300  empty.cfg                            cs/1822.cs
-
-10628  empty.cfg                            cs/sf628.cs
-10160  empty.cfg                            cs/delegate.cs
-10161  indent_cs_delegate_brace-t.cfg       cs/delegate.cs
-12001  bug_620.cfg                          cs/bug_620.cs
-12002  empty.cfg                            cs/nullable_prop.cs
-12003  ben_043.cfg                          cs/fncall_as_ctor_in_attr.cs
-12004  verbatim_strings.cfg                 cs/verbatim_strings.cs
-12005  empty.cfg                            cs/bug_1591.cs
-
-12101  indent_using_block-f.cfg             cs/bug_i_679.cs
-
-12102  mod_full_brace_nl_block_rem_mlcond-0.cfg  cs/mod_full_brace_nl_block_rem_mlcond.cs
-12103  mod_full_brace_nl_block_rem_mlcond-1.cfg  cs/mod_full_brace_nl_block_rem_mlcond.cs
-12104  bug_1637.cfg                         cs/bug_1637.cs
-12105  bug_1650.cfg                         cs/bug_1650.cs
-12106  bug_1650.cfg                         cs/UNI-40685.cs
-12107  mod_full_paren_if_bool.cfg           cs/mod_full_paren_if_bool.cs
-12108  Issue_2705.cfg                       cs/Issue_2705.cs
-
-# Adopt some UT tests
-10012  empty.cfg                            cs/621_this-spacing.cs
-10014  empty.cfg                            cs/630_bad-new-init-semicolon-removal.cs
-10015  misc-failures.cfg                    cs/misc-failures.cs
-10016  new-constraint-paren-space.cfg       cs/new-constraint-paren-space.cs
-10018  empty.cfg                            cs/delete-space-oc.mm
-10019  empty.cfg                            cs/func-param-wrap-oc.mm
-10027  U01-Cs.cfg                           cs/oneline_property.cs
-10028  U02-Cs.cfg                           cs/ifcolalign.cs
-10029  U03-Cs.cfg                           cs/when.cs
-10033  U11-Cpp.cfg                          cs/objc.mm
-10034  U12-Cpp.cfg                          cs/asm.h.mm
-10035  U13-Cpp.cfg                          cs/definesalign.h.mm
-10036  U14-Cpp.cfg                          cs/inttypes.h.mm
-10039  615_nested_usings.cfg                cs/615_nested-usings.cs
-10044  U04-Cs.cfg                           cs/ifcomment.cs
-10045  UNI-1288.cfg                         cs/UNI-1288.cs
-10046  U15-Cpp.cfg                          cs/UNI-1333.mm
-10051  UNI-1338.cfg                         cs/UNI-1338.cs
-10055  U06-Cs.cfg                           cs/UNI-1345.cs
-10066  UNI-1977.cfg                         cs/UNI-1977.cs
-10067  UNI-1978.cfg                         cs/UNI-1978.cs
-10075  UNI-2021.cfg                         cs/UNI-2021.cs
-10076  UNI-1343.cfg                         cs/UNI-1343.cs
-10077  U09-Cs.cfg                           cs/UNI-1919.cs
-10078  U10-Cs.cfg                           cs/UNI-3484.cs
-10102  U24-Cpp.cfg                          cs/pp-ignore.mm
-10103  U11-Cs.cfg                           cs/UNI-2506.cs
-10104  empty.cfg                            cs/UNI-2505.cs
-11011  620_getset-brace.cfg                 cs/620_getset-brace.cs
-11030  U08-Cpp.cfg                          cs/argtypes.mm
-11031  U09-Cpp.cfg                          cs/casting.mm
-11032  U10-Cpp.cfg                          cs/newlines.mm
-11072  U07-Cs.cfg                           cs/UNI-2007.cs
-11073  U08-Cs.cfg                           cs/UNI-2008.cs
-20010  UNI-32658.cfg                        cs/UNI-32658.cs
-20011  bug_1620.cfg                         cs/bug_1620.cs
-
-60004  UNI-2684.cfg                         cs/UNI-2684.cs
-60005  UNI-2685.cfg                         cs/UNI-2685.cs
-60007  UNI-3083.cfg                         cs/UNI-3083.cs
-60008  U-J.cfg                              cs/UNI-17253.cs
-60009  UNI-9917.cfg                         cs/UNI-9917.cs
-60011  UNI-11095.cfg                        cs/UNI-11095.mm
-60012  U13-Cs.cfg                           cs/UNI-12303.cs
-60013  UNI-13955.cfg                        cs/UNI-13955.cs
-60015  UNI-14131.cfg                        cs/UNI-14131.cs
-60016  UNI-11662.cfg                        cs/UNI-11662.cs
-60018  UNI-18777.cfg                        cs/UNI-18777.cs
-60019  empty.cfg                            cs/UNI-18780.cs
-60020  UNI-18829.cfg                        cs/UNI-18829.cs
-60023  UNI-18437.cfg                        cs/UNI-18437.cs
-60024  U15-Cs.cfg                           cs/UNI-19644.cs
-60026  UNI-19895.cfg                        cs/UNI-19895.cs
-60033  UNI-21730.cfg                        cs/UNI-21730.cs
-60036  UNI-11993.cfg                        cs/UNI-11993.cs
-60037  UNI-29933.cfg                        cs/UNI-29933.cs
-60040  UNI-30498_2.cfg                      cs/UNI-30498_2.cs
-60041  squeeze-paren-close-Option.cfg       cs/squeeze-paren-close-Option.cs
-60042  indent-multistring-coulmn1.cfg       cs/indent-multistring-coulmn1.cs
-60044  UNI-37241.cfg                        cs/UNI-37241.cs
-60045  nl_before_after.cfg                  cs/add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c.test
deleted file mode 100644
index 50d24735..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c.test
+++ /dev/null
@@ -1,397 +0,0 @@
-#
-# Test cases specifically for the C language.
-#
-# Range: 00000 - 09999
-# test.name  config.file  input.file
-
-
-# little general tests ====================================================
-
-00000  indent_columns-3.cfg                 c/comment-indent.c
-00001  cpp_to_c-1.cfg                       c/comment-indent.c
-00002  cpp_to_c-2.cfg                       c/comment-indent.c
-00003  cpp_to_c-3.cfg                       c/comment-indent.c
-00004  indent-1.cfg                         c/switch.c
-00005  ben_047.cfg                          c/cmt-align.c
-00006  indent_columns-3.cfg                 c/comment-convert.c
-00007  cpp_to_c-1.cfg                       c/comment-convert.c
-00008  cpp_to_c-2.cfg                       c/comment-convert.c
-00009  cpp_to_c-3.cfg                       c/comment-convert.c
-
-
-# brace styles
-
-00010  ben_048.cfg                          c/braces.c
-00011  brace-allman.cfg                     c/braces.c
-00012! brace-banner.cfg                     c/braces.c
-00013  brace-gnu.cfg                        c/braces.c
-00014  brace-kr.cfg                         c/braces.c
-00015  brace-ws.cfg                         c/braces.c
-00016  brace-ws2.cfg                        c/braces.c
-
-00020  ben_049.cfg                          c/define-if-indent.c
-00050  brace-remove-2.cfg                   c/brace-remove.c
-00051  brace-remove-all.cfg                 c/brace-remove.c
-00052  brace-remove-all.cfg                 c/brace-remove2.c
-00053  nl_brace_test.cfg                    c/brace.c
-00054  if_chain.cfg                         c/if_chain.c
-00055  cgal.cfg                             c/braces-2.c
-00056  brace-remove-all.cfg                 c/brace-remove3.c
-00057  if_chain.cfg                         c/brace-remove3.c
-00058  brace-kr-nobr.cfg                    c/if_chain.c
-
-00060  ben_050.cfg                          c/braces-2.c
-00061  ben_051.cfg                          c/braces-3.c
-00062  ben_052.cfg                          c/braces-4.c
-00065  ben_053.cfg                          c/braces-5.c
-00066  ben_054.cfg                          c/vb-while.c
-00067  ben_055.cfg                          c/vb-do.c
-
-
-00068  ben_056.cfg                          c/bsnl.c
-00069  ben_057.cfg                          c/vb-pp.c
-
-00070  ben_058.cfg                          c/return-multi.c
-00071  ben_042.cfg                          c/include_define.h
-00072  star_pos-0.cfg                       c/align-proto.c
-00073  empty.cfg                            c/nl_proto_endif.c
-00074  clang-has_include.cfg                c/clang-has_include.h
-00076  1225.cfg                             c/1225.c
-
-00081  else-if-1.cfg                        c/else-if.c
-00082  else-if-2.cfg                        c/else-if.c
-
-00091  cond-1.cfg                           c/cond.c
-00092  indent_columns-3.cfg                 c/cond.c
-00093  sp_cond_colon.cfg                    c/cond.c
-
-00101  ben_061.cfg                          c/bugs-1.c
-00102  space_indent_columns-3.cfg           c/bugs-2.c
-00103  ben_063.cfg                          c/bugs-3.c
-00104  ben_064.cfg                          c/bugs-4.c
-00105  ben_065.cfg                          c/bugs-5.c
-00106  ben_011.cfg                          c/bugs-6.c
-00107  ben_011.cfg                          c/bugs-7.c
-00108  indent_columns-3.cfg                 c/bugs-8.c
-
-00110  ben_069.cfg                          c/misc.c
-00111  brace-kr-br.cfg                      c/misc.c
-
-00120  sp_cmt_cpp_start-r.cfg               c/sp_cmt_cpp_start.c
-00121  sp_cmt_cpp_start-a.cfg               c/sp_cmt_cpp_start.c
-00122  sp_cmt_cpp_start_force.cfg           c/sp_cmt_cpp_start.c
-00123  cmt_reflow.cfg                       c/cmt_reflow.c
-
-00130  ben_070.cfg                          c/minus-minus.c
-00135  nepenthes.cfg                        c/br_cmt.c
-
-00140  ben_071.cfg                          c/global-vars.c
-00141  ben_072.cfg                          c/deref.c
-00142  ben_073.cfg                          c/type-cast.c
-00143  ben_074.cfg                          c/t3.in.c
-00144  ben_075.cfg                          c/align-proto-vars.c
-00145  ben_076.cfg                          c/vardefcol.c
-
-
-# casts
-
-00150  ben_077.cfg                          c/casts.c
-00151  cast-sp-r.cfg                        c/casts.c
-00152  cast-sp-a.cfg                        c/casts.c
-00153  cast-type.cfg                        c/casts.c
-00154  sp_after_cast.cfg                    c/casts.c
-00155  ben_078.cfg                          c/cast_brace.c
-
-
-# fcn indents
-
-00160  indent_func_param.cfg                c/fcn_indent.c
-00161  indent_func_call_param.cfg           c/fcn_indent.c
-00162  indent_func_def_param.cfg            c/fcn_indent.c
-00163  indent_func_proto_param.cfg          c/fcn_indent.c
-00164  rdan.cfg                             c/fcn_indent_func_def_col1.c
-00165  sp_func_call_user_inside_fparen.cfg  c/sp_func_call_user_inside_fparen.c
-
-00170  empty.cfg                            c/beautifier-off.c
-00180  sf538.cfg                            c/lvalue.c
-
-
-# switch & case stuff
-
-00201  case-1.cfg                           c/case.c
-00202  case-2.cfg                           c/case.c
-00203  case-3.cfg                           c/case.c
-00204  bug_1718.cfg                         c/bug_1718.c
-00205  nl_before_return_false.cfg           c/case-nl_before_return.c
-00206  nl_before_return_true.cfg            c/case-nl_before_return.c
-
-
-# structure initializers
-
-00301  ben_079.cfg                          c/align-struct-init.c
-00302  ben_080.cfg                          c/one-liner-init.c
-00303  1liner-split.cfg                     c/one-liner-init.c
-00304  1liner-no-split.cfg                  c/one-liner-init.c
-00305  ben_081.cfg                          c/one-liner-define.c
-
-00310  empty.cfg                            c/sp_embed_comment.c
-
-00320  rdan.cfg                             c/indent_first_bool_expr.c
-
-
-# aligning tresholds
-
-00401  align-1.cfg                          c/align-equ.c
-00402  align-1.cfg                          c/align-var.c
-00403  align-2.cfg                          c/align-var.c
-00404  align-3.cfg                          c/align-var.c
-00405  align-3.cfg                          c/bits.c
-00406  bug_i_771.cfg                        c/bug_i_771.c
-
-00411  align_typedef_gap-3_span-5.cfg       c/align-typedef.c
-00412  align_typedef_gap-3_span-5.cfg       c/align-typedef.c
-00413  align_typedef_func-1.cfg             c/align-typedef.c
-00414  align_typedef_func-2.cfg             c/align-typedef.c
-00415  align_stack.cfg                      c/align_stack.c
-00416  align_sf_call_thresh_416.cfg         c/align_sf_call_thresh_416.c
-00417  align_sf_call_thresh_417.cfg         c/align_sf_call_thresh_417.c
-00418  align_sf_call_span_418.cfg           c/align_sf_call_span_418.c
-00419  align_sf_call_span_419.cfg           c/align_sf_call_span_419.c
-00420  Issue-2278.cfg                       c/Issue-2278.c
-
-00421  nl_ds_struct_enum_cmt-t.cfg          c/nl_ds_struct_enum.c
-00422  nl_ds_struct_enum-2.cfg              c/nl_ds_struct_enum.c
-00423  bug_1702.cfg                         c/bug_1702.c
-
-00430  empty.cfg                            c/paren-indent.c
-00431  indent_paren_close-1.cfg             c/paren-indent.c
-00432  indent_paren_close-2.cfg             c/paren-indent.c
-
-00440  bug_489.cfg                          c/bug_489.c
-
-00451  code_width-80.cfg                    c/enum_gallery.c
-00452  nl_enum_own_lines-a.cfg              c/enum_gallery.c
-00453! nl_enum_own_lines-3.cfg              c/enum_gallery.c
-00454  nl_enum_own_lines-4.cfg              c/enum_gallery.c
-
-
-# boolean and comma positioning
-
-00501  bool-pos-eol.cfg                     c/bool-pos.c
-00502  bool-pos-sol.cfg                     c/bool-pos.c
-00503  pos_compare-sol.cfg                  c/pos_compare.c
-00504  pos_compare-eol.cfg                  c/pos_compare.c
-00505  pos_conditional-l.cfg                c/pos_conditional.c
-00506  pos_conditional-t.cfg                c/pos_conditional.c
-00510  bool-pos-eol-break.cfg               c/bool-pos.c
-00511  bool-pos-sol-break.cfg               c/bool-pos.c
-00512  bool-pos-eol-force.cfg               c/bool-pos.c
-00513  bool-pos-sol-force.cfg               c/bool-pos.c
-00514  my_conf.cfg                          c/my_infile.c
-
-00600  indent_columns-3.cfg                 c/dos.c
-00601  indent_columns-3.cfg                 c/mac.c
-00611  empty.cfg                            c/pp-space.c
-00612  pp-indent-2.cfg                      c/pp-space.c
-00613  pp_indent-a.cfg                      c/pp-space.c
-00614  pp-space.cfg                         c/pp-space.c
-00615  pp-indent-2.cfg                      c/pp-nest.c
-00616  pp_if_indent-1.cfg                   c/pp-if-indent.c
-00617  rdan.cfg                             c/pp-if-indent.c
-00618  pp_if_indent-4.cfg                   c/pp-if-indent.c
-
-00620  ben_083.cfg                          c/indent-assign.c
-00621  nl_endif.cfg                         c/nl_endif.c
-00622  indent_assign.cfg                    c/indent-off-after-assign.c
-
-00631  nl_assign1.cfg                       c/nl_assign.c
-00632  nl_assign2.cfg                       c/nl_assign.c
-00633  nl_assign1.cfg                       c/bug_3156.c
-
-# function def newlines
-00701  func-def-1.cfg                       c/function-def.c
-00702  func-def-2.cfg                       c/function-def.c
-00703  func-def-3.cfg                       c/function-def.c
-
-00710  add_long_closebrace_comment_1.cfg    c/add_long_comment.c
-
-# nl_after_semicolon and nl_after_open_brace
-
-00721  nl_semicolon.cfg                     c/nl-semicolon.c
-
-# function types
-
-00801  ben_084.cfg                          c/fcn_type.c
-00802  ben_085.cfg                          c/funcfunc.c
-00803  sf537.cfg                            c/fcn_type.c
-
-# code width
-
-00901  width.cfg                            c/code_width.c
-00902  width-2.cfg                          c/code_width.c
-00903  width-3.cfg                          c/code_width.c
-
-# pascal ptr_type
-
-00910  pascal_ptr.cfg                       c/pascal_ptr.c
-00911  empty_body.cfg                       c/pascal_ptr.c
-
-01000  mod-paren.cfg                        c/mod-paren.c
-01001  nl-comment.cfg                       c/nl-comment.c
-01002  mod-paren2.cfg                       c/mod-paren.c
-
-01005  mod_case_brace_add.cfg               c/mod_case_brace.c
-01006  mod_case_brace_rm.cfg                c/mod_case_brace.c
-01007  mod_move_case_brace.cfg              c/mod_case_brace.c
-
-01011  del_semicolon.cfg                    c/semicolons.c
-01012  ben_086.cfg                          c/semicolons.c
-
-01015  empty.cfg                            c/paren_indent.c
-01016  align_attr.cfg                       c/align_attr.c
-
-01020  kw_subst.cfg                         c/kw_subst.c
-01021  kw_subst3.cfg                        c/hello.c
-01022  kw_subst3.cfg                        c/kw_subst.c
-
-01030  cmt_indent_multi-f.cfg               c/multi.h
-
-01035  empty.cfg                            c/func_wrap.c
-01036  sp_inside_fparen-f.cfg               c/func_wrap.c
-01037  type_wrap.cfg                        c/type_wrap.c
-
-01040  newline_after_endif.cfg              c/newline_after_endif.c
-
-01050  func_call_user.cfg                   c/func_call_user.c
-
-01060  empty.cfg                            c/backslash-newline-lex.c
-
-01070  label_colon_nl_1.cfg                 c/various_colons.c
-01071  label_colon_nl_2.cfg                 c/various_colons.c
-
-01080  empty.cfg                            c/bug_1196.c
-
-# big general tests
-
-02000  ben_087.cfg                          c/i2c-core.c
-02001  preproc-cleanup.cfg                  c/directfb.h
-02002  ben2.cfg                             c/i2c-core.c
-
-# clark's style - blank lines before and after flow control, indented comments
-
-02100  clark.cfg                            c/i2c-core.c
-02101  clark.cfg                            c/comment-indent.c
-
-02200  xml-str.cfg                          c/xml.c
-02201  xml-str.cfg                          c/align-string.c
-
-02300  ben_088.cfg                          c/preproc-if.c
-02301  d.cfg                                c/preproc-if.c
-02302  cpp_to_c-1.cfg                       c/nl-cont.c
-02303  cpp_to_c-1.cfg                       c/nl-cont2.c
-
-02310  ben_089.cfg                          c/empty-for.c
-02311  ben_090.cfg                          c/pragma.c
-
-02315  pp_ret.cfg                           c/pp_ret.c
-
-02320  nl_create_one_liner.cfg              c/nl_create_one_liner.c
-02325  sort_imports.cfg                     c/sort_include.c
-
-02330  leave_one_liners.cfg                 c/one_liners.c
-
-# some embedded sql stuff
-
-02400  ben_091.cfg                          sql/mysql.sqc                   C
-02401  ben_092.cfg                          sql/sta-select.sqc              C
-02402  issue_527.cfg                        sql/issue_527.sqc               C
-
-02410  pp_if_indent-0.cfg                   c/ifdef-indent.c
-02411  pp_if_indent-1.cfg                   c/ifdef-indent.c
-02412  pp_if_indent-2.cfg                   c/ifdef-indent.c
-02413  pp_if_indent-3.cfg                   c/ifdef-indent.c
-02414  nl_whole_file_ifdef.cfg              c/whole_file_ifdef.c
-02415  endif.cfg                            c/endif.c
-02416  cmt_nl_end.cfg                       c/cmt_nl_end.c
-
-02421  cmt_multi_check_last-f.cfg           c/cmt_multi.c
-02422  empty.cfg                            c/cmt_multi.c
-02423  empty.cfg                            c/cmt_multi_utf8.c
-
-02431  align_right_cmt_gap-1.cfg            c/cmt_right_align.c
-02432  space_indent_columns-3.cfg           c/cmt_right_align.c
-
-02440  empty.cfg                            c/string_utf8.c
-02441  empty.cfg                            c/utf8-identifiers.c
-
-02451  return-1.cfg                         c/nl_return_expr.c
-02452  return-2.cfg                         c/nl_return_expr.c
-02453  return-3.cfg                         c/nl_return_expr.c
-02454  return-4.cfg                         c/nl_return_expr.c
-
-02455  mod_paren_on_return-a.cfg            c/macro-returns.c
-02456  mod_paren_on_return-r.cfg            c/macro-returns.c
-02457  nl_before_return_true.cfg            c/nl_before_return.c
-
-02460  freebsd.cfg                          c/freebsd.c
-
-02486  doxy-comment-no.cfg                  c/doxy-comment.c
-02487  doxy-comment-yes.cfg                 c/doxy-comment.c
-
-02501  ger.cfg                              c/custom_types_ssl.c
-02502  custom_types_ssl.cfg                 c/custom_types_ssl.c
-#02503  ger.cfg                              c/pp_concat_asn1.h
-
-02504  align_keep_extra.cfg                 c/align_keep_extra.c
-
-02510  ben_093.cfg                          c/asm.c
-10004  ben_094.cfg                          c/pragma_asm.c
-
-07630  indent-vbrace.cfg                    c/indent-vbrace.c
-
-08399  ben_095.cfg                          c/gh399.c
-
-09594  indent_columns-3.cfg                 c/sf594.c
-09588  empty.cfg                            c/sf588.c
-
-09601  sp_after_sparen.cfg                  c/sp_after_sparen.c
-
-09602  bug_671.cfg                          c/bug_671.c
-
-09603  indent_ternary_operator-1.cfg        c/indent_ternary-1.c
-09604  indent_ternary_operator-2.cfg        c/indent_ternary-2.c
-
-09605  sp_arith-f.cfg                       c/negative_value.c
-09606  ptr-arith.cfg                        c/extern.c
-09607  ptr-arith.cfg                        c/attribute.c
-09608  aet-func_call_user.cfg               c/func_call_user2.c
-09609  Issue_2279.cfg                       c/Issue_2279.c
-09610  force_tab_after_define-t.cfg         c/bug_i_876.c
-09611  space_indent_columns-4.cfg           c/bug_i_222.c
-09612  empty.cfg                            c/bug_1041.c
-09613  empty.cfg                            c/i1413.c
-09614  empty.cfg                            c/string_prefixes.c
-09615  i1564.cfg                            c/i1564.c
-
-09616  enum_comma_ifdef.cfg                 c/enum_comma_ifdef.c
-09617  Issue_2360-a.cfg                     c/Issue_2360.c
-09618  Issue_2360-b.cfg                     c/Issue_2360.c
-09619  Issue_2411.cfg                       c/Issue_2411.c
-09620  Issue_2640.cfg                       c/Issue_2640.c
-09621  preproc-cleanup.cfg                  c/pp-before-func-def.c
-
-10005  empty.cfg                            c/i1270.c
-
-10006  bug_2331.cfg                         c/bug_2331.c
-
-10007  indent_macro_brace-true.cfg          c/indent-macro-brace.c
-10008  indent_macro_brace-false.cfg         c/indent-macro-brace.c
-
-10009  empty.cfg                            c/return-compound-literal.c
-10010  indent_compound_literal_return-false.cfg c/return-compound-literal.c
-10011  indent_compound_literal_return-true.cfg c/return-compound-literal.c
-
-10012  indent_sparen_extra-8.cfg            c/sparen-indent.c
-10013  empty.cfg                            c/sparen-indent.c
-10014  indent_continue-8.cfg                c/sparen-indent.c
-10015  empty.cfg                            c/Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/I-842.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/I-842.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/I-842.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_d.cfg
deleted file mode 100644
index ddd51138..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_d.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# should create a warning and not appear in the actual config
-not_existing_option = 1
-
-# option with default setting, depending on uncrustify call can
-# be omitted, if not it should stay the same
-# non default counter = 0
-input_tab_size                  = 8
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_nd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_nd.cfg
deleted file mode 100644
index 23db4460..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_nd.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include "mini_d.cfg"
-
-# option with non default setting, should stay the same
-# non default counter = 1
-newlines                        = crlf
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/replace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/replace.cfg
deleted file mode 100644
index 16473bf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/replace.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-sp_arith                        = force
-sp_assign                       = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/tracking_space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/tracking_space.cfg
deleted file mode 100644
index 8b37aa38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/tracking_space.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_with_tabs = 0
-indent_columns   = 3
-sp_arith         = force
-sp_assign        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/truncate.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/truncate.cfg
deleted file mode 100644
index cc48c57e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/truncate.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debug_truncate = 38
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/unmatched_close_pp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/unmatched_close_pp.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/unmatched_close_pp.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/I-842.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/I-842.cpp
deleted file mode 100644
index 7f7bcaf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/I-842.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Namespace
-{
-	// class Class {
-		public void foo()
-		{
-
-		}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/backup.h-save b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/backup.h-save
deleted file mode 100644
index 9a66578c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/backup.h-save
+++ /dev/null
@@ -1,4 +0,0 @@
-int main()
-{
-   a=b+c;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/class_enum_struct_union.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/class_enum_struct_union.cpp
deleted file mode 100644
index 6a72c823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/class_enum_struct_union.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-   /**
-    * the enum (and variable declarations thereof) could be of
-    * the following forms:
-    *
-    * "enum type [: integral_type] { ... } [x, ...]"
-    * "enum type [: integral_type]"
-    * "enum class type [: integral_type] { ... } [x, ...]"
-    * "enum class type [: integral_type]"
-    * "enum [: integral_type] { ... } x, ..."
-    */
-
-   /**
-    * the class/struct (and variable declarations thereof) could be of
-    * the following forms:
-    *
-    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }
-    * template<...> class/struct[<...>] [macros/attributes ...] type
-    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]
-    * class/struct [macros/attributes ...] type [x, ...]
-    * class/struct [macros/attributes ...] [: bases] { } x, ...
-    */
-
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-
-#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#define API_EXPORT __attribute__ ((visibility("default")))
-#elif defined _WIN32
-#define API_EXPORT __declspec(dllexport)
-#else
-#define API_EXPORT
-#endif
-
-namespace outer_namespace
-{
-
-namespace inner_namespace
-{
-
-class Base1 { };
-
-template<typename> class Base2 { };
-
-}
-
-}
-
-// template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }
-template<typename, typename ...>
-class API_EXPORT __attribute__((__deprecated__)) ALIGNAS(4) c1
-: public outer_namespace::inner_namespace::Base1,
-  public outer_namespace::inner_namespace::Base2<outer_namespace::inner_namespace::Base1>
-{
-
-};
-
-// template<...> class/struct[<...>] [macros/attributes ...] type { }
-template<typename, typename ...>
-class API_EXPORT c2
-{
-public:
-
-   template<typename T>
-   struct inner_class
-   {
-      static inner_class<T> *m_inner_class;
-   };
-};
-
-template<> template<> struct API_EXPORT c2<int>::inner_class<int> *c2<int>::inner_class<int>::m_inner_class = nullptr;
-
-// template<...> class/struct[<...>] [macros/attributes ...] type
-template<typename, typename ...>
-class API_EXPORT c2;
-
-// class/struct [macros/attributes ...] type : bases ... { } x, ...
-class API_EXPORT __attribute__((__deprecated__)) ALIGNAS(4) c3
-: public outer_namespace::inner_namespace::Base2<int>,
-  public c2<int>::inner_class<int>
-{
-public:
-   c3(int x = 0, int y = 0, int z = 0) : m_x(x), m_y(y), m_z(z) { }
-
-   int m_x;
-   int m_y;
-   int m_z;
-} c31, *c32 = nullptr, *c33[] = { nullptr, nullptr }, c34{ 0, 1, 2}, * const c35(nullptr), c16(0, 1, 2);
-
-// class/struct [macros/attributes ...] type x, ...
-class __attribute__((__deprecated__)) API_EXPORT ALIGNAS(4) c3 c41, *c42 = c32 ? c32 : nullptr, *c43[] = { nullptr, nullptr }, c44{ 0, 1, 2}, * const c45(nullptr), c46(0, 1, 2);
-
-// class/struct [macros/attributes ...] type : bases ... { } x, ...
-class ALIGNAS(4) API_EXPORT __attribute__((__deprecated__))
-: public outer_namespace::inner_namespace::Base1
-{
-public:
-   int m_x;
-   int m_y;
-   int m_z;
-} c51, *c52 = nullptr, *c53[] = { nullptr, nullptr };
-
-
-// enum type : integral_type { ... } x, ...
-enum e1 : long long { a1, b1, d1 } e11, e12, e13;
-
-// enum type : integral_type { ... }
-enum e2 : unsigned int { a2, b2, d2 };
-
-// enum type : integral_type
-enum e3 : short;
-
-// enum type x, ...
-enum e3 e31, e32;
-
-// enum class type : integral_type { ... } x, ...
-enum class e4 : long long { a4, b4, d4 } e41, e42, e43, e44;
-
-// enum class type : integral_type { ... }
-enum class e5 : unsigned int { a5, b5, d5 };
-
-// enum class type : integral_type
-enum class e6 : short;
-
-// enum class type
-enum class e7;
-
-// enum : integral_type { ... } x, ...
-enum : long long { a8, b8, c8 } e81, e82;
-
-// enum { ... } x, ...
-enum { a9, b9, c9 } e91, e92;
-
-union API_EXPORT u1 { int x; long y; } u11, *u12 = nullptr, *u13{0};
-
-union API_EXPORT u1 u21;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/logger.cs
deleted file mode 100644
index defede8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/logger.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {1}). May need special support, or perhaps there's a bug..

-// long comment line(s), such as here, might be too long to produce a correct LOG-file such as

-// with the use of option -L A

-// in such a case, the output of the log will be cut.

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/replace.list b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/replace.list
deleted file mode 100644
index 8de0b2c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/replace.list
+++ /dev/null
@@ -1 +0,0 @@
-input/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrc.cpp
deleted file mode 100644
index 1a22f6d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrc.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-struct TelegramIndex
-{
-TelegramIndex(const char* pN, unsigned long nI) :
-pTelName(pN),
-nTelIndex(n)
-{
-}
-
-~TelegramIndex()
-{
-}
-
-const char* const pTelName;
-unsigned long nTelIndex;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrcP.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrcP.cpp
deleted file mode 100644
index 85e36674..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrcP.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#define x s23_foo += \
-s8_foo * s16_bar;
-
-struct TelegramIndex
-{
-TelegramIndex(const char* pN, unsigned long nI) :
-pTelName(pN),
-nTelIndex(n)
-{
-}
-
-~TelegramIndex()
-{
-}
-
-const char* const pTelName;
-unsigned long nTelIndex;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/tracking_space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/tracking_space.cpp
deleted file mode 100644
index 5b0b8aa1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/tracking_space.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-   a =     b +              111-55;
-}
-template<typename...A, int...B>
-struct foo1:foo1<A..., (sizeof...(A)+B)...>
-{
-        foo1() {
-                int x = sizeof...(A);
-                bool b = x > 1;
-        }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/truncate.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/truncate.cpp
deleted file mode 100644
index 7ef9530d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/truncate.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// 1 6789A123456789B123456789c123456789d123456789 123456789 123456789 123
-// 2 6789A123456789B123456789c123456789
-// 3 6789A123456789B123456789c12345678
-// 4 6789A123456789B123456789c1234567
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/unmatched_close_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/unmatched_close_pp.cpp
deleted file mode 100644
index b79d12fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/unmatched_close_pp.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _Include_H
-#define _Include_H
-namespace Namespace
-{
-	// class Class {
-		public void foo()
-		{
-
-		}
-	}
-}
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/21.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/21.txt
deleted file mode 100644
index 7c702d87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/21.txt
+++ /dev/null
@@ -1,1887 +0,0 @@
-log_rule(indent_text : rule is 'indent_columns'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 1, pc->column is 1, pc->text() is 'struct, indent_column is 1
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 1, indent set to 1, for 'struct'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_macro_brace'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 2, pc->column is 1, pc->text() is '{, indent_column is 1
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 2, indent set to 1, for '{'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 3, pc->column is 1, pc->text() is 'TelegramIndex, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_class_colon'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 4, pc->column is 1, pc->text() is 'pTelName, indent_column is 17
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 4, indent set to 17, for 'pTelName'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 5, pc->column is 1, pc->text() is 'nTelIndex, indent_column is 17
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_macro_brace'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 6, pc->column is 1, pc->text() is '{, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 6, indent set to 9, for '{'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 7, pc->column is 1, pc->text() is '}, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 7, indent set to 9, for '}'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 9, pc->column is 1, pc->text() is '~, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 9, indent set to 9, for '~'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_macro_brace'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 10, pc->column is 1, pc->text() is '{, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 10, indent set to 9, for '{'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 11, pc->column is 1, pc->text() is '}, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 11, indent set to 9, for '}'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 13, pc->column is 1, pc->text() is 'const, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 13, indent set to 9, for 'const'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 14, pc->column is 1, pc->text() is 'unsigned, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 14, indent set to 9, for 'unsigned'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 15, pc->column is 1, pc->text() is '}, indent_column is 1
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 15, indent set to 1, for '}'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_columns'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 1, pc->column is 1, pc->text() is 'struct, indent_column is 1
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 1, indent set to 1, for 'struct'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_macro_brace'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 2, pc->column is 1, pc->text() is '{, indent_column is 1
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 2, indent set to 1, for '{'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 3, pc->column is 9, pc->text() is 'TelegramIndex, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_class_colon'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 4, pc->column is 17, pc->text() is 'pTelName, indent_column is 17
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 4, indent set to 17, for 'pTelName'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 5, pc->column is 17, pc->text() is 'nTelIndex, indent_column is 17
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_macro_brace'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 6, pc->column is 9, pc->text() is '{, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 6, indent set to 9, for '{'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 7, pc->column is 9, pc->text() is '}, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 7, indent set to 9, for '}'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 9, pc->column is 9, pc->text() is '~, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 9, indent set to 9, for '~'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_align_paren'
-log_rule(indent_text : rule is 'indent_paren_nl'
-log_rule(indent_text : rule is 'indent_square_nl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'use_indent_continue_only_once'
-log_rule(indent_text : rule is 'indent_paren_after_func_decl'
-log_rule(indent_text : rule is 'indent_paren_after_func_def'
-log_rule(indent_text : rule is 'indent_paren_after_func_call'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_macro_brace'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 10, pc->column is 9, pc->text() is '{, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 10, indent set to 9, for '{'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 11, pc->column is 9, pc->text() is '}, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 11, indent set to 9, for '}'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 13, pc->column is 9, pc->text() is 'const, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 13, indent set to 9, for 'const'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 14, pc->column is 9, pc->text() is 'unsigned, indent_column is 9
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 14, indent set to 9, for 'unsigned'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_continue'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 15, pc->column is 1, pc->text() is '}, indent_column is 1
-log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 15, indent set to 1, for '}'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text : rule is 'indent_brace_parent'
-log_rule(indent_text : rule is 'indent_func_def_force_col1'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_inside_ternary_operator'
-log_rule(indent_text : rule is 'indent_access_spec_body'
-log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text : rule is 'indent_single_newlines'
-log_rule(indent_text : rule is 'indent_braces'
-log_rule(indent_text : rule is 'indent_braces_no_func'
-log_rule(indent_text : rule is 'indent_braces_no_class'
-log_rule(indent_text : rule is 'indent_braces_no_struct'
-log_rule(indent_text : rule is 'indent_shift'
-log_rule(indent_text : rule is 'indent_xml_string'
-log_rule(indent_text : rule is 'indent_continue_class_head'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
-log_rule(next_tab_column : rule is 'output_tab_size'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/25.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/25.txt
deleted file mode 100644
index 12967a1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/25.txt
+++ /dev/null
@@ -1,237 +0,0 @@
-Newline loop start: 0
-log_rule(newlines_cleanup_braces : rule is 'nl_struct_brace'
-log_rule(newlines_struct_union : rule is 'nl_define_macro'
-log_rule(newlines_cleanup_braces : rule is 'nl_ds_struct_enum_cmt'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_brace_pair : rule is 'nl_define_macro'
-log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
-log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
-log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
-newline_add_between : start->text() is ';', type is SEMICOLON, orig_line is 14, orig_col is 24
-newline_add_between : and end->text() is '}', orig_line is 15, orig_col is 1
-   [CallStack]
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_before_opening_brace_func_class_def'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_brace_pair : rule is 'nl_define_macro'
-log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
-log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
-log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
-log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
-log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 7, orig_col is 1
-   [CallStack]
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 7, orig_col is 1
-   [CallStack]
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_fparen'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_cleanup_braces : rule is 'eat_blanks_before_close_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_struct_var'
-log_rule(newlines_cleanup_braces : rule is 'nl_after_brace_close'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces : rule is 'nl_before_opening_brace_func_class_def'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_brace_pair : rule is 'nl_define_macro'
-log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
-log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
-log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
-log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
-log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 11, orig_col is 1
-   [CallStack]
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 11, orig_col is 1
-   [CallStack]
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_fparen'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_cleanup_braces : rule is 'eat_blanks_before_close_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_struct_var'
-log_rule(newlines_cleanup_braces : rule is 'nl_after_brace_close'
-log_rule(newlines_cleanup_braces : rule is 'nl_after_semicolon'
-log_rule(newlines_cleanup_braces : rule is 'nl_after_semicolon'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_fparen'
-log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_cleanup_braces : rule is 'eat_blanks_before_close_brace'
-log_rule(newlines_cleanup_braces : rule is 'nl_brace_struct_var'
-log_rule(newlines_cleanup_braces : rule is 'nl_after_semicolon'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_def'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_proto'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_def'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_proto'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_def'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_proto'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_def'
-log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_proto'
-log_rule(newlines_class_colon_pos : rule is 'pos_class_colon'
-log_rule(newlines_class_colon_pos : rule is 'nl_class_colon'
-log_rule(newlines_class_colon_pos : rule is 'nl_class_init_args'
-log_rule(newlines_class_colon_pos : rule is 'pos_class_comma'
-log_rule(newlines_class_colon_pos : rule is 'align_constr_value_span'
-log_rule(newlines_class_colon_pos : rule is 'pos_constr_colon'
-log_rule(newlines_class_colon_pos : rule is 'nl_constr_colon'
-log_rule(newlines_class_colon_pos : rule is 'nl_constr_init_args'
-log_rule(newlines_class_colon_pos : rule is 'pos_constr_comma'
-log_rule(newlines_class_colon_pos : rule is 'align_constr_value_span'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(can_increase_nl : rule is 'nl_start_of_file'
-log_rule(can_increase_nl : rule is 'nl_end_of_file'
-log_rule(do_blank_lines : rule is 'nl_after_class'
-log_rule(do_blank_lines : rule is 'nl_after_struct'
-log_rule(newlines_functions_remove_extra_blank_lines : rule is 'nl_max_blank_in_func'
-newlines_functions_remove_extra_blank_lines : nl_max_blank_in_func is zero
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/28.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/28.txt
deleted file mode 100644
index f7553062..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/28.txt
+++ /dev/null
@@ -1,371 +0,0 @@
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(tokenize : rule is 'newlines'
-brace_cleanup : orig_line is 1, orig_col is 1, text() is 'struct'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 1, orig_col is 1, type is STRUCT, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 1, type is STRUCT, text() is 'struct'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 1, orig_col is 8, text() is 'TelegramIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 1, orig_col is 8, type is TYPE, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 1, type is TYPE, text() is 'TelegramIndex'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 1, orig_col is 21, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 2, orig_col is 1, text() is '{'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 2, orig_col is 1, type is BRACE_OPEN, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 2, type is BRACE_OPEN, text() is '{'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 2, orig_col is 2, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 3, orig_col is 1, text() is 'TelegramIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is WORD, text() is 'TelegramIndex'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 3, orig_col is 14, text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 14, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is PAREN_OPEN, text() is '('
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 3, orig_col is 15, text() is 'const'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 15, type is QUALIFIER, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is QUALIFIER, text() is 'const'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-brace_cleanup : orig_line is 3, orig_col is 21, text() is 'char'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 21, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is TYPE, text() is 'char'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-brace_cleanup : orig_line is 3, orig_col is 25, text() is '*'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 25, type is PTR_TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is PTR_TYPE, text() is '*'
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
-brace_cleanup : orig_line is 3, orig_col is 27, text() is 'pN'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 27, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is WORD, text() is 'pN'
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
-brace_cleanup : orig_line is 3, orig_col is 29, text() is ','
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 29, type is COMMA, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is COMMA, text() is ','
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 5
-brace_cleanup : orig_line is 3, orig_col is 31, text() is 'unsigned'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 31, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is TYPE, text() is 'unsigned'
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-brace_cleanup : orig_line is 3, orig_col is 40, text() is 'long'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 40, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is TYPE, text() is 'long'
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-brace_cleanup : orig_line is 3, orig_col is 45, text() is 'nI'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 45, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is WORD, text() is 'nI'
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
-brace_cleanup : orig_line is 3, orig_col is 47, text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 47, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is PAREN_CLOSE, text() is ')'
-parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
-brace_cleanup : orig_line is 3, orig_col is 49, text() is ':'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 49, type is COLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is COLON, text() is ':'
-parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 12, frm.expr_count is 5
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 3, orig_col is 50, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 4, orig_col is 1, text() is 'pTelName'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is WORD, text() is 'pTelName'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 4, orig_col is 9, text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 9, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is PAREN_OPEN, text() is '('
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 4, orig_col is 10, text() is 'pN'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 10, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is WORD, text() is 'pN'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-brace_cleanup : orig_line is 4, orig_col is 12, text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is PAREN_CLOSE, text() is ')'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-brace_cleanup : orig_line is 4, orig_col is 13, text() is ','
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 13, type is COMMA, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is COMMA, text() is ','
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
-brace_cleanup : orig_line is 4, orig_col is 14, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 5, orig_col is 1, text() is 'nTelIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is WORD, text() is 'nTelIndex'
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
-brace_cleanup : orig_line is 5, orig_col is 10, text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 10, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is PAREN_OPEN, text() is '('
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 2
-brace_cleanup : orig_line is 5, orig_col is 11, text() is 'n'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 11, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is WORD, text() is 'n'
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-brace_cleanup : orig_line is 5, orig_col is 12, text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is PAREN_CLOSE, text() is ')'
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-brace_cleanup : orig_line is 5, orig_col is 13, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 6, orig_col is 1, text() is '{'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 6, orig_col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 6, type is BRACE_OPEN, text() is '{'
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 6, orig_col is 2, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 7, orig_col is 1, text() is '}'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 7, orig_col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 7, type is BRACE_CLOSE, text() is '}'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 7, orig_col is 2, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 9, orig_col is 1, text() is '~'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 1, type is INV, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is INV, text() is '~'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 9, orig_col is 2, text() is 'TelegramIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 2, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is WORD, text() is 'TelegramIndex'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
-brace_cleanup : orig_line is 9, orig_col is 15, text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 15, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is PAREN_OPEN, text() is '('
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 2
-brace_cleanup : orig_line is 9, orig_col is 16, text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 16, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is PAREN_CLOSE, text() is ')'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
-brace_cleanup : orig_line is 9, orig_col is 17, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 10, orig_col is 1, text() is '{'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 10, orig_col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 10, type is BRACE_OPEN, text() is '{'
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 10, orig_col is 2, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 11, orig_col is 1, text() is '}'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 11, orig_col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 11, type is BRACE_CLOSE, text() is '}'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 11, orig_col is 2, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 13, orig_col is 1, text() is 'const'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 1, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is QUALIFIER, text() is 'const'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 13, orig_col is 7, text() is 'char'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 7, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is TYPE, text() is 'char'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 13, orig_col is 11, text() is '*'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 11, type is PTR_TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is PTR_TYPE, text() is '*'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-brace_cleanup : orig_line is 13, orig_col is 13, text() is 'const'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 13, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is QUALIFIER, text() is 'const'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
-brace_cleanup : orig_line is 13, orig_col is 19, text() is 'pTelName'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 19, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is WORD, text() is 'pTelName'
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
-brace_cleanup : orig_line is 13, orig_col is 27, text() is ';'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 27, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is SEMICOLON, text() is ';'
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 6
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 13, orig_col is 28, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 14, orig_col is 1, text() is 'unsigned'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 1, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is TYPE, text() is 'unsigned'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 14, orig_col is 10, text() is 'long'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 10, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is TYPE, text() is 'long'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 14, orig_col is 15, text() is 'nTelIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 15, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is WORD, text() is 'nTelIndex'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-brace_cleanup : orig_line is 14, orig_col is 24, text() is ';'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 24, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is SEMICOLON, text() is ';'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 14, orig_col is 25, text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 15, orig_col is 1, text() is '}'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 15, orig_col is 1, type is BRACE_CLOSE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 15, type is BRACE_CLOSE, text() is '}'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 15, orig_col is 2, text() is ';'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 15, orig_col is 2, type is SEMICOLON, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 15, type is SEMICOLON, text() is ';'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 15, orig_col is 3, text() is ''
-brace_cleanup : pp_level is 0
-log_rule(enum_cleanup : rule is 'mod_enum_last_comma'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/31.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/31.txt
deleted file mode 100644
index a890e117..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/31.txt
+++ /dev/null
@@ -1,600 +0,0 @@
-indent_text : orig_line is 1, orig_col is 1, column is 1, for 'struct'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-reindent_line : orig_line is 1, orig_col is 1, on 'struct' [STRUCT/NONE] => 1
- [CallStack]
-indent_text : orig_line is 1, orig_col is 8, column is 8, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : orig_line is 1, <Newline>
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : orig_line is 2, orig_col is 1, column is 1, for '{'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 1, ... indent is 9
-indent_text : orig_line is 2, orig_col is 1, text() is '{', parent_type is STRUCT
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 2, orig_col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
- [CallStack]
-indent_text : orig_line is 2, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 3, orig_col is 1, column is 1, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 3, orig_col is 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
- [CallStack]
-indent_text : orig_line is 3, orig_col is 14, column is 22, for '('
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ...indent is 23
-indent_text : frm.pse_tos is 2, ...indent is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 15, column is 23, for 'const'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 21, column is 29, for 'char'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 25, column is 33, for '*'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 27, column is 35, for 'pN'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 29, column is 37, for ','
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 31, column is 39, for 'unsigned'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 40, column is 48, for 'long'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 45, column is 53, for 'nI'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 47, column is 55, for ')'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : pc->orig_line is 3, orig_col is 47, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 3, orig_col is 49, column is 57, for ':'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 3, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 4, orig_col is 1, column is 1, for 'pTelName'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 4, orig_col is 1, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
- [CallStack]
-indent_text : orig_line is 4, orig_col is 9, column is 25, for '('
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 3, ...indent is 26
-indent_text : frm.pse_tos is 3, ...indent is 26
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : orig_line is 4, orig_col is 10, column is 26, for 'pN'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : orig_line is 4, orig_col is 12, column is 28, for ')'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : pc->orig_line is 4, orig_col is 12, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 4, orig_col is 13, column is 29, for ','
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 4, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 5, orig_col is 1, column is 1, for 'nTelIndex'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 5, orig_col is 1, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
- [CallStack]
-indent_text : orig_line is 5, orig_col is 10, column is 26, for '('
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 3, ...indent is 27
-indent_text : frm.pse_tos is 3, ...indent is 27
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : orig_line is 5, orig_col is 11, column is 27, for 'n'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : orig_line is 5, orig_col is 12, column is 28, for ')'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : pc->orig_line is 5, orig_col is 12, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 5, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 6, orig_col is 1, column is 1, for '{'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc->orig_line is 6, orig_col is 1, text() is '{', type is BRACE_OPEN
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ... indent is 17
-indent_text : orig_line is 6, orig_col is 1, text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 6, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 6, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 7, orig_col is 1, column is 1, for '}'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc->orig_line is 7, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 7, orig_col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 7, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 9, orig_col is 1, column is 1, for '~'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 9, orig_col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 9, orig_col is 2, column is 10, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 9, orig_col is 15, column is 23, for '('
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ...indent is 24
-indent_text : frm.pse_tos is 2, ...indent is 24
-indent_text : frm.pse_tos is 2, ...indent_tmp is 24
-indent_text : orig_line is 9, orig_col is 16, column is 24, for ')'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 24
-indent_text : pc->orig_line is 9, orig_col is 16, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 9, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 10, orig_col is 1, column is 1, for '{'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ... indent is 17
-indent_text : orig_line is 10, orig_col is 1, text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 10, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 10, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 11, orig_col is 1, column is 1, for '}'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc->orig_line is 11, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 11, orig_col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 11, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 1, column is 1, for 'const'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 13, orig_col is 1, on 'const' [QUALIFIER/NONE] => 9
- [CallStack]
-indent_text : orig_line is 13, orig_col is 7, column is 15, for 'char'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 11, column is 19, for '*'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 13, column is 21, for 'const'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 19, column is 27, for 'pTelName'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 27, column is 35, for ';'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, orig_col is 1, column is 1, for 'unsigned'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 14, orig_col is 1, on 'unsigned' [TYPE/NONE] => 9
- [CallStack]
-indent_text : orig_line is 14, orig_col is 10, column is 18, for 'long'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, orig_col is 15, column is 23, for 'nTelIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, orig_col is 24, column is 32, for ';'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 15, orig_col is 1, column is 1, for '}'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : pc->orig_line is 15, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 15, orig_col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
- [CallStack]
-indent_text : orig_line is 15, orig_col is 2, column is 2, for ';'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : orig_line is 15, <Newline>
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : before quick_align_again
-indent_text : after quick_align_again
-indent_text : orig_line is 1, orig_col is 1, column is 1, for 'struct'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-reindent_line : orig_line is 1, orig_col is 1, on 'struct' [STRUCT/NONE] => 1
- [CallStack]
-indent_text : orig_line is 1, orig_col is 8, column is 8, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : orig_line is 1, <Newline>
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : orig_line is 2, orig_col is 1, column is 1, for '{'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 1, ... indent is 9
-indent_text : orig_line is 2, orig_col is 1, text() is '{', parent_type is STRUCT
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 2, orig_col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
- [CallStack]
-indent_text : orig_line is 2, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 3, orig_col is 1, column is 9, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 3, orig_col is 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
- [CallStack]
-indent_text : orig_line is 3, orig_col is 14, column is 22, for '('
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ...indent is 23
-indent_text : frm.pse_tos is 2, ...indent is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 15, column is 23, for 'const'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 21, column is 29, for 'char'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 25, column is 33, for '*'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 27, column is 35, for 'pN'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 29, column is 37, for ','
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 31, column is 39, for 'unsigned'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 40, column is 48, for 'long'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 45, column is 53, for 'nI'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : orig_line is 3, orig_col is 47, column is 55, for ')'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : pc->orig_line is 3, orig_col is 47, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 3, orig_col is 49, column is 57, for ':'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 3, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 4, orig_col is 1, column is 17, for 'pTelName'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 4, orig_col is 1, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
- [CallStack]
-indent_text : orig_line is 4, orig_col is 9, column is 25, for '('
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 3, ...indent is 26
-indent_text : frm.pse_tos is 3, ...indent is 26
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : orig_line is 4, orig_col is 10, column is 26, for 'pN'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : orig_line is 4, orig_col is 12, column is 28, for ')'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 26
-indent_text : pc->orig_line is 4, orig_col is 12, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 4, orig_col is 13, column is 29, for ','
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 4, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 5, orig_col is 1, column is 17, for 'nTelIndex'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 5, orig_col is 1, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
- [CallStack]
-indent_text : orig_line is 5, orig_col is 10, column is 26, for '('
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 3, ...indent is 27
-indent_text : frm.pse_tos is 3, ...indent is 27
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : orig_line is 5, orig_col is 11, column is 27, for 'n'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : orig_line is 5, orig_col is 12, column is 28, for ')'
-   []
-indent_text : frm.pse_tos is 3, ...indent_tmp is 27
-indent_text : pc->orig_line is 5, orig_col is 12, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 5, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 6, orig_col is 1, column is 9, for '{'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc->orig_line is 6, orig_col is 1, text() is '{', type is BRACE_OPEN
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ... indent is 17
-indent_text : orig_line is 6, orig_col is 1, text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 6, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 6, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 7, orig_col is 1, column is 9, for '}'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc->orig_line is 7, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 7, orig_col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 7, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 9, orig_col is 1, column is 9, for '~'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 9, orig_col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 9, orig_col is 2, column is 10, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 9, orig_col is 15, column is 23, for '('
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ...indent is 24
-indent_text : frm.pse_tos is 2, ...indent is 24
-indent_text : frm.pse_tos is 2, ...indent_tmp is 24
-indent_text : orig_line is 9, orig_col is 16, column is 24, for ')'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 24
-indent_text : pc->orig_line is 9, orig_col is 16, text() is ')', type is FPAREN_CLOSE
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 9, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 10, orig_col is 1, column is 9, for '{'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ... indent is 17
-indent_text : orig_line is 10, orig_col is 1, text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 10, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 10, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : orig_line is 11, orig_col is 1, column is 9, for '}'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc->orig_line is 11, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 11, orig_col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : orig_line is 11, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 1, column is 9, for 'const'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 13, orig_col is 1, on 'const' [QUALIFIER/NONE] => 9
- [CallStack]
-indent_text : orig_line is 13, orig_col is 7, column is 15, for 'char'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 11, column is 19, for '*'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 13, column is 21, for 'const'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 19, column is 27, for 'pTelName'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, orig_col is 27, column is 35, for ';'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 13, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, orig_col is 1, column is 9, for 'unsigned'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 14, orig_col is 1, on 'unsigned' [TYPE/NONE] => 9
- [CallStack]
-indent_text : orig_line is 14, orig_col is 10, column is 18, for 'long'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, orig_col is 15, column is 23, for 'nTelIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, orig_col is 24, column is 32, for ';'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 14, <Newline>
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : orig_line is 15, orig_col is 1, column is 1, for '}'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : pc->orig_line is 15, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 15, orig_col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
- [CallStack]
-indent_text : orig_line is 15, orig_col is 2, column is 2, for ';'
-   []
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : orig_line is 15, <Newline>
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : frm.pse_tos is 0, ...indent is 1
-indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : before quick_align_again
-indent_text : after quick_align_again
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/36.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/36.txt
deleted file mode 100644
index 892f5af5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/36.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-fix_fcn_def_params : text() '(', type is PAREN_OPEN, on orig_line 3, level is 1
-fix_fcn_def_params : looking at, text() 'const' on orig_line 3, level 2
-fix_fcn_def_params : looking at, text() 'char' on orig_line 3, level 2
-fix_fcn_def_params : looking at, text() '*' on orig_line 3, level 2
-fix_fcn_def_params : looking at, text() 'pN' on orig_line 3, level 2
-fix_fcn_def_params : looking at, text() ',' on orig_line 3, level 2
-mark_variable_stack : parameter on orig_line 3, orig_col 27:
-mark_variable_stack : parameter on orig_line 3, orig_col 27: <char> as TYPE
-mark_variable_stack : parameter on orig_line 3, orig_col 27: <pN> as VAR
-fix_fcn_def_params : looking at, text() 'unsigned' on orig_line 3, level 2
-fix_fcn_def_params : looking at, text() 'long' on orig_line 3, level 2
-fix_fcn_def_params : looking at, text() 'nI' on orig_line 3, level 2
-fix_fcn_def_params : bailed on text() ')', on orig_line 3
-mark_variable_stack : parameter on orig_line 3, orig_col 45:
-mark_variable_stack : parameter on orig_line 3, orig_col 45: <long> as TYPE
-mark_variable_stack : parameter on orig_line 3, orig_col 45: <unsigned> as TYPE
-mark_variable_stack : parameter on orig_line 3, orig_col 45: <nI> as VAR
-fix_fcn_def_params : text() '(', type is PAREN_OPEN, on orig_line 9, level is 1
-fix_fcn_def_params : bailed on text() ')', on orig_line 9
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/66.txt
deleted file mode 100644
index 2607cb69..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/66.txt
+++ /dev/null
@@ -1,741 +0,0 @@
-space_text : orig_line is 1, orig_col is 1, 'struct' type is STRUCT
-space_text : back-to-back words need a space: pc->text() 'struct', next->text() 'TelegramIndex'
-space_text : orig_line is 1, orig_col is 1, pc-text() 'struct', type is STRUCT
-do_space : orig_line is 1, orig_col is 1, first->text() 'struct', type is STRUCT
-do_space : first->orig_line is 1, first->orig_col is 1, first->text() is 'struct', [STRUCT/NONE] <===>
-           second->orig_line is 1, second->orig_col is 8, second->text() is 'TelegramIndex', [TYPE/STRUCT] : rule ADD from add_space_table[ ]
-ensure_force_space : <force between 'struct' and 'TelegramIndex'> rule = ADD @ 1 => 8
-space_text : orig_line is 1, orig_col is 8, 'TelegramIndex' type is TYPE
-space_text : orig_line is 1, orig_col is 8, pc-text() 'TelegramIndex', type is TYPE
-do_space : orig_line is 1, orig_col is 8, first->text() 'TelegramIndex', type is TYPE
- rule = REMOVE @ 0 => 21
-space_text : orig_line is 1, orig_col is 21, <Newline>, nl is 1
-space_text : orig_line is 2, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 2, orig_col is 1, pc-text() '{', type is BRACE_OPEN
-do_space : orig_line is 2, orig_col is 1, first->text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 2, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 3, orig_col is 1, 'TelegramIndex' type is FUNC_CLASS_DEF
-space_text : orig_line is 3, orig_col is 1, pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : orig_line is 3, orig_col is 1, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 3, first->orig_col is 1, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
-           second->orig_line is 3, second->orig_col is 14, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
- rule = IGNORE @ 0 => 14
-space_text : orig_line is 3, orig_col is 14, '(' type is FPAREN_OPEN
-space_text : orig_line is 3, orig_col is 14, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 3, orig_col is 14, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 3, first->orig_col is 14, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 15, second->text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 15
-space_text : orig_line is 3, orig_col is 15, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->text() 'const', next->text() 'char'
-space_text : orig_line is 3, orig_col is 15, pc-text() 'const', type is QUALIFIER
-do_space : orig_line is 3, orig_col is 15, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 3, first->orig_col is 15, first->text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 3, second->orig_col is 21, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'> rule = FORCE @ 1 => 21
-space_text : orig_line is 3, orig_col is 21, 'char' type is TYPE
-space_text : orig_line is 3, orig_col is 21, pc-text() 'char', type is TYPE
-do_space : orig_line is 3, orig_col is 21, first->text() 'char', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 21, first->text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 25, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 0 => 25
-space_text : orig_line is 3, orig_col is 25, '*' type is PTR_TYPE
-space_text : orig_line is 3, orig_col is 25, pc-text() '*', type is PTR_TYPE
-do_space : orig_line is 3, orig_col is 25, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 3, first->orig_col is 25, first->text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 27, second->text() is 'pN', [WORD/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 1 => 27
-space_text : orig_line is 3, orig_col is 27, 'pN' type is WORD
-space_text : orig_line is 3, orig_col is 27, pc-text() 'pN', type is WORD
-do_space : orig_line is 3, orig_col is 27, first->text() 'pN', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 27, first->text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 29, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
- rule = REMOVE @ 0 => 29
-space_text : orig_line is 3, orig_col is 29, ',' type is COMMA
-space_text : orig_line is 3, orig_col is 29, pc-text() ',', type is COMMA
-do_space : orig_line is 3, orig_col is 29, first->text() ',', type is COMMA
-do_space : first->orig_line is 3, first->orig_col is 29, first->text() is ',', [COMMA/NONE] <===>
-           second->orig_line is 3, second->orig_col is 31, second->text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
- rule = IGNORE @ 1 => 31
-space_text : orig_line is 3, orig_col is 31, 'unsigned' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'unsigned', next->text() 'long'
-space_text : orig_line is 3, orig_col is 31, pc-text() 'unsigned', type is TYPE
-do_space : orig_line is 3, orig_col is 31, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 31, first->text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 40, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 40
-space_text : orig_line is 3, orig_col is 40, 'long' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'long', next->text() 'nI'
-space_text : orig_line is 3, orig_col is 40, pc-text() 'long', type is TYPE
-do_space : orig_line is 3, orig_col is 40, first->text() 'long', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 40, first->text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 45, second->text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nI'> rule = FORCE @ 1 => 45
-space_text : orig_line is 3, orig_col is 45, 'nI' type is WORD
-space_text : orig_line is 3, orig_col is 45, pc-text() 'nI', type is WORD
-do_space : orig_line is 3, orig_col is 45, first->text() 'nI', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 45, first->text() is 'nI', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 47, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 47
-space_text : orig_line is 3, orig_col is 47, ')' type is FPAREN_CLOSE
-space_text : orig_line is 3, orig_col is 47, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 3, orig_col is 47, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 3, first->orig_col is 47, first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 49, second->text() is ':', [CONSTR_COLON/NONE] : rule ADD from add_space_table[ ]
- rule = ADD @ 1 => 49
-space_text : orig_line is 3, orig_col is 49, ':' type is CONSTR_COLON
-space_text : orig_line is 3, orig_col is 49, pc-text() ':', type is CONSTR_COLON
-do_space : orig_line is 3, orig_col is 49, first->text() ':', type is CONSTR_COLON
- rule = REMOVE @ 0 => 50
-space_text : orig_line is 3, orig_col is 50, <Newline>, nl is 1
-space_text : orig_line is 4, orig_col is 1, 'pTelName' type is FUNC_CTOR_VAR
-space_text : orig_line is 4, orig_col is 1, pc-text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : orig_line is 4, orig_col is 1, first->text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 4, first->orig_col is 1, first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 4, second->orig_col is 9, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
- rule = IGNORE @ 0 => 9
-space_text : orig_line is 4, orig_col is 9, '(' type is FPAREN_OPEN
-space_text : orig_line is 4, orig_col is 9, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 4, orig_col is 9, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 4, first->orig_col is 9, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 10, second->text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 10
-space_text : orig_line is 4, orig_col is 10, 'pN' type is WORD
-space_text : orig_line is 4, orig_col is 10, pc-text() 'pN', type is WORD
-do_space : orig_line is 4, orig_col is 10, first->text() 'pN', type is WORD
-do_space : first->orig_line is 4, first->orig_col is 10, first->text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 4, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 12
-space_text : orig_line is 4, orig_col is 12, ')' type is FPAREN_CLOSE
-space_text : orig_line is 4, orig_col is 12, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 4, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 4, first->orig_col is 12, first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 13, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
- rule = REMOVE @ 0 => 13
-space_text : orig_line is 4, orig_col is 13, ',' type is COMMA
-space_text : orig_line is 4, orig_col is 13, pc-text() ',', type is COMMA
-do_space : orig_line is 4, orig_col is 13, first->text() ',', type is COMMA
- rule = REMOVE @ 0 => 14
-space_text : orig_line is 4, orig_col is 14, <Newline>, nl is 1
-space_text : orig_line is 5, orig_col is 1, 'nTelIndex' type is FUNC_CTOR_VAR
-space_text : orig_line is 5, orig_col is 1, pc-text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : orig_line is 5, orig_col is 1, first->text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 5, first->orig_col is 1, first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 5, second->orig_col is 10, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
- rule = IGNORE @ 0 => 10
-space_text : orig_line is 5, orig_col is 10, '(' type is FPAREN_OPEN
-space_text : orig_line is 5, orig_col is 10, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 5, orig_col is 10, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 5, first->orig_col is 10, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 5, second->orig_col is 11, second->text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 11
-space_text : orig_line is 5, orig_col is 11, 'n' type is WORD
-space_text : orig_line is 5, orig_col is 11, pc-text() 'n', type is WORD
-do_space : orig_line is 5, orig_col is 11, first->text() 'n', type is WORD
-do_space : first->orig_line is 5, first->orig_col is 11, first->text() is 'n', [WORD/NONE] <===>
-           second->orig_line is 5, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 12
-space_text : orig_line is 5, orig_col is 12, ')' type is FPAREN_CLOSE
-space_text : orig_line is 5, orig_col is 12, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 5, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
- rule = REMOVE @ 0 => 13
-space_text : orig_line is 5, orig_col is 13, <Newline>, nl is 1
-space_text : orig_line is 6, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 6, orig_col is 1, pc-text() '{', type is BRACE_OPEN
-do_space : orig_line is 6, orig_col is 1, first->text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 6, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 7, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 7, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
-do_space : orig_line is 7, orig_col is 1, first->text() '}', type is BRACE_CLOSE
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 7, orig_col is 2, <Newline>, nl is 2
-space_text : orig_line is 9, orig_col is 1, '~' type is DESTRUCTOR
-space_text : orig_line is 9, orig_col is 1, pc-text() '~', type is DESTRUCTOR
-do_space : orig_line is 9, orig_col is 1, first->text() '~', type is DESTRUCTOR
-do_space : first->orig_line is 9, first->orig_col is 1, first->text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 2, second->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 9, orig_col is 2, 'TelegramIndex' type is FUNC_CLASS_DEF
-space_text : orig_line is 9, orig_col is 2, pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : orig_line is 9, orig_col is 2, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 9, first->orig_col is 2, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
-           second->orig_line is 9, second->orig_col is 15, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
- rule = IGNORE @ 0 => 15
-space_text : orig_line is 9, orig_col is 15, '(' type is FPAREN_OPEN
-space_text : orig_line is 9, orig_col is 15, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 9, orig_col is 15, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 9, first->orig_col is 15, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 16, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
- rule = IGNORE @ 0 => 16
-space_text : orig_line is 9, orig_col is 16, ')' type is FPAREN_CLOSE
-space_text : orig_line is 9, orig_col is 16, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 9, orig_col is 16, first->text() ')', type is FPAREN_CLOSE
- rule = REMOVE @ 0 => 17
-space_text : orig_line is 9, orig_col is 17, <Newline>, nl is 1
-space_text : orig_line is 10, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 10, orig_col is 1, pc-text() '{', type is BRACE_OPEN
-do_space : orig_line is 10, orig_col is 1, first->text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 10, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 11, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 11, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
-do_space : orig_line is 11, orig_col is 1, first->text() '}', type is BRACE_CLOSE
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 11, orig_col is 2, <Newline>, nl is 2
-space_text : orig_line is 13, orig_col is 1, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->text() 'const', next->text() 'char'
-space_text : orig_line is 13, orig_col is 1, pc-text() 'const', type is QUALIFIER
-do_space : orig_line is 13, orig_col is 1, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 1, first->text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 7, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'> rule = FORCE @ 1 => 7
-space_text : orig_line is 13, orig_col is 7, 'char' type is TYPE
-space_text : orig_line is 13, orig_col is 7, pc-text() 'char', type is TYPE
-do_space : orig_line is 13, orig_col is 7, first->text() 'char', type is TYPE
-do_space : first->orig_line is 13, first->orig_col is 7, first->text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 11, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 0 => 11
-space_text : orig_line is 13, orig_col is 11, '*' type is PTR_TYPE
-space_text : orig_line is 13, orig_col is 11, pc-text() '*', type is PTR_TYPE
-do_space : orig_line is 13, orig_col is 11, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 13, first->orig_col is 11, first->text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 13, second->text() is 'const', [QUALIFIER/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 1 => 13
-space_text : orig_line is 13, orig_col is 13, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->text() 'const', next->text() 'pTelName'
-space_text : orig_line is 13, orig_col is 13, pc-text() 'const', type is QUALIFIER
-do_space : orig_line is 13, orig_col is 13, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 13, first->text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 19, second->text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'pTelName'> rule = FORCE @ 1 => 19
-space_text : orig_line is 13, orig_col is 19, 'pTelName' type is WORD
-space_text : orig_line is 13, orig_col is 19, pc-text() 'pTelName', type is WORD
-do_space : orig_line is 13, orig_col is 19, first->text() 'pTelName', type is WORD
-do_space : first->orig_line is 13, first->orig_col is 19, first->text() is 'pTelName', [WORD/NONE] <===>
-           second->orig_line is 13, second->orig_col is 27, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 27
-space_text : orig_line is 13, orig_col is 27, ';' type is SEMICOLON
-space_text : orig_line is 13, orig_col is 27, pc-text() ';', type is SEMICOLON
-do_space : orig_line is 13, orig_col is 27, first->text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 28
-space_text : orig_line is 13, orig_col is 28, <Newline>, nl is 1
-space_text : orig_line is 14, orig_col is 1, 'unsigned' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'unsigned', next->text() 'long'
-space_text : orig_line is 14, orig_col is 1, pc-text() 'unsigned', type is TYPE
-do_space : orig_line is 14, orig_col is 1, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 1, first->text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 10, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 10
-space_text : orig_line is 14, orig_col is 10, 'long' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'long', next->text() 'nTelIndex'
-space_text : orig_line is 14, orig_col is 10, pc-text() 'long', type is TYPE
-do_space : orig_line is 14, orig_col is 10, first->text() 'long', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 10, first->text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 15, second->text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nTelIndex'> rule = FORCE @ 1 => 15
-space_text : orig_line is 14, orig_col is 15, 'nTelIndex' type is WORD
-space_text : orig_line is 14, orig_col is 15, pc-text() 'nTelIndex', type is WORD
-do_space : orig_line is 14, orig_col is 15, first->text() 'nTelIndex', type is WORD
-do_space : first->orig_line is 14, first->orig_col is 15, first->text() is 'nTelIndex', [WORD/NONE] <===>
-           second->orig_line is 14, second->orig_col is 24, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 24
-space_text : orig_line is 14, orig_col is 24, ';' type is SEMICOLON
-space_text : orig_line is 14, orig_col is 24, pc-text() ';', type is SEMICOLON
-do_space : orig_line is 14, orig_col is 24, first->text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 25
-space_text : orig_line is 14, orig_col is 25, <Newline>, nl is 1
-space_text : orig_line is 15, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 15, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
-do_space : orig_line is 15, orig_col is 1, first->text() '}', type is BRACE_CLOSE
-do_space : first->orig_line is 15, first->orig_col is 1, first->text() is '}', [BRACE_CLOSE/STRUCT] <===>
-           second->orig_line is 15, second->orig_col is 2, second->text() is ';', [SEMICOLON/STRUCT] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 15, orig_col is 2, ';' type is SEMICOLON
-space_text : orig_line is 15, orig_col is 2, pc-text() ';', type is SEMICOLON
-do_space : orig_line is 15, orig_col is 2, first->text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 3
-space_text : orig_line is 15, orig_col is 3, <Newline>, nl is 2
-space_col_align : first->orig_line is 3, orig_col is 1, [FUNC_CLASS_DEF/NONE], text() 'TelegramIndex' <==>
-space_col_align : second->orig_line is 3, orig_col is 14 [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(', [CallStack]
-do_space : orig_line is 3, orig_col is 1, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 3, first->orig_col is 1, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
-           second->orig_line is 3, second->orig_col is 14, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 13
-space_col_align :    => coldiff is 13
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'TelegramIndex'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 14
-space_col_align :    => first->len()      is 13
-space_col_align :    => coldiff is 13
-space_col_align : first->orig_line is 3, orig_col is 14, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
-space_col_align : second->orig_line is 3, orig_col is 15 [QUALIFIER/NONE], text() 'const', [CallStack]
-do_space : orig_line is 3, orig_col is 14, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 3, first->orig_col is 14, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 15, second->text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'const'
-space_col_align :    => first->orig_col   is 14
-space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 3, orig_col is 15, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 3, orig_col is 21 [TYPE/NONE], text() 'char', [CallStack]
-do_space : orig_line is 3, orig_col is 15, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 3, first->orig_col is 15, first->text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 3, second->orig_col is 21, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>space_col_align : av is force
-space_col_align :    len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-space_col_align : first->orig_line is 3, orig_col is 21, [TYPE/NONE], text() 'char' <==>
-space_col_align : second->orig_line is 3, orig_col is 25 [PTR_TYPE/NONE], text() '*', [CallStack]
-do_space : orig_line is 3, orig_col is 21, first->text() 'char', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 21, first->text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 25, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'char'
-space_col_align :    => second->text()    is '*'
-space_col_align :    => first->orig_col   is 21
-space_col_align :    => second->orig_col  is 25
-space_col_align :    => first->len()      is 4
-space_col_align :    => coldiff is 4
-space_col_align : first->orig_line is 3, orig_col is 25, [PTR_TYPE/NONE], text() '*' <==>
-space_col_align : second->orig_line is 3, orig_col is 27 [WORD/NONE], text() 'pN', [CallStack]
-do_space : orig_line is 3, orig_col is 25, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 3, first->orig_col is 25, first->text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 27, second->text() is 'pN', [WORD/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is '*'
-space_col_align :    => second->text()    is 'pN'
-space_col_align :    => first->orig_col   is 25
-space_col_align :    => second->orig_col  is 27
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 27, [WORD/NONE], text() 'pN' <==>
-space_col_align : second->orig_line is 3, orig_col is 29 [COMMA/NONE], text() ',', [CallStack]
-do_space : orig_line is 3, orig_col is 27, first->text() 'pN', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 27, first->text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 29, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
-space_col_align : av is remove
-space_col_align :    len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 29, [COMMA/NONE], text() ',' <==>
-space_col_align : second->orig_line is 3, orig_col is 31 [TYPE/NONE], text() 'unsigned', [CallStack]
-do_space : orig_line is 3, orig_col is 29, first->text() ',', type is COMMA
-do_space : first->orig_line is 3, first->orig_col is 29, first->text() is ',', [COMMA/NONE] <===>
-           second->orig_line is 3, second->orig_col is 31, second->text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is ','
-space_col_align :    => second->text()    is 'unsigned'
-space_col_align :    => first->orig_col   is 29
-space_col_align :    => second->orig_col  is 31
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 31, [TYPE/NONE], text() 'unsigned' <==>
-space_col_align : second->orig_line is 3, orig_col is 40 [TYPE/NONE], text() 'long', [CallStack]
-do_space : orig_line is 3, orig_col is 31, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 31, first->text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 40, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>space_col_align : av is force
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 3, orig_col is 40, [TYPE/NONE], text() 'long' <==>
-space_col_align : second->orig_line is 3, orig_col is 45 [WORD/NONE], text() 'nI', [CallStack]
-do_space : orig_line is 3, orig_col is 40, first->text() 'long', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 40, first->text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 45, second->text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nI'>space_col_align : av is force
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 5
-space_col_align : first->orig_line is 3, orig_col is 45, [WORD/NONE], text() 'nI' <==>
-space_col_align : second->orig_line is 3, orig_col is 47 [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')', [CallStack]
-do_space : orig_line is 3, orig_col is 45, first->text() 'nI', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 45, first->text() is 'nI', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 47, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'nI'
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 45
-space_col_align :    => second->orig_col  is 47
-space_col_align :    => first->len()      is 2
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
-space_col_align : second->orig_line is 3, orig_col is 49 [CONSTR_COLON/NONE], text() ':', [CallStack]
-do_space : orig_line is 3, orig_col is 47, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 3, first->orig_col is 47, first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 49, second->text() is ':', [CONSTR_COLON/NONE] : rule ADD from add_space_table[ ]
-space_col_align : av is add
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is ADD
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 49, [CONSTR_COLON/NONE], text() ':' <==>
-space_col_align : second->orig_line is 3, orig_col is 50 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 3, orig_col is 49, first->text() ':', type is CONSTR_COLON
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 4, orig_col is 1, [FUNC_CTOR_VAR/NONE], text() 'pTelName' <==>
-space_col_align : second->orig_line is 4, orig_col is 9 [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(', [CallStack]
-do_space : orig_line is 4, orig_col is 1, first->text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 4, first->orig_col is 1, first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 4, second->orig_col is 9, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is 'pTelName'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 9
-space_col_align :    => first->len()      is 8
-space_col_align :    => coldiff is 8
-space_col_align : first->orig_line is 4, orig_col is 9, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
-space_col_align : second->orig_line is 4, orig_col is 10 [WORD/NONE], text() 'pN', [CallStack]
-do_space : orig_line is 4, orig_col is 9, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 4, first->orig_col is 9, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 10, second->text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'pN'
-space_col_align :    => first->orig_col   is 9
-space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 4, orig_col is 10, [WORD/NONE], text() 'pN' <==>
-space_col_align : second->orig_line is 4, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
-do_space : orig_line is 4, orig_col is 10, first->text() 'pN', type is WORD
-do_space : first->orig_line is 4, first->orig_col is 10, first->text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 4, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is 'pN'
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 10
-space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->len()      is 2
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 4, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
-space_col_align : second->orig_line is 4, orig_col is 13 [COMMA/NONE], text() ',', [CallStack]
-do_space : orig_line is 4, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 4, first->orig_col is 12, first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 13, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 4, orig_col is 13, [COMMA/NONE], text() ',' <==>
-space_col_align : second->orig_line is 4, orig_col is 14 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 4, orig_col is 13, first->text() ',', type is COMMA
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 1, [FUNC_CTOR_VAR/NONE], text() 'nTelIndex' <==>
-space_col_align : second->orig_line is 5, orig_col is 10 [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(', [CallStack]
-do_space : orig_line is 5, orig_col is 1, first->text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 5, first->orig_col is 1, first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 5, second->orig_col is 10, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 9
-space_col_align :    => coldiff is 9
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is 'nTelIndex'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->len()      is 9
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 5, orig_col is 10, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
-space_col_align : second->orig_line is 5, orig_col is 11 [WORD/NONE], text() 'n', [CallStack]
-do_space : orig_line is 5, orig_col is 10, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 5, first->orig_col is 10, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 5, second->orig_col is 11, second->text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'n'
-space_col_align :    => first->orig_col   is 10
-space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 11, [WORD/NONE], text() 'n' <==>
-space_col_align : second->orig_line is 5, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
-do_space : orig_line is 5, orig_col is 11, first->text() 'n', type is WORD
-do_space : first->orig_line is 5, first->orig_col is 11, first->text() is 'n', [WORD/NONE] <===>
-           second->orig_line is 5, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is 'n'
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 11
-space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
-space_col_align : second->orig_line is 5, orig_col is 13 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 5, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 6, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], text() '{' <==>
-space_col_align : second->orig_line is 6, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 6, orig_col is 1, first->text() '{', type is BRACE_OPEN
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 7, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text() '}' <==>
-space_col_align : second->orig_line is 7, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 7, orig_col is 1, first->text() '}', type is BRACE_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 9, orig_col is 1, [DESTRUCTOR/FUNC_CLASS_DEF], text() '~' <==>
-space_col_align : second->orig_line is 9, orig_col is 2 [FUNC_CLASS_DEF/DESTRUCTOR], text() 'TelegramIndex', [CallStack]
-do_space : orig_line is 9, orig_col is 1, first->text() '~', type is DESTRUCTOR
-do_space : first->orig_line is 9, first->orig_col is 1, first->text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 2, second->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 9, orig_col is 2, [FUNC_CLASS_DEF/DESTRUCTOR], text() 'TelegramIndex' <==>
-space_col_align : second->orig_line is 9, orig_col is 15 [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(', [CallStack]
-do_space : orig_line is 9, orig_col is 2, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 9, first->orig_col is 2, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
-           second->orig_line is 9, second->orig_col is 15, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 13
-space_col_align :    => coldiff is 13
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 9
-space_col_align :    => second->orig_line is 9
-space_col_align :    => first->text()     is 'TelegramIndex'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 2
-space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->len()      is 13
-space_col_align :    => coldiff is 13
-space_col_align : first->orig_line is 9, orig_col is 15, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
-space_col_align : second->orig_line is 9, orig_col is 16 [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')', [CallStack]
-do_space : orig_line is 9, orig_col is 15, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 9, first->orig_col is 15, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 16, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 9
-space_col_align :    => second->orig_line is 9
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 15
-space_col_align :    => second->orig_col  is 16
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 9, orig_col is 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
-space_col_align : second->orig_line is 9, orig_col is 17 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 9, orig_col is 16, first->text() ')', type is FPAREN_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 10, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], text() '{' <==>
-space_col_align : second->orig_line is 10, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 10, orig_col is 1, first->text() '{', type is BRACE_OPEN
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 11, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text() '}' <==>
-space_col_align : second->orig_line is 11, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 11, orig_col is 1, first->text() '}', type is BRACE_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 13, orig_col is 1, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 13, orig_col is 7 [TYPE/NONE], text() 'char', [CallStack]
-do_space : orig_line is 13, orig_col is 1, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 1, first->text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 7, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>space_col_align : av is force
-space_col_align :    len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-space_col_align : first->orig_line is 13, orig_col is 7, [TYPE/NONE], text() 'char' <==>
-space_col_align : second->orig_line is 13, orig_col is 11 [PTR_TYPE/NONE], text() '*', [CallStack]
-do_space : orig_line is 13, orig_col is 7, first->text() 'char', type is TYPE
-do_space : first->orig_line is 13, first->orig_col is 7, first->text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 11, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 13
-space_col_align :    => second->orig_line is 13
-space_col_align :    => first->text()     is 'char'
-space_col_align :    => second->text()    is '*'
-space_col_align :    => first->orig_col   is 7
-space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->len()      is 4
-space_col_align :    => coldiff is 4
-space_col_align : first->orig_line is 13, orig_col is 11, [PTR_TYPE/NONE], text() '*' <==>
-space_col_align : second->orig_line is 13, orig_col is 13 [QUALIFIER/NONE], text() 'const', [CallStack]
-do_space : orig_line is 13, orig_col is 11, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 13, first->orig_col is 11, first->text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 13, second->text() is 'const', [QUALIFIER/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 13
-space_col_align :    => second->orig_line is 13
-space_col_align :    => first->text()     is '*'
-space_col_align :    => second->text()    is 'const'
-space_col_align :    => first->orig_col   is 11
-space_col_align :    => second->orig_col  is 13
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 13, orig_col is 13, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 13, orig_col is 19 [WORD/NONE], text() 'pTelName', [CallStack]
-do_space : orig_line is 13, orig_col is 13, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 13, first->text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 19, second->text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'pTelName'>space_col_align : av is force
-space_col_align :    len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-space_col_align : first->orig_line is 13, orig_col is 19, [WORD/NONE], text() 'pTelName' <==>
-space_col_align : second->orig_line is 13, orig_col is 27 [SEMICOLON/NONE], text() ';', [CallStack]
-do_space : orig_line is 13, orig_col is 19, first->text() 'pTelName', type is WORD
-do_space : first->orig_line is 13, first->orig_col is 19, first->text() is 'pTelName', [WORD/NONE] <===>
-           second->orig_line is 13, second->orig_col is 27, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
-space_col_align : av is remove
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 8
-space_col_align : first->orig_line is 13, orig_col is 27, [SEMICOLON/NONE], text() ';' <==>
-space_col_align : second->orig_line is 13, orig_col is 28 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 13, orig_col is 27, first->text() ';', type is SEMICOLON
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 14, orig_col is 1, [TYPE/NONE], text() 'unsigned' <==>
-space_col_align : second->orig_line is 14, orig_col is 10 [TYPE/NONE], text() 'long', [CallStack]
-do_space : orig_line is 14, orig_col is 1, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 1, first->text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 10, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>space_col_align : av is force
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 14, orig_col is 10, [TYPE/NONE], text() 'long' <==>
-space_col_align : second->orig_line is 14, orig_col is 15 [WORD/NONE], text() 'nTelIndex', [CallStack]
-do_space : orig_line is 14, orig_col is 10, first->text() 'long', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 10, first->text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 15, second->text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nTelIndex'>space_col_align : av is force
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 5
-space_col_align : first->orig_line is 14, orig_col is 15, [WORD/NONE], text() 'nTelIndex' <==>
-space_col_align : second->orig_line is 14, orig_col is 24 [SEMICOLON/NONE], text() ';', [CallStack]
-do_space : orig_line is 14, orig_col is 15, first->text() 'nTelIndex', type is WORD
-do_space : first->orig_line is 14, first->orig_col is 15, first->text() is 'nTelIndex', [WORD/NONE] <===>
-           second->orig_line is 14, second->orig_col is 24, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
-space_col_align : av is remove
-space_col_align :    len is 9
-space_col_align :    => coldiff is 9
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 14, orig_col is 24, [SEMICOLON/NONE], text() ';' <==>
-space_col_align : second->orig_line is 14, orig_col is 25 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 14, orig_col is 24, first->text() ';', type is SEMICOLON
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/9.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/9.txt
deleted file mode 100644
index 98afe921..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/9.txt
+++ /dev/null
@@ -1 +0,0 @@
-Using LF line endings
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/92.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/92.txt
deleted file mode 100644
index eb0d7c05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/92.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-parse_word : orig_line is 1, orig_col is 1, pc->text() 'struct'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 1, orig_col is 1, pc->text() 'struct'
-   pc->type is WORD, pc->parent_type is NONE => *type is STRUCT, *parent_type is NONE
-parse_whitespace : orig_line is 1, orig_col is 7, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 1, orig_col is 8, pc->text() 'TelegramIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_whitespace : orig_line is 1, orig_col is 21, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 2, orig_col is 1, pc->text() '{'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_OPEN, *parent_type is NONE
-parse_whitespace : orig_line is 2, orig_col is 2, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 1, pc->text() 'TelegramIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 14, pc->text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 15, pc->text() 'const'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 15, pc->text() 'const'
-   pc->type is WORD, pc->parent_type is NONE => *type is QUALIFIER, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 20, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 21, pc->text() 'char'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 21, pc->text() 'char'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 25, pc->text() '*'
-   pc->type is NONE, pc->parent_type is NONE => *type is STAR, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 26, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 27, pc->text() 'pN'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 29, pc->text() ','
-   pc->type is NONE, pc->parent_type is NONE => *type is COMMA, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 30, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 31, pc->text() 'unsigned'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 31, pc->text() 'unsigned'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 39, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 40, pc->text() 'long'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 40, pc->text() 'long'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 44, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 45, pc->text() 'nI'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 47, pc->text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 48, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 49, pc->text() ':'
-   pc->type is NONE, pc->parent_type is NONE => *type is COLON, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 50, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 4, orig_col is 1, pc->text() 'pTelName'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 4, orig_col is 9, pc->text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_word : orig_line is 4, orig_col is 10, pc->text() 'pN'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 4, orig_col is 12, pc->text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_next : orig_line is 4, orig_col is 13, pc->text() ','
-   pc->type is NONE, pc->parent_type is NONE => *type is COMMA, *parent_type is NONE
-parse_whitespace : orig_line is 4, orig_col is 14, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 5, orig_col is 1, pc->text() 'nTelIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 5, orig_col is 10, pc->text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_word : orig_line is 5, orig_col is 11, pc->text() 'n'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 5, orig_col is 12, pc->text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 5, orig_col is 13, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 6, orig_col is 1, pc->text() '{'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_OPEN, *parent_type is NONE
-parse_whitespace : orig_line is 6, orig_col is 2, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 7, orig_col is 1, pc->text() '}'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 7, orig_col is 2, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 9, orig_col is 1, pc->text() '~'
-   pc->type is NONE, pc->parent_type is NONE => *type is INV, *parent_type is NONE
-parse_word : orig_line is 9, orig_col is 2, pc->text() 'TelegramIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 9, orig_col is 15, pc->text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_next : orig_line is 9, orig_col is 16, pc->text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 9, orig_col is 17, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 10, orig_col is 1, pc->text() '{'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_OPEN, *parent_type is NONE
-parse_whitespace : orig_line is 10, orig_col is 2, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 11, orig_col is 1, pc->text() '}'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 11, orig_col is 2, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 1, pc->text() 'const'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 1, pc->text() 'const'
-   pc->type is WORD, pc->parent_type is NONE => *type is QUALIFIER, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 6, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 7, pc->text() 'char'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 7, pc->text() 'char'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_next : orig_line is 13, orig_col is 11, pc->text() '*'
-   pc->type is NONE, pc->parent_type is NONE => *type is STAR, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 12, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 13, pc->text() 'const'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 13, pc->text() 'const'
-   pc->type is WORD, pc->parent_type is NONE => *type is QUALIFIER, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 18, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 19, pc->text() 'pTelName'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 13, orig_col is 27, pc->text() ';'
-   pc->type is NONE, pc->parent_type is NONE => *type is SEMICOLON, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 28, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 1, pc->text() 'unsigned'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 1, pc->text() 'unsigned'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 14, orig_col is 9, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 10, pc->text() 'long'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 10, pc->text() 'long'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 14, orig_col is 14, pc->text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 15, pc->text() 'nTelIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 14, orig_col is 24, pc->text() ';'
-   pc->type is NONE, pc->parent_type is NONE => *type is SEMICOLON, *parent_type is NONE
-parse_whitespace : orig_line is 14, orig_col is 25, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 15, orig_col is 1, pc->text() '}'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_CLOSE, *parent_type is NONE
-parse_next : orig_line is 15, orig_col is 2, pc->text() ';'
-   pc->type is NONE, pc->parent_type is NONE => *type is SEMICOLON, *parent_type is NONE
-parse_whitespace : orig_line is 15, orig_col is 3, pc->text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-tokenize_cleanup : orig_line is 1, orig_col is 8, pc->text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-tokenize_cleanup : orig_line is 3, orig_col is 25, pc->text() '*'
-   pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE
-tokenize_cleanup : orig_line is 13, orig_col is 11, pc->text() '*'
-   pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE
-try_find_end_chunk : orig_line is 1, orig_col is 8, pc->text() 'TelegramIndex'
-   pc->type is TYPE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-make_type : orig_line is 1, orig_col is 8, pc->text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-mark_constructors : orig_line is 3, orig_col is 1, pc->text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE
-flag_parens : orig_line is 3, orig_col is 14, pc->text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 3, orig_col is 47, pc->text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
-mark_cpp_constructor : orig_line is 3, orig_col is 49, pc->text() ':'
-   pc->type is COLON, pc->parent_type is NONE => *type is CONSTR_COLON, *parent_type is NONE
-mark_cpp_constructor : orig_line is 4, orig_col is 1, pc->text() 'pTelName'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CTOR_VAR, *parent_type is NONE
-flag_parens : orig_line is 4, orig_col is 9, pc->text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 4, orig_col is 12, pc->text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
-mark_cpp_constructor : orig_line is 5, orig_col is 1, pc->text() 'nTelIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CTOR_VAR, *parent_type is NONE
-flag_parens : orig_line is 5, orig_col is 10, pc->text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 5, orig_col is 12, pc->text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
-mark_constructors : orig_line is 9, orig_col is 2, pc->text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE
-mark_cpp_constructor : orig_line is 9, orig_col is 1, pc->text() '~'
-   pc->type is INV, pc->parent_type is NONE => *type is DESTRUCTOR, *parent_type is NONE
-flag_parens : orig_line is 9, orig_col is 15, pc->text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 9, orig_col is 16, pc->text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/Debug_tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/Debug_tracking_space.html
deleted file mode 100644
index 5cc68ada..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/Debug_tracking_space.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<p>
-</p>
-<pre>
-{
-   a<a title="1,sp_assign"><font color="red">M</font></a>=<a title="2,69,sp_assign"><font color="red">M</font></a>b<a title="3,70,75,sp_arith"><font color="red">M</font></a>+<a title="4,71,76,80,sp_arith"><font color="red">M</font></a>111<a title="5,72,77,81,84,sp_arith"><font color="red">M</font></a>-<a title="6,73,78,82,85,87,sp_arith"><font color="red">M</font></a>55<a title="7,74,79,83,86,88,89,sp_before_semi"><font color="red">M</font></a>;
-}
-template<a title="8,sp_before_angle"><font color="red">M</font></a>&lt;<a title="9,90,sp_inside_angle"><font color="red">M</font></a>typename<a title="10,91,96,ADD from add_space_table"><font color="red">M</font></a>... A<a title="11,92,97,101,sp_before_comma"><font color="red">M</font></a>,<a title="12,93,98,102,105,sp_after_comma"><font color="red">M</font></a>int<a title="13,94,99,103,106,108,sp_type_ellipsis"><font color="red">M</font></a>... B<a title="14,95,100,104,107,109,110,sp_inside_angle"><font color="red">M</font></a>&gt;
-struct<a title="15,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="16,111,sp_after_type"><font color="red">M</font></a>:<a title="17,112,128,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="18,113,129,144,sp_before_angle"><font color="red">M</font></a>&lt;<a title="19,114,130,145,159,sp_inside_angle"><font color="red">M</font></a>A<a title="20,115,131,146,160,173,sp_type_ellipsis"><font color="red">M</font></a>...<a title="21,116,132,147,161,174,186,sp_before_comma"><font color="red">M</font></a>,<a title="22,117,133,148,162,175,187,198,sp_after_comma"><font color="red">M</font></a>(<a title="23,118,134,149,163,176,188,199,209,sp_inside_paren"><font color="red">M</font></a>sizeof<a title="24,119,135,150,164,177,189,200,210,219,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="25,120,136,151,165,178,190,201,211,220,228,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="26,121,137,152,166,179,191,202,212,221,229,236,sp_inside_paren"><font color="red">M</font></a>A<a title="27,122,138,153,167,180,192,203,213,222,230,237,243,sp_inside_paren"><font color="red">M</font></a>)<a title="28,123,139,154,168,181,193,204,214,223,231,238,244,249,sp_arith"><font color="red">M</font></a>+<a title="29,124,140,155,169,182,194,205,215,224,232,239,245,250,254,sp_arith"><font color="red">M</font></a>B<a title="30,125,141,156,170,183,195,206,216,225,233,240,246,251,255,258,sp_inside_paren"><font color="red">M</font></a>)<a title="31,126,142,157,171,184,196,207,217,226,234,241,247,252,256,259,261,sp_paren_ellipsis"><font color="red">M</font></a>...<a title="32,127,143,158,172,185,197,208,218,227,235,242,248,253,257,260,262,263,sp_inside_angle"><font color="red">M</font></a>&gt;
-{
-   foo1<a title="33,51,sp_func_class_paren"><font color="red">M</font></a>(<a title="34,52,264,sp_inside_fparens"><font color="red">M</font></a>)<a title="35,53,265,266,sp_fparen_brace"><font color="red">M</font></a>{
-      int<a title="36,54,sp_after_type"><font color="red">M</font></a>x<a title="37,55,267,sp_assign"><font color="red">M</font></a>=<a title="38,56,268,274,sp_assign"><font color="red">M</font></a>sizeof<a title="39,57,269,275,280,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="40,58,270,276,281,285,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="41,59,271,277,282,286,289,sp_inside_paren"><font color="red">M</font></a>A<a title="42,60,272,278,283,287,290,292,sp_inside_paren"><font color="red">M</font></a>)<a title="43,61,273,279,284,288,291,293,294,sp_before_semi"><font color="red">M</font></a>;
-      bool<a title="44,62,sp_after_type"><font color="red">M</font></a>b<a title="45,63,295,sp_assign"><font color="red">M</font></a>=<a title="46,64,296,300,sp_assign"><font color="red">M</font></a>x<a title="47,65,297,301,304,sp_compare"><font color="red">M</font></a>><a title="48,66,298,302,305,307,sp_compare"><font color="red">M</font></a>1<a title="49,67,299,303,306,308,309,sp_before_semi"><font color="red">M</font></a>;
-   }
-}<a title="50,sp_before_semi"><font color="red">M</font></a>;
-</pre>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/I-842.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/I-842.txt
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/I-842.txt
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/backup.h
deleted file mode 100644
index 210c6f7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/backup.h
+++ /dev/null
@@ -1,4 +0,0 @@
-int main()
-{
-   a = b + c;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.csv b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.csv
deleted file mode 100644
index 3b5c4a4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.csv
+++ /dev/null
@@ -1,685 +0,0 @@
-number of loops,1,
-language,CPP,
-Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig Sp Before,Br,Lvl,pp,Flags,Nl Before,Nl After,Text,
-1,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,3,0,0,0,"",9,0," /**�    * the enum (and variable declarations thereof) could be of�    * the following forms:�    *�    * ""enum type [: integral_type] { ... } [x, ...]""�    * ""enum type [: integral_type]""�    * ""enum class type [: integral_type] { ... } [x, ...]""�    * ""enum class type [: integral_type]""�    * ""enum [: integral_type] { ... } x, ...""�    */"
-10,NEWLINE,NONE,PARENT_NOT_SET,7,7,4,0,0,0,0,"",2,0,
-12,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,0,0,0,0,"",9,0," /**�    * the class/struct (and variable declarations thereof) could be of�    * the following forms:�    *�    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }�    * template<...> class/struct[<...>] [macros/attributes ...] type�    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]�    * class/struct [macros/attributes ...] type [x, ...]�    * class/struct [macros/attributes ...] [: bases] { } x, ...�    */"
-21,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0,
-23,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-23,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,0,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-23,MACRO_FUNC,NONE,PARENT_NOT_SET,9,9,16,1,1,1,0,"IN_PREPROC,EXPR_START",0,0,"         ALIGNAS"
-23,FPAREN_OPEN,MACRO_FUNC,PARENT_NOT_SET,16,16,17,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                ("
-23,WORD,NONE,PARENT_NOT_SET,17,17,31,0,1,2,0,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                 byte_alignment"
-23,FPAREN_CLOSE,MACRO_FUNC,PARENT_NOT_SET,31,31,32,0,1,1,0,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                               )"
-23,ATTRIBUTE,NONE,PARENT_NOT_SET,33,33,46,1,1,1,0,"IN_PREPROC",0,0,"                                 __attribute__"
-23,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,46,46,47,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                              ("
-23,PAREN_OPEN,NONE,PARENT_NOT_SET,47,47,48,0,1,2,0,"IN_PREPROC,EXPR_START,PUNCTUATOR",0,0,"                                               ("
-23,FUNC_CALL,NONE,PARENT_NOT_SET,48,48,55,0,1,3,0,"IN_PREPROC,EXPR_START",0,0,"                                                aligned"
-23,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,55,55,56,0,1,3,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                       ("
-23,WORD,NONE,PARENT_NOT_SET,56,56,70,0,1,4,0,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                                        byte_alignment"
-23,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,70,70,71,0,1,3,0,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                      )"
-23,PAREN_CLOSE,NONE,PARENT_NOT_SET,71,71,72,0,1,2,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                       )"
-23,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,72,72,73,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                        )"
-23,NEWLINE,NONE,PARENT_NOT_SET,73,73,1,0,0,0,0,"",2,0,
-25,PREPROC,PP_IF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-25,PP_IF,NONE,PARENT_NOT_SET,2,2,4,0,0,0,1,"IN_PREPROC,FORCE_SPACE",0,0,"  if"
-25,PP_DEFINED,NONE,PARENT_NOT_SET,5,5,12,1,0,0,1,"IN_PREPROC,EXPR_START",0,0,"     defined"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"             ("
-25,WORD,NONE,PARENT_NOT_SET,14,14,22,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"              __unix__"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,22,22,23,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                      )"
-25,BOOL,NONE,PARENT_NOT_SET,24,24,26,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                        ||"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,27,27,28,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                           ("
-25,PP_DEFINED,NONE,PARENT_NOT_SET,28,28,35,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                            defined"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,36,36,37,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                    ("
-25,WORD,NONE,PARENT_NOT_SET,37,37,46,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                                     __APPLE__"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,46,46,47,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                              )"
-25,BOOL,NONE,PARENT_NOT_SET,48,48,50,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                &&"
-25,PP_DEFINED,NONE,PARENT_NOT_SET,51,51,58,1,0,0,1,"IN_PREPROC",0,0,"                                                   defined"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,59,59,60,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                           ("
-25,WORD,NONE,PARENT_NOT_SET,60,60,68,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                                                            __MACH__"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,68,68,69,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                    )"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,69,69,70,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                     )"
-25,NEWLINE,NONE,PARENT_NOT_SET,70,70,1,0,0,0,1,"",1,0,
-26,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-26,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-26,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"         API_EXPORT"
-26,ATTRIBUTE,NONE,PARENT_NOT_SET,20,20,33,1,1,1,1,"IN_PREPROC,EXPR_START",0,0,"                    __attribute__"
-26,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,34,34,35,1,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,PUNCTUATOR",0,0,"                                  ("
-26,PAREN_OPEN,NONE,PARENT_NOT_SET,35,35,36,0,1,2,1,"IN_PREPROC,EXPR_START,PUNCTUATOR",0,0,"                                   ("
-26,FUNC_CALL,NONE,PARENT_NOT_SET,36,36,46,0,1,3,1,"IN_PREPROC,EXPR_START",0,0,"                                    visibility"
-26,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,46,46,47,0,1,3,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                              ("
-26,STRING,PP_INCLUDE,PARENT_NOT_SET,47,47,56,0,1,4,1,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                               ""default"""
-26,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,56,56,57,0,1,3,1,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                                                        )"
-26,PAREN_CLOSE,NONE,PARENT_NOT_SET,57,57,58,0,1,2,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                         )"
-26,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,58,58,59,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                          )"
-26,NEWLINE,NONE,PARENT_NOT_SET,59,59,1,0,0,0,1,"",1,0,
-27,PREPROC,PP_ELSE,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-27,PP_ELSE,NONE,PP_IF,2,2,6,0,0,0,1,"IN_PREPROC,FORCE_SPACE",0,0,"  elif"
-27,PP_DEFINED,NONE,PARENT_NOT_SET,7,7,14,1,0,0,1,"IN_PREPROC,FORCE_SPACE,EXPR_START",0,0,"       defined"
-27,WORD,NONE,PARENT_NOT_SET,15,15,21,1,0,0,1,"IN_PREPROC",0,0,"               _WIN32"
-27,NEWLINE,NONE,PARENT_NOT_SET,21,21,1,0,0,0,1,"",1,0,
-28,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-28,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-28,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"         API_EXPORT"
-28,DECLSPEC,NONE,PARENT_NOT_SET,20,20,30,1,1,1,1,"IN_PREPROC,STMT_START,EXPR_START",0,0,"                    __declspec"
-28,PAREN_OPEN,DECLSPEC,PARENT_NOT_SET,30,30,31,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                              ("
-28,WORD,NONE,PARENT_NOT_SET,31,31,40,0,1,2,1,"IN_PREPROC,EXPR_START",0,0,"                               dllexport"
-28,PAREN_CLOSE,DECLSPEC,PARENT_NOT_SET,40,40,41,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                        )"
-28,NEWLINE,NONE,PARENT_NOT_SET,41,41,1,0,0,0,1,"",1,0,
-29,PREPROC,PP_ELSE,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-29,PP_ELSE,NONE,PP_IF,2,2,6,0,0,0,1,"IN_PREPROC",0,0,"  else"
-29,NEWLINE,NONE,PARENT_NOT_SET,6,6,1,0,0,0,1,"",1,0,
-30,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-30,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-30,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC",0,0,"         API_EXPORT"
-30,NEWLINE,NONE,PARENT_NOT_SET,19,19,1,0,0,0,1,"",1,0,
-31,PREPROC,PP_ENDIF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-31,PP_ENDIF,NONE,PP_IF,2,2,7,0,0,0,0,"IN_PREPROC",0,0,"  endif"
-31,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0,
-33,NAMESPACE,NONE,PARENT_NOT_SET,1,1,10,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," namespace"
-33,WORD,NAMESPACE,PARENT_NOT_SET,11,11,26,1,0,0,0,"",0,0,"           outer_namespace"
-33,NEWLINE,NONE,PARENT_NOT_SET,26,26,1,0,0,0,0,"",1,0,
-34,BRACE_OPEN,NAMESPACE,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," {"
-34,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_NAMESPACE",2,0,
-36,NAMESPACE,NONE,PARENT_NOT_SET,1,1,10,0,1,1,0,"IN_NAMESPACE,FORCE_SPACE,STMT_START,EXPR_START",0,0," namespace"
-36,WORD,NAMESPACE,PARENT_NOT_SET,11,11,26,1,1,1,0,"IN_NAMESPACE",0,0,"           inner_namespace"
-36,NEWLINE,NONE,PARENT_NOT_SET,26,26,1,0,1,1,0,"IN_NAMESPACE",1,0,
-37,BRACE_OPEN,NAMESPACE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_NAMESPACE,PUNCTUATOR",0,0," {"
-37,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,2,2,0,"IN_NAMESPACE",2,0,
-39,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,2,2,0,"IN_NAMESPACE,FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
-39,TYPE,CLASS,PARENT_NOT_SET,7,7,12,1,2,2,0,"IN_NAMESPACE",0,0,"       Base1"
-39,BRACE_OPEN,CLASS,PARENT_NOT_SET,13,13,14,1,2,2,0,"IN_CLASS,IN_NAMESPACE,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"             {"
-39,BRACE_CLOSE,CLASS,PARENT_NOT_SET,15,15,16,1,2,2,0,"IN_CLASS,IN_NAMESPACE,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"               }"
-39,SEMICOLON,CLASS,PARENT_NOT_SET,16,16,17,0,2,2,0,"PUNCTUATOR",0,0,"                ;"
-39,NEWLINE,NONE,PARENT_NOT_SET,17,17,1,0,2,2,0,"",2,0,
-41,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,2,2,0,"STMT_START,EXPR_START",0,0," template"
-41,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,2,2,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-41,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,2,3,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
-41,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,18,18,19,0,2,2,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  >"
-41,CLASS,TEMPLATE,PARENT_NOT_SET,20,20,25,1,2,2,0,"FORCE_SPACE,EXPR_START",0,0,"                    class"
-41,TYPE,CLASS,PARENT_NOT_SET,26,26,31,1,2,2,0,"",0,0,"                          Base2"
-41,BRACE_OPEN,CLASS,PARENT_NOT_SET,32,32,33,1,2,2,0,"IN_CLASS,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"                                {"
-41,BRACE_CLOSE,CLASS,PARENT_NOT_SET,34,34,35,1,2,2,0,"IN_CLASS,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"                                  }"
-41,SEMICOLON,CLASS,PARENT_NOT_SET,35,35,36,0,2,2,0,"PUNCTUATOR",0,0,"                                   ;"
-41,NEWLINE,NONE,PARENT_NOT_SET,36,36,1,0,2,2,0,"",2,0,
-43,BRACE_CLOSE,NAMESPACE,PARENT_NOT_SET,1,1,2,0,1,1,0,"PUNCTUATOR",0,0," }"
-43,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"",2,0,
-45,BRACE_CLOSE,NAMESPACE,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," }"
-45,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,0,0,0,"",2,0,
-47,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,82,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }"
-47,NEWLINE,NONE,PARENT_NOT_SET,82,82,1,0,0,0,0,"",1,0,
-48,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
-48,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-48,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
-48,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
-48,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
-48,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
-48,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
-48,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
-49,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START",0,0," class"
-49,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-49,ATTRIBUTE,NONE,PARENT_NOT_SET,18,18,31,1,0,0,0,"",0,0,"                  __attribute__"
-49,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,31,31,32,0,0,0,0,"PUNCTUATOR",0,0,"                               ("
-49,PAREN_OPEN,NONE,PARENT_NOT_SET,32,32,33,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                ("
-49,WORD,NONE,PARENT_NOT_SET,33,33,47,0,0,2,0,"EXPR_START",0,0,"                                 __deprecated__"
-49,PAREN_CLOSE,NONE,PARENT_NOT_SET,47,47,48,0,0,1,0,"PUNCTUATOR",0,0,"                                               )"
-49,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,48,48,49,0,0,0,0,"PUNCTUATOR",0,0,"                                                )"
-49,MACRO_FUNC_CALL,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"",0,0,"                                                  ALIGNAS"
-49,FPAREN_OPEN,MACRO_FUNC_CALL,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
-49,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"EXPR_START",0,0,"                                                          4"
-49,FPAREN_CLOSE,MACRO_FUNC_CALL,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
-49,TYPE,CLASS,PARENT_NOT_SET,61,61,63,1,0,0,0,"",0,0,"                                                             c1"
-49,NEWLINE,NONE,PARENT_NOT_SET,63,63,1,0,0,0,0,"",1,0,
-50,CLASS_COLON,CLASS,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"         :"
-50,QUALIFIER,NONE,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START",0,0,"           public"
-50,TYPE,NONE,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                  outer_namespace"
-50,DC_MEMBER,NONE,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                 ::"
-50,TYPE,NONE,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                   inner_namespace"
-50,DC_MEMBER,NONE,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                  ::"
-50,TYPE,NONE,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                    Base1"
-50,COMMA,NONE,PARENT_NOT_SET,57,49,50,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                         ,"
-50,NEWLINE,NONE,PARENT_NOT_SET,58,50,3,0,0,0,0,"",1,0,
-51,QUALIFIER,NONE,PARENT_NOT_SET,9,3,9,0,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,EXPR_START",0,0,"         public"
-51,TYPE,NONE,PARENT_NOT_SET,16,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                outer_namespace"
-51,DC_MEMBER,NONE,PARENT_NOT_SET,31,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                               ::"
-51,TYPE,NONE,PARENT_NOT_SET,33,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                 inner_namespace"
-51,DC_MEMBER,NONE,PARENT_NOT_SET,48,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                ::"
-51,TYPE,NONE,PARENT_NOT_SET,50,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                  Base2"
-51,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,55,49,50,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                       <"
-51,TYPE,NONE,PARENT_NOT_SET,56,50,65,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                                                        outer_namespace"
-51,DC_MEMBER,NONE,PARENT_NOT_SET,71,65,67,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                                       ::"
-51,TYPE,NONE,PARENT_NOT_SET,73,67,82,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE",0,0,"                                                                         inner_namespace"
-51,DC_MEMBER,NONE,PARENT_NOT_SET,88,82,84,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                                                        ::"
-51,TYPE,NONE,PARENT_NOT_SET,90,84,89,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE",0,0,"                                                                                          Base1"
-51,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,95,89,90,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                                                               >"
-51,NEWLINE,NONE,PARENT_NOT_SET,96,90,1,0,0,0,0,"",1,0,
-52,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EXPR_START,EMPTY_BODY,PUNCTUATOR",0,0," {"
-52,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",2,0,
-54,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0," }"
-54,SEMICOLON,CLASS,PARENT_NOT_SET,2,2,3,0,0,0,0,"PUNCTUATOR",0,0,"  ;"
-54,NEWLINE,NONE,PARENT_NOT_SET,3,3,1,0,0,0,0,"",2,0,
-56,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,70,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type { }"
-56,NEWLINE,NONE,PARENT_NOT_SET,70,70,1,0,0,0,0,"",1,0,
-57,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
-57,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-57,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
-57,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
-57,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
-57,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
-57,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
-57,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
-58,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START",0,0," class"
-58,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-58,TYPE,CLASS,PARENT_NOT_SET,18,18,20,1,0,0,0,"",0,0,"                  c2"
-58,NEWLINE,NONE,PARENT_NOT_SET,20,20,1,0,0,0,0,"",1,0,
-59,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," {"
-59,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",1,0,
-60,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
-60,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
-60,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"IN_CLASS",2,0,
-62,TEMPLATE,NONE,PARENT_NOT_SET,1,4,12,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," template"
-62,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,12,13,0,1,1,0,"IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"         <"
-62,TYPENAME,NONE,PARENT_NOT_SET,10,13,21,0,1,2,0,"IN_TEMPLATE,IN_CLASS,FORCE_SPACE,EXPR_START",0,0,"          typename"
-62,TYPE,NONE,PARENT_NOT_SET,19,22,23,1,1,2,0,"IN_TEMPLATE,IN_CLASS",0,0,"                   T"
-62,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,20,23,24,0,1,1,0,"IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                    >"
-62,NEWLINE,NONE,PARENT_NOT_SET,21,24,4,0,1,1,0,"IN_CLASS",1,0,
-63,STRUCT,TEMPLATE,PARENT_NOT_SET,1,4,10,0,1,1,0,"IN_CLASS,FORCE_SPACE,EXPR_START",0,0," struct"
-63,TYPE,STRUCT,PARENT_NOT_SET,8,11,22,1,1,1,0,"IN_CLASS",0,0,"        inner_class"
-63,NEWLINE,NONE,PARENT_NOT_SET,19,22,4,0,1,1,0,"IN_CLASS",1,0,
-64,BRACE_OPEN,STRUCT,PARENT_NOT_SET,1,4,5,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0," {"
-64,NEWLINE,NONE,PARENT_NOT_SET,2,5,7,0,2,2,0,"IN_STRUCT,IN_CLASS",1,0,
-65,QUALIFIER,NONE,PARENT_NOT_SET,9,7,13,0,2,2,0,"IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0,"         static"
-65,TYPE,NONE,PARENT_NOT_SET,16,14,25,1,2,2,0,"IN_STRUCT,IN_CLASS,VAR_TYPE",0,0,"                inner_class"
-65,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,27,25,26,0,2,2,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                           <"
-65,TYPE,NONE,PARENT_NOT_SET,28,26,27,0,2,3,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,EXPR_START",0,0,"                            T"
-65,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,29,27,28,0,2,2,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                             >"
-65,PTR_TYPE,NONE,PARENT_NOT_SET,31,29,30,1,2,2,0,"IN_STRUCT,IN_CLASS,EXPR_START,VAR_TYPE,PUNCTUATOR",0,0,"                               *"
-65,WORD,NONE,PARENT_NOT_SET,32,30,43,0,2,2,0,"IN_STRUCT,IN_CLASS,EXPR_START,VAR_DEF,VAR_1ST",0,0,"                                m_inner_class"
-65,SEMICOLON,NONE,PARENT_NOT_SET,45,43,44,0,2,2,0,"IN_STRUCT,IN_CLASS,PUNCTUATOR",0,0,"                                             ;"
-65,NEWLINE,NONE,PARENT_NOT_SET,46,44,4,0,2,2,0,"IN_STRUCT,IN_CLASS",1,0,
-66,BRACE_CLOSE,STRUCT,PARENT_NOT_SET,1,4,5,0,1,1,0,"IN_STRUCT,IN_CLASS,PUNCTUATOR",0,0," }"
-66,SEMICOLON,STRUCT,PARENT_NOT_SET,2,5,6,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"  ;"
-66,NEWLINE,NONE,PARENT_NOT_SET,3,6,1,0,1,1,0,"IN_CLASS",1,0,
-67,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
-67,SEMICOLON,CLASS,PARENT_NOT_SET,2,2,3,0,0,0,0,"PUNCTUATOR",0,0,"  ;"
-67,NEWLINE,NONE,PARENT_NOT_SET,3,3,1,0,0,0,0,"",2,0,
-69,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,10,10,11,0,0,0,0,"IN_TEMPLATE,EXPR_START,PUNCTUATOR",0,0,"          >"
-69,TEMPLATE,NONE,PARENT_NOT_SET,12,12,20,1,0,0,0,"EXPR_START",0,0,"            template"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,20,20,21,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                    <"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,21,21,22,0,0,0,0,"IN_TEMPLATE,EXPR_START,PUNCTUATOR",0,0,"                     >"
-69,STRUCT,TEMPLATE,PARENT_NOT_SET,23,23,29,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                       struct"
-69,WORD,NONE,PARENT_NOT_SET,30,30,40,1,0,0,0,"FORCE_SPACE",0,0,"                              API_EXPORT"
-69,TYPE,NONE,PARENT_NOT_SET,41,41,43,1,0,0,0,"",0,0,"                                         c2"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,43,43,44,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                           <"
-69,TYPE,NONE,PARENT_NOT_SET,44,44,47,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                            int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,47,47,48,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                               >"
-69,DC_MEMBER,NONE,PARENT_NOT_SET,48,48,50,0,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                ::"
-69,TYPE,STRUCT,PARENT_NOT_SET,50,50,61,0,0,0,0,"VAR_TYPE",0,0,"                                                  inner_class"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,61,61,62,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                             <"
-69,TYPE,NONE,PARENT_NOT_SET,62,62,65,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                                              int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,65,65,66,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                 >"
-69,PTR_TYPE,NONE,PARENT_NOT_SET,67,67,68,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                   *"
-69,TYPE,NONE,PARENT_NOT_SET,68,68,70,0,0,0,0,"EXPR_START",0,0,"                                                                    c2"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,70,70,71,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                      <"
-69,TYPE,NONE,PARENT_NOT_SET,71,71,74,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                                                       int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,74,74,75,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                          >"
-69,DC_MEMBER,NONE,PARENT_NOT_SET,75,75,77,0,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                           ::"
-69,TYPE,NONE,PARENT_NOT_SET,77,77,88,0,0,0,0,"",0,0,"                                                                             inner_class"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,88,88,89,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                                        <"
-69,TYPE,NONE,PARENT_NOT_SET,89,89,92,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                                                                         int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,92,92,93,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                                            >"
-69,DC_MEMBER,NONE,PARENT_NOT_SET,93,93,95,0,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                             ::"
-69,WORD,NONE,PARENT_NOT_SET,95,95,108,0,0,0,0,"VAR_DEF,VAR_1ST,LVALUE",0,0,"                                                                                               m_inner_class"
-69,ASSIGN,NONE,PARENT_NOT_SET,109,109,110,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                                             ="
-69,WORD,NONE,PARENT_NOT_SET,111,111,118,1,0,0,0,"EXPR_START",0,0,"                                                                                                               nullptr"
-69,SEMICOLON,STRUCT,PARENT_NOT_SET,118,118,119,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                      ;"
-69,NEWLINE,NONE,PARENT_NOT_SET,119,119,1,0,0,0,0,"",2,0,
-71,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,66,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type"
-71,NEWLINE,NONE,PARENT_NOT_SET,66,66,1,0,0,0,0,"",1,0,
-72,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
-72,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-72,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
-72,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
-72,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
-72,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
-72,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
-72,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
-73,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START,INCOMPLETE",0,0," class"
-73,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"       API_EXPORT"
-73,TYPE,CLASS,PARENT_NOT_SET,18,18,20,1,0,0,0,"INCOMPLETE",0,0,"                  c2"
-73,SEMICOLON,CLASS,PARENT_NOT_SET,20,20,21,0,0,0,0,"PUNCTUATOR",0,0,"                    ;"
-73,NEWLINE,NONE,PARENT_NOT_SET,21,21,1,0,0,0,0,"",2,0,
-75,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,68,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type : bases ... { } x, ..."
-75,NEWLINE,NONE,PARENT_NOT_SET,68,68,1,0,0,0,0,"",1,0,
-76,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
-76,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-76,ATTRIBUTE,NONE,PARENT_NOT_SET,18,18,31,1,0,0,0,"",0,0,"                  __attribute__"
-76,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,31,31,32,0,0,0,0,"PUNCTUATOR",0,0,"                               ("
-76,PAREN_OPEN,NONE,PARENT_NOT_SET,32,32,33,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                ("
-76,WORD,NONE,PARENT_NOT_SET,33,33,47,0,0,2,0,"EXPR_START",0,0,"                                 __deprecated__"
-76,PAREN_CLOSE,NONE,PARENT_NOT_SET,47,47,48,0,0,1,0,"PUNCTUATOR",0,0,"                                               )"
-76,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,48,48,49,0,0,0,0,"PUNCTUATOR",0,0,"                                                )"
-76,MACRO_FUNC_CALL,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"",0,0,"                                                  ALIGNAS"
-76,FPAREN_OPEN,MACRO_FUNC_CALL,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
-76,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"EXPR_START",0,0,"                                                          4"
-76,FPAREN_CLOSE,MACRO_FUNC_CALL,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
-76,TYPE,CLASS,PARENT_NOT_SET,61,61,63,1,0,0,0,"VAR_TYPE",0,0,"                                                             c3"
-76,NEWLINE,NONE,PARENT_NOT_SET,63,63,1,0,0,0,0,"",1,0,
-77,CLASS_COLON,CLASS,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"         :"
-77,QUALIFIER,NONE,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START",0,0,"           public"
-77,TYPE,NONE,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                  outer_namespace"
-77,DC_MEMBER,NONE,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                 ::"
-77,TYPE,NONE,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                   inner_namespace"
-77,DC_MEMBER,NONE,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                  ::"
-77,TYPE,NONE,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                    Base2"
-77,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,57,49,50,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                         <"
-77,TYPE,NONE,PARENT_NOT_SET,58,50,53,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                                                          int"
-77,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,61,53,54,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                             >"
-77,COMMA,NONE,PARENT_NOT_SET,62,54,55,0,0,0,0,"IN_CLASS_BASE,EXPR_START,PUNCTUATOR",0,0,"                                                              ,"
-77,NEWLINE,NONE,PARENT_NOT_SET,63,55,3,0,0,0,0,"",1,0,
-78,QUALIFIER,NONE,PARENT_NOT_SET,9,3,9,0,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,EXPR_START",0,0,"         public"
-78,TYPE,NONE,PARENT_NOT_SET,16,10,12,1,0,0,0,"IN_CLASS_BASE",0,0,"                c2"
-78,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,18,12,13,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                  <"
-78,TYPE,NONE,PARENT_NOT_SET,19,13,16,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                   int"
-78,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,22,16,17,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                      >"
-78,DC_MEMBER,NONE,PARENT_NOT_SET,23,17,19,0,0,0,0,"IN_CLASS_BASE,EXPR_START,PUNCTUATOR",0,0,"                       ::"
-78,TYPE,NONE,PARENT_NOT_SET,25,19,30,0,0,0,0,"IN_CLASS_BASE",0,0,"                         inner_class"
-78,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,36,30,31,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                    <"
-78,TYPE,NONE,PARENT_NOT_SET,37,31,34,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                                     int"
-78,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,40,34,35,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                        >"
-78,NEWLINE,NONE,PARENT_NOT_SET,41,35,1,0,0,0,0,"",1,0,
-79,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EXPR_START,PUNCTUATOR",0,0," {"
-79,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",1,0,
-80,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
-80,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
-80,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"IN_CLASS",1,0,
-81,FUNC_CLASS_DEF,NONE,PARENT_NOT_SET,1,4,6,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," c3"
-81,FPAREN_OPEN,FUNC_CLASS_DEF,PARENT_NOT_SET,3,6,7,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"   ("
-81,TYPE,NONE,PARENT_NOT_SET,4,7,10,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE,LVALUE",0,0,"    int"
-81,WORD,NONE,PARENT_NOT_SET,8,11,12,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF,LVALUE",0,0,"        x"
-81,ASSIGN_DEFAULT_ARG,FUNC_PROTO,PARENT_NOT_SET,10,13,14,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"          ="
-81,NUMBER,NONE,PARENT_NOT_SET,12,15,16,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"            0"
-81,COMMA,NONE,PARENT_NOT_SET,13,16,17,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"             ,"
-81,TYPE,NONE,PARENT_NOT_SET,15,18,21,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE,LVALUE",0,0,"               int"
-81,WORD,NONE,PARENT_NOT_SET,19,22,23,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF,LVALUE",0,0,"                   y"
-81,ASSIGN_DEFAULT_ARG,FUNC_PROTO,PARENT_NOT_SET,21,24,25,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                     ="
-81,NUMBER,NONE,PARENT_NOT_SET,23,26,27,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                       0"
-81,COMMA,NONE,PARENT_NOT_SET,24,27,28,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                        ,"
-81,TYPE,NONE,PARENT_NOT_SET,26,29,32,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE,LVALUE",0,0,"                          int"
-81,WORD,NONE,PARENT_NOT_SET,30,33,34,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF,LVALUE",0,0,"                              z"
-81,ASSIGN_DEFAULT_ARG,FUNC_PROTO,PARENT_NOT_SET,32,35,36,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                ="
-81,NUMBER,NONE,PARENT_NOT_SET,34,37,38,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                  0"
-81,FPAREN_CLOSE,FUNC_CLASS_DEF,PARENT_NOT_SET,35,38,39,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                   )"
-81,CONSTR_COLON,NONE,PARENT_NOT_SET,37,40,41,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                     :"
-81,FUNC_CTOR_VAR,NONE,PARENT_NOT_SET,39,42,45,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START",0,0,"                                       m_x"
-81,FPAREN_OPEN,FUNC_CTOR_VAR,PARENT_NOT_SET,42,45,46,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                          ("
-81,WORD,NONE,PARENT_NOT_SET,43,46,47,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                           x"
-81,FPAREN_CLOSE,FUNC_CTOR_VAR,PARENT_NOT_SET,44,47,48,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                            )"
-81,COMMA,NONE,PARENT_NOT_SET,45,48,49,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                             ,"
-81,FUNC_CTOR_VAR,NONE,PARENT_NOT_SET,47,50,53,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                               m_y"
-81,FPAREN_OPEN,FUNC_CTOR_VAR,PARENT_NOT_SET,50,53,54,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                  ("
-81,WORD,NONE,PARENT_NOT_SET,51,54,55,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                                   y"
-81,FPAREN_CLOSE,FUNC_CTOR_VAR,PARENT_NOT_SET,52,55,56,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                    )"
-81,COMMA,NONE,PARENT_NOT_SET,53,56,57,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                     ,"
-81,FUNC_CTOR_VAR,NONE,PARENT_NOT_SET,55,58,61,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                                       m_z"
-81,FPAREN_OPEN,FUNC_CTOR_VAR,PARENT_NOT_SET,58,61,62,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                          ("
-81,WORD,NONE,PARENT_NOT_SET,59,62,63,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                                           z"
-81,FPAREN_CLOSE,FUNC_CTOR_VAR,PARENT_NOT_SET,60,63,64,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                            )"
-81,BRACE_OPEN,FUNC_CLASS_DEF,PARENT_NOT_SET,62,65,66,1,1,1,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0,"                                                              {"
-81,NEWLINE,NONE,PARENT_NOT_SET,63,67,0,0,1,1,0,"IN_CLASS",1,0,
-81,BRACE_CLOSE,FUNC_CLASS_DEF,PARENT_NOT_SET,1,67,68,1,1,1,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0," }"
-81,NEWLINE,NONE,PARENT_NOT_SET,2,68,4,0,1,1,0,"IN_CLASS",2,0,
-83,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-83,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_x"
-83,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-83,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
-84,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-84,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_y"
-84,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-84,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
-85,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-85,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_z"
-85,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-85,NEWLINE,NONE,PARENT_NOT_SET,9,12,1,0,1,1,0,"IN_CLASS",1,0,
-86,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
-86,WORD,NONE,PARENT_NOT_SET,3,3,6,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"   c31"
-86,COMMA,NONE,PARENT_NOT_SET,6,6,7,0,0,0,0,"PUNCTUATOR",0,0,"      ,"
-86,PTR_TYPE,CLASS,PARENT_NOT_SET,8,8,9,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"        *"
-86,WORD,NONE,PARENT_NOT_SET,9,9,12,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"         c32"
-86,ASSIGN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,0,"PUNCTUATOR",0,0,"             ="
-86,WORD,NONE,PARENT_NOT_SET,15,15,22,1,0,0,0,"EXPR_START",0,0,"               nullptr"
-86,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ,"
-86,PTR_TYPE,CLASS,PARENT_NOT_SET,24,24,25,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                        *"
-86,WORD,NONE,PARENT_NOT_SET,25,25,28,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                         c33"
-86,TSQUARE,NONE,PARENT_NOT_SET,28,28,30,0,0,0,0,"PUNCTUATOR",0,0,"                            []"
-86,ASSIGN,NONE,PARENT_NOT_SET,31,31,32,1,0,0,0,"PUNCTUATOR",0,0,"                               ="
-86,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,33,33,34,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                 {"
-86,WORD,NONE,PARENT_NOT_SET,35,35,42,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                   nullptr"
-86,COMMA,NONE,PARENT_NOT_SET,42,42,43,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                          ,"
-86,WORD,NONE,PARENT_NOT_SET,44,44,51,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                            nullptr"
-86,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,52,52,53,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                    }"
-86,COMMA,NONE,PARENT_NOT_SET,53,53,54,0,0,0,0,"PUNCTUATOR",0,0,"                                                     ,"
-86,WORD,NONE,PARENT_NOT_SET,55,55,58,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"                                                       c34"
-86,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,58,58,59,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                          {"
-86,NUMBER,NONE,PARENT_NOT_SET,60,60,61,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                            0"
-86,COMMA,NONE,PARENT_NOT_SET,61,61,62,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                             ,"
-86,NUMBER,NONE,PARENT_NOT_SET,63,63,64,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                               1"
-86,COMMA,NONE,PARENT_NOT_SET,64,64,65,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                ,"
-86,NUMBER,NONE,PARENT_NOT_SET,66,66,67,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                  2"
-86,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,67,67,68,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                   }"
-86,COMMA,NONE,PARENT_NOT_SET,68,68,69,0,0,0,0,"PUNCTUATOR",0,0,"                                                                    ,"
-86,PTR_TYPE,CLASS,PARENT_NOT_SET,70,70,71,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                      *"
-86,QUALIFIER,NONE,PARENT_NOT_SET,72,72,77,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                                                                        const"
-86,FUNC_CALL,NONE,PARENT_NOT_SET,78,78,81,1,0,0,0,"VAR_DEF,VAR_INLINE",0,0,"                                                                              c35"
-86,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,81,81,82,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                 ("
-86,WORD,NONE,PARENT_NOT_SET,82,82,89,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                  nullptr"
-86,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,89,89,90,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                         )"
-86,COMMA,NONE,PARENT_NOT_SET,90,90,91,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                          ,"
-86,FUNC_CALL,NONE,PARENT_NOT_SET,92,92,95,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                                                            c16"
-86,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,95,95,96,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                               ("
-86,NUMBER,NONE,PARENT_NOT_SET,96,96,97,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                0"
-86,COMMA,NONE,PARENT_NOT_SET,97,97,98,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                 ,"
-86,NUMBER,NONE,PARENT_NOT_SET,99,99,100,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                   1"
-86,COMMA,NONE,PARENT_NOT_SET,100,100,101,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                    ,"
-86,NUMBER,NONE,PARENT_NOT_SET,102,102,103,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                      2"
-86,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,103,103,104,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                       )"
-86,SEMICOLON,CLASS,PARENT_NOT_SET,104,104,105,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                        ;"
-86,NEWLINE,NONE,PARENT_NOT_SET,105,105,1,0,0,0,0,"",2,0,
-88,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,52,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type x, ..."
-88,NEWLINE,NONE,PARENT_NOT_SET,52,52,1,0,0,0,0,"",1,0,
-89,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
-89,ATTRIBUTE,NONE,PARENT_NOT_SET,7,7,20,1,0,0,0,"",0,0,"       __attribute__"
-89,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,20,20,21,0,0,0,0,"PUNCTUATOR",0,0,"                    ("
-89,PAREN_OPEN,NONE,PARENT_NOT_SET,21,21,22,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                     ("
-89,WORD,NONE,PARENT_NOT_SET,22,22,36,0,0,2,0,"EXPR_START",0,0,"                      __deprecated__"
-89,PAREN_CLOSE,NONE,PARENT_NOT_SET,36,36,37,0,0,1,0,"PUNCTUATOR",0,0,"                                    )"
-89,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,37,37,38,0,0,0,0,"PUNCTUATOR",0,0,"                                     )"
-89,WORD,NONE,PARENT_NOT_SET,39,39,49,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                                       API_EXPORT"
-89,MACRO_FUNC_CALL,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"",0,0,"                                                  ALIGNAS"
-89,FPAREN_OPEN,MACRO_FUNC_CALL,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
-89,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"EXPR_START",0,0,"                                                          4"
-89,FPAREN_CLOSE,MACRO_FUNC_CALL,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
-89,TYPE,CLASS,PARENT_NOT_SET,61,61,63,1,0,0,0,"FORCE_SPACE,VAR_TYPE",0,0,"                                                             c3"
-89,WORD,NONE,PARENT_NOT_SET,64,64,67,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                                                                c41"
-89,COMMA,NONE,PARENT_NOT_SET,67,67,68,0,0,0,0,"PUNCTUATOR",0,0,"                                                                   ,"
-89,PTR_TYPE,CLASS,PARENT_NOT_SET,69,69,70,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                     *"
-89,WORD,NONE,PARENT_NOT_SET,70,70,73,0,0,0,0,"EXPR_START,VAR_DEF,LVALUE",0,0,"                                                                      c42"
-89,ASSIGN,NONE,PARENT_NOT_SET,74,74,75,1,0,0,0,"PUNCTUATOR",0,0,"                                                                          ="
-89,WORD,NONE,PARENT_NOT_SET,76,76,79,1,0,0,0,"EXPR_START",0,0,"                                                                            c32"
-89,QUESTION,NONE,PARENT_NOT_SET,80,80,81,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                ?"
-89,WORD,NONE,PARENT_NOT_SET,82,82,85,1,0,0,0,"EXPR_START",0,0,"                                                                                  c32"
-89,COND_COLON,NONE,PARENT_NOT_SET,86,86,87,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                      :"
-89,WORD,NONE,PARENT_NOT_SET,88,88,95,1,0,0,0,"STMT_START,EXPR_START",0,0,"                                                                                        nullptr"
-89,COMMA,NONE,PARENT_NOT_SET,95,95,96,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                               ,"
-89,PTR_TYPE,CLASS,PARENT_NOT_SET,97,97,98,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                                 *"
-89,WORD,NONE,PARENT_NOT_SET,98,98,101,0,0,0,0,"EXPR_START,VAR_DEF",0,0,"                                                                                                  c43"
-89,TSQUARE,NONE,PARENT_NOT_SET,101,101,103,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                     []"
-89,ASSIGN,NONE,PARENT_NOT_SET,104,104,105,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                                        ="
-89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,106,106,107,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                                                                                          {"
-89,WORD,NONE,PARENT_NOT_SET,108,108,115,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                            nullptr"
-89,COMMA,NONE,PARENT_NOT_SET,115,115,116,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                   ,"
-89,WORD,NONE,PARENT_NOT_SET,117,117,124,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                     nullptr"
-89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,125,125,126,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                             }"
-89,COMMA,NONE,PARENT_NOT_SET,126,126,127,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                              ,"
-89,WORD,NONE,PARENT_NOT_SET,128,128,131,1,0,0,0,"EXPR_START,VAR_DEF,LVALUE",0,0,"                                                                                                                                c44"
-89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,131,131,132,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                   {"
-89,NUMBER,NONE,PARENT_NOT_SET,133,133,134,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                                                                                                     0"
-89,COMMA,NONE,PARENT_NOT_SET,134,134,135,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                      ,"
-89,NUMBER,NONE,PARENT_NOT_SET,136,136,137,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                                        1"
-89,COMMA,NONE,PARENT_NOT_SET,137,137,138,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                         ,"
-89,NUMBER,NONE,PARENT_NOT_SET,139,139,140,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                                           2"
-89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,140,140,141,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                            }"
-89,COMMA,NONE,PARENT_NOT_SET,141,141,142,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                             ,"
-89,PTR_TYPE,CLASS,PARENT_NOT_SET,143,143,144,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                                                                               *"
-89,QUALIFIER,NONE,PARENT_NOT_SET,145,145,150,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                                                                                                                                                 const"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,151,151,154,1,0,0,0,"VAR_DEF",0,0,"                                                                                                                                                       c45"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,154,154,155,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                          ("
-89,WORD,NONE,PARENT_NOT_SET,155,155,162,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                           nullptr"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,162,162,163,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                  )"
-89,COMMA,NONE,PARENT_NOT_SET,163,163,164,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                   ,"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,165,165,168,1,0,0,0,"EXPR_START,VAR_DEF",0,0,"                                                                                                                                                                     c46"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,168,168,169,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                        ("
-89,NUMBER,NONE,PARENT_NOT_SET,169,169,170,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                         0"
-89,COMMA,NONE,PARENT_NOT_SET,170,170,171,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                          ,"
-89,NUMBER,NONE,PARENT_NOT_SET,172,172,173,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                            1"
-89,COMMA,NONE,PARENT_NOT_SET,173,173,174,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                             ,"
-89,NUMBER,NONE,PARENT_NOT_SET,175,175,176,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                               2"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,176,176,177,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                                )"
-89,SEMICOLON,CLASS,PARENT_NOT_SET,177,177,178,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                                 ;"
-89,NEWLINE,NONE,PARENT_NOT_SET,178,178,1,0,0,0,0,"",2,0,
-91,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,68,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type : bases ... { } x, ..."
-91,NEWLINE,NONE,PARENT_NOT_SET,68,68,1,0,0,0,0,"",1,0,
-92,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
-92,FUNC_CALL,NONE,PARENT_NOT_SET,7,7,14,1,0,0,0,"",0,0,"       ALIGNAS"
-92,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,14,14,15,0,0,0,0,"PUNCTUATOR",0,0,"              ("
-92,NUMBER,NONE,PARENT_NOT_SET,15,15,16,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"               4"
-92,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,16,16,17,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                )"
-92,WORD,NONE,PARENT_NOT_SET,18,18,28,1,0,0,0,"FORCE_SPACE",0,0,"                  API_EXPORT"
-92,ATTRIBUTE,NONE,PARENT_NOT_SET,29,29,42,1,0,0,0,"",0,0,"                             __attribute__"
-92,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,42,42,43,0,0,0,0,"PUNCTUATOR",0,0,"                                          ("
-92,PAREN_OPEN,NONE,PARENT_NOT_SET,43,43,44,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                           ("
-92,WORD,NONE,PARENT_NOT_SET,44,44,58,0,0,2,0,"EXPR_START",0,0,"                                            __deprecated__"
-92,PAREN_CLOSE,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"PUNCTUATOR",0,0,"                                                          )"
-92,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
-92,NEWLINE,NONE,PARENT_NOT_SET,60,60,1,0,0,0,0,"",1,0,
-93,CLASS_COLON,CLASS,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"         :"
-93,QUALIFIER,NONE,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START",0,0,"           public"
-93,TYPE,NONE,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                  outer_namespace"
-93,DC_MEMBER,NONE,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                 ::"
-93,TYPE,NONE,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                   inner_namespace"
-93,DC_MEMBER,NONE,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                  ::"
-93,TYPE,NONE,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                    Base1"
-93,NEWLINE,NONE,PARENT_NOT_SET,57,49,1,0,0,0,0,"",1,0,
-94,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," {"
-94,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",1,0,
-95,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
-95,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
-95,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"IN_CLASS",1,0,
-96,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-96,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_x"
-96,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-96,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
-97,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-97,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_y"
-97,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-97,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
-98,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-98,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_z"
-98,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-98,NEWLINE,NONE,PARENT_NOT_SET,9,12,1,0,1,1,0,"IN_CLASS",1,0,
-99,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
-99,WORD,NONE,PARENT_NOT_SET,3,3,6,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"   c51"
-99,COMMA,NONE,PARENT_NOT_SET,6,6,7,0,0,0,0,"PUNCTUATOR",0,0,"      ,"
-99,PTR_TYPE,CLASS,PARENT_NOT_SET,8,8,9,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"        *"
-99,WORD,NONE,PARENT_NOT_SET,9,9,12,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"         c52"
-99,ASSIGN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,0,"PUNCTUATOR",0,0,"             ="
-99,WORD,NONE,PARENT_NOT_SET,15,15,22,1,0,0,0,"EXPR_START",0,0,"               nullptr"
-99,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ,"
-99,PTR_TYPE,CLASS,PARENT_NOT_SET,24,24,25,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                        *"
-99,WORD,NONE,PARENT_NOT_SET,25,25,28,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                         c53"
-99,TSQUARE,NONE,PARENT_NOT_SET,28,28,30,0,0,0,0,"PUNCTUATOR",0,0,"                            []"
-99,ASSIGN,NONE,PARENT_NOT_SET,31,31,32,1,0,0,0,"PUNCTUATOR",0,0,"                               ="
-99,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,33,33,34,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                 {"
-99,WORD,NONE,PARENT_NOT_SET,35,35,42,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                   nullptr"
-99,COMMA,NONE,PARENT_NOT_SET,42,42,43,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                          ,"
-99,WORD,NONE,PARENT_NOT_SET,44,44,51,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                            nullptr"
-99,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,52,52,53,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                    }"
-99,SEMICOLON,CLASS,PARENT_NOT_SET,53,53,54,0,0,0,0,"PUNCTUATOR",0,0,"                                                     ;"
-99,NEWLINE,NONE,PARENT_NOT_SET,54,54,1,0,0,0,0,"",3,0,
-102,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,44,0,0,0,0,"",0,0," // enum type : integral_type { ... } x, ..."
-102,NEWLINE,NONE,PARENT_NOT_SET,44,44,1,0,0,0,0,"",1,0,
-103,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
-103,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"VAR_TYPE",0,0,"      e1"
-103,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
-103,TYPE,BIT_COLON,PARENT_NOT_SET,11,11,15,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"           long"
-103,TYPE,BIT_COLON,PARENT_NOT_SET,16,16,20,1,0,0,0,"",0,0,"                long"
-103,BRACE_OPEN,ENUM,PARENT_NOT_SET,21,21,22,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                     {"
-103,WORD,NONE,PARENT_NOT_SET,23,23,25,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                       a1"
-103,COMMA,NONE,PARENT_NOT_SET,25,25,26,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                         ,"
-103,WORD,NONE,PARENT_NOT_SET,27,27,29,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                           b1"
-103,COMMA,NONE,PARENT_NOT_SET,29,29,30,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                             ,"
-103,WORD,NONE,PARENT_NOT_SET,31,31,33,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                               d1"
-103,BRACE_CLOSE,ENUM,PARENT_NOT_SET,34,34,35,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                  }"
-103,WORD,NONE,PARENT_NOT_SET,36,36,39,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                    e11"
-103,COMMA,NONE,PARENT_NOT_SET,39,39,40,0,0,0,0,"PUNCTUATOR",0,0,"                                       ,"
-103,WORD,NONE,PARENT_NOT_SET,41,41,44,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                         e12"
-103,COMMA,NONE,PARENT_NOT_SET,44,44,45,0,0,0,0,"PUNCTUATOR",0,0,"                                            ,"
-103,WORD,NONE,PARENT_NOT_SET,46,46,49,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                              e13"
-103,SEMICOLON,ENUM,PARENT_NOT_SET,49,49,50,0,0,0,0,"PUNCTUATOR",0,0,"                                                 ;"
-103,NEWLINE,NONE,PARENT_NOT_SET,50,50,1,0,0,0,0,"",2,0,
-105,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,37,0,0,0,0,"",0,0," // enum type : integral_type { ... }"
-105,NEWLINE,NONE,PARENT_NOT_SET,37,37,1,0,0,0,0,"",1,0,
-106,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
-106,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"",0,0,"      e2"
-106,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
-106,TYPE,BIT_COLON,PARENT_NOT_SET,11,11,19,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"           unsigned"
-106,TYPE,BIT_COLON,PARENT_NOT_SET,20,20,23,1,0,0,0,"",0,0,"                    int"
-106,BRACE_OPEN,ENUM,PARENT_NOT_SET,24,24,25,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                        {"
-106,WORD,NONE,PARENT_NOT_SET,26,26,28,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                          a2"
-106,COMMA,NONE,PARENT_NOT_SET,28,28,29,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                            ,"
-106,WORD,NONE,PARENT_NOT_SET,30,30,32,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                              b2"
-106,COMMA,NONE,PARENT_NOT_SET,32,32,33,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                ,"
-106,WORD,NONE,PARENT_NOT_SET,34,34,36,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                  d2"
-106,BRACE_CLOSE,ENUM,PARENT_NOT_SET,37,37,38,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                     }"
-106,SEMICOLON,ENUM,PARENT_NOT_SET,38,38,39,0,0,0,0,"PUNCTUATOR",0,0,"                                      ;"
-106,NEWLINE,NONE,PARENT_NOT_SET,39,39,1,0,0,0,0,"",2,0,
-108,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,29,0,0,0,0,"",0,0," // enum type : integral_type"
-108,NEWLINE,NONE,PARENT_NOT_SET,29,29,1,0,0,0,0,"",1,0,
-109,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
-109,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"INCOMPLETE",0,0,"      e3"
-109,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
-109,TYPE,BIT_COLON,PARENT_NOT_SET,11,11,16,1,0,0,0,"STMT_START,EXPR_START",0,0,"           short"
-109,SEMICOLON,ENUM,PARENT_NOT_SET,16,16,17,0,0,0,0,"PUNCTUATOR",0,0,"                ;"
-109,NEWLINE,NONE,PARENT_NOT_SET,17,17,1,0,0,0,0,"",2,0,
-111,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,20,0,0,0,0,"",0,0," // enum type x, ..."
-111,NEWLINE,NONE,PARENT_NOT_SET,20,20,1,0,0,0,0,"",1,0,
-112,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
-112,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"FORCE_SPACE,VAR_TYPE",0,0,"      e3"
-112,WORD,NONE,PARENT_NOT_SET,9,9,12,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"         e31"
-112,COMMA,NONE,PARENT_NOT_SET,12,12,13,0,0,0,0,"PUNCTUATOR",0,0,"            ,"
-112,WORD,NONE,PARENT_NOT_SET,14,14,17,1,0,0,0,"EXPR_START,VAR_DEF",0,0,"              e32"
-112,SEMICOLON,ENUM,PARENT_NOT_SET,17,17,18,0,0,0,0,"PUNCTUATOR",0,0,"                 ;"
-112,NEWLINE,NONE,PARENT_NOT_SET,18,18,1,0,0,0,0,"",2,0,
-114,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,50,0,0,0,0,"",0,0," // enum class type : integral_type { ... } x, ..."
-114,NEWLINE,NONE,PARENT_NOT_SET,50,50,1,0,0,0,0,"",1,0,
-115,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
-115,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE",0,0,"      class"
-115,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"VAR_TYPE",0,0,"            e4"
-115,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
-115,TYPE,BIT_COLON,PARENT_NOT_SET,17,17,21,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                 long"
-115,TYPE,BIT_COLON,PARENT_NOT_SET,22,22,26,1,0,0,0,"",0,0,"                      long"
-115,BRACE_OPEN,ENUM,PARENT_NOT_SET,27,27,28,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                           {"
-115,WORD,NONE,PARENT_NOT_SET,29,29,31,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                             a4"
-115,COMMA,NONE,PARENT_NOT_SET,31,31,32,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                               ,"
-115,WORD,NONE,PARENT_NOT_SET,33,33,35,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                 b4"
-115,COMMA,NONE,PARENT_NOT_SET,35,35,36,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                   ,"
-115,WORD,NONE,PARENT_NOT_SET,37,37,39,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                     d4"
-115,BRACE_CLOSE,ENUM,PARENT_NOT_SET,40,40,41,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                        }"
-115,WORD,NONE,PARENT_NOT_SET,42,42,45,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                          e41"
-115,COMMA,NONE,PARENT_NOT_SET,45,45,46,0,0,0,0,"PUNCTUATOR",0,0,"                                             ,"
-115,WORD,NONE,PARENT_NOT_SET,47,47,50,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                               e42"
-115,COMMA,NONE,PARENT_NOT_SET,50,50,51,0,0,0,0,"PUNCTUATOR",0,0,"                                                  ,"
-115,WORD,NONE,PARENT_NOT_SET,52,52,55,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                    e43"
-115,COMMA,NONE,PARENT_NOT_SET,55,55,56,0,0,0,0,"PUNCTUATOR",0,0,"                                                       ,"
-115,WORD,NONE,PARENT_NOT_SET,57,57,60,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                         e44"
-115,SEMICOLON,ENUM,PARENT_NOT_SET,60,60,61,0,0,0,0,"PUNCTUATOR",0,0,"                                                            ;"
-115,NEWLINE,NONE,PARENT_NOT_SET,61,61,1,0,0,0,0,"",2,0,
-117,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,43,0,0,0,0,"",0,0," // enum class type : integral_type { ... }"
-117,NEWLINE,NONE,PARENT_NOT_SET,43,43,1,0,0,0,0,"",1,0,
-118,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
-118,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE",0,0,"      class"
-118,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"",0,0,"            e5"
-118,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
-118,TYPE,BIT_COLON,PARENT_NOT_SET,17,17,25,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                 unsigned"
-118,TYPE,BIT_COLON,PARENT_NOT_SET,26,26,29,1,0,0,0,"",0,0,"                          int"
-118,BRACE_OPEN,ENUM,PARENT_NOT_SET,30,30,31,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                              {"
-118,WORD,NONE,PARENT_NOT_SET,32,32,34,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                                a5"
-118,COMMA,NONE,PARENT_NOT_SET,34,34,35,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                  ,"
-118,WORD,NONE,PARENT_NOT_SET,36,36,38,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                    b5"
-118,COMMA,NONE,PARENT_NOT_SET,38,38,39,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                      ,"
-118,WORD,NONE,PARENT_NOT_SET,40,40,42,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                        d5"
-118,BRACE_CLOSE,ENUM,PARENT_NOT_SET,43,43,44,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                           }"
-118,SEMICOLON,ENUM,PARENT_NOT_SET,44,44,45,0,0,0,0,"PUNCTUATOR",0,0,"                                            ;"
-118,NEWLINE,NONE,PARENT_NOT_SET,45,45,1,0,0,0,0,"",2,0,
-120,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,35,0,0,0,0,"",0,0," // enum class type : integral_type"
-120,NEWLINE,NONE,PARENT_NOT_SET,35,35,1,0,0,0,0,"",1,0,
-121,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
-121,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"      class"
-121,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"INCOMPLETE",0,0,"            e6"
-121,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
-121,TYPE,BIT_COLON,PARENT_NOT_SET,17,17,22,1,0,0,0,"STMT_START,EXPR_START",0,0,"                 short"
-121,SEMICOLON,ENUM,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ;"
-121,NEWLINE,NONE,PARENT_NOT_SET,23,23,1,0,0,0,0,"",2,0,
-123,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,19,0,0,0,0,"",0,0," // enum class type"
-123,NEWLINE,NONE,PARENT_NOT_SET,19,19,1,0,0,0,0,"",1,0,
-124,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
-124,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"      class"
-124,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"INCOMPLETE",0,0,"            e7"
-124,SEMICOLON,ENUM,PARENT_NOT_SET,14,14,15,0,0,0,0,"PUNCTUATOR",0,0,"              ;"
-124,NEWLINE,NONE,PARENT_NOT_SET,15,15,1,0,0,0,0,"",2,0,
-126,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,39,0,0,0,0,"",0,0," // enum : integral_type { ... } x, ..."
-126,NEWLINE,NONE,PARENT_NOT_SET,39,39,1,0,0,0,0,"",1,0,
-127,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"STMT_START,EXPR_START",0,0," enum"
-127,BIT_COLON,ENUM,PARENT_NOT_SET,6,6,7,1,0,0,0,"PUNCTUATOR",0,0,"      :"
-127,TYPE,BIT_COLON,PARENT_NOT_SET,8,8,12,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"        long"
-127,TYPE,BIT_COLON,PARENT_NOT_SET,13,13,17,1,0,0,0,"",0,0,"             long"
-127,BRACE_OPEN,ENUM,PARENT_NOT_SET,18,18,19,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                  {"
-127,WORD,NONE,PARENT_NOT_SET,20,20,22,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                    a8"
-127,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                      ,"
-127,WORD,NONE,PARENT_NOT_SET,24,24,26,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                        b8"
-127,COMMA,NONE,PARENT_NOT_SET,26,26,27,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                          ,"
-127,WORD,NONE,PARENT_NOT_SET,28,28,30,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                            c8"
-127,BRACE_CLOSE,ENUM,PARENT_NOT_SET,31,31,32,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                               }"
-127,WORD,NONE,PARENT_NOT_SET,33,33,36,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                 e81"
-127,COMMA,NONE,PARENT_NOT_SET,36,36,37,0,0,0,0,"PUNCTUATOR",0,0,"                                    ,"
-127,WORD,NONE,PARENT_NOT_SET,38,38,41,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                      e82"
-127,SEMICOLON,ENUM,PARENT_NOT_SET,41,41,42,0,0,0,0,"PUNCTUATOR",0,0,"                                         ;"
-127,NEWLINE,NONE,PARENT_NOT_SET,42,42,1,0,0,0,0,"",2,0,
-129,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,23,0,0,0,0,"",0,0," // enum { ... } x, ..."
-129,NEWLINE,NONE,PARENT_NOT_SET,23,23,1,0,0,0,0,"",1,0,
-130,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"STMT_START,EXPR_START",0,0," enum"
-130,BRACE_OPEN,ENUM,PARENT_NOT_SET,6,6,7,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"      {"
-130,WORD,NONE,PARENT_NOT_SET,8,8,10,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"        a9"
-130,COMMA,NONE,PARENT_NOT_SET,10,10,11,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"          ,"
-130,WORD,NONE,PARENT_NOT_SET,12,12,14,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"            b9"
-130,COMMA,NONE,PARENT_NOT_SET,14,14,15,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"              ,"
-130,WORD,NONE,PARENT_NOT_SET,16,16,18,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                c9"
-130,BRACE_CLOSE,ENUM,PARENT_NOT_SET,19,19,20,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                   }"
-130,WORD,NONE,PARENT_NOT_SET,21,21,24,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                     e91"
-130,COMMA,NONE,PARENT_NOT_SET,24,24,25,0,0,0,0,"PUNCTUATOR",0,0,"                        ,"
-130,WORD,NONE,PARENT_NOT_SET,26,26,29,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                          e92"
-130,SEMICOLON,ENUM,PARENT_NOT_SET,29,29,30,0,0,0,0,"PUNCTUATOR",0,0,"                             ;"
-130,NEWLINE,NONE,PARENT_NOT_SET,30,30,1,0,0,0,0,"",2,0,
-132,UNION,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," union"
-132,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-132,TYPE,UNION,PARENT_NOT_SET,18,18,20,1,0,0,0,"VAR_TYPE",0,0,"                  u1"
-132,BRACE_OPEN,UNION,PARENT_NOT_SET,21,21,22,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                     {"
-132,TYPE,NONE,PARENT_NOT_SET,23,23,26,1,1,1,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,ONE_LINER",0,0,"                       int"
-132,WORD,NONE,PARENT_NOT_SET,27,27,28,1,1,1,0,"VAR_DEF,VAR_1ST,ONE_LINER",0,0,"                           x"
-132,SEMICOLON,NONE,PARENT_NOT_SET,28,28,29,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                            ;"
-132,TYPE,NONE,PARENT_NOT_SET,30,30,34,1,1,1,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,ONE_LINER",0,0,"                              long"
-132,WORD,NONE,PARENT_NOT_SET,35,35,36,1,1,1,0,"VAR_DEF,VAR_1ST,ONE_LINER",0,0,"                                   y"
-132,SEMICOLON,NONE,PARENT_NOT_SET,36,36,37,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                    ;"
-132,BRACE_CLOSE,UNION,PARENT_NOT_SET,38,38,39,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                      }"
-132,WORD,NONE,PARENT_NOT_SET,40,40,43,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                        u11"
-132,COMMA,NONE,PARENT_NOT_SET,43,43,44,0,0,0,0,"PUNCTUATOR",0,0,"                                           ,"
-132,PTR_TYPE,UNION,PARENT_NOT_SET,45,45,46,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                             *"
-132,WORD,NONE,PARENT_NOT_SET,46,46,49,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"                                              u12"
-132,ASSIGN,NONE,PARENT_NOT_SET,50,50,51,1,0,0,0,"PUNCTUATOR",0,0,"                                                  ="
-132,WORD,NONE,PARENT_NOT_SET,52,52,59,1,0,0,0,"EXPR_START",0,0,"                                                    nullptr"
-132,COMMA,NONE,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           ,"
-132,PTR_TYPE,UNION,PARENT_NOT_SET,61,61,62,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                             *"
-132,WORD,NONE,PARENT_NOT_SET,62,62,65,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"                                                              u13"
-132,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,65,65,66,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                 {"
-132,NUMBER,NONE,PARENT_NOT_SET,66,66,67,0,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                                  0"
-132,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,67,67,68,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                   }"
-132,SEMICOLON,UNION,PARENT_NOT_SET,68,68,69,0,0,0,0,"PUNCTUATOR",0,0,"                                                                    ;"
-132,NEWLINE,NONE,PARENT_NOT_SET,69,69,1,0,0,0,0,"",2,0,
-134,UNION,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," union"
-134,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-134,TYPE,UNION,PARENT_NOT_SET,18,18,20,1,0,0,0,"FORCE_SPACE,VAR_TYPE",0,0,"                  u1"
-134,WORD,NONE,PARENT_NOT_SET,21,21,24,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                     u21"
-134,SEMICOLON,UNION,PARENT_NOT_SET,24,24,25,0,0,0,0,"PUNCTUATOR",0,0,"                        ;"
-134,NEWLINE,NONE,PARENT_NOT_SET,25,25,1,0,0,0,0,"",1,0,
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.txt
deleted file mode 100644
index 4cf1a681..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.txt
+++ /dev/null
@@ -1,692 +0,0 @@
-
-# option(s) with 'not default' value: 0
-#
-# -=====-
-# number of loops               = 1
-# -=====-
-# language                      = CPP
-# -=====-
-# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp      Flag   Nl  Text
-#   1>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  3][0/0/0][          0][9-0] /**�    * the enum (and variable declarations thereof) could be of�    * the following forms:�    *�    * "enum type [: integral_type] { ... } [x, ...]"�    * "enum type [: integral_type]"�    * "enum class type [: integral_type] { ... } [x, ...]"�    * "enum class type [: integral_type]"�    * "enum [: integral_type] { ... } x, ..."�    */
-#  10>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  4/  0][0/0/0][          0][2-0]
-#  12>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  0][0/0/0][          0][9-0] /**�    * the class/struct (and variable declarations thereof) could be of�    * the following forms:�    *�    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }�    * template<...> class/struct[<...>] [macros/attributes ...] type�    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]�    * class/struct [macros/attributes ...] type [x, ...]�    * class/struct [macros/attributes ...] [: bases] { } x, ...�    */
-#  21>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][          0][2-0]
-#  23>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  2001c0001][0-0] #
-#  23>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/0][      20001][0-0]  define
-#  23>         MACRO_FUNC|               NONE|     PARENT_NOT_SET[  9/  9/ 16/  1][1/1/0][      80001][0-0]         ALIGNAS
-#  23>        FPAREN_OPEN|         MACRO_FUNC|     PARENT_NOT_SET[ 16/ 16/ 17/  0][1/1/0][  200000001][0-0]                (
-#  23>               WORD|               NONE|     PARENT_NOT_SET[ 17/ 17/ 31/  0][1/2/0][      80011][0-0]                 byte_alignment
-#  23>       FPAREN_CLOSE|         MACRO_FUNC|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][  200000011][0-0]                               )
-#  23>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 33/ 33/ 46/  1][1/1/0][          1][0-0]                                 __attribute__
-#  23>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/1/0][  200000001][0-0]                                              (
-#  23>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][1/2/0][  200080001][0-0]                                               (
-#  23>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 55/  0][1/3/0][      80001][0-0]                                                aligned
-#  23>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 55/ 55/ 56/  0][1/3/0][  200000001][0-0]                                                       (
-#  23>               WORD|               NONE|     PARENT_NOT_SET[ 56/ 56/ 70/  0][1/4/0][      80011][0-0]                                                        byte_alignment
-#  23>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 70/ 70/ 71/  0][1/3/0][  200000011][0-0]                                                                      )
-#  23>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 72/  0][1/2/0][  200000001][0-0]                                                                       )
-#  23>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 72/ 72/ 73/  0][1/1/0][  200000001][0-0]                                                                        )
-#  23>            NEWLINE|               NONE|     PARENT_NOT_SET[ 73/ 73/  1/  0][0/0/0][          0][2-0]
-#  25>            PREPROC|              PP_IF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  25>              PP_IF|               NONE|     PARENT_NOT_SET[  2/  2/  4/  0][0/0/1][      20001][0-0]  if
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  5/  5/ 12/  1][0/0/1][      80001][0-0]     defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/1][  200000001][0-0]             (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 22/  0][0/0/1][      80001][0-0]              __unix__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/1][  200000001][0-0]                      )
-#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][0/0/1][  200000001][0-0]                        ||
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/1][  200000001][0-0]                           (
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 28/ 28/ 35/  0][0/0/1][      80001][0-0]                            defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  1][0/0/1][  200000001][0-0]                                    (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 46/  0][0/0/1][      80001][0-0]                                     __APPLE__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][0/0/1][  200000001][0-0]                                              )
-#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  1][0/0/1][  200000001][0-0]                                                &&
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 51/ 51/ 58/  1][0/0/1][          1][0-0]                                                   defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  1][0/0/1][  200000001][0-0]                                                           (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 60/ 60/ 68/  0][0/0/1][      80001][0-0]                                                            __MACH__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/1][  200000001][0-0]                                                                    )
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 69/ 69/ 70/  0][0/0/1][  200000001][0-0]                                                                     )
-#  25>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/1][          0][1-0]
-#  26>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
-#  26>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
-#  26>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][      20001][0-0]         API_EXPORT
-#  26>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 20/ 20/ 33/  1][1/1/1][      80001][0-0]                    __attribute__
-#  26>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 34/ 34/ 35/  1][1/1/1][  2000c0001][0-0]                                  (
-#  26>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/2/1][  200080001][0-0]                                   (
-#  26>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 36/ 36/ 46/  0][1/3/1][      80001][0-0]                                    visibility
-#  26>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/3/1][  200000001][0-0]                                              (
-#  26>             STRING|         PP_INCLUDE|     PARENT_NOT_SET[ 47/ 47/ 56/  0][1/4/1][      80011][0-0]                                               "default"
-#  26>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 56/ 56/ 57/  0][1/3/1][  200000011][0-0]                                                        )
-#  26>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 57/ 57/ 58/  0][1/2/1][  200000001][0-0]                                                         )
-#  26>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][1/1/1][  200000001][0-0]                                                          )
-#  26>            NEWLINE|               NONE|     PARENT_NOT_SET[ 59/ 59/  1/  0][0/0/1][          0][1-0]
-#  27>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  27>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][      20001][0-0]  elif
-#  27>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/1][      a0001][0-0]       defined
-#  27>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 21/  1][0/0/1][          1][0-0]               _WIN32
-#  27>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/1][          0][1-0]
-#  28>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
-#  28>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
-#  28>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][      20001][0-0]         API_EXPORT
-#  28>           DECLSPEC|               NONE|     PARENT_NOT_SET[ 20/ 20/ 30/  1][1/1/1][      c0001][0-0]                    __declspec
-#  28>         PAREN_OPEN|           DECLSPEC|     PARENT_NOT_SET[ 30/ 30/ 31/  0][1/1/1][  200000001][0-0]                              (
-#  28>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 40/  0][1/2/1][      80001][0-0]                               dllexport
-#  28>        PAREN_CLOSE|           DECLSPEC|     PARENT_NOT_SET[ 40/ 40/ 41/  0][1/1/1][  200000001][0-0]                                        )
-#  28>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 41/  1/  0][0/0/1][          0][1-0]
-#  29>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  29>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][          1][0-0]  else
-#  29>            NEWLINE|               NONE|     PARENT_NOT_SET[  6/  6/  1/  0][0/0/1][          0][1-0]
-#  30>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
-#  30>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
-#  30>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][          1][0-0]         API_EXPORT
-#  30>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/1][          0][1-0]
-#  31>            PREPROC|           PP_ENDIF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  31>           PP_ENDIF|               NONE|              PP_IF[  2/  2/  7/  0][0/0/0][          1][0-0]  endif
-#  31>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][          0][2-0]
-#  33>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][0/0/0][      e0000][0-0] namespace
-#  33>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][0/0/0][          0][0-0]           outer_namespace
-#  33>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][0/0/0][          0][1-0]
-#  34>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] {
-#  34>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][       1000][2-0]
-#  36>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][1/1/0][      e1000][0-0] namespace
-#  36>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][1/1/0][       1000][0-0]           inner_namespace
-#  36>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][1/1/0][       1000][1-0]
-#  37>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  200001000][0-0] {
-#  37>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][2/2/0][       1000][2-0]
-#  39>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][2/2/0][      e1000][0-0] class
-#  39>               TYPE|              CLASS|     PARENT_NOT_SET[  7/  7/ 12/  1][2/2/0][       1000][0-0]       Base1
-#  39>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 13/ 13/ 14/  1][2/2/0][  2c0001400][0-0]             {
-#  39>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 15/ 15/ 16/  1][2/2/0][  2c0001400][0-0]               }
-#  39>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 16/ 16/ 17/  0][2/2/0][  200000000][0-0]                ;
-#  39>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][2/2/0][          0][2-0]
-#  41>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][2/2/0][      c0000][0-0] template
-#  41>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][2/2/0][  200000040][0-0]         <
-#  41>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][2/3/0][      80040][0-0]          typename
-#  41>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][2/2/0][  200000040][0-0]                  >
-#  41>              CLASS|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 25/  1][2/2/0][      a0000][0-0]                    class
-#  41>               TYPE|              CLASS|     PARENT_NOT_SET[ 26/ 26/ 31/  1][2/2/0][          0][0-0]                          Base2
-#  41>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 32/ 32/ 33/  1][2/2/0][  2c0000400][0-0]                                {
-#  41>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 34/ 34/ 35/  1][2/2/0][  2c0000400][0-0]                                  }
-#  41>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 35/ 35/ 36/  0][2/2/0][  200000000][0-0]                                   ;
-#  41>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 36/  1/  0][2/2/0][          0][2-0]
-#  43>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  200000000][0-0] }
-#  43>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][          0][2-0]
-#  45>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] }
-#  45>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][0/0/0][          0][2-0]
-#  47>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 82/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }
-#  47>            NEWLINE|               NONE|     PARENT_NOT_SET[ 82/ 82/  1/  0][0/0/0][          0][1-0]
-#  48>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  48>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
-#  48>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
-#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
-#  48>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
-#  48>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
-#  48>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
-#  49>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      a0000][0-0] class
-#  49>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-#  49>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][          0][0-0]                  __attribute__
-#  49>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][  200000000][0-0]                               (
-#  49>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][  200080000][0-0]                                (
-#  49>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][      80000][0-0]                                 __deprecated__
-#  49>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][  200000000][0-0]                                               )
-#  49>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][  200000000][0-0]                                                )
-#  49>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
-#  49>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
-#  49>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
-#  49>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  49>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][          0][0-0]                                                             c1
-#  49>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][          0][1-0]
-#  50>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
-#  50>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
-#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
-#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base1
-#  50>              COMMA|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][  200000800][0-0]                                                         ,
-#  50>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  3/  0][0/0/0][          0][1-0]
-#  51>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][      a0800][0-0]         public
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 25/  1][0/0/0][        800][0-0]                outer_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 31/ 25/ 27/  0][0/0/0][  200000800][0-0]                               ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 33/ 27/ 42/  0][0/0/0][        800][0-0]                                 inner_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 50/ 44/ 49/  0][0/0/0][        800][0-0]                                                  Base2
-#  51>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 55/ 49/ 50/  0][0/0/0][  200000840][0-0]                                                       <
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 56/ 50/ 65/  0][0/1/0][      80840][0-0]                                                        outer_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 71/ 65/ 67/  0][0/1/0][  200000840][0-0]                                                                       ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 73/ 67/ 82/  0][0/1/0][        840][0-0]                                                                         inner_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 88/ 82/ 84/  0][0/1/0][  200000840][0-0]                                                                                        ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 90/ 84/ 89/  0][0/1/0][        840][0-0]                                                                                          Base1
-#  51>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 95/ 89/ 90/  0][0/0/0][  200000840][0-0]                                                                                               >
-#  51>            NEWLINE|               NONE|     PARENT_NOT_SET[ 96/ 90/  1/  0][0/0/0][          0][1-0]
-#  52>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  280080400][0-0] {
-#  52>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][2-0]
-#  54>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  280000400][0-0] }
-#  54>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][  200000000][0-0]  ;
-#  54>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][          0][2-0]
-#  56>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 70/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type { }
-#  56>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/0][          0][1-0]
-#  57>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  57>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
-#  57>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
-#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
-#  57>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
-#  57>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
-#  57>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
-#  58>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      a0000][0-0] class
-#  58>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-#  58>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][          0][0-0]                  c2
-#  58>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][          0][1-0]
-#  59>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] {
-#  59>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
-#  60>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
-#  60>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
-#  60>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][2-0]
-#  62>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  4/ 12/  0][1/1/0][      c0400][0-0] template
-#  62>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/ 12/ 13/  0][1/1/0][  200000440][0-0]         <
-#  62>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 13/ 21/  0][1/2/0][      a0440][0-0]          typename
-#  62>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][        440][0-0]                   T
-#  62>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 20/ 23/ 24/  0][1/1/0][  200000440][0-0]                    >
-#  62>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 24/  4/  0][1/1/0][        400][1-0]
-#  63>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[  1/  4/ 10/  0][1/1/0][      a0400][0-0] struct
-#  63>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/ 11/ 22/  1][1/1/0][        400][0-0]        inner_class
-#  63>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 22/  4/  0][1/1/0][        400][1-0]
-#  64>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][  200000400][0-0] {
-#  64>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  5/  7/  0][2/2/0][        402][1-0]
-#  65>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  7/ 13/  0][2/2/0][     8e0402][0-0]         static
-#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 14/ 25/  1][2/2/0][     800402][0-0]                inner_class
-#  65>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 27/ 25/ 26/  0][2/2/0][  200000442][0-0]                           <
-#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 28/ 26/ 27/  0][2/3/0][      80442][0-0]                            T
-#  65>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 29/ 27/ 28/  0][2/2/0][  200000442][0-0]                             >
-#  65>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 31/ 29/ 30/  1][2/2/0][  200880402][0-0]                               *
-#  65>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 30/ 43/  0][2/2/0][    3080402][0-0]                                m_inner_class
-#  65>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 45/ 43/ 44/  0][2/2/0][  200000402][0-0]                                             ;
-#  65>            NEWLINE|               NONE|     PARENT_NOT_SET[ 46/ 44/  4/  0][2/2/0][        402][1-0]
-#  66>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][  200000402][0-0] }
-#  66>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  5/  6/  0][1/1/0][  200000400][0-0]  ;
-#  66>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  6/  1/  0][1/1/0][        400][1-0]
-#  67>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
-#  67>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][  200000000][0-0]  ;
-#  67>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][          0][2-0]
-#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][0/0/0][  200080040][0-0]          >
-#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[ 12/ 12/ 20/  1][0/0/0][      80000][0-0]            template
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000040][0-0]                    <
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/0/0][  200080040][0-0]                     >
-#  69>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[ 23/ 23/ 29/  1][0/0/0][      a0000][0-0]                       struct
-#  69>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 40/  1][0/0/0][      20000][0-0]                              API_EXPORT
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 41/ 41/ 43/  1][0/0/0][          0][0-0]                                         c2
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][  200000040][0-0]                                           <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 44/ 44/ 47/  0][0/1/0][      80040][0-0]                                            int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/0/0][  200000040][0-0]                                               >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  0][0/0/0][  200080000][0-0]                                                ::
-#  69>               TYPE|             STRUCT|     PARENT_NOT_SET[ 50/ 50/ 61/  0][0/0/0][     800000][0-0]                                                  inner_class
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][0/0/0][  200000040][0-0]                                                             <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/1/0][      80040][0-0]                                                              int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][  200000040][0-0]                                                                 >
-#  69>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  1][0/0/0][  200080000][0-0]                                                                   *
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 70/  0][0/0/0][      80000][0-0]                                                                    c2
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 70/ 70/ 71/  0][0/0/0][  200000040][0-0]                                                                      <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 74/  0][0/1/0][      80040][0-0]                                                                       int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 74/ 74/ 75/  0][0/0/0][  200000040][0-0]                                                                          >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 75/ 75/ 77/  0][0/0/0][  200080000][0-0]                                                                           ::
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 77/ 77/ 88/  0][0/0/0][          0][0-0]                                                                             inner_class
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 88/ 88/ 89/  0][0/0/0][  200000040][0-0]                                                                                        <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 89/ 89/ 92/  0][0/1/0][      80040][0-0]                                                                                         int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 92/ 92/ 93/  0][0/0/0][  200000040][0-0]                                                                                            >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 93/ 93/ 95/  0][0/0/0][  200080000][0-0]                                                                                             ::
-#  69>               WORD|               NONE|     PARENT_NOT_SET[ 95/ 95/108/  0][0/0/0][   23000000][0-0]                                                                                               m_inner_class
-#  69>             ASSIGN|               NONE|     PARENT_NOT_SET[109/109/110/  1][0/0/0][  200000000][0-0]                                                                                                             =
-#  69>               WORD|               NONE|     PARENT_NOT_SET[111/111/118/  1][0/0/0][      80000][0-0]                                                                                                               nullptr
-#  69>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[118/118/119/  0][0/0/0][  200000000][0-0]                                                                                                                      ;
-#  69>            NEWLINE|               NONE|     PARENT_NOT_SET[119/119/  1/  0][0/0/0][          0][2-0]
-#  71>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 66/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type
-#  71>            NEWLINE|               NONE|     PARENT_NOT_SET[ 66/ 66/  1/  0][0/0/0][          0][1-0]
-#  72>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  72>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
-#  72>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
-#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
-#  72>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
-#  72>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
-#  72>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
-#  73>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][1000000a0000][0-0] class
-#  73>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][100000020000][0-0]       API_EXPORT
-#  73>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][100000000000][0-0]                  c2
-#  73>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000000][0-0]                    ;
-#  73>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/0][          0][2-0]
-#  75>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
-#  75>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][          0][1-0]
-#  76>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
-#  76>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-#  76>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][          0][0-0]                  __attribute__
-#  76>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][  200000000][0-0]                               (
-#  76>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][  200080000][0-0]                                (
-#  76>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][      80000][0-0]                                 __deprecated__
-#  76>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][  200000000][0-0]                                               )
-#  76>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][  200000000][0-0]                                                )
-#  76>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
-#  76>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
-#  76>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
-#  76>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  76>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][     800000][0-0]                                                             c3
-#  76>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][          0][1-0]
-#  77>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
-#  77>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
-#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
-#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base2
-#  77>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][  200000840][0-0]                                                         <
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 58/ 50/ 53/  0][0/1/0][      80840][0-0]                                                          int
-#  77>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 61/ 53/ 54/  0][0/0/0][  200000840][0-0]                                                             >
-#  77>              COMMA|               NONE|     PARENT_NOT_SET[ 62/ 54/ 55/  0][0/0/0][  200080800][0-0]                                                              ,
-#  77>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 55/  3/  0][0/0/0][          0][1-0]
-#  78>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][      a0800][0-0]         public
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 12/  1][0/0/0][        800][0-0]                c2
-#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 18/ 12/ 13/  0][0/0/0][  200000840][0-0]                  <
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 13/ 16/  0][0/1/0][      80840][0-0]                   int
-#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 22/ 16/ 17/  0][0/0/0][  200000840][0-0]                      >
-#  78>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 23/ 17/ 19/  0][0/0/0][  200080800][0-0]                       ::
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 25/ 19/ 30/  0][0/0/0][        800][0-0]                         inner_class
-#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 36/ 30/ 31/  0][0/0/0][  200000840][0-0]                                    <
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 37/ 31/ 34/  0][0/1/0][      80840][0-0]                                     int
-#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 40/ 34/ 35/  0][0/0/0][  200000840][0-0]                                        >
-#  78>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 35/  1/  0][0/0/0][          0][1-0]
-#  79>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200080400][0-0] {
-#  79>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
-#  80>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
-#  80>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
-#  80>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][1-0]
-#  81>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  1/  4/  6/  0][1/1/0][      c0400][0-0] c3
-#  81>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  3/  6/  7/  0][1/1/0][  200000500][0-0]   (
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[  4/  7/ 10/  0][1/2/0][   208a0510][0-0]    int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  1][1/2/0][   21000510][0-0]        x
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 10/ 13/ 14/  1][1/2/0][  200000510][0-0]          =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 12/ 15/ 16/  1][1/2/0][      80510][0-0]            0
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 13/ 16/ 17/  0][1/2/0][  200000510][0-0]             ,
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 15/ 18/ 21/  1][1/2/0][   208a0510][0-0]               int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][   21000510][0-0]                   y
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 21/ 24/ 25/  1][1/2/0][  200000510][0-0]                     =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 23/ 26/ 27/  1][1/2/0][      80510][0-0]                       0
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 27/ 28/  0][1/2/0][  200000510][0-0]                        ,
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 26/ 29/ 32/  1][1/2/0][   208a0510][0-0]                          int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 33/ 34/  1][1/2/0][   21000510][0-0]                              z
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 32/ 35/ 36/  1][1/2/0][  200000510][0-0]                                =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 34/ 37/ 38/  1][1/2/0][      80510][0-0]                                  0
-#  81>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 35/ 38/ 39/  0][1/1/0][  200000510][0-0]                                   )
-#  81>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 37/ 40/ 41/  1][1/1/0][  200000500][0-0]                                     :
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 39/ 42/ 45/  1][1/1/0][      c0500][0-0]                                       m_x
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 42/ 45/ 46/  0][1/1/0][  200000500][0-0]                                          (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 43/ 46/ 47/  0][1/2/0][      80510][0-0]                                           x
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 44/ 47/ 48/  0][1/1/0][  200000510][0-0]                                            )
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 48/ 49/  0][1/1/0][  200000500][0-0]                                             ,
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 47/ 50/ 53/  1][1/1/0][      80500][0-0]                                               m_y
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 50/ 53/ 54/  0][1/1/0][  200000500][0-0]                                                  (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 51/ 54/ 55/  0][1/2/0][      80510][0-0]                                                   y
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 52/ 55/ 56/  0][1/1/0][  200000510][0-0]                                                    )
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 56/ 57/  0][1/1/0][  200000500][0-0]                                                     ,
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 55/ 58/ 61/  1][1/1/0][      80500][0-0]                                                       m_z
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 58/ 61/ 62/  0][1/1/0][  200000500][0-0]                                                          (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 59/ 62/ 63/  0][1/2/0][      80510][0-0]                                                           z
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 60/ 63/ 64/  0][1/1/0][  200000510][0-0]                                                            )
-#  81>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 62/ 65/ 66/  1][1/1/0][  280000400][0-0]                                                              {
-#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 67/  0/  0][1/1/0][        400][1-0]
-#  81>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  1/ 67/ 68/  1][1/1/0][  280000400][0-0] }
-#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/ 68/  4/  0][1/1/0][        400][2-0]
-#  83>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  83>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_x
-#  83>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  83>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  84>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  84>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_y
-#  84>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  84>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  85>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  85>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_z
-#  85>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  85>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][        400][1-0]
-#  86>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
-#  86>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][    70c0000][0-0]   c31
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][  200000000][0-0]      ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][  200080000][0-0]        *
-#  86>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][   25080000][0-0]         c32
-#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][  200000000][0-0]             =
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][      80000][0-0]               nullptr
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  200080000][0-0]                        *
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][    5080000][0-0]                         c33
-#  86>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][  200000000][0-0]                            []
-#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  200000000][0-0]                               =
-#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][  240080000][0-0]                                 {
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][   40080000][0-0]                                   nullptr
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][  240000000][0-0]                                          ,
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][   40080000][0-0]                                            nullptr
-#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][  240000000][0-0]                                                    }
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][  200000000][0-0]                                                     ,
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 55/ 55/ 58/  1][0/0/0][   25080000][0-0]                                                       c34
-#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/0/0][  240000000][0-0]                                                          {
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 60/ 60/ 61/  1][1/1/0][   400c0000][0-0]                                                            0
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][1/1/0][  240000000][0-0]                                                             ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 63/ 63/ 64/  1][1/1/0][   40080000][0-0]                                                               1
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 64/ 64/ 65/  0][1/1/0][  240000000][0-0]                                                                ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  1][1/1/0][   40080000][0-0]                                                                  2
-#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  240000000][0-0]                                                                   }
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][  200000000][0-0]                                                                    ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 70/ 70/ 71/  1][0/0/0][  200080000][0-0]                                                                      *
-#  86>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 72/ 72/ 77/  1][0/0/0][      a0000][0-0]                                                                        const
-#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 78/ 78/ 81/  1][0/0/0][    5000000][0-0]                                                                              c35
-#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 81/ 81/ 82/  0][0/0/0][  200000000][0-0]                                                                                 (
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 89/  0][0/1/0][      80010][0-0]                                                                                  nullptr
-#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 89/ 89/ 90/  0][0/0/0][  200000010][0-0]                                                                                         )
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 90/ 90/ 91/  0][0/0/0][  200000000][0-0]                                                                                          ,
-#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 92/ 92/ 95/  1][0/0/0][    5080000][0-0]                                                                                            c16
-#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][  200000000][0-0]                                                                                               (
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 96/ 96/ 97/  0][0/1/0][      80010][0-0]                                                                                                0
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 97/ 97/ 98/  0][0/1/0][  200000010][0-0]                                                                                                 ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 99/ 99/100/  1][0/1/0][      80010][0-0]                                                                                                   1
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[100/100/101/  0][0/1/0][  200000010][0-0]                                                                                                    ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[102/102/103/  1][0/1/0][      80010][0-0]                                                                                                      2
-#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[103/103/104/  0][0/0/0][  200000010][0-0]                                                                                                       )
-#  86>          SEMICOLON|              CLASS|     PARENT_NOT_SET[104/104/105/  0][0/0/0][  200000000][0-0]                                                                                                        ;
-#  86>            NEWLINE|               NONE|     PARENT_NOT_SET[105/105/  1/  0][0/0/0][          0][2-0]
-#  88>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 52/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type x, ...
-#  88>            NEWLINE|               NONE|     PARENT_NOT_SET[ 52/ 52/  1/  0][0/0/0][          0][1-0]
-#  89>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
-#  89>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[  7/  7/ 20/  1][0/0/0][          0][0-0]       __attribute__
-#  89>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000000][0-0]                    (
-#  89>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/1/0][  200080000][0-0]                     (
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 22/ 22/ 36/  0][0/2/0][      80000][0-0]                      __deprecated__
-#  89>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/1/0][  200000000][0-0]                                    )
-#  89>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 37/ 37/ 38/  0][0/0/0][  200000000][0-0]                                     )
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 39/ 39/ 49/  1][0/0/0][      e0000][0-0]                                       API_EXPORT
-#  89>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
-#  89>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
-#  89>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  89>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][     820000][0-0]                                                             c3
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 64/ 64/ 67/  1][0/0/0][    3000000][0-0]                                                                c41
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  200000000][0-0]                                                                   ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 69/ 69/ 70/  1][0/0/0][  200080000][0-0]                                                                     *
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 70/ 70/ 73/  0][0/0/0][   21080000][0-0]                                                                      c42
-#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[ 74/ 74/ 75/  1][0/0/0][  200000000][0-0]                                                                          =
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 76/ 76/ 79/  1][0/0/0][      80000][0-0]                                                                            c32
-#  89>           QUESTION|               NONE|     PARENT_NOT_SET[ 80/ 80/ 81/  1][0/0/0][  200000000][0-0]                                                                                ?
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 85/  1][0/0/0][      80000][0-0]                                                                                  c32
-#  89>         COND_COLON|               NONE|     PARENT_NOT_SET[ 86/ 86/ 87/  1][0/0/0][  200000000][0-0]                                                                                      :
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 88/ 88/ 95/  1][0/0/0][      c0000][0-0]                                                                                        nullptr
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][  200000000][0-0]                                                                                               ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 97/ 97/ 98/  1][0/0/0][  200080000][0-0]                                                                                                 *
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 98/ 98/101/  0][0/0/0][    1080000][0-0]                                                                                                  c43
-#  89>            TSQUARE|               NONE|     PARENT_NOT_SET[101/101/103/  0][0/0/0][  200000000][0-0]                                                                                                     []
-#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[104/104/105/  1][0/0/0][  200000000][0-0]                                                                                                        =
-#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[106/106/107/  1][0/0/0][  240080000][0-0]                                                                                                          {
-#  89>               WORD|               NONE|     PARENT_NOT_SET[108/108/115/  1][1/1/0][   40080000][0-0]                                                                                                            nullptr
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[115/115/116/  0][1/1/0][  240000000][0-0]                                                                                                                   ,
-#  89>               WORD|               NONE|     PARENT_NOT_SET[117/117/124/  1][1/1/0][   40080000][0-0]                                                                                                                     nullptr
-#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[125/125/126/  1][0/0/0][  240000000][0-0]                                                                                                                             }
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[126/126/127/  0][0/0/0][  200000000][0-0]                                                                                                                              ,
-#  89>               WORD|               NONE|     PARENT_NOT_SET[128/128/131/  1][0/0/0][   21080000][0-0]                                                                                                                                c44
-#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[131/131/132/  0][0/0/0][  240000000][0-0]                                                                                                                                   {
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[133/133/134/  1][1/1/0][   400c0000][0-0]                                                                                                                                     0
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[134/134/135/  0][1/1/0][  240000000][0-0]                                                                                                                                      ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[136/136/137/  1][1/1/0][   40080000][0-0]                                                                                                                                        1
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[137/137/138/  0][1/1/0][  240000000][0-0]                                                                                                                                         ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[139/139/140/  1][1/1/0][   40080000][0-0]                                                                                                                                           2
-#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[140/140/141/  0][0/0/0][  240000000][0-0]                                                                                                                                            }
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[141/141/142/  0][0/0/0][  200000000][0-0]                                                                                                                                             ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[143/143/144/  1][0/0/0][  200080000][0-0]                                                                                                                                               *
-#  89>          QUALIFIER|               NONE|     PARENT_NOT_SET[145/145/150/  1][0/0/0][      a0000][0-0]                                                                                                                                                 const
-#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[151/151/154/  1][0/0/0][    1000000][0-0]                                                                                                                                                       c45
-#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[154/154/155/  0][0/0/0][  200000000][0-0]                                                                                                                                                          (
-#  89>               WORD|               NONE|     PARENT_NOT_SET[155/155/162/  0][0/1/0][      80010][0-0]                                                                                                                                                           nullptr
-#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[162/162/163/  0][0/0/0][  200000010][0-0]                                                                                                                                                                  )
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[163/163/164/  0][0/0/0][  200000000][0-0]                                                                                                                                                                   ,
-#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[165/165/168/  1][0/0/0][    1080000][0-0]                                                                                                                                                                     c46
-#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[168/168/169/  0][0/0/0][  200000000][0-0]                                                                                                                                                                        (
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[169/169/170/  0][0/1/0][      80010][0-0]                                                                                                                                                                         0
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[170/170/171/  0][0/1/0][  200000010][0-0]                                                                                                                                                                          ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[172/172/173/  1][0/1/0][      80010][0-0]                                                                                                                                                                            1
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[173/173/174/  0][0/1/0][  200000010][0-0]                                                                                                                                                                             ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[175/175/176/  1][0/1/0][      80010][0-0]                                                                                                                                                                               2
-#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[176/176/177/  0][0/0/0][  200000010][0-0]                                                                                                                                                                                )
-#  89>          SEMICOLON|              CLASS|     PARENT_NOT_SET[177/177/178/  0][0/0/0][  200000000][0-0]                                                                                                                                                                                 ;
-#  89>            NEWLINE|               NONE|     PARENT_NOT_SET[178/178/  1/  0][0/0/0][          0][2-0]
-#  91>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
-#  91>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][          0][1-0]
-#  92>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
-#  92>          FUNC_CALL|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/0][          0][0-0]       ALIGNAS
-#  92>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][  200000000][0-0]              (
-#  92>             NUMBER|               NONE|     PARENT_NOT_SET[ 15/ 15/ 16/  0][0/1/0][      80010][0-0]               4
-#  92>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][  200000010][0-0]                )
-#  92>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 18/ 28/  1][0/0/0][      20000][0-0]                  API_EXPORT
-#  92>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 29/ 29/ 42/  1][0/0/0][          0][0-0]                             __attribute__
-#  92>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][0/0/0][  200000000][0-0]                                          (
-#  92>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/1/0][  200080000][0-0]                                           (
-#  92>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 58/  0][0/2/0][      80000][0-0]                                            __deprecated__
-#  92>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][  200000000][0-0]                                                          )
-#  92>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  92>            NEWLINE|               NONE|     PARENT_NOT_SET[ 60/ 60/  1/  0][0/0/0][          0][1-0]
-#  93>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
-#  93>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
-#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
-#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base1
-#  93>            NEWLINE|               NONE|     PARENT_NOT_SET[ 57/ 49/  1/  0][0/0/0][          0][1-0]
-#  94>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] {
-#  94>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
-#  95>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
-#  95>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
-#  95>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][1-0]
-#  96>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  96>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_x
-#  96>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  96>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  97>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  97>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_y
-#  97>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  97>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  98>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  98>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_z
-#  98>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  98>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][        400][1-0]
-#  99>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
-#  99>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][    70c0000][0-0]   c51
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][  200000000][0-0]      ,
-#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][  200080000][0-0]        *
-#  99>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][   25080000][0-0]         c52
-#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][  200000000][0-0]             =
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][      80000][0-0]               nullptr
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ,
-#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  200080000][0-0]                        *
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][    5080000][0-0]                         c53
-#  99>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][  200000000][0-0]                            []
-#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  200000000][0-0]                               =
-#  99>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][  240080000][0-0]                                 {
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][   40080000][0-0]                                   nullptr
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][  240000000][0-0]                                          ,
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][   40080000][0-0]                                            nullptr
-#  99>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][  240000000][0-0]                                                    }
-#  99>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][  200000000][0-0]                                                     ;
-#  99>            NEWLINE|               NONE|     PARENT_NOT_SET[ 54/ 54/  1/  0][0/0/0][          0][3-0]
-# 102>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 44/  0][0/0/0][          0][0-0] // enum type : integral_type { ... } x, ...
-# 102>            NEWLINE|               NONE|     PARENT_NOT_SET[ 44/ 44/  1/  0][0/0/0][          0][1-0]
-# 103>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 103>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][     800000][0-0]      e1
-# 103>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
-# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 15/  1][0/0/0][      e0000][0-0]           long
-# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 16/ 16/ 20/  1][0/0/0][          0][0-0]                long
-# 103>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][  240000000][0-0]                     {
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 23/ 23/ 25/  1][1/1/0][   400c0004][0-0]                       a1
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 25/ 25/ 26/  0][1/1/0][  240000004][0-0]                         ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 29/  1][1/1/0][   40080004][0-0]                           b1
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 29/ 30/  0][1/1/0][  240000004][0-0]                             ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 33/  1][1/1/0][   40080004][0-0]                               d1
-# 103>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 34/ 34/ 35/  1][0/0/0][  240000004][0-0]                                  }
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 39/  1][0/0/0][    70c0000][0-0]                                    e11
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 39/ 39/ 40/  0][0/0/0][  200000000][0-0]                                       ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 41/ 41/ 44/  1][0/0/0][    5080000][0-0]                                         e12
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][  200000000][0-0]                                            ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  1][0/0/0][    5080000][0-0]                                              e13
-# 103>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 49/ 49/ 50/  0][0/0/0][  200000000][0-0]                                                 ;
-# 103>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][          0][2-0]
-# 105>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 37/  0][0/0/0][          0][0-0] // enum type : integral_type { ... }
-# 105>            NEWLINE|               NONE|     PARENT_NOT_SET[ 37/ 37/  1/  0][0/0/0][          0][1-0]
-# 106>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 106>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][          0][0-0]      e2
-# 106>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
-# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 19/  1][0/0/0][      e0000][0-0]           unsigned
-# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 20/ 20/ 23/  1][0/0/0][          0][0-0]                    int
-# 106>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  240000000][0-0]                        {
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 28/  1][1/1/0][   400c0004][0-0]                          a2
-# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][  240000004][0-0]                            ,
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 32/  1][1/1/0][   40080004][0-0]                              b2
-# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][1/1/0][  240000004][0-0]                                ,
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 34/ 34/ 36/  1][1/1/0][   40080004][0-0]                                  d2
-# 106>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 37/ 37/ 38/  1][0/0/0][  240000004][0-0]                                     }
-# 106>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 38/ 38/ 39/  0][0/0/0][  200000000][0-0]                                      ;
-# 106>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][          0][2-0]
-# 108>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 29/  0][0/0/0][          0][0-0] // enum type : integral_type
-# 108>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 29/  1/  0][0/0/0][          0][1-0]
-# 109>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
-# 109>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][100000000000][0-0]      e3
-# 109>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
-# 109>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 16/  1][0/0/0][      c0000][0-0]           short
-# 109>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][  200000000][0-0]                ;
-# 109>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][0/0/0][          0][2-0]
-# 111>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 20/  0][0/0/0][          0][0-0] // enum type x, ...
-# 111>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][          0][1-0]
-# 112>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 112>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][     820000][0-0]      e3
-# 112>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  1][0/0/0][    3000000][0-0]         e31
-# 112>              COMMA|               NONE|     PARENT_NOT_SET[ 12/ 12/ 13/  0][0/0/0][  200000000][0-0]            ,
-# 112>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 17/  1][0/0/0][    1080000][0-0]              e32
-# 112>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 17/ 17/ 18/  0][0/0/0][  200000000][0-0]                 ;
-# 112>            NEWLINE|               NONE|     PARENT_NOT_SET[ 18/ 18/  1/  0][0/0/0][          0][2-0]
-# 114>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 50/  0][0/0/0][          0][0-0] // enum class type : integral_type { ... } x, ...
-# 114>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][          0][1-0]
-# 115>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 115>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][      20000][0-0]      class
-# 115>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][     800000][0-0]            e4
-# 115>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
-# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 21/  1][0/0/0][      e0000][0-0]                 long
-# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 22/ 22/ 26/  1][0/0/0][          0][0-0]                      long
-# 115>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/0][  240000000][0-0]                           {
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 29/ 29/ 31/  1][1/1/0][   400c0004][0-0]                             a4
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][  240000004][0-0]                               ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 35/  1][1/1/0][   40080004][0-0]                                 b4
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/1/0][  240000004][0-0]                                   ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 39/  1][1/1/0][   40080004][0-0]                                     d4
-# 115>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 40/ 40/ 41/  1][0/0/0][  240000004][0-0]                                        }
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 42/ 42/ 45/  1][0/0/0][    70c0000][0-0]                                          e41
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 45/ 46/  0][0/0/0][  200000000][0-0]                                             ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 47/ 47/ 50/  1][0/0/0][    5080000][0-0]                                               e42
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  0][0/0/0][  200000000][0-0]                                                  ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 55/  1][0/0/0][    5080000][0-0]                                                    e43
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 55/ 55/ 56/  0][0/0/0][  200000000][0-0]                                                       ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 57/ 57/ 60/  1][0/0/0][    5080000][0-0]                                                         e44
-# 115>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 60/ 60/ 61/  0][0/0/0][  200000000][0-0]                                                            ;
-# 115>            NEWLINE|               NONE|     PARENT_NOT_SET[ 61/ 61/  1/  0][0/0/0][          0][2-0]
-# 117>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 43/  0][0/0/0][          0][0-0] // enum class type : integral_type { ... }
-# 117>            NEWLINE|               NONE|     PARENT_NOT_SET[ 43/ 43/  1/  0][0/0/0][          0][1-0]
-# 118>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 118>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][      20000][0-0]      class
-# 118>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][          0][0-0]            e5
-# 118>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
-# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 25/  1][0/0/0][      e0000][0-0]                 unsigned
-# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][          0][0-0]                          int
-# 118>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 30/ 30/ 31/  1][0/0/0][  240000000][0-0]                              {
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 32/ 34/  1][1/1/0][   400c0004][0-0]                                a5
-# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 34/ 34/ 35/  0][1/1/0][  240000004][0-0]                                  ,
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 38/  1][1/1/0][   40080004][0-0]                                    b5
-# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 38/ 38/ 39/  0][1/1/0][  240000004][0-0]                                      ,
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 42/  1][1/1/0][   40080004][0-0]                                        d5
-# 118>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 43/ 43/ 44/  1][0/0/0][  240000004][0-0]                                           }
-# 118>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][  200000000][0-0]                                            ;
-# 118>            NEWLINE|               NONE|     PARENT_NOT_SET[ 45/ 45/  1/  0][0/0/0][          0][2-0]
-# 120>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 35/  0][0/0/0][          0][0-0] // enum class type : integral_type
-# 120>            NEWLINE|               NONE|     PARENT_NOT_SET[ 35/ 35/  1/  0][0/0/0][          0][1-0]
-# 121>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
-# 121>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][100000020000][0-0]      class
-# 121>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][100000000000][0-0]            e6
-# 121>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
-# 121>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 22/  1][0/0/0][      c0000][0-0]                 short
-# 121>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ;
-# 121>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][          0][2-0]
-# 123>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 19/  0][0/0/0][          0][0-0] // enum class type
-# 123>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/0][          0][1-0]
-# 124>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
-# 124>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][100000020000][0-0]      class
-# 124>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][100000000000][0-0]            e7
-# 124>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][  200000000][0-0]              ;
-# 124>            NEWLINE|               NONE|     PARENT_NOT_SET[ 15/ 15/  1/  0][0/0/0][          0][2-0]
-# 126>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 39/  0][0/0/0][          0][0-0] // enum : integral_type { ... } x, ...
-# 126>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][          0][1-0]
-# 127>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      c0000][0-0] enum
-# 127>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][  200000000][0-0]      :
-# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[  8/  8/ 12/  1][0/0/0][      e0000][0-0]        long
-# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 13/ 13/ 17/  1][0/0/0][          0][0-0]             long
-# 127>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 18/ 18/ 19/  1][0/0/0][  240000000][0-0]                  {
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 20/ 20/ 22/  1][1/1/0][   400c0004][0-0]                    a8
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][1/1/0][  240000004][0-0]                      ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][1/1/0][   40080004][0-0]                        b8
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 26/ 26/ 27/  0][1/1/0][  240000004][0-0]                          ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  1][1/1/0][   40080004][0-0]                            c8
-# 127>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  240000004][0-0]                               }
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 36/  1][0/0/0][    70c0000][0-0]                                 e81
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/0/0][  200000000][0-0]                                    ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 38/ 38/ 41/  1][0/0/0][    5080000][0-0]                                      e82
-# 127>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 41/ 41/ 42/  0][0/0/0][  200000000][0-0]                                         ;
-# 127>            NEWLINE|               NONE|     PARENT_NOT_SET[ 42/ 42/  1/  0][0/0/0][          0][2-0]
-# 129>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 23/  0][0/0/0][          0][0-0] // enum { ... } x, ...
-# 129>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][          0][1-0]
-# 130>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      c0000][0-0] enum
-# 130>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][  240000000][0-0]      {
-# 130>               WORD|               NONE|     PARENT_NOT_SET[  8/  8/ 10/  1][1/1/0][   400c0004][0-0]        a9
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][1/1/0][  240000004][0-0]          ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 12/ 12/ 14/  1][1/1/0][   40080004][0-0]            b9
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 14/ 14/ 15/  0][1/1/0][  240000004][0-0]              ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 16/ 16/ 18/  1][1/1/0][   40080004][0-0]                c9
-# 130>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 19/ 19/ 20/  1][0/0/0][  240000004][0-0]                   }
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][    70c0000][0-0]                     e91
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][  200000000][0-0]                        ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][    5080000][0-0]                          e92
-# 130>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 29/ 29/ 30/  0][0/0/0][  200000000][0-0]                             ;
-# 130>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 30/  1/  0][0/0/0][          0][2-0]
-# 132>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] union
-# 132>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-# 132>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][     800000][0-0]                  u1
-# 132>         BRACE_OPEN|              UNION|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][  240000000][0-0]                     {
-# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 23/ 23/ 26/  1][1/1/0][   408e0000][0-0]                       int
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][1/1/0][   43000000][0-0]                           x
-# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][  240000000][0-0]                            ;
-# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 30/ 30/ 34/  1][1/1/0][   408e0000][0-0]                              long
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  1][1/1/0][   43000000][0-0]                                   y
-# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][1/1/0][  240000000][0-0]                                    ;
-# 132>        BRACE_CLOSE|              UNION|     PARENT_NOT_SET[ 38/ 38/ 39/  1][0/0/0][  240000000][0-0]                                      }
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 43/  1][0/0/0][    70c0000][0-0]                                        u11
-# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][  200000000][0-0]                                           ,
-# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 45/ 45/ 46/  1][0/0/0][  200080000][0-0]                                             *
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  0][0/0/0][   25080000][0-0]                                              u12
-# 132>             ASSIGN|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  1][0/0/0][  200000000][0-0]                                                  =
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 59/  1][0/0/0][      80000][0-0]                                                    nullptr
-# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           ,
-# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 61/ 61/ 62/  1][0/0/0][  200080000][0-0]                                                             *
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/0/0][   25080000][0-0]                                                              u13
-# 132>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][  240000000][0-0]                                                                 {
-# 132>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  0][1/1/0][   400c0000][0-0]                                                                  0
-# 132>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  240000000][0-0]                                                                   }
-# 132>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][  200000000][0-0]                                                                    ;
-# 132>            NEWLINE|               NONE|     PARENT_NOT_SET[ 69/ 69/  1/  0][0/0/0][          0][2-0]
-# 134>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] union
-# 134>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-# 134>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][     820000][0-0]                  u1
-# 134>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][    3000000][0-0]                     u21
-# 134>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][  200000000][0-0]                        ;
-# 134>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 25/  1/  0][0/0/0][          0][1-0]
-# -=====-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/help.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/help.txt
deleted file mode 100644
index 1348030e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/help.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-Usage:
-uncrustify [options] [files ...]
-
-If no input files are specified, the input is read from stdin
-If reading from stdin, you should specify the language using -l
-or specify a filename using --assume for automatic language detection.
-
-If -F is used or files are specified on the command line,
-the output filename is 'prefix/filename' + suffix
-
-When reading from stdin or doing a single file via the '-f' option,
-the output is dumped to stdout, unless redirected with -o FILE.
-
-Errors are always dumped to stderr
-
-The '-f' and '-o' options may not be used with '-F' or '--replace'.
-The '--prefix' and '--suffix' options may not be used with '--replace'.
-
-Basic Options:
- -c CFG       : Use the config file CFG, or defaults if CFG is set to '-'.
- -f FILE      : Process the single file FILE (output to stdout, use with -o).
- -o FILE      : Redirect stdout to FILE.
- -F FILE      : Read files to process from FILE, one filename per line (- is stdin).
- --check      : Do not output the new text, instead verify that nothing changes when
-                the file(s) are processed.
-                The status of every file is printed to stderr.
-                The exit code is EXIT_SUCCESS if there were no changes, EXIT_FAILURE otherwise.
- files        : Files to process (can be combined with -F).
- --suffix SFX : Append SFX to the output filename. The default is '.uncrustify'
- --prefix PFX : Prepend PFX to the output filename path.
- --replace    : Replace source files (creates a backup).
- --no-backup  : Do not create backup and md5 files. Useful if files are under source control.
- --if-changed : Write to stdout (or create output FILE) only if a change was detected.
- -l           : Language override: C, CPP, D, CS, JAVA, PAWN, OC, OC+, VALA.
- -t           : Load a file with types (usually not needed).
- -q           : Quiet mode - no output on stderr (-L will override).
- --frag       : Code fragment, assume the first line is indented correctly.
- --assume FN  : Uses the filename FN for automatic language detection if reading
-                from stdin unless -l is specified.
-
-Config/Help Options:
- -h -? --help --usage     : Print this message and exit.
- --version                : Print the version and exit.
- --count-options          : Print the number of available options and exit.
- --show-config            : Print out option documentation and exit.
- --update-config          : Output a new config file. Use with -o FILE.
- --update-config-with-doc : Output a new config file. Use with -o FILE.
- --universalindent        : Output a config file for Universal Indent GUI.
- --detect                 : Detects the config from a source file. Use with '-f FILE'.
-                            Detection is fairly limited.
- --set <option>=<value>   : Sets a new value to a config option.
-
-Debug Options:
- -p FILE               : Dump debug info into FILE, or to stdout if FILE is set to '-'.
-                         Must be used in combination with '-f FILE'
- -L SEV                : Set the log severity (see log_levels.h; note 'A' = 'all')
- -s                    : Show the log severity in the logs.
- --decode              : Decode remaining args (chunk flags) and exit.
- --tracking_space FILE : Prepare tracking informations for debugging.
-                         Cannot be used with the -o option'
-
-Usage Examples
-cat foo.d | uncrustify -q -c my.cfg -l d
-uncrustify -c my.cfg -f foo.d
-uncrustify -c my.cfg -f foo.d -L0-2,20-23,51
-uncrustify -c my.cfg -f foo.d -o foo.d
-uncrustify -c my.cfg foo.d
-uncrustify -c my.cfg --replace foo.d
-uncrustify -c my.cfg --no-backup foo.d
-uncrustify -c my.cfg --prefix=out -F files.txt
-
-Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable
-      processing of parts of the source file (these can be overridden with
-      enable_processing_cmt and disable_processing_cmt).
-
-There are currently x options and minimal documentation.
-Try UniversalIndentGUI and good luck.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/logger_cs_L_99.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/logger_cs_L_99.txt
deleted file mode 100644
index e839831f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/logger_cs_L_99.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tokenize(): orig_line is , orig_col is , text() '// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {}). May need special support, or perhaps there's a bug..', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
-tokenize(): orig_line is , orig_col is , text() '// long comment line(s), such as here, might be too long to produce a correct LOG-file such as', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
-tokenize(): orig_line is , orig_col is , text() '// with the use of option -L A', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
-tokenize(): orig_line is , orig_col is , text() '// in such a case, the output of the log will be cut.', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_error.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_error.txt
deleted file mode 100644
index ac1e7302..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_error.txt
+++ /dev/null
@@ -1 +0,0 @@
-config/mini_d.cfg:2: unknown option 'not_existing_option'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_uc.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_uc.txt
deleted file mode 100644
index 9d7d5c7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_uc.txt
+++ /dev/null
@@ -1,756 +0,0 @@
-
-newlines                        = auto
-input_tab_size                  = 8
-output_tab_size                 = 8
-string_escape_char              = 92
-string_escape_char2             = 0
-string_replace_tab_chars        = false
-tok_split_gte                   = false
-disable_processing_nl_cont      = false
-disable_processing_cmt          = " *INDENT-OFF*"
-enable_processing_cmt           = " *INDENT-ON*"
-enable_digraphs                 = false
-processing_cmt_as_regex         = false
-utf8_bom                        = ignore
-utf8_byte                       = false
-utf8_force                      = false
-sp_arith                        = ignore
-sp_arith_additive               = ignore
-sp_assign                       = ignore
-sp_cpp_lambda_assign            = ignore
-sp_cpp_lambda_square_paren      = ignore
-sp_cpp_lambda_square_brace      = ignore
-sp_cpp_lambda_argument_list     = ignore
-sp_cpp_lambda_paren_brace       = ignore
-sp_cpp_lambda_fparen            = ignore
-sp_assign_default               = ignore
-sp_before_assign                = ignore
-sp_after_assign                 = ignore
-sp_enum_paren                   = ignore
-sp_enum_assign                  = ignore
-sp_enum_before_assign           = ignore
-sp_enum_after_assign            = ignore
-sp_enum_colon                   = ignore
-sp_pp_concat                    = add
-sp_pp_stringify                 = ignore
-sp_before_pp_stringify          = ignore
-sp_bool                         = ignore
-sp_compare                      = ignore
-sp_inside_paren                 = ignore
-sp_paren_paren                  = ignore
-sp_cparen_oparen                = ignore
-sp_balance_nested_parens        = false
-sp_paren_brace                  = ignore
-sp_brace_brace                  = ignore
-sp_before_ptr_star              = ignore
-sp_before_unnamed_ptr_star      = ignore
-sp_between_ptr_star             = ignore
-sp_after_ptr_star               = ignore
-sp_after_ptr_block_caret        = ignore
-sp_after_ptr_star_qualifier     = ignore
-sp_after_ptr_star_func          = ignore
-sp_ptr_star_paren               = ignore
-sp_before_ptr_star_func         = ignore
-sp_before_byref                 = ignore
-sp_before_unnamed_byref         = ignore
-sp_after_byref                  = ignore
-sp_after_byref_func             = ignore
-sp_before_byref_func            = ignore
-sp_after_type                   = force
-sp_after_decltype               = ignore
-sp_before_template_paren        = ignore
-sp_template_angle               = ignore
-sp_before_angle                 = ignore
-sp_inside_angle                 = ignore
-sp_inside_angle_empty           = ignore
-sp_angle_colon                  = ignore
-sp_after_angle                  = ignore
-sp_angle_paren                  = ignore
-sp_angle_paren_empty            = ignore
-sp_angle_word                   = ignore
-sp_angle_shift                  = add
-sp_permit_cpp11_shift           = false
-sp_before_sparen                = ignore
-sp_inside_sparen                = ignore
-sp_inside_sparen_open           = ignore
-sp_inside_sparen_close          = ignore
-sp_after_sparen                 = ignore
-sp_sparen_brace                 = ignore
-sp_do_brace_open                = ignore
-sp_brace_close_while            = ignore
-sp_while_paren_open             = ignore
-sp_invariant_paren              = ignore
-sp_after_invariant_paren        = ignore
-sp_special_semi                 = ignore
-sp_before_semi                  = remove
-sp_before_semi_for              = ignore
-sp_before_semi_for_empty        = ignore
-sp_after_semi                   = add
-sp_after_semi_for               = force
-sp_after_semi_for_empty         = ignore
-sp_before_square                = ignore
-sp_before_vardef_square         = remove
-sp_before_square_asm_block      = ignore
-sp_before_squares               = ignore
-sp_cpp_before_struct_binding    = ignore
-sp_inside_square                = ignore
-sp_inside_square_empty          = ignore
-sp_inside_square_oc_array       = ignore
-sp_after_comma                  = ignore
-sp_before_comma                 = remove
-sp_after_mdatype_commas         = ignore
-sp_before_mdatype_commas        = ignore
-sp_between_mdatype_commas       = ignore
-sp_paren_comma                  = force
-sp_before_ellipsis              = ignore
-sp_type_ellipsis                = ignore
-sp_type_question                = ignore
-sp_paren_ellipsis               = ignore
-sp_paren_qualifier              = ignore
-sp_paren_noexcept               = ignore
-sp_after_class_colon            = ignore
-sp_before_class_colon           = ignore
-sp_after_constr_colon           = ignore
-sp_before_constr_colon          = ignore
-sp_before_case_colon            = remove
-sp_after_operator               = ignore
-sp_after_operator_sym           = ignore
-sp_after_operator_sym_empty     = ignore
-sp_after_cast                   = ignore
-sp_inside_paren_cast            = ignore
-sp_cpp_cast_paren               = ignore
-sp_sizeof_paren                 = ignore
-sp_sizeof_ellipsis              = ignore
-sp_sizeof_ellipsis_paren        = ignore
-sp_decltype_paren               = ignore
-sp_after_tag                    = ignore
-sp_inside_braces_enum           = ignore
-sp_inside_braces_struct         = ignore
-sp_inside_braces_oc_dict        = ignore
-sp_after_type_brace_init_lst_open = ignore
-sp_before_type_brace_init_lst_close = ignore
-sp_inside_type_brace_init_lst   = ignore
-sp_inside_braces                = ignore
-sp_inside_braces_empty          = ignore
-sp_trailing_return              = ignore
-sp_type_func                    = ignore
-sp_type_brace_init_lst          = ignore
-sp_func_proto_paren             = ignore
-sp_func_proto_paren_empty       = ignore
-sp_func_type_paren              = ignore
-sp_func_def_paren               = ignore
-sp_func_def_paren_empty         = ignore
-sp_inside_fparens               = ignore
-sp_inside_fparen                = ignore
-sp_inside_tparen                = ignore
-sp_after_tparen_close           = ignore
-sp_square_fparen                = ignore
-sp_fparen_brace                 = ignore
-sp_fparen_brace_initializer     = ignore
-sp_fparen_dbrace                = ignore
-sp_func_call_paren              = ignore
-sp_func_call_paren_empty        = ignore
-sp_func_call_user_paren         = ignore
-sp_func_call_user_inside_fparen = ignore
-sp_func_call_user_paren_paren   = ignore
-sp_func_class_paren             = ignore
-sp_func_class_paren_empty       = ignore
-sp_return_paren                 = ignore
-sp_return_brace                 = ignore
-sp_attribute_paren              = ignore
-sp_defined_paren                = ignore
-sp_throw_paren                  = ignore
-sp_after_throw                  = ignore
-sp_catch_paren                  = ignore
-sp_oc_catch_paren               = ignore
-sp_before_oc_proto_list         = ignore
-sp_oc_classname_paren           = ignore
-sp_version_paren                = ignore
-sp_scope_paren                  = ignore
-sp_super_paren                  = remove
-sp_this_paren                   = remove
-sp_macro                        = ignore
-sp_macro_func                   = ignore
-sp_else_brace                   = ignore
-sp_brace_else                   = ignore
-sp_brace_typedef                = ignore
-sp_catch_brace                  = ignore
-sp_oc_catch_brace               = ignore
-sp_brace_catch                  = ignore
-sp_oc_brace_catch               = ignore
-sp_finally_brace                = ignore
-sp_brace_finally                = ignore
-sp_try_brace                    = ignore
-sp_getset_brace                 = ignore
-sp_word_brace_init_lst          = ignore
-sp_word_brace_ns                = add
-sp_before_dc                    = ignore
-sp_after_dc                     = ignore
-sp_d_array_colon                = ignore
-sp_not                          = remove
-sp_inv                          = remove
-sp_addr                         = remove
-sp_member                       = remove
-sp_deref                        = remove
-sp_sign                         = remove
-sp_incdec                       = remove
-sp_before_nl_cont               = add
-sp_after_oc_scope               = ignore
-sp_after_oc_colon               = ignore
-sp_before_oc_colon              = ignore
-sp_after_oc_dict_colon          = ignore
-sp_before_oc_dict_colon         = ignore
-sp_after_send_oc_colon          = ignore
-sp_before_send_oc_colon         = ignore
-sp_after_oc_type                = ignore
-sp_after_oc_return_type         = ignore
-sp_after_oc_at_sel              = ignore
-sp_after_oc_at_sel_parens       = ignore
-sp_inside_oc_at_sel_parens      = ignore
-sp_before_oc_block_caret        = ignore
-sp_after_oc_block_caret         = ignore
-sp_after_oc_msg_receiver        = ignore
-sp_after_oc_property            = ignore
-sp_after_oc_synchronized        = ignore
-sp_cond_colon                   = ignore
-sp_cond_colon_before            = ignore
-sp_cond_colon_after             = ignore
-sp_cond_question                = ignore
-sp_cond_question_before         = ignore
-sp_cond_question_after          = ignore
-sp_cond_ternary_short           = ignore
-sp_case_label                   = ignore
-sp_range                        = ignore
-sp_after_for_colon              = ignore
-sp_before_for_colon             = ignore
-sp_extern_paren                 = ignore
-sp_cmt_cpp_start                = ignore
-sp_cmt_cpp_region               = ignore
-sp_cmt_cpp_doxygen              = false
-sp_cmt_cpp_qttr                 = false
-sp_endif_cmt                    = ignore
-sp_after_new                    = ignore
-sp_between_new_paren            = ignore
-sp_after_newop_paren            = ignore
-sp_inside_newop_paren           = ignore
-sp_inside_newop_paren_open      = ignore
-sp_inside_newop_paren_close     = ignore
-sp_before_tr_emb_cmt            = ignore
-sp_num_before_tr_emb_cmt        = 0
-sp_annotation_paren             = ignore
-sp_skip_vbrace_tokens           = false
-sp_after_noexcept               = ignore
-sp_vala_after_translation       = ignore
-force_tab_after_define          = false
-indent_columns                  = 8
-indent_continue                 = 0
-indent_continue_class_head      = 0
-indent_single_newlines          = false
-indent_param                    = 0
-indent_with_tabs                = 1
-indent_cmt_with_tabs            = false
-indent_align_string             = false
-indent_xml_string               = 0
-indent_brace                    = 0
-indent_braces                   = false
-indent_braces_no_func           = false
-indent_braces_no_class          = false
-indent_braces_no_struct         = false
-indent_brace_parent             = false
-indent_paren_open_brace         = false
-indent_cs_delegate_brace        = false
-indent_cs_delegate_body         = false
-indent_namespace                = false
-indent_namespace_single_indent  = false
-indent_namespace_level          = 0
-indent_namespace_limit          = 0
-indent_extern                   = false
-indent_class                    = false
-indent_before_class_colon       = 0
-indent_class_colon              = false
-indent_class_on_colon           = false
-indent_constr_colon             = false
-indent_ctor_init_leading        = 2
-indent_ctor_init                = 0
-indent_else_if                  = false
-indent_var_def_blk              = 0
-indent_var_def_cont             = false
-indent_shift                    = false
-indent_func_def_force_col1      = false
-indent_func_call_param          = false
-indent_func_def_param           = false
-indent_func_def_param_paren_pos_threshold = 0
-indent_func_proto_param         = false
-indent_func_class_param         = false
-indent_func_ctor_var_param      = false
-indent_template_param           = false
-indent_func_param_double        = false
-indent_func_const               = 0
-indent_func_throw               = 0
-indent_macro_brace              = true
-indent_member                   = 0
-indent_member_single            = false
-indent_sing_line_comments       = 0
-indent_sparen_extra             = 0
-indent_relative_single_line_comments = false
-indent_switch_case              = 0
-indent_case_brace               = 0
-indent_switch_break_with_case   = false
-indent_switch_pp                = true
-indent_case_shift               = 0
-indent_col1_comment             = false
-indent_col1_multi_string_literal = false
-indent_label                    = 1
-indent_access_spec              = 1
-indent_access_spec_body         = false
-indent_paren_nl                 = false
-indent_paren_close              = 0
-indent_paren_after_func_def     = false
-indent_paren_after_func_decl    = false
-indent_paren_after_func_call    = false
-indent_comma_brace              = false
-indent_comma_paren              = false
-indent_bool_paren               = false
-indent_semicolon_for_paren      = false
-indent_first_bool_expr          = false
-indent_first_for_expr           = false
-indent_square_nl                = false
-indent_preserve_sql             = false
-indent_align_assign             = true
-indent_off_after_assign         = false
-indent_align_paren              = true
-indent_oc_inside_msg_sel        = false
-indent_oc_block                 = false
-indent_oc_block_msg             = 0
-indent_oc_msg_colon             = 0
-indent_oc_msg_prioritize_first_colon = true
-indent_oc_block_msg_xcode_style = false
-indent_oc_block_msg_from_keyword = false
-indent_oc_block_msg_from_colon  = false
-indent_oc_block_msg_from_caret  = false
-indent_oc_block_msg_from_brace  = false
-indent_min_vbrace_open          = 0
-indent_vbrace_open_on_tabstop   = false
-indent_token_after_brace        = true
-indent_cpp_lambda_body          = false
-indent_compound_literal_return  = true
-indent_using_block              = true
-indent_ternary_operator         = 0
-indent_inside_ternary_operator  = false
-indent_off_after_return         = false
-indent_off_after_return_new     = false
-indent_single_after_return      = false
-indent_ignore_asm_block         = false
-donot_indent_func_def_close_paren = false
-nl_collapse_empty_body          = false
-nl_assign_leave_one_liners      = false
-nl_class_leave_one_liners       = false
-nl_enum_leave_one_liners        = false
-nl_getset_leave_one_liners      = false
-nl_cs_property_leave_one_liners = false
-nl_func_leave_one_liners        = false
-nl_cpp_lambda_leave_one_liners  = false
-nl_if_leave_one_liners          = false
-nl_while_leave_one_liners       = false
-nl_do_leave_one_liners          = false
-nl_for_leave_one_liners         = false
-nl_oc_msg_leave_one_liner       = false
-nl_oc_mdef_brace                = ignore
-nl_oc_block_brace               = ignore
-nl_oc_before_interface          = ignore
-nl_oc_before_implementation     = ignore
-nl_oc_before_end                = ignore
-nl_oc_interface_brace           = ignore
-nl_oc_implementation_brace      = ignore
-nl_start_of_file                = ignore
-nl_start_of_file_min            = 0
-nl_end_of_file                  = ignore
-nl_end_of_file_min              = 0
-nl_assign_brace                 = ignore
-nl_assign_square                = ignore
-nl_tsquare_brace                = ignore
-nl_after_square_assign          = ignore
-nl_fcall_brace                  = ignore
-nl_enum_brace                   = ignore
-nl_enum_class                   = ignore
-nl_enum_class_identifier        = ignore
-nl_enum_identifier_colon        = ignore
-nl_enum_colon_type              = ignore
-nl_struct_brace                 = ignore
-nl_union_brace                  = ignore
-nl_if_brace                     = ignore
-nl_brace_else                   = ignore
-nl_elseif_brace                 = ignore
-nl_else_brace                   = ignore
-nl_else_if                      = ignore
-nl_before_opening_brace_func_class_def = ignore
-nl_before_if_closing_paren      = ignore
-nl_brace_finally                = ignore
-nl_finally_brace                = ignore
-nl_try_brace                    = ignore
-nl_getset_brace                 = ignore
-nl_for_brace                    = ignore
-nl_catch_brace                  = ignore
-nl_oc_catch_brace               = ignore
-nl_brace_catch                  = ignore
-nl_oc_brace_catch               = ignore
-nl_brace_square                 = ignore
-nl_brace_fparen                 = ignore
-nl_while_brace                  = ignore
-nl_scope_brace                  = ignore
-nl_unittest_brace               = ignore
-nl_version_brace                = ignore
-nl_using_brace                  = ignore
-nl_brace_brace                  = ignore
-nl_do_brace                     = ignore
-nl_brace_while                  = ignore
-nl_switch_brace                 = ignore
-nl_synchronized_brace           = ignore
-nl_multi_line_cond              = false
-nl_multi_line_sparen_open       = ignore
-nl_multi_line_sparen_close      = ignore
-nl_multi_line_define            = false
-nl_before_case                  = false
-nl_after_case                   = false
-nl_case_colon_brace             = ignore
-nl_before_throw                 = ignore
-nl_namespace_brace              = ignore
-nl_template_class               = ignore
-nl_template_class_decl          = ignore
-nl_template_class_decl_special  = ignore
-nl_template_class_def           = ignore
-nl_template_class_def_special   = ignore
-nl_template_func                = ignore
-nl_template_func_decl           = ignore
-nl_template_func_decl_special   = ignore
-nl_template_func_def            = ignore
-nl_template_func_def_special    = ignore
-nl_template_var                 = ignore
-nl_template_using               = ignore
-nl_class_brace                  = ignore
-nl_class_init_args              = ignore
-nl_constr_init_args             = ignore
-nl_enum_own_lines               = ignore
-nl_func_type_name               = ignore
-nl_func_type_name_class         = ignore
-nl_func_class_scope             = ignore
-nl_func_scope_name              = ignore
-nl_func_proto_type_name         = ignore
-nl_func_paren                   = ignore
-nl_func_paren_empty             = ignore
-nl_func_def_paren               = ignore
-nl_func_def_paren_empty         = ignore
-nl_func_call_paren              = ignore
-nl_func_call_paren_empty        = ignore
-nl_func_decl_start              = ignore
-nl_func_def_start               = ignore
-nl_func_decl_start_single       = ignore
-nl_func_def_start_single        = ignore
-nl_func_decl_start_multi_line   = false
-nl_func_def_start_multi_line    = false
-nl_func_decl_args               = ignore
-nl_func_def_args                = ignore
-nl_func_call_args               = ignore
-nl_func_decl_args_multi_line    = false
-nl_func_def_args_multi_line     = false
-nl_func_decl_end                = ignore
-nl_func_def_end                 = ignore
-nl_func_decl_end_single         = ignore
-nl_func_def_end_single          = ignore
-nl_func_decl_end_multi_line     = false
-nl_func_def_end_multi_line      = false
-nl_func_decl_empty              = ignore
-nl_func_def_empty               = ignore
-nl_func_call_empty              = ignore
-nl_func_call_start              = ignore
-nl_func_call_end                = ignore
-nl_func_call_start_multi_line   = false
-nl_func_call_args_multi_line    = false
-nl_func_call_end_multi_line     = false
-nl_func_call_args_multi_line_ignore_closures = false
-nl_template_start               = false
-nl_template_args                = false
-nl_template_end                 = false
-nl_oc_msg_args                  = false
-nl_fdef_brace                   = ignore
-nl_fdef_brace_cond              = ignore
-nl_cpp_ldef_brace               = ignore
-nl_return_expr                  = ignore
-nl_after_semicolon              = false
-nl_paren_dbrace_open            = ignore
-nl_type_brace_init_lst          = ignore
-nl_type_brace_init_lst_open     = ignore
-nl_type_brace_init_lst_close    = ignore
-nl_after_brace_open             = false
-nl_after_brace_open_cmt         = false
-nl_after_vbrace_open            = false
-nl_after_vbrace_open_empty      = false
-nl_after_brace_close            = false
-nl_after_vbrace_close           = false
-nl_brace_struct_var             = ignore
-nl_define_macro                 = false
-nl_squeeze_paren_close          = false
-nl_squeeze_ifdef                = false
-nl_squeeze_ifdef_top_level      = false
-nl_before_if                    = ignore
-nl_after_if                     = ignore
-nl_before_for                   = ignore
-nl_after_for                    = ignore
-nl_before_while                 = ignore
-nl_after_while                  = ignore
-nl_before_switch                = ignore
-nl_after_switch                 = ignore
-nl_before_synchronized          = ignore
-nl_after_synchronized           = ignore
-nl_before_do                    = ignore
-nl_after_do                     = ignore
-nl_before_return                = false
-nl_after_return                 = false
-nl_before_member                = ignore
-nl_after_member                 = ignore
-nl_ds_struct_enum_cmt           = false
-nl_ds_struct_enum_close_brace   = false
-nl_class_colon                  = ignore
-nl_constr_colon                 = ignore
-nl_namespace_two_to_one_liner   = false
-nl_create_if_one_liner          = false
-nl_create_for_one_liner         = false
-nl_create_while_one_liner       = false
-nl_create_func_def_one_liner    = false
-nl_create_list_one_liner        = false
-nl_split_if_one_liner           = false
-nl_split_for_one_liner          = false
-nl_split_while_one_liner        = false
-donot_add_nl_before_cpp_comment = false
-nl_max                          = 0
-nl_max_blank_in_func            = 0
-nl_inside_empty_func            = 0
-nl_before_func_body_proto       = 0
-nl_before_func_body_def         = 0
-nl_before_func_class_proto      = 0
-nl_before_func_class_def        = 0
-nl_after_func_proto             = 0
-nl_after_func_proto_group       = 0
-nl_after_func_class_proto       = 0
-nl_after_func_class_proto_group = 0
-nl_class_leave_one_liner_groups = false
-nl_after_func_body              = 0
-nl_after_func_body_class        = 0
-nl_after_func_body_one_liner    = 0
-nl_func_var_def_blk             = 0
-nl_typedef_blk_start            = 0
-nl_typedef_blk_end              = 0
-nl_typedef_blk_in               = 0
-nl_var_def_blk_start            = 0
-nl_var_def_blk_end              = 0
-nl_var_def_blk_in               = 0
-nl_before_block_comment         = 0
-nl_before_c_comment             = 0
-nl_before_cpp_comment           = 0
-nl_after_multiline_comment      = false
-nl_after_label_colon            = false
-nl_after_struct                 = 0
-nl_before_class                 = 0
-nl_after_class                  = 0
-nl_before_namespace             = 0
-nl_inside_namespace             = 0
-nl_after_namespace              = 0
-nl_before_access_spec           = 0
-nl_after_access_spec            = 0
-nl_comment_func_def             = 0
-nl_after_try_catch_finally      = 0
-nl_around_cs_property           = 0
-nl_between_get_set              = 0
-nl_property_brace               = ignore
-eat_blanks_after_open_brace     = false
-eat_blanks_before_close_brace   = false
-nl_remove_extra_newlines        = 0
-nl_after_annotation             = ignore
-nl_between_annotation           = ignore
-nl_before_whole_file_ifdef      = 0
-nl_after_whole_file_ifdef       = 0
-nl_before_whole_file_endif      = 0
-nl_after_whole_file_endif       = 0
-pos_arith                       = ignore
-pos_assign                      = ignore
-pos_bool                        = ignore
-pos_compare                     = ignore
-pos_conditional                 = ignore
-pos_comma                       = ignore
-pos_enum_comma                  = ignore
-pos_class_comma                 = ignore
-pos_constr_comma                = ignore
-pos_class_colon                 = ignore
-pos_constr_colon                = ignore
-pos_shift                       = ignore
-code_width                      = 0
-ls_for_split_full               = false
-ls_func_split_full              = false
-ls_code_width                   = false
-align_keep_tabs                 = false
-align_with_tabs                 = false
-align_on_tabstop                = false
-align_number_right              = false
-align_keep_extra_space          = false
-align_func_params               = false
-align_func_params_span          = 0
-align_func_params_thresh        = 0
-align_func_params_gap           = 0
-align_constr_value_span         = 0
-align_constr_value_thresh       = 0
-align_constr_value_gap          = 0
-align_same_func_call_params     = false
-align_same_func_call_params_span = 0
-align_same_func_call_params_thresh = 0
-align_var_def_span              = 0
-align_var_def_star_style        = 0
-align_var_def_amp_style         = 0
-align_var_def_thresh            = 0
-align_var_def_gap               = 0
-align_var_def_colon             = false
-align_var_def_colon_gap         = 0
-align_var_def_attribute         = false
-align_var_def_inline            = false
-align_assign_span               = 0
-align_assign_func_proto_span    = 0
-align_assign_thresh             = 0
-align_assign_decl_func          = 0
-align_enum_equ_span             = 0
-align_enum_equ_thresh           = 0
-align_var_class_span            = 0
-align_var_class_thresh          = 0
-align_var_class_gap             = 0
-align_var_struct_span           = 0
-align_var_struct_thresh         = 0
-align_var_struct_gap            = 0
-align_struct_init_span          = 0
-align_typedef_span              = 0
-align_typedef_gap               = 0
-align_typedef_func              = 0
-align_typedef_star_style        = 0
-align_typedef_amp_style         = 0
-align_right_cmt_span            = 0
-align_right_cmt_gap             = 0
-align_right_cmt_mix             = false
-align_right_cmt_same_level      = false
-align_right_cmt_at_col          = 0
-align_func_proto_span           = 0
-align_func_proto_thresh         = 0
-align_func_proto_gap            = 0
-align_on_operator               = false
-align_mix_var_proto             = false
-align_single_line_func          = false
-align_single_line_brace         = false
-align_single_line_brace_gap     = 0
-align_oc_msg_spec_span          = 0
-align_nl_cont                   = false
-align_pp_define_together        = false
-align_pp_define_span            = 0
-align_pp_define_gap             = 0
-align_left_shift                = true
-align_eigen_comma_init          = false
-align_asm_colon                 = false
-align_oc_msg_colon_span         = 0
-align_oc_msg_colon_first        = false
-align_oc_decl_colon             = false
-align_oc_msg_colon_xcode_like   = false
-cmt_width                       = 0
-cmt_reflow_mode                 = 0
-cmt_reflow_fold_regex_file      = ""
-cmt_reflow_indent_to_paragraph_start = false
-cmt_convert_tab_to_spaces       = false
-cmt_indent_multi                = true
-cmt_align_doxygen_javadoc_tags  = false
-cmt_sp_before_doxygen_javadoc_tags = 1
-cmt_c_group                     = false
-cmt_c_nl_start                  = false
-cmt_c_nl_end                    = false
-cmt_cpp_to_c                    = false
-cmt_cpp_group                   = false
-cmt_cpp_nl_start                = false
-cmt_cpp_nl_end                  = false
-cmt_star_cont                   = false
-cmt_sp_before_star_cont         = 0
-cmt_sp_after_star_cont          = 0
-cmt_multi_check_last            = true
-cmt_multi_first_len_minimum     = 4
-cmt_insert_file_header          = ""
-cmt_insert_file_footer          = ""
-cmt_insert_func_header          = ""
-cmt_insert_class_header         = ""
-cmt_insert_oc_msg_header        = ""
-cmt_insert_before_preproc       = false
-cmt_insert_before_inlines       = true
-cmt_insert_before_ctor_dtor     = false
-mod_full_brace_do               = ignore
-mod_full_brace_for              = ignore
-mod_full_brace_function         = ignore
-mod_full_brace_if               = ignore
-mod_full_brace_if_chain         = false
-mod_full_brace_if_chain_only    = false
-mod_full_brace_while            = ignore
-mod_full_brace_using            = ignore
-mod_full_brace_nl               = 0
-mod_full_brace_nl_block_rem_mlcond = false
-mod_paren_on_return             = ignore
-mod_pawn_semicolon              = false
-mod_full_paren_if_bool          = false
-mod_remove_extra_semicolon      = false
-mod_add_long_function_closebrace_comment = 0
-mod_add_long_namespace_closebrace_comment = 0
-mod_add_long_class_closebrace_comment = 0
-mod_add_long_switch_closebrace_comment = 0
-mod_add_long_ifdef_endif_comment = 0
-mod_add_long_ifdef_else_comment = 0
-mod_sort_case_sensitive         = false
-mod_sort_import                 = false
-mod_sort_using                  = false
-mod_sort_include                = false
-mod_sort_incl_import_prioritize_filename = false
-mod_sort_incl_import_prioritize_extensionless = false
-mod_sort_incl_import_prioritize_angle_over_quotes = false
-mod_sort_incl_import_ignore_extension = false
-mod_sort_incl_import_grouping_enabled = false
-mod_move_case_break             = false
-mod_case_brace                  = ignore
-mod_remove_empty_return         = false
-mod_enum_last_comma             = ignore
-mod_sort_oc_properties          = false
-mod_sort_oc_property_class_weight = 0
-mod_sort_oc_property_thread_safe_weight = 0
-mod_sort_oc_property_readwrite_weight = 0
-mod_sort_oc_property_reference_weight = 0
-mod_sort_oc_property_getter_weight = 0
-mod_sort_oc_property_setter_weight = 0
-mod_sort_oc_property_nullability_weight = 0
-pp_indent                       = ignore
-pp_indent_at_level              = false
-pp_indent_count                 = 1
-pp_space                        = ignore
-pp_space_count                  = 0
-pp_indent_region                = 0
-pp_region_indent_code           = false
-pp_indent_if                    = 0
-pp_if_indent_code               = false
-pp_define_at_level              = false
-pp_ignore_define_body           = false
-pp_indent_case                  = true
-pp_indent_func_def              = true
-pp_indent_extern                = true
-pp_indent_brace                 = true
-include_category_0              = ""
-include_category_1              = ""
-include_category_2              = ""
-use_indent_func_call_param      = true
-use_indent_continue_only_once   = false
-indent_cpp_lambda_only_once     = false
-use_sp_after_angle_always       = false
-use_options_overriding_for_qt_macros = true
-use_form_feed_no_more_as_whitespace_character = false
-warn_level_tabs_found_in_verbatim_string_literals = 2
-debug_max_number_of_loops       = 0
-debug_line_number_to_protocol   = 0
-debug_timeout                   = 0
-debug_truncate                  = 0
-# option(s) with 'not default' value: 0
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_ucwd.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_ucwd.txt
deleted file mode 100644
index f220a918..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_ucwd.txt
+++ /dev/null
@@ -1,3214 +0,0 @@
-
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
-
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
-
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
-
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Option to allow both disable_processing_cmt and enable_processing_cmt
-# strings, if specified, to be interpreted as ECMAScript regular expressions.
-# If true, a regex search will be performed within comments according to the
-# specified patterns in order to disable/enable processing.
-processing_cmt_as_regex         = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening parenthesis and before the closing
-# parenthesis of a argument list of a C++11 lambda, as in
-# '[]( <here> int x <here> ){ ... }'.
-sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype(...)' and word,
-# brace or function call.
-sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
-
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
-
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force/not_defined
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force/not_defined
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : <here> expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var <here> : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
-# A region marker is defined as a comment which is not preceded by other text
-# (i.e. the comment is the first non-whitespace on the line), and which starts
-# with either 'BEGIN' or 'END'.
-#
-# Overrides sp_cmt_cpp_start.
-sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
-
-# If true, space added with sp_cmt_cpp_start will be added after Doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space added with sp_cmt_cpp_start will be added after Qt translator
-# or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force/not_defined
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
-
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
-
-# Additional indent before the leading base class colon.
-# Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
-indent_before_class_colon       = 0        # number
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-# It might wise to choose the same value for the option indent_case_brace.
-indent_switch_case              = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-# It might wise to choose the same value for the option indent_switch_case.
-indent_case_brace               = 0        # number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = 1        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace
-#       (i.e. 2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only
-#        add the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statements inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = false    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line do statements, as in 'do { b++; } while(...);'.
-nl_do_leave_one_liners          = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option in case of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into three lines by
-# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option overrides eat_blanks_after_open_brace and
-# eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition. Where
-# applicable, this option is overridden with eat_blanks_after_open_brace=true
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Path to a file that contains regular expressions describing patterns for
-# which the end of one line and the beginning of the next will be folded into
-# the same sentence or paragraph during full comment reflow. The regular
-# expressions are described using ECMAScript syntax. The syntax for this
-# specification is as follows, where "..." indicates the custom regular
-# expression and "n" indicates the nth end_of_prev_line_regex and
-# beg_of_next_line_regex regular expression pair:
-#
-# end_of_prev_line_regex[1] = "...$"
-# beg_of_next_line_regex[1] = "^..."
-# end_of_prev_line_regex[2] = "...$"
-# beg_of_next_line_regex[2] = "^..."
-#             .
-#             .
-#             .
-# end_of_prev_line_regex[n] = "...$"
-# beg_of_next_line_regex[n] = "^..."
-#
-# Note that use of this option overrides the default reflow fold regular
-# expressions, which are internally defined as follows:
-#
-# end_of_prev_line_regex[1] = "[\w,\]\)]$"
-# beg_of_next_line_regex[1] = "^[\w,\[\(]"
-# end_of_prev_line_regex[2] = "\.$"
-# beg_of_next_line_regex[2] = "^[A-Z]"
-cmt_reflow_fold_regex_file      = ""         # string
-
-# Whether to indent wrapped lines to the start of the encompassing paragraph
-# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
-# specified by cmt_sp_after_star_cont.
-#
-# Note that cmt_align_doxygen_javadoc_tags overrides this option for
-# paragraphs associated with javadoc tags
-cmt_reflow_indent_to_paragraph_start = false    # true/false
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
-# and corresponding fields such that groups of consecutive block tags,
-# parameter names, and descriptions align with one another. Overrides that
-# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
-# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
-# in order to achieve the desired alignment for line-wrapping.
-cmt_align_doxygen_javadoc_tags  = false    # true/false
-
-# The number of spaces to insert after the star and before doxygen
-# javadoc-style tags (@param, @return, etc). Requires enabling
-# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
-# cmt_sp_after_star_cont.
-#
-# Default: 1
-cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list of whitespace
-# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Set the number of characters to be printed if the text is too long,
-# 0: do not truncate.
-debug_truncate                  = 0        # unsigned number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 0
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_uc.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_uc.txt
deleted file mode 100644
index 4203df78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_uc.txt
+++ /dev/null
@@ -1,756 +0,0 @@
-
-newlines                        = crlf
-input_tab_size                  = 8
-output_tab_size                 = 8
-string_escape_char              = 92
-string_escape_char2             = 0
-string_replace_tab_chars        = false
-tok_split_gte                   = false
-disable_processing_nl_cont      = false
-disable_processing_cmt          = " *INDENT-OFF*"
-enable_processing_cmt           = " *INDENT-ON*"
-enable_digraphs                 = false
-processing_cmt_as_regex         = false
-utf8_bom                        = ignore
-utf8_byte                       = false
-utf8_force                      = false
-sp_arith                        = ignore
-sp_arith_additive               = ignore
-sp_assign                       = ignore
-sp_cpp_lambda_assign            = ignore
-sp_cpp_lambda_square_paren      = ignore
-sp_cpp_lambda_square_brace      = ignore
-sp_cpp_lambda_argument_list     = ignore
-sp_cpp_lambda_paren_brace       = ignore
-sp_cpp_lambda_fparen            = ignore
-sp_assign_default               = ignore
-sp_before_assign                = ignore
-sp_after_assign                 = ignore
-sp_enum_paren                   = ignore
-sp_enum_assign                  = ignore
-sp_enum_before_assign           = ignore
-sp_enum_after_assign            = ignore
-sp_enum_colon                   = ignore
-sp_pp_concat                    = add
-sp_pp_stringify                 = ignore
-sp_before_pp_stringify          = ignore
-sp_bool                         = ignore
-sp_compare                      = ignore
-sp_inside_paren                 = ignore
-sp_paren_paren                  = ignore
-sp_cparen_oparen                = ignore
-sp_balance_nested_parens        = false
-sp_paren_brace                  = ignore
-sp_brace_brace                  = ignore
-sp_before_ptr_star              = ignore
-sp_before_unnamed_ptr_star      = ignore
-sp_between_ptr_star             = ignore
-sp_after_ptr_star               = ignore
-sp_after_ptr_block_caret        = ignore
-sp_after_ptr_star_qualifier     = ignore
-sp_after_ptr_star_func          = ignore
-sp_ptr_star_paren               = ignore
-sp_before_ptr_star_func         = ignore
-sp_before_byref                 = ignore
-sp_before_unnamed_byref         = ignore
-sp_after_byref                  = ignore
-sp_after_byref_func             = ignore
-sp_before_byref_func            = ignore
-sp_after_type                   = force
-sp_after_decltype               = ignore
-sp_before_template_paren        = ignore
-sp_template_angle               = ignore
-sp_before_angle                 = ignore
-sp_inside_angle                 = ignore
-sp_inside_angle_empty           = ignore
-sp_angle_colon                  = ignore
-sp_after_angle                  = ignore
-sp_angle_paren                  = ignore
-sp_angle_paren_empty            = ignore
-sp_angle_word                   = ignore
-sp_angle_shift                  = add
-sp_permit_cpp11_shift           = false
-sp_before_sparen                = ignore
-sp_inside_sparen                = ignore
-sp_inside_sparen_open           = ignore
-sp_inside_sparen_close          = ignore
-sp_after_sparen                 = ignore
-sp_sparen_brace                 = ignore
-sp_do_brace_open                = ignore
-sp_brace_close_while            = ignore
-sp_while_paren_open             = ignore
-sp_invariant_paren              = ignore
-sp_after_invariant_paren        = ignore
-sp_special_semi                 = ignore
-sp_before_semi                  = remove
-sp_before_semi_for              = ignore
-sp_before_semi_for_empty        = ignore
-sp_after_semi                   = add
-sp_after_semi_for               = force
-sp_after_semi_for_empty         = ignore
-sp_before_square                = ignore
-sp_before_vardef_square         = remove
-sp_before_square_asm_block      = ignore
-sp_before_squares               = ignore
-sp_cpp_before_struct_binding    = ignore
-sp_inside_square                = ignore
-sp_inside_square_empty          = ignore
-sp_inside_square_oc_array       = ignore
-sp_after_comma                  = ignore
-sp_before_comma                 = remove
-sp_after_mdatype_commas         = ignore
-sp_before_mdatype_commas        = ignore
-sp_between_mdatype_commas       = ignore
-sp_paren_comma                  = force
-sp_before_ellipsis              = ignore
-sp_type_ellipsis                = ignore
-sp_type_question                = ignore
-sp_paren_ellipsis               = ignore
-sp_paren_qualifier              = ignore
-sp_paren_noexcept               = ignore
-sp_after_class_colon            = ignore
-sp_before_class_colon           = ignore
-sp_after_constr_colon           = ignore
-sp_before_constr_colon          = ignore
-sp_before_case_colon            = remove
-sp_after_operator               = ignore
-sp_after_operator_sym           = ignore
-sp_after_operator_sym_empty     = ignore
-sp_after_cast                   = ignore
-sp_inside_paren_cast            = ignore
-sp_cpp_cast_paren               = ignore
-sp_sizeof_paren                 = ignore
-sp_sizeof_ellipsis              = ignore
-sp_sizeof_ellipsis_paren        = ignore
-sp_decltype_paren               = ignore
-sp_after_tag                    = ignore
-sp_inside_braces_enum           = ignore
-sp_inside_braces_struct         = ignore
-sp_inside_braces_oc_dict        = ignore
-sp_after_type_brace_init_lst_open = ignore
-sp_before_type_brace_init_lst_close = ignore
-sp_inside_type_brace_init_lst   = ignore
-sp_inside_braces                = ignore
-sp_inside_braces_empty          = ignore
-sp_trailing_return              = ignore
-sp_type_func                    = ignore
-sp_type_brace_init_lst          = ignore
-sp_func_proto_paren             = ignore
-sp_func_proto_paren_empty       = ignore
-sp_func_type_paren              = ignore
-sp_func_def_paren               = ignore
-sp_func_def_paren_empty         = ignore
-sp_inside_fparens               = ignore
-sp_inside_fparen                = ignore
-sp_inside_tparen                = ignore
-sp_after_tparen_close           = ignore
-sp_square_fparen                = ignore
-sp_fparen_brace                 = ignore
-sp_fparen_brace_initializer     = ignore
-sp_fparen_dbrace                = ignore
-sp_func_call_paren              = ignore
-sp_func_call_paren_empty        = ignore
-sp_func_call_user_paren         = ignore
-sp_func_call_user_inside_fparen = ignore
-sp_func_call_user_paren_paren   = ignore
-sp_func_class_paren             = ignore
-sp_func_class_paren_empty       = ignore
-sp_return_paren                 = ignore
-sp_return_brace                 = ignore
-sp_attribute_paren              = ignore
-sp_defined_paren                = ignore
-sp_throw_paren                  = ignore
-sp_after_throw                  = ignore
-sp_catch_paren                  = ignore
-sp_oc_catch_paren               = ignore
-sp_before_oc_proto_list         = ignore
-sp_oc_classname_paren           = ignore
-sp_version_paren                = ignore
-sp_scope_paren                  = ignore
-sp_super_paren                  = remove
-sp_this_paren                   = remove
-sp_macro                        = ignore
-sp_macro_func                   = ignore
-sp_else_brace                   = ignore
-sp_brace_else                   = ignore
-sp_brace_typedef                = ignore
-sp_catch_brace                  = ignore
-sp_oc_catch_brace               = ignore
-sp_brace_catch                  = ignore
-sp_oc_brace_catch               = ignore
-sp_finally_brace                = ignore
-sp_brace_finally                = ignore
-sp_try_brace                    = ignore
-sp_getset_brace                 = ignore
-sp_word_brace_init_lst          = ignore
-sp_word_brace_ns                = add
-sp_before_dc                    = ignore
-sp_after_dc                     = ignore
-sp_d_array_colon                = ignore
-sp_not                          = remove
-sp_inv                          = remove
-sp_addr                         = remove
-sp_member                       = remove
-sp_deref                        = remove
-sp_sign                         = remove
-sp_incdec                       = remove
-sp_before_nl_cont               = add
-sp_after_oc_scope               = ignore
-sp_after_oc_colon               = ignore
-sp_before_oc_colon              = ignore
-sp_after_oc_dict_colon          = ignore
-sp_before_oc_dict_colon         = ignore
-sp_after_send_oc_colon          = ignore
-sp_before_send_oc_colon         = ignore
-sp_after_oc_type                = ignore
-sp_after_oc_return_type         = ignore
-sp_after_oc_at_sel              = ignore
-sp_after_oc_at_sel_parens       = ignore
-sp_inside_oc_at_sel_parens      = ignore
-sp_before_oc_block_caret        = ignore
-sp_after_oc_block_caret         = ignore
-sp_after_oc_msg_receiver        = ignore
-sp_after_oc_property            = ignore
-sp_after_oc_synchronized        = ignore
-sp_cond_colon                   = ignore
-sp_cond_colon_before            = ignore
-sp_cond_colon_after             = ignore
-sp_cond_question                = ignore
-sp_cond_question_before         = ignore
-sp_cond_question_after          = ignore
-sp_cond_ternary_short           = ignore
-sp_case_label                   = ignore
-sp_range                        = ignore
-sp_after_for_colon              = ignore
-sp_before_for_colon             = ignore
-sp_extern_paren                 = ignore
-sp_cmt_cpp_start                = ignore
-sp_cmt_cpp_region               = ignore
-sp_cmt_cpp_doxygen              = false
-sp_cmt_cpp_qttr                 = false
-sp_endif_cmt                    = ignore
-sp_after_new                    = ignore
-sp_between_new_paren            = ignore
-sp_after_newop_paren            = ignore
-sp_inside_newop_paren           = ignore
-sp_inside_newop_paren_open      = ignore
-sp_inside_newop_paren_close     = ignore
-sp_before_tr_emb_cmt            = ignore
-sp_num_before_tr_emb_cmt        = 0
-sp_annotation_paren             = ignore
-sp_skip_vbrace_tokens           = false
-sp_after_noexcept               = ignore
-sp_vala_after_translation       = ignore
-force_tab_after_define          = false
-indent_columns                  = 8
-indent_continue                 = 0
-indent_continue_class_head      = 0
-indent_single_newlines          = false
-indent_param                    = 0
-indent_with_tabs                = 1
-indent_cmt_with_tabs            = false
-indent_align_string             = false
-indent_xml_string               = 0
-indent_brace                    = 0
-indent_braces                   = false
-indent_braces_no_func           = false
-indent_braces_no_class          = false
-indent_braces_no_struct         = false
-indent_brace_parent             = false
-indent_paren_open_brace         = false
-indent_cs_delegate_brace        = false
-indent_cs_delegate_body         = false
-indent_namespace                = false
-indent_namespace_single_indent  = false
-indent_namespace_level          = 0
-indent_namespace_limit          = 0
-indent_extern                   = false
-indent_class                    = false
-indent_before_class_colon       = 0
-indent_class_colon              = false
-indent_class_on_colon           = false
-indent_constr_colon             = false
-indent_ctor_init_leading        = 2
-indent_ctor_init                = 0
-indent_else_if                  = false
-indent_var_def_blk              = 0
-indent_var_def_cont             = false
-indent_shift                    = false
-indent_func_def_force_col1      = false
-indent_func_call_param          = false
-indent_func_def_param           = false
-indent_func_def_param_paren_pos_threshold = 0
-indent_func_proto_param         = false
-indent_func_class_param         = false
-indent_func_ctor_var_param      = false
-indent_template_param           = false
-indent_func_param_double        = false
-indent_func_const               = 0
-indent_func_throw               = 0
-indent_macro_brace              = true
-indent_member                   = 0
-indent_member_single            = false
-indent_sing_line_comments       = 0
-indent_sparen_extra             = 0
-indent_relative_single_line_comments = false
-indent_switch_case              = 0
-indent_case_brace               = 0
-indent_switch_break_with_case   = false
-indent_switch_pp                = true
-indent_case_shift               = 0
-indent_col1_comment             = false
-indent_col1_multi_string_literal = false
-indent_label                    = 1
-indent_access_spec              = 1
-indent_access_spec_body         = false
-indent_paren_nl                 = false
-indent_paren_close              = 0
-indent_paren_after_func_def     = false
-indent_paren_after_func_decl    = false
-indent_paren_after_func_call    = false
-indent_comma_brace              = false
-indent_comma_paren              = false
-indent_bool_paren               = false
-indent_semicolon_for_paren      = false
-indent_first_bool_expr          = false
-indent_first_for_expr           = false
-indent_square_nl                = false
-indent_preserve_sql             = false
-indent_align_assign             = true
-indent_off_after_assign         = false
-indent_align_paren              = true
-indent_oc_inside_msg_sel        = false
-indent_oc_block                 = false
-indent_oc_block_msg             = 0
-indent_oc_msg_colon             = 0
-indent_oc_msg_prioritize_first_colon = true
-indent_oc_block_msg_xcode_style = false
-indent_oc_block_msg_from_keyword = false
-indent_oc_block_msg_from_colon  = false
-indent_oc_block_msg_from_caret  = false
-indent_oc_block_msg_from_brace  = false
-indent_min_vbrace_open          = 0
-indent_vbrace_open_on_tabstop   = false
-indent_token_after_brace        = true
-indent_cpp_lambda_body          = false
-indent_compound_literal_return  = true
-indent_using_block              = true
-indent_ternary_operator         = 0
-indent_inside_ternary_operator  = false
-indent_off_after_return         = false
-indent_off_after_return_new     = false
-indent_single_after_return      = false
-indent_ignore_asm_block         = false
-donot_indent_func_def_close_paren = false
-nl_collapse_empty_body          = false
-nl_assign_leave_one_liners      = false
-nl_class_leave_one_liners       = false
-nl_enum_leave_one_liners        = false
-nl_getset_leave_one_liners      = false
-nl_cs_property_leave_one_liners = false
-nl_func_leave_one_liners        = false
-nl_cpp_lambda_leave_one_liners  = false
-nl_if_leave_one_liners          = false
-nl_while_leave_one_liners       = false
-nl_do_leave_one_liners          = false
-nl_for_leave_one_liners         = false
-nl_oc_msg_leave_one_liner       = false
-nl_oc_mdef_brace                = ignore
-nl_oc_block_brace               = ignore
-nl_oc_before_interface          = ignore
-nl_oc_before_implementation     = ignore
-nl_oc_before_end                = ignore
-nl_oc_interface_brace           = ignore
-nl_oc_implementation_brace      = ignore
-nl_start_of_file                = ignore
-nl_start_of_file_min            = 0
-nl_end_of_file                  = ignore
-nl_end_of_file_min              = 0
-nl_assign_brace                 = ignore
-nl_assign_square                = ignore
-nl_tsquare_brace                = ignore
-nl_after_square_assign          = ignore
-nl_fcall_brace                  = ignore
-nl_enum_brace                   = ignore
-nl_enum_class                   = ignore
-nl_enum_class_identifier        = ignore
-nl_enum_identifier_colon        = ignore
-nl_enum_colon_type              = ignore
-nl_struct_brace                 = ignore
-nl_union_brace                  = ignore
-nl_if_brace                     = ignore
-nl_brace_else                   = ignore
-nl_elseif_brace                 = ignore
-nl_else_brace                   = ignore
-nl_else_if                      = ignore
-nl_before_opening_brace_func_class_def = ignore
-nl_before_if_closing_paren      = ignore
-nl_brace_finally                = ignore
-nl_finally_brace                = ignore
-nl_try_brace                    = ignore
-nl_getset_brace                 = ignore
-nl_for_brace                    = ignore
-nl_catch_brace                  = ignore
-nl_oc_catch_brace               = ignore
-nl_brace_catch                  = ignore
-nl_oc_brace_catch               = ignore
-nl_brace_square                 = ignore
-nl_brace_fparen                 = ignore
-nl_while_brace                  = ignore
-nl_scope_brace                  = ignore
-nl_unittest_brace               = ignore
-nl_version_brace                = ignore
-nl_using_brace                  = ignore
-nl_brace_brace                  = ignore
-nl_do_brace                     = ignore
-nl_brace_while                  = ignore
-nl_switch_brace                 = ignore
-nl_synchronized_brace           = ignore
-nl_multi_line_cond              = false
-nl_multi_line_sparen_open       = ignore
-nl_multi_line_sparen_close      = ignore
-nl_multi_line_define            = false
-nl_before_case                  = false
-nl_after_case                   = false
-nl_case_colon_brace             = ignore
-nl_before_throw                 = ignore
-nl_namespace_brace              = ignore
-nl_template_class               = ignore
-nl_template_class_decl          = ignore
-nl_template_class_decl_special  = ignore
-nl_template_class_def           = ignore
-nl_template_class_def_special   = ignore
-nl_template_func                = ignore
-nl_template_func_decl           = ignore
-nl_template_func_decl_special   = ignore
-nl_template_func_def            = ignore
-nl_template_func_def_special    = ignore
-nl_template_var                 = ignore
-nl_template_using               = ignore
-nl_class_brace                  = ignore
-nl_class_init_args              = ignore
-nl_constr_init_args             = ignore
-nl_enum_own_lines               = ignore
-nl_func_type_name               = ignore
-nl_func_type_name_class         = ignore
-nl_func_class_scope             = ignore
-nl_func_scope_name              = ignore
-nl_func_proto_type_name         = ignore
-nl_func_paren                   = ignore
-nl_func_paren_empty             = ignore
-nl_func_def_paren               = ignore
-nl_func_def_paren_empty         = ignore
-nl_func_call_paren              = ignore
-nl_func_call_paren_empty        = ignore
-nl_func_decl_start              = ignore
-nl_func_def_start               = ignore
-nl_func_decl_start_single       = ignore
-nl_func_def_start_single        = ignore
-nl_func_decl_start_multi_line   = false
-nl_func_def_start_multi_line    = false
-nl_func_decl_args               = ignore
-nl_func_def_args                = ignore
-nl_func_call_args               = ignore
-nl_func_decl_args_multi_line    = false
-nl_func_def_args_multi_line     = false
-nl_func_decl_end                = ignore
-nl_func_def_end                 = ignore
-nl_func_decl_end_single         = ignore
-nl_func_def_end_single          = ignore
-nl_func_decl_end_multi_line     = false
-nl_func_def_end_multi_line      = false
-nl_func_decl_empty              = ignore
-nl_func_def_empty               = ignore
-nl_func_call_empty              = ignore
-nl_func_call_start              = ignore
-nl_func_call_end                = ignore
-nl_func_call_start_multi_line   = false
-nl_func_call_args_multi_line    = false
-nl_func_call_end_multi_line     = false
-nl_func_call_args_multi_line_ignore_closures = false
-nl_template_start               = false
-nl_template_args                = false
-nl_template_end                 = false
-nl_oc_msg_args                  = false
-nl_fdef_brace                   = ignore
-nl_fdef_brace_cond              = ignore
-nl_cpp_ldef_brace               = ignore
-nl_return_expr                  = ignore
-nl_after_semicolon              = false
-nl_paren_dbrace_open            = ignore
-nl_type_brace_init_lst          = ignore
-nl_type_brace_init_lst_open     = ignore
-nl_type_brace_init_lst_close    = ignore
-nl_after_brace_open             = false
-nl_after_brace_open_cmt         = false
-nl_after_vbrace_open            = false
-nl_after_vbrace_open_empty      = false
-nl_after_brace_close            = false
-nl_after_vbrace_close           = false
-nl_brace_struct_var             = ignore
-nl_define_macro                 = false
-nl_squeeze_paren_close          = false
-nl_squeeze_ifdef                = false
-nl_squeeze_ifdef_top_level      = false
-nl_before_if                    = ignore
-nl_after_if                     = ignore
-nl_before_for                   = ignore
-nl_after_for                    = ignore
-nl_before_while                 = ignore
-nl_after_while                  = ignore
-nl_before_switch                = ignore
-nl_after_switch                 = ignore
-nl_before_synchronized          = ignore
-nl_after_synchronized           = ignore
-nl_before_do                    = ignore
-nl_after_do                     = ignore
-nl_before_return                = false
-nl_after_return                 = false
-nl_before_member                = ignore
-nl_after_member                 = ignore
-nl_ds_struct_enum_cmt           = false
-nl_ds_struct_enum_close_brace   = false
-nl_class_colon                  = ignore
-nl_constr_colon                 = ignore
-nl_namespace_two_to_one_liner   = false
-nl_create_if_one_liner          = false
-nl_create_for_one_liner         = false
-nl_create_while_one_liner       = false
-nl_create_func_def_one_liner    = false
-nl_create_list_one_liner        = false
-nl_split_if_one_liner           = false
-nl_split_for_one_liner          = false
-nl_split_while_one_liner        = false
-donot_add_nl_before_cpp_comment = false
-nl_max                          = 0
-nl_max_blank_in_func            = 0
-nl_inside_empty_func            = 0
-nl_before_func_body_proto       = 0
-nl_before_func_body_def         = 0
-nl_before_func_class_proto      = 0
-nl_before_func_class_def        = 0
-nl_after_func_proto             = 0
-nl_after_func_proto_group       = 0
-nl_after_func_class_proto       = 0
-nl_after_func_class_proto_group = 0
-nl_class_leave_one_liner_groups = false
-nl_after_func_body              = 0
-nl_after_func_body_class        = 0
-nl_after_func_body_one_liner    = 0
-nl_func_var_def_blk             = 0
-nl_typedef_blk_start            = 0
-nl_typedef_blk_end              = 0
-nl_typedef_blk_in               = 0
-nl_var_def_blk_start            = 0
-nl_var_def_blk_end              = 0
-nl_var_def_blk_in               = 0
-nl_before_block_comment         = 0
-nl_before_c_comment             = 0
-nl_before_cpp_comment           = 0
-nl_after_multiline_comment      = false
-nl_after_label_colon            = false
-nl_after_struct                 = 0
-nl_before_class                 = 0
-nl_after_class                  = 0
-nl_before_namespace             = 0
-nl_inside_namespace             = 0
-nl_after_namespace              = 0
-nl_before_access_spec           = 0
-nl_after_access_spec            = 0
-nl_comment_func_def             = 0
-nl_after_try_catch_finally      = 0
-nl_around_cs_property           = 0
-nl_between_get_set              = 0
-nl_property_brace               = ignore
-eat_blanks_after_open_brace     = false
-eat_blanks_before_close_brace   = false
-nl_remove_extra_newlines        = 0
-nl_after_annotation             = ignore
-nl_between_annotation           = ignore
-nl_before_whole_file_ifdef      = 0
-nl_after_whole_file_ifdef       = 0
-nl_before_whole_file_endif      = 0
-nl_after_whole_file_endif       = 0
-pos_arith                       = ignore
-pos_assign                      = ignore
-pos_bool                        = ignore
-pos_compare                     = ignore
-pos_conditional                 = ignore
-pos_comma                       = ignore
-pos_enum_comma                  = ignore
-pos_class_comma                 = ignore
-pos_constr_comma                = ignore
-pos_class_colon                 = ignore
-pos_constr_colon                = ignore
-pos_shift                       = ignore
-code_width                      = 0
-ls_for_split_full               = false
-ls_func_split_full              = false
-ls_code_width                   = false
-align_keep_tabs                 = false
-align_with_tabs                 = false
-align_on_tabstop                = false
-align_number_right              = false
-align_keep_extra_space          = false
-align_func_params               = false
-align_func_params_span          = 0
-align_func_params_thresh        = 0
-align_func_params_gap           = 0
-align_constr_value_span         = 0
-align_constr_value_thresh       = 0
-align_constr_value_gap          = 0
-align_same_func_call_params     = false
-align_same_func_call_params_span = 0
-align_same_func_call_params_thresh = 0
-align_var_def_span              = 0
-align_var_def_star_style        = 0
-align_var_def_amp_style         = 0
-align_var_def_thresh            = 0
-align_var_def_gap               = 0
-align_var_def_colon             = false
-align_var_def_colon_gap         = 0
-align_var_def_attribute         = false
-align_var_def_inline            = false
-align_assign_span               = 0
-align_assign_func_proto_span    = 0
-align_assign_thresh             = 0
-align_assign_decl_func          = 0
-align_enum_equ_span             = 0
-align_enum_equ_thresh           = 0
-align_var_class_span            = 0
-align_var_class_thresh          = 0
-align_var_class_gap             = 0
-align_var_struct_span           = 0
-align_var_struct_thresh         = 0
-align_var_struct_gap            = 0
-align_struct_init_span          = 0
-align_typedef_span              = 0
-align_typedef_gap               = 0
-align_typedef_func              = 0
-align_typedef_star_style        = 0
-align_typedef_amp_style         = 0
-align_right_cmt_span            = 0
-align_right_cmt_gap             = 0
-align_right_cmt_mix             = false
-align_right_cmt_same_level      = false
-align_right_cmt_at_col          = 0
-align_func_proto_span           = 0
-align_func_proto_thresh         = 0
-align_func_proto_gap            = 0
-align_on_operator               = false
-align_mix_var_proto             = false
-align_single_line_func          = false
-align_single_line_brace         = false
-align_single_line_brace_gap     = 0
-align_oc_msg_spec_span          = 0
-align_nl_cont                   = false
-align_pp_define_together        = false
-align_pp_define_span            = 0
-align_pp_define_gap             = 0
-align_left_shift                = true
-align_eigen_comma_init          = false
-align_asm_colon                 = false
-align_oc_msg_colon_span         = 0
-align_oc_msg_colon_first        = false
-align_oc_decl_colon             = false
-align_oc_msg_colon_xcode_like   = false
-cmt_width                       = 0
-cmt_reflow_mode                 = 0
-cmt_reflow_fold_regex_file      = ""
-cmt_reflow_indent_to_paragraph_start = false
-cmt_convert_tab_to_spaces       = false
-cmt_indent_multi                = true
-cmt_align_doxygen_javadoc_tags  = false
-cmt_sp_before_doxygen_javadoc_tags = 1
-cmt_c_group                     = false
-cmt_c_nl_start                  = false
-cmt_c_nl_end                    = false
-cmt_cpp_to_c                    = false
-cmt_cpp_group                   = false
-cmt_cpp_nl_start                = false
-cmt_cpp_nl_end                  = false
-cmt_star_cont                   = false
-cmt_sp_before_star_cont         = 0
-cmt_sp_after_star_cont          = 0
-cmt_multi_check_last            = true
-cmt_multi_first_len_minimum     = 4
-cmt_insert_file_header          = ""
-cmt_insert_file_footer          = ""
-cmt_insert_func_header          = ""
-cmt_insert_class_header         = ""
-cmt_insert_oc_msg_header        = ""
-cmt_insert_before_preproc       = false
-cmt_insert_before_inlines       = true
-cmt_insert_before_ctor_dtor     = false
-mod_full_brace_do               = ignore
-mod_full_brace_for              = ignore
-mod_full_brace_function         = ignore
-mod_full_brace_if               = ignore
-mod_full_brace_if_chain         = false
-mod_full_brace_if_chain_only    = false
-mod_full_brace_while            = ignore
-mod_full_brace_using            = ignore
-mod_full_brace_nl               = 0
-mod_full_brace_nl_block_rem_mlcond = false
-mod_paren_on_return             = ignore
-mod_pawn_semicolon              = false
-mod_full_paren_if_bool          = false
-mod_remove_extra_semicolon      = false
-mod_add_long_function_closebrace_comment = 0
-mod_add_long_namespace_closebrace_comment = 0
-mod_add_long_class_closebrace_comment = 0
-mod_add_long_switch_closebrace_comment = 0
-mod_add_long_ifdef_endif_comment = 0
-mod_add_long_ifdef_else_comment = 0
-mod_sort_case_sensitive         = false
-mod_sort_import                 = false
-mod_sort_using                  = false
-mod_sort_include                = false
-mod_sort_incl_import_prioritize_filename = false
-mod_sort_incl_import_prioritize_extensionless = false
-mod_sort_incl_import_prioritize_angle_over_quotes = false
-mod_sort_incl_import_ignore_extension = false
-mod_sort_incl_import_grouping_enabled = false
-mod_move_case_break             = false
-mod_case_brace                  = ignore
-mod_remove_empty_return         = false
-mod_enum_last_comma             = ignore
-mod_sort_oc_properties          = false
-mod_sort_oc_property_class_weight = 0
-mod_sort_oc_property_thread_safe_weight = 0
-mod_sort_oc_property_readwrite_weight = 0
-mod_sort_oc_property_reference_weight = 0
-mod_sort_oc_property_getter_weight = 0
-mod_sort_oc_property_setter_weight = 0
-mod_sort_oc_property_nullability_weight = 0
-pp_indent                       = ignore
-pp_indent_at_level              = false
-pp_indent_count                 = 1
-pp_space                        = ignore
-pp_space_count                  = 0
-pp_indent_region                = 0
-pp_region_indent_code           = false
-pp_indent_if                    = 0
-pp_if_indent_code               = false
-pp_define_at_level              = false
-pp_ignore_define_body           = false
-pp_indent_case                  = true
-pp_indent_func_def              = true
-pp_indent_extern                = true
-pp_indent_brace                 = true
-include_category_0              = ""
-include_category_1              = ""
-include_category_2              = ""
-use_indent_func_call_param      = true
-use_indent_continue_only_once   = false
-indent_cpp_lambda_only_once     = false
-use_sp_after_angle_always       = false
-use_options_overriding_for_qt_macros = true
-use_form_feed_no_more_as_whitespace_character = false
-warn_level_tabs_found_in_verbatim_string_literals = 2
-debug_max_number_of_loops       = 0
-debug_line_number_to_protocol   = 0
-debug_timeout                   = 0
-debug_truncate                  = 0
-# option(s) with 'not default' value: 1
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_ucwd.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_ucwd.txt
deleted file mode 100644
index b160b09d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_ucwd.txt
+++ /dev/null
@@ -1,3214 +0,0 @@
-
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = crlf     # lf/crlf/cr/auto
-
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
-
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
-
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Option to allow both disable_processing_cmt and enable_processing_cmt
-# strings, if specified, to be interpreted as ECMAScript regular expressions.
-# If true, a regex search will be performed within comments according to the
-# specified patterns in order to disable/enable processing.
-processing_cmt_as_regex         = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening parenthesis and before the closing
-# parenthesis of a argument list of a C++11 lambda, as in
-# '[]( <here> int x <here> ){ ... }'.
-sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype(...)' and word,
-# brace or function call.
-sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
-
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
-
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force/not_defined
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force/not_defined
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : <here> expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var <here> : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
-# A region marker is defined as a comment which is not preceded by other text
-# (i.e. the comment is the first non-whitespace on the line), and which starts
-# with either 'BEGIN' or 'END'.
-#
-# Overrides sp_cmt_cpp_start.
-sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
-
-# If true, space added with sp_cmt_cpp_start will be added after Doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space added with sp_cmt_cpp_start will be added after Qt translator
-# or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force/not_defined
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
-
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
-
-# Additional indent before the leading base class colon.
-# Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
-indent_before_class_colon       = 0        # number
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-# It might wise to choose the same value for the option indent_case_brace.
-indent_switch_case              = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-# It might wise to choose the same value for the option indent_switch_case.
-indent_case_brace               = 0        # number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = 1        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace
-#       (i.e. 2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only
-#        add the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statements inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = false    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line do statements, as in 'do { b++; } while(...);'.
-nl_do_leave_one_liners          = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option in case of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into three lines by
-# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option overrides eat_blanks_after_open_brace and
-# eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition. Where
-# applicable, this option is overridden with eat_blanks_after_open_brace=true
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Path to a file that contains regular expressions describing patterns for
-# which the end of one line and the beginning of the next will be folded into
-# the same sentence or paragraph during full comment reflow. The regular
-# expressions are described using ECMAScript syntax. The syntax for this
-# specification is as follows, where "..." indicates the custom regular
-# expression and "n" indicates the nth end_of_prev_line_regex and
-# beg_of_next_line_regex regular expression pair:
-#
-# end_of_prev_line_regex[1] = "...$"
-# beg_of_next_line_regex[1] = "^..."
-# end_of_prev_line_regex[2] = "...$"
-# beg_of_next_line_regex[2] = "^..."
-#             .
-#             .
-#             .
-# end_of_prev_line_regex[n] = "...$"
-# beg_of_next_line_regex[n] = "^..."
-#
-# Note that use of this option overrides the default reflow fold regular
-# expressions, which are internally defined as follows:
-#
-# end_of_prev_line_regex[1] = "[\w,\]\)]$"
-# beg_of_next_line_regex[1] = "^[\w,\[\(]"
-# end_of_prev_line_regex[2] = "\.$"
-# beg_of_next_line_regex[2] = "^[A-Z]"
-cmt_reflow_fold_regex_file      = ""         # string
-
-# Whether to indent wrapped lines to the start of the encompassing paragraph
-# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
-# specified by cmt_sp_after_star_cont.
-#
-# Note that cmt_align_doxygen_javadoc_tags overrides this option for
-# paragraphs associated with javadoc tags
-cmt_reflow_indent_to_paragraph_start = false    # true/false
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
-# and corresponding fields such that groups of consecutive block tags,
-# parameter names, and descriptions align with one another. Overrides that
-# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
-# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
-# in order to achieve the desired alignment for line-wrapping.
-cmt_align_doxygen_javadoc_tags  = false    # true/false
-
-# The number of spaces to insert after the star and before doxygen
-# javadoc-style tags (@param, @return, etc). Requires enabling
-# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
-# cmt_sp_after_star_cont.
-#
-# Default: 1
-cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list of whitespace
-# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Set the number of characters to be printed if the text is too long,
-# 0: do not truncate.
-debug_truncate                  = 0        # unsigned number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 1
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/p.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/p.txt
deleted file mode 100644
index f74c1cb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/p.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-

-newlines                        = crlf

-# option(s) with 'not default' value: 1

-#

-# -=====-

-# number of loops               = 0
-# -=====-

-# language                      = CPP
-# -=====-

-# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp      Flag   Nl  Text

-#   1>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  2001c0001][0-0] #

-#   1>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/0][      20001][0-0]  define

-#   1>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 10/  1][1/1/0][      20001][0-0]         x

-#   1>               WORD|               NONE|     PARENT_NOT_SET[ 11/ 11/ 18/  1][1/1/0][      c0001][0-0]           s23_foo

-#   1>             ASSIGN|               NONE|     PARENT_NOT_SET[ 19/ 19/ 21/  1][1/1/0][  200000001][0-0]                   +=

-#   1>            NL_CONT|               NONE|     PARENT_NOT_SET[ 22/ 22/  1/  1][1/1/0][      80001][1-0]                      \

-#   2>               WORD|               NONE|     PARENT_NOT_SET[  9/  1/  7/  0][1/1/0][      80001][0-0]         s8_foo

-#   2>              ARITH|               NONE|     PARENT_NOT_SET[ 16/  8/  9/  1][1/1/0][  200000001][0-0]                *

-#   2>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 10/ 17/  1][1/1/0][      80001][0-0]                  s16_bar

-#   2>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 25/ 17/ 18/  0][1/1/0][  200000001][0-0]                         ;

-#   2>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 18/  1/  0][0/0/0][          0][2-0]

-#   4>             STRUCT|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][0/0/0][      e0000][0-0] struct

-#   4>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/  8/ 21/  1][0/0/0][          0][0-0]        TelegramIndex

-#   4>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/0][          0][1-0]

-#   5>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] {

-#   5>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][          2][1-0]

-#   6>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  9/  1/ 14/  0][1/1/0][      c0402][0-0]         TelegramIndex

-#   6>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 22/ 14/ 15/  0][1/1/0][  200000502][0-0]                      (

-#   6>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 23/ 15/ 20/  0][1/2/0][      a0512][0-0]                       const

-#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 29/ 21/ 25/  1][1/2/0][     800512][0-0]                             char

-#   6>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 33/ 25/ 26/  0][1/2/0][  200000512][0-0]                                 *

-#   6>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 27/ 29/  1][1/2/0][    1000512][0-0]                                   pN

-#   6>              COMMA|               NONE|     PARENT_NOT_SET[ 37/ 29/ 30/  0][1/2/0][  200000512][0-0]                                     ,

-#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 39/ 31/ 39/  1][1/2/0][     8a0512][0-0]                                       unsigned

-#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 48/ 40/ 44/  1][1/2/0][     820512][0-0]                                                long

-#   6>               WORD|               NONE|     PARENT_NOT_SET[ 53/ 45/ 47/  1][1/2/0][    1000512][0-0]                                                     nI

-#   6>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 55/ 47/ 48/  0][1/1/0][  200000512][0-0]                                                       )

-#   6>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  1][1/1/0][  200000502][0-0]                                                         :

-#   6>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  1/  0][1/1/0][          2][1-0]

-#   7>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 17/  1/  9/  0][1/1/0][      c0502][0-0]                 pTelName

-#   7>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 25/  9/ 10/  0][1/1/0][  200000502][0-0]                         (

-#   7>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 10/ 12/  0][1/2/0][      80512][0-0]                          pN

-#   7>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 28/ 12/ 13/  0][1/1/0][  200000512][0-0]                            )

-#   7>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 13/ 14/  0][1/1/0][  200000502][0-0]                             ,

-#   7>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 14/  1/  0][1/1/0][          2][1-0]

-#   8>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 17/  1/ 10/  0][1/1/0][      80502][0-0]                 nTelIndex

-#   8>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 26/ 10/ 11/  0][1/1/0][  200000502][0-0]                          (

-#   8>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 11/ 12/  0][1/2/0][      80512][0-0]                           n

-#   8>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 28/ 12/ 13/  0][1/1/0][  200000512][0-0]                            )

-#   8>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 13/  1/  0][1/1/0][          2][1-0]

-#   9>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][  280000402][0-0]         {

-#   9>            NEWLINE|               NONE|     PARENT_NOT_SET[ 10/  2/  1/  0][2/2/0][          2][1-0]

-#  10>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][  280000402][0-0]         }

-#  10>            NEWLINE|               NONE|     PARENT_NOT_SET[ 10/  2/  1/  0][1/1/0][          2][2-0]

-#  12>         DESTRUCTOR|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][  2000c0402][0-0]         ~

-#  12>     FUNC_CLASS_DEF|         DESTRUCTOR|     PARENT_NOT_SET[ 10/  2/ 15/  0][1/1/0][      80402][0-0]          TelegramIndex

-#  12>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 23/ 15/ 16/  0][1/1/0][  200000502][0-0]                       (

-#  12>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 24/ 16/ 17/  0][1/1/0][  200000512][0-0]                        )

-#  12>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 17/  1/  0][1/1/0][          2][1-0]

-#  13>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][  280000402][0-0]         {

-#  13>            NEWLINE|               NONE|     PARENT_NOT_SET[ 10/  2/  1/  0][2/2/0][          2][1-0]

-#  14>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][  280000402][0-0]         }

-#  14>            NEWLINE|               NONE|     PARENT_NOT_SET[ 10/  2/  1/  0][1/1/0][          2][2-0]

-#  16>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  1/  6/  0][1/1/0][     8e0402][0-0]         const

-#  16>               TYPE|               NONE|     PARENT_NOT_SET[ 15/  7/ 11/  1][1/1/0][     800402][0-0]               char

-#  16>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 19/ 11/ 12/  0][1/1/0][  200800402][0-0]                   *

-#  16>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 21/ 13/ 18/  1][1/1/0][     820402][0-0]                     const

-#  16>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 19/ 27/  1][1/1/0][    3000402][0-0]                           pTelName

-#  16>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 35/ 27/ 28/  0][1/1/0][  200000402][0-0]                                   ;

-#  16>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 28/  1/  0][1/1/0][          2][1-0]

-#  17>               TYPE|               NONE|     PARENT_NOT_SET[  9/  1/  9/  0][1/1/0][     8e0402][0-0]         unsigned

-#  17>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 14/  1][1/1/0][     820402][0-0]                  long

-#  17>               WORD|               NONE|     PARENT_NOT_SET[ 23/ 15/ 24/  1][1/1/0][    3000402][0-0]                       nTelIndex

-#  17>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 32/ 24/ 25/  0][1/1/0][  200000402][0-0]                                ;

-#  17>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 25/  1/  0][1/1/0][          2][1-0]

-#  18>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000402][0-0] }

-#  18>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][  200000000][0-0]  ;

-#  18>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][          0][2-0]

-# -=====-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/pc-.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/pc-.txt
deleted file mode 100644
index 63ed3d2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/pc-.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# option(s) with 'not default' value: 0
-#
-# -=====-
-# number of loops               = 0
-# -=====-
-# language                      = C
-# -=====-
-# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp      Flag   Nl  Text
-# -=====-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/show_config.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/show_config.txt
deleted file mode 100644
index f220a918..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/show_config.txt
+++ /dev/null
@@ -1,3214 +0,0 @@
-
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
-
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
-
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
-
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Option to allow both disable_processing_cmt and enable_processing_cmt
-# strings, if specified, to be interpreted as ECMAScript regular expressions.
-# If true, a regex search will be performed within comments according to the
-# specified patterns in order to disable/enable processing.
-processing_cmt_as_regex         = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening parenthesis and before the closing
-# parenthesis of a argument list of a C++11 lambda, as in
-# '[]( <here> int x <here> ){ ... }'.
-sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype(...)' and word,
-# brace or function call.
-sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
-
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
-
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
-sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force/not_defined
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force/not_defined
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : <here> expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var <here> : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
-# A region marker is defined as a comment which is not preceded by other text
-# (i.e. the comment is the first non-whitespace on the line), and which starts
-# with either 'BEGIN' or 'END'.
-#
-# Overrides sp_cmt_cpp_start.
-sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
-
-# If true, space added with sp_cmt_cpp_start will be added after Doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space added with sp_cmt_cpp_start will be added after Qt translator
-# or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force/not_defined
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
-
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
-
-# Additional indent before the leading base class colon.
-# Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
-indent_before_class_colon       = 0        # number
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-# It might wise to choose the same value for the option indent_case_brace.
-indent_switch_case              = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-# It might wise to choose the same value for the option indent_switch_case.
-indent_case_brace               = 0        # number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = 1        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace
-#       (i.e. 2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only
-#        add the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statements inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = false    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line do statements, as in 'do { b++; } while(...);'.
-nl_do_leave_one_liners          = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option in case of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into three lines by
-# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option overrides eat_blanks_after_open_brace and
-# eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition. Where
-# applicable, this option is overridden with eat_blanks_after_open_brace=true
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Path to a file that contains regular expressions describing patterns for
-# which the end of one line and the beginning of the next will be folded into
-# the same sentence or paragraph during full comment reflow. The regular
-# expressions are described using ECMAScript syntax. The syntax for this
-# specification is as follows, where "..." indicates the custom regular
-# expression and "n" indicates the nth end_of_prev_line_regex and
-# beg_of_next_line_regex regular expression pair:
-#
-# end_of_prev_line_regex[1] = "...$"
-# beg_of_next_line_regex[1] = "^..."
-# end_of_prev_line_regex[2] = "...$"
-# beg_of_next_line_regex[2] = "^..."
-#             .
-#             .
-#             .
-# end_of_prev_line_regex[n] = "...$"
-# beg_of_next_line_regex[n] = "^..."
-#
-# Note that use of this option overrides the default reflow fold regular
-# expressions, which are internally defined as follows:
-#
-# end_of_prev_line_regex[1] = "[\w,\]\)]$"
-# beg_of_next_line_regex[1] = "^[\w,\[\(]"
-# end_of_prev_line_regex[2] = "\.$"
-# beg_of_next_line_regex[2] = "^[A-Z]"
-cmt_reflow_fold_regex_file      = ""         # string
-
-# Whether to indent wrapped lines to the start of the encompassing paragraph
-# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
-# specified by cmt_sp_after_star_cont.
-#
-# Note that cmt_align_doxygen_javadoc_tags overrides this option for
-# paragraphs associated with javadoc tags
-cmt_reflow_indent_to_paragraph_start = false    # true/false
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
-# and corresponding fields such that groups of consecutive block tags,
-# parameter names, and descriptions align with one another. Overrides that
-# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
-# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
-# in order to achieve the desired alignment for line-wrapping.
-cmt_align_doxygen_javadoc_tags  = false    # true/false
-
-# The number of spaces to insert after the star and before doxygen
-# javadoc-style tags (@param, @return, etc). Requires enabling
-# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
-# cmt_sp_after_star_cont.
-#
-# Default: 1
-cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force/not_defined
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list of whitespace
-# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Set the number of characters to be printed if the text is too long,
-# 0: do not truncate.
-debug_truncate                  = 0        # unsigned number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 0
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/tracking_space.html
deleted file mode 100644
index d3b69435..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/tracking_space.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-   <title>Uncrustify: where do the Spaces options work</title>
-</head>
-<body lang="en-US">
-<p>
-</p>
-<pre>
-{
-   a = b + 111 - 55;
-}
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A) + B)...>
-{
-   foo1() {
-      int x = sizeof...(A);
-      bool b = x > 1;
-   }
-};
-</pre>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/truncate.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/truncate.txt
deleted file mode 100644
index 8c428d84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/truncate.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-output_text : text() is '// 1 6789A123456789B123456789c12345678 ... <The string is truncated>', type is COMMENT_CPP, orig_line is 1, column is 1, nl is 0
-output_cmt_start : no cmt_insert_file
-output_comment_cpp : set cont_text to '// '
-output_text : text() is '', type is NEWLINE, orig_line is 1, column is 74, nl is 1
-output_text : text() is '// 2 678 ... <The string is truncated>', type is COMMENT_CPP, orig_line is 2, column is 1, nl is 0
-output_cmt_start : no cmt_insert_file
-output_comment_cpp : set cont_text to '// '
-output_text : text() is '', type is NEWLINE, orig_line is 2, column is 40, nl is 1
-output_text : text() is '// 3 6789A123456789B123456789c12345678', type is COMMENT_CPP, orig_line is 3, column is 1, nl is 0
-output_cmt_start : no cmt_insert_file
-output_comment_cpp : set cont_text to '// '
-output_text : text() is '', type is NEWLINE, orig_line is 3, column is 39, nl is 1
-output_text : text() is '// 4 6789A123456789B123456789c1234567', type is COMMENT_CPP, orig_line is 4, column is 1, nl is 0
-output_cmt_start : no cmt_insert_file
-output_comment_cpp : set cont_text to '// '
-output_text : text() is '', type is NEWLINE, orig_line is 4, column is 38, nl is 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/universalindent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/universalindent.cfg
deleted file mode 100644
index 48a9dd47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/universalindent.cfg
+++ /dev/null
@@ -1,6712 +0,0 @@
-[header]
-categories=General options|Spacing options|Indenting options|Newline adding and removing options|Blank line options|Positioning options|Line splitting options|Code alignment options (not left column spaces/tabs)|Comment modification options|Code modifying options (non-whitespace)|Preprocessor options|Sort includes options|Use or Do not Use options|Warn levels - 1: error, 2: warning (default), 3: note
-cfgFileParameterEnding=cr
-configFilename=uncrustify.cfg
-fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.cp|*.C|*.CPP|*.c++|*.di|*.m|*.mm|*.sqc|*.es
-indenterFileName=uncrustify
-indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
-inputFileName=indentinput
-inputFileParameter="-f "
-manual=http://uncrustify.sourceforge.net/config.txt
-outputFileName=indentoutput
-outputFileParameter="-o "
-stringparaminquotes=false
-parameterOrder=ipo
-showHelpParameter=-h
-stringparaminquotes=false
-useCfgFileParameter="-c "
-
-
-[Newlines]
-Category=0
-Description="<html>The type of line endings.<br/><br/>Default: auto</html>"
-Enabled=false
-EditorType=multiple
-Choices=newlines=lf|newlines=crlf|newlines=cr|newlines=auto
-ChoicesReadable="Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto"
-ValueDefault=auto
-
-[Input Tab Size]
-Category=0
-Description="<html>The original size of tabs in the input.<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="input_tab_size="
-MinVal=1
-MaxVal=32
-ValueDefault=8
-
-[Output Tab Size]
-Category=0
-Description="<html>The size of tabs in the output (only used if align_with_tabs=true).<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="output_tab_size="
-MinVal=1
-MaxVal=32
-ValueDefault=8
-
-[String Escape Char]
-Category=0
-Description="<html>The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).<br/><br/>Default: 92</html>"
-Enabled=false
-EditorType=numeric
-CallName="string_escape_char="
-MinVal=0
-MaxVal=255
-ValueDefault=92
-
-[String Escape Char2]
-Category=0
-Description="<html>Alternate string escape char (usually only used for Pawn).<br/>Only works right before the quote char.</html>"
-Enabled=false
-EditorType=numeric
-CallName="string_escape_char2="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[String Replace Tab Chars]
-Category=0
-Description="<html>Replace tab characters found in string literals with the escape sequence \t<br/>instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=string_replace_tab_chars=true|string_replace_tab_chars=false
-ValueDefault=false
-
-[Tok Split Gte]
-Category=0
-Description="<html>Allow interpreting '&gt;=' and '&gt;&gt;=' as part of a template in code like<br/>'void f(list&lt;list&lt;B&gt;&gt;=val);'. If true, 'assert(x&lt;0 &amp;&amp; y&gt;=3)' will be broken.<br/>Improvements to template detection may make this option obsolete.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=tok_split_gte=true|tok_split_gte=false
-ValueDefault=false
-
-[Disable Processing Nl Cont]
-Category=0
-Description="<html>Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=disable_processing_nl_cont=true|disable_processing_nl_cont=false
-ValueDefault=false
-
-[Disable Processing Cmt]
-Category=0
-Description="<html>Specify the marker used in comments to disable processing of part of the<br/>file.<br/><br/>Default:  *INDENT-OFF*</html>"
-Enabled=false
-CallName=disable_processing_cmt=
-EditorType=string
-ValueDefault= *INDENT-OFF*
-
-[Enable Processing Cmt]
-Category=0
-Description="<html>Specify the marker used in comments to (re)enable processing in a file.<br/><br/>Default:  *INDENT-ON*</html>"
-Enabled=false
-CallName=enable_processing_cmt=
-EditorType=string
-ValueDefault= *INDENT-ON*
-
-[Enable Digraphs]
-Category=0
-Description="<html>Enable parsing of digraphs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=enable_digraphs=true|enable_digraphs=false
-ValueDefault=false
-
-[Processing Cmt As Regex]
-Category=0
-Description="<html>Option to allow both disable_processing_cmt and enable_processing_cmt<br/>strings, if specified, to be interpreted as ECMAScript regular expressions.<br/>If true, a regex search will be performed within comments according to the<br/>specified patterns in order to disable/enable processing.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=processing_cmt_as_regex=true|processing_cmt_as_regex=false
-ValueDefault=false
-
-[Utf8 Bom]
-Category=0
-Description="<html>Add or remove the UTF-8 BOM (recommend 'remove').</html>"
-Enabled=false
-EditorType=multiple
-Choices=utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force|utf8_bom=not_defined
-ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
-ValueDefault=ignore
-
-[Utf8 Byte]
-Category=0
-Description="<html>If the file contains bytes with values between 128 and 255, but is not<br/>UTF-8, then output as UTF-8.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=utf8_byte=true|utf8_byte=false
-ValueDefault=false
-
-[Utf8 Force]
-Category=0
-Description="<html>Force the output encoding to UTF-8.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=utf8_force=true|utf8_force=false
-ValueDefault=false
-
-[Sp Arith]
-Category=1
-Description="<html>Add or remove space around non-assignment symbolic operators ('+', '/', '%',<br/>'&lt;&lt;', and so forth).</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_arith=ignore|sp_arith=add|sp_arith=remove|sp_arith=force|sp_arith=not_defined
-ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith"
-ValueDefault=ignore
-
-[Sp Arith Additive]
-Category=1
-Description="<html>Add or remove space around arithmetic operators '+' and '-'.<br/><br/>Overrides sp_arith.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_arith_additive=ignore|sp_arith_additive=add|sp_arith_additive=remove|sp_arith_additive=force|sp_arith_additive=not_defined
-ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive"
-ValueDefault=ignore
-
-[Sp Assign]
-Category=1
-Description="<html>Add or remove space around assignment operator '=', '+=', etc.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_assign=ignore|sp_assign=add|sp_assign=remove|sp_assign=force|sp_assign=not_defined
-ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Assign]
-Category=1
-Description="<html>Add or remove space around '=' in C++11 lambda capture specifications.<br/><br/>Overrides sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_assign=ignore|sp_cpp_lambda_assign=add|sp_cpp_lambda_assign=remove|sp_cpp_lambda_assign=force|sp_cpp_lambda_assign=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Assign|Add Sp Cpp Lambda Assign|Remove Sp Cpp Lambda Assign|Force Sp Cpp Lambda Assign"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Square Paren]
-Category=1
-Description="<html>Add or remove space after the capture specification of a C++11 lambda when<br/>an argument list is present, as in '[] &lt;here&gt; (int x){ ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_square_paren=ignore|sp_cpp_lambda_square_paren=add|sp_cpp_lambda_square_paren=remove|sp_cpp_lambda_square_paren=force|sp_cpp_lambda_square_paren=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Square Paren|Add Sp Cpp Lambda Square Paren|Remove Sp Cpp Lambda Square Paren|Force Sp Cpp Lambda Square Paren"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Square Brace]
-Category=1
-Description="<html>Add or remove space after the capture specification of a C++11 lambda with<br/>no argument list is present, as in '[] &lt;here&gt; { ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_square_brace=ignore|sp_cpp_lambda_square_brace=add|sp_cpp_lambda_square_brace=remove|sp_cpp_lambda_square_brace=force|sp_cpp_lambda_square_brace=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Square Brace|Add Sp Cpp Lambda Square Brace|Remove Sp Cpp Lambda Square Brace|Force Sp Cpp Lambda Square Brace"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Argument List]
-Category=1
-Description="<html>Add or remove space after the opening parenthesis and before the closing<br/>parenthesis of a argument list of a C++11 lambda, as in<br/>'[]( &lt;here&gt; int x &lt;here&gt; ){ ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_argument_list=ignore|sp_cpp_lambda_argument_list=add|sp_cpp_lambda_argument_list=remove|sp_cpp_lambda_argument_list=force|sp_cpp_lambda_argument_list=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Argument List|Add Sp Cpp Lambda Argument List|Remove Sp Cpp Lambda Argument List|Force Sp Cpp Lambda Argument List"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Paren Brace]
-Category=1
-Description="<html>Add or remove space after the argument list of a C++11 lambda, as in<br/>'[](int x) &lt;here&gt; { ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_paren_brace=ignore|sp_cpp_lambda_paren_brace=add|sp_cpp_lambda_paren_brace=remove|sp_cpp_lambda_paren_brace=force|sp_cpp_lambda_paren_brace=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Paren Brace|Add Sp Cpp Lambda Paren Brace|Remove Sp Cpp Lambda Paren Brace|Force Sp Cpp Lambda Paren Brace"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Fparen]
-Category=1
-Description="<html>Add or remove space between a lambda body and its call operator of an<br/>immediately invoked lambda, as in '[]( ... ){ ... } &lt;here&gt; ( ... )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_fparen=ignore|sp_cpp_lambda_fparen=add|sp_cpp_lambda_fparen=remove|sp_cpp_lambda_fparen=force|sp_cpp_lambda_fparen=not_defined
-ChoicesReadable="Ignore Sp Cpp Lambda Fparen|Add Sp Cpp Lambda Fparen|Remove Sp Cpp Lambda Fparen|Force Sp Cpp Lambda Fparen"
-ValueDefault=ignore
-
-[Sp Assign Default]
-Category=1
-Description="<html>Add or remove space around assignment operator '=' in a prototype.<br/><br/>If set to ignore, use sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force|sp_assign_default=not_defined
-ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
-ValueDefault=ignore
-
-[Sp Before Assign]
-Category=1
-Description="<html>Add or remove space before assignment operator '=', '+=', etc.<br/><br/>Overrides sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_assign=ignore|sp_before_assign=add|sp_before_assign=remove|sp_before_assign=force|sp_before_assign=not_defined
-ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign"
-ValueDefault=ignore
-
-[Sp After Assign]
-Category=1
-Description="<html>Add or remove space after assignment operator '=', '+=', etc.<br/><br/>Overrides sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_assign=ignore|sp_after_assign=add|sp_after_assign=remove|sp_after_assign=force|sp_after_assign=not_defined
-ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
-ValueDefault=ignore
-
-[Sp Enum Paren]
-Category=1
-Description="<html>Add or remove space in 'NS_ENUM ('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_paren=ignore|sp_enum_paren=add|sp_enum_paren=remove|sp_enum_paren=force|sp_enum_paren=not_defined
-ChoicesReadable="Ignore Sp Enum Paren|Add Sp Enum Paren|Remove Sp Enum Paren|Force Sp Enum Paren"
-ValueDefault=ignore
-
-[Sp Enum Assign]
-Category=1
-Description="<html>Add or remove space around assignment '=' in enum.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_assign=ignore|sp_enum_assign=add|sp_enum_assign=remove|sp_enum_assign=force|sp_enum_assign=not_defined
-ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign"
-ValueDefault=ignore
-
-[Sp Enum Before Assign]
-Category=1
-Description="<html>Add or remove space before assignment '=' in enum.<br/><br/>Overrides sp_enum_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_before_assign=ignore|sp_enum_before_assign=add|sp_enum_before_assign=remove|sp_enum_before_assign=force|sp_enum_before_assign=not_defined
-ChoicesReadable="Ignore Sp Enum Before Assign|Add Sp Enum Before Assign|Remove Sp Enum Before Assign|Force Sp Enum Before Assign"
-ValueDefault=ignore
-
-[Sp Enum After Assign]
-Category=1
-Description="<html>Add or remove space after assignment '=' in enum.<br/><br/>Overrides sp_enum_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_after_assign=ignore|sp_enum_after_assign=add|sp_enum_after_assign=remove|sp_enum_after_assign=force|sp_enum_after_assign=not_defined
-ChoicesReadable="Ignore Sp Enum After Assign|Add Sp Enum After Assign|Remove Sp Enum After Assign|Force Sp Enum After Assign"
-ValueDefault=ignore
-
-[Sp Enum Colon]
-Category=1
-Description="<html>Add or remove space around assignment ':' in enum.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_enum_colon=ignore|sp_enum_colon=add|sp_enum_colon=remove|sp_enum_colon=force|sp_enum_colon=not_defined
-ChoicesReadable="Ignore Sp Enum Colon|Add Sp Enum Colon|Remove Sp Enum Colon|Force Sp Enum Colon"
-ValueDefault=ignore
-
-[Sp Pp Concat]
-Category=1
-Description="<html>Add or remove space around preprocessor '##' concatenation operator.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force|sp_pp_concat=not_defined
-ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat"
-ValueDefault=add
-
-[Sp Pp Stringify]
-Category=1
-Description="<html>Add or remove space after preprocessor '#' stringify operator.<br/>Also affects the '#@' charizing operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_pp_stringify=ignore|sp_pp_stringify=add|sp_pp_stringify=remove|sp_pp_stringify=force|sp_pp_stringify=not_defined
-ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify"
-ValueDefault=ignore
-
-[Sp Before Pp Stringify]
-Category=1
-Description="<html>Add or remove space before preprocessor '#' stringify operator<br/>as in '#define x(y) L#y'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_pp_stringify=ignore|sp_before_pp_stringify=add|sp_before_pp_stringify=remove|sp_before_pp_stringify=force|sp_before_pp_stringify=not_defined
-ChoicesReadable="Ignore Sp Before Pp Stringify|Add Sp Before Pp Stringify|Remove Sp Before Pp Stringify|Force Sp Before Pp Stringify"
-ValueDefault=ignore
-
-[Sp Bool]
-Category=1
-Description="<html>Add or remove space around boolean operators '&amp;&amp;' and '||'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_bool=ignore|sp_bool=add|sp_bool=remove|sp_bool=force|sp_bool=not_defined
-ChoicesReadable="Ignore Sp Bool|Add Sp Bool|Remove Sp Bool|Force Sp Bool"
-ValueDefault=ignore
-
-[Sp Compare]
-Category=1
-Description="<html>Add or remove space around compare operator '&lt;', '&gt;', '==', etc.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_compare=ignore|sp_compare=add|sp_compare=remove|sp_compare=force|sp_compare=not_defined
-ChoicesReadable="Ignore Sp Compare|Add Sp Compare|Remove Sp Compare|Force Sp Compare"
-ValueDefault=ignore
-
-[Sp Inside Paren]
-Category=1
-Description="<html>Add or remove space inside '(' and ')'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_paren=ignore|sp_inside_paren=add|sp_inside_paren=remove|sp_inside_paren=force|sp_inside_paren=not_defined
-ChoicesReadable="Ignore Sp Inside Paren|Add Sp Inside Paren|Remove Sp Inside Paren|Force Sp Inside Paren"
-ValueDefault=ignore
-
-[Sp Paren Paren]
-Category=1
-Description="<html>Add or remove space between nested parentheses, i.e. '((' vs. ') )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_paren=ignore|sp_paren_paren=add|sp_paren_paren=remove|sp_paren_paren=force|sp_paren_paren=not_defined
-ChoicesReadable="Ignore Sp Paren Paren|Add Sp Paren Paren|Remove Sp Paren Paren|Force Sp Paren Paren"
-ValueDefault=ignore
-
-[Sp Cparen Oparen]
-Category=1
-Description="<html>Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cparen_oparen=ignore|sp_cparen_oparen=add|sp_cparen_oparen=remove|sp_cparen_oparen=force|sp_cparen_oparen=not_defined
-ChoicesReadable="Ignore Sp Cparen Oparen|Add Sp Cparen Oparen|Remove Sp Cparen Oparen|Force Sp Cparen Oparen"
-ValueDefault=ignore
-
-[Sp Balance Nested Parens]
-Category=1
-Description="<html>Whether to balance spaces inside nested parentheses.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_balance_nested_parens=true|sp_balance_nested_parens=false
-ValueDefault=false
-
-[Sp Paren Brace]
-Category=1
-Description="<html>Add or remove space between ')' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_brace=ignore|sp_paren_brace=add|sp_paren_brace=remove|sp_paren_brace=force|sp_paren_brace=not_defined
-ChoicesReadable="Ignore Sp Paren Brace|Add Sp Paren Brace|Remove Sp Paren Brace|Force Sp Paren Brace"
-ValueDefault=ignore
-
-[Sp Brace Brace]
-Category=1
-Description="<html>Add or remove space between nested braces, i.e. '{{' vs. '{ {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_brace=ignore|sp_brace_brace=add|sp_brace_brace=remove|sp_brace_brace=force|sp_brace_brace=not_defined
-ChoicesReadable="Ignore Sp Brace Brace|Add Sp Brace Brace|Remove Sp Brace Brace|Force Sp Brace Brace"
-ValueDefault=ignore
-
-[Sp Before Ptr Star]
-Category=1
-Description="<html>Add or remove space before pointer star '*'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ptr_star=ignore|sp_before_ptr_star=add|sp_before_ptr_star=remove|sp_before_ptr_star=force|sp_before_ptr_star=not_defined
-ChoicesReadable="Ignore Sp Before Ptr Star|Add Sp Before Ptr Star|Remove Sp Before Ptr Star|Force Sp Before Ptr Star"
-ValueDefault=ignore
-
-[Sp Before Unnamed Ptr Star]
-Category=1
-Description="<html>Add or remove space before pointer star '*' that isn't followed by a<br/>variable name. If set to ignore, sp_before_ptr_star is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_unnamed_ptr_star=ignore|sp_before_unnamed_ptr_star=add|sp_before_unnamed_ptr_star=remove|sp_before_unnamed_ptr_star=force|sp_before_unnamed_ptr_star=not_defined
-ChoicesReadable="Ignore Sp Before Unnamed Ptr Star|Add Sp Before Unnamed Ptr Star|Remove Sp Before Unnamed Ptr Star|Force Sp Before Unnamed Ptr Star"
-ValueDefault=ignore
-
-[Sp Between Ptr Star]
-Category=1
-Description="<html>Add or remove space between pointer stars '*'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_between_ptr_star=ignore|sp_between_ptr_star=add|sp_between_ptr_star=remove|sp_between_ptr_star=force|sp_between_ptr_star=not_defined
-ChoicesReadable="Ignore Sp Between Ptr Star|Add Sp Between Ptr Star|Remove Sp Between Ptr Star|Force Sp Between Ptr Star"
-ValueDefault=ignore
-
-[Sp After Ptr Star]
-Category=1
-Description="<html>Add or remove space after pointer star '*', if followed by a word.<br/><br/>Overrides sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_star=ignore|sp_after_ptr_star=add|sp_after_ptr_star=remove|sp_after_ptr_star=force|sp_after_ptr_star=not_defined
-ChoicesReadable="Ignore Sp After Ptr Star|Add Sp After Ptr Star|Remove Sp After Ptr Star|Force Sp After Ptr Star"
-ValueDefault=ignore
-
-[Sp After Ptr Block Caret]
-Category=1
-Description="<html>Add or remove space after pointer caret '^', if followed by a word.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_block_caret=ignore|sp_after_ptr_block_caret=add|sp_after_ptr_block_caret=remove|sp_after_ptr_block_caret=force|sp_after_ptr_block_caret=not_defined
-ChoicesReadable="Ignore Sp After Ptr Block Caret|Add Sp After Ptr Block Caret|Remove Sp After Ptr Block Caret|Force Sp After Ptr Block Caret"
-ValueDefault=ignore
-
-[Sp After Ptr Star Qualifier]
-Category=1
-Description="<html>Add or remove space after pointer star '*', if followed by a qualifier.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_star_qualifier=ignore|sp_after_ptr_star_qualifier=add|sp_after_ptr_star_qualifier=remove|sp_after_ptr_star_qualifier=force|sp_after_ptr_star_qualifier=not_defined
-ChoicesReadable="Ignore Sp After Ptr Star Qualifier|Add Sp After Ptr Star Qualifier|Remove Sp After Ptr Star Qualifier|Force Sp After Ptr Star Qualifier"
-ValueDefault=ignore
-
-[Sp After Ptr Star Func]
-Category=1
-Description="<html>Add or remove space after a pointer star '*', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_ptr_star and sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_star_func=ignore|sp_after_ptr_star_func=add|sp_after_ptr_star_func=remove|sp_after_ptr_star_func=force|sp_after_ptr_star_func=not_defined
-ChoicesReadable="Ignore Sp After Ptr Star Func|Add Sp After Ptr Star Func|Remove Sp After Ptr Star Func|Force Sp After Ptr Star Func"
-ValueDefault=ignore
-
-[Sp Ptr Star Paren]
-Category=1
-Description="<html>Add or remove space after a pointer star '*', if followed by an open<br/>parenthesis, as in 'void* (*)().</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_ptr_star_paren=ignore|sp_ptr_star_paren=add|sp_ptr_star_paren=remove|sp_ptr_star_paren=force|sp_ptr_star_paren=not_defined
-ChoicesReadable="Ignore Sp Ptr Star Paren|Add Sp Ptr Star Paren|Remove Sp Ptr Star Paren|Force Sp Ptr Star Paren"
-ValueDefault=ignore
-
-[Sp Before Ptr Star Func]
-Category=1
-Description="<html>Add or remove space before a pointer star '*', if followed by a function<br/>prototype or function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ptr_star_func=ignore|sp_before_ptr_star_func=add|sp_before_ptr_star_func=remove|sp_before_ptr_star_func=force|sp_before_ptr_star_func=not_defined
-ChoicesReadable="Ignore Sp Before Ptr Star Func|Add Sp Before Ptr Star Func|Remove Sp Before Ptr Star Func|Force Sp Before Ptr Star Func"
-ValueDefault=ignore
-
-[Sp Before Byref]
-Category=1
-Description="<html>Add or remove space before a reference sign '&amp;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_byref=ignore|sp_before_byref=add|sp_before_byref=remove|sp_before_byref=force|sp_before_byref=not_defined
-ChoicesReadable="Ignore Sp Before Byref|Add Sp Before Byref|Remove Sp Before Byref|Force Sp Before Byref"
-ValueDefault=ignore
-
-[Sp Before Unnamed Byref]
-Category=1
-Description="<html>Add or remove space before a reference sign '&amp;' that isn't followed by a<br/>variable name. If set to ignore, sp_before_byref is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_unnamed_byref=ignore|sp_before_unnamed_byref=add|sp_before_unnamed_byref=remove|sp_before_unnamed_byref=force|sp_before_unnamed_byref=not_defined
-ChoicesReadable="Ignore Sp Before Unnamed Byref|Add Sp Before Unnamed Byref|Remove Sp Before Unnamed Byref|Force Sp Before Unnamed Byref"
-ValueDefault=ignore
-
-[Sp After Byref]
-Category=1
-Description="<html>Add or remove space after reference sign '&amp;', if followed by a word.<br/><br/>Overrides sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force|sp_after_byref=not_defined
-ChoicesReadable="Ignore Sp After Byref|Add Sp After Byref|Remove Sp After Byref|Force Sp After Byref"
-ValueDefault=ignore
-
-[Sp After Byref Func]
-Category=1
-Description="<html>Add or remove space after a reference sign '&amp;', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_byref and sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_byref_func=ignore|sp_after_byref_func=add|sp_after_byref_func=remove|sp_after_byref_func=force|sp_after_byref_func=not_defined
-ChoicesReadable="Ignore Sp After Byref Func|Add Sp After Byref Func|Remove Sp After Byref Func|Force Sp After Byref Func"
-ValueDefault=ignore
-
-[Sp Before Byref Func]
-Category=1
-Description="<html>Add or remove space before a reference sign '&amp;', if followed by a function<br/>prototype or function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_byref_func=ignore|sp_before_byref_func=add|sp_before_byref_func=remove|sp_before_byref_func=force|sp_before_byref_func=not_defined
-ChoicesReadable="Ignore Sp Before Byref Func|Add Sp Before Byref Func|Remove Sp Before Byref Func|Force Sp Before Byref Func"
-ValueDefault=ignore
-
-[Sp After Type]
-Category=1
-Description="<html>Add or remove space between type and word. In cases where total removal of<br/>whitespace would be a syntax error, a value of 'remove' is treated the same<br/>as 'force'.<br/><br/>This also affects some other instances of space following a type that are<br/>not covered by other options; for example, between the return type and<br/>parenthesis of a function type template argument, between the type and<br/>parenthesis of an array parameter, or between 'decltype(...)' and the<br/>following word.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force|sp_after_type=not_defined
-ChoicesReadable="Ignore Sp After Type|Add Sp After Type|Remove Sp After Type|Force Sp After Type"
-ValueDefault=force
-
-[Sp After Decltype]
-Category=1
-Description="<html>Add or remove space between 'decltype(...)' and word,<br/>brace or function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_decltype=ignore|sp_after_decltype=add|sp_after_decltype=remove|sp_after_decltype=force|sp_after_decltype=not_defined
-ChoicesReadable="Ignore Sp After Decltype|Add Sp After Decltype|Remove Sp After Decltype|Force Sp After Decltype"
-ValueDefault=ignore
-
-[Sp Before Template Paren]
-Category=1
-Description="<html>(D) Add or remove space before the parenthesis in the D constructs<br/>'template Foo(' and 'class Foo('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_template_paren=ignore|sp_before_template_paren=add|sp_before_template_paren=remove|sp_before_template_paren=force|sp_before_template_paren=not_defined
-ChoicesReadable="Ignore Sp Before Template Paren|Add Sp Before Template Paren|Remove Sp Before Template Paren|Force Sp Before Template Paren"
-ValueDefault=ignore
-
-[Sp Template Angle]
-Category=1
-Description="<html>Add or remove space between 'template' and '&lt;'.<br/>If set to ignore, sp_before_angle is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_template_angle=ignore|sp_template_angle=add|sp_template_angle=remove|sp_template_angle=force|sp_template_angle=not_defined
-ChoicesReadable="Ignore Sp Template Angle|Add Sp Template Angle|Remove Sp Template Angle|Force Sp Template Angle"
-ValueDefault=ignore
-
-[Sp Before Angle]
-Category=1
-Description="<html>Add or remove space before '&lt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force|sp_before_angle=not_defined
-ChoicesReadable="Ignore Sp Before Angle|Add Sp Before Angle|Remove Sp Before Angle|Force Sp Before Angle"
-ValueDefault=ignore
-
-[Sp Inside Angle]
-Category=1
-Description="<html>Add or remove space inside '&lt;' and '&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_angle=ignore|sp_inside_angle=add|sp_inside_angle=remove|sp_inside_angle=force|sp_inside_angle=not_defined
-ChoicesReadable="Ignore Sp Inside Angle|Add Sp Inside Angle|Remove Sp Inside Angle|Force Sp Inside Angle"
-ValueDefault=ignore
-
-[Sp Inside Angle Empty]
-Category=1
-Description="<html>Add or remove space inside '&lt;&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_angle_empty=ignore|sp_inside_angle_empty=add|sp_inside_angle_empty=remove|sp_inside_angle_empty=force|sp_inside_angle_empty=not_defined
-ChoicesReadable="Ignore Sp Inside Angle Empty|Add Sp Inside Angle Empty|Remove Sp Inside Angle Empty|Force Sp Inside Angle Empty"
-ValueDefault=ignore
-
-[Sp Angle Colon]
-Category=1
-Description="<html>Add or remove space between '&gt;' and ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_colon=ignore|sp_angle_colon=add|sp_angle_colon=remove|sp_angle_colon=force|sp_angle_colon=not_defined
-ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon"
-ValueDefault=ignore
-
-[Sp After Angle]
-Category=1
-Description="<html>Add or remove space after '&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force|sp_after_angle=not_defined
-ChoicesReadable="Ignore Sp After Angle|Add Sp After Angle|Remove Sp After Angle|Force Sp After Angle"
-ValueDefault=ignore
-
-[Sp Angle Paren]
-Category=1
-Description="<html>Add or remove space between '&gt;' and '(' as found in 'new List&lt;byte&gt;(foo);'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_paren=ignore|sp_angle_paren=add|sp_angle_paren=remove|sp_angle_paren=force|sp_angle_paren=not_defined
-ChoicesReadable="Ignore Sp Angle Paren|Add Sp Angle Paren|Remove Sp Angle Paren|Force Sp Angle Paren"
-ValueDefault=ignore
-
-[Sp Angle Paren Empty]
-Category=1
-Description="<html>Add or remove space between '&gt;' and '()' as found in 'new List&lt;byte&gt;();'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_paren_empty=ignore|sp_angle_paren_empty=add|sp_angle_paren_empty=remove|sp_angle_paren_empty=force|sp_angle_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Angle Paren Empty|Add Sp Angle Paren Empty|Remove Sp Angle Paren Empty|Force Sp Angle Paren Empty"
-ValueDefault=ignore
-
-[Sp Angle Word]
-Category=1
-Description="<html>Add or remove space between '&gt;' and a word as in 'List&lt;byte&gt; m;' or<br/>'template &lt;typename T&gt; static ...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force|sp_angle_word=not_defined
-ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word"
-ValueDefault=ignore
-
-[Sp Angle Shift]
-Category=1
-Description="<html>Add or remove space between '&gt;' and '&gt;' in '&gt;&gt;' (template stuff).<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force|sp_angle_shift=not_defined
-ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift"
-ValueDefault=add
-
-[Sp Permit Cpp11 Shift]
-Category=1
-Description="<html>(C++11) Permit removal of the space between '&gt;&gt;' in 'foo&lt;bar&lt;int&gt; &gt;'. Note<br/>that sp_angle_shift cannot remove the space without this option.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_permit_cpp11_shift=true|sp_permit_cpp11_shift=false
-ValueDefault=false
-
-[Sp Before Sparen]
-Category=1
-Description="<html>Add or remove space before '(' of control statements ('if', 'for', 'switch',<br/>'while', etc.).</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_sparen=ignore|sp_before_sparen=add|sp_before_sparen=remove|sp_before_sparen=force|sp_before_sparen=not_defined
-ChoicesReadable="Ignore Sp Before Sparen|Add Sp Before Sparen|Remove Sp Before Sparen|Force Sp Before Sparen"
-ValueDefault=ignore
-
-[Sp Inside Sparen]
-Category=1
-Description="<html>Add or remove space inside '(' and ')' of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_sparen=ignore|sp_inside_sparen=add|sp_inside_sparen=remove|sp_inside_sparen=force|sp_inside_sparen=not_defined
-ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen"
-ValueDefault=ignore
-
-[Sp Inside Sparen Open]
-Category=1
-Description="<html>Add or remove space after '(' of control statements.<br/><br/>Overrides sp_inside_sparen.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_sparen_open=ignore|sp_inside_sparen_open=add|sp_inside_sparen_open=remove|sp_inside_sparen_open=force|sp_inside_sparen_open=not_defined
-ChoicesReadable="Ignore Sp Inside Sparen Open|Add Sp Inside Sparen Open|Remove Sp Inside Sparen Open|Force Sp Inside Sparen Open"
-ValueDefault=ignore
-
-[Sp Inside Sparen Close]
-Category=1
-Description="<html>Add or remove space before ')' of control statements.<br/><br/>Overrides sp_inside_sparen.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_sparen_close=ignore|sp_inside_sparen_close=add|sp_inside_sparen_close=remove|sp_inside_sparen_close=force|sp_inside_sparen_close=not_defined
-ChoicesReadable="Ignore Sp Inside Sparen Close|Add Sp Inside Sparen Close|Remove Sp Inside Sparen Close|Force Sp Inside Sparen Close"
-ValueDefault=ignore
-
-[Sp After Sparen]
-Category=1
-Description="<html>Add or remove space after ')' of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_sparen=ignore|sp_after_sparen=add|sp_after_sparen=remove|sp_after_sparen=force|sp_after_sparen=not_defined
-ChoicesReadable="Ignore Sp After Sparen|Add Sp After Sparen|Remove Sp After Sparen|Force Sp After Sparen"
-ValueDefault=ignore
-
-[Sp Sparen Brace]
-Category=1
-Description="<html>Add or remove space between ')' and '{' of of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sparen_brace=ignore|sp_sparen_brace=add|sp_sparen_brace=remove|sp_sparen_brace=force|sp_sparen_brace=not_defined
-ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace"
-ValueDefault=ignore
-
-[Sp Do Brace Open]
-Category=1
-Description="<html>Add or remove space between 'do' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_do_brace_open=ignore|sp_do_brace_open=add|sp_do_brace_open=remove|sp_do_brace_open=force|sp_do_brace_open=not_defined
-ChoicesReadable="Ignore Sp Do Brace Open|Add Sp Do Brace Open|Remove Sp Do Brace Open|Force Sp Do Brace Open"
-ValueDefault=ignore
-
-[Sp Brace Close While]
-Category=1
-Description="<html>Add or remove space between '}' and 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_close_while=ignore|sp_brace_close_while=add|sp_brace_close_while=remove|sp_brace_close_while=force|sp_brace_close_while=not_defined
-ChoicesReadable="Ignore Sp Brace Close While|Add Sp Brace Close While|Remove Sp Brace Close While|Force Sp Brace Close While"
-ValueDefault=ignore
-
-[Sp While Paren Open]
-Category=1
-Description="<html>Add or remove space between 'while' and '('. Overrides sp_before_sparen.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_while_paren_open=ignore|sp_while_paren_open=add|sp_while_paren_open=remove|sp_while_paren_open=force|sp_while_paren_open=not_defined
-ChoicesReadable="Ignore Sp While Paren Open|Add Sp While Paren Open|Remove Sp While Paren Open|Force Sp While Paren Open"
-ValueDefault=ignore
-
-[Sp Invariant Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'invariant' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_invariant_paren=ignore|sp_invariant_paren=add|sp_invariant_paren=remove|sp_invariant_paren=force|sp_invariant_paren=not_defined
-ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren"
-ValueDefault=ignore
-
-[Sp After Invariant Paren]
-Category=1
-Description="<html>(D) Add or remove space after the ')' in 'invariant (C) c'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_invariant_paren=ignore|sp_after_invariant_paren=add|sp_after_invariant_paren=remove|sp_after_invariant_paren=force|sp_after_invariant_paren=not_defined
-ChoicesReadable="Ignore Sp After Invariant Paren|Add Sp After Invariant Paren|Remove Sp After Invariant Paren|Force Sp After Invariant Paren"
-ValueDefault=ignore
-
-[Sp Special Semi]
-Category=1
-Description="<html>Add or remove space before empty statement ';' on 'if', 'for' and 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_special_semi=ignore|sp_special_semi=add|sp_special_semi=remove|sp_special_semi=force|sp_special_semi=not_defined
-ChoicesReadable="Ignore Sp Special Semi|Add Sp Special Semi|Remove Sp Special Semi|Force Sp Special Semi"
-ValueDefault=ignore
-
-[Sp Before Semi]
-Category=1
-Description="<html>Add or remove space before ';'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force|sp_before_semi=not_defined
-ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
-ValueDefault=remove
-
-[Sp Before Semi For]
-Category=1
-Description="<html>Add or remove space before ';' in non-empty 'for' statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi_for=ignore|sp_before_semi_for=add|sp_before_semi_for=remove|sp_before_semi_for=force|sp_before_semi_for=not_defined
-ChoicesReadable="Ignore Sp Before Semi For|Add Sp Before Semi For|Remove Sp Before Semi For|Force Sp Before Semi For"
-ValueDefault=ignore
-
-[Sp Before Semi For Empty]
-Category=1
-Description="<html>Add or remove space before a semicolon of an empty part of a for statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi_for_empty=ignore|sp_before_semi_for_empty=add|sp_before_semi_for_empty=remove|sp_before_semi_for_empty=force|sp_before_semi_for_empty=not_defined
-ChoicesReadable="Ignore Sp Before Semi For Empty|Add Sp Before Semi For Empty|Remove Sp Before Semi For Empty|Force Sp Before Semi For Empty"
-ValueDefault=ignore
-
-[Sp After Semi]
-Category=1
-Description="<html>Add or remove space after ';', except when followed by a comment.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force|sp_after_semi=not_defined
-ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
-ValueDefault=add
-
-[Sp After Semi For]
-Category=1
-Description="<html>Add or remove space after ';' in non-empty 'for' statements.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi_for=ignore|sp_after_semi_for=add|sp_after_semi_for=remove|sp_after_semi_for=force|sp_after_semi_for=not_defined
-ChoicesReadable="Ignore Sp After Semi For|Add Sp After Semi For|Remove Sp After Semi For|Force Sp After Semi For"
-ValueDefault=force
-
-[Sp After Semi For Empty]
-Category=1
-Description="<html>Add or remove space after the final semicolon of an empty part of a for<br/>statement, as in 'for ( ; ; &lt;here&gt; )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi_for_empty=ignore|sp_after_semi_for_empty=add|sp_after_semi_for_empty=remove|sp_after_semi_for_empty=force|sp_after_semi_for_empty=not_defined
-ChoicesReadable="Ignore Sp After Semi For Empty|Add Sp After Semi For Empty|Remove Sp After Semi For Empty|Force Sp After Semi For Empty"
-ValueDefault=ignore
-
-[Sp Before Square]
-Category=1
-Description="<html>Add or remove space before '[' (except '[]').</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_square=ignore|sp_before_square=add|sp_before_square=remove|sp_before_square=force|sp_before_square=not_defined
-ChoicesReadable="Ignore Sp Before Square|Add Sp Before Square|Remove Sp Before Square|Force Sp Before Square"
-ValueDefault=ignore
-
-[Sp Before Vardef Square]
-Category=1
-Description="<html>Add or remove space before '[' for a variable definition.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_vardef_square=ignore|sp_before_vardef_square=add|sp_before_vardef_square=remove|sp_before_vardef_square=force|sp_before_vardef_square=not_defined
-ChoicesReadable="Ignore Sp Before Vardef Square|Add Sp Before Vardef Square|Remove Sp Before Vardef Square|Force Sp Before Vardef Square"
-ValueDefault=remove
-
-[Sp Before Square Asm Block]
-Category=1
-Description="<html>Add or remove space before '[' for asm block.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_square_asm_block=ignore|sp_before_square_asm_block=add|sp_before_square_asm_block=remove|sp_before_square_asm_block=force|sp_before_square_asm_block=not_defined
-ChoicesReadable="Ignore Sp Before Square Asm Block|Add Sp Before Square Asm Block|Remove Sp Before Square Asm Block|Force Sp Before Square Asm Block"
-ValueDefault=ignore
-
-[Sp Before Squares]
-Category=1
-Description="<html>Add or remove space before '[]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_squares=ignore|sp_before_squares=add|sp_before_squares=remove|sp_before_squares=force|sp_before_squares=not_defined
-ChoicesReadable="Ignore Sp Before Squares|Add Sp Before Squares|Remove Sp Before Squares|Force Sp Before Squares"
-ValueDefault=ignore
-
-[Sp Cpp Before Struct Binding]
-Category=1
-Description="<html>Add or remove space before C++17 structured bindings.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_before_struct_binding=ignore|sp_cpp_before_struct_binding=add|sp_cpp_before_struct_binding=remove|sp_cpp_before_struct_binding=force|sp_cpp_before_struct_binding=not_defined
-ChoicesReadable="Ignore Sp Cpp Before Struct Binding|Add Sp Cpp Before Struct Binding|Remove Sp Cpp Before Struct Binding|Force Sp Cpp Before Struct Binding"
-ValueDefault=ignore
-
-[Sp Inside Square]
-Category=1
-Description="<html>Add or remove space inside a non-empty '[' and ']'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_square=ignore|sp_inside_square=add|sp_inside_square=remove|sp_inside_square=force|sp_inside_square=not_defined
-ChoicesReadable="Ignore Sp Inside Square|Add Sp Inside Square|Remove Sp Inside Square|Force Sp Inside Square"
-ValueDefault=ignore
-
-[Sp Inside Square Empty]
-Category=1
-Description="<html>Add or remove space inside '[]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_square_empty=ignore|sp_inside_square_empty=add|sp_inside_square_empty=remove|sp_inside_square_empty=force|sp_inside_square_empty=not_defined
-ChoicesReadable="Ignore Sp Inside Square Empty|Add Sp Inside Square Empty|Remove Sp Inside Square Empty|Force Sp Inside Square Empty"
-ValueDefault=ignore
-
-[Sp Inside Square Oc Array]
-Category=1
-Description="<html>(OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and<br/>']'. If set to ignore, sp_inside_square is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_square_oc_array=ignore|sp_inside_square_oc_array=add|sp_inside_square_oc_array=remove|sp_inside_square_oc_array=force|sp_inside_square_oc_array=not_defined
-ChoicesReadable="Ignore Sp Inside Square Oc Array|Add Sp Inside Square Oc Array|Remove Sp Inside Square Oc Array|Force Sp Inside Square Oc Array"
-ValueDefault=ignore
-
-[Sp After Comma]
-Category=1
-Description="<html>Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_comma=ignore|sp_after_comma=add|sp_after_comma=remove|sp_after_comma=force|sp_after_comma=not_defined
-ChoicesReadable="Ignore Sp After Comma|Add Sp After Comma|Remove Sp After Comma|Force Sp After Comma"
-ValueDefault=ignore
-
-[Sp Before Comma]
-Category=1
-Description="<html>Add or remove space before ','.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force|sp_before_comma=not_defined
-ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
-ValueDefault=remove
-
-[Sp After Mdatype Commas]
-Category=1
-Description="<html>(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_mdatype_commas=ignore|sp_after_mdatype_commas=add|sp_after_mdatype_commas=remove|sp_after_mdatype_commas=force|sp_after_mdatype_commas=not_defined
-ChoicesReadable="Ignore Sp After Mdatype Commas|Add Sp After Mdatype Commas|Remove Sp After Mdatype Commas|Force Sp After Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Before Mdatype Commas]
-Category=1
-Description="<html>(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_mdatype_commas=ignore|sp_before_mdatype_commas=add|sp_before_mdatype_commas=remove|sp_before_mdatype_commas=force|sp_before_mdatype_commas=not_defined
-ChoicesReadable="Ignore Sp Before Mdatype Commas|Add Sp Before Mdatype Commas|Remove Sp Before Mdatype Commas|Force Sp Before Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Between Mdatype Commas]
-Category=1
-Description="<html>(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_between_mdatype_commas=ignore|sp_between_mdatype_commas=add|sp_between_mdatype_commas=remove|sp_between_mdatype_commas=force|sp_between_mdatype_commas=not_defined
-ChoicesReadable="Ignore Sp Between Mdatype Commas|Add Sp Between Mdatype Commas|Remove Sp Between Mdatype Commas|Force Sp Between Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Paren Comma]
-Category=1
-Description="<html>Add or remove space between an open parenthesis and comma,<br/>i.e. '(,' vs. '( ,'.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force|sp_paren_comma=not_defined
-ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
-ValueDefault=force
-
-[Sp Before Ellipsis]
-Category=1
-Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force|sp_before_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Before Ellipsis|Add Sp Before Ellipsis|Remove Sp Before Ellipsis|Force Sp Before Ellipsis"
-ValueDefault=ignore
-
-[Sp Type Ellipsis]
-Category=1
-Description="<html>Add or remove space between a type and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_ellipsis=ignore|sp_type_ellipsis=add|sp_type_ellipsis=remove|sp_type_ellipsis=force|sp_type_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Type Ellipsis|Add Sp Type Ellipsis|Remove Sp Type Ellipsis|Force Sp Type Ellipsis"
-ValueDefault=ignore
-
-[Sp Type Question]
-Category=1
-Description="<html>(D) Add or remove space between a type and '?'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force|sp_type_question=not_defined
-ChoicesReadable="Ignore Sp Type Question|Add Sp Type Question|Remove Sp Type Question|Force Sp Type Question"
-ValueDefault=ignore
-
-[Sp Paren Ellipsis]
-Category=1
-Description="<html>Add or remove space between ')' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_ellipsis=ignore|sp_paren_ellipsis=add|sp_paren_ellipsis=remove|sp_paren_ellipsis=force|sp_paren_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Paren Ellipsis|Add Sp Paren Ellipsis|Remove Sp Paren Ellipsis|Force Sp Paren Ellipsis"
-ValueDefault=ignore
-
-[Sp Paren Qualifier]
-Category=1
-Description="<html>Add or remove space between ')' and a qualifier such as 'const'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_qualifier=ignore|sp_paren_qualifier=add|sp_paren_qualifier=remove|sp_paren_qualifier=force|sp_paren_qualifier=not_defined
-ChoicesReadable="Ignore Sp Paren Qualifier|Add Sp Paren Qualifier|Remove Sp Paren Qualifier|Force Sp Paren Qualifier"
-ValueDefault=ignore
-
-[Sp Paren Noexcept]
-Category=1
-Description="<html>Add or remove space between ')' and 'noexcept'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_noexcept=ignore|sp_paren_noexcept=add|sp_paren_noexcept=remove|sp_paren_noexcept=force|sp_paren_noexcept=not_defined
-ChoicesReadable="Ignore Sp Paren Noexcept|Add Sp Paren Noexcept|Remove Sp Paren Noexcept|Force Sp Paren Noexcept"
-ValueDefault=ignore
-
-[Sp After Class Colon]
-Category=1
-Description="<html>Add or remove space after class ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_class_colon=ignore|sp_after_class_colon=add|sp_after_class_colon=remove|sp_after_class_colon=force|sp_after_class_colon=not_defined
-ChoicesReadable="Ignore Sp After Class Colon|Add Sp After Class Colon|Remove Sp After Class Colon|Force Sp After Class Colon"
-ValueDefault=ignore
-
-[Sp Before Class Colon]
-Category=1
-Description="<html>Add or remove space before class ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_class_colon=ignore|sp_before_class_colon=add|sp_before_class_colon=remove|sp_before_class_colon=force|sp_before_class_colon=not_defined
-ChoicesReadable="Ignore Sp Before Class Colon|Add Sp Before Class Colon|Remove Sp Before Class Colon|Force Sp Before Class Colon"
-ValueDefault=ignore
-
-[Sp After Constr Colon]
-Category=1
-Description="<html>Add or remove space after class constructor ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_constr_colon=ignore|sp_after_constr_colon=add|sp_after_constr_colon=remove|sp_after_constr_colon=force|sp_after_constr_colon=not_defined
-ChoicesReadable="Ignore Sp After Constr Colon|Add Sp After Constr Colon|Remove Sp After Constr Colon|Force Sp After Constr Colon"
-ValueDefault=ignore
-
-[Sp Before Constr Colon]
-Category=1
-Description="<html>Add or remove space before class constructor ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_constr_colon=ignore|sp_before_constr_colon=add|sp_before_constr_colon=remove|sp_before_constr_colon=force|sp_before_constr_colon=not_defined
-ChoicesReadable="Ignore Sp Before Constr Colon|Add Sp Before Constr Colon|Remove Sp Before Constr Colon|Force Sp Before Constr Colon"
-ValueDefault=ignore
-
-[Sp Before Case Colon]
-Category=1
-Description="<html>Add or remove space before case ':'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_case_colon=ignore|sp_before_case_colon=add|sp_before_case_colon=remove|sp_before_case_colon=force|sp_before_case_colon=not_defined
-ChoicesReadable="Ignore Sp Before Case Colon|Add Sp Before Case Colon|Remove Sp Before Case Colon|Force Sp Before Case Colon"
-ValueDefault=remove
-
-[Sp After Operator]
-Category=1
-Description="<html>Add or remove space between 'operator' and operator sign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_operator=ignore|sp_after_operator=add|sp_after_operator=remove|sp_after_operator=force|sp_after_operator=not_defined
-ChoicesReadable="Ignore Sp After Operator|Add Sp After Operator|Remove Sp After Operator|Force Sp After Operator"
-ValueDefault=ignore
-
-[Sp After Operator Sym]
-Category=1
-Description="<html>Add or remove space between the operator symbol and the open parenthesis, as<br/>in 'operator ++('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_operator_sym=ignore|sp_after_operator_sym=add|sp_after_operator_sym=remove|sp_after_operator_sym=force|sp_after_operator_sym=not_defined
-ChoicesReadable="Ignore Sp After Operator Sym|Add Sp After Operator Sym|Remove Sp After Operator Sym|Force Sp After Operator Sym"
-ValueDefault=ignore
-
-[Sp After Operator Sym Empty]
-Category=1
-Description="<html>Overrides sp_after_operator_sym when the operator has no arguments, as in<br/>'operator *()'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_operator_sym_empty=ignore|sp_after_operator_sym_empty=add|sp_after_operator_sym_empty=remove|sp_after_operator_sym_empty=force|sp_after_operator_sym_empty=not_defined
-ChoicesReadable="Ignore Sp After Operator Sym Empty|Add Sp After Operator Sym Empty|Remove Sp After Operator Sym Empty|Force Sp After Operator Sym Empty"
-ValueDefault=ignore
-
-[Sp After Cast]
-Category=1
-Description="<html>Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or<br/>'(int)a' vs. '(int) a'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force|sp_after_cast=not_defined
-ChoicesReadable="Ignore Sp After Cast|Add Sp After Cast|Remove Sp After Cast|Force Sp After Cast"
-ValueDefault=ignore
-
-[Sp Inside Paren Cast]
-Category=1
-Description="<html>Add or remove spaces inside cast parentheses.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_paren_cast=ignore|sp_inside_paren_cast=add|sp_inside_paren_cast=remove|sp_inside_paren_cast=force|sp_inside_paren_cast=not_defined
-ChoicesReadable="Ignore Sp Inside Paren Cast|Add Sp Inside Paren Cast|Remove Sp Inside Paren Cast|Force Sp Inside Paren Cast"
-ValueDefault=ignore
-
-[Sp Cpp Cast Paren]
-Category=1
-Description="<html>Add or remove space between the type and open parenthesis in a C++ cast,<br/>i.e. 'int(exp)' vs. 'int (exp)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_cast_paren=ignore|sp_cpp_cast_paren=add|sp_cpp_cast_paren=remove|sp_cpp_cast_paren=force|sp_cpp_cast_paren=not_defined
-ChoicesReadable="Ignore Sp Cpp Cast Paren|Add Sp Cpp Cast Paren|Remove Sp Cpp Cast Paren|Force Sp Cpp Cast Paren"
-ValueDefault=ignore
-
-[Sp Sizeof Paren]
-Category=1
-Description="<html>Add or remove space between 'sizeof' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_paren=ignore|sp_sizeof_paren=add|sp_sizeof_paren=remove|sp_sizeof_paren=force|sp_sizeof_paren=not_defined
-ChoicesReadable="Ignore Sp Sizeof Paren|Add Sp Sizeof Paren|Remove Sp Sizeof Paren|Force Sp Sizeof Paren"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis]
-Category=1
-Description="<html>Add or remove space between 'sizeof' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_ellipsis=ignore|sp_sizeof_ellipsis=add|sp_sizeof_ellipsis=remove|sp_sizeof_ellipsis=force|sp_sizeof_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Sizeof Ellipsis|Add Sp Sizeof Ellipsis|Remove Sp Sizeof Ellipsis|Force Sp Sizeof Ellipsis"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis Paren]
-Category=1
-Description="<html>Add or remove space between 'sizeof...' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_ellipsis_paren=ignore|sp_sizeof_ellipsis_paren=add|sp_sizeof_ellipsis_paren=remove|sp_sizeof_ellipsis_paren=force|sp_sizeof_ellipsis_paren=not_defined
-ChoicesReadable="Ignore Sp Sizeof Ellipsis Paren|Add Sp Sizeof Ellipsis Paren|Remove Sp Sizeof Ellipsis Paren|Force Sp Sizeof Ellipsis Paren"
-ValueDefault=ignore
-
-[Sp Decltype Paren]
-Category=1
-Description="<html>Add or remove space between 'decltype' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_decltype_paren=ignore|sp_decltype_paren=add|sp_decltype_paren=remove|sp_decltype_paren=force|sp_decltype_paren=not_defined
-ChoicesReadable="Ignore Sp Decltype Paren|Add Sp Decltype Paren|Remove Sp Decltype Paren|Force Sp Decltype Paren"
-ValueDefault=ignore
-
-[Sp After Tag]
-Category=1
-Description="<html>(Pawn) Add or remove space after the tag keyword.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_tag=ignore|sp_after_tag=add|sp_after_tag=remove|sp_after_tag=force|sp_after_tag=not_defined
-ChoicesReadable="Ignore Sp After Tag|Add Sp After Tag|Remove Sp After Tag|Force Sp After Tag"
-ValueDefault=ignore
-
-[Sp Inside Braces Enum]
-Category=1
-Description="<html>Add or remove space inside enum '{' and '}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_enum=ignore|sp_inside_braces_enum=add|sp_inside_braces_enum=remove|sp_inside_braces_enum=force|sp_inside_braces_enum=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Enum|Add Sp Inside Braces Enum|Remove Sp Inside Braces Enum|Force Sp Inside Braces Enum"
-ValueDefault=ignore
-
-[Sp Inside Braces Struct]
-Category=1
-Description="<html>Add or remove space inside struct/union '{' and '}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_struct=ignore|sp_inside_braces_struct=add|sp_inside_braces_struct=remove|sp_inside_braces_struct=force|sp_inside_braces_struct=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Struct|Add Sp Inside Braces Struct|Remove Sp Inside Braces Struct|Force Sp Inside Braces Struct"
-ValueDefault=ignore
-
-[Sp Inside Braces Oc Dict]
-Category=1
-Description="<html>(OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_oc_dict=ignore|sp_inside_braces_oc_dict=add|sp_inside_braces_oc_dict=remove|sp_inside_braces_oc_dict=force|sp_inside_braces_oc_dict=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Oc Dict|Add Sp Inside Braces Oc Dict|Remove Sp Inside Braces Oc Dict|Force Sp Inside Braces Oc Dict"
-ValueDefault=ignore
-
-[Sp After Type Brace Init Lst Open]
-Category=1
-Description="<html>Add or remove space after open brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_type_brace_init_lst_open=ignore|sp_after_type_brace_init_lst_open=add|sp_after_type_brace_init_lst_open=remove|sp_after_type_brace_init_lst_open=force|sp_after_type_brace_init_lst_open=not_defined
-ChoicesReadable="Ignore Sp After Type Brace Init Lst Open|Add Sp After Type Brace Init Lst Open|Remove Sp After Type Brace Init Lst Open|Force Sp After Type Brace Init Lst Open"
-ValueDefault=ignore
-
-[Sp Before Type Brace Init Lst Close]
-Category=1
-Description="<html>Add or remove space before close brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_type_brace_init_lst_close=ignore|sp_before_type_brace_init_lst_close=add|sp_before_type_brace_init_lst_close=remove|sp_before_type_brace_init_lst_close=force|sp_before_type_brace_init_lst_close=not_defined
-ChoicesReadable="Ignore Sp Before Type Brace Init Lst Close|Add Sp Before Type Brace Init Lst Close|Remove Sp Before Type Brace Init Lst Close|Force Sp Before Type Brace Init Lst Close"
-ValueDefault=ignore
-
-[Sp Inside Type Brace Init Lst]
-Category=1
-Description="<html>Add or remove space inside an unnamed temporary direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_type_brace_init_lst=ignore|sp_inside_type_brace_init_lst=add|sp_inside_type_brace_init_lst=remove|sp_inside_type_brace_init_lst=force|sp_inside_type_brace_init_lst=not_defined
-ChoicesReadable="Ignore Sp Inside Type Brace Init Lst|Add Sp Inside Type Brace Init Lst|Remove Sp Inside Type Brace Init Lst|Force Sp Inside Type Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Inside Braces]
-Category=1
-Description="<html>Add or remove space inside '{' and '}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces=ignore|sp_inside_braces=add|sp_inside_braces=remove|sp_inside_braces=force|sp_inside_braces=not_defined
-ChoicesReadable="Ignore Sp Inside Braces|Add Sp Inside Braces|Remove Sp Inside Braces|Force Sp Inside Braces"
-ValueDefault=ignore
-
-[Sp Inside Braces Empty]
-Category=1
-Description="<html>Add or remove space inside '{}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_braces_empty=ignore|sp_inside_braces_empty=add|sp_inside_braces_empty=remove|sp_inside_braces_empty=force|sp_inside_braces_empty=not_defined
-ChoicesReadable="Ignore Sp Inside Braces Empty|Add Sp Inside Braces Empty|Remove Sp Inside Braces Empty|Force Sp Inside Braces Empty"
-ValueDefault=ignore
-
-[Sp Trailing Return]
-Category=1
-Description="<html>Add or remove space around trailing return operator '-&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_trailing_return=ignore|sp_trailing_return=add|sp_trailing_return=remove|sp_trailing_return=force|sp_trailing_return=not_defined
-ChoicesReadable="Ignore Sp Trailing Return|Add Sp Trailing Return|Remove Sp Trailing Return|Force Sp Trailing Return"
-ValueDefault=ignore
-
-[Sp Type Func]
-Category=1
-Description="<html>Add or remove space between return type and function name. A minimum of 1<br/>is forced except for pointer return types.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force|sp_type_func=not_defined
-ChoicesReadable="Ignore Sp Type Func|Add Sp Type Func|Remove Sp Type Func|Force Sp Type Func"
-ValueDefault=ignore
-
-[Sp Type Brace Init Lst]
-Category=1
-Description="<html>Add or remove space between type and open brace of an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_brace_init_lst=ignore|sp_type_brace_init_lst=add|sp_type_brace_init_lst=remove|sp_type_brace_init_lst=force|sp_type_brace_init_lst=not_defined
-ChoicesReadable="Ignore Sp Type Brace Init Lst|Add Sp Type Brace Init Lst|Remove Sp Type Brace Init Lst|Force Sp Type Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Func Proto Paren]
-Category=1
-Description="<html>Add or remove space between function name and '(' on function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_proto_paren=ignore|sp_func_proto_paren=add|sp_func_proto_paren=remove|sp_func_proto_paren=force|sp_func_proto_paren=not_defined
-ChoicesReadable="Ignore Sp Func Proto Paren|Add Sp Func Proto Paren|Remove Sp Func Proto Paren|Force Sp Func Proto Paren"
-ValueDefault=ignore
-
-[Sp Func Proto Paren Empty]
-Category=1
-Description="<html>Add or remove space between function name and '()' on function declaration<br/>without parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_proto_paren_empty=ignore|sp_func_proto_paren_empty=add|sp_func_proto_paren_empty=remove|sp_func_proto_paren_empty=force|sp_func_proto_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Proto Paren Empty|Add Sp Func Proto Paren Empty|Remove Sp Func Proto Paren Empty|Force Sp Func Proto Paren Empty"
-ValueDefault=ignore
-
-[Sp Func Type Paren]
-Category=1
-Description="<html>Add or remove space between function name and '(' with a typedef specifier.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_type_paren=ignore|sp_func_type_paren=add|sp_func_type_paren=remove|sp_func_type_paren=force|sp_func_type_paren=not_defined
-ChoicesReadable="Ignore Sp Func Type Paren|Add Sp Func Type Paren|Remove Sp Func Type Paren|Force Sp Func Type Paren"
-ValueDefault=ignore
-
-[Sp Func Def Paren]
-Category=1
-Description="<html>Add or remove space between alias name and '(' of a non-pointer function type typedef.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_def_paren=ignore|sp_func_def_paren=add|sp_func_def_paren=remove|sp_func_def_paren=force|sp_func_def_paren=not_defined
-ChoicesReadable="Ignore Sp Func Def Paren|Add Sp Func Def Paren|Remove Sp Func Def Paren|Force Sp Func Def Paren"
-ValueDefault=ignore
-
-[Sp Func Def Paren Empty]
-Category=1
-Description="<html>Add or remove space between function name and '()' on function definition<br/>without parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_def_paren_empty=ignore|sp_func_def_paren_empty=add|sp_func_def_paren_empty=remove|sp_func_def_paren_empty=force|sp_func_def_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Def Paren Empty|Add Sp Func Def Paren Empty|Remove Sp Func Def Paren Empty|Force Sp Func Def Paren Empty"
-ValueDefault=ignore
-
-[Sp Inside Fparens]
-Category=1
-Description="<html>Add or remove space inside empty function '()'.<br/>Overrides sp_after_angle unless use_sp_after_angle_always is set to true.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_fparens=ignore|sp_inside_fparens=add|sp_inside_fparens=remove|sp_inside_fparens=force|sp_inside_fparens=not_defined
-ChoicesReadable="Ignore Sp Inside Fparens|Add Sp Inside Fparens|Remove Sp Inside Fparens|Force Sp Inside Fparens"
-ValueDefault=ignore
-
-[Sp Inside Fparen]
-Category=1
-Description="<html>Add or remove space inside function '(' and ')'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_fparen=ignore|sp_inside_fparen=add|sp_inside_fparen=remove|sp_inside_fparen=force|sp_inside_fparen=not_defined
-ChoicesReadable="Ignore Sp Inside Fparen|Add Sp Inside Fparen|Remove Sp Inside Fparen|Force Sp Inside Fparen"
-ValueDefault=ignore
-
-[Sp Inside Tparen]
-Category=1
-Description="<html>Add or remove space inside the first parentheses in a function type, as in<br/>'void (*x)(...)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_tparen=ignore|sp_inside_tparen=add|sp_inside_tparen=remove|sp_inside_tparen=force|sp_inside_tparen=not_defined
-ChoicesReadable="Ignore Sp Inside Tparen|Add Sp Inside Tparen|Remove Sp Inside Tparen|Force Sp Inside Tparen"
-ValueDefault=ignore
-
-[Sp After Tparen Close]
-Category=1
-Description="<html>Add or remove space between the ')' and '(' in a function type, as in<br/>'void (*x)(...)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_tparen_close=ignore|sp_after_tparen_close=add|sp_after_tparen_close=remove|sp_after_tparen_close=force|sp_after_tparen_close=not_defined
-ChoicesReadable="Ignore Sp After Tparen Close|Add Sp After Tparen Close|Remove Sp After Tparen Close|Force Sp After Tparen Close"
-ValueDefault=ignore
-
-[Sp Square Fparen]
-Category=1
-Description="<html>Add or remove space between ']' and '(' when part of a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_square_fparen=ignore|sp_square_fparen=add|sp_square_fparen=remove|sp_square_fparen=force|sp_square_fparen=not_defined
-ChoicesReadable="Ignore Sp Square Fparen|Add Sp Square Fparen|Remove Sp Square Fparen|Force Sp Square Fparen"
-ValueDefault=ignore
-
-[Sp Fparen Brace]
-Category=1
-Description="<html>Add or remove space between ')' and '{' of function.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_fparen_brace=ignore|sp_fparen_brace=add|sp_fparen_brace=remove|sp_fparen_brace=force|sp_fparen_brace=not_defined
-ChoicesReadable="Ignore Sp Fparen Brace|Add Sp Fparen Brace|Remove Sp Fparen Brace|Force Sp Fparen Brace"
-ValueDefault=ignore
-
-[Sp Fparen Brace Initializer]
-Category=1
-Description="<html>Add or remove space between ')' and '{' of a function call in object<br/>initialization.<br/><br/>Overrides sp_fparen_brace.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_fparen_brace_initializer=ignore|sp_fparen_brace_initializer=add|sp_fparen_brace_initializer=remove|sp_fparen_brace_initializer=force|sp_fparen_brace_initializer=not_defined
-ChoicesReadable="Ignore Sp Fparen Brace Initializer|Add Sp Fparen Brace Initializer|Remove Sp Fparen Brace Initializer|Force Sp Fparen Brace Initializer"
-ValueDefault=ignore
-
-[Sp Fparen Dbrace]
-Category=1
-Description="<html>(Java) Add or remove space between ')' and '{{' of double brace initializer.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_fparen_dbrace=ignore|sp_fparen_dbrace=add|sp_fparen_dbrace=remove|sp_fparen_dbrace=force|sp_fparen_dbrace=not_defined
-ChoicesReadable="Ignore Sp Fparen Dbrace|Add Sp Fparen Dbrace|Remove Sp Fparen Dbrace|Force Sp Fparen Dbrace"
-ValueDefault=ignore
-
-[Sp Func Call Paren]
-Category=1
-Description="<html>Add or remove space between function name and '(' on function calls.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_paren=ignore|sp_func_call_paren=add|sp_func_call_paren=remove|sp_func_call_paren=force|sp_func_call_paren=not_defined
-ChoicesReadable="Ignore Sp Func Call Paren|Add Sp Func Call Paren|Remove Sp Func Call Paren|Force Sp Func Call Paren"
-ValueDefault=ignore
-
-[Sp Func Call Paren Empty]
-Category=1
-Description="<html>Add or remove space between function name and '()' on function calls without<br/>parameters. If set to ignore (the default), sp_func_call_paren is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_paren_empty=ignore|sp_func_call_paren_empty=add|sp_func_call_paren_empty=remove|sp_func_call_paren_empty=force|sp_func_call_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Call Paren Empty|Add Sp Func Call Paren Empty|Remove Sp Func Call Paren Empty|Force Sp Func Call Paren Empty"
-ValueDefault=ignore
-
-[Sp Func Call User Paren]
-Category=1
-Description="<html>Add or remove space between the user function name and '(' on function<br/>calls. You need to set a keyword to be a user function in the config file,<br/>like:<br/>  set func_call_user tr _ i18n</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_user_paren=ignore|sp_func_call_user_paren=add|sp_func_call_user_paren=remove|sp_func_call_user_paren=force|sp_func_call_user_paren=not_defined
-ChoicesReadable="Ignore Sp Func Call User Paren|Add Sp Func Call User Paren|Remove Sp Func Call User Paren|Force Sp Func Call User Paren"
-ValueDefault=ignore
-
-[Sp Func Call User Inside Fparen]
-Category=1
-Description="<html>Add or remove space inside user function '(' and ')'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_user_inside_fparen=ignore|sp_func_call_user_inside_fparen=add|sp_func_call_user_inside_fparen=remove|sp_func_call_user_inside_fparen=force|sp_func_call_user_inside_fparen=not_defined
-ChoicesReadable="Ignore Sp Func Call User Inside Fparen|Add Sp Func Call User Inside Fparen|Remove Sp Func Call User Inside Fparen|Force Sp Func Call User Inside Fparen"
-ValueDefault=ignore
-
-[Sp Func Call User Paren Paren]
-Category=1
-Description="<html>Add or remove space between nested parentheses with user functions,<br/>i.e. '((' vs. '( ('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_call_user_paren_paren=ignore|sp_func_call_user_paren_paren=add|sp_func_call_user_paren_paren=remove|sp_func_call_user_paren_paren=force|sp_func_call_user_paren_paren=not_defined
-ChoicesReadable="Ignore Sp Func Call User Paren Paren|Add Sp Func Call User Paren Paren|Remove Sp Func Call User Paren Paren|Force Sp Func Call User Paren Paren"
-ValueDefault=ignore
-
-[Sp Func Class Paren]
-Category=1
-Description="<html>Add or remove space between a constructor/destructor and the open<br/>parenthesis.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_class_paren=ignore|sp_func_class_paren=add|sp_func_class_paren=remove|sp_func_class_paren=force|sp_func_class_paren=not_defined
-ChoicesReadable="Ignore Sp Func Class Paren|Add Sp Func Class Paren|Remove Sp Func Class Paren|Force Sp Func Class Paren"
-ValueDefault=ignore
-
-[Sp Func Class Paren Empty]
-Category=1
-Description="<html>Add or remove space between a constructor without parameters or destructor<br/>and '()'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_class_paren_empty=ignore|sp_func_class_paren_empty=add|sp_func_class_paren_empty=remove|sp_func_class_paren_empty=force|sp_func_class_paren_empty=not_defined
-ChoicesReadable="Ignore Sp Func Class Paren Empty|Add Sp Func Class Paren Empty|Remove Sp Func Class Paren Empty|Force Sp Func Class Paren Empty"
-ValueDefault=ignore
-
-[Sp Return Paren]
-Category=1
-Description="<html>Add or remove space between 'return' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_return_paren=ignore|sp_return_paren=add|sp_return_paren=remove|sp_return_paren=force|sp_return_paren=not_defined
-ChoicesReadable="Ignore Sp Return Paren|Add Sp Return Paren|Remove Sp Return Paren|Force Sp Return Paren"
-ValueDefault=ignore
-
-[Sp Return Brace]
-Category=1
-Description="<html>Add or remove space between 'return' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_return_brace=ignore|sp_return_brace=add|sp_return_brace=remove|sp_return_brace=force|sp_return_brace=not_defined
-ChoicesReadable="Ignore Sp Return Brace|Add Sp Return Brace|Remove Sp Return Brace|Force Sp Return Brace"
-ValueDefault=ignore
-
-[Sp Attribute Paren]
-Category=1
-Description="<html>Add or remove space between '__attribute__' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_attribute_paren=ignore|sp_attribute_paren=add|sp_attribute_paren=remove|sp_attribute_paren=force|sp_attribute_paren=not_defined
-ChoicesReadable="Ignore Sp Attribute Paren|Add Sp Attribute Paren|Remove Sp Attribute Paren|Force Sp Attribute Paren"
-ValueDefault=ignore
-
-[Sp Defined Paren]
-Category=1
-Description="<html>Add or remove space between 'defined' and '(' in '#if defined (FOO)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_defined_paren=ignore|sp_defined_paren=add|sp_defined_paren=remove|sp_defined_paren=force|sp_defined_paren=not_defined
-ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren"
-ValueDefault=ignore
-
-[Sp Throw Paren]
-Category=1
-Description="<html>Add or remove space between 'throw' and '(' in 'throw (something)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_throw_paren=ignore|sp_throw_paren=add|sp_throw_paren=remove|sp_throw_paren=force|sp_throw_paren=not_defined
-ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
-ValueDefault=ignore
-
-[Sp After Throw]
-Category=1
-Description="<html>Add or remove space between 'throw' and anything other than '(' as in<br/>'@throw [...];'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_throw=ignore|sp_after_throw=add|sp_after_throw=remove|sp_after_throw=force|sp_after_throw=not_defined
-ChoicesReadable="Ignore Sp After Throw|Add Sp After Throw|Remove Sp After Throw|Force Sp After Throw"
-ValueDefault=ignore
-
-[Sp Catch Paren]
-Category=1
-Description="<html>Add or remove space between 'catch' and '(' in 'catch (something) { }'.<br/>If set to ignore, sp_before_sparen is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_catch_paren=ignore|sp_catch_paren=add|sp_catch_paren=remove|sp_catch_paren=force|sp_catch_paren=not_defined
-ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
-ValueDefault=ignore
-
-[Sp Oc Catch Paren]
-Category=1
-Description="<html>(OC) Add or remove space between '@catch' and '('<br/>in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_catch_paren=ignore|sp_oc_catch_paren=add|sp_oc_catch_paren=remove|sp_oc_catch_paren=force|sp_oc_catch_paren=not_defined
-ChoicesReadable="Ignore Sp Oc Catch Paren|Add Sp Oc Catch Paren|Remove Sp Oc Catch Paren|Force Sp Oc Catch Paren"
-ValueDefault=ignore
-
-[Sp Before Oc Proto List]
-Category=1
-Description="<html>(OC) Add or remove space before Objective-C protocol list<br/>as in '@protocol Protocol&lt;here&gt;&lt;Protocol_A&gt;' or '@interface MyClass : NSObject&lt;here&gt;&lt;MyProtocol&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_proto_list=ignore|sp_before_oc_proto_list=add|sp_before_oc_proto_list=remove|sp_before_oc_proto_list=force|sp_before_oc_proto_list=not_defined
-ChoicesReadable="Ignore Sp Before Oc Proto List|Add Sp Before Oc Proto List|Remove Sp Before Oc Proto List|Force Sp Before Oc Proto List"
-ValueDefault=ignore
-
-[Sp Oc Classname Paren]
-Category=1
-Description="<html>(OC) Add or remove space between class name and '('<br/>in '@interface className(categoryName)&lt;ProtocolName&gt;:BaseClass'</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_classname_paren=ignore|sp_oc_classname_paren=add|sp_oc_classname_paren=remove|sp_oc_classname_paren=force|sp_oc_classname_paren=not_defined
-ChoicesReadable="Ignore Sp Oc Classname Paren|Add Sp Oc Classname Paren|Remove Sp Oc Classname Paren|Force Sp Oc Classname Paren"
-ValueDefault=ignore
-
-[Sp Version Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'version' and '('<br/>in 'version (something) { }'. If set to ignore, sp_before_sparen is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_version_paren=ignore|sp_version_paren=add|sp_version_paren=remove|sp_version_paren=force|sp_version_paren=not_defined
-ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
-ValueDefault=ignore
-
-[Sp Scope Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'scope' and '('<br/>in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_scope_paren=ignore|sp_scope_paren=add|sp_scope_paren=remove|sp_scope_paren=force|sp_scope_paren=not_defined
-ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
-ValueDefault=ignore
-
-[Sp Super Paren]
-Category=1
-Description="<html>Add or remove space between 'super' and '(' in 'super (something)'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_super_paren=ignore|sp_super_paren=add|sp_super_paren=remove|sp_super_paren=force|sp_super_paren=not_defined
-ChoicesReadable="Ignore Sp Super Paren|Add Sp Super Paren|Remove Sp Super Paren|Force Sp Super Paren"
-ValueDefault=remove
-
-[Sp This Paren]
-Category=1
-Description="<html>Add or remove space between 'this' and '(' in 'this (something)'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_this_paren=ignore|sp_this_paren=add|sp_this_paren=remove|sp_this_paren=force|sp_this_paren=not_defined
-ChoicesReadable="Ignore Sp This Paren|Add Sp This Paren|Remove Sp This Paren|Force Sp This Paren"
-ValueDefault=remove
-
-[Sp Macro]
-Category=1
-Description="<html>Add or remove space between a macro name and its definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force|sp_macro=not_defined
-ChoicesReadable="Ignore Sp Macro|Add Sp Macro|Remove Sp Macro|Force Sp Macro"
-ValueDefault=ignore
-
-[Sp Macro Func]
-Category=1
-Description="<html>Add or remove space between a macro function ')' and its definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_macro_func=ignore|sp_macro_func=add|sp_macro_func=remove|sp_macro_func=force|sp_macro_func=not_defined
-ChoicesReadable="Ignore Sp Macro Func|Add Sp Macro Func|Remove Sp Macro Func|Force Sp Macro Func"
-ValueDefault=ignore
-
-[Sp Else Brace]
-Category=1
-Description="<html>Add or remove space between 'else' and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_else_brace=ignore|sp_else_brace=add|sp_else_brace=remove|sp_else_brace=force|sp_else_brace=not_defined
-ChoicesReadable="Ignore Sp Else Brace|Add Sp Else Brace|Remove Sp Else Brace|Force Sp Else Brace"
-ValueDefault=ignore
-
-[Sp Brace Else]
-Category=1
-Description="<html>Add or remove space between '}' and 'else' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_else=ignore|sp_brace_else=add|sp_brace_else=remove|sp_brace_else=force|sp_brace_else=not_defined
-ChoicesReadable="Ignore Sp Brace Else|Add Sp Brace Else|Remove Sp Brace Else|Force Sp Brace Else"
-ValueDefault=ignore
-
-[Sp Brace Typedef]
-Category=1
-Description="<html>Add or remove space between '}' and the name of a typedef on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_typedef=ignore|sp_brace_typedef=add|sp_brace_typedef=remove|sp_brace_typedef=force|sp_brace_typedef=not_defined
-ChoicesReadable="Ignore Sp Brace Typedef|Add Sp Brace Typedef|Remove Sp Brace Typedef|Force Sp Brace Typedef"
-ValueDefault=ignore
-
-[Sp Catch Brace]
-Category=1
-Description="<html>Add or remove space before the '{' of a 'catch' statement, if the '{' and<br/>'catch' are on the same line, as in 'catch (decl) &lt;here&gt; {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force|sp_catch_brace=not_defined
-ChoicesReadable="Ignore Sp Catch Brace|Add Sp Catch Brace|Remove Sp Catch Brace|Force Sp Catch Brace"
-ValueDefault=ignore
-
-[Sp Oc Catch Brace]
-Category=1
-Description="<html>(OC) Add or remove space before the '{' of a '@catch' statement, if the '{'<br/>and '@catch' are on the same line, as in '@catch (decl) &lt;here&gt; {'.<br/>If set to ignore, sp_catch_brace is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_catch_brace=ignore|sp_oc_catch_brace=add|sp_oc_catch_brace=remove|sp_oc_catch_brace=force|sp_oc_catch_brace=not_defined
-ChoicesReadable="Ignore Sp Oc Catch Brace|Add Sp Oc Catch Brace|Remove Sp Oc Catch Brace|Force Sp Oc Catch Brace"
-ValueDefault=ignore
-
-[Sp Brace Catch]
-Category=1
-Description="<html>Add or remove space between '}' and 'catch' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_catch=ignore|sp_brace_catch=add|sp_brace_catch=remove|sp_brace_catch=force|sp_brace_catch=not_defined
-ChoicesReadable="Ignore Sp Brace Catch|Add Sp Brace Catch|Remove Sp Brace Catch|Force Sp Brace Catch"
-ValueDefault=ignore
-
-[Sp Oc Brace Catch]
-Category=1
-Description="<html>(OC) Add or remove space between '}' and '@catch' if on the same line.<br/>If set to ignore, sp_brace_catch is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_brace_catch=ignore|sp_oc_brace_catch=add|sp_oc_brace_catch=remove|sp_oc_brace_catch=force|sp_oc_brace_catch=not_defined
-ChoicesReadable="Ignore Sp Oc Brace Catch|Add Sp Oc Brace Catch|Remove Sp Oc Brace Catch|Force Sp Oc Brace Catch"
-ValueDefault=ignore
-
-[Sp Finally Brace]
-Category=1
-Description="<html>Add or remove space between 'finally' and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_finally_brace=ignore|sp_finally_brace=add|sp_finally_brace=remove|sp_finally_brace=force|sp_finally_brace=not_defined
-ChoicesReadable="Ignore Sp Finally Brace|Add Sp Finally Brace|Remove Sp Finally Brace|Force Sp Finally Brace"
-ValueDefault=ignore
-
-[Sp Brace Finally]
-Category=1
-Description="<html>Add or remove space between '}' and 'finally' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_finally=ignore|sp_brace_finally=add|sp_brace_finally=remove|sp_brace_finally=force|sp_brace_finally=not_defined
-ChoicesReadable="Ignore Sp Brace Finally|Add Sp Brace Finally|Remove Sp Brace Finally|Force Sp Brace Finally"
-ValueDefault=ignore
-
-[Sp Try Brace]
-Category=1
-Description="<html>Add or remove space between 'try' and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_try_brace=ignore|sp_try_brace=add|sp_try_brace=remove|sp_try_brace=force|sp_try_brace=not_defined
-ChoicesReadable="Ignore Sp Try Brace|Add Sp Try Brace|Remove Sp Try Brace|Force Sp Try Brace"
-ValueDefault=ignore
-
-[Sp Getset Brace]
-Category=1
-Description="<html>Add or remove space between get/set and '{' if on the same line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_getset_brace=ignore|sp_getset_brace=add|sp_getset_brace=remove|sp_getset_brace=force|sp_getset_brace=not_defined
-ChoicesReadable="Ignore Sp Getset Brace|Add Sp Getset Brace|Remove Sp Getset Brace|Force Sp Getset Brace"
-ValueDefault=ignore
-
-[Sp Word Brace Init Lst]
-Category=1
-Description="<html>Add or remove space between a variable and '{' for C++ uniform<br/>initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_word_brace_init_lst=ignore|sp_word_brace_init_lst=add|sp_word_brace_init_lst=remove|sp_word_brace_init_lst=force|sp_word_brace_init_lst=not_defined
-ChoicesReadable="Ignore Sp Word Brace Init Lst|Add Sp Word Brace Init Lst|Remove Sp Word Brace Init Lst|Force Sp Word Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Word Brace Ns]
-Category=1
-Description="<html>Add or remove space between a variable and '{' for a namespace.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_word_brace_ns=ignore|sp_word_brace_ns=add|sp_word_brace_ns=remove|sp_word_brace_ns=force|sp_word_brace_ns=not_defined
-ChoicesReadable="Ignore Sp Word Brace Ns|Add Sp Word Brace Ns|Remove Sp Word Brace Ns|Force Sp Word Brace Ns"
-ValueDefault=add
-
-[Sp Before Dc]
-Category=1
-Description="<html>Add or remove space before the '::' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_dc=ignore|sp_before_dc=add|sp_before_dc=remove|sp_before_dc=force|sp_before_dc=not_defined
-ChoicesReadable="Ignore Sp Before Dc|Add Sp Before Dc|Remove Sp Before Dc|Force Sp Before Dc"
-ValueDefault=ignore
-
-[Sp After Dc]
-Category=1
-Description="<html>Add or remove space after the '::' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_dc=ignore|sp_after_dc=add|sp_after_dc=remove|sp_after_dc=force|sp_after_dc=not_defined
-ChoicesReadable="Ignore Sp After Dc|Add Sp After Dc|Remove Sp After Dc|Force Sp After Dc"
-ValueDefault=ignore
-
-[Sp D Array Colon]
-Category=1
-Description="<html>(D) Add or remove around the D named array initializer ':' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_d_array_colon=ignore|sp_d_array_colon=add|sp_d_array_colon=remove|sp_d_array_colon=force|sp_d_array_colon=not_defined
-ChoicesReadable="Ignore Sp D Array Colon|Add Sp D Array Colon|Remove Sp D Array Colon|Force Sp D Array Colon"
-ValueDefault=ignore
-
-[Sp Not]
-Category=1
-Description="<html>Add or remove space after the '!' (not) unary operator.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force|sp_not=not_defined
-ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
-ValueDefault=remove
-
-[Sp Inv]
-Category=1
-Description="<html>Add or remove space after the '~' (invert) unary operator.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force|sp_inv=not_defined
-ChoicesReadable="Ignore Sp Inv|Add Sp Inv|Remove Sp Inv|Force Sp Inv"
-ValueDefault=remove
-
-[Sp Addr]
-Category=1
-Description="<html>Add or remove space after the '&amp;' (address-of) unary operator. This does not<br/>affect the spacing after a '&amp;' that is part of a type.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force|sp_addr=not_defined
-ChoicesReadable="Ignore Sp Addr|Add Sp Addr|Remove Sp Addr|Force Sp Addr"
-ValueDefault=remove
-
-[Sp Member]
-Category=1
-Description="<html>Add or remove space around the '.' or '-&gt;' operators.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force|sp_member=not_defined
-ChoicesReadable="Ignore Sp Member|Add Sp Member|Remove Sp Member|Force Sp Member"
-ValueDefault=remove
-
-[Sp Deref]
-Category=1
-Description="<html>Add or remove space after the '*' (dereference) unary operator. This does<br/>not affect the spacing after a '*' that is part of a type.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force|sp_deref=not_defined
-ChoicesReadable="Ignore Sp Deref|Add Sp Deref|Remove Sp Deref|Force Sp Deref"
-ValueDefault=remove
-
-[Sp Sign]
-Category=1
-Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force|sp_sign=not_defined
-ChoicesReadable="Ignore Sp Sign|Add Sp Sign|Remove Sp Sign|Force Sp Sign"
-ValueDefault=remove
-
-[Sp Incdec]
-Category=1
-Description="<html>Add or remove space between '++' and '--' the word to which it is being<br/>applied, as in '(--x)' or 'y++;'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force|sp_incdec=not_defined
-ChoicesReadable="Ignore Sp Incdec|Add Sp Incdec|Remove Sp Incdec|Force Sp Incdec"
-ValueDefault=remove
-
-[Sp Before Nl Cont]
-Category=1
-Description="<html>Add or remove space before a backslash-newline at the end of a line.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_nl_cont=ignore|sp_before_nl_cont=add|sp_before_nl_cont=remove|sp_before_nl_cont=force|sp_before_nl_cont=not_defined
-ChoicesReadable="Ignore Sp Before Nl Cont|Add Sp Before Nl Cont|Remove Sp Before Nl Cont|Force Sp Before Nl Cont"
-ValueDefault=add
-
-[Sp After Oc Scope]
-Category=1
-Description="<html>(OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'<br/>or '+(int) bar;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_scope=ignore|sp_after_oc_scope=add|sp_after_oc_scope=remove|sp_after_oc_scope=force|sp_after_oc_scope=not_defined
-ChoicesReadable="Ignore Sp After Oc Scope|Add Sp After Oc Scope|Remove Sp After Oc Scope|Force Sp After Oc Scope"
-ValueDefault=ignore
-
-[Sp After Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space after the colon in message specs,<br/>i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_colon=ignore|sp_after_oc_colon=add|sp_after_oc_colon=remove|sp_after_oc_colon=force|sp_after_oc_colon=not_defined
-ChoicesReadable="Ignore Sp After Oc Colon|Add Sp After Oc Colon|Remove Sp After Oc Colon|Force Sp After Oc Colon"
-ValueDefault=ignore
-
-[Sp Before Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space before the colon in message specs,<br/>i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_colon=ignore|sp_before_oc_colon=add|sp_before_oc_colon=remove|sp_before_oc_colon=force|sp_before_oc_colon=not_defined
-ChoicesReadable="Ignore Sp Before Oc Colon|Add Sp Before Oc Colon|Remove Sp Before Oc Colon|Force Sp Before Oc Colon"
-ValueDefault=ignore
-
-[Sp After Oc Dict Colon]
-Category=1
-Description="<html>(OC) Add or remove space after the colon in immutable dictionary expression<br/>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_dict_colon=ignore|sp_after_oc_dict_colon=add|sp_after_oc_dict_colon=remove|sp_after_oc_dict_colon=force|sp_after_oc_dict_colon=not_defined
-ChoicesReadable="Ignore Sp After Oc Dict Colon|Add Sp After Oc Dict Colon|Remove Sp After Oc Dict Colon|Force Sp After Oc Dict Colon"
-ValueDefault=ignore
-
-[Sp Before Oc Dict Colon]
-Category=1
-Description="<html>(OC) Add or remove space before the colon in immutable dictionary expression<br/>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_dict_colon=ignore|sp_before_oc_dict_colon=add|sp_before_oc_dict_colon=remove|sp_before_oc_dict_colon=force|sp_before_oc_dict_colon=not_defined
-ChoicesReadable="Ignore Sp Before Oc Dict Colon|Add Sp Before Oc Dict Colon|Remove Sp Before Oc Dict Colon|Force Sp Before Oc Dict Colon"
-ValueDefault=ignore
-
-[Sp After Send Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space after the colon in message specs,<br/>i.e. '[object setValue:1];' vs. '[object setValue: 1];'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_send_oc_colon=ignore|sp_after_send_oc_colon=add|sp_after_send_oc_colon=remove|sp_after_send_oc_colon=force|sp_after_send_oc_colon=not_defined
-ChoicesReadable="Ignore Sp After Send Oc Colon|Add Sp After Send Oc Colon|Remove Sp After Send Oc Colon|Force Sp After Send Oc Colon"
-ValueDefault=ignore
-
-[Sp Before Send Oc Colon]
-Category=1
-Description="<html>(OC) Add or remove space before the colon in message specs,<br/>i.e. '[object setValue:1];' vs. '[object setValue :1];'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_send_oc_colon=ignore|sp_before_send_oc_colon=add|sp_before_send_oc_colon=remove|sp_before_send_oc_colon=force|sp_before_send_oc_colon=not_defined
-ChoicesReadable="Ignore Sp Before Send Oc Colon|Add Sp Before Send Oc Colon|Remove Sp Before Send Oc Colon|Force Sp Before Send Oc Colon"
-ValueDefault=ignore
-
-[Sp After Oc Type]
-Category=1
-Description="<html>(OC) Add or remove space after the (type) in message specs,<br/>i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force|sp_after_oc_type=not_defined
-ChoicesReadable="Ignore Sp After Oc Type|Add Sp After Oc Type|Remove Sp After Oc Type|Force Sp After Oc Type"
-ValueDefault=ignore
-
-[Sp After Oc Return Type]
-Category=1
-Description="<html>(OC) Add or remove space after the first (type) in message specs,<br/>i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_return_type=ignore|sp_after_oc_return_type=add|sp_after_oc_return_type=remove|sp_after_oc_return_type=force|sp_after_oc_return_type=not_defined
-ChoicesReadable="Ignore Sp After Oc Return Type|Add Sp After Oc Return Type|Remove Sp After Oc Return Type|Force Sp After Oc Return Type"
-ValueDefault=ignore
-
-[Sp After Oc At Sel]
-Category=1
-Description="<html>(OC) Add or remove space between '@selector' and '(',<br/>i.e. '@selector(msgName)' vs. '@selector (msgName)'.<br/>Also applies to '@protocol()' constructs.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_at_sel=ignore|sp_after_oc_at_sel=add|sp_after_oc_at_sel=remove|sp_after_oc_at_sel=force|sp_after_oc_at_sel=not_defined
-ChoicesReadable="Ignore Sp After Oc At Sel|Add Sp After Oc At Sel|Remove Sp After Oc At Sel|Force Sp After Oc At Sel"
-ValueDefault=ignore
-
-[Sp After Oc At Sel Parens]
-Category=1
-Description="<html>(OC) Add or remove space between '@selector(x)' and the following word,<br/>i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_at_sel_parens=ignore|sp_after_oc_at_sel_parens=add|sp_after_oc_at_sel_parens=remove|sp_after_oc_at_sel_parens=force|sp_after_oc_at_sel_parens=not_defined
-ChoicesReadable="Ignore Sp After Oc At Sel Parens|Add Sp After Oc At Sel Parens|Remove Sp After Oc At Sel Parens|Force Sp After Oc At Sel Parens"
-ValueDefault=ignore
-
-[Sp Inside Oc At Sel Parens]
-Category=1
-Description="<html>(OC) Add or remove space inside '@selector' parentheses,<br/>i.e. '@selector(foo)' vs. '@selector( foo )'.<br/>Also applies to '@protocol()' constructs.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_oc_at_sel_parens=ignore|sp_inside_oc_at_sel_parens=add|sp_inside_oc_at_sel_parens=remove|sp_inside_oc_at_sel_parens=force|sp_inside_oc_at_sel_parens=not_defined
-ChoicesReadable="Ignore Sp Inside Oc At Sel Parens|Add Sp Inside Oc At Sel Parens|Remove Sp Inside Oc At Sel Parens|Force Sp Inside Oc At Sel Parens"
-ValueDefault=ignore
-
-[Sp Before Oc Block Caret]
-Category=1
-Description="<html>(OC) Add or remove space before a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_block_caret=ignore|sp_before_oc_block_caret=add|sp_before_oc_block_caret=remove|sp_before_oc_block_caret=force|sp_before_oc_block_caret=not_defined
-ChoicesReadable="Ignore Sp Before Oc Block Caret|Add Sp Before Oc Block Caret|Remove Sp Before Oc Block Caret|Force Sp Before Oc Block Caret"
-ValueDefault=ignore
-
-[Sp After Oc Block Caret]
-Category=1
-Description="<html>(OC) Add or remove space after a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_block_caret=ignore|sp_after_oc_block_caret=add|sp_after_oc_block_caret=remove|sp_after_oc_block_caret=force|sp_after_oc_block_caret=not_defined
-ChoicesReadable="Ignore Sp After Oc Block Caret|Add Sp After Oc Block Caret|Remove Sp After Oc Block Caret|Force Sp After Oc Block Caret"
-ValueDefault=ignore
-
-[Sp After Oc Msg Receiver]
-Category=1
-Description="<html>(OC) Add or remove space between the receiver and selector in a message,<br/>as in '[receiver selector ...]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_msg_receiver=ignore|sp_after_oc_msg_receiver=add|sp_after_oc_msg_receiver=remove|sp_after_oc_msg_receiver=force|sp_after_oc_msg_receiver=not_defined
-ChoicesReadable="Ignore Sp After Oc Msg Receiver|Add Sp After Oc Msg Receiver|Remove Sp After Oc Msg Receiver|Force Sp After Oc Msg Receiver"
-ValueDefault=ignore
-
-[Sp After Oc Property]
-Category=1
-Description="<html>(OC) Add or remove space after '@property'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_property=ignore|sp_after_oc_property=add|sp_after_oc_property=remove|sp_after_oc_property=force|sp_after_oc_property=not_defined
-ChoicesReadable="Ignore Sp After Oc Property|Add Sp After Oc Property|Remove Sp After Oc Property|Force Sp After Oc Property"
-ValueDefault=ignore
-
-[Sp After Oc Synchronized]
-Category=1
-Description="<html>(OC) Add or remove space between '@synchronized' and the open parenthesis,<br/>i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_synchronized=ignore|sp_after_oc_synchronized=add|sp_after_oc_synchronized=remove|sp_after_oc_synchronized=force|sp_after_oc_synchronized=not_defined
-ChoicesReadable="Ignore Sp After Oc Synchronized|Add Sp After Oc Synchronized|Remove Sp After Oc Synchronized|Force Sp After Oc Synchronized"
-ValueDefault=ignore
-
-[Sp Cond Colon]
-Category=1
-Description="<html>Add or remove space around the ':' in 'b ? t : f'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_colon=ignore|sp_cond_colon=add|sp_cond_colon=remove|sp_cond_colon=force|sp_cond_colon=not_defined
-ChoicesReadable="Ignore Sp Cond Colon|Add Sp Cond Colon|Remove Sp Cond Colon|Force Sp Cond Colon"
-ValueDefault=ignore
-
-[Sp Cond Colon Before]
-Category=1
-Description="<html>Add or remove space before the ':' in 'b ? t : f'.<br/><br/>Overrides sp_cond_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_colon_before=ignore|sp_cond_colon_before=add|sp_cond_colon_before=remove|sp_cond_colon_before=force|sp_cond_colon_before=not_defined
-ChoicesReadable="Ignore Sp Cond Colon Before|Add Sp Cond Colon Before|Remove Sp Cond Colon Before|Force Sp Cond Colon Before"
-ValueDefault=ignore
-
-[Sp Cond Colon After]
-Category=1
-Description="<html>Add or remove space after the ':' in 'b ? t : f'.<br/><br/>Overrides sp_cond_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_colon_after=ignore|sp_cond_colon_after=add|sp_cond_colon_after=remove|sp_cond_colon_after=force|sp_cond_colon_after=not_defined
-ChoicesReadable="Ignore Sp Cond Colon After|Add Sp Cond Colon After|Remove Sp Cond Colon After|Force Sp Cond Colon After"
-ValueDefault=ignore
-
-[Sp Cond Question]
-Category=1
-Description="<html>Add or remove space around the '?' in 'b ? t : f'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_question=ignore|sp_cond_question=add|sp_cond_question=remove|sp_cond_question=force|sp_cond_question=not_defined
-ChoicesReadable="Ignore Sp Cond Question|Add Sp Cond Question|Remove Sp Cond Question|Force Sp Cond Question"
-ValueDefault=ignore
-
-[Sp Cond Question Before]
-Category=1
-Description="<html>Add or remove space before the '?' in 'b ? t : f'.<br/><br/>Overrides sp_cond_question.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_question_before=ignore|sp_cond_question_before=add|sp_cond_question_before=remove|sp_cond_question_before=force|sp_cond_question_before=not_defined
-ChoicesReadable="Ignore Sp Cond Question Before|Add Sp Cond Question Before|Remove Sp Cond Question Before|Force Sp Cond Question Before"
-ValueDefault=ignore
-
-[Sp Cond Question After]
-Category=1
-Description="<html>Add or remove space after the '?' in 'b ? t : f'.<br/><br/>Overrides sp_cond_question.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_question_after=ignore|sp_cond_question_after=add|sp_cond_question_after=remove|sp_cond_question_after=force|sp_cond_question_after=not_defined
-ChoicesReadable="Ignore Sp Cond Question After|Add Sp Cond Question After|Remove Sp Cond Question After|Force Sp Cond Question After"
-ValueDefault=ignore
-
-[Sp Cond Ternary Short]
-Category=1
-Description="<html>In the abbreviated ternary form '(a ?: b)', add or remove space between '?'<br/>and ':'.<br/><br/>Overrides all other sp_cond_* options.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cond_ternary_short=ignore|sp_cond_ternary_short=add|sp_cond_ternary_short=remove|sp_cond_ternary_short=force|sp_cond_ternary_short=not_defined
-ChoicesReadable="Ignore Sp Cond Ternary Short|Add Sp Cond Ternary Short|Remove Sp Cond Ternary Short|Force Sp Cond Ternary Short"
-ValueDefault=ignore
-
-[Sp Case Label]
-Category=1
-Description="<html>Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make<br/>sense here.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_case_label=ignore|sp_case_label=add|sp_case_label=remove|sp_case_label=force|sp_case_label=not_defined
-ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label"
-ValueDefault=ignore
-
-[Sp Range]
-Category=1
-Description="<html>(D) Add or remove space around the D '..' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_range=ignore|sp_range=add|sp_range=remove|sp_range=force|sp_range=not_defined
-ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range"
-ValueDefault=ignore
-
-[Sp After For Colon]
-Category=1
-Description="<html>Add or remove space after ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var : &lt;here&gt; expr)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_for_colon=ignore|sp_after_for_colon=add|sp_after_for_colon=remove|sp_after_for_colon=force|sp_after_for_colon=not_defined
-ChoicesReadable="Ignore Sp After For Colon|Add Sp After For Colon|Remove Sp After For Colon|Force Sp After For Colon"
-ValueDefault=ignore
-
-[Sp Before For Colon]
-Category=1
-Description="<html>Add or remove space before ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var &lt;here&gt; : expr)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_for_colon=ignore|sp_before_for_colon=add|sp_before_for_colon=remove|sp_before_for_colon=force|sp_before_for_colon=not_defined
-ChoicesReadable="Ignore Sp Before For Colon|Add Sp Before For Colon|Remove Sp Before For Colon|Force Sp Before For Colon"
-ValueDefault=ignore
-
-[Sp Extern Paren]
-Category=1
-Description="<html>(D) Add or remove space between 'extern' and '(' as in 'extern &lt;here&gt; (C)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_extern_paren=ignore|sp_extern_paren=add|sp_extern_paren=remove|sp_extern_paren=force|sp_extern_paren=not_defined
-ChoicesReadable="Ignore Sp Extern Paren|Add Sp Extern Paren|Remove Sp Extern Paren|Force Sp Extern Paren"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Start]
-Category=1
-Description="<html>Add or remove space after the opening of a C++ comment, as in '// &lt;here&gt; A'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cmt_cpp_start=ignore|sp_cmt_cpp_start=add|sp_cmt_cpp_start=remove|sp_cmt_cpp_start=force|sp_cmt_cpp_start=not_defined
-ChoicesReadable="Ignore Sp Cmt Cpp Start|Add Sp Cmt Cpp Start|Remove Sp Cmt Cpp Start|Force Sp Cmt Cpp Start"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Region]
-Category=1
-Description="<html>Add or remove space in a C++ region marker comment, as in '// &lt;here&gt; BEGIN'.<br/>A region marker is defined as a comment which is not preceded by other text<br/>(i.e. the comment is the first non-whitespace on the line), and which starts<br/>with either 'BEGIN' or 'END'.<br/><br/>Overrides sp_cmt_cpp_start.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cmt_cpp_region=ignore|sp_cmt_cpp_region=add|sp_cmt_cpp_region=remove|sp_cmt_cpp_region=force|sp_cmt_cpp_region=not_defined
-ChoicesReadable="Ignore Sp Cmt Cpp Region|Add Sp Cmt Cpp Region|Remove Sp Cmt Cpp Region|Force Sp Cmt Cpp Region"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Doxygen]
-Category=1
-Description="<html>If true, space added with sp_cmt_cpp_start will be added after Doxygen<br/>sequences like '///', '///&lt;', '//!' and '//!&lt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_cmt_cpp_doxygen=true|sp_cmt_cpp_doxygen=false
-ValueDefault=false
-
-[Sp Cmt Cpp Qttr]
-Category=1
-Description="<html>If true, space added with sp_cmt_cpp_start will be added after Qt translator<br/>or meta-data comments like '//:', '//=', and '//~'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_cmt_cpp_qttr=true|sp_cmt_cpp_qttr=false
-ValueDefault=false
-
-[Sp Endif Cmt]
-Category=1
-Description="<html>Add or remove space between #else or #endif and a trailing comment.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_endif_cmt=ignore|sp_endif_cmt=add|sp_endif_cmt=remove|sp_endif_cmt=force|sp_endif_cmt=not_defined
-ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
-ValueDefault=ignore
-
-[Sp After New]
-Category=1
-Description="<html>Add or remove space after 'new', 'delete' and 'delete[]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_new=ignore|sp_after_new=add|sp_after_new=remove|sp_after_new=force|sp_after_new=not_defined
-ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
-ValueDefault=ignore
-
-[Sp Between New Paren]
-Category=1
-Description="<html>Add or remove space between 'new' and '(' in 'new()'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_between_new_paren=ignore|sp_between_new_paren=add|sp_between_new_paren=remove|sp_between_new_paren=force|sp_between_new_paren=not_defined
-ChoicesReadable="Ignore Sp Between New Paren|Add Sp Between New Paren|Remove Sp Between New Paren|Force Sp Between New Paren"
-ValueDefault=ignore
-
-[Sp After Newop Paren]
-Category=1
-Description="<html>Add or remove space between ')' and type in 'new(foo) BAR'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_newop_paren=ignore|sp_after_newop_paren=add|sp_after_newop_paren=remove|sp_after_newop_paren=force|sp_after_newop_paren=not_defined
-ChoicesReadable="Ignore Sp After Newop Paren|Add Sp After Newop Paren|Remove Sp After Newop Paren|Force Sp After Newop Paren"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren]
-Category=1
-Description="<html>Add or remove space inside parenthesis of the new operator<br/>as in 'new(foo) BAR'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_newop_paren=ignore|sp_inside_newop_paren=add|sp_inside_newop_paren=remove|sp_inside_newop_paren=force|sp_inside_newop_paren=not_defined
-ChoicesReadable="Ignore Sp Inside Newop Paren|Add Sp Inside Newop Paren|Remove Sp Inside Newop Paren|Force Sp Inside Newop Paren"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren Open]
-Category=1
-Description="<html>Add or remove space after the open parenthesis of the new operator,<br/>as in 'new(foo) BAR'.<br/><br/>Overrides sp_inside_newop_paren.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_newop_paren_open=ignore|sp_inside_newop_paren_open=add|sp_inside_newop_paren_open=remove|sp_inside_newop_paren_open=force|sp_inside_newop_paren_open=not_defined
-ChoicesReadable="Ignore Sp Inside Newop Paren Open|Add Sp Inside Newop Paren Open|Remove Sp Inside Newop Paren Open|Force Sp Inside Newop Paren Open"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren Close]
-Category=1
-Description="<html>Add or remove space before the close parenthesis of the new operator,<br/>as in 'new(foo) BAR'.<br/><br/>Overrides sp_inside_newop_paren.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_newop_paren_close=ignore|sp_inside_newop_paren_close=add|sp_inside_newop_paren_close=remove|sp_inside_newop_paren_close=force|sp_inside_newop_paren_close=not_defined
-ChoicesReadable="Ignore Sp Inside Newop Paren Close|Add Sp Inside Newop Paren Close|Remove Sp Inside Newop Paren Close|Force Sp Inside Newop Paren Close"
-ValueDefault=ignore
-
-[Sp Before Tr Emb Cmt]
-Category=1
-Description="<html>Add or remove space before a trailing or embedded comment.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_tr_emb_cmt=ignore|sp_before_tr_emb_cmt=add|sp_before_tr_emb_cmt=remove|sp_before_tr_emb_cmt=force|sp_before_tr_emb_cmt=not_defined
-ChoicesReadable="Ignore Sp Before Tr Emb Cmt|Add Sp Before Tr Emb Cmt|Remove Sp Before Tr Emb Cmt|Force Sp Before Tr Emb Cmt"
-ValueDefault=ignore
-
-[Sp Num Before Tr Emb Cmt]
-Category=1
-Description="<html>Number of spaces before a trailing or embedded comment.</html>"
-Enabled=false
-EditorType=numeric
-CallName="sp_num_before_tr_emb_cmt="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Sp Annotation Paren]
-Category=1
-Description="<html>(Java) Add or remove space between an annotation and the open parenthesis.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_annotation_paren=ignore|sp_annotation_paren=add|sp_annotation_paren=remove|sp_annotation_paren=force|sp_annotation_paren=not_defined
-ChoicesReadable="Ignore Sp Annotation Paren|Add Sp Annotation Paren|Remove Sp Annotation Paren|Force Sp Annotation Paren"
-ValueDefault=ignore
-
-[Sp Skip Vbrace Tokens]
-Category=1
-Description="<html>If true, vbrace tokens are dropped to the previous token and skipped.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_skip_vbrace_tokens=true|sp_skip_vbrace_tokens=false
-ValueDefault=false
-
-[Sp After Noexcept]
-Category=1
-Description="<html>Add or remove space after 'noexcept'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_noexcept=ignore|sp_after_noexcept=add|sp_after_noexcept=remove|sp_after_noexcept=force|sp_after_noexcept=not_defined
-ChoicesReadable="Ignore Sp After Noexcept|Add Sp After Noexcept|Remove Sp After Noexcept|Force Sp After Noexcept"
-ValueDefault=ignore
-
-[Sp Vala After Translation]
-Category=1
-Description="<html>Add or remove space after '_'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_vala_after_translation=ignore|sp_vala_after_translation=add|sp_vala_after_translation=remove|sp_vala_after_translation=force|sp_vala_after_translation=not_defined
-ChoicesReadable="Ignore Sp Vala After Translation|Add Sp Vala After Translation|Remove Sp Vala After Translation|Force Sp Vala After Translation"
-ValueDefault=ignore
-
-[Force Tab After Define]
-Category=1
-Description="<html>If true, a &lt;TAB&gt; is inserted after #define.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=force_tab_after_define=true|force_tab_after_define=false
-ValueDefault=false
-
-[Indent Columns]
-Category=2
-Description="<html>The number of columns to indent per level. Usually 2, 3, 4, or 8.<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_columns="
-MinVal=0
-MaxVal=16
-ValueDefault=8
-
-[Indent Continue]
-Category=2
-Description="<html>The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_continue="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Continue Class Head]
-Category=2
-Description="<html>The continuation indent, only for class header line(s). If non-zero, this<br/>overrides the indent of 'class' continuation indents.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_continue_class_head="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Single Newlines]
-Category=2
-Description="<html>Whether to indent empty lines (i.e. lines which contain only spaces before<br/>the newline character).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_single_newlines=true|indent_single_newlines=false
-ValueDefault=false
-
-[Indent Param]
-Category=2
-Description="<html>The continuation indent for func_*_param if they are true. If non-zero, this<br/>overrides the indent.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_param="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent With Tabs]
-Category=2
-Description="<html>How to use tabs when indenting code.<br/><br/>0: Spaces only<br/>1: Indent with tabs to brace level, align with spaces (default)<br/>2: Indent and align with tabs, using spaces when not on a tabstop<br/><br/>Default: 1</html>"
-Enabled=true
-EditorType=multiple
-Choices="indent_with_tabs=0|indent_with_tabs=1|indent_with_tabs=2"
-ChoicesReadable="Spaces only|Indent with tabs, align with spaces|Indent and align with tabs"
-ValueDefault=1
-
-[Indent Cmt With Tabs]
-Category=2
-Description="<html>Whether to indent comments that are not at a brace level with tabs on a<br/>tabstop. Requires indent_with_tabs=2. If false, will use spaces.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cmt_with_tabs=true|indent_cmt_with_tabs=false
-ValueDefault=false
-
-[Indent Align String]
-Category=2
-Description="<html>Whether to indent strings broken by '\' so that they line up.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_string=true|indent_align_string=false
-ValueDefault=false
-
-[Indent Xml String]
-Category=2
-Description="<html>The number of spaces to indent multi-line XML strings.<br/>Requires indent_align_string=true.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_xml_string="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Brace]
-Category=2
-Description="<html>Spaces to indent '{' from level.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_brace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Braces]
-Category=2
-Description="<html>Whether braces are indented to the body level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces=true|indent_braces=false
-ValueDefault=false
-
-[Indent Braces No Func]
-Category=2
-Description="<html>Whether to disable indenting function braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_func=true|indent_braces_no_func=false
-ValueDefault=false
-
-[Indent Braces No Class]
-Category=2
-Description="<html>Whether to disable indenting class braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_class=true|indent_braces_no_class=false
-ValueDefault=false
-
-[Indent Braces No Struct]
-Category=2
-Description="<html>Whether to disable indenting struct braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_struct=true|indent_braces_no_struct=false
-ValueDefault=false
-
-[Indent Brace Parent]
-Category=2
-Description="<html>Whether to indent based on the size of the brace parent,<br/>i.e. 'if' =&gt; 3 spaces, 'for' =&gt; 4 spaces, etc.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_brace_parent=true|indent_brace_parent=false
-ValueDefault=false
-
-[Indent Paren Open Brace]
-Category=2
-Description="<html>Whether to indent based on the open parenthesis instead of the open brace<br/>in '({\n'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_open_brace=true|indent_paren_open_brace=false
-ValueDefault=false
-
-[Indent Cs Delegate Brace]
-Category=2
-Description="<html>(C#) Whether to indent the brace of a C# delegate by another level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cs_delegate_brace=true|indent_cs_delegate_brace=false
-ValueDefault=false
-
-[Indent Cs Delegate Body]
-Category=2
-Description="<html>(C#) Whether to indent a C# delegate (to handle delegates with no brace) by<br/>another level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cs_delegate_body=true|indent_cs_delegate_body=false
-ValueDefault=false
-
-[Indent Namespace]
-Category=2
-Description="<html>Whether to indent the body of a 'namespace'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_namespace=true|indent_namespace=false
-ValueDefault=false
-
-[Indent Namespace Single Indent]
-Category=2
-Description="<html>Whether to indent only the first namespace, and not any nested namespaces.<br/>Requires indent_namespace=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_namespace_single_indent=true|indent_namespace_single_indent=false
-ValueDefault=false
-
-[Indent Namespace Level]
-Category=2
-Description="<html>The number of spaces to indent a namespace block.<br/>If set to zero, use the value indent_columns</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_namespace_level="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Namespace Limit]
-Category=2
-Description="<html>If the body of the namespace is longer than this number, it won't be<br/>indented. Requires indent_namespace=true. 0 means no limit.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_namespace_limit="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Indent Extern]
-Category=2
-Description="<html>Whether the 'extern "C"' body is indented.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_extern=true|indent_extern=false
-ValueDefault=false
-
-[Indent Class]
-Category=2
-Description="<html>Whether the 'class' body is indented.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class=true|indent_class=false
-ValueDefault=false
-
-[Indent Before Class Colon]
-Category=2
-Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires a newline break before colon (see pos_class_colon<br/>and nl_class_colon)</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_before_class_colon="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Class Colon]
-Category=2
-Description="<html>Whether to indent the stuff after a leading base class colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class_colon=true|indent_class_colon=false
-ValueDefault=false
-
-[Indent Class On Colon]
-Category=2
-Description="<html>Whether to indent based on a class colon instead of the stuff after the<br/>colon. Requires indent_class_colon=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false
-ValueDefault=false
-
-[Indent Constr Colon]
-Category=2
-Description="<html>Whether to indent the stuff after a leading class initializer colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_constr_colon=true|indent_constr_colon=false
-ValueDefault=false
-
-[Indent Ctor Init Leading]
-Category=2
-Description="<html>Virtual indent from the ':' for member initializers.<br/><br/>Default: 2</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ctor_init_leading="
-MinVal=0
-MaxVal=16
-ValueDefault=2
-
-[Indent Ctor Init]
-Category=2
-Description="<html>Additional indent for constructor initializer list.<br/>Negative values decrease indent down to the first column.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ctor_init="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Else If]
-Category=2
-Description="<html>Whether to indent 'if' following 'else' as a new block under the 'else'.<br/>If false, 'else\nif' is treated as 'else if' for indenting purposes.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_else_if=true|indent_else_if=false
-ValueDefault=false
-
-[Indent Var Def Blk]
-Category=2
-Description="<html>Amount to indent variable declarations after a open brace.<br/><br/> &lt;0: Relative<br/>&gt;=0: Absolute</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_var_def_blk="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Var Def Cont]
-Category=2
-Description="<html>Whether to indent continued variable declarations instead of aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_var_def_cont=true|indent_var_def_cont=false
-ValueDefault=false
-
-[Indent Shift]
-Category=2
-Description="<html>Whether to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;') instead of<br/>aligning. Set align_left_shift=false when enabling this.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_shift=true|indent_shift=false
-ValueDefault=false
-
-[Indent Func Def Force Col1]
-Category=2
-Description="<html>Whether to force indentation of function definitions to start in column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_def_force_col1=true|indent_func_def_force_col1=false
-ValueDefault=false
-
-[Indent Func Call Param]
-Category=2
-Description="<html>Whether to indent continued function call parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_call_param=true|indent_func_call_param=false
-ValueDefault=false
-
-[Indent Func Def Param]
-Category=2
-Description="<html>Whether to indent continued function definition parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_def_param=true|indent_func_def_param=false
-ValueDefault=false
-
-[Indent Func Def Param Paren Pos Threshold]
-Category=2
-Description="<html>for function definitions, only if indent_func_def_param is false<br/>Allows to align params when appropriate and indent them when not<br/>behave as if it was true if paren position is more than this value<br/>if paren position is more than the option value</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_def_param_paren_pos_threshold="
-MinVal=0
-MaxVal=160
-ValueDefault=0
-
-[Indent Func Proto Param]
-Category=2
-Description="<html>Whether to indent continued function call prototype one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_proto_param=true|indent_func_proto_param=false
-ValueDefault=false
-
-[Indent Func Class Param]
-Category=2
-Description="<html>Whether to indent continued function call declaration one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_class_param=true|indent_func_class_param=false
-ValueDefault=false
-
-[Indent Func Ctor Var Param]
-Category=2
-Description="<html>Whether to indent continued class variable constructors one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_ctor_var_param=true|indent_func_ctor_var_param=false
-ValueDefault=false
-
-[Indent Template Param]
-Category=2
-Description="<html>Whether to indent continued template parameter list one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_template_param=true|indent_template_param=false
-ValueDefault=false
-
-[Indent Func Param Double]
-Category=2
-Description="<html>Double the indent for indent_func_xxx_param options.<br/>Use both values of the options indent_columns and indent_param.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_param_double=true|indent_func_param_double=false
-ValueDefault=false
-
-[Indent Func Const]
-Category=2
-Description="<html>Indentation column for standalone 'const' qualifier on a function<br/>prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_const="
-MinVal=0
-MaxVal=69
-ValueDefault=0
-
-[Indent Func Throw]
-Category=2
-Description="<html>Indentation column for standalone 'throw' qualifier on a function<br/>prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_throw="
-MinVal=0
-MaxVal=41
-ValueDefault=0
-
-[Indent Macro Brace]
-Category=2
-Description="<html>How to indent within a macro followed by a brace on the same line<br/>This allows reducing the indent in macros that have (for example)<br/>`do { ... } while ` blocks bracketing them.<br/><br/>true:  add an indent for the brace on the same line as the macro<br/>false: do not add an indent for the brace on the same line as the macro<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_macro_brace=true|indent_macro_brace=false
-ValueDefault=true
-
-[Indent Member]
-Category=2
-Description="<html>The number of spaces to indent a continued '-&gt;' or '.'.<br/>Usually set to 0, 1, or indent_columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_member="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Member Single]
-Category=2
-Description="<html>Whether lines broken at '.' or '-&gt;' should be indented by a single indent.<br/>The indent_member option will not be effective if this is set to true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_member_single=true|indent_member_single=false
-ValueDefault=false
-
-[Indent Sing Line Comments]
-Category=2
-Description="<html>Spaces to indent single line ('//') comments on lines before code.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_sing_line_comments="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Sparen Extra]
-Category=2
-Description="<html>When opening a paren for a control statement (if, for, while, etc), increase<br/>the indent level by this value. Negative values decrease the indent level.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_sparen_extra="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Relative Single Line Comments]
-Category=2
-Description="<html>Whether to indent trailing single line ('//') comments relative to the code<br/>instead of trying to keep the same absolute column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_relative_single_line_comments=true|indent_relative_single_line_comments=false
-ValueDefault=false
-
-[Indent Switch Case]
-Category=2
-Description="<html>Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.<br/>It might wise to choose the same value for the option indent_case_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_switch_case="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Case Brace]
-Category=2
-Description="<html>Spaces to indent '{' from 'case'. By default, the brace will appear under<br/>the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.<br/>It might wise to choose the same value for the option indent_switch_case.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_case_brace="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Switch Break With Case]
-Category=2
-Description="<html>indent 'break' with 'case' from 'switch'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_switch_break_with_case=true|indent_switch_break_with_case=false
-ValueDefault=false
-
-[Indent Switch Pp]
-Category=2
-Description="<html>Whether to indent preprocessor statements inside of switch statements.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_switch_pp=true|indent_switch_pp=false
-ValueDefault=true
-
-[Indent Case Shift]
-Category=2
-Description="<html>Spaces to shift the 'case' line, without affecting any other lines.<br/>Usually 0.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_case_shift="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Col1 Comment]
-Category=2
-Description="<html>Whether to indent comments found in first column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_col1_comment=true|indent_col1_comment=false
-ValueDefault=false
-
-[Indent Col1 Multi String Literal]
-Category=2
-Description="<html>Whether to indent multi string literal in first column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_col1_multi_string_literal=true|indent_col1_multi_string_literal=false
-ValueDefault=false
-
-[Indent Label]
-Category=2
-Description="<html>How to indent goto labels.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_label="
-MinVal=-16
-MaxVal=16
-ValueDefault=1
-
-[Indent Access Spec]
-Category=2
-Description="<html>How to indent access specifiers that are followed by a<br/>colon.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_access_spec="
-MinVal=-16
-MaxVal=16
-ValueDefault=1
-
-[Indent Access Spec Body]
-Category=2
-Description="<html>Whether to indent the code after an access specifier by one level.<br/>If true, this option forces 'indent_access_spec=0'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_access_spec_body=true|indent_access_spec_body=false
-ValueDefault=false
-
-[Indent Paren Nl]
-Category=2
-Description="<html>If an open parenthesis is followed by a newline, whether to indent the next<br/>line so that it lines up after the open parenthesis (not recommended).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_nl=true|indent_paren_nl=false
-ValueDefault=false
-
-[Indent Paren Close]
-Category=2
-Description="<html>How to indent a close parenthesis after a newline.<br/><br/>0: Indent to body level (default)<br/>1: Align under the open parenthesis<br/>2: Indent to the brace level</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_paren_close="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Indent Paren After Func Def]
-Category=2
-Description="<html>Whether to indent the open parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_def=true|indent_paren_after_func_def=false
-ValueDefault=false
-
-[Indent Paren After Func Decl]
-Category=2
-Description="<html>Whether to indent the open parenthesis of a function declaration,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_decl=true|indent_paren_after_func_decl=false
-ValueDefault=false
-
-[Indent Paren After Func Call]
-Category=2
-Description="<html>Whether to indent the open parenthesis of a function call,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_call=true|indent_paren_after_func_call=false
-ValueDefault=false
-
-[Indent Comma Brace]
-Category=2
-Description="<html>Whether to indent a comma when inside a brace.<br/>If true, aligns under the open brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_comma_brace=true|indent_comma_brace=false
-ValueDefault=false
-
-[Indent Comma Paren]
-Category=2
-Description="<html>Whether to indent a comma when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_comma_paren=true|indent_comma_paren=false
-ValueDefault=false
-
-[Indent Bool Paren]
-Category=2
-Description="<html>Whether to indent a Boolean operator when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_bool_paren=true|indent_bool_paren=false
-ValueDefault=false
-
-[Indent Semicolon For Paren]
-Category=2
-Description="<html>Whether to indent a semicolon when inside a for parenthesis.<br/>If true, aligns under the open for parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_semicolon_for_paren=true|indent_semicolon_for_paren=false
-ValueDefault=false
-
-[Indent First Bool Expr]
-Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
-ValueDefault=false
-
-[Indent First For Expr]
-Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_semicolon_for_paren=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_first_for_expr=true|indent_first_for_expr=false
-ValueDefault=false
-
-[Indent Square Nl]
-Category=2
-Description="<html>If an open square is followed by a newline, whether to indent the next line<br/>so that it lines up after the open square (not recommended).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_square_nl=true|indent_square_nl=false
-ValueDefault=false
-
-[Indent Preserve Sql]
-Category=2
-Description="<html>(ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false
-ValueDefault=false
-
-[Indent Align Assign]
-Category=2
-Description="<html>Whether to align continued statements at the '='. If false or if the '=' is<br/>followed by a newline, the next line is indent one tab.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_assign=true|indent_align_assign=false
-ValueDefault=true
-
-[Indent Off After Assign]
-Category=2
-Description="<html>If true, the indentation of the chunks after a '=' sequence will be set at<br/>LHS token indentation column before '='.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_assign=true|indent_off_after_assign=false
-ValueDefault=false
-
-[Indent Align Paren]
-Category=2
-Description="<html>Whether to align continued statements at the '('. If false or the '(' is<br/>followed by a newline, the next line indent is one tab.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_paren=true|indent_align_paren=false
-ValueDefault=true
-
-[Indent Oc Inside Msg Sel]
-Category=2
-Description="<html>(OC) Whether to indent Objective-C code inside message selectors.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_inside_msg_sel=true|indent_oc_inside_msg_sel=false
-ValueDefault=false
-
-[Indent Oc Block]
-Category=2
-Description="<html>(OC) Whether to indent Objective-C blocks at brace level instead of usual<br/>rules.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block=true|indent_oc_block=false
-ValueDefault=false
-
-[Indent Oc Block Msg]
-Category=2
-Description="<html>(OC) Indent for Objective-C blocks in a message relative to the parameter<br/>name.<br/><br/>=0: Use indent_oc_block rules<br/>&gt;0: Use specified number of spaces to indent</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_oc_block_msg="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Oc Msg Colon]
-Category=2
-Description="<html>(OC) Minimum indent for subsequent parameters</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_oc_msg_colon="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Indent Oc Msg Prioritize First Colon]
-Category=2
-Description="<html>(OC) Whether to prioritize aligning with initial colon (and stripping spaces<br/>from lines, if necessary).<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_msg_prioritize_first_colon=true|indent_oc_msg_prioritize_first_colon=false
-ValueDefault=true
-
-[Indent Oc Block Msg Xcode Style]
-Category=2
-Description="<html>(OC) Whether to indent blocks the way that Xcode does by default<br/>(from the keyword if the parameter is on its own line; otherwise, from the<br/>previous indentation level). Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_xcode_style=true|indent_oc_block_msg_xcode_style=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Keyword]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace is, relative to a<br/>message keyword. Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_keyword=true|indent_oc_block_msg_from_keyword=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Colon]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace is, relative to a message<br/>colon. Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_colon=true|indent_oc_block_msg_from_colon=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Caret]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the block caret is.<br/>Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_caret=true|indent_oc_block_msg_from_caret=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Brace]
-Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace caret is.<br/>Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_brace=true|indent_oc_block_msg_from_brace=false
-ValueDefault=false
-
-[Indent Min Vbrace Open]
-Category=2
-Description="<html>When indenting after virtual brace open and newline add further spaces to<br/>reach this minimum indent.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_min_vbrace_open="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Vbrace Open On Tabstop]
-Category=2
-Description="<html>Whether to add further spaces after regular indent to reach next tabstop<br/>when indenting after virtual brace open and newline.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_vbrace_open_on_tabstop=true|indent_vbrace_open_on_tabstop=false
-ValueDefault=false
-
-[Indent Token After Brace]
-Category=2
-Description="<html>How to indent after a brace followed by another token (not a newline).<br/>true:  indent all contained lines to match the token<br/>false: indent all contained lines to match the brace<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_token_after_brace=true|indent_token_after_brace=false
-ValueDefault=true
-
-[Indent Cpp Lambda Body]
-Category=2
-Description="<html>Whether to indent the body of a C++11 lambda.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cpp_lambda_body=true|indent_cpp_lambda_body=false
-ValueDefault=false
-
-[Indent Compound Literal Return]
-Category=2
-Description="<html>How to indent compound literals that are being returned.<br/>true: add both the indent from return &amp; the compound literal open brace<br/>      (i.e. 2 indent levels)<br/>false: only indent 1 level, don't add the indent for the open brace, only<br/>       add the indent for the return.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_compound_literal_return=true|indent_compound_literal_return=false
-ValueDefault=true
-
-[Indent Using Block]
-Category=2
-Description="<html>(C#) Whether to indent a 'using' block if no braces are used.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_using_block=true|indent_using_block=false
-ValueDefault=true
-
-[Indent Ternary Operator]
-Category=2
-Description="<html>How to indent the continuation of ternary operator.<br/><br/>0: Off (default)<br/>1: When the `if_false` is a continuation, indent it under `if_false`<br/>2: When the `:` is a continuation, indent it under `?`</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ternary_operator="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Indent Inside Ternary Operator]
-Category=2
-Description="<html>Whether to indent the statements inside ternary operator.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_inside_ternary_operator=true|indent_inside_ternary_operator=false
-ValueDefault=false
-
-[Indent Off After Return]
-Category=2
-Description="<html>If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_return=true|indent_off_after_return=false
-ValueDefault=false
-
-[Indent Off After Return New]
-Category=2
-Description="<html>If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_return_new=true|indent_off_after_return_new=false
-ValueDefault=false
-
-[Indent Single After Return]
-Category=2
-Description="<html>If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_single_after_return=true|indent_single_after_return=false
-ValueDefault=false
-
-[Indent Ignore Asm Block]
-Category=2
-Description="<html>Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they<br/>have their own indentation).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_ignore_asm_block=true|indent_ignore_asm_block=false
-ValueDefault=false
-
-[Donot Indent Func Def Close Paren]
-Category=2
-Description="<html>Don't indent the close parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=donot_indent_func_def_close_paren=true|donot_indent_func_def_close_paren=false
-ValueDefault=false
-
-[Nl Collapse Empty Body]
-Category=3
-Description="<html>Whether to collapse empty blocks between '{' and '}'.<br/>If true, overrides nl_inside_empty_func</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false
-ValueDefault=false
-
-[Nl Assign Leave One Liners]
-Category=3
-Description="<html>Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_assign_leave_one_liners=true|nl_assign_leave_one_liners=false
-ValueDefault=false
-
-[Nl Class Leave One Liners]
-Category=3
-Description="<html>Don't split one-line braced statements inside a 'class xx { }' body.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_class_leave_one_liners=true|nl_class_leave_one_liners=false
-ValueDefault=false
-
-[Nl Enum Leave One Liners]
-Category=3
-Description="<html>Don't split one-line enums, as in 'enum foo { BAR = 15 };'</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_enum_leave_one_liners=true|nl_enum_leave_one_liners=false
-ValueDefault=false
-
-[Nl Getset Leave One Liners]
-Category=3
-Description="<html>Don't split one-line get or set functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_getset_leave_one_liners=true|nl_getset_leave_one_liners=false
-ValueDefault=false
-
-[Nl Cs Property Leave One Liners]
-Category=3
-Description="<html>(C#) Don't split one-line property get or set functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_cs_property_leave_one_liners=true|nl_cs_property_leave_one_liners=false
-ValueDefault=false
-
-[Nl Func Leave One Liners]
-Category=3
-Description="<html>Don't split one-line function definitions, as in 'int foo() { return 0; }'.<br/>might modify nl_func_type_name</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_leave_one_liners=true|nl_func_leave_one_liners=false
-ValueDefault=false
-
-[Nl Cpp Lambda Leave One Liners]
-Category=3
-Description="<html>Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_cpp_lambda_leave_one_liners=true|nl_cpp_lambda_leave_one_liners=false
-ValueDefault=false
-
-[Nl If Leave One Liners]
-Category=3
-Description="<html>Don't split one-line if/else statements, as in 'if(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_if_leave_one_liners=true|nl_if_leave_one_liners=false
-ValueDefault=false
-
-[Nl While Leave One Liners]
-Category=3
-Description="<html>Don't split one-line while statements, as in 'while(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_while_leave_one_liners=true|nl_while_leave_one_liners=false
-ValueDefault=false
-
-[Nl Do Leave One Liners]
-Category=3
-Description="<html>Don't split one-line do statements, as in 'do { b++; } while(...);'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_do_leave_one_liners=true|nl_do_leave_one_liners=false
-ValueDefault=false
-
-[Nl For Leave One Liners]
-Category=3
-Description="<html>Don't split one-line for statements, as in 'for(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_for_leave_one_liners=true|nl_for_leave_one_liners=false
-ValueDefault=false
-
-[Nl Oc Msg Leave One Liner]
-Category=3
-Description="<html>(OC) Don't split one-line Objective-C messages.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_oc_msg_leave_one_liner=true|nl_oc_msg_leave_one_liner=false
-ValueDefault=false
-
-[Nl Oc Mdef Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between method declaration and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_mdef_brace=ignore|nl_oc_mdef_brace=add|nl_oc_mdef_brace=remove|nl_oc_mdef_brace=force|nl_oc_mdef_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Mdef Brace|Add Nl Oc Mdef Brace|Remove Nl Oc Mdef Brace|Force Nl Oc Mdef Brace"
-ValueDefault=ignore
-
-[Nl Oc Block Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between Objective-C block signature and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_block_brace=ignore|nl_oc_block_brace=add|nl_oc_block_brace=remove|nl_oc_block_brace=force|nl_oc_block_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Block Brace|Add Nl Oc Block Brace|Remove Nl Oc Block Brace|Force Nl Oc Block Brace"
-ValueDefault=ignore
-
-[Nl Oc Before Interface]
-Category=3
-Description="<html>(OC) Add or remove blank line before '@interface' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_interface=ignore|nl_oc_before_interface=add|nl_oc_before_interface=remove|nl_oc_before_interface=force|nl_oc_before_interface=not_defined
-ChoicesReadable="Ignore Nl Oc Before Interface|Add Nl Oc Before Interface|Remove Nl Oc Before Interface|Force Nl Oc Before Interface"
-ValueDefault=ignore
-
-[Nl Oc Before Implementation]
-Category=3
-Description="<html>(OC) Add or remove blank line before '@implementation' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_implementation=ignore|nl_oc_before_implementation=add|nl_oc_before_implementation=remove|nl_oc_before_implementation=force|nl_oc_before_implementation=not_defined
-ChoicesReadable="Ignore Nl Oc Before Implementation|Add Nl Oc Before Implementation|Remove Nl Oc Before Implementation|Force Nl Oc Before Implementation"
-ValueDefault=ignore
-
-[Nl Oc Before End]
-Category=3
-Description="<html>(OC) Add or remove blank line before '@end' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_end=ignore|nl_oc_before_end=add|nl_oc_before_end=remove|nl_oc_before_end=force|nl_oc_before_end=not_defined
-ChoicesReadable="Ignore Nl Oc Before End|Add Nl Oc Before End|Remove Nl Oc Before End|Force Nl Oc Before End"
-ValueDefault=ignore
-
-[Nl Oc Interface Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between '@interface' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_interface_brace=ignore|nl_oc_interface_brace=add|nl_oc_interface_brace=remove|nl_oc_interface_brace=force|nl_oc_interface_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Interface Brace|Add Nl Oc Interface Brace|Remove Nl Oc Interface Brace|Force Nl Oc Interface Brace"
-ValueDefault=ignore
-
-[Nl Oc Implementation Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between '@implementation' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_implementation_brace=ignore|nl_oc_implementation_brace=add|nl_oc_implementation_brace=remove|nl_oc_implementation_brace=force|nl_oc_implementation_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Implementation Brace|Add Nl Oc Implementation Brace|Remove Nl Oc Implementation Brace|Force Nl Oc Implementation Brace"
-ValueDefault=ignore
-
-[Nl Start Of File]
-Category=3
-Description="<html>Add or remove newlines at the start of the file.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_start_of_file=ignore|nl_start_of_file=add|nl_start_of_file=remove|nl_start_of_file=force|nl_start_of_file=not_defined
-ChoicesReadable="Ignore Nl Start Of File|Add Nl Start Of File|Remove Nl Start Of File|Force Nl Start Of File"
-ValueDefault=ignore
-
-[Nl Start Of File Min]
-Category=3
-Description="<html>The minimum number of newlines at the start of the file (only used if<br/>nl_start_of_file is 'add' or 'force').</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_start_of_file_min="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl End Of File]
-Category=3
-Description="<html>Add or remove newline at the end of the file.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_end_of_file=ignore|nl_end_of_file=add|nl_end_of_file=remove|nl_end_of_file=force|nl_end_of_file=not_defined
-ChoicesReadable="Ignore Nl End Of File|Add Nl End Of File|Remove Nl End Of File|Force Nl End Of File"
-ValueDefault=ignore
-
-[Nl End Of File Min]
-Category=3
-Description="<html>The minimum number of newlines at the end of the file (only used if<br/>nl_end_of_file is 'add' or 'force').</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_end_of_file_min="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Assign Brace]
-Category=3
-Description="<html>Add or remove newline between '=' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_assign_brace=ignore|nl_assign_brace=add|nl_assign_brace=remove|nl_assign_brace=force|nl_assign_brace=not_defined
-ChoicesReadable="Ignore Nl Assign Brace|Add Nl Assign Brace|Remove Nl Assign Brace|Force Nl Assign Brace"
-ValueDefault=ignore
-
-[Nl Assign Square]
-Category=3
-Description="<html>(D) Add or remove newline between '=' and '['.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force|nl_assign_square=not_defined
-ChoicesReadable="Ignore Nl Assign Square|Add Nl Assign Square|Remove Nl Assign Square|Force Nl Assign Square"
-ValueDefault=ignore
-
-[Nl Tsquare Brace]
-Category=3
-Description="<html>Add or remove newline between '[]' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_tsquare_brace=ignore|nl_tsquare_brace=add|nl_tsquare_brace=remove|nl_tsquare_brace=force|nl_tsquare_brace=not_defined
-ChoicesReadable="Ignore Nl Tsquare Brace|Add Nl Tsquare Brace|Remove Nl Tsquare Brace|Force Nl Tsquare Brace"
-ValueDefault=ignore
-
-[Nl After Square Assign]
-Category=3
-Description="<html>(D) Add or remove newline after '= ['. Will also affect the newline before<br/>the ']'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_square_assign=ignore|nl_after_square_assign=add|nl_after_square_assign=remove|nl_after_square_assign=force|nl_after_square_assign=not_defined
-ChoicesReadable="Ignore Nl After Square Assign|Add Nl After Square Assign|Remove Nl After Square Assign|Force Nl After Square Assign"
-ValueDefault=ignore
-
-[Nl Fcall Brace]
-Category=3
-Description="<html>Add or remove newline between a function call's ')' and '{', as in<br/>'list_for_each(item, &amp;list) { }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_fcall_brace=ignore|nl_fcall_brace=add|nl_fcall_brace=remove|nl_fcall_brace=force|nl_fcall_brace=not_defined
-ChoicesReadable="Ignore Nl Fcall Brace|Add Nl Fcall Brace|Remove Nl Fcall Brace|Force Nl Fcall Brace"
-ValueDefault=ignore
-
-[Nl Enum Brace]
-Category=3
-Description="<html>Add or remove newline between 'enum' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_brace=ignore|nl_enum_brace=add|nl_enum_brace=remove|nl_enum_brace=force|nl_enum_brace=not_defined
-ChoicesReadable="Ignore Nl Enum Brace|Add Nl Enum Brace|Remove Nl Enum Brace|Force Nl Enum Brace"
-ValueDefault=ignore
-
-[Nl Enum Class]
-Category=3
-Description="<html>Add or remove newline between 'enum' and 'class'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_class=ignore|nl_enum_class=add|nl_enum_class=remove|nl_enum_class=force|nl_enum_class=not_defined
-ChoicesReadable="Ignore Nl Enum Class|Add Nl Enum Class|Remove Nl Enum Class|Force Nl Enum Class"
-ValueDefault=ignore
-
-[Nl Enum Class Identifier]
-Category=3
-Description="<html>Add or remove newline between 'enum class' and the identifier.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_class_identifier=ignore|nl_enum_class_identifier=add|nl_enum_class_identifier=remove|nl_enum_class_identifier=force|nl_enum_class_identifier=not_defined
-ChoicesReadable="Ignore Nl Enum Class Identifier|Add Nl Enum Class Identifier|Remove Nl Enum Class Identifier|Force Nl Enum Class Identifier"
-ValueDefault=ignore
-
-[Nl Enum Identifier Colon]
-Category=3
-Description="<html>Add or remove newline between 'enum class' type and ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_identifier_colon=ignore|nl_enum_identifier_colon=add|nl_enum_identifier_colon=remove|nl_enum_identifier_colon=force|nl_enum_identifier_colon=not_defined
-ChoicesReadable="Ignore Nl Enum Identifier Colon|Add Nl Enum Identifier Colon|Remove Nl Enum Identifier Colon|Force Nl Enum Identifier Colon"
-ValueDefault=ignore
-
-[Nl Enum Colon Type]
-Category=3
-Description="<html>Add or remove newline between 'enum class identifier :' and type.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_colon_type=ignore|nl_enum_colon_type=add|nl_enum_colon_type=remove|nl_enum_colon_type=force|nl_enum_colon_type=not_defined
-ChoicesReadable="Ignore Nl Enum Colon Type|Add Nl Enum Colon Type|Remove Nl Enum Colon Type|Force Nl Enum Colon Type"
-ValueDefault=ignore
-
-[Nl Struct Brace]
-Category=3
-Description="<html>Add or remove newline between 'struct and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_struct_brace=ignore|nl_struct_brace=add|nl_struct_brace=remove|nl_struct_brace=force|nl_struct_brace=not_defined
-ChoicesReadable="Ignore Nl Struct Brace|Add Nl Struct Brace|Remove Nl Struct Brace|Force Nl Struct Brace"
-ValueDefault=ignore
-
-[Nl Union Brace]
-Category=3
-Description="<html>Add or remove newline between 'union' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_union_brace=ignore|nl_union_brace=add|nl_union_brace=remove|nl_union_brace=force|nl_union_brace=not_defined
-ChoicesReadable="Ignore Nl Union Brace|Add Nl Union Brace|Remove Nl Union Brace|Force Nl Union Brace"
-ValueDefault=ignore
-
-[Nl If Brace]
-Category=3
-Description="<html>Add or remove newline between 'if' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_if_brace=ignore|nl_if_brace=add|nl_if_brace=remove|nl_if_brace=force|nl_if_brace=not_defined
-ChoicesReadable="Ignore Nl If Brace|Add Nl If Brace|Remove Nl If Brace|Force Nl If Brace"
-ValueDefault=ignore
-
-[Nl Brace Else]
-Category=3
-Description="<html>Add or remove newline between '}' and 'else'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_else=ignore|nl_brace_else=add|nl_brace_else=remove|nl_brace_else=force|nl_brace_else=not_defined
-ChoicesReadable="Ignore Nl Brace Else|Add Nl Brace Else|Remove Nl Brace Else|Force Nl Brace Else"
-ValueDefault=ignore
-
-[Nl Elseif Brace]
-Category=3
-Description="<html>Add or remove newline between 'else if' and '{'. If set to ignore,<br/>nl_if_brace is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_elseif_brace=ignore|nl_elseif_brace=add|nl_elseif_brace=remove|nl_elseif_brace=force|nl_elseif_brace=not_defined
-ChoicesReadable="Ignore Nl Elseif Brace|Add Nl Elseif Brace|Remove Nl Elseif Brace|Force Nl Elseif Brace"
-ValueDefault=ignore
-
-[Nl Else Brace]
-Category=3
-Description="<html>Add or remove newline between 'else' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_else_brace=ignore|nl_else_brace=add|nl_else_brace=remove|nl_else_brace=force|nl_else_brace=not_defined
-ChoicesReadable="Ignore Nl Else Brace|Add Nl Else Brace|Remove Nl Else Brace|Force Nl Else Brace"
-ValueDefault=ignore
-
-[Nl Else If]
-Category=3
-Description="<html>Add or remove newline between 'else' and 'if'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_else_if=ignore|nl_else_if=add|nl_else_if=remove|nl_else_if=force|nl_else_if=not_defined
-ChoicesReadable="Ignore Nl Else If|Add Nl Else If|Remove Nl Else If|Force Nl Else If"
-ValueDefault=ignore
-
-[Nl Before Opening Brace Func Class Def]
-Category=3
-Description="<html>Add or remove newline before '{' opening brace</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_opening_brace_func_class_def=ignore|nl_before_opening_brace_func_class_def=add|nl_before_opening_brace_func_class_def=remove|nl_before_opening_brace_func_class_def=force|nl_before_opening_brace_func_class_def=not_defined
-ChoicesReadable="Ignore Nl Before Opening Brace Func Class Def|Add Nl Before Opening Brace Func Class Def|Remove Nl Before Opening Brace Func Class Def|Force Nl Before Opening Brace Func Class Def"
-ValueDefault=ignore
-
-[Nl Before If Closing Paren]
-Category=3
-Description="<html>Add or remove newline before 'if'/'else if' closing parenthesis.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_if_closing_paren=ignore|nl_before_if_closing_paren=add|nl_before_if_closing_paren=remove|nl_before_if_closing_paren=force|nl_before_if_closing_paren=not_defined
-ChoicesReadable="Ignore Nl Before If Closing Paren|Add Nl Before If Closing Paren|Remove Nl Before If Closing Paren|Force Nl Before If Closing Paren"
-ValueDefault=ignore
-
-[Nl Brace Finally]
-Category=3
-Description="<html>Add or remove newline between '}' and 'finally'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_finally=ignore|nl_brace_finally=add|nl_brace_finally=remove|nl_brace_finally=force|nl_brace_finally=not_defined
-ChoicesReadable="Ignore Nl Brace Finally|Add Nl Brace Finally|Remove Nl Brace Finally|Force Nl Brace Finally"
-ValueDefault=ignore
-
-[Nl Finally Brace]
-Category=3
-Description="<html>Add or remove newline between 'finally' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_finally_brace=ignore|nl_finally_brace=add|nl_finally_brace=remove|nl_finally_brace=force|nl_finally_brace=not_defined
-ChoicesReadable="Ignore Nl Finally Brace|Add Nl Finally Brace|Remove Nl Finally Brace|Force Nl Finally Brace"
-ValueDefault=ignore
-
-[Nl Try Brace]
-Category=3
-Description="<html>Add or remove newline between 'try' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_try_brace=ignore|nl_try_brace=add|nl_try_brace=remove|nl_try_brace=force|nl_try_brace=not_defined
-ChoicesReadable="Ignore Nl Try Brace|Add Nl Try Brace|Remove Nl Try Brace|Force Nl Try Brace"
-ValueDefault=ignore
-
-[Nl Getset Brace]
-Category=3
-Description="<html>Add or remove newline between get/set and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_getset_brace=ignore|nl_getset_brace=add|nl_getset_brace=remove|nl_getset_brace=force|nl_getset_brace=not_defined
-ChoicesReadable="Ignore Nl Getset Brace|Add Nl Getset Brace|Remove Nl Getset Brace|Force Nl Getset Brace"
-ValueDefault=ignore
-
-[Nl For Brace]
-Category=3
-Description="<html>Add or remove newline between 'for' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_for_brace=ignore|nl_for_brace=add|nl_for_brace=remove|nl_for_brace=force|nl_for_brace=not_defined
-ChoicesReadable="Ignore Nl For Brace|Add Nl For Brace|Remove Nl For Brace|Force Nl For Brace"
-ValueDefault=ignore
-
-[Nl Catch Brace]
-Category=3
-Description="<html>Add or remove newline before the '{' of a 'catch' statement, as in<br/>'catch (decl) &lt;here&gt; {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force|nl_catch_brace=not_defined
-ChoicesReadable="Ignore Nl Catch Brace|Add Nl Catch Brace|Remove Nl Catch Brace|Force Nl Catch Brace"
-ValueDefault=ignore
-
-[Nl Oc Catch Brace]
-Category=3
-Description="<html>(OC) Add or remove newline before the '{' of a '@catch' statement, as in<br/>'@catch (decl) &lt;here&gt; {'. If set to ignore, nl_catch_brace is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_catch_brace=ignore|nl_oc_catch_brace=add|nl_oc_catch_brace=remove|nl_oc_catch_brace=force|nl_oc_catch_brace=not_defined
-ChoicesReadable="Ignore Nl Oc Catch Brace|Add Nl Oc Catch Brace|Remove Nl Oc Catch Brace|Force Nl Oc Catch Brace"
-ValueDefault=ignore
-
-[Nl Brace Catch]
-Category=3
-Description="<html>Add or remove newline between '}' and 'catch'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_catch=ignore|nl_brace_catch=add|nl_brace_catch=remove|nl_brace_catch=force|nl_brace_catch=not_defined
-ChoicesReadable="Ignore Nl Brace Catch|Add Nl Brace Catch|Remove Nl Brace Catch|Force Nl Brace Catch"
-ValueDefault=ignore
-
-[Nl Oc Brace Catch]
-Category=3
-Description="<html>(OC) Add or remove newline between '}' and '@catch'. If set to ignore,<br/>nl_brace_catch is used.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_brace_catch=ignore|nl_oc_brace_catch=add|nl_oc_brace_catch=remove|nl_oc_brace_catch=force|nl_oc_brace_catch=not_defined
-ChoicesReadable="Ignore Nl Oc Brace Catch|Add Nl Oc Brace Catch|Remove Nl Oc Brace Catch|Force Nl Oc Brace Catch"
-ValueDefault=ignore
-
-[Nl Brace Square]
-Category=3
-Description="<html>Add or remove newline between '}' and ']'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_square=ignore|nl_brace_square=add|nl_brace_square=remove|nl_brace_square=force|nl_brace_square=not_defined
-ChoicesReadable="Ignore Nl Brace Square|Add Nl Brace Square|Remove Nl Brace Square|Force Nl Brace Square"
-ValueDefault=ignore
-
-[Nl Brace Fparen]
-Category=3
-Description="<html>Add or remove newline between '}' and ')' in a function invocation.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_fparen=ignore|nl_brace_fparen=add|nl_brace_fparen=remove|nl_brace_fparen=force|nl_brace_fparen=not_defined
-ChoicesReadable="Ignore Nl Brace Fparen|Add Nl Brace Fparen|Remove Nl Brace Fparen|Force Nl Brace Fparen"
-ValueDefault=ignore
-
-[Nl While Brace]
-Category=3
-Description="<html>Add or remove newline between 'while' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_while_brace=ignore|nl_while_brace=add|nl_while_brace=remove|nl_while_brace=force|nl_while_brace=not_defined
-ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
-ValueDefault=ignore
-
-[Nl Scope Brace]
-Category=3
-Description="<html>(D) Add or remove newline between 'scope (x)' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_scope_brace=ignore|nl_scope_brace=add|nl_scope_brace=remove|nl_scope_brace=force|nl_scope_brace=not_defined
-ChoicesReadable="Ignore Nl Scope Brace|Add Nl Scope Brace|Remove Nl Scope Brace|Force Nl Scope Brace"
-ValueDefault=ignore
-
-[Nl Unittest Brace]
-Category=3
-Description="<html>(D) Add or remove newline between 'unittest' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_unittest_brace=ignore|nl_unittest_brace=add|nl_unittest_brace=remove|nl_unittest_brace=force|nl_unittest_brace=not_defined
-ChoicesReadable="Ignore Nl Unittest Brace|Add Nl Unittest Brace|Remove Nl Unittest Brace|Force Nl Unittest Brace"
-ValueDefault=ignore
-
-[Nl Version Brace]
-Category=3
-Description="<html>(D) Add or remove newline between 'version (x)' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_version_brace=ignore|nl_version_brace=add|nl_version_brace=remove|nl_version_brace=force|nl_version_brace=not_defined
-ChoicesReadable="Ignore Nl Version Brace|Add Nl Version Brace|Remove Nl Version Brace|Force Nl Version Brace"
-ValueDefault=ignore
-
-[Nl Using Brace]
-Category=3
-Description="<html>(C#) Add or remove newline between 'using' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_using_brace=ignore|nl_using_brace=add|nl_using_brace=remove|nl_using_brace=force|nl_using_brace=not_defined
-ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
-ValueDefault=ignore
-
-[Nl Brace Brace]
-Category=3
-Description="<html>Add or remove newline between two open or close braces. Due to general<br/>newline/brace handling, REMOVE may not work.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_brace=ignore|nl_brace_brace=add|nl_brace_brace=remove|nl_brace_brace=force|nl_brace_brace=not_defined
-ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
-ValueDefault=ignore
-
-[Nl Do Brace]
-Category=3
-Description="<html>Add or remove newline between 'do' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_do_brace=ignore|nl_do_brace=add|nl_do_brace=remove|nl_do_brace=force|nl_do_brace=not_defined
-ChoicesReadable="Ignore Nl Do Brace|Add Nl Do Brace|Remove Nl Do Brace|Force Nl Do Brace"
-ValueDefault=ignore
-
-[Nl Brace While]
-Category=3
-Description="<html>Add or remove newline between '}' and 'while' of 'do' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_while=ignore|nl_brace_while=add|nl_brace_while=remove|nl_brace_while=force|nl_brace_while=not_defined
-ChoicesReadable="Ignore Nl Brace While|Add Nl Brace While|Remove Nl Brace While|Force Nl Brace While"
-ValueDefault=ignore
-
-[Nl Switch Brace]
-Category=3
-Description="<html>Add or remove newline between 'switch' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_switch_brace=ignore|nl_switch_brace=add|nl_switch_brace=remove|nl_switch_brace=force|nl_switch_brace=not_defined
-ChoicesReadable="Ignore Nl Switch Brace|Add Nl Switch Brace|Remove Nl Switch Brace|Force Nl Switch Brace"
-ValueDefault=ignore
-
-[Nl Synchronized Brace]
-Category=3
-Description="<html>Add or remove newline between 'synchronized' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_synchronized_brace=ignore|nl_synchronized_brace=add|nl_synchronized_brace=remove|nl_synchronized_brace=force|nl_synchronized_brace=not_defined
-ChoicesReadable="Ignore Nl Synchronized Brace|Add Nl Synchronized Brace|Remove Nl Synchronized Brace|Force Nl Synchronized Brace"
-ValueDefault=ignore
-
-[Nl Multi Line Cond]
-Category=3
-Description="<html>Add a newline between ')' and '{' if the ')' is on a different line than the<br/>if/for/etc.<br/><br/>Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and<br/>nl_catch_brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_multi_line_cond=true|nl_multi_line_cond=false
-ValueDefault=false
-
-[Nl Multi Line Sparen Open]
-Category=3
-Description="<html>Add a newline after '(' if an if/for/while/switch condition spans multiple<br/>lines</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_multi_line_sparen_open=ignore|nl_multi_line_sparen_open=add|nl_multi_line_sparen_open=remove|nl_multi_line_sparen_open=force|nl_multi_line_sparen_open=not_defined
-ChoicesReadable="Ignore Nl Multi Line Sparen Open|Add Nl Multi Line Sparen Open|Remove Nl Multi Line Sparen Open|Force Nl Multi Line Sparen Open"
-ValueDefault=ignore
-
-[Nl Multi Line Sparen Close]
-Category=3
-Description="<html>Add a newline before ')' if an if/for/while/switch condition spans multiple<br/>lines. Overrides nl_before_if_closing_paren if both are specified.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_multi_line_sparen_close=ignore|nl_multi_line_sparen_close=add|nl_multi_line_sparen_close=remove|nl_multi_line_sparen_close=force|nl_multi_line_sparen_close=not_defined
-ChoicesReadable="Ignore Nl Multi Line Sparen Close|Add Nl Multi Line Sparen Close|Remove Nl Multi Line Sparen Close|Force Nl Multi Line Sparen Close"
-ValueDefault=ignore
-
-[Nl Multi Line Define]
-Category=3
-Description="<html>Force a newline in a define after the macro name for multi-line defines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_multi_line_define=true|nl_multi_line_define=false
-ValueDefault=false
-
-[Nl Before Case]
-Category=3
-Description="<html>Whether to add a newline before 'case', and a blank line before a 'case'<br/>statement that follows a ';' or '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_case=true|nl_before_case=false
-ValueDefault=false
-
-[Nl After Case]
-Category=3
-Description="<html>Whether to add a newline after a 'case' statement.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_case=true|nl_after_case=false
-ValueDefault=false
-
-[Nl Case Colon Brace]
-Category=3
-Description="<html>Add or remove newline between a case ':' and '{'.<br/><br/>Overrides nl_after_case.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_case_colon_brace=ignore|nl_case_colon_brace=add|nl_case_colon_brace=remove|nl_case_colon_brace=force|nl_case_colon_brace=not_defined
-ChoicesReadable="Ignore Nl Case Colon Brace|Add Nl Case Colon Brace|Remove Nl Case Colon Brace|Force Nl Case Colon Brace"
-ValueDefault=ignore
-
-[Nl Before Throw]
-Category=3
-Description="<html>Add or remove newline between ')' and 'throw'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_throw=ignore|nl_before_throw=add|nl_before_throw=remove|nl_before_throw=force|nl_before_throw=not_defined
-ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
-ValueDefault=ignore
-
-[Nl Namespace Brace]
-Category=3
-Description="<html>Add or remove newline between 'namespace' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_namespace_brace=ignore|nl_namespace_brace=add|nl_namespace_brace=remove|nl_namespace_brace=force|nl_namespace_brace=not_defined
-ChoicesReadable="Ignore Nl Namespace Brace|Add Nl Namespace Brace|Remove Nl Namespace Brace|Force Nl Namespace Brace"
-ValueDefault=ignore
-
-[Nl Template Class]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class=ignore|nl_template_class=add|nl_template_class=remove|nl_template_class=force|nl_template_class=not_defined
-ChoicesReadable="Ignore Nl Template Class|Add Nl Template Class|Remove Nl Template Class|Force Nl Template Class"
-ValueDefault=ignore
-
-[Nl Template Class Decl]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class declaration.<br/><br/>Overrides nl_template_class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_decl=ignore|nl_template_class_decl=add|nl_template_class_decl=remove|nl_template_class_decl=force|nl_template_class_decl=not_defined
-ChoicesReadable="Ignore Nl Template Class Decl|Add Nl Template Class Decl|Remove Nl Template Class Decl|Force Nl Template Class Decl"
-ValueDefault=ignore
-
-[Nl Template Class Decl Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class declaration.<br/><br/>Overrides nl_template_class_decl.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_decl_special=ignore|nl_template_class_decl_special=add|nl_template_class_decl_special=remove|nl_template_class_decl_special=force|nl_template_class_decl_special=not_defined
-ChoicesReadable="Ignore Nl Template Class Decl Special|Add Nl Template Class Decl Special|Remove Nl Template Class Decl Special|Force Nl Template Class Decl Special"
-ValueDefault=ignore
-
-[Nl Template Class Def]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class definition.<br/><br/>Overrides nl_template_class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_def=ignore|nl_template_class_def=add|nl_template_class_def=remove|nl_template_class_def=force|nl_template_class_def=not_defined
-ChoicesReadable="Ignore Nl Template Class Def|Add Nl Template Class Def|Remove Nl Template Class Def|Force Nl Template Class Def"
-ValueDefault=ignore
-
-[Nl Template Class Def Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class definition.<br/><br/>Overrides nl_template_class_def.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_def_special=ignore|nl_template_class_def_special=add|nl_template_class_def_special=remove|nl_template_class_def_special=force|nl_template_class_def_special=not_defined
-ChoicesReadable="Ignore Nl Template Class Def Special|Add Nl Template Class Def Special|Remove Nl Template Class Def Special|Force Nl Template Class Def Special"
-ValueDefault=ignore
-
-[Nl Template Func]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func=ignore|nl_template_func=add|nl_template_func=remove|nl_template_func=force|nl_template_func=not_defined
-ChoicesReadable="Ignore Nl Template Func|Add Nl Template Func|Remove Nl Template Func|Force Nl Template Func"
-ValueDefault=ignore
-
-[Nl Template Func Decl]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>declaration.<br/><br/>Overrides nl_template_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_decl=ignore|nl_template_func_decl=add|nl_template_func_decl=remove|nl_template_func_decl=force|nl_template_func_decl=not_defined
-ChoicesReadable="Ignore Nl Template Func Decl|Add Nl Template Func Decl|Remove Nl Template Func Decl|Force Nl Template Func Decl"
-ValueDefault=ignore
-
-[Nl Template Func Decl Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>declaration.<br/><br/>Overrides nl_template_func_decl.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_decl_special=ignore|nl_template_func_decl_special=add|nl_template_func_decl_special=remove|nl_template_func_decl_special=force|nl_template_func_decl_special=not_defined
-ChoicesReadable="Ignore Nl Template Func Decl Special|Add Nl Template Func Decl Special|Remove Nl Template Func Decl Special|Force Nl Template Func Decl Special"
-ValueDefault=ignore
-
-[Nl Template Func Def]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>definition.<br/><br/>Overrides nl_template_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_def=ignore|nl_template_func_def=add|nl_template_func_def=remove|nl_template_func_def=force|nl_template_func_def=not_defined
-ChoicesReadable="Ignore Nl Template Func Def|Add Nl Template Func Def|Remove Nl Template Func Def|Force Nl Template Func Def"
-ValueDefault=ignore
-
-[Nl Template Func Def Special]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>definition.<br/><br/>Overrides nl_template_func_def.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_def_special=ignore|nl_template_func_def_special=add|nl_template_func_def_special=remove|nl_template_func_def_special=force|nl_template_func_def_special=not_defined
-ChoicesReadable="Ignore Nl Template Func Def Special|Add Nl Template Func Def Special|Remove Nl Template Func Def Special|Force Nl Template Func Def Special"
-ValueDefault=ignore
-
-[Nl Template Var]
-Category=3
-Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template variable.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_var=ignore|nl_template_var=add|nl_template_var=remove|nl_template_var=force|nl_template_var=not_defined
-ChoicesReadable="Ignore Nl Template Var|Add Nl Template Var|Remove Nl Template Var|Force Nl Template Var"
-ValueDefault=ignore
-
-[Nl Template Using]
-Category=3
-Description="<html>Add or remove newline between 'template&lt;...&gt;' and 'using' of a templated<br/>type alias.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_using=ignore|nl_template_using=add|nl_template_using=remove|nl_template_using=force|nl_template_using=not_defined
-ChoicesReadable="Ignore Nl Template Using|Add Nl Template Using|Remove Nl Template Using|Force Nl Template Using"
-ValueDefault=ignore
-
-[Nl Class Brace]
-Category=3
-Description="<html>Add or remove newline between 'class' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_class_brace=ignore|nl_class_brace=add|nl_class_brace=remove|nl_class_brace=force|nl_class_brace=not_defined
-ChoicesReadable="Ignore Nl Class Brace|Add Nl Class Brace|Remove Nl Class Brace|Force Nl Class Brace"
-ValueDefault=ignore
-
-[Nl Class Init Args]
-Category=3
-Description="<html>Add or remove newline before or after (depending on pos_class_comma,<br/>may not be IGNORE) each',' in the base class list.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_class_init_args=ignore|nl_class_init_args=add|nl_class_init_args=remove|nl_class_init_args=force|nl_class_init_args=not_defined
-ChoicesReadable="Ignore Nl Class Init Args|Add Nl Class Init Args|Remove Nl Class Init Args|Force Nl Class Init Args"
-ValueDefault=ignore
-
-[Nl Constr Init Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in the constructor member<br/>initialization. Related to nl_constr_colon, pos_constr_colon and<br/>pos_constr_comma.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_constr_init_args=ignore|nl_constr_init_args=add|nl_constr_init_args=remove|nl_constr_init_args=force|nl_constr_init_args=not_defined
-ChoicesReadable="Ignore Nl Constr Init Args|Add Nl Constr Init Args|Remove Nl Constr Init Args|Force Nl Constr Init Args"
-ValueDefault=ignore
-
-[Nl Enum Own Lines]
-Category=3
-Description="<html>Add or remove newline before first element, after comma, and after last<br/>element, in 'enum'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_enum_own_lines=ignore|nl_enum_own_lines=add|nl_enum_own_lines=remove|nl_enum_own_lines=force|nl_enum_own_lines=not_defined
-ChoicesReadable="Ignore Nl Enum Own Lines|Add Nl Enum Own Lines|Remove Nl Enum Own Lines|Force Nl Enum Own Lines"
-ValueDefault=ignore
-
-[Nl Func Type Name]
-Category=3
-Description="<html>Add or remove newline between return type and function name in a function<br/>definition.<br/>might be modified by nl_func_leave_one_liners</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force|nl_func_type_name=not_defined
-ChoicesReadable="Ignore Nl Func Type Name|Add Nl Func Type Name|Remove Nl Func Type Name|Force Nl Func Type Name"
-ValueDefault=ignore
-
-[Nl Func Type Name Class]
-Category=3
-Description="<html>Add or remove newline between return type and function name inside a class<br/>definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name<br/>is used instead.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_type_name_class=ignore|nl_func_type_name_class=add|nl_func_type_name_class=remove|nl_func_type_name_class=force|nl_func_type_name_class=not_defined
-ChoicesReadable="Ignore Nl Func Type Name Class|Add Nl Func Type Name Class|Remove Nl Func Type Name Class|Force Nl Func Type Name Class"
-ValueDefault=ignore
-
-[Nl Func Class Scope]
-Category=3
-Description="<html>Add or remove newline between class specification and '::'<br/>in 'void A::f() { }'. Only appears in separate member implementation (does<br/>not appear with in-line implementation).</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_class_scope=ignore|nl_func_class_scope=add|nl_func_class_scope=remove|nl_func_class_scope=force|nl_func_class_scope=not_defined
-ChoicesReadable="Ignore Nl Func Class Scope|Add Nl Func Class Scope|Remove Nl Func Class Scope|Force Nl Func Class Scope"
-ValueDefault=ignore
-
-[Nl Func Scope Name]
-Category=3
-Description="<html>Add or remove newline between function scope and name, as in<br/>'void A :: &lt;here&gt; f() { }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_scope_name=ignore|nl_func_scope_name=add|nl_func_scope_name=remove|nl_func_scope_name=force|nl_func_scope_name=not_defined
-ChoicesReadable="Ignore Nl Func Scope Name|Add Nl Func Scope Name|Remove Nl Func Scope Name|Force Nl Func Scope Name"
-ValueDefault=ignore
-
-[Nl Func Proto Type Name]
-Category=3
-Description="<html>Add or remove newline between return type and function name in a prototype.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_proto_type_name=ignore|nl_func_proto_type_name=add|nl_func_proto_type_name=remove|nl_func_proto_type_name=force|nl_func_proto_type_name=not_defined
-ChoicesReadable="Ignore Nl Func Proto Type Name|Add Nl Func Proto Type Name|Remove Nl Func Proto Type Name|Force Nl Func Proto Type Name"
-ValueDefault=ignore
-
-[Nl Func Paren]
-Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force|nl_func_paren=not_defined
-ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren"
-ValueDefault=ignore
-
-[Nl Func Paren Empty]
-Category=3
-Description="<html>Overrides nl_func_paren for functions with no parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_paren_empty=ignore|nl_func_paren_empty=add|nl_func_paren_empty=remove|nl_func_paren_empty=force|nl_func_paren_empty=not_defined
-ChoicesReadable="Ignore Nl Func Paren Empty|Add Nl Func Paren Empty|Remove Nl Func Paren Empty|Force Nl Func Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Def Paren]
-Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_paren=ignore|nl_func_def_paren=add|nl_func_def_paren=remove|nl_func_def_paren=force|nl_func_def_paren=not_defined
-ChoicesReadable="Ignore Nl Func Def Paren|Add Nl Func Def Paren|Remove Nl Func Def Paren|Force Nl Func Def Paren"
-ValueDefault=ignore
-
-[Nl Func Def Paren Empty]
-Category=3
-Description="<html>Overrides nl_func_def_paren for functions with no parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_paren_empty=ignore|nl_func_def_paren_empty=add|nl_func_def_paren_empty=remove|nl_func_def_paren_empty=force|nl_func_def_paren_empty=not_defined
-ChoicesReadable="Ignore Nl Func Def Paren Empty|Add Nl Func Def Paren Empty|Remove Nl Func Def Paren Empty|Force Nl Func Def Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Call Paren]
-Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_paren=ignore|nl_func_call_paren=add|nl_func_call_paren=remove|nl_func_call_paren=force|nl_func_call_paren=not_defined
-ChoicesReadable="Ignore Nl Func Call Paren|Add Nl Func Call Paren|Remove Nl Func Call Paren|Force Nl Func Call Paren"
-ValueDefault=ignore
-
-[Nl Func Call Paren Empty]
-Category=3
-Description="<html>Overrides nl_func_call_paren for functions with no parameters.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_paren_empty=ignore|nl_func_call_paren_empty=add|nl_func_call_paren_empty=remove|nl_func_call_paren_empty=force|nl_func_call_paren_empty=not_defined
-ChoicesReadable="Ignore Nl Func Call Paren Empty|Add Nl Func Call Paren Empty|Remove Nl Func Call Paren Empty|Force Nl Func Call Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Decl Start]
-Category=3
-Description="<html>Add or remove newline after '(' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_start=ignore|nl_func_decl_start=add|nl_func_decl_start=remove|nl_func_decl_start=force|nl_func_decl_start=not_defined
-ChoicesReadable="Ignore Nl Func Decl Start|Add Nl Func Decl Start|Remove Nl Func Decl Start|Force Nl Func Decl Start"
-ValueDefault=ignore
-
-[Nl Func Def Start]
-Category=3
-Description="<html>Add or remove newline after '(' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_start=ignore|nl_func_def_start=add|nl_func_def_start=remove|nl_func_def_start=force|nl_func_def_start=not_defined
-ChoicesReadable="Ignore Nl Func Def Start|Add Nl Func Def Start|Remove Nl Func Def Start|Force Nl Func Def Start"
-ValueDefault=ignore
-
-[Nl Func Decl Start Single]
-Category=3
-Description="<html>Overrides nl_func_decl_start when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_start_single=ignore|nl_func_decl_start_single=add|nl_func_decl_start_single=remove|nl_func_decl_start_single=force|nl_func_decl_start_single=not_defined
-ChoicesReadable="Ignore Nl Func Decl Start Single|Add Nl Func Decl Start Single|Remove Nl Func Decl Start Single|Force Nl Func Decl Start Single"
-ValueDefault=ignore
-
-[Nl Func Def Start Single]
-Category=3
-Description="<html>Overrides nl_func_def_start when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_start_single=ignore|nl_func_def_start_single=add|nl_func_def_start_single=remove|nl_func_def_start_single=force|nl_func_def_start_single=not_defined
-ChoicesReadable="Ignore Nl Func Def Start Single|Add Nl Func Def Start Single|Remove Nl Func Def Start Single|Force Nl Func Def Start Single"
-ValueDefault=ignore
-
-[Nl Func Decl Start Multi Line]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function declaration if '(' and ')'<br/>are in different lines. If false, nl_func_decl_start is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_start_multi_line=true|nl_func_decl_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Def Start Multi Line]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function definition if '(' and ')'<br/>are in different lines. If false, nl_func_def_start is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_start_multi_line=true|nl_func_def_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_args=ignore|nl_func_decl_args=add|nl_func_decl_args=remove|nl_func_decl_args=force|nl_func_decl_args=not_defined
-ChoicesReadable="Ignore Nl Func Decl Args|Add Nl Func Decl Args|Remove Nl Func Decl Args|Force Nl Func Decl Args"
-ValueDefault=ignore
-
-[Nl Func Def Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_args=ignore|nl_func_def_args=add|nl_func_def_args=remove|nl_func_def_args=force|nl_func_def_args=not_defined
-ChoicesReadable="Ignore Nl Func Def Args|Add Nl Func Def Args|Remove Nl Func Def Args|Force Nl Func Def Args"
-ValueDefault=ignore
-
-[Nl Func Call Args]
-Category=3
-Description="<html>Add or remove newline after each ',' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_args=ignore|nl_func_call_args=add|nl_func_call_args=remove|nl_func_call_args=force|nl_func_call_args=not_defined
-ChoicesReadable="Ignore Nl Func Call Args|Add Nl Func Call Args|Remove Nl Func Call Args|Force Nl Func Call Args"
-ValueDefault=ignore
-
-[Nl Func Decl Args Multi Line]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a function declaration if '('<br/>and ')' are in different lines. If false, nl_func_decl_args is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_args_multi_line=true|nl_func_decl_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Def Args Multi Line]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a function definition if '('<br/>and ')' are in different lines. If false, nl_func_def_args is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_args_multi_line=true|nl_func_def_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl End]
-Category=3
-Description="<html>Add or remove newline before the ')' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_end=ignore|nl_func_decl_end=add|nl_func_decl_end=remove|nl_func_decl_end=force|nl_func_decl_end=not_defined
-ChoicesReadable="Ignore Nl Func Decl End|Add Nl Func Decl End|Remove Nl Func Decl End|Force Nl Func Decl End"
-ValueDefault=ignore
-
-[Nl Func Def End]
-Category=3
-Description="<html>Add or remove newline before the ')' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_end=ignore|nl_func_def_end=add|nl_func_def_end=remove|nl_func_def_end=force|nl_func_def_end=not_defined
-ChoicesReadable="Ignore Nl Func Def End|Add Nl Func Def End|Remove Nl Func Def End|Force Nl Func Def End"
-ValueDefault=ignore
-
-[Nl Func Decl End Single]
-Category=3
-Description="<html>Overrides nl_func_decl_end when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_end_single=ignore|nl_func_decl_end_single=add|nl_func_decl_end_single=remove|nl_func_decl_end_single=force|nl_func_decl_end_single=not_defined
-ChoicesReadable="Ignore Nl Func Decl End Single|Add Nl Func Decl End Single|Remove Nl Func Decl End Single|Force Nl Func Decl End Single"
-ValueDefault=ignore
-
-[Nl Func Def End Single]
-Category=3
-Description="<html>Overrides nl_func_def_end when there is only one parameter.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_end_single=ignore|nl_func_def_end_single=add|nl_func_def_end_single=remove|nl_func_def_end_single=force|nl_func_def_end_single=not_defined
-ChoicesReadable="Ignore Nl Func Def End Single|Add Nl Func Def End Single|Remove Nl Func Def End Single|Force Nl Func Def End Single"
-ValueDefault=ignore
-
-[Nl Func Decl End Multi Line]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function declaration if '(' and ')'<br/>are in different lines. If false, nl_func_decl_end is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_end_multi_line=true|nl_func_decl_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Def End Multi Line]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function definition if '(' and ')'<br/>are in different lines. If false, nl_func_def_end is used instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_end_multi_line=true|nl_func_def_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl Empty]
-Category=3
-Description="<html>Add or remove newline between '()' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_empty=ignore|nl_func_decl_empty=add|nl_func_decl_empty=remove|nl_func_decl_empty=force|nl_func_decl_empty=not_defined
-ChoicesReadable="Ignore Nl Func Decl Empty|Add Nl Func Decl Empty|Remove Nl Func Decl Empty|Force Nl Func Decl Empty"
-ValueDefault=ignore
-
-[Nl Func Def Empty]
-Category=3
-Description="<html>Add or remove newline between '()' in a function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_def_empty=ignore|nl_func_def_empty=add|nl_func_def_empty=remove|nl_func_def_empty=force|nl_func_def_empty=not_defined
-ChoicesReadable="Ignore Nl Func Def Empty|Add Nl Func Def Empty|Remove Nl Func Def Empty|Force Nl Func Def Empty"
-ValueDefault=ignore
-
-[Nl Func Call Empty]
-Category=3
-Description="<html>Add or remove newline between '()' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_empty=ignore|nl_func_call_empty=add|nl_func_call_empty=remove|nl_func_call_empty=force|nl_func_call_empty=not_defined
-ChoicesReadable="Ignore Nl Func Call Empty|Add Nl Func Call Empty|Remove Nl Func Call Empty|Force Nl Func Call Empty"
-ValueDefault=ignore
-
-[Nl Func Call Start]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function call,<br/>has preference over nl_func_call_start_multi_line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_start=ignore|nl_func_call_start=add|nl_func_call_start=remove|nl_func_call_start=force|nl_func_call_start=not_defined
-ChoicesReadable="Ignore Nl Func Call Start|Add Nl Func Call Start|Remove Nl Func Call Start|Force Nl Func Call Start"
-ValueDefault=ignore
-
-[Nl Func Call End]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_end=ignore|nl_func_call_end=add|nl_func_call_end=remove|nl_func_call_end=force|nl_func_call_end=not_defined
-ChoicesReadable="Ignore Nl Func Call End|Add Nl Func Call End|Remove Nl Func Call End|Force Nl Func Call End"
-ValueDefault=ignore
-
-[Nl Func Call Start Multi Line]
-Category=3
-Description="<html>Whether to add a newline after '(' in a function call if '(' and ')' are in<br/>different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_start_multi_line=true|nl_func_call_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Call Args Multi Line]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a function call if '(' and ')'<br/>are in different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_args_multi_line=true|nl_func_call_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Call End Multi Line]
-Category=3
-Description="<html>Whether to add a newline before ')' in a function call if '(' and ')' are in<br/>different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_end_multi_line=true|nl_func_call_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Call Args Multi Line Ignore Closures]
-Category=3
-Description="<html>Whether to respect nl_func_call_XXX option in case of closure args.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_args_multi_line_ignore_closures=true|nl_func_call_args_multi_line_ignore_closures=false
-ValueDefault=false
-
-[Nl Template Start]
-Category=3
-Description="<html>Whether to add a newline after '&lt;' of a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_start=true|nl_template_start=false
-ValueDefault=false
-
-[Nl Template Args]
-Category=3
-Description="<html>Whether to add a newline after each ',' in a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_args=true|nl_template_args=false
-ValueDefault=false
-
-[Nl Template End]
-Category=3
-Description="<html>Whether to add a newline before '&gt;' of a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_end=true|nl_template_end=false
-ValueDefault=false
-
-[Nl Oc Msg Args]
-Category=3
-Description="<html>(OC) Whether to put each Objective-C message parameter on a separate line.<br/>See nl_oc_msg_leave_one_liner.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_oc_msg_args=true|nl_oc_msg_args=false
-ValueDefault=false
-
-[Nl Fdef Brace]
-Category=3
-Description="<html>Add or remove newline between function signature and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_fdef_brace=ignore|nl_fdef_brace=add|nl_fdef_brace=remove|nl_fdef_brace=force|nl_fdef_brace=not_defined
-ChoicesReadable="Ignore Nl Fdef Brace|Add Nl Fdef Brace|Remove Nl Fdef Brace|Force Nl Fdef Brace"
-ValueDefault=ignore
-
-[Nl Fdef Brace Cond]
-Category=3
-Description="<html>Add or remove newline between function signature and '{',<br/>if signature ends with ')'. Overrides nl_fdef_brace.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_fdef_brace_cond=ignore|nl_fdef_brace_cond=add|nl_fdef_brace_cond=remove|nl_fdef_brace_cond=force|nl_fdef_brace_cond=not_defined
-ChoicesReadable="Ignore Nl Fdef Brace Cond|Add Nl Fdef Brace Cond|Remove Nl Fdef Brace Cond|Force Nl Fdef Brace Cond"
-ValueDefault=ignore
-
-[Nl Cpp Ldef Brace]
-Category=3
-Description="<html>Add or remove newline between C++11 lambda signature and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_cpp_ldef_brace=ignore|nl_cpp_ldef_brace=add|nl_cpp_ldef_brace=remove|nl_cpp_ldef_brace=force|nl_cpp_ldef_brace=not_defined
-ChoicesReadable="Ignore Nl Cpp Ldef Brace|Add Nl Cpp Ldef Brace|Remove Nl Cpp Ldef Brace|Force Nl Cpp Ldef Brace"
-ValueDefault=ignore
-
-[Nl Return Expr]
-Category=3
-Description="<html>Add or remove newline between 'return' and the return expression.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return_expr=force|nl_return_expr=not_defined
-ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
-ValueDefault=ignore
-
-[Nl After Semicolon]
-Category=3
-Description="<html>Whether to add a newline after semicolons, except in 'for' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_semicolon=true|nl_after_semicolon=false
-ValueDefault=false
-
-[Nl Paren Dbrace Open]
-Category=3
-Description="<html>(Java) Add or remove newline between the ')' and '{{' of the double brace<br/>initializer.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_paren_dbrace_open=ignore|nl_paren_dbrace_open=add|nl_paren_dbrace_open=remove|nl_paren_dbrace_open=force|nl_paren_dbrace_open=not_defined
-ChoicesReadable="Ignore Nl Paren Dbrace Open|Add Nl Paren Dbrace Open|Remove Nl Paren Dbrace Open|Force Nl Paren Dbrace Open"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst]
-Category=3
-Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_type_brace_init_lst=ignore|nl_type_brace_init_lst=add|nl_type_brace_init_lst=remove|nl_type_brace_init_lst=force|nl_type_brace_init_lst=not_defined
-ChoicesReadable="Ignore Nl Type Brace Init Lst|Add Nl Type Brace Init Lst|Remove Nl Type Brace Init Lst|Force Nl Type Brace Init Lst"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst Open]
-Category=3
-Description="<html>Whether to add a newline after the open brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_type_brace_init_lst_open=ignore|nl_type_brace_init_lst_open=add|nl_type_brace_init_lst_open=remove|nl_type_brace_init_lst_open=force|nl_type_brace_init_lst_open=not_defined
-ChoicesReadable="Ignore Nl Type Brace Init Lst Open|Add Nl Type Brace Init Lst Open|Remove Nl Type Brace Init Lst Open|Force Nl Type Brace Init Lst Open"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst Close]
-Category=3
-Description="<html>Whether to add a newline before the close brace in an unnamed temporary<br/>direct-list-initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_type_brace_init_lst_close=ignore|nl_type_brace_init_lst_close=add|nl_type_brace_init_lst_close=remove|nl_type_brace_init_lst_close=force|nl_type_brace_init_lst_close=not_defined
-ChoicesReadable="Ignore Nl Type Brace Init Lst Close|Add Nl Type Brace Init Lst Close|Remove Nl Type Brace Init Lst Close|Force Nl Type Brace Init Lst Close"
-ValueDefault=ignore
-
-[Nl After Brace Open]
-Category=3
-Description="<html>Whether to add a newline after '{'. This also adds a newline before the<br/>matching '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_open=true|nl_after_brace_open=false
-ValueDefault=false
-
-[Nl After Brace Open Cmt]
-Category=3
-Description="<html>Whether to add a newline between the open brace and a trailing single-line<br/>comment. Requires nl_after_brace_open=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_open_cmt=true|nl_after_brace_open_cmt=false
-ValueDefault=false
-
-[Nl After Vbrace Open]
-Category=3
-Description="<html>Whether to add a newline after a virtual brace open with a non-empty body.<br/>These occur in un-braced if/while/do/for statement bodies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_open=true|nl_after_vbrace_open=false
-ValueDefault=false
-
-[Nl After Vbrace Open Empty]
-Category=3
-Description="<html>Whether to add a newline after a virtual brace open with an empty body.<br/>These occur in un-braced if/while/do/for statement bodies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_open_empty=true|nl_after_vbrace_open_empty=false
-ValueDefault=false
-
-[Nl After Brace Close]
-Category=3
-Description="<html>Whether to add a newline after '}'. Does not apply if followed by a<br/>necessary ';'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_close=true|nl_after_brace_close=false
-ValueDefault=false
-
-[Nl After Vbrace Close]
-Category=3
-Description="<html>Whether to add a newline after a virtual brace close,<br/>as in 'if (foo) a++; &lt;here&gt; return;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_close=true|nl_after_vbrace_close=false
-ValueDefault=false
-
-[Nl Brace Struct Var]
-Category=3
-Description="<html>Add or remove newline between the close brace and identifier,<br/>as in 'struct { int a; } &lt;here&gt; b;'. Affects enumerations, unions and<br/>structures. If set to ignore, uses nl_after_brace_close.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_struct_var=ignore|nl_brace_struct_var=add|nl_brace_struct_var=remove|nl_brace_struct_var=force|nl_brace_struct_var=not_defined
-ChoicesReadable="Ignore Nl Brace Struct Var|Add Nl Brace Struct Var|Remove Nl Brace Struct Var|Force Nl Brace Struct Var"
-ValueDefault=ignore
-
-[Nl Define Macro]
-Category=3
-Description="<html>Whether to alter newlines in '#define' macros.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_define_macro=true|nl_define_macro=false
-ValueDefault=false
-
-[Nl Squeeze Paren Close]
-Category=3
-Description="<html>Whether to alter newlines between consecutive parenthesis closes. The number<br/>of closing parentheses in a line will depend on respective open parenthesis<br/>lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_paren_close=true|nl_squeeze_paren_close=false
-ValueDefault=false
-
-[Nl Squeeze Ifdef]
-Category=3
-Description="<html>Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and<br/>'#endif'. Does not affect top-level #ifdefs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_ifdef=true|nl_squeeze_ifdef=false
-ValueDefault=false
-
-[Nl Squeeze Ifdef Top Level]
-Category=3
-Description="<html>Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_ifdef_top_level=true|nl_squeeze_ifdef_top_level=false
-ValueDefault=false
-
-[Nl Before If]
-Category=3
-Description="<html>Add or remove blank line before 'if'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force|nl_before_if=not_defined
-ChoicesReadable="Ignore Nl Before If|Add Nl Before If|Remove Nl Before If|Force Nl Before If"
-ValueDefault=ignore
-
-[Nl After If]
-Category=3
-Description="<html>Add or remove blank line after 'if' statement. Add/Force work only if the<br/>next token is not a closing brace.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force|nl_after_if=not_defined
-ChoicesReadable="Ignore Nl After If|Add Nl After If|Remove Nl After If|Force Nl After If"
-ValueDefault=ignore
-
-[Nl Before For]
-Category=3
-Description="<html>Add or remove blank line before 'for'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force|nl_before_for=not_defined
-ChoicesReadable="Ignore Nl Before For|Add Nl Before For|Remove Nl Before For|Force Nl Before For"
-ValueDefault=ignore
-
-[Nl After For]
-Category=3
-Description="<html>Add or remove blank line after 'for' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force|nl_after_for=not_defined
-ChoicesReadable="Ignore Nl After For|Add Nl After For|Remove Nl After For|Force Nl After For"
-ValueDefault=ignore
-
-[Nl Before While]
-Category=3
-Description="<html>Add or remove blank line before 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force|nl_before_while=not_defined
-ChoicesReadable="Ignore Nl Before While|Add Nl Before While|Remove Nl Before While|Force Nl Before While"
-ValueDefault=ignore
-
-[Nl After While]
-Category=3
-Description="<html>Add or remove blank line after 'while' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force|nl_after_while=not_defined
-ChoicesReadable="Ignore Nl After While|Add Nl After While|Remove Nl After While|Force Nl After While"
-ValueDefault=ignore
-
-[Nl Before Switch]
-Category=3
-Description="<html>Add or remove blank line before 'switch'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force|nl_before_switch=not_defined
-ChoicesReadable="Ignore Nl Before Switch|Add Nl Before Switch|Remove Nl Before Switch|Force Nl Before Switch"
-ValueDefault=ignore
-
-[Nl After Switch]
-Category=3
-Description="<html>Add or remove blank line after 'switch' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force|nl_after_switch=not_defined
-ChoicesReadable="Ignore Nl After Switch|Add Nl After Switch|Remove Nl After Switch|Force Nl After Switch"
-ValueDefault=ignore
-
-[Nl Before Synchronized]
-Category=3
-Description="<html>Add or remove blank line before 'synchronized'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_synchronized=ignore|nl_before_synchronized=add|nl_before_synchronized=remove|nl_before_synchronized=force|nl_before_synchronized=not_defined
-ChoicesReadable="Ignore Nl Before Synchronized|Add Nl Before Synchronized|Remove Nl Before Synchronized|Force Nl Before Synchronized"
-ValueDefault=ignore
-
-[Nl After Synchronized]
-Category=3
-Description="<html>Add or remove blank line after 'synchronized' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_synchronized=ignore|nl_after_synchronized=add|nl_after_synchronized=remove|nl_after_synchronized=force|nl_after_synchronized=not_defined
-ChoicesReadable="Ignore Nl After Synchronized|Add Nl After Synchronized|Remove Nl After Synchronized|Force Nl After Synchronized"
-ValueDefault=ignore
-
-[Nl Before Do]
-Category=3
-Description="<html>Add or remove blank line before 'do'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force|nl_before_do=not_defined
-ChoicesReadable="Ignore Nl Before Do|Add Nl Before Do|Remove Nl Before Do|Force Nl Before Do"
-ValueDefault=ignore
-
-[Nl After Do]
-Category=3
-Description="<html>Add or remove blank line after 'do/while' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force|nl_after_do=not_defined
-ChoicesReadable="Ignore Nl After Do|Add Nl After Do|Remove Nl After Do|Force Nl After Do"
-ValueDefault=ignore
-
-[Nl Before Return]
-Category=3
-Description="<html>Whether to put a blank line before 'return' statements, unless after an open<br/>brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_return=true|nl_before_return=false
-ValueDefault=false
-
-[Nl After Return]
-Category=3
-Description="<html>Whether to put a blank line after 'return' statements, unless followed by a<br/>close brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_return=true|nl_after_return=false
-ValueDefault=false
-
-[Nl Before Member]
-Category=3
-Description="<html>Whether to put a blank line before a member '.' or '-&gt;' operators.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_member=ignore|nl_before_member=add|nl_before_member=remove|nl_before_member=force|nl_before_member=not_defined
-ChoicesReadable="Ignore Nl Before Member|Add Nl Before Member|Remove Nl Before Member|Force Nl Before Member"
-ValueDefault=ignore
-
-[Nl After Member]
-Category=3
-Description="<html>(Java) Whether to put a blank line after a member '.' or '-&gt;' operators.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_member=ignore|nl_after_member=add|nl_after_member=remove|nl_after_member=force|nl_after_member=not_defined
-ChoicesReadable="Ignore Nl After Member|Add Nl After Member|Remove Nl After Member|Force Nl After Member"
-ValueDefault=ignore
-
-[Nl Ds Struct Enum Cmt]
-Category=3
-Description="<html>Whether to double-space commented-entries in 'struct'/'union'/'enum'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_ds_struct_enum_cmt=true|nl_ds_struct_enum_cmt=false
-ValueDefault=false
-
-[Nl Ds Struct Enum Close Brace]
-Category=3
-Description="<html>Whether to force a newline before '}' of a 'struct'/'union'/'enum'.<br/>(Lower priority than eat_blanks_before_close_brace.)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_ds_struct_enum_close_brace=true|nl_ds_struct_enum_close_brace=false
-ValueDefault=false
-
-[Nl Class Colon]
-Category=3
-Description="<html>Add or remove newline before or after (depending on pos_class_colon) a class<br/>colon, as in 'class Foo &lt;here&gt; : &lt;or here&gt; public Bar'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force|nl_class_colon=not_defined
-ChoicesReadable="Ignore Nl Class Colon|Add Nl Class Colon|Remove Nl Class Colon|Force Nl Class Colon"
-ValueDefault=ignore
-
-[Nl Constr Colon]
-Category=3
-Description="<html>Add or remove newline around a class constructor colon. The exact position<br/>depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_constr_colon=ignore|nl_constr_colon=add|nl_constr_colon=remove|nl_constr_colon=force|nl_constr_colon=not_defined
-ChoicesReadable="Ignore Nl Constr Colon|Add Nl Constr Colon|Remove Nl Constr Colon|Force Nl Constr Colon"
-ValueDefault=ignore
-
-[Nl Namespace Two To One Liner]
-Category=3
-Description="<html>Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'<br/>into a single line. If true, prevents other brace newline rules from turning<br/>such code into four lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_namespace_two_to_one_liner=true|nl_namespace_two_to_one_liner=false
-ValueDefault=false
-
-[Nl Create If One Liner]
-Category=3
-Description="<html>Whether to remove a newline in simple unbraced if statements, turning them<br/>into one-liners, as in 'if(b)\n i++;' =&gt; 'if(b) i++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_if_one_liner=true|nl_create_if_one_liner=false
-ValueDefault=false
-
-[Nl Create For One Liner]
-Category=3
-Description="<html>Whether to remove a newline in simple unbraced for statements, turning them<br/>into one-liners, as in 'for (...)\n stmt;' =&gt; 'for (...) stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_for_one_liner=true|nl_create_for_one_liner=false
-ValueDefault=false
-
-[Nl Create While One Liner]
-Category=3
-Description="<html>Whether to remove a newline in simple unbraced while statements, turning<br/>them into one-liners, as in 'while (expr)\n stmt;' =&gt; 'while (expr) stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_while_one_liner=true|nl_create_while_one_liner=false
-ValueDefault=false
-
-[Nl Create Func Def One Liner]
-Category=3
-Description="<html>Whether to collapse a function definition whose body (not counting braces)<br/>is only one line so that the entire definition (prototype, braces, body) is<br/>a single line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_func_def_one_liner=true|nl_create_func_def_one_liner=false
-ValueDefault=false
-
-[Nl Create List One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced if statements into three lines by<br/>adding newlines, as in 'int a[12] = { &lt;here&gt; 0 &lt;here&gt; };'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_list_one_liner=true|nl_create_list_one_liner=false
-ValueDefault=false
-
-[Nl Split If One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced if statements into two lines by<br/>adding a newline, as in 'if(b) &lt;here&gt; i++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_if_one_liner=true|nl_split_if_one_liner=false
-ValueDefault=false
-
-[Nl Split For One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced for statements into two lines by<br/>adding a newline, as in 'for (...) &lt;here&gt; stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_for_one_liner=true|nl_split_for_one_liner=false
-ValueDefault=false
-
-[Nl Split While One Liner]
-Category=3
-Description="<html>Whether to split one-line simple unbraced while statements into two lines by<br/>adding a newline, as in 'while (expr) &lt;here&gt; stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_while_one_liner=true|nl_split_while_one_liner=false
-ValueDefault=false
-
-[Donot Add Nl Before Cpp Comment]
-Category=3
-Description="<html>Don't add a newline before a cpp-comment in a parameter list of a function<br/>call.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=donot_add_nl_before_cpp_comment=true|donot_add_nl_before_cpp_comment=false
-ValueDefault=false
-
-[Nl Max]
-Category=4
-Description="<html>The maximum number of consecutive newlines (3 = 2 blank lines).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_max="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Max Blank In Func]
-Category=4
-Description="<html>The maximum number of consecutive newlines in a function.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_max_blank_in_func="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Inside Empty Func]
-Category=4
-Description="<html>The number of newlines inside an empty function body.<br/>This option overrides eat_blanks_after_open_brace and<br/>eat_blanks_before_close_brace, but is ignored when<br/>nl_collapse_empty_body=true</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_inside_empty_func="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Body Proto]
-Category=4
-Description="<html>The number of newlines before a function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_body_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Body Def]
-Category=4
-Description="<html>The number of newlines before a multi-line function definition. Where<br/>applicable, this option is overridden with eat_blanks_after_open_brace=true</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_body_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Class Proto]
-Category=4
-Description="<html>The number of newlines before a class constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_class_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Class Def]
-Category=4
-Description="<html>The number of newlines before a class constructor/destructor definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_class_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Proto]
-Category=4
-Description="<html>The number of newlines after a function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Proto Group]
-Category=4
-Description="<html>The number of newlines after a function prototype, if not followed by<br/>another function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_proto_group="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Class Proto]
-Category=4
-Description="<html>The number of newlines after a class constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_class_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Class Proto Group]
-Category=4
-Description="<html>The number of newlines after a class constructor/destructor prototype,<br/>if not followed by another constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_class_proto_group="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Class Leave One Liner Groups]
-Category=4
-Description="<html>Whether one-line method definitions inside a class body should be treated<br/>as if they were prototypes for the purposes of adding newlines.<br/><br/>Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def<br/>and nl_before_func_class_def for one-liners.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_class_leave_one_liner_groups=true|nl_class_leave_one_liner_groups=false
-ValueDefault=false
-
-[Nl After Func Body]
-Category=4
-Description="<html>The number of newlines after '}' of a multi-line function body.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Body Class]
-Category=4
-Description="<html>The number of newlines after '}' of a multi-line function body in a class<br/>declaration. Also affects class constructors/destructors.<br/><br/>Overrides nl_after_func_body.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Body One Liner]
-Category=4
-Description="<html>The number of newlines after '}' of a single line function body. Also<br/>affects class constructors/destructors.<br/><br/>Overrides nl_after_func_body and nl_after_func_body_class.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body_one_liner="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Func Var Def Blk]
-Category=4
-Description="<html>The number of blank lines after a block of variable definitions at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_func_var_def_blk="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk Start]
-Category=4
-Description="<html>The number of newlines before a block of typedefs. If nl_after_access_spec<br/>is non-zero, that option takes precedence.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_start="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk End]
-Category=4
-Description="<html>The number of newlines after a block of typedefs.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_end="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk In]
-Category=4
-Description="<html>The maximum number of consecutive newlines within a block of typedefs.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_in="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk Start]
-Category=4
-Description="<html>The number of newlines before a block of variable definitions not at the top<br/>of a function body. If nl_after_access_spec is non-zero, that option takes<br/>precedence.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_start="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk End]
-Category=4
-Description="<html>The number of newlines after a block of variable definitions not at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_end="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk In]
-Category=4
-Description="<html>The maximum number of consecutive newlines within a block of variable<br/>definitions.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_in="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Block Comment]
-Category=4
-Description="<html>The minimum number of newlines before a multi-line comment.<br/>Doesn't apply if after a brace open or another multi-line comment.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_block_comment="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before C Comment]
-Category=4
-Description="<html>The minimum number of newlines before a single-line C comment.<br/>Doesn't apply if after a brace open or other single-line C comments.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_c_comment="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Cpp Comment]
-Category=4
-Description="<html>The minimum number of newlines before a CPP comment.<br/>Doesn't apply if after a brace open or other CPP comments.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_cpp_comment="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Multiline Comment]
-Category=4
-Description="<html>Whether to force a newline after a multi-line comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_multiline_comment=true|nl_after_multiline_comment=false
-ValueDefault=false
-
-[Nl After Label Colon]
-Category=4
-Description="<html>Whether to force a newline after a label's colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_label_colon=true|nl_after_label_colon=false
-ValueDefault=false
-
-[Nl After Struct]
-Category=4
-Description="<html>The number of newlines after '}' or ';' of a struct/enum/union definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_struct="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Class]
-Category=4
-Description="<html>The number of newlines before a class definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Class]
-Category=4
-Description="<html>The number of newlines after '}' or ';' of a class definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Namespace]
-Category=4
-Description="<html>The number of newlines before a namespace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Inside Namespace]
-Category=4
-Description="<html>The number of newlines after '{' of a namespace. This also adds newlines<br/>before the matching '}'.<br/><br/>0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if<br/>    applicable, otherwise no change.<br/><br/>Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_inside_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Namespace]
-Category=4
-Description="<html>The number of newlines after '}' of a namespace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Access Spec]
-Category=4
-Description="<html>The number of newlines before an access specifier label. This also includes<br/>the Qt-specific 'signals:' and 'slots:'. Will not change the newline count<br/>if after a brace open.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_access_spec="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Access Spec]
-Category=4
-Description="<html>The number of newlines after an access specifier label. This also includes<br/>the Qt-specific 'signals:' and 'slots:'. Will not change the newline count<br/>if after a brace open.<br/><br/>0: No change (default).<br/><br/>Overrides nl_typedef_blk_start and nl_var_def_blk_start.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_access_spec="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Comment Func Def]
-Category=4
-Description="<html>The number of newlines between a function definition and the function<br/>comment, as in '// comment\n &lt;here&gt; void foo() {...}'.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_comment_func_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Try Catch Finally]
-Category=4
-Description="<html>The number of newlines after a try-catch-finally block that isn't followed<br/>by a brace close.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_try_catch_finally="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Around Cs Property]
-Category=4
-Description="<html>(C#) The number of newlines before and after a property, indexer or event<br/>declaration.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_around_cs_property="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Between Get Set]
-Category=4
-Description="<html>(C#) The number of newlines between the get/set/add/remove handlers.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_between_get_set="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Property Brace]
-Category=4
-Description="<html>(C#) Add or remove newline between property and the '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_property_brace=ignore|nl_property_brace=add|nl_property_brace=remove|nl_property_brace=force|nl_property_brace=not_defined
-ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
-ValueDefault=ignore
-
-[Eat Blanks After Open Brace]
-Category=4
-Description="<html>Whether to remove blank lines after '{'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=eat_blanks_after_open_brace=true|eat_blanks_after_open_brace=false
-ValueDefault=false
-
-[Eat Blanks Before Close Brace]
-Category=4
-Description="<html>Whether to remove blank lines before '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=eat_blanks_before_close_brace=true|eat_blanks_before_close_brace=false
-ValueDefault=false
-
-[Nl Remove Extra Newlines]
-Category=4
-Description="<html>How aggressively to remove extra newlines not in preprocessor.<br/><br/>0: No change (default)<br/>1: Remove most newlines not handled by other config<br/>2: Remove all newlines and reformat completely by config</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_remove_extra_newlines="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Nl After Annotation]
-Category=4
-Description="<html>(Java) Add or remove newline after an annotation statement. Only affects<br/>annotations that are after a newline.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_annotation=ignore|nl_after_annotation=add|nl_after_annotation=remove|nl_after_annotation=force|nl_after_annotation=not_defined
-ChoicesReadable="Ignore Nl After Annotation|Add Nl After Annotation|Remove Nl After Annotation|Force Nl After Annotation"
-ValueDefault=ignore
-
-[Nl Between Annotation]
-Category=4
-Description="<html>(Java) Add or remove newline between two annotations.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_between_annotation=ignore|nl_between_annotation=add|nl_between_annotation=remove|nl_between_annotation=force|nl_between_annotation=not_defined
-ChoicesReadable="Ignore Nl Between Annotation|Add Nl Between Annotation|Remove Nl Between Annotation|Force Nl Between Annotation"
-ValueDefault=ignore
-
-[Nl Before Whole File Ifdef]
-Category=4
-Description="<html>The number of newlines before a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_whole_file_ifdef="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Whole File Ifdef]
-Category=4
-Description="<html>The number of newlines after a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_whole_file_ifdef="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Whole File Endif]
-Category=4
-Description="<html>The number of newlines before a whole-file #endif.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_whole_file_endif="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Whole File Endif]
-Category=4
-Description="<html>The number of newlines after a whole-file #endif.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_whole_file_endif="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Pos Arith]
-Category=5
-Description="<html>The position of arithmetic operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_arith=ignore|pos_arith=break|pos_arith=force|pos_arith=lead|pos_arith=trail|pos_arith=join|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail_break|pos_arith=trail_force
-ChoicesReadable="Ignore Pos Arith|Break Pos Arith|Force Pos Arith|Lead Pos Arith|Trail Pos Arith|Join Pos Arith|Lead Break Pos Arith|Lead Force Pos Arith|Trail Break Pos Arith|Trail Force Pos Arith"
-ValueDefault=ignore
-
-[Pos Assign]
-Category=5
-Description="<html>The position of assignment in wrapped expressions. Do not affect '='<br/>followed by '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_assign=ignore|pos_assign=break|pos_assign=force|pos_assign=lead|pos_assign=trail|pos_assign=join|pos_assign=lead_break|pos_assign=lead_force|pos_assign=trail_break|pos_assign=trail_force
-ChoicesReadable="Ignore Pos Assign|Break Pos Assign|Force Pos Assign|Lead Pos Assign|Trail Pos Assign|Join Pos Assign|Lead Break Pos Assign|Lead Force Pos Assign|Trail Break Pos Assign|Trail Force Pos Assign"
-ValueDefault=ignore
-
-[Pos Bool]
-Category=5
-Description="<html>The position of Boolean operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_bool=ignore|pos_bool=break|pos_bool=force|pos_bool=lead|pos_bool=trail|pos_bool=join|pos_bool=lead_break|pos_bool=lead_force|pos_bool=trail_break|pos_bool=trail_force
-ChoicesReadable="Ignore Pos Bool|Break Pos Bool|Force Pos Bool|Lead Pos Bool|Trail Pos Bool|Join Pos Bool|Lead Break Pos Bool|Lead Force Pos Bool|Trail Break Pos Bool|Trail Force Pos Bool"
-ValueDefault=ignore
-
-[Pos Compare]
-Category=5
-Description="<html>The position of comparison operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_compare=ignore|pos_compare=break|pos_compare=force|pos_compare=lead|pos_compare=trail|pos_compare=join|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail_break|pos_compare=trail_force
-ChoicesReadable="Ignore Pos Compare|Break Pos Compare|Force Pos Compare|Lead Pos Compare|Trail Pos Compare|Join Pos Compare|Lead Break Pos Compare|Lead Force Pos Compare|Trail Break Pos Compare|Trail Force Pos Compare"
-ValueDefault=ignore
-
-[Pos Conditional]
-Category=5
-Description="<html>The position of conditional operators, as in the '?' and ':' of<br/>'expr ? stmt : stmt', in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_conditional=ignore|pos_conditional=break|pos_conditional=force|pos_conditional=lead|pos_conditional=trail|pos_conditional=join|pos_conditional=lead_break|pos_conditional=lead_force|pos_conditional=trail_break|pos_conditional=trail_force
-ChoicesReadable="Ignore Pos Conditional|Break Pos Conditional|Force Pos Conditional|Lead Pos Conditional|Trail Pos Conditional|Join Pos Conditional|Lead Break Pos Conditional|Lead Force Pos Conditional|Trail Break Pos Conditional|Trail Force Pos Conditional"
-ValueDefault=ignore
-
-[Pos Comma]
-Category=5
-Description="<html>The position of the comma in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_comma=ignore|pos_comma=break|pos_comma=force|pos_comma=lead|pos_comma=trail|pos_comma=join|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail_break|pos_comma=trail_force
-ChoicesReadable="Ignore Pos Comma|Break Pos Comma|Force Pos Comma|Lead Pos Comma|Trail Pos Comma|Join Pos Comma|Lead Break Pos Comma|Lead Force Pos Comma|Trail Break Pos Comma|Trail Force Pos Comma"
-ValueDefault=ignore
-
-[Pos Enum Comma]
-Category=5
-Description="<html>The position of the comma in enum entries.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_enum_comma=ignore|pos_enum_comma=break|pos_enum_comma=force|pos_enum_comma=lead|pos_enum_comma=trail|pos_enum_comma=join|pos_enum_comma=lead_break|pos_enum_comma=lead_force|pos_enum_comma=trail_break|pos_enum_comma=trail_force
-ChoicesReadable="Ignore Pos Enum Comma|Break Pos Enum Comma|Force Pos Enum Comma|Lead Pos Enum Comma|Trail Pos Enum Comma|Join Pos Enum Comma|Lead Break Pos Enum Comma|Lead Force Pos Enum Comma|Trail Break Pos Enum Comma|Trail Force Pos Enum Comma"
-ValueDefault=ignore
-
-[Pos Class Comma]
-Category=5
-Description="<html>The position of the comma in the base class list if there is more than one<br/>line. Affects nl_class_init_args.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_class_comma=ignore|pos_class_comma=break|pos_class_comma=force|pos_class_comma=lead|pos_class_comma=trail|pos_class_comma=join|pos_class_comma=lead_break|pos_class_comma=lead_force|pos_class_comma=trail_break|pos_class_comma=trail_force
-ChoicesReadable="Ignore Pos Class Comma|Break Pos Class Comma|Force Pos Class Comma|Lead Pos Class Comma|Trail Pos Class Comma|Join Pos Class Comma|Lead Break Pos Class Comma|Lead Force Pos Class Comma|Trail Break Pos Class Comma|Trail Force Pos Class Comma"
-ValueDefault=ignore
-
-[Pos Constr Comma]
-Category=5
-Description="<html>The position of the comma in the constructor initialization list.<br/>Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_constr_comma=ignore|pos_constr_comma=break|pos_constr_comma=force|pos_constr_comma=lead|pos_constr_comma=trail|pos_constr_comma=join|pos_constr_comma=lead_break|pos_constr_comma=lead_force|pos_constr_comma=trail_break|pos_constr_comma=trail_force
-ChoicesReadable="Ignore Pos Constr Comma|Break Pos Constr Comma|Force Pos Constr Comma|Lead Pos Constr Comma|Trail Pos Constr Comma|Join Pos Constr Comma|Lead Break Pos Constr Comma|Lead Force Pos Constr Comma|Trail Break Pos Constr Comma|Trail Force Pos Constr Comma"
-ValueDefault=ignore
-
-[Pos Class Colon]
-Category=5
-Description="<html>The position of trailing/leading class colon, between class and base class<br/>list. Affects nl_class_colon.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_class_colon=ignore|pos_class_colon=break|pos_class_colon=force|pos_class_colon=lead|pos_class_colon=trail|pos_class_colon=join|pos_class_colon=lead_break|pos_class_colon=lead_force|pos_class_colon=trail_break|pos_class_colon=trail_force
-ChoicesReadable="Ignore Pos Class Colon|Break Pos Class Colon|Force Pos Class Colon|Lead Pos Class Colon|Trail Pos Class Colon|Join Pos Class Colon|Lead Break Pos Class Colon|Lead Force Pos Class Colon|Trail Break Pos Class Colon|Trail Force Pos Class Colon"
-ValueDefault=ignore
-
-[Pos Constr Colon]
-Category=5
-Description="<html>The position of colons between constructor and member initialization.<br/>Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_constr_colon=ignore|pos_constr_colon=break|pos_constr_colon=force|pos_constr_colon=lead|pos_constr_colon=trail|pos_constr_colon=join|pos_constr_colon=lead_break|pos_constr_colon=lead_force|pos_constr_colon=trail_break|pos_constr_colon=trail_force
-ChoicesReadable="Ignore Pos Constr Colon|Break Pos Constr Colon|Force Pos Constr Colon|Lead Pos Constr Colon|Trail Pos Constr Colon|Join Pos Constr Colon|Lead Break Pos Constr Colon|Lead Force Pos Constr Colon|Trail Break Pos Constr Colon|Trail Force Pos Constr Colon"
-ValueDefault=ignore
-
-[Pos Shift]
-Category=5
-Description="<html>The position of shift operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_shift=ignore|pos_shift=break|pos_shift=force|pos_shift=lead|pos_shift=trail|pos_shift=join|pos_shift=lead_break|pos_shift=lead_force|pos_shift=trail_break|pos_shift=trail_force
-ChoicesReadable="Ignore Pos Shift|Break Pos Shift|Force Pos Shift|Lead Pos Shift|Trail Pos Shift|Join Pos Shift|Lead Break Pos Shift|Lead Force Pos Shift|Trail Break Pos Shift|Trail Force Pos Shift"
-ValueDefault=ignore
-
-[Code Width]
-Category=6
-Description="<html>Try to limit code width to N columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="code_width="
-MinVal=0
-MaxVal=10000
-ValueDefault=0
-
-[Ls For Split Full]
-Category=6
-Description="<html>Whether to fully split long 'for' statements at semi-colons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_for_split_full=true|ls_for_split_full=false
-ValueDefault=false
-
-[Ls Func Split Full]
-Category=6
-Description="<html>Whether to fully split long function prototypes/calls at commas.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_func_split_full=true|ls_func_split_full=false
-ValueDefault=false
-
-[Ls Code Width]
-Category=6
-Description="<html>Whether to split lines as close to code_width as possible and ignore some<br/>groupings.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_code_width=true|ls_code_width=false
-ValueDefault=false
-
-[Align Keep Tabs]
-Category=7
-Description="<html>Whether to keep non-indenting tabs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_keep_tabs=true|align_keep_tabs=false
-ValueDefault=false
-
-[Align With Tabs]
-Category=7
-Description="<html>Whether to use tabs for aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_with_tabs=true|align_with_tabs=false
-ValueDefault=false
-
-[Align On Tabstop]
-Category=7
-Description="<html>Whether to bump out to the next tab when aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_on_tabstop=true|align_on_tabstop=false
-ValueDefault=false
-
-[Align Number Right]
-Category=7
-Description="<html>Whether to right-align numbers.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_number_right=true|align_number_right=false
-ValueDefault=false
-
-[Align Keep Extra Space]
-Category=7
-Description="<html>Whether to keep whitespace not required for alignment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_keep_extra_space=true|align_keep_extra_space=false
-ValueDefault=false
-
-[Align Func Params]
-Category=7
-Description="<html>Whether to align variable definitions in prototypes and functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_func_params=true|align_func_params=false
-ValueDefault=false
-
-[Align Func Params Span]
-Category=7
-Description="<html>The span for aligning parameter definitions in function on parameter name.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Func Params Thresh]
-Category=7
-Description="<html>The threshold for aligning function parameter definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Params Gap]
-Category=7
-Description="<html>The gap for aligning function parameter definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Constr Value Span]
-Category=7
-Description="<html>The span for aligning constructor value.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Constr Value Thresh]
-Category=7
-Description="<html>The threshold for aligning constructor value.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Constr Value Gap]
-Category=7
-Description="<html>The gap for aligning constructor value.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Same Func Call Params]
-Category=7
-Description="<html>Whether to align parameters in single-line functions that have the same<br/>name. The function names must already be aligned with each other.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_same_func_call_params=true|align_same_func_call_params=false
-ValueDefault=false
-
-[Align Same Func Call Params Span]
-Category=7
-Description="<html>The span for aligning function-call parameters for single line functions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_same_func_call_params_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Same Func Call Params Thresh]
-Category=7
-Description="<html>The threshold for aligning function-call parameters for single line<br/>functions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_same_func_call_params_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Span]
-Category=7
-Description="<html>The span for aligning variable definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Star Style]
-Category=7
-Description="<html>How to consider (or treat) the '*' in the alignment of variable definitions.<br/><br/>0: Part of the type     'void *   foo;' (default)<br/>1: Part of the variable 'void     *foo;'<br/>2: Dangling             'void    *foo;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_star_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Var Def Amp Style]
-Category=7
-Description="<html>How to consider (or treat) the '&amp;' in the alignment of variable definitions.<br/><br/>0: Part of the type     'long &amp;   foo;' (default)<br/>1: Part of the variable 'long     &amp;foo;'<br/>2: Dangling             'long    &amp;foo;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_amp_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Var Def Thresh]
-Category=7
-Description="<html>The threshold for aligning variable definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Gap]
-Category=7
-Description="<html>The gap for aligning variable definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Def Colon]
-Category=7
-Description="<html>Whether to align the colon in struct bit fields.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_colon=true|align_var_def_colon=false
-ValueDefault=false
-
-[Align Var Def Colon Gap]
-Category=7
-Description="<html>The gap for aligning the colon in struct bit fields.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_colon_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Def Attribute]
-Category=7
-Description="<html>Whether to align any attribute after the variable name.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_attribute=true|align_var_def_attribute=false
-ValueDefault=false
-
-[Align Var Def Inline]
-Category=7
-Description="<html>Whether to align inline struct/enum/union variable definitions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_inline=true|align_var_def_inline=false
-ValueDefault=false
-
-[Align Assign Span]
-Category=7
-Description="<html>The span for aligning on '=' in assignments.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Func Proto Span]
-Category=7
-Description="<html>The span for aligning on '=' in function prototype modifier.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_func_proto_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Thresh]
-Category=7
-Description="<html>The threshold for aligning on '=' in assignments.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Decl Func]
-Category=7
-Description="<html>How to apply align_assign_span to function declaration "assignments", i.e.<br/>'virtual void foo() = 0' or '~foo() = {default|delete}'.<br/><br/>0: Align with other assignments (default)<br/>1: Align with each other, ignoring regular assignments<br/>2: Don't align</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_decl_func="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Enum Equ Span]
-Category=7
-Description="<html>The span for aligning on '=' in enums.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_enum_equ_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Enum Equ Thresh]
-Category=7
-Description="<html>The threshold for aligning on '=' in enums.<br/>Use a negative number for absolute thresholds.<br/><br/>0: no limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_enum_equ_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Span]
-Category=7
-Description="<html>The span for aligning class member definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Thresh]
-Category=7
-Description="<html>The threshold for aligning class member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Gap]
-Category=7
-Description="<html>The gap for aligning class member definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Struct Span]
-Category=7
-Description="<html>The span for aligning struct/union member definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Struct Thresh]
-Category=7
-Description="<html>The threshold for aligning struct/union member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Struct Gap]
-Category=7
-Description="<html>The gap for aligning struct/union member definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Struct Init Span]
-Category=7
-Description="<html>The span for aligning struct initializer values.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_struct_init_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Typedef Span]
-Category=7
-Description="<html>The span for aligning single-line typedefs.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Typedef Gap]
-Category=7
-Description="<html>The minimum space between the type and the synonym of a typedef.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Typedef Func]
-Category=7
-Description="<html>How to align typedef'd functions with other typedefs.<br/><br/>0: Don't mix them at all (default)<br/>1: Align the open parenthesis with the types<br/>2: Align the function type name with the other type names</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_func="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Typedef Star Style]
-Category=7
-Description="<html>How to consider (or treat) the '*' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int * pint;' (default)<br/>1: Part of type name:        'typedef int   *pint;'<br/>2: Dangling:                 'typedef int  *pint;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_star_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Typedef Amp Style]
-Category=7
-Description="<html>How to consider (or treat) the '&amp;' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int &amp; intref;' (default)<br/>1: Part of type name:        'typedef int   &amp;intref;'<br/>2: Dangling:                 'typedef int  &amp;intref;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_amp_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Right Cmt Span]
-Category=7
-Description="<html>The span for aligning comments that end lines.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Right Cmt Gap]
-Category=7
-Description="<html>Minimum number of columns between preceding text and a trailing comment in<br/>order for the comment to qualify for being aligned. Must be non-zero to have<br/>an effect.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Right Cmt Mix]
-Category=7
-Description="<html>If aligning comments, whether to mix with comments after '}' and #endif with<br/>less than three spaces before the comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_right_cmt_mix=true|align_right_cmt_mix=false
-ValueDefault=false
-
-[Align Right Cmt Same Level]
-Category=7
-Description="<html>Whether to only align trailing comments that are at the same brace level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_right_cmt_same_level=true|align_right_cmt_same_level=false
-ValueDefault=false
-
-[Align Right Cmt At Col]
-Category=7
-Description="<html>Minimum column at which to align trailing comments. Comments which are<br/>aligned beyond this column, but which can be aligned in a lesser column,<br/>may be "pulled in".<br/><br/>0: Ignore (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_at_col="
-MinVal=0
-MaxVal=200
-ValueDefault=0
-
-[Align Func Proto Span]
-Category=7
-Description="<html>The span for aligning function prototypes.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Proto Thresh]
-Category=7
-Description="<html>The threshold for aligning function prototypes.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Proto Gap]
-Category=7
-Description="<html>Minimum gap between the return type and the function name.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align On Operator]
-Category=7
-Description="<html>Whether to align function prototypes on the 'operator' keyword instead of<br/>what follows.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_on_operator=true|align_on_operator=false
-ValueDefault=false
-
-[Align Mix Var Proto]
-Category=7
-Description="<html>Whether to mix aligning prototype and variable declarations. If true,<br/>align_var_def_XXX options are used instead of align_func_proto_XXX options.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_mix_var_proto=true|align_mix_var_proto=false
-ValueDefault=false
-
-[Align Single Line Func]
-Category=7
-Description="<html>Whether to align single-line functions with function prototypes.<br/>Uses align_func_proto_span.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_single_line_func=true|align_single_line_func=false
-ValueDefault=false
-
-[Align Single Line Brace]
-Category=7
-Description="<html>Whether to align the open brace of single-line functions.<br/>Requires align_single_line_func=true. Uses align_func_proto_span.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_single_line_brace=true|align_single_line_brace=false
-ValueDefault=false
-
-[Align Single Line Brace Gap]
-Category=7
-Description="<html>Gap for align_single_line_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_single_line_brace_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Oc Msg Spec Span]
-Category=7
-Description="<html>(OC) The span for aligning Objective-C message specifications.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_oc_msg_spec_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Nl Cont]
-Category=7
-Description="<html>Whether to align macros wrapped with a backslash and a newline. This will<br/>not work right if the macro contains a multi-line comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_nl_cont=true|align_nl_cont=false
-ValueDefault=false
-
-[Align Pp Define Together]
-Category=7
-Description="<html>Whether to align macro functions and variables together.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_pp_define_together=true|align_pp_define_together=false
-ValueDefault=false
-
-[Align Pp Define Span]
-Category=7
-Description="<html>The span for aligning on '#define' bodies.<br/><br/>=0: Don't align (default)<br/>&gt;0: Number of lines (including comments) between blocks</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_pp_define_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Pp Define Gap]
-Category=7
-Description="<html>The minimum space between label and value of a preprocessor define.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_pp_define_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Left Shift]
-Category=7
-Description="<html>Whether to align lines that start with '&lt;&lt;' with previous '&lt;&lt;'.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_left_shift=true|align_left_shift=false
-ValueDefault=true
-
-[Align Eigen Comma Init]
-Category=7
-Description="<html>Whether to align comma-separated statements following '&lt;&lt;' (as used to<br/>initialize Eigen matrices).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_eigen_comma_init=true|align_eigen_comma_init=false
-ValueDefault=false
-
-[Align Asm Colon]
-Category=7
-Description="<html>Whether to align text after 'asm volatile ()' colons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_asm_colon=true|align_asm_colon=false
-ValueDefault=false
-
-[Align Oc Msg Colon Span]
-Category=7
-Description="<html>(OC) Span for aligning parameters in an Objective-C message call<br/>on the ':'.<br/><br/>0: Don't align.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_oc_msg_colon_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Oc Msg Colon First]
-Category=7
-Description="<html>(OC) Whether to always align with the first parameter, even if it is too<br/>short.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_msg_colon_first=true|align_oc_msg_colon_first=false
-ValueDefault=false
-
-[Align Oc Decl Colon]
-Category=7
-Description="<html>(OC) Whether to align parameters in an Objective-C '+' or '-' declaration<br/>on the ':'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_decl_colon=true|align_oc_decl_colon=false
-ValueDefault=false
-
-[Align Oc Msg Colon Xcode Like]
-Category=7
-Description="<html>(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>aligment)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
-ValueDefault=false
-
-[Cmt Width]
-Category=8
-Description="<html>Try to wrap comments at N columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_width="
-MinVal=0
-MaxVal=256
-ValueDefault=0
-
-[Cmt Reflow Mode]
-Category=8
-Description="<html>How to reflow comments.<br/><br/>0: No reflowing (apart from the line wrapping due to cmt_width) (default)<br/>1: No touching at all<br/>2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_reflow_mode="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Cmt Reflow Fold Regex File]
-Category=8
-Description="<html>Path to a file that contains regular expressions describing patterns for<br/>which the end of one line and the beginning of the next will be folded into<br/>the same sentence or paragraph during full comment reflow. The regular<br/>expressions are described using ECMAScript syntax. The syntax for this<br/>specification is as follows, where "..." indicates the custom regular<br/>expression and "n" indicates the nth end_of_prev_line_regex and<br/>beg_of_next_line_regex regular expression pair:<br/><br/>end_of_prev_line_regex[1] = "...$"<br/>beg_of_next_line_regex[1] = "^..."<br/>end_of_prev_line_regex[2] = "...$"<br/>beg_of_next_line_regex[2] = "^..."<br/>            .<br/>            .<br/>            .<br/>end_of_prev_line_regex[n] = "...$"<br/>beg_of_next_line_regex[n] = "^..."<br/><br/>Note that use of this option overrides the default reflow fold regular<br/>expressions, which are internally defined as follows:<br/><br/>end_of_prev_line_regex[1] = "[\w,\]\)]$"<br/>beg_of_next_line_regex[1] = "^[\w,\[\(]"<br/>end_of_prev_line_regex[2] = "\.$"<br/>beg_of_next_line_regex[2] = "^[A-Z]"</html>"
-Enabled=false
-CallName=cmt_reflow_fold_regex_file=
-EditorType=string
-ValueDefault=
-
-[Cmt Reflow Indent To Paragraph Start]
-Category=8
-Description="<html>Whether to indent wrapped lines to the start of the encompassing paragraph<br/>during full comment reflow (cmt_reflow_mode = 2). Overrides the value<br/>specified by cmt_sp_after_star_cont.<br/><br/>Note that cmt_align_doxygen_javadoc_tags overrides this option for<br/>paragraphs associated with javadoc tags</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_reflow_indent_to_paragraph_start=true|cmt_reflow_indent_to_paragraph_start=false
-ValueDefault=false
-
-[Cmt Convert Tab To Spaces]
-Category=8
-Description="<html>Whether to convert all tabs to spaces in comments. If false, tabs in<br/>comments are left alone, unless used for indenting.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_convert_tab_to_spaces=true|cmt_convert_tab_to_spaces=false
-ValueDefault=false
-
-[Cmt Indent Multi]
-Category=8
-Description="<html>Whether to apply changes to multi-line comments, including cmt_width,<br/>keyword substitution and leading chars.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false
-ValueDefault=true
-
-[Cmt Align Doxygen Javadoc Tags]
-Category=8
-Description="<html>Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)<br/>and corresponding fields such that groups of consecutive block tags,<br/>parameter names, and descriptions align with one another. Overrides that<br/>which is specified by the cmt_sp_after_star_cont. If cmt_width &gt; 0, it may<br/>be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2<br/>in order to achieve the desired alignment for line-wrapping.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_align_doxygen_javadoc_tags=true|cmt_align_doxygen_javadoc_tags=false
-ValueDefault=false
-
-[Cmt Sp Before Doxygen Javadoc Tags]
-Category=8
-Description="<html>The number of spaces to insert after the star and before doxygen<br/>javadoc-style tags (@param, @return, etc). Requires enabling<br/>cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the<br/>cmt_sp_after_star_cont.<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_before_doxygen_javadoc_tags="
-MinVal=0
-MaxVal=16
-ValueDefault=1
-
-[Cmt C Group]
-Category=8
-Description="<html>Whether to group c-comments that look like they are in a block.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_group=true|cmt_c_group=false
-ValueDefault=false
-
-[Cmt C Nl Start]
-Category=8
-Description="<html>Whether to put an empty '/*' on the first line of the combined c-comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_nl_start=true|cmt_c_nl_start=false
-ValueDefault=false
-
-[Cmt C Nl End]
-Category=8
-Description="<html>Whether to add a newline before the closing '*/' of the combined c-comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_nl_end=true|cmt_c_nl_end=false
-ValueDefault=false
-
-[Cmt Cpp To C]
-Category=8
-Description="<html>Whether to change cpp-comments into c-comments.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_to_c=true|cmt_cpp_to_c=false
-ValueDefault=false
-
-[Cmt Cpp Group]
-Category=8
-Description="<html>Whether to group cpp-comments that look like they are in a block. Only<br/>meaningful if cmt_cpp_to_c=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_group=true|cmt_cpp_group=false
-ValueDefault=false
-
-[Cmt Cpp Nl Start]
-Category=8
-Description="<html>Whether to put an empty '/*' on the first line of the combined cpp-comment<br/>when converting to a c-comment.<br/><br/>Requires cmt_cpp_to_c=true and cmt_cpp_group=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_nl_start=true|cmt_cpp_nl_start=false
-ValueDefault=false
-
-[Cmt Cpp Nl End]
-Category=8
-Description="<html>Whether to add a newline before the closing '*/' of the combined cpp-comment<br/>when converting to a c-comment.<br/><br/>Requires cmt_cpp_to_c=true and cmt_cpp_group=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_nl_end=true|cmt_cpp_nl_end=false
-ValueDefault=false
-
-[Cmt Star Cont]
-Category=8
-Description="<html>Whether to put a star on subsequent comment lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_star_cont=true|cmt_star_cont=false
-ValueDefault=false
-
-[Cmt Sp Before Star Cont]
-Category=8
-Description="<html>The number of spaces to insert at the start of subsequent comment lines.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_before_star_cont="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Cmt Sp After Star Cont]
-Category=8
-Description="<html>The number of spaces to insert after the star on subsequent comment lines.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_after_star_cont="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Cmt Multi Check Last]
-Category=8
-Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first<br/>and last lines of the comment are the same length.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_multi_check_last=true|cmt_multi_check_last=false
-ValueDefault=true
-
-[Cmt Multi First Len Minimum]
-Category=8
-Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first<br/>and last lines of the comment are the same length AND if the length is<br/>bigger as the first_len minimum.<br/><br/>Default: 4</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_multi_first_len_minimum="
-MinVal=1
-MaxVal=20
-ValueDefault=4
-
-[Cmt Insert File Header]
-Category=8
-Description="<html>Path to a file that contains text to insert at the beginning of a file if<br/>the file doesn't start with a C/C++ comment. If the inserted text contains<br/>'$(filename)', that will be replaced with the current file's name.</html>"
-Enabled=false
-CallName=cmt_insert_file_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert File Footer]
-Category=8
-Description="<html>Path to a file that contains text to insert at the end of a file if the<br/>file doesn't end with a C/C++ comment. If the inserted text contains<br/>'$(filename)', that will be replaced with the current file's name.</html>"
-Enabled=false
-CallName=cmt_insert_file_footer=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Func Header]
-Category=8
-Description="<html>Path to a file that contains text to insert before a function definition if<br/>the function isn't preceded by a C/C++ comment. If the inserted text<br/>contains '$(function)', '$(javaparam)' or '$(fclass)', these will be<br/>replaced with, respectively, the name of the function, the javadoc '@param'<br/>and '@return' stuff, or the name of the class to which the member function<br/>belongs.</html>"
-Enabled=false
-CallName=cmt_insert_func_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Class Header]
-Category=8
-Description="<html>Path to a file that contains text to insert before a class if the class<br/>isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',<br/>that will be replaced with the class name.</html>"
-Enabled=false
-CallName=cmt_insert_class_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Oc Msg Header]
-Category=8
-Description="<html>Path to a file that contains text to insert before an Objective-C message<br/>specification, if the method isn't preceded by a C/C++ comment. If the<br/>inserted text contains '$(message)' or '$(javaparam)', these will be<br/>replaced with, respectively, the name of the function, or the javadoc<br/>'@param' and '@return' stuff.</html>"
-Enabled=false
-CallName=cmt_insert_oc_msg_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Before Preproc]
-Category=8
-Description="<html>Whether a comment should be inserted if a preprocessor is encountered when<br/>stepping backwards from a function name.<br/><br/>Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and<br/>cmt_insert_class_header.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_preproc=true|cmt_insert_before_preproc=false
-ValueDefault=false
-
-[Cmt Insert Before Inlines]
-Category=8
-Description="<html>Whether a comment should be inserted if a function is declared inline to a<br/>class definition.<br/><br/>Applies to cmt_insert_func_header.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_inlines=true|cmt_insert_before_inlines=false
-ValueDefault=true
-
-[Cmt Insert Before Ctor Dtor]
-Category=8
-Description="<html>Whether a comment should be inserted if the function is a class constructor<br/>or destructor.<br/><br/>Applies to cmt_insert_func_header.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_ctor_dtor=true|cmt_insert_before_ctor_dtor=false
-ValueDefault=false
-
-[Mod Full Brace Do]
-Category=9
-Description="<html>Add or remove braces on a single-line 'do' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_do=ignore|mod_full_brace_do=add|mod_full_brace_do=remove|mod_full_brace_do=force|mod_full_brace_do=not_defined
-ChoicesReadable="Ignore Mod Full Brace Do|Add Mod Full Brace Do|Remove Mod Full Brace Do|Force Mod Full Brace Do"
-ValueDefault=ignore
-
-[Mod Full Brace For]
-Category=9
-Description="<html>Add or remove braces on a single-line 'for' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_for=ignore|mod_full_brace_for=add|mod_full_brace_for=remove|mod_full_brace_for=force|mod_full_brace_for=not_defined
-ChoicesReadable="Ignore Mod Full Brace For|Add Mod Full Brace For|Remove Mod Full Brace For|Force Mod Full Brace For"
-ValueDefault=ignore
-
-[Mod Full Brace Function]
-Category=9
-Description="<html>(Pawn) Add or remove braces on a single-line function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force|mod_full_brace_function=not_defined
-ChoicesReadable="Ignore Mod Full Brace Function|Add Mod Full Brace Function|Remove Mod Full Brace Function|Force Mod Full Brace Function"
-ValueDefault=ignore
-
-[Mod Full Brace If]
-Category=9
-Description="<html>Add or remove braces on a single-line 'if' statement. Braces will not be<br/>removed if the braced statement contains an 'else'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_if=ignore|mod_full_brace_if=add|mod_full_brace_if=remove|mod_full_brace_if=force|mod_full_brace_if=not_defined
-ChoicesReadable="Ignore Mod Full Brace If|Add Mod Full Brace If|Remove Mod Full Brace If|Force Mod Full Brace If"
-ValueDefault=ignore
-
-[Mod Full Brace If Chain]
-Category=9
-Description="<html>Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either<br/>have, or do not have, braces. If true, braces will be added if any block<br/>needs braces, and will only be removed if they can be removed from all<br/>blocks.<br/><br/>Overrides mod_full_brace_if.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
-ValueDefault=false
-
-[Mod Full Brace If Chain Only]
-Category=9
-Description="<html>Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.<br/>If true, mod_full_brace_if_chain will only remove braces from an 'if' that<br/>does not have an 'else if' or 'else'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_if_chain_only=true|mod_full_brace_if_chain_only=false
-ValueDefault=false
-
-[Mod Full Brace While]
-Category=9
-Description="<html>Add or remove braces on single-line 'while' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_while=ignore|mod_full_brace_while=add|mod_full_brace_while=remove|mod_full_brace_while=force|mod_full_brace_while=not_defined
-ChoicesReadable="Ignore Mod Full Brace While|Add Mod Full Brace While|Remove Mod Full Brace While|Force Mod Full Brace While"
-ValueDefault=ignore
-
-[Mod Full Brace Using]
-Category=9
-Description="<html>Add or remove braces on single-line 'using ()' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_using=ignore|mod_full_brace_using=add|mod_full_brace_using=remove|mod_full_brace_using=force|mod_full_brace_using=not_defined
-ChoicesReadable="Ignore Mod Full Brace Using|Add Mod Full Brace Using|Remove Mod Full Brace Using|Force Mod Full Brace Using"
-ValueDefault=ignore
-
-[Mod Full Brace Nl]
-Category=9
-Description="<html>Don't remove braces around statements that span N newlines</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_full_brace_nl="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Mod Full Brace Nl Block Rem Mlcond]
-Category=9
-Description="<html>Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks<br/>which span multiple lines.<br/><br/>Affects:<br/>  mod_full_brace_for<br/>  mod_full_brace_if<br/>  mod_full_brace_if_chain<br/>  mod_full_brace_if_chain_only<br/>  mod_full_brace_while<br/>  mod_full_brace_using<br/><br/>Does not affect:<br/>  mod_full_brace_do<br/>  mod_full_brace_function</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_nl_block_rem_mlcond=true|mod_full_brace_nl_block_rem_mlcond=false
-ValueDefault=false
-
-[Mod Paren On Return]
-Category=9
-Description="<html>Add or remove unnecessary parenthesis on 'return' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_paren_on_return=ignore|mod_paren_on_return=add|mod_paren_on_return=remove|mod_paren_on_return=force|mod_paren_on_return=not_defined
-ChoicesReadable="Ignore Mod Paren On Return|Add Mod Paren On Return|Remove Mod Paren On Return|Force Mod Paren On Return"
-ValueDefault=ignore
-
-[Mod Pawn Semicolon]
-Category=9
-Description="<html>(Pawn) Whether to change optional semicolons to real semicolons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_pawn_semicolon=true|mod_pawn_semicolon=false
-ValueDefault=false
-
-[Mod Full Paren If Bool]
-Category=9
-Description="<html>Whether to fully parenthesize Boolean expressions in 'while' and 'if'<br/>statement, as in 'if (a &amp;&amp; b &gt; c)' =&gt; 'if (a &amp;&amp; (b &gt; c))'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false
-ValueDefault=false
-
-[Mod Remove Extra Semicolon]
-Category=9
-Description="<html>Whether to remove superfluous semicolons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_remove_extra_semicolon=true|mod_remove_extra_semicolon=false
-ValueDefault=false
-
-[Mod Add Long Function Closebrace Comment]
-Category=9
-Description="<html>If a function body exceeds the specified number of newlines and doesn't have<br/>a comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_function_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Namespace Closebrace Comment]
-Category=9
-Description="<html>If a namespace body exceeds the specified number of newlines and doesn't<br/>have a comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_namespace_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Class Closebrace Comment]
-Category=9
-Description="<html>If a class body exceeds the specified number of newlines and doesn't have a<br/>comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_class_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Switch Closebrace Comment]
-Category=9
-Description="<html>If a switch body exceeds the specified number of newlines and doesn't have a<br/>comment after the close brace, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_switch_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Ifdef Endif Comment]
-Category=9
-Description="<html>If an #ifdef body exceeds the specified number of newlines and doesn't have<br/>a comment after the #endif, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_ifdef_endif_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Ifdef Else Comment]
-Category=9
-Description="<html>If an #ifdef or #else body exceeds the specified number of newlines and<br/>doesn't have a comment after the #else, a comment will be added.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_ifdef_else_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Sort Case Sensitive]
-Category=9
-Description="<html>Whether to take care of the case by the mod_sort_xx options.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_case_sensitive=true|mod_sort_case_sensitive=false
-ValueDefault=false
-
-[Mod Sort Import]
-Category=9
-Description="<html>Whether to sort consecutive single-line 'import' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_import=true|mod_sort_import=false
-ValueDefault=false
-
-[Mod Sort Using]
-Category=9
-Description="<html>(C#) Whether to sort consecutive single-line 'using' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_using=true|mod_sort_using=false
-ValueDefault=false
-
-[Mod Sort Include]
-Category=9
-Description="<html>Whether to sort consecutive single-line '#include' statements (C/C++) and<br/>'#import' statements (Objective-C). Be aware that this has the potential to<br/>break your code if your includes/imports have ordering dependencies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_include=true|mod_sort_include=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Filename]
-Category=9
-Description="<html>Whether to prioritize '#include' and '#import' statements that contain<br/>filename without extension when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_filename=true|mod_sort_incl_import_prioritize_filename=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Extensionless]
-Category=9
-Description="<html>Whether to prioritize '#include' and '#import' statements that does not<br/>contain extensions when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_extensionless=true|mod_sort_incl_import_prioritize_extensionless=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Angle Over Quotes]
-Category=9
-Description="<html>Whether to prioritize '#include' and '#import' statements that contain<br/>angle over quotes when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_angle_over_quotes=true|mod_sort_incl_import_prioritize_angle_over_quotes=false
-ValueDefault=false
-
-[Mod Sort Incl Import Ignore Extension]
-Category=9
-Description="<html>Whether to ignore file extension in '#include' and '#import' statements<br/>for sorting comparison.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_ignore_extension=true|mod_sort_incl_import_ignore_extension=false
-ValueDefault=false
-
-[Mod Sort Incl Import Grouping Enabled]
-Category=9
-Description="<html>Whether to group '#include' and '#import' statements when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_grouping_enabled=true|mod_sort_incl_import_grouping_enabled=false
-ValueDefault=false
-
-[Mod Move Case Break]
-Category=9
-Description="<html>Whether to move a 'break' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } break;' =&gt; 'case X: { ... break; }'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_move_case_break=true|mod_move_case_break=false
-ValueDefault=false
-
-[Mod Case Brace]
-Category=9
-Description="<html>Add or remove braces around a fully braced case statement. Will only remove<br/>braces if there are no variable declarations in the block.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_case_brace=ignore|mod_case_brace=add|mod_case_brace=remove|mod_case_brace=force|mod_case_brace=not_defined
-ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
-ValueDefault=ignore
-
-[Mod Remove Empty Return]
-Category=9
-Description="<html>Whether to remove a void 'return;' that appears as the last statement in a<br/>function.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_remove_empty_return=true|mod_remove_empty_return=false
-ValueDefault=false
-
-[Mod Enum Last Comma]
-Category=9
-Description="<html>Add or remove the comma after the last value of an enumeration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_enum_last_comma=ignore|mod_enum_last_comma=add|mod_enum_last_comma=remove|mod_enum_last_comma=force|mod_enum_last_comma=not_defined
-ChoicesReadable="Ignore Mod Enum Last Comma|Add Mod Enum Last Comma|Remove Mod Enum Last Comma|Force Mod Enum Last Comma"
-ValueDefault=ignore
-
-[Mod Sort Oc Properties]
-Category=9
-Description="<html>(OC) Whether to organize the properties. If true, properties will be<br/>rearranged according to the mod_sort_oc_property_*_weight factors.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_oc_properties=true|mod_sort_oc_properties=false
-ValueDefault=false
-
-[Mod Sort Oc Property Class Weight]
-Category=9
-Description="<html>(OC) Weight of a class property modifier.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_class_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Thread Safe Weight]
-Category=9
-Description="<html>(OC) Weight of 'atomic' and 'nonatomic'.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_thread_safe_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Readwrite Weight]
-Category=9
-Description="<html>(OC) Weight of 'readwrite' when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_readwrite_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Reference Weight]
-Category=9
-Description="<html>(OC) Weight of a reference type specifier ('retain', 'copy', 'assign',<br/>'weak', 'strong') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_reference_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Getter Weight]
-Category=9
-Description="<html>(OC) Weight of getter type ('getter=') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_getter_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Setter Weight]
-Category=9
-Description="<html>(OC) Weight of setter type ('setter=') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_setter_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Nullability Weight]
-Category=9
-Description="<html>(OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',<br/>'null_resettable') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_nullability_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Pp Indent]
-Category=10
-Description="<html>Add or remove indentation of preprocessor directives inside #if blocks<br/>at brace level 0 (file-level).</html>"
-Enabled=false
-EditorType=multiple
-Choices=pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force|pp_indent=not_defined
-ChoicesReadable="Ignore Pp Indent|Add Pp Indent|Remove Pp Indent|Force Pp Indent"
-ValueDefault=ignore
-
-[Pp Indent At Level]
-Category=10
-Description="<html>Whether to indent #if/#else/#endif at the brace level. If false, these are<br/>indented from column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false
-ValueDefault=false
-
-[Pp Indent Count]
-Category=10
-Description="<html>Specifies the number of columns to indent preprocessors per level<br/>at brace level 0 (file-level). If pp_indent_at_level=false, also specifies<br/>the number of columns to indent preprocessors per level<br/>at brace level &gt; 0 (function-level).<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_count="
-MinVal=0
-MaxVal=16
-ValueDefault=1
-
-[Pp Space]
-Category=10
-Description="<html>Add or remove space after # based on pp_level of #if blocks.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force|pp_space=not_defined
-ChoicesReadable="Ignore Pp Space|Add Pp Space|Remove Pp Space|Force Pp Space"
-ValueDefault=ignore
-
-[Pp Space Count]
-Category=10
-Description="<html>Sets the number of spaces per level added with pp_space.</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_space_count="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Pp Indent Region]
-Category=10
-Description="<html>The indent for '#region' and '#endregion' in C# and '#pragma region' in<br/>C/C++. Negative values decrease indent down to the first column.</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_region="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Pp Region Indent Code]
-Category=10
-Description="<html>Whether to indent the code between #region and #endregion.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_region_indent_code=true|pp_region_indent_code=false
-ValueDefault=false
-
-[Pp Indent If]
-Category=10
-Description="<html>If pp_indent_at_level=true, sets the indent for #if, #else and #endif when<br/>not at file-level. Negative values decrease indent down to the first column.<br/><br/>=0: Indent preprocessors using output_tab_size<br/>&gt;0: Column at which all preprocessors will be indented</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_if="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Pp If Indent Code]
-Category=10
-Description="<html>Whether to indent the code between #if, #else and #endif.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_if_indent_code=true|pp_if_indent_code=false
-ValueDefault=false
-
-[Pp Define At Level]
-Category=10
-Description="<html>Whether to indent '#define' at the brace level. If false, these are<br/>indented from column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_define_at_level=true|pp_define_at_level=false
-ValueDefault=false
-
-[Pp Ignore Define Body]
-Category=10
-Description="<html>Whether to ignore the '#define' body while formatting.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_ignore_define_body=true|pp_ignore_define_body=false
-ValueDefault=false
-
-[Pp Indent Case]
-Category=10
-Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the case statements<br/>directly inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_case=true|pp_indent_case=false
-ValueDefault=true
-
-[Pp Indent Func Def]
-Category=10
-Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the function definition<br/>is directly inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_func_def=true|pp_indent_func_def=false
-ValueDefault=true
-
-[Pp Indent Extern]
-Category=10
-Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the extern block is<br/>directly inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_extern=true|pp_indent_extern=false
-ValueDefault=true
-
-[Pp Indent Brace]
-Category=10
-Description="<html>Whether to indent braces directly inside #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the braces are directly<br/>inside of.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_brace=true|pp_indent_brace=false
-ValueDefault=true
-
-[Include Category 0]
-Category=11
-Description="<html>The regex for include category with priority 0.</html>"
-Enabled=false
-CallName=include_category_0=
-EditorType=string
-ValueDefault=
-
-[Include Category 1]
-Category=11
-Description="<html>The regex for include category with priority 1.</html>"
-Enabled=false
-CallName=include_category_1=
-EditorType=string
-ValueDefault=
-
-[Include Category 2]
-Category=11
-Description="<html>The regex for include category with priority 2.</html>"
-Enabled=false
-CallName=include_category_2=
-EditorType=string
-ValueDefault=
-
-[Use Indent Func Call Param]
-Category=12
-Description="<html>true:  indent_func_call_param will be used (default)<br/>false: indent_func_call_param will NOT be used<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_indent_func_call_param=true|use_indent_func_call_param=false
-ValueDefault=true
-
-[Use Indent Continue Only Once]
-Category=12
-Description="<html>The value of the indentation for a continuation line is calculated<br/>differently if the statement is:<br/>- a declaration: your case with QString fileName ...<br/>- an assignment: your case with pSettings = new QSettings( ...<br/><br/>At the second case the indentation value might be used twice:<br/>- at the assignment<br/>- at the function call (if present)<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indent_continue will be used only once<br/>false: indent_continue will be used every time (default)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
-ValueDefault=false
-
-[Indent Cpp Lambda Only Once]
-Category=12
-Description="<html>The value might be used twice:<br/>- at the assignment<br/>- at the opening brace<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indentation will be used only once<br/>false: indentation will be used every time (default)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
-ValueDefault=false
-
-[Use Sp After Angle Always]
-Category=12
-Description="<html>Whether sp_after_angle takes precedence over sp_inside_fparen. This was the<br/>historic behavior, but is probably not the desired behavior, so this is off<br/>by default.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_sp_after_angle_always=true|use_sp_after_angle_always=false
-ValueDefault=false
-
-[Use Options Overriding For Qt Macros]
-Category=12
-Description="<html>Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,<br/>this tries to format these so that they match Qt's normalized form (i.e. the<br/>result of QMetaObject::normalizedSignature), which can slightly improve the<br/>performance of the QObject::connect call, rather than how they would<br/>otherwise be formatted.<br/><br/>See options_for_QT.cpp for details.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_options_overriding_for_qt_macros=true|use_options_overriding_for_qt_macros=false
-ValueDefault=true
-
-[Use Form Feed No More As Whitespace Character]
-Category=12
-Description="<html>If true: the form feed character is removed from the list of whitespace<br/>characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_form_feed_no_more_as_whitespace_character=true|use_form_feed_no_more_as_whitespace_character=false
-ValueDefault=false
-
-[Warn Level Tabs Found In Verbatim String Literals]
-Category=13
-Description="<html>(C#) Warning is given if doing tab-to-\t replacement and we have found one<br/>in a C# verbatim string literal.<br/><br/>Default: 2</html>"
-Enabled=false
-EditorType=numeric
-CallName="warn_level_tabs_found_in_verbatim_string_literals="
-MinVal=1
-MaxVal=3
-ValueDefault=2
-
-[Debug Max Number Of Loops]
-Category=13
-Description="<html>Limit the number of loops.<br/>Used by uncrustify.cpp to exit from infinite loop.<br/>0: no limit.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_max_number_of_loops="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Line Number To Protocol]
-Category=13
-Description="<html>Set the number of the line to protocol;<br/>Used in the function prot_the_line if the 2. parameter is zero.<br/>0: nothing protocol.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_line_number_to_protocol="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Timeout]
-Category=13
-Description="<html>Set the number of second(s) before terminating formatting the current file,<br/>0: no timeout.<br/>only for linux</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_timeout="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Truncate]
-Category=13
-Description="<html>Set the number of characters to be printed if the text is too long,<br/>0: do not truncate.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_truncate="
-MinVal=0
-MaxVal=960
-ValueDefault=0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/unmatched_close_pp.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/unmatched_close_pp.txt
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/unmatched_close_pp.txt
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/v-out.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/v-out.txt
deleted file mode 100644
index 129af768..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/v-out.txt
+++ /dev/null
@@ -1 +0,0 @@
-Uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/xyz-err.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/xyz-err.txt
deleted file mode 100644
index a16550ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/xyz-err.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Specify the config file with '-c file' or set UNCRUSTIFY_CONFIG
-Try running with -h for usage information
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/test_cli_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/test_cli_options.py
deleted file mode 100755
index d835822e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/test_cli_options.py
+++ /dev/null
@@ -1,831 +0,0 @@
-#!/usr/bin/python
-
-"""
-test_cli_options.py
-
-Tests output generated by Uncrustifys commandline options
-(excluding actual source code formatting)
-
-:author:  DanielChumak
-:license: GPL v2+
-"""
-
-from __future__ import print_function
-from sys import stderr, argv, exit as sys_exit
-from os import mkdir, remove, name as os_name
-from os.path import dirname, relpath, isdir, isfile, join as path_join, split as path_split
-from shutil import rmtree, copyfile
-from subprocess import Popen, PIPE
-from io import open
-import re
-import difflib
-import argparse
-import pprint
-
-if os_name == 'nt':
-    EX_OK = 0
-    EX_USAGE = 64
-    EX_SOFTWARE = 70
-    NULL_DEVICE = 'nul'
-else:
-    from os import EX_OK, EX_USAGE, EX_SOFTWARE
-    NULL_DEVICE = '/dev/null'
-
-RE_CALLSTACK = r'\[CallStack:( \w+:\w+(, \w+:\w+)*|-DEBUG NOT SET-)?\]'
-RE_DO_SPACE = (r'\n\ndo_space : WARNING: unrecognized do_space:'
-               r'\n[^\n]+\n[^\n]+\n')
-
-
-def eprint(*args, **kwargs):
-    """
-        print() wrapper that sets file=stderr
-    """
-    print(*args, file=stderr, **kwargs)
-
-
-def decode_out(text):
-    text = text.decode('utf-8')
-    text = text.replace(u'\r\n', u'\n')
-    text = text.replace(u'\r', u'\n')
-    return text
-
-
-def proc(bin_path, args_arr=()):
-    """
-    simple Popen wrapper to return std out/err utf8 strings
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param bin_path: string
-        path to the binary that is going to be called
-
-    :param args_arr : list/tuple
-        all needed arguments
-
-
-    :return: string, string
-    ----------------------------------------------------------------------------
-        generated output of both stdout and stderr
-
-    >>> proc("echo", "test")
-    'test'
-    """
-    if not isfile(bin_path):
-        eprint("bin is not a file: %s" % bin_path)
-        return False
-
-    # call uncrustify, hold output in memory
-    call_arr = [bin_path]
-    call_arr.extend(args_arr)
-    proc = Popen(call_arr, stdout=PIPE, stderr=PIPE)
-
-    out_txt, err_txt = proc.communicate()
-
-    return decode_out(out_txt), decode_out(err_txt)
-
-
-def write_to_output_path(output_path, result_str):
-    """
-    writes the contents of result_str to the output path
-    """
-    print("Auto appending differences to: " + output_path)
-
-    '''
-    newline = None: this outputs  \r\n
-    newline = "\r": this outputs  \r
-    newline = "\n": this outputs  \n
-    newline = ""  : this outputs  \n
-    For the sake of consistency, all newlines are now being written out as \n
-    However, if the result_str itself contains \r\n, then \r\n will be output
-    as this code doesn't post process the data being written out
-    '''
-    with open(output_path, 'w', encoding="utf-8", newline="\n") as f:
-        f.write(result_str)
-
-
-def get_file_content(fp):
-    """
-    returns file content as an utf8 string or None if fp is not a file
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param fp: string
-        path of the file that will be read
-
-
-    :return: string or None
-    ----------------------------------------------------------------------------
-    the file content
-
-    """
-    out = None
-
-    if isfile(fp):
-        with open(fp, encoding="utf-8", newline="\n") as f:
-            out = f.read()
-    else:
-        eprint("is not a file: %s" % fp)
-
-    return out
-
-
-def check_generated_output(gen_expected_path, gen_result_path,
-                           result_manip=None, program_args=None):
-    """
-    compares the content of two files,
-
-    is intended to compare a file that was generated during a call of Uncrustify
-    with a file that has the expected content
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param gen_expected_path: string
-        path to a file that will be compared with the generated file
-
-    :param gen_result_path: string
-        path to the file that will be generated by Uncrustify
-
-    :param result_manip: lambda OR list or tuple of lambdas
-        optional lambda function(s) that will be applied (before the comparison)
-        on the content of the generated file,
-        the lambda function(s) should accept one string parameter
-
-    :param program_args: tuple of options
-        a collection of multiple options used to add extra functionality to the
-        script (i.e. auto apply changes or show diffs on command line)
-
-    :return: bool
-    ----------------------------------------------------------------------------
-    True or False depending on whether both files have the same content
-
-    >>> check_generated_output("/dev/null", "/dev/null")
-    True
-    """
-
-    gen_exp_txt = get_file_content(gen_expected_path)
-    if gen_exp_txt is None:
-        return False
-
-    gen_res_txt = get_file_content(gen_result_path)
-    if gen_res_txt is None:
-        return False
-
-    if result_manip is not None:
-        if type(result_manip) is list or type(result_manip) is tuple:
-            for m in result_manip:
-                gen_res_txt = m(gen_res_txt)
-        else:
-            gen_res_txt = result_manip(gen_res_txt)
-
-    if gen_res_txt != gen_exp_txt:
-        with open(gen_result_path, 'w', encoding="utf-8", newline="") as f:
-            f.write(gen_res_txt)
-
-        if program_args.apply and program_args.auto_output_path:
-            write_to_output_path(program_args.auto_output_path, gen_res_txt)
-            return True
-        elif program_args.diff:
-            print("\n************************************")
-            print("Problem (1) with %s" % gen_result_path)
-            print("************************************")
-
-            file_diff = difflib.ndiff(gen_res_txt.splitlines(False),
-                                      gen_exp_txt.splitlines(False))
-
-            for line in file_diff:
-                pprint.PrettyPrinter(indent=4, width=280).pprint(line)
-
-            return False
-        else:
-            print("\nProblem (2) with %s" % gen_result_path)
-            print("use(gen): '--diff' to find out why %s %s are different"
-                  % (gen_result_path, gen_expected_path))
-            return False
-
-    remove(gen_result_path)
-
-    return True
-
-
-def check_std_output(expected_path, result_path, result_str, result_manip=None,
-                     program_args=None):
-    """
-    compares output generated by Uncrustify (std out/err) with a the content of
-    a file
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param expected_path: string
-        path of the file that will be compared with the output of Uncrustify
-
-    :param result_path: string
-        path to which the Uncrustifys output will be saved in case of a mismatch
-
-    :param result_str: string (utf8)
-        the output string generated by Uncrustify
-
-    :param result_manip: lambda OR list or tuple of lambdas
-        see result_manip for check_generated_output
-
-    :param program_args: tuple of options
-        a collection of multiple options used to add extra functionality to the
-        script (i.e. auto apply changes or show diffs on command line)
-
-    :return: bool
-    ----------------------------------------------------------------------------
-    True or False depending on whether both files have the same content
-
-    """
-    exp_txt = get_file_content(expected_path)
-    if exp_txt is None:
-        return False
-
-    if result_manip is not None:
-        if type(result_manip) is list or type(result_manip) is tuple:
-            for m in result_manip:
-                result_str = m(result_str)
-        else:
-            result_str = result_manip(result_str)
-
-    if result_str != exp_txt:
-        with open(result_path, 'w', encoding="utf-8", newline="\n") as f:
-            f.write(result_str)
-
-        if program_args.apply and program_args.auto_output_path:
-            write_to_output_path(program_args.auto_output_path, result_str)
-            return True
-
-        if program_args.diff:
-            print("\n************************************")
-            print("Problem (3) with result_path   is %s" % result_path)
-            print("                 expected_path is %s" % expected_path)
-            print("************************************")
-
-            file_diff = difflib.ndiff(result_str.splitlines(False),
-                                      exp_txt.splitlines(False))
-
-            """
-            change the value of width
-            look at: If compact is false (the default)...
-            """
-            for line in file_diff:
-                pprint.PrettyPrinter(indent=4, width=280).pprint(line)
-        else:
-            print("\nProblem (4) with %s" % result_path)
-            print("use: '--diff' to find out why %s %s are different"
-                  % (result_path, expected_path))
-        return False
-    return True
-
-
-def check_uncrustify_output(
-        uncr_bin,
-        program_args,
-        args_arr=(),
-        out_expected_path=None, out_result_manip=None, out_result_path=None,
-        err_expected_path=None, err_result_manip=None, err_result_path=None,
-        gen_expected_path=None, gen_result_manip=None, gen_result_path=None):
-    """
-    compares outputs generated by Uncrustify with files
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param uncr_bin: string
-        path to the Uncrustify binary
-
-    :param program_args: tuple of options
-        a collection of multiple options used to add extra functionality to the
-        script (i.e. auto apply changes or show diffs on command line)
-
-    :param args_arr: list/tuple
-        Uncrustify commandline arguments
-
-    :param out_expected_path: string
-        file that will be compared with Uncrustifys stdout output
-
-    :param out_result_manip: string
-        lambda function that will be applied to Uncrustifys stdout output
-        (before the comparison with out_expected_path),
-        the lambda function should accept one string parameter
-
-    :param out_result_path: string
-        path where Uncrustifys stdout output will be saved to in case of a
-        mismatch
-
-    :param err_expected_path: string
-        path to a file that will be compared with Uncrustifys stderr output
-
-    :param err_result_manip: string
-        see out_result_manip (is applied to Uncrustifys stderr instead)
-
-    :param err_result_path: string
-        see out_result_path (is applied to Uncrustifys stderr instead)
-
-    :param gen_expected_path: string
-        path to a file that will be compared with a file generated by Uncrustify
-
-    :param gen_result_path: string
-        path to a file that will be generated by Uncrustify
-
-    :param gen_result_manip:
-        see out_result_path (is applied, in memory, to the file content of the
-        file generated by Uncrustify instead)
-
-
-    :return: bool
-    ----------------------------------------------------------------------------
-    True if all specified files match up, False otherwise
-    """
-    # check param sanity
-    if not out_expected_path and not err_expected_path and not gen_expected_path:
-        eprint("No expected comparison file provided")
-        return False
-
-    if bool(gen_expected_path) != bool(gen_result_path):
-        eprint("'gen_expected_path' and 'gen_result_path' must be used in "
-               "combination")
-        return False
-
-    if gen_result_manip and not gen_result_path:
-        eprint("Set up 'gen_result_path' if 'gen_result_manip' is used")
-
-    out_res_txt, err_res_txt = proc(uncr_bin, args_arr)
-
-    ret_flag = True
-
-    if program_args.apply:
-        valid_path = [out_expected_path, err_expected_path, gen_expected_path]
-        program_args.auto_output_path = next(item for item in valid_path if item is not None)
-
-    if out_expected_path and not check_std_output(
-            out_expected_path, out_result_path, out_res_txt,
-            result_manip=out_result_manip,
-            program_args=program_args):
-        ret_flag = False
-
-    if program_args.apply:
-        valid_path = [err_expected_path, out_expected_path, gen_expected_path]
-        program_args.auto_output_path = next(item for item in valid_path if item is not None)
-
-    if err_expected_path and not check_std_output(
-            err_expected_path, err_result_path, err_res_txt,
-            result_manip=err_result_manip,
-            program_args=program_args):
-        ret_flag = False
-
-    if gen_expected_path and not check_generated_output(
-            gen_expected_path, gen_result_path,
-            result_manip=gen_result_manip,
-            program_args=program_args):
-        ret_flag = False
-
-    return ret_flag
-
-
-def clear_dir(path):
-    """
-    clears a directory by deleting and creating it again
-
-
-    Parameters
-    ----------------------------------------------------------------------------
-    :param path:
-        path of the directory
-
-
-    :return: void
-    """
-    if isdir(path):
-        rmtree(path)
-    mkdir(path)
-
-
-def reg_replace(pattern, replacement):
-    """
-    returns a generated lambda function that applies a regex string replacement
-
-
-    Parameters:
-    ----------------------------------------------------------------------------
-
-    :param pattern: regex pattern
-        the pattern that will be used to find targets to replace
-
-    :param replacement: string
-        the replacement that will be applied
-
-
-    :return: lambda function
-    ----------------------------------------------------------------------------
-        the generated lambda function, takes in a string on which the
-        replacement will be applied and returned
-
-    >>>  l = reg_replace(r"a", "b")
-    >>>  a = l("a")
-    'b'
-    """
-    return lambda text: re.sub(pattern, replacement, text)
-
-
-def string_replace(string_target, replacement):
-    """
-    returns a generated lambda function that applies a string replacement
-
-    like reg_replace, uses string.replace() instead
-    """
-    return lambda text: text.replace(string_target, replacement)
-
-
-def s_path_join(path, *paths):
-    """
-    Wrapper for the os.path.join function, splits every path component to
-    replace it with a system specific path separator. This is for consistent
-    path separators (and also systems that don't use either '\' or '/')
-
-
-    Parameter
-    ----------------------------------------------------------------------------
-    :params path, paths: string
-        see os.path.join
-
-    :return: string
-    ----------------------------------------------------------------------------
-        a joined path, see os.path.join
-
-    >>> s_path_join('./z/d/', '../a/b/c/f')
-    r'.\z\a\b\c\f'
-    """
-    p_splits = list(path_split(path))
-    for r in map(path_split, paths):
-        p_splits.extend(r)
-    return path_join(*p_splits)
-
-
-def main(args):
-    # set working dir to script dir
-    script_dir = dirname(relpath(__file__))
-
-    parser = argparse.ArgumentParser(description='Test CLI Options')
-    parser.add_argument('--diff', action='store_true',
-                        help='show diffs when there is a test mismatch')
-    parser.add_argument('--apply', action='store_true',
-                        help='auto apply the changes from the results folder to the output folder')
-    parser.add_argument('--build',
-                        default=s_path_join(script_dir, '../../build'),
-                        help='specify location of the build directory')
-    parser.add_argument('--config',
-                        default='Release',
-                        help='the build_type value (Release or Debug)')
-
-    parsed_args = parser.parse_args()
-
-    # find the uncrustify binary
-    bin_found = False
-    uncr_bin = ''
-    bd_dir = parsed_args.build
-    bin_paths = [s_path_join(bd_dir, 'uncrustify'),
-                 s_path_join(bd_dir, 'uncrustify.exe'),
-                 s_path_join(bd_dir, 'Debug/uncrustify'),
-                 s_path_join(bd_dir, 'Debug/uncrustify.exe'),
-                 s_path_join(bd_dir, 'Release/uncrustify'),
-                 s_path_join(bd_dir, 'Release/uncrustify.exe'),
-                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify'),
-                 s_path_join(bd_dir, 'RelWithDebInfo/uncrustify.exe'),
-                 s_path_join(bd_dir, 'MinSizeRel/uncrustify'),
-                 s_path_join(bd_dir, 'MinSizeRel/uncrustify.exe')]
-    for uncr_bin in bin_paths:
-        if not isfile(uncr_bin):
-            eprint("is not a file: %s" % uncr_bin)
-        else:
-            print("Uncrustify binary found: %s" % uncr_bin)
-            bin_found = True
-            break
-    if not bin_found:
-        eprint("No Uncrustify binary found")
-        sys_exit(EX_USAGE)
-
-    clear_dir(s_path_join(script_dir, "./results"))
-
-    return_flag = True
-
-    #
-    # Test help
-    #   -h -? --help --usage
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            out_expected_path=s_path_join(script_dir, 'output/help.txt'),
-            out_result_path=s_path_join(script_dir, 'results/help.txt'),
-            out_result_manip=[
-                string_replace(' --mtime      : Preserve mtime on replaced files.\n', ''),
-                string_replace('.exe', ''),
-                reg_replace(r'currently \d+ options', 'currently x options')
-            ]):
-        return_flag = False
-
-    #
-    # Test false parameter
-    #   --xyz
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['--xyz'],
-            err_expected_path=s_path_join(script_dir, 'output/xyz-err.txt'),
-            err_result_path=s_path_join(script_dir, 'results/xyz-err.txt')
-            ):
-        return_flag = False
-
-    #
-    # Test Version
-    #   -v
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-v'],
-            out_expected_path=s_path_join(script_dir, 'output/v-out.txt'),
-            out_result_path=s_path_join(script_dir, 'results/v-out.txt'),
-            out_result_manip=reg_replace(r'Uncrustify.+', 'Uncrustify')
-            ):
-        return_flag = False
-
-    #
-    # Test --show-config
-    #
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['--show-config'],
-            out_expected_path=s_path_join(script_dir, 'output/show_config.txt'),
-            out_result_path=s_path_join(script_dir, 'results/show_config.txt'),
-            out_result_manip=reg_replace(r'\# Uncrustify.+', '')
-            ):
-        return_flag = False
-
-    #
-    # Test the truncate option
-    #
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', s_path_join(script_dir, 'config/truncate.cfg'),
-                      '-f', s_path_join(script_dir, 'input/truncate.cpp'),
-                      '-o', NULL_DEVICE,
-                      '-L', '83'],
-            err_expected_path=s_path_join(script_dir, 'output/truncate.txt'),
-            err_result_path=s_path_join(script_dir, 'results/truncate.txt'),
-            err_result_manip=[reg_replace(r'\([0-9]+\)', ' '),
-                              reg_replace(RE_DO_SPACE, '')]
-            ):
-        return_flag = False
-
-    #
-    # Test --update-config
-    #
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', s_path_join(script_dir, 'config/mini_d.cfg'),
-                      '--update-config'],
-            out_expected_path=s_path_join(script_dir, 'output/mini_d_uc.txt'),
-            out_result_path=s_path_join(script_dir, 'results/mini_d_uc.txt'),
-            out_result_manip=reg_replace(r'\# Uncrustify.+', ''),
-            err_expected_path=s_path_join(script_dir, 'output/mini_d_error.txt'),
-            err_result_path=s_path_join(script_dir, 'results/mini_d_error0.txt'),
-            err_result_manip=string_replace('\\', '/')
-            ):
-        return_flag = False
-
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', s_path_join(script_dir, 'config/mini_nd.cfg'),
-                      '--update-config'],
-            out_expected_path=s_path_join(script_dir, 'output/mini_nd_uc.txt'),
-            out_result_path=s_path_join(script_dir, 'results/mini_nd_uc.txt'),
-            out_result_manip=reg_replace(r'\# Uncrustify.+', ''),
-            err_expected_path=s_path_join(script_dir, 'output/mini_d_error.txt'),
-            err_result_path=s_path_join(script_dir, 'results/mini_d_error1.txt'),
-            err_result_manip=string_replace('\\', '/')
-            ):
-        return_flag = False
-
-    #
-    # Test --update-config-with-doc
-    #
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', s_path_join(script_dir, 'config/mini_d.cfg'),
-                      '--update-config-with-doc'],
-            out_expected_path=s_path_join(script_dir, 'output/mini_d_ucwd.txt'),
-            out_result_path=s_path_join(script_dir, 'results/mini_d_ucwd.txt'),
-            out_result_manip=reg_replace(r'\# Uncrustify.+', ''),
-            err_expected_path=s_path_join(script_dir, 'output/mini_d_error.txt'),
-            err_result_path=s_path_join(script_dir, 'results/mini_d_error2.txt'),
-            err_result_manip=string_replace('\\', '/')
-            ):
-        return_flag = False
-
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', s_path_join(script_dir, 'config/mini_nd.cfg'),
-                      '--update-config-with-doc'],
-            out_expected_path=s_path_join(script_dir, 'output/mini_nd_ucwd.txt'),
-            out_result_path=s_path_join(script_dir, 'results/mini_nd_ucwd.txt'),
-            out_result_manip=reg_replace(r'\# Uncrustify.+', ''),
-            err_expected_path=s_path_join(script_dir, 'output/mini_d_error.txt'),
-            err_result_path=s_path_join(script_dir, 'results/mini_d_error3.txt'),
-            err_result_manip=string_replace('\\', '/')
-            ):
-        return_flag = False
-
-    #
-    # Test -p
-    #
-    if os_name != 'nt':
-        if not check_uncrustify_output(
-                uncr_bin,
-                parsed_args,
-                args_arr=['-c', s_path_join(script_dir, 'config/mini_nd.cfg'),
-                          '-f', s_path_join(script_dir, 'input/testSrcP.cpp'),
-                          '-p', s_path_join(script_dir, 'results/p.txt')],
-                gen_expected_path=s_path_join(script_dir, 'output/p.txt'),
-                gen_result_path=s_path_join(script_dir, 'results/p.txt'),
-                gen_result_manip=reg_replace(r'\# Uncrustify.+[^\n\r]', '')
-                ):
-            return_flag = False
-
-        if not check_uncrustify_output(
-                uncr_bin,
-                parsed_args,
-                args_arr=['-f', s_path_join(script_dir, 'input/class_enum_struct_union.cpp'),
-                          '-p', s_path_join(script_dir, 'results/class_enum_struct_union.txt')],
-                gen_expected_path=s_path_join(script_dir, 'output/class_enum_struct_union.txt'),
-                gen_result_path=s_path_join(script_dir, 'results/class_enum_struct_union.txt'),
-                gen_result_manip=reg_replace(r'\# Uncrustify.+[^\n\r]', '')
-                ):
-            return_flag = False
-
-    if os_name == 'nt' or check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', '-',
-                      '-f', NULL_DEVICE,
-                      '-p', '-'],
-            out_expected_path=s_path_join(script_dir, 'output/pc-.txt'),
-            out_result_manip=reg_replace(r'\# Uncrustify.+[^\n\r]', ''),
-            out_result_path=s_path_join(script_dir, 'results/pc-.txt')
-    ):
-        pass
-    #
-    # Test -p and -c with '-' input
-    #
-    else:
-        return_flag = False
-
-    #
-    # Test -p and --debug-csv-format option
-    #
-    if os_name != 'nt' and not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', '-',
-                      '-f', s_path_join(script_dir, 'input/class_enum_struct_union.cpp'),
-                      '-p', s_path_join(script_dir, 'results/class_enum_struct_union.csv'),
-                      '--debug-csv-format'],
-            gen_expected_path=s_path_join(script_dir, 'output/class_enum_struct_union.csv'),
-            gen_result_path=s_path_join(script_dir, 'results/class_enum_struct_union.csv'),
-            ):
-        return_flag = False
-
-    #
-    # Test --tracking_space FILE
-    #
-    if parsed_args.config == 'Release':
-        eprint("Release")
-        if not check_uncrustify_output(
-                uncr_bin,
-                parsed_args,
-                args_arr=['-c', s_path_join(script_dir, 'config/tracking_space.cfg'),
-                          '-f', s_path_join(script_dir, 'input/tracking_space.cpp'),
-                          '--tracking_space', s_path_join(script_dir, 'results/tracking_space.html')],
-                gen_expected_path=s_path_join(script_dir, 'output/tracking_space.html'),
-                gen_result_path=s_path_join(script_dir, 'results/tracking_space.html'),
-                ):
-            return_flag = False
-    else:
-        eprint("Debug")
-        if not check_uncrustify_output(
-                uncr_bin,
-                parsed_args,
-                args_arr=['-c', s_path_join(script_dir, 'config/tracking_space.cfg'),
-                          '-f', s_path_join(script_dir, 'input/tracking_space.cpp'),
-                          '--tracking_space', s_path_join(script_dir, 'results/tracking_space.html')],
-                gen_expected_path=s_path_join(script_dir, 'output/Debug_tracking_space.html'),
-                gen_result_path=s_path_join(script_dir, 'results/tracking_space.html'),
-                ):
-            return_flag = False
-
-    #
-    # Test --replace
-    #
-    copyfile("input/backup.h-save", "input/backup.h")
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', s_path_join(script_dir, 'config/replace.cfg'),
-                      '-F', s_path_join(script_dir, 'input/replace.list'),
-                      '--replace'],
-            gen_expected_path=s_path_join(script_dir, 'output/backup.h'),
-            gen_result_path=s_path_join(script_dir, 'input/backup.h')
-            ):
-        return_flag = False
-
-    # The flag CMAKE_BUILD_TYPE must be set to "Release", or all lines with
-    # 'Description="<html>(<number>)text abc.</html>" must be changed to
-    # 'Description="<html>text abc.</html>"
-    #
-    # OR it is possible to introduce a new parameter: gen_expected_manip
-    #
-    # The last "reg_replace(r'\r', '')" is necessary under Windows, because
-    # fprintf puts a \r\n at the end of a line. To make the check, we use
-    # output/universalindent.cfg, generated under Linux, with only \n at the
-    # end of a line.
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-o', s_path_join(script_dir, 'results/universalindent.cfg'),
-                      '--universalindent'],
-            gen_expected_path=s_path_join(script_dir, 'output/universalindent.cfg'),
-            gen_result_path=s_path_join(script_dir, 'results/universalindent.cfg'),
-            gen_result_manip=[reg_replace(r'version=U.+', ''),
-                              reg_replace(r'\(\d+\)', ''),
-                              reg_replace(r'\r', '')]
-            ):
-        return_flag = False
-
-    # Debug Options:
-    #   -L
-    # look at src/log_levels.h
-    Ls_A = ['9', '21', '25', '28', '31', '36', '66', '92']
-    for L in Ls_A:
-        if not check_uncrustify_output(
-                uncr_bin,
-                parsed_args,
-                args_arr=['-c', NULL_DEVICE, '-L', L, '-o', NULL_DEVICE,
-                          '-f', s_path_join(script_dir, 'input/testSrc.cpp')],
-                err_expected_path=s_path_join(script_dir, 'output/%s.txt' % L),
-                err_result_path=s_path_join(script_dir, 'results/%s.txt' % L),
-                err_result_manip=[reg_replace(r'\([0-9]+\)', ' '),
-                                  reg_replace(r'\:[0-9]+\)', ' '),
-                                  reg_replace(r'\[line [0-9]+', '[ '),
-                                  reg_replace(r'   \[[_|,|1|A-Z]*\]', '   []'),
-                                  reg_replace(r', \[[_|,|1|A-Z]*\]', ', []'),
-                                  reg_replace(r', \[0[xX][0-9a-fA-F]+:[_|,|1|A-Z]*\]', ', []'),
-                                  reg_replace(r'   \[0[xX][0-9a-fA-F]+:[_|,|1|A-Z]*\]', '   []'),
-                                  reg_replace(r'^[ \t]*[_A-Za-z][_A-Za-z0-9]*::', ''),
-                                  reg_replace(RE_CALLSTACK, '[CallStack]'),
-                                  reg_replace(RE_DO_SPACE, '')]
-            ):
-            return_flag = False
-
-    # Test logger buffer overflow
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', NULL_DEVICE, '-L', '99', '-o', NULL_DEVICE,
-                      '-f', s_path_join(script_dir, 'input/logger.cs')],
-            err_expected_path=s_path_join(script_dir, 'output/logger_cs_L_99.txt'),
-            err_result_path=s_path_join(script_dir, 'results/logger_cs_L_99.txt'),
-            err_result_manip=reg_replace(r'[0-9]', '')
-            ):
-        return_flag = False
-
-    # misc error_tests
-    error_tests = ["I-842", "unmatched_close_pp"]
-    for test in error_tests:
-        if not check_uncrustify_output(
-                uncr_bin,
-                parsed_args,
-                args_arr=['-c', s_path_join(script_dir, 'config/%s.cfg' % test),
-                          '-f', s_path_join(script_dir, 'input/%s.cpp' % test),
-                          '-o', NULL_DEVICE, '-q'],
-                err_expected_path=s_path_join(script_dir, 'output/%s.txt' % test),
-                err_result_path=s_path_join(script_dir, 'results/%s.txt' % test)
-                ):
-            return_flag = False
-
-    if return_flag:
-        print("all tests are OK")
-        sys_exit(EX_OK)
-    else:
-        print("some problem(s) are still present")
-        sys_exit(EX_SOFTWARE)
-
-
-if __name__ == "__main__":
-    main(argv[1:])
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1225.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1225.cfg
deleted file mode 100644
index cbc83adb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1225.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-align_func_proto_span    = 2
-align_single_line_func   = True
-nl_func_leave_one_liners = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1438.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1438.cfg
deleted file mode 100644
index 6973c22f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1438.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add or remove space between 'invariant' and '(' in the D language.
-sp_invariant_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1927.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1927.cfg
deleted file mode 100644
index 3734f63d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1927.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-no-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-no-split.cfg
deleted file mode 100644
index 84eba64d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-no-split.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_before_sparen                = force
-sp_inside_braces                = force
-sp_fparen_brace                 = add
-sp_else_brace                   = force
-sp_brace_else                   = force
-indent_columns                  = 3
-nl_func_leave_one_liners        = true
-nl_start_of_file                = remove
-mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-split.cfg
deleted file mode 100644
index e666ea24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-split.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_before_sparen                = force
-indent_columns                  = 3
-nl_start_of_file                = remove
-nl_assign_brace                 = add
-nl_enum_brace                   = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_fdef_brace                   = add
-nl_after_brace_open             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2185.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2185.cfg
deleted file mode 100644
index fda2290c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2185.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 2
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2203.cfg
deleted file mode 100644
index e9c359cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2203.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type = Remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/615_nested_usings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/615_nested_usings.cfg
deleted file mode 100644
index ae152fd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/615_nested_usings.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_using_block = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/620_getset-brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/620_getset-brace.cfg
deleted file mode 100644
index 8e5510d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/620_getset-brace.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_class                    = true
-nl_getset_leave_one_liners      = true
-nl_getset_brace                 = force
-nl_property_brace               = force
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/623_caret-spacing.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/623_caret-spacing.cfg
deleted file mode 100644
index 4d60daa9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/623_caret-spacing.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_arith = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/625_where-constraints.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/625_where-constraints.cfg
deleted file mode 100644
index a6fa8175..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/625_where-constraints.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_inside_angle                 = remove
-sp_angle_shift                  = remove
-sp_after_comma                  = add
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/633_decl-in-func-typedef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/633_decl-in-func-typedef.cfg
deleted file mode 100644
index 5ca47821..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/633_decl-in-func-typedef.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_arith = add
-sp_before_ptr_star = force
-sp_after_ptr_star = remove
-sp_ptr_star_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-0.cfg
deleted file mode 100644
index 8aef4713..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-0.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns         = 3
-indent_with_tabs       = 0
-#
-align_assign_decl_func = 0
-#
-align_assign_span      = 6
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-1.cfg
deleted file mode 100644
index f97e0abe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-1.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns         = 3
-indent_with_tabs       = 0
-#
-align_assign_decl_func = 1
-#
-align_assign_span      = 6
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-2.cfg
deleted file mode 100644
index 6c39bace..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-2.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns         = 3
-indent_with_tabs       = 0
-#
-align_assign_decl_func = 2
-#
-align_assign_span      = 6
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I1112-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I1112-2.cfg
deleted file mode 100644
index 6b1bba41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I1112-2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_continue                 = 8
-indent_access_spec_body         = true
-
-#indent_member should not be used in I1112-2.cpp
-indent_member                   = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I2103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I2103.cfg
deleted file mode 100644
index 5c34ca18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I2103.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_byref = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue-2278.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue-2278.cfg
deleted file mode 100644
index 80ba4f6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue-2278.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Try to limit code width to N columns.</html>"
-code_width = 100
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params = true
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style = 2
-
-
-align_func_params_span = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1052.cfg
deleted file mode 100644
index 91fe8899..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1052.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_create_list_one_liner = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1122.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1122.cfg
deleted file mode 100644
index 8a152eda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1122.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_throw = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-f.cfg
deleted file mode 100644
index bec692b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_after_member  = force
-nl_before_member = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-r.cfg
deleted file mode 100644
index 1c610373..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_after_member  = remove
-nl_before_member = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1167.cfg
deleted file mode 100644
index feb56c83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1167.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_template_start               = true
-nl_template_args                = true
-nl_template_end                 = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1184.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1184.cfg
deleted file mode 100644
index 0fdd95de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1184.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_square        = remove
-sp_before_vardef_square = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1460.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1460.cfg
deleted file mode 100644
index 7adee60a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1460.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-set COMMENT_CPP G_DECLARE_FINAL_TYPE
-sp_arith = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1511.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1511.cfg
deleted file mode 100644
index 71c01f4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1511.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_type_name        = force
-nl_func_leave_one_liners = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1692.cfg
deleted file mode 100644
index db3cbdbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1692.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                = 2
-indent_with_tabs              = 0
-indent_switch_case            = 2
-indent_switch_break_with_case = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1703.cfg
deleted file mode 100644
index f8c889ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1703.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_balance_nested_parens = true
-sp_paren_paren           = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1734.cfg
deleted file mode 100644
index 37a4c192..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1734.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_func_body = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1753.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1753.cfg
deleted file mode 100644
index e0e5ab0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1753.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_arith         = add
-sp_cond_colon    = add
-sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1813.cfg
deleted file mode 100644
index ff1ce9d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1813.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-indent_columns                 = 3
-indent_with_tabs               = 0
-indent_namespace               = true
-indent_namespace_single_indent = true
-use_indent_continue_only_once  = true
-indent_cpp_lambda_only_once    = true
-sp_cpp_lambda_paren_brace      = add
-set EXECUTION_CONTEXT DEVICE_LAMBDA_CONTEXT
-set EXECUTION_CONTEXT HOST_DEVICE_LAMBDA_CONTEXT
-set EXECUTION_CONTEXT __host__ __device__
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1845.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1845.cfg
deleted file mode 100644
index 5d339f68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1845.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_annotation = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1923.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1923.cfg
deleted file mode 100644
index f242e902..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1923.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_align_assign = true
-align_assign_span   = 5
-align_var_def_span  = 5
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1966.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1966.cfg
deleted file mode 100644
index be3a873d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1966.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_arith              = add
-pp_ignore_define_body = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2020.cfg
deleted file mode 100644
index 2104e036..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2020.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_func_decl_start = remove
-nl_func_def_start  = remove
-nl_func_call_empty = remove
-nl_func_call_start = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2045.cfg
deleted file mode 100644
index 3fb7cfe9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2045.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns  = 4
-indent_continue = 8
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2085.cfg
deleted file mode 100644
index 2df8ebd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2085.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_type_func             = add
-sp_func_call_paren       = remove
-sp_func_call_paren_empty = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2090.cfg
deleted file mode 100644
index f6e8529b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2090.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_type_question = force
-sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2091.cfg
deleted file mode 100644
index 898b035b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2091.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_sort_include = true
-mod_sort_case_sensitive = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2101.cfg
deleted file mode 100644
index 44e5a0e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2101.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns    = 4
-indent_with_tabs  = 0
-
-# The position of conditional (b ? t : f) operators in wrapped expressions.
-pos_conditional   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2149.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2149.cfg
deleted file mode 100644
index 23a8583a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2149.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_namespace   = true
-indent_continue    = 8
-indent_shift       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2150.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2150.cfg
deleted file mode 100644
index 5f518291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2150.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2151.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2151.cfg
deleted file mode 100644
index 0660e498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2151.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_unnamed_byref = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2163.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2163.cfg
deleted file mode 100644
index b7c31fe2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2163.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_func_body_def = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2166.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2166.cfg
deleted file mode 100644
index 2b473436..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2166.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_cpp_lambda_leave_one_liners = true
-sp_before_byref                = remove
-indent_columns                 = 3
-indent_with_tabs               = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2170.cfg
deleted file mode 100644
index f66f0022..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2170.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_assign_span      = 1
-align_assign_decl_func = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2172.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2172.cfg
deleted file mode 100644
index a4da88d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2172.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns = 3
-nl_if_brace    = add
-pos_enum_comma = trail_force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2186.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2186.cfg
deleted file mode 100644
index d694b699..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2186.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_namespace_brace      = force
-indent_namespace        = true
-indent_namespace_limit  = 10
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2195.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2195.cfg
deleted file mode 100644
index 0c70840d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2195.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_after_if                     = force
-cmt_indent_multi                = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2219.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2219.cfg
deleted file mode 100644
index 865142a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2219.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_for = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2224.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2224.cfg
deleted file mode 100644
index 8973a14f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2224.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-nl_create_if_one_liner          = true
-mod_full_brace_if               = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2229.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2229.cfg
deleted file mode 100644
index 8527cbb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2229.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if = remove
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2232.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2232.cfg
deleted file mode 100644
index 06730341..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2232.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2236.cfg
deleted file mode 100644
index 6d30f256..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2236.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns               = 4
-indent_with_tabs             = 0
-indent_class                 = true
-align_assign_span            = 5
-sp_assign_default            = force
-align_assign_func_proto_span = 4
-align_assign_decl_func       = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2250.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2250.cfg
deleted file mode 100644
index 94a8d306..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2250.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 3
-indent_func_proto_param         = true
-indent_func_param_double        = true
-nl_cpp_lambda_leave_one_liners  = true
-pos_bool                        = trail
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2270.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2270.cfg
deleted file mode 100644
index 43cc3757..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2270.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_vala_after_translation = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2279.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2279.cfg
deleted file mode 100644
index 1f646668..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2279.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_ptr_star       = force
-align_var_def_span       = 1
-align_var_def_star_style = 1
-align_assign_span        = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2281.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2281.cfg
deleted file mode 100644
index 1d8b164e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2281.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_with_tabs              = 0
-indent_switch_break_with_case = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2302.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2302.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2302.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2305.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2305.cfg
deleted file mode 100644
index 7200d9ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2305.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_columns   = 4
-indent_with_tabs = 0
-indent_class     = true
-
-nl_class_brace      = force
-
-nl_constr_colon     = force
-pos_constr_colon    = lead_force
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2319.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2319.cfg
deleted file mode 100644
index aeb132b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2319.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_arith                        = force # this one actually works
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2343.cfg
deleted file mode 100644
index 955a1f9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2343.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cmt_with_tabs            = false
-indent_class_on_colon           = true
-indent_constr_colon             = true
-indent_relative_single_line_comments = true
-indent_access_spec_body         = true
-nl_func_leave_one_liners        = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 4
-nl_before_opening_brace_func_class_def = force
-nl_class_colon                  = add
-pos_class_colon                 = lead
-align_var_class_span            = 3
-align_var_struct_span           = 3
-pp_if_indent_code               = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2345.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2345.cfg
deleted file mode 100644
index 27213b45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2345.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Whether to indent the body of a 'namespace'.
-indent_namespace = true
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-a.cfg
deleted file mode 100644
index 85052020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-a.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_multi_line_sparen_open = force
-nl_multi_line_sparen_close = force
-nl_before_if_closing_paren = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-b.cfg
deleted file mode 100644
index b61841cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-b.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_multi_line_sparen_open = false
-nl_multi_line_sparen_close = remove
-nl_before_if_closing_paren = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2368.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2368.cfg
deleted file mode 100644
index d1496108..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2368.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_same_func_call_params = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2383.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2383.cfg
deleted file mode 100644
index 313d9efb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2383.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_before_block_comment         = 2
-nl_before_c_comment             = 2
-nl_before_cpp_comment           = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2386.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2386.cfg
deleted file mode 100644
index 3a121c2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2386.cfg
+++ /dev/null
@@ -1 +0,0 @@
-use_form_feed_no_more_as_whitespace_character = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2411.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2411.cfg
deleted file mode 100644
index a4770ec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2411.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_with_tabs = 1
-cmt_convert_tab_to_spaces = false
-cmt_indent_multi = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2428.cfg
deleted file mode 100644
index 8af28414..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2428.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_with_tabs       = 0
-sp_type_brace_init_lst = remove
-sp_word_brace_init_lst = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2437.cfg
deleted file mode 100644
index b21679ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2437.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_func_proto_paren = remove
-sp_func_type_paren  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440.cfg
deleted file mode 100644
index 3da56066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pp_region_indent_code = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440_nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440_nl.cfg
deleted file mode 100644
index 3da56066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440_nl.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pp_region_indent_code = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2478.cfg
deleted file mode 100644
index bb4425d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2478.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span              = 1
-align_assign_span               = 1
-align_var_class_span            = 1
-align_left_shift                 = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2561.cfg
deleted file mode 100644
index 03a40504..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2561.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_func_def_paren               = force
-indent_columns                  = 3
-nl_func_leave_one_liners        = true
-nl_func_type_name               = force
-mod_add_long_function_closebrace_comment = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2570.cfg
deleted file mode 100644
index 6a9f2d25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2570.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_remove_extra_semicolon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2574.cfg
deleted file mode 100644
index d96f0980..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2574.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-output_tab_size                 = 2
-sp_after_comma                  = force
-indent_columns                  = 2
-indent_with_tabs                = 2
-indent_member                   = 2
-nl_fcall_brace                  = force
-nl_after_semicolon              = true
-nl_before_member                = force
-nl_remove_extra_newlines        = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2582.cfg
deleted file mode 100644
index f634b12e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2582.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 2
-
-# How to indent a close parenthesis after a newline.
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2586.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2586.cfg
deleted file mode 100644
index ff46f80d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2586.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_assign      = force

-indent_columns = 4

-nl_end_of_file = remove

-pos_assign     = join

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cf b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cf
deleted file mode 100644
index b93c5f06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cf
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns      = 2

-indent_align_assign = false

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cfg
deleted file mode 100644
index 6ca8934c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns          = 2
-indent_align_assign     = false
-indent_off_after_assign = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2594.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2594.cfg
deleted file mode 100644
index 6d847dfc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2594.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-output_tab_size                 = 4
-sp_before_ellipsis              = remove
-sp_inside_braces                = remove
-sp_brace_else                   = force
-indent_columns                  = 4
-nl_func_leave_one_liners        = true
-nl_if_brace                     = add
-nl_brace_else                   = remove
-nl_create_if_one_liner          = true
-mod_full_brace_if_chain         = true
-mod_full_brace_nl               = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2596.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2596.cfg
deleted file mode 100644
index b6338859..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2596.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_with_tabs = 0
-sp_cond_colon    = ignore
-sp_cond_question = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2604.cfg
deleted file mode 100644
index daeb9bc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2604.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args   = remove   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args    = remove   # ignore/add/remove/force`
-
-nl_func_call_args   = remove
-
-sp_after_comma      = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2640.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2640.cfg
deleted file mode 100644
index a4dd2354..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2640.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2668.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2668.cfg
deleted file mode 100644
index 7649b34c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2668.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_end = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2688.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2688.cfg
deleted file mode 100644
index 4baf4b3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2688.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_arith         = true
-sp_bool          = true
-sp_compare       = true
-indent_columns   = 2
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2689.cfg
deleted file mode 100644
index e498e830..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2689.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_after_ptr_star  = remove
-indent_columns     = 3
-indent_class       = true
-indent_label       = 2
-indent_access_spec = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2692.cfg
deleted file mode 100644
index bce2060e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2692.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_start = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2703.cfg
deleted file mode 100644
index 80c42da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2703.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_columns           = 4
-indent_with_tabs         = 0
-#Whether to align variable definitions in prototypes and functions.
-align_func_params        = true
-#The span for aligning parameter definitions in function on parameter name.
-#  0: Don't align (default).
-align_func_params_span   = 1
-sp_after_byref           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2705.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2705.cfg
deleted file mode 100644
index 0a3ecb71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2705.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_remove_empty_return         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2734.cfg
deleted file mode 100644
index 83fdd868..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2734.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_balance_nested_parens        = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2735.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2735.cfg
deleted file mode 100644
index 32a72aa2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2735.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_switch_case              = 4
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2742.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2742.cfg
deleted file mode 100644
index eba0468c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2742.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_var_def_span = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2752.cfg
deleted file mode 100644
index e15e7702..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2752.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_insert_file_footer = "footer.txt"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2757.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2757.cfg
deleted file mode 100644
index e2118df5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2757.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns           = 4
-indent_with_tabs         = 0
-align_func_params        = true
-align_func_params_span   = 1
-align_func_params_gap    = 0
-align_func_params_thresh = 0
-sp_after_byref           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2758.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2758.cfg
deleted file mode 100644
index dd2d0f6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2758.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_call_start = force
-nl_func_call_end   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2759.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2759.cfg
deleted file mode 100644
index abdc53f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2759.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-nl_constr_colon          = force
-nl_constr_init_args      = force
-pos_constr_comma         = trail
-pos_constr_colon         = lead
-indent_columns           = 4
-indent_ctor_init         = 0
-indent_ctor_init_leading = 2
-indent_constr_colon      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2771.cfg
deleted file mode 100644
index b34e82a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2771.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_with_tabs         = 0
-indent_class             = true
-align_func_proto_span    = 1
-align_single_line_func   = true
-align_on_operator        = true
-nl_func_leave_one_liners = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2794.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2794.cfg
deleted file mode 100644
index c193054f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2794.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_with_tabs       = 0
-nl_after_func_body     = 3
-cmt_width              = 75
-cmt_star_cont          = true
-cmt_sp_after_star_cont = 1
-
-cmt_indent_multi       = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2795.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2795.cfg
deleted file mode 100644
index 353cafa8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2795.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns               = 4
-nl_create_func_def_one_liner = true
-code_width                   = 140
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2823.cfg
deleted file mode 100644
index de58e056..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2823.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2831.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2831.cfg
deleted file mode 100644
index e7271af0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2831.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_proto_span = 1
-align_mix_var_proto   = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2836.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2836.cfg
deleted file mode 100644
index 41151a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2836.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add or remove newline between 'if' and '{'.
-nl_if_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2873.cfg
deleted file mode 100644
index be881c98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2873.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns      = 4
-indent_with_tabs    = 0
-indent_class        = true
-nl_constr_init_args = remove
-nl_class_init_args  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2879.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2879.cfg
deleted file mode 100644
index ba98f974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2879.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_bool         = add
-sp_before_byref = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2886.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2886.cfg
deleted file mode 100644
index eb4b5ca2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2886.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_compare = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2890.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2890.cfg
deleted file mode 100644
index 81ba72ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2890.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_with_tabs = 0
-indent_member_single          = true
-use_indent_continue_only_once = true
-nl_before_member              = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2902.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2902.cfg
deleted file mode 100644
index 5806b371..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2902.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_enum_last_comma = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2907.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2907.cfg
deleted file mode 100644
index fa5b3018..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2907.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 2
-nl_class_leave_one_liners       = true
-nl_before_opening_brace_func_class_def = force
-nl_after_func_class_proto_group = 2
-nl_class_leave_one_liner_groups = true
-eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2914.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2914.cfg
deleted file mode 100644
index 98d4511c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2914.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-nl_func_call_start_multi_line   = true
-nl_func_call_args_multi_line    = true
-indent_columns                  = 4
-indent_with_tabs                = 0
-donot_add_nl_before_cpp_comment = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2921.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2921.cfg
deleted file mode 100644
index 142dc8dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2921.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_func_params_span = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2930.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2930.cfg
deleted file mode 100644
index bd8cb9b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2930.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-output_tab_size                 = 4
-sp_before_ptr_star              = add
-sp_between_ptr_star             = remove
-sp_func_def_paren               = add
-indent_columns                  = 4
-indent_with_tabs                = 0
-donot_indent_func_def_close_paren = true
-nl_func_type_name               = add
-nl_func_def_start               = add
-nl_func_def_args                = add
-nl_func_def_end                 = add
-nl_fdef_brace                   = add
-align_on_tabstop                = true
-align_func_params               = true
-align_var_def_star_style        = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2942.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2942.cfg
deleted file mode 100644
index e72ddc77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2942.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_special_semi = remove
-sp_before_semi  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2949.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2949.cfg
deleted file mode 100644
index b5ea1ffb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2949.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3010.cfg
deleted file mode 100644
index 5f518291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3010.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3025.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3025.cfg
deleted file mode 100644
index 5e545c50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3025.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cmt_cpp_start = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3034.cfg
deleted file mode 100644
index 77557ac3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3034.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-output_tab_size     = 2
-indent_columns      = 2
-nl_after_brace_open = true
-mod_full_brace_if   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3040.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3040.cfg
deleted file mode 100644
index 12c8ebaf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3040.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 2
-indent_switch_case              = 2
-nl_before_case                  = true
-nl_after_case                   = true
-eat_blanks_before_close_brace   = true
-mod_move_case_break             = true
-mod_case_brace                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3044.cfg
deleted file mode 100644
index c2f9ade5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3044.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-output_tab_size       = 2
-indent_columns        = 2
-indent_switch_case    = 2
-nl_before_case        = true
-nl_after_case         = true
-nl_after_switch       = force
-mod_case_brace        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3048.cfg
deleted file mode 100644
index fb4171d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3048.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-output_tab_size                 = 2
-indent_columns                  = 2
-indent_switch_case              = 2
-nl_if_brace                     = force
-nl_else_brace                   = force
-nl_before_case                  = true
-nl_after_case                   = true
-eat_blanks_before_close_brace   = true
-mod_full_brace_if               = add
-mod_case_brace                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3052.cfg
deleted file mode 100644
index f7c29b8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3052.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-input_tab_size        = 4
-output_tab_size       = 4
-indent_columns        = 4
-pp_ignore_define_body = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054-2.cfg
deleted file mode 100644
index a41640f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054-2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns = 2
-nl_fdef_brace  = force
-code_width     = 80
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054.cfg
deleted file mode 100644
index a88303ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_cpp_lambda_square_paren  = remove
-sp_cpp_lambda_argument_list = remove
-sp_cpp_lambda_paren_brace   = remove
-sp_inside_square            = remove
-indent_columns              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3055.cfg
deleted file mode 100644
index 307e5d93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3055.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-pp_space       = force
-pp_space_count = 2
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3058.cfg
deleted file mode 100644
index 1619b851..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3058.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns     = 2
-indent_with_tabs   = 0
-indent_switch_case = 2
-nl_after_case      = true
-mod_case_brace     = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_0nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_0nl.cfg
deleted file mode 100644
index 53a71184..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_0nl.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-cmt_width=30
-code_width=30
-eat_blanks_after_open_brace=true
-nl_inside_empty_func=2
-nl_fdef_brace=force
-indent_columns=4
-indent_class=true
-indent_with_tabs=0
-input_tab_size=4
-nl_func_type_name=force
-nl_before_func_body_def=2
-nl_end_of_file=remove
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_1nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_1nl.cfg
deleted file mode 100644
index ad1c0bbc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_1nl.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-cmt_width=30
-code_width=30
-eat_blanks_after_open_brace=true
-nl_inside_empty_func=2
-nl_fdef_brace=force
-indent_columns=4
-indent_class=true
-indent_with_tabs=0
-input_tab_size=4
-nl_func_type_name=force
-nl_before_func_body_def=2
-nl_end_of_file=force
-nl_end_of_file_min=1
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_2nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_2nl.cfg
deleted file mode 100644
index 27325b31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_2nl.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-cmt_width=30
-code_width=30
-eat_blanks_after_open_brace=true
-nl_inside_empty_func=2
-nl_fdef_brace=force
-indent_columns=4
-indent_class=true
-indent_with_tabs=0
-input_tab_size=4
-nl_func_type_name=force
-nl_before_func_body_def=2
-nl_end_of_file=force
-nl_end_of_file_min=2
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_3nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_3nl.cfg
deleted file mode 100644
index 276c7d72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_3nl.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-cmt_width=30
-code_width=30
-eat_blanks_after_open_brace=true
-nl_inside_empty_func=2
-nl_fdef_brace=force
-indent_columns=4
-indent_class=true
-indent_with_tabs=0
-input_tab_size=4
-nl_func_type_name=force
-nl_before_func_body_def=2
-nl_end_of_file=force
-nl_end_of_file_min=3
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3080.cfg
deleted file mode 100644
index 748a6dad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3080.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_decltype = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3097.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3097.cfg
deleted file mode 100644
index bce2060e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3097.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_start = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_670.cfg
deleted file mode 100644
index 504b1d7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_670.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-code_width                 = 80
-indent_columns             = 4
-indent_continue            = 4
-indent_continue_class_head = 8
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_681.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_681.cfg
deleted file mode 100644
index 901b0c8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_681.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_oc_before_interface      = force
-nl_oc_before_end            = force
-nl_oc_before_implementation = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_931.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_931.cfg
deleted file mode 100644
index 45879950..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_931.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_continue                           = 0
-indent_func_def_param                     = false
-indent_func_def_param_paren_pos_threshold = 40
-indent_with_tabs                          = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_995-do.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_995-do.cfg
deleted file mode 100644
index ba4e6387..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_995-do.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_with_tabs     = 0
-sp_do_brace_open     = force
-sp_brace_close_while = force
-sp_while_paren_open  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-f.cfg
deleted file mode 100644
index 8da1e530..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_start_of_file                = force
-nl_start_of_file_min            = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-r.cfg
deleted file mode 100644
index 329f5112..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_start_of_file                = remove
-nl_end_of_file                  = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/STUCK_macro-difficulties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/STUCK_macro-difficulties.cfg
deleted file mode 100644
index c7ce0fd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/STUCK_macro-difficulties.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_pp_concat = ignore
-
-# try to get rid of the need for this. though is it really possible without uncrustify processing #includes itself?
-# it would have no way otherwise of knowing that 'inline' suddenly is no longer a keyword. really need to add the ability
-# to set this inline in the file that is hitting the trouble instead.
-set WORD inline
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U-J.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U-J.cfg
deleted file mode 100644
index 21e55d74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U-J.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_switch_case              = 4
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_before_return                = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U01-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U01-Cs.cfg
deleted file mode 100644
index 89f36ae7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U01-Cs.cfg
+++ /dev/null
@@ -1,281 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-#mod_add_long_ifdef_else_comment=8
-#mod_add_long_ifdef_endif_comment=8
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cpp.cfg
deleted file mode 100644
index e8b4846a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cs.cfg
deleted file mode 100644
index c7d6aeda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cs.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-input_tab_size                  = 4
-sp_skip_vbrace_tokens           = true
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cpp.cfg
deleted file mode 100644
index d0f33089..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cpp.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_assign                       = add
-sp_after_comma                  = add
-indent_columns                  = 4
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cs.cfg
deleted file mode 100644
index 24961370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cs.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_try_brace                    = force
-nl_brace_catch                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cs.cfg
deleted file mode 100644
index b331f6f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cs.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-input_tab_size                  = 4
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-nl_class_leave_one_liners       = true
-nl_after_func_body              = 2
-eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U05-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U05-Cpp.cfg
deleted file mode 100644
index ac01c51c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U05-Cpp.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cpp.cfg
deleted file mode 100644
index 55fcc716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cpp.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-input_tab_size                  = 4
-sp_inside_sparen                = remove
-indent_columns                  = 4
-nl_if_brace                     = force
-nl_else_brace                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cs.cfg
deleted file mode 100644
index 03c2c765..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cs.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cs_delegate_brace        = true
-indent_class                    = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cpp.cfg
deleted file mode 100644
index 9cee7fef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cpp.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_func_call_paren              = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_func_call_param          = true
-use_options_overriding_for_qt_macros = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cs.cfg
deleted file mode 100644
index b972e1fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cs.cfg
+++ /dev/null
@@ -1,282 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cpp.cfg
deleted file mode 100644
index 967ea74d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_func_proto_paren             = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cs.cfg
deleted file mode 100644
index 31f8df36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cs.cfg
+++ /dev/null
@@ -1,281 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=remove
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cpp.cfg
deleted file mode 100644
index e8b4846a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cs.cfg
deleted file mode 100644
index d74080d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cs.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cs_delegate_brace        = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cpp.cfg
deleted file mode 100644
index 76c1c8c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cpp.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_func_def_paren               = remove
-sp_after_send_oc_colon          = force
-sp_cond_question                = add
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_after_func_body              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cs.cfg
deleted file mode 100644
index 42254ddb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cs.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_inside_fparen                = remove
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cpp.cfg
deleted file mode 100644
index 07ba9e26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cpp.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_sparen                = force
-sp_after_send_oc_colon          = force
-indent_columns                  = 4
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cs.cfg
deleted file mode 100644
index 70557c46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cs.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_single_after_return      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U12-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U12-Cpp.cfg
deleted file mode 100644
index 581594ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U12-Cpp.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_after_cast                   = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cpp.cfg
deleted file mode 100644
index 162b13d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cpp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-input_tab_size                  = 4
-indent_with_tabs                = 0
-pp_ignore_define_body           = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cs.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cs.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U14-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U14-Cpp.cfg
deleted file mode 100644
index 967ea74d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U14-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_func_proto_paren             = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cpp.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cs.cfg
deleted file mode 100644
index 5a700342..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cs.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_class                    = true
-nl_class_leave_one_liners       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U16-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U16-Cpp.cfg
deleted file mode 100644
index 425ee375..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U16-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-input_tab_size                  = 4
-pp_ignore_define_body           = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U18-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U18-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U18-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U21-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U21-Cpp.cfg
deleted file mode 100644
index fd27114f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U21-Cpp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-input_tab_size                  = 4
-sp_after_type                   = ignore
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U23-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U23-Cpp.cfg
deleted file mode 100644
index 04863187..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U23-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_inside_paren                 = remove
-sp_inside_angle                 = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U24-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U24-Cpp.cfg
deleted file mode 100644
index bc46ae54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U24-Cpp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-input_tab_size                  = 4
-indent_columns                  = 4
-pp_ignore_define_body           = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U25-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U25-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U25-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U26-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U26-Cpp.cfg
deleted file mode 100644
index 2e611f4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U26-Cpp.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_func_call_paren              = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_off_after_return_new     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U27-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U27-Cpp.cfg
deleted file mode 100644
index e8b4846a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U27-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U28-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U28-Cpp.cfg
deleted file mode 100644
index ac01c51c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U28-Cpp.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U29-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U29-Cpp.cfg
deleted file mode 100644
index d65f6b27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U29-Cpp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U30-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U30-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U30-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U31-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U31-Cpp.cfg
deleted file mode 100644
index bd45658a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U31-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U33-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U33-Cpp.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U33-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U36-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U36-Cpp.cfg
deleted file mode 100644
index b655be2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U36-Cpp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_class                    = true
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-10496.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-10496.cfg
deleted file mode 100644
index 42f6ee64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-10496.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_dc  = remove
-sp_before_dc = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11095.cfg
deleted file mode 100644
index 6c12366e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11095.cfg
+++ /dev/null
@@ -1,318 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_align_paren=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_namespace_two_to_one_liner=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-nl_create_func_def_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_convert_tab_to_spaces=True
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
-
-# workaround for some nasty macroing we're doing
-set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG
-
-# without this, uncrustify will parse and process the contents of #defines, which is super unstable. very easy to get into edge cases it does not support,
-# so just have it treat #defines as black boxes. this will keep all of the contents of the #define as unprocessed.
-pp_ignore_define_body=true
-
-# macros in #includes aren't known to Uncrustify, so have to inform it here for macros that will confuse it
-set MACRO_FUNC ATTRIBUTE_ALIGN
-
-# we have some truly insane deep namespace nesting in il2cpp. :/
-indent_namespace_single_indent=true
-
-# needed for fmod apparently (via HEVAGTool.h - the *'s near F_STDCALL will be interpreted as ARITH without this)
-set COMMENT F_STDCALL
-
-# https://github.com/uncrustify/uncrustify/pull/602
-# https://sourceforge.net/p/uncrustify/bugs/633/
-set COMMENT __cdecl
-set COMMENT __clrcall
-set COMMENT __fastcall
-set COMMENT __stdcall
-set COMMENT __thiscall
-set COMMENT __vectorcall
-set COMMENT WINAPI
-
-# We need to make FAKE_FUNCTION a PROTO_WRAP macro function to help properly tokenize it's parameters.
-# Previously parameters with CT_AMP and CT_STAR were tokenized as CT_ARITH. Support for optional parenthesis added in github PR #629.
-set PROTO_WRAP FAKE_FUNCTION
-nl_create_func_def_one_liner=true
-sp_inside_braces=Add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11662.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11662.cfg
deleted file mode 100644
index 24cf86a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11662.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-nl_class_leave_one_liners       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11993.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11993.cfg
deleted file mode 100644
index 57e7ff00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11993.cfg
+++ /dev/null
@@ -1,286 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_member_single=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_align_paren=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_namespace_two_to_one_liner=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-nl_create_func_def_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_convert_tab_to_spaces=True
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-12046.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-12046.cfg
deleted file mode 100644
index 4dcd62eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-12046.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_type                   = ignore
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1288.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1288.cfg
deleted file mode 100644
index 3b6cf1b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1288.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_assign                       = add
-sp_fparen_brace_initializer     = add
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_off_after_return_new     = true
-nl_class_leave_one_liners       = true
-nl_after_func_body              = 2
-eat_blanks_after_open_brace     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1338.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1338.cfg
deleted file mode 100644
index 0eef21b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1338.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_fparen_brace                 = add
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-nl_class_leave_one_liners       = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-sp_inside_braces                = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1340.cfg
deleted file mode 100644
index 8a43dca1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1340.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_namespace_two_to_one_liner   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1343.cfg
deleted file mode 100644
index f5276e1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1343.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_namespace                = true
-eat_blanks_before_close_brace   = true
-mod_add_long_namespace_closebrace_comment = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1344.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1344.cfg
deleted file mode 100644
index 9e9937d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1344.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-input_tab_size                  = 4
-indent_columns                  = 4
-indent_ignore_asm_block         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1346.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1346.cfg
deleted file mode 100644
index 4074ff52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1346.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cmt_cpp_start                = Add
-sp_cmt_cpp_doxygen              = True
-indent_columns                  = 4
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1347.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1347.cfg
deleted file mode 100644
index ee4173ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1347.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_extern = true
-set PROTO_WRAP FAKE_FUNCTION
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1350.cfg
deleted file mode 100644
index 082a647f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1350.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_braces_struct = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1356.cfg
deleted file mode 100644
index 948f20b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1356.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 2
-indent_continue                 = 4
-use_indent_continue_only_once   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1358.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1358.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1358.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-13955.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-13955.cfg
deleted file mode 100644
index d1c7c955..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-13955.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_func_call_param          = true
-indent_paren_close              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-14131.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-14131.cfg
deleted file mode 100644
index 7c5535ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-14131.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cs_delegate_brace        = true
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18437.cfg
deleted file mode 100644
index 4ba5e224..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18437.cfg
+++ /dev/null
@@ -1,286 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_align_paren=false    			
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_namespace_two_to_one_liner=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-nl_create_func_def_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_convert_tab_to_spaces=True
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
-indent_member_single=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18777.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18777.cfg
deleted file mode 100644
index 7d4c013e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18777.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_align_assign             = false
-indent_member_single            = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18829.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18829.cfg
deleted file mode 100644
index d65f6b27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18829.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1975.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1975.cfg
deleted file mode 100644
index 80528dc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1975.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1977.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1977.cfg
deleted file mode 100644
index 4563bfde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1977.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-cmt_convert_tab_to_spaces       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1978.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1978.cfg
deleted file mode 100644
index 2cf794e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1978.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_arith                        = add
-sp_inside_fparen                = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-nl_tsquare_brace                = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-19895.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-19895.cfg
deleted file mode 100644
index ac4012d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-19895.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-indent_align_paren              = false
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2020.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2020.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2021.cfg
deleted file mode 100644
index 827d33e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2021.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_func_def_paren               = remove
-sp_fparen_brace                 = add
-nl_func_leave_one_liners        = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_create_func_def_one_liner    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2049.cfg
deleted file mode 100644
index f075ea03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2049.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-21730.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-21730.cfg
deleted file mode 100644
index 5443f32f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-21730.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_comma                 = ignore
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2650.cfg
deleted file mode 100644
index 46279443..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2650.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_paren_close              = 2
-indent_off_after_return_new     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2680.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2680.cfg
deleted file mode 100644
index 99790699..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2680.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_func_call_param          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2684.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2684.cfg
deleted file mode 100644
index c048c827..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2684.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-indent_cs_delegate_brace        = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2685.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2685.cfg
deleted file mode 100644
index 3f25a1fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2685.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_func_call_param          = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-indent_cs_delegate_brace        = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29933.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29933.cfg
deleted file mode 100644
index 2f136516..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29933.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_func_call_param          = true
-indent_switch_case              = 4
-indent_align_assign             = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29935.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29935.cfg
deleted file mode 100644
index f5543d81..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29935.cfg
+++ /dev/null
@@ -1,147 +0,0 @@
-input_tab_size                  = 4
-string_replace_tab_chars        = true
-disable_processing_cmt          = "*begin-nonstandard-formatting*"
-enable_processing_cmt           = "*end-nonstandard-formatting*"
-utf8_bom                        = remove
-sp_arith                        = add
-sp_assign                       = add
-sp_assign_default               = add
-sp_enum_assign                  = add
-sp_pp_concat                    = remove
-sp_pp_stringify                 = remove
-sp_bool                         = add
-sp_compare                      = add
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_paren_brace                  = force
-sp_after_type                   = ignore
-sp_template_angle               = remove
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_angle_paren                  = remove
-sp_angle_paren_empty            = remove
-sp_angle_word                   = add
-sp_angle_shift                  = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_after_sparen                 = add
-sp_sparen_brace                 = force
-sp_special_semi                 = force
-sp_before_semi_for              = remove
-sp_before_semi_for_empty        = remove
-sp_after_semi_for_empty         = remove
-sp_before_square                = remove
-sp_before_squares               = remove
-sp_inside_square                = remove
-sp_after_comma                  = add
-sp_before_comma                 = ignore
-sp_after_mdatype_commas         = remove
-sp_before_mdatype_commas        = remove
-sp_between_mdatype_commas       = remove
-sp_paren_comma                  = remove
-sp_after_class_colon            = force
-sp_before_class_colon           = force
-sp_after_operator               = remove
-sp_after_operator_sym           = remove
-sp_after_operator_sym_empty     = remove
-sp_after_cast                   = remove
-sp_inside_paren_cast            = remove
-sp_cpp_cast_paren               = remove
-sp_sizeof_paren                 = remove
-sp_inside_braces_enum           = add
-sp_inside_braces_empty          = remove
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_inside_fparens               = remove
-sp_inside_fparen                = remove
-sp_fparen_brace                 = add
-sp_func_call_paren              = remove
-sp_func_call_paren_empty        = remove
-sp_func_call_user_paren         = remove
-sp_func_class_paren             = remove
-sp_return_paren                 = add
-sp_defined_paren                = remove
-sp_throw_paren                  = add
-sp_catch_paren                  = add
-sp_brace_typedef                = add
-sp_getset_brace                 = add
-sp_after_dc                     = remove
-sp_after_oc_scope               = force
-sp_after_oc_colon               = remove
-sp_before_oc_colon              = remove
-sp_after_oc_dict_colon          = force
-sp_before_oc_dict_colon         = remove
-sp_after_send_oc_colon          = force
-sp_before_send_oc_colon         = remove
-sp_after_oc_type                = remove
-sp_after_oc_return_type         = remove
-sp_after_oc_at_sel              = remove
-sp_inside_oc_at_sel_parens      = remove
-sp_cond_colon                   = add
-sp_cond_question                = add
-sp_after_new                    = force
-sp_between_new_paren            = remove
-sp_skip_vbrace_tokens           = true
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cs_delegate_brace        = true
-indent_namespace                = true
-indent_class                    = true
-indent_func_call_param          = true
-indent_func_def_param           = true
-indent_func_proto_param         = true
-indent_switch_case              = 4
-indent_label                    = -4
-indent_access_spec              = -4
-indent_align_assign             = false
-indent_align_paren              = false
-indent_oc_block_msg_xcode_style = true
-indent_off_after_return_new     = true
-indent_single_after_return      = true
-nl_assign_leave_one_liners      = true
-nl_class_leave_one_liners       = true
-nl_enum_leave_one_liners        = true
-nl_getset_leave_one_liners      = true
-nl_func_leave_one_liners        = true
-nl_cpp_lambda_leave_one_liners  = true
-nl_oc_msg_leave_one_liner       = true
-nl_start_of_file                = remove
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_assign_brace                 = force
-nl_enum_brace                   = force
-nl_struct_brace                 = force
-nl_union_brace                  = force
-nl_if_brace                     = force
-nl_brace_else                   = force
-nl_else_brace                   = force
-nl_else_if                      = remove
-nl_brace_finally                = force
-nl_finally_brace                = force
-nl_try_brace                    = force
-nl_getset_brace                 = force
-nl_for_brace                    = force
-nl_catch_brace                  = force
-nl_brace_catch                  = force
-nl_while_brace                  = force
-nl_using_brace                  = force
-nl_do_brace                     = force
-nl_brace_while                  = force
-nl_switch_brace                 = force
-nl_case_colon_brace             = force
-nl_namespace_brace              = force
-nl_class_brace                  = force
-nl_fdef_brace                   = force
-nl_max                          = 3
-nl_after_func_body              = 2
-nl_property_brace               = force
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-align_left_shift                = false
-cmt_convert_tab_to_spaces       = true
-cmt_indent_multi                = false
-cmt_multi_check_last            = false
-mod_remove_extra_semicolon      = true
-mod_remove_empty_return         = true
-use_options_overriding_for_qt_macros = false
-warn_level_tabs_found_in_verbatim_string_literals = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30088.cfg
deleted file mode 100644
index 4abe03e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30088.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_align_assign             = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30498_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30498_2.cfg
deleted file mode 100644
index 8f635e72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30498_2.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_func_call_param          = true
-indent_switch_case              = 4
-indent_align_assign             = false
-nl_class_leave_one_liners       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-3083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-3083.cfg
deleted file mode 100644
index 80528dc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-3083.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32657.cfg
deleted file mode 100644
index 034ba33b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32657.cfg
+++ /dev/null
@@ -1,315 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_member_single=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_align_paren=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_namespace_two_to_one_liner=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-nl_create_func_def_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_convert_tab_to_spaces=True
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
-
-# workaround for some nasty macroing we're doing
-set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG
-
-# without this, uncrustify will parse and process the contents of #defines, which is super unstable. very easy to get into edge cases it does not support,
-# so just have it treat #defines as black boxes. this will keep all of the contents of the #define as unprocessed.
-pp_ignore_define_body=true
-
-# macros in #includes aren't known to Uncrustify, so have to inform it here for macros that will confuse it
-set MACRO_FUNC ATTRIBUTE_ALIGN
-
-# we have some truly insane deep namespace nesting in il2cpp. :/
-indent_namespace_single_indent=true
-
-# needed for fmod apparently (via HEVAGTool.h - the *'s near F_STDCALL will be interpreted as ARITH without this)
-set COMMENT F_STDCALL
-
-# https://github.com/uncrustify/uncrustify/pull/602
-# https://sourceforge.net/p/uncrustify/bugs/633/
-set COMMENT __cdecl
-set COMMENT __clrcall
-set COMMENT __fastcall
-set COMMENT __stdcall
-set COMMENT __thiscall
-set COMMENT __vectorcall
-set COMMENT WINAPI
-
-# We need to make FAKE_FUNCTION a PROTO_WRAP macro function to help properly tokenize it's parameters.
-# Previously parameters with CT_AMP and CT_STAR were tokenized as CT_ARITH. Support for optional parenthesis added in github PR #629.
-set PROTO_WRAP FAKE_FUNCTION
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32658.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32658.cfg
deleted file mode 100644
index d6bd63c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32658.cfg
+++ /dev/null
@@ -1,285 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_member_single=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_align_paren=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_namespace_two_to_one_liner=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-nl_create_func_def_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_paren_on_return=ignore
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_convert_tab_to_spaces=True
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-37241.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-37241.cfg
deleted file mode 100644
index 5d377cfd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-37241.cfg
+++ /dev/null
@@ -1,286 +0,0 @@
-input_tab_size=4                                    # Number
-string_replace_tab_chars=true                       # { False, True }
-tok_split_gte=false                                 # { False, True }
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove                                     # { Ignore, Add, Remove, Force }
-utf8_byte=false                                     # { False, True }
-utf8_force=false                                    # { False, True }
-indent_columns=4                                    # Number
-indent_with_tabs=0                                  # Number
-indent_cmt_with_tabs=false                          # { False, True }
-indent_align_string=false                           # { False, True }
-indent_braces=false                                 # { False, True }
-indent_braces_no_func=false                         # { False, True }
-indent_braces_no_class=false                        # { False, True }
-indent_braces_no_struct=false                       # { False, True }
-indent_brace_parent=false                           # { False, True }
-indent_cs_delegate_brace=true                      # { False, True }
-indent_namespace=true                               # { False, True }
-indent_extern=false                                 # { False, True }
-indent_class=true                                   # { False, True }
-indent_class_colon=false                            # { False, True }
-indent_else_if=false                                # { False, True }
-indent_var_def_cont=false                           # { False, True }
-indent_func_call_param=true                         # { False, True }
-indent_func_def_param=true                          # { False, True }
-indent_func_proto_param=true                        # { False, True }
-indent_func_class_param=false                       # { False, True }
-indent_func_ctor_var_param=false                    # { False, True }
-indent_template_param=false                         # { False, True }
-indent_func_param_double=false                      # { False, True }
-indent_member_single=false                          # false/true
-indent_relative_single_line_comments=false          # { False, True }
-indent_switch_case=4                                # Number
-indent_case_shift=0                                 # Number
-indent_case_brace=0                                 # Number
-indent_col1_comment=false                           # { False, True }
-indent_label=-4                                     # Number
-indent_access_spec=-4                               # Number
-indent_paren_nl=false                               # { False, True }
-indent_comma_paren=false                            # { False, True }
-indent_bool_paren=false                             # { False, True }
-indent_first_bool_expr=false                        # { False, True }
-indent_square_nl=false                              # { False, True }
-indent_preserve_sql=false                           # { False, True }
-indent_align_paren=false    						# { False, True }
-indent_oc_block_msg_xcode_style=true                # { False, True }
-indent_off_after_return_new=true                    # { False, True }
-indent_single_after_return=true                     # { False, True }
-sp_arith=add                                        # { Ignore, Add, Remove, Force }
-sp_assign=add                                       # { Ignore, Add, Remove, Force }
-sp_assign_default=add                               # { Ignore, Add, Remove, Force }
-sp_enum_assign=add                                  # { Ignore, Add, Remove, Force }
-sp_pp_concat=remove                                 # { Ignore, Add, Remove, Force }
-sp_pp_stringify=remove                              # { Ignore, Add, Remove, Force }
-sp_bool=add                                         # { Ignore, Add, Remove, Force }
-sp_compare=add                                      # { Ignore, Add, Remove, Force }
-sp_inside_paren=remove                              # { Ignore, Add, Remove, Force }
-sp_paren_paren=remove                               # { Ignore, Add, Remove, Force }
-sp_balance_nested_parens=false                      # { False, True }
-sp_paren_brace=force                                # { Ignore, Add, Remove, Force }
-sp_after_type=ignore                                # { Ignore, Add, Remove, Force }
-sp_template_angle=remove                            # { Ignore, Add, Remove, Force }
-sp_before_angle=remove                              # { Ignore, Add, Remove, Force }
-sp_inside_angle=remove                              # { Ignore, Add, Remove, Force }
-sp_angle_paren=remove                               # { Ignore, Add, Remove, Force }
-sp_angle_paren_empty=remove                         # { Ignore, Add, Remove, Force }
-sp_angle_word=add                                   # { Ignore, Add, Remove, Force }
-sp_angle_shift=remove                               # { Ignore, Add, Remove, Force }
-sp_before_sparen=force                              # { Ignore, Add, Remove, Force }
-sp_inside_sparen=remove                             # { Ignore, Add, Remove, Force }
-sp_after_sparen=add                                 # { Ignore, Add, Remove, Force }
-sp_sparen_brace=force                               # { Ignore, Add, Remove, Force }
-sp_special_semi=force                               # { Ignore, Add, Remove, Force }
-sp_before_semi=remove                               # { Ignore, Add, Remove, Force }
-sp_before_semi_for=remove                           # { Ignore, Add, Remove, Force }
-sp_before_semi_for_empty=remove                     # { Ignore, Add, Remove, Force }
-sp_after_semi=add                                   # { Ignore, Add, Remove, Force }
-sp_after_semi_for=force                             # { Ignore, Add, Remove, Force }
-sp_after_semi_for_empty=remove                      # { Ignore, Add, Remove, Force }
-sp_before_square=remove                             # { Ignore, Add, Remove, Force }
-sp_before_squares=remove                            # { Ignore, Add, Remove, Force }
-sp_inside_square=remove                             # { Ignore, Add, Remove, Force }
-sp_after_comma=add                                  # { Ignore, Add, Remove, Force }
-sp_before_comma=ignore                              # { Ignore, Add, Remove, Force }
-sp_after_mdatype_commas=remove                      # { Ignore, Add, Remove, Force }
-sp_before_mdatype_commas=remove                     # { Ignore, Add, Remove, Force }
-sp_between_mdatype_commas=remove                    # { Ignore, Add, Remove, Force }
-sp_paren_comma=remove                               # { Ignore, Add, Remove, Force }
-sp_after_class_colon=force                          # { Ignore, Add, Remove, Force }
-sp_before_class_colon=force                         # { Ignore, Add, Remove, Force }
-sp_before_case_colon=remove                         # { Ignore, Add, Remove, Force }
-sp_after_operator=remove                            # { Ignore, Add, Remove, Force }
-sp_after_operator_sym=remove                        # { Ignore, Add, Remove, Force }
-sp_after_operator_sym_empty=remove                  # { Ignore, Add, Remove, Force }
-sp_after_cast=remove                                # { Ignore, Add, Remove, Force }
-sp_inside_paren_cast=remove                         # { Ignore, Add, Remove, Force }
-sp_cpp_cast_paren=remove                            # { Ignore, Add, Remove, Force }
-sp_sizeof_paren=remove                              # { Ignore, Add, Remove, Force }
-sp_inside_braces_enum=add                           # { Ignore, Add, Remove, Force }
-sp_inside_braces_empty=remove                       # { Ignore, Add, Remove, Force }
-sp_type_func=ignore                                 # { Ignore, Add, Remove, Force }
-sp_func_proto_paren=remove                          # { Ignore, Add, Remove, Force }
-sp_func_def_paren=remove                            # { Ignore, Add, Remove, Force }
-sp_inside_fparens=remove                            # { Ignore, Add, Remove, Force }
-sp_inside_fparen=remove                             # { Ignore, Add, Remove, Force }
-sp_fparen_brace=add                                 # { Ignore, Add, Remove, Force }
-sp_func_call_paren=remove                           # { Ignore, Add, Remove, Force }
-sp_func_call_paren_empty=remove                     # { Ignore, Add, Remove, Force }
-sp_func_call_user_paren=remove                      # { Ignore, Add, Remove, Force }
-sp_func_class_paren=remove                          # { Ignore, Add, Remove, Force }
-sp_return_paren=add                                 # { Ignore, Add, Remove, Force }
-sp_defined_paren=remove                             # { Ignore, Add, Remove, Force }
-sp_throw_paren=add                                  # { Ignore, Add, Remove, Force }
-sp_catch_paren=add                                  # { Ignore, Add, Remove, Force }
-sp_brace_typedef=add                                # { Ignore, Add, Remove, Force }
-sp_getset_brace=add                                 # { Ignore, Add, Remove, Force }
-sp_after_dc=remove                                 # { Ignore, Add, Remove, Force }
-sp_not=remove                                       # { Ignore, Add, Remove, Force }
-sp_inv=remove                                       # { Ignore, Add, Remove, Force }
-sp_addr=remove                                      # { Ignore, Add, Remove, Force }
-sp_member=remove                                    # { Ignore, Add, Remove, Force }
-sp_deref=remove                                     # { Ignore, Add, Remove, Force }
-sp_sign=remove                                      # { Ignore, Add, Remove, Force }
-sp_incdec=remove                                    # { Ignore, Add, Remove, Force }
-sp_before_nl_cont=add                               # { Ignore, Add, Remove, Force }
-sp_after_oc_scope=force                             # { Ignore, Add, Remove, Force }
-sp_after_oc_colon=remove                            # { Ignore, Add, Remove, Force }
-sp_before_oc_colon=remove                           # { Ignore, Add, Remove, Force }
-sp_after_oc_dict_colon=force                        # { Ignore, Add, Remove, Force }
-sp_before_oc_dict_colon=remove                      # { Ignore, Add, Remove, Force }
-sp_after_send_oc_colon=force                        # { Ignore, Add, Remove, Force }
-sp_before_send_oc_colon=remove                      # { Ignore, Add, Remove, Force }
-sp_after_oc_type=remove                             # { Ignore, Add, Remove, Force }
-sp_after_oc_return_type=remove                      # { Ignore, Add, Remove, Force }
-sp_after_oc_at_sel=remove                           # { Ignore, Add, Remove, Force }
-sp_inside_oc_at_sel_parens=remove                   # { Ignore, Add, Remove, Force }
-sp_cond_colon=add                                   # { Ignore, Add, Remove, Force }
-sp_cond_question=add                                # { Ignore, Add, Remove, Force }
-sp_case_label=ignore                                # { Ignore, Add, Remove, Force }
-sp_after_new=force                                  # { Ignore, Add, Remove, Force }
-sp_between_new_paren=remove                         # { Ignore, Add, Remove, Force }
-sp_skip_vbrace_tokens=true                          # { False, True }
-align_keep_tabs=false                               # { False, True }
-align_with_tabs=false                               # { False, True }
-align_on_tabstop=false                              # { False, True }
-align_number_right=false                             # { False, True }
-align_func_params=false                             # { False, True }
-align_same_func_call_params=false                   # { False, True }
-align_var_def_colon=false                           # { False, True }
-align_var_def_attribute=false                       # { False, True }
-align_var_def_inline=false                          # { False, True }
-align_right_cmt_mix=false                           # { False, True }
-align_on_operator=false                             # { False, True }
-align_mix_var_proto=false                           # { False, True }
-align_single_line_func=false                        # { False, True }
-align_single_line_brace=false                       # { False, True }
-align_nl_cont=false                                 # { False, True }
-align_left_shift=false                              # { False, True }
-nl_collapse_empty_body=false                        # { False, True }
-nl_assign_leave_one_liners=true                     # { False, True }
-nl_class_leave_one_liners=true                      # { False, True }
-nl_enum_leave_one_liners=true                       # { False, True }
-nl_getset_leave_one_liners=true                     # { False, True }
-nl_func_leave_one_liners=true                       # { False, True }
-nl_cpp_lambda_leave_one_liners=true                 # { False, True }
-nl_if_leave_one_liners=false                        # { False, True }
-nl_oc_msg_leave_one_liner=true                      # { False, True }
-nl_start_of_file=remove                             # { Ignore, Add, Remove, Force }
-nl_end_of_file=force                                # { Ignore, Add, Remove, Force }
-nl_end_of_file_min=1                                # Number
-nl_assign_brace=force                               # { Ignore, Add, Remove, Force }
-nl_enum_brace=force                                 # { Ignore, Add, Remove, Force }
-nl_struct_brace=force                               # { Ignore, Add, Remove, Force }
-nl_union_brace=force                                # { Ignore, Add, Remove, Force }
-nl_if_brace=force                                   # { Ignore, Add, Remove, Force }
-nl_brace_else=force                                 # { Ignore, Add, Remove, Force }
-nl_else_brace=force                                 # { Ignore, Add, Remove, Force }
-nl_else_if=remove                                   # { Ignore, Add, Remove, Force }
-nl_brace_finally=force                              # { Ignore, Add, Remove, Force }
-nl_finally_brace=force                              # { Ignore, Add, Remove, Force }
-nl_try_brace=force                                  # { Ignore, Add, Remove, Force }
-nl_getset_brace=force                               # { Ignore, Add, Remove, Force }
-nl_for_brace=force                                  # { Ignore, Add, Remove, Force }
-nl_catch_brace=force                                # { Ignore, Add, Remove, Force }
-nl_brace_catch=force                                # { Ignore, Add, Remove, Force }
-nl_while_brace=force                                # { Ignore, Add, Remove, Force }
-nl_using_brace=force                                # { Ignore, Add, Remove, Force }
-nl_brace_brace=ignore                               # { Ignore, Add, Remove, Force }
-nl_do_brace=force                                   # { Ignore, Add, Remove, Force }
-nl_brace_while=force                                # { Ignore, Add, Remove, Force }
-nl_switch_brace=force                               # { Ignore, Add, Remove, Force }
-nl_multi_line_cond=false                            # { False, True }
-nl_before_case=false                                # { False, True }
-nl_after_case=false                                 # { False, True }
-nl_case_colon_brace=force                           # { Ignore, Add, Remove, Force }
-nl_namespace_brace=force                            # { Ignore, Add, Remove, Force }
-nl_template_class=ignore                            # { Ignore, Add, Remove, Force }
-nl_class_brace=force                                # { Ignore, Add, Remove, Force }
-nl_fdef_brace=force                                 # { Ignore, Add, Remove, Force }
-nl_after_semicolon=false                            # { False, True }
-nl_after_brace_open=false                           # { False, True }
-nl_after_brace_open_cmt=false                       # { False, True }
-nl_after_vbrace_open=false                          # { False, True }
-nl_after_vbrace_open_empty=false                    # { False, True }
-nl_after_brace_close=false                          # { False, True }
-nl_after_vbrace_close=false                         # { False, True }
-nl_squeeze_ifdef=false                              # { False, True }
-nl_ds_struct_enum_cmt=false                         # { False, True }
-nl_ds_struct_enum_close_brace=false                 # { False, True }
-nl_namespace_two_to_one_liner=false                 # { False, True }
-nl_create_if_one_liner=false                        # { False, True }
-nl_create_for_one_liner=false                       # { False, True }
-nl_create_while_one_liner=false                     # { False, True }
-nl_create_func_def_one_liner=false                  # { False, True }
-ls_for_split_full=false                             # { False, True }
-ls_func_split_full=false                            # { False, True }
-nl_max=3                                            # Number
-nl_after_func_body=2                                # Number
-nl_after_multiline_comment=false                    # { False, True }
-nl_property_brace=force                             # { Ignore, Add, Remove, Force }
-eat_blanks_after_open_brace=true                    # { False, True }
-eat_blanks_before_close_brace=true                  # { False, True }
-nl_after_return=false                               # { False, True }
-mod_full_brace_if_chain=false                       # { False, True }
-mod_paren_on_return=ignore                          # { Ignore, Add, Remove, Force }
-mod_pawn_semicolon=false                            # { False, True }
-mod_full_paren_if_bool=false                        # { False, True }
-mod_remove_extra_semicolon=true                     # { False, True }
-mod_move_case_break=false                           # { False, True }
-mod_remove_empty_return=true                        # { False, True }
-cmt_convert_tab_to_spaces=True                      # { False, True }
-cmt_indent_multi=false                              # { False, True }
-cmt_c_group=false                                   # { False, True }
-cmt_c_nl_start=false                                # { False, True }
-cmt_c_nl_end=false                                  # { False, True }
-cmt_cpp_group=false                                 # { False, True }
-cmt_cpp_nl_start=false                              # { False, True }
-cmt_cpp_nl_end=false                                # { False, True }
-cmt_cpp_to_c=false                                  # { False, True }
-cmt_star_cont=false                                 # { False, True }
-cmt_multi_check_last=false                          # { False, True }
-cmt_insert_before_preproc=false                     # { False, True }
-pp_space=ignore                                     # { Ignore, Add, Remove, Force }
-use_options_overriding_for_qt_macros=false          # { False, True }
-warn_level_tabs_found_in_verbatim_string_literals=1 # { 1, 2, 3 }
-# blocked by https://sourceforge.net/p/uncrustify/bugs/619/
-# can be turned back on at any time
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
-nl_cs_property_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-58354.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-58354.cfg
deleted file mode 100644
index fb9ca61b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-58354.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_with_tabs=0
-indent_columns=4
-indent_class=true
-nl_class_leave_one_liners=true
-
-mod_remove_extra_semicolon=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-64325.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-64325.cfg
deleted file mode 100644
index 44ee8b48..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-64325.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_class=true
-indent_with_tabs=0
-indent_columns=4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-9917.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-9917.cfg
deleted file mode 100644
index f1fd0af3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-9917.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_inside_braces_empty          = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-nl_class_leave_one_liners       = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_class_brace                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Uncrustify.Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Uncrustify.Cpp.cfg
deleted file mode 100644
index 89855c3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Uncrustify.Cpp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-input_tab_size                  = 4
-indent_with_tabs                = 0
-pp_ignore_define_body           = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/add_long_closebrace_comment_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/add_long_closebrace_comment_1.cfg
deleted file mode 100644
index b8190eb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/add_long_closebrace_comment_1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_add_long_function_closebrace_comment = 8
-mod_add_long_switch_closebrace_comment = 8
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_call_user.cfg
deleted file mode 100644
index 3219bc4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_call_user.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-include "aet.cfg"
-
-sp_func_call_user_inside_fparen=force
-sp_func_call_user_paren_paren=force
-
-set FUNC_CALL_USER CMD_CHECK
-set FUNC_CALL_USER INTERNAL
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_def.cfg
deleted file mode 100644
index c4575b88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_def.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-include "aet.cfg"
-
-set FUNC_DEF MACRO1
-set FUNC_DEF MACRO2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_after_oc_msg_receiver.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_after_oc_msg_receiver.cfg
deleted file mode 100644
index 8e25aaed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_after_oc_msg_receiver.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-include "aet.cfg"
-
-sp_after_oc_msg_receiver = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_inside_braces_oc_dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_inside_braces_oc_dict.cfg
deleted file mode 100644
index 57e2463e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_inside_braces_oc_dict.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-include "aet.cfg"
-
-sp_inside_braces_oc_dict=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet.cfg
deleted file mode 100644
index d3729edf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet.cfg
+++ /dev/null
@@ -1,507 +0,0 @@
-# Uncrustify 0.61
-newlines                                             = auto
-input_tab_size                                       = 4
-output_tab_size                                      = 8
-string_escape_char                                   = 92
-string_escape_char2                                  = 0
-string_replace_tab_chars                             = true
-tok_split_gte                                        = false
-disable_processing_cmt                               = "*begin-nonstandard-formatting*"
-enable_processing_cmt                                = "*end-nonstandard-formatting*"
-utf8_bom                                             = remove
-utf8_byte                                            = false
-utf8_force                                           = false
-indent_columns                                       = 4
-indent_continue                                      = 4
-indent_with_tabs                                     = 0
-indent_cmt_with_tabs                                 = false
-indent_align_string                                  = false
-indent_xml_string                                    = 0
-indent_brace                                         = 0
-indent_braces                                        = false
-indent_braces_no_func                                = false
-indent_braces_no_class                               = false
-indent_braces_no_struct                              = false
-indent_brace_parent                                  = false
-indent_paren_open_brace                              = false
-indent_namespace                                     = false
-indent_namespace_single_indent                       = true
-indent_namespace_level                               = 0
-indent_namespace_limit                               = 0
-indent_extern                                        = false
-indent_class                                         = true
-indent_class_colon                                   = false
-indent_class_on_colon                                = false
-indent_constr_colon                                  = false
-indent_ctor_init_leading                             = 2
-indent_ctor_init                                     = 0
-indent_else_if                                       = false
-indent_var_def_blk                                   = 0
-indent_var_def_cont                                  = false
-indent_shift                                         = false
-indent_func_def_force_col1                           = false
-indent_func_call_param                               = true
-indent_func_def_param                                = true
-indent_func_proto_param                              = true
-indent_func_class_param                              = false
-indent_func_ctor_var_param                           = false
-indent_template_param                                = false
-indent_func_param_double                             = false
-indent_func_const                                    = 0
-indent_func_throw                                    = 0
-indent_member                                        = 0
-indent_sing_line_comments                            = 0
-indent_relative_single_line_comments                 = true
-indent_switch_case                                   = 0
-indent_case_shift                                    = 0
-indent_case_brace                                    = 0
-indent_col1_comment                                  = false
-indent_label                                         = -4
-indent_access_spec                                   = -4
-indent_access_spec_body                              = false
-indent_paren_nl                                      = false
-indent_paren_close                                   = 0
-indent_comma_paren                                   = false
-indent_bool_paren                                    = false
-indent_first_bool_expr                               = false
-indent_square_nl                                     = false
-indent_preserve_sql                                  = false
-indent_align_assign                                  = false
-indent_oc_block                                      = false
-indent_oc_block_msg                                  = 0
-indent_oc_msg_colon                                  = 0
-indent_oc_msg_prioritize_first_colon                 = true
-indent_oc_block_msg_xcode_style                      = true
-indent_oc_block_msg_from_keyword                     = false
-indent_oc_block_msg_from_colon                       = false
-indent_oc_block_msg_from_caret                       = false
-indent_oc_block_msg_from_brace                       = false
-indent_min_vbrace_open                               = 0
-indent_vbrace_open_on_tabstop                        = false
-sp_arith                                             = force
-sp_assign                                            = add
-sp_cpp_lambda_assign                                 = ignore
-sp_cpp_lambda_square_paren                           = ignore
-sp_assign_default                                    = add
-sp_before_assign                                     = force
-sp_after_assign                                      = force
-sp_enum_paren                                        = ignore
-sp_enum_assign                                       = add
-sp_enum_before_assign                                = ignore
-sp_enum_after_assign                                 = ignore
-sp_pp_concat                                         = remove
-sp_pp_stringify                                      = remove
-sp_before_pp_stringify                               = ignore
-sp_bool                                              = add
-sp_compare                                           = add
-sp_inside_paren                                      = remove
-sp_paren_paren                                       = remove
-sp_cparen_oparen                                     = ignore
-sp_balance_nested_parens                             = false
-sp_paren_brace                                       = force
-sp_before_ptr_star                                   = force
-sp_before_unnamed_ptr_star                           = ignore
-sp_between_ptr_star                                  = remove
-sp_after_ptr_star                                    = remove
-sp_after_ptr_star_qualifier                          = remove
-sp_after_ptr_star_func                               = remove
-sp_ptr_star_paren                                    = remove
-sp_before_ptr_star_func                              = force
-sp_before_byref                                      = remove
-sp_before_unnamed_byref                              = remove
-sp_after_byref                                       = force
-sp_after_byref_func                                  = force
-sp_before_byref_func                                 = remove
-sp_after_type                                        = force
-sp_after_decltype                                    = force
-sp_before_template_paren                             = ignore
-sp_template_angle                                    = remove
-sp_before_angle                                      = remove
-sp_inside_angle                                      = remove
-sp_after_angle                                       = remove
-sp_angle_paren                                       = remove
-sp_angle_paren_empty                                 = remove
-sp_angle_word                                        = force
-sp_angle_shift                                       = remove
-sp_permit_cpp11_shift                                = false
-sp_before_sparen                                     = force
-sp_inside_sparen                                     = remove
-sp_inside_sparen_close                               = ignore
-sp_inside_sparen_open                                = ignore
-sp_after_sparen                                      = add
-sp_sparen_brace                                      = force
-sp_invariant_paren                                   = ignore
-sp_after_invariant_paren                             = ignore
-sp_special_semi                                      = force
-sp_before_semi                                       = remove
-sp_before_semi_for                                   = remove
-sp_before_semi_for_empty                             = remove
-sp_after_semi                                        = force
-sp_after_semi_for                                    = force
-sp_after_semi_for_empty                              = remove
-sp_before_square                                     = remove
-sp_before_squares                                    = remove
-sp_inside_square                                     = remove
-sp_after_comma                                       = add
-sp_before_comma                                      = remove
-sp_after_mdatype_commas                              = remove
-sp_before_mdatype_commas                             = remove
-sp_between_mdatype_commas                            = remove
-sp_paren_comma                                       = remove
-sp_before_ellipsis                                   = ignore
-sp_after_class_colon                                 = force
-sp_before_class_colon                                = force
-sp_after_constr_colon                                = ignore
-sp_before_constr_colon                               = ignore
-sp_before_case_colon                                 = remove
-sp_after_operator                                    = ignore
-sp_after_operator_sym                                = ignore
-sp_after_cast                                        = force
-sp_inside_paren_cast                                 = remove
-sp_cpp_cast_paren                                    = remove
-sp_sizeof_paren                                      = remove
-sp_decltype_paren                                    = remove
-sp_after_tag                                         = ignore
-sp_inside_braces_enum                                = add
-sp_inside_braces_struct                              = ignore
-sp_inside_braces                                     = ignore
-sp_inside_braces_empty                               = remove
-sp_type_func                                         = force
-sp_func_proto_paren                                  = remove
-sp_func_def_paren                                    = remove
-sp_inside_fparens                                    = remove
-sp_inside_fparen                                     = remove
-sp_inside_tparen                                     = remove
-sp_after_tparen_close                                = remove
-sp_square_fparen                                     = ignore
-sp_fparen_brace                                      = force
-sp_fparen_dbrace                                     = ignore
-sp_func_call_paren                                   = remove
-sp_func_call_paren_empty                             = remove
-sp_func_call_user_paren                              = remove
-sp_func_class_paren                                  = remove
-sp_return_paren                                      = add
-sp_attribute_paren                                   = ignore
-sp_defined_paren                                     = remove
-sp_throw_paren                                       = add
-sp_after_throw                                       = ignore
-sp_catch_paren                                       = add
-sp_version_paren                                     = ignore
-sp_scope_paren                                       = ignore
-sp_macro                                             = ignore
-sp_macro_func                                        = ignore
-sp_else_brace                                        = force
-sp_brace_else                                        = force
-sp_brace_typedef                                     = add
-sp_catch_brace                                       = force
-sp_brace_catch                                       = force
-sp_finally_brace                                     = force
-sp_brace_finally                                     = force
-sp_try_brace                                         = force
-sp_getset_brace                                      = add
-sp_word_brace_init_lst                               = add
-sp_word_brace_ns                                     = add
-sp_before_dc                                         = remove
-sp_after_dc                                          = remove
-sp_d_array_colon                                     = ignore
-sp_not                                               = remove
-sp_inv                                               = remove
-sp_addr                                              = remove
-sp_member                                            = remove
-sp_deref                                             = remove
-sp_sign                                              = remove
-sp_incdec                                            = remove
-sp_before_nl_cont                                    = add
-sp_after_oc_scope                                    = force
-sp_after_oc_colon                                    = remove
-sp_before_oc_colon                                   = remove
-sp_after_oc_dict_colon                               = force
-sp_before_oc_dict_colon                              = remove
-sp_after_send_oc_colon                               = remove
-sp_before_send_oc_colon                              = remove
-sp_after_oc_type                                     = remove
-sp_after_oc_return_type                              = remove
-sp_after_oc_at_sel                                   = remove
-sp_after_oc_at_sel_parens                            = force
-sp_inside_oc_at_sel_parens                           = remove
-sp_before_oc_block_caret                             = remove
-sp_after_oc_block_caret                              = remove
-sp_after_oc_msg_receiver                             = force
-sp_after_oc_property                                 = force
-sp_cond_colon                                        = add
-sp_cond_colon_before                                 = ignore
-sp_cond_colon_after                                  = ignore
-sp_cond_question                                     = add
-sp_cond_question_before                              = ignore
-sp_cond_question_after                               = ignore
-sp_cond_ternary_short                                = ignore
-sp_case_label                                        = force
-sp_range                                             = ignore
-sp_after_for_colon                                   = force
-sp_before_for_colon                                  = force
-sp_extern_paren                                      = ignore
-sp_cmt_cpp_start                                     = ignore
-sp_cmt_cpp_doxygen                                   = false
-sp_endif_cmt                                         = ignore
-sp_after_new                                         = force
-sp_between_new_paren                                 = remove
-sp_before_tr_emb_cmt                                 = ignore
-sp_num_before_tr_emb_cmt                             = 0
-sp_annotation_paren                                  = remove
-align_keep_tabs                                      = false
-align_with_tabs                                      = false
-align_on_tabstop                                     = false
-align_number_right                                   = false
-align_keep_extra_space                               = false
-align_func_params                                    = false
-align_same_func_call_params                          = false
-align_var_def_span                                   = 0
-align_var_def_star_style                             = 0
-align_var_def_amp_style                              = 0
-align_var_def_thresh                                 = 0
-align_var_def_gap                                    = 0
-align_var_def_colon                                  = false
-align_var_def_attribute                              = false
-align_var_def_inline                                 = false
-align_assign_span                                    = 0
-align_assign_thresh                                  = 0
-align_enum_equ_span                                  = 0
-align_enum_equ_thresh                                = 0
-align_var_struct_span                                = 0
-align_var_struct_thresh                              = 0
-align_var_struct_gap                                 = 0
-align_struct_init_span                               = 0
-align_typedef_gap                                    = 0
-align_typedef_span                                   = 0
-align_typedef_func                                   = 0
-align_typedef_star_style                             = 0
-align_typedef_amp_style                              = 0
-align_right_cmt_span                                 = 0
-align_right_cmt_mix                                  = false
-align_right_cmt_gap                                  = 0
-align_right_cmt_at_col                               = 0
-align_func_proto_span                                = 0
-align_func_proto_gap                                 = 0
-align_on_operator                                    = false
-align_mix_var_proto                                  = false
-align_single_line_func                               = false
-align_single_line_brace                              = false
-align_single_line_brace_gap                          = 0
-align_oc_msg_spec_span                               = 0
-align_nl_cont                                        = false
-align_pp_define_together                             = false
-align_pp_define_gap                                  = 0
-align_pp_define_span                                 = 0
-align_left_shift                                     = false
-align_oc_msg_colon_span                              = 20
-align_oc_msg_colon_first                             = true
-align_oc_decl_colon                                  = true
-nl_collapse_empty_body                               = false
-nl_assign_leave_one_liners                           = true
-nl_class_leave_one_liners                            = true
-nl_enum_leave_one_liners                             = true
-nl_getset_leave_one_liners                           = true
-nl_func_leave_one_liners                             = true
-nl_cpp_lambda_leave_one_liners                       = true
-nl_if_leave_one_liners                               = true
-nl_oc_msg_leave_one_liner                            = true
-nl_start_of_file                                     = remove
-nl_start_of_file_min                                 = 0
-nl_end_of_file                                       = force
-nl_end_of_file_min                                   = 1
-nl_assign_brace                                      = remove
-nl_assign_square                                     = ignore
-nl_after_square_assign                               = ignore
-nl_func_var_def_blk                                  = 0
-nl_typedef_blk_start                                 = 0
-nl_typedef_blk_end                                   = 0
-nl_typedef_blk_in                                    = 0
-nl_var_def_blk_start                                 = 0
-nl_var_def_blk_end                                   = 0
-nl_var_def_blk_in                                    = 0
-nl_fcall_brace                                       = ignore
-nl_enum_brace                                        = remove
-nl_struct_brace                                      = remove
-nl_union_brace                                       = remove
-nl_if_brace                                          = remove
-nl_brace_else                                        = remove
-nl_elseif_brace                                      = ignore
-nl_else_brace                                        = remove
-nl_else_if                                           = remove
-nl_brace_finally                                     = remove
-nl_finally_brace                                     = remove
-nl_try_brace                                         = remove
-nl_getset_brace                                      = remove
-nl_for_brace                                         = remove
-nl_catch_brace                                       = remove
-nl_brace_catch                                       = remove
-nl_brace_square                                      = ignore
-nl_brace_fparen                                      = ignore
-nl_while_brace                                       = remove
-nl_scope_brace                                       = ignore
-nl_unittest_brace                                    = ignore
-nl_version_brace                                     = ignore
-nl_using_brace                                       = remove
-nl_brace_brace                                       = ignore
-nl_do_brace                                          = remove
-nl_brace_while                                       = remove
-nl_switch_brace                                      = remove
-nl_multi_line_cond                                   = false
-nl_multi_line_define                                 = false
-nl_before_case                                       = false
-nl_before_throw                                      = ignore
-nl_after_case                                        = false
-nl_case_colon_brace                                  = remove
-nl_namespace_brace                                   = remove
-nl_template_class                                    = ignore
-nl_class_brace                                       = remove
-nl_class_init_args                                   = ignore
-nl_constr_init_args                                  = ignore
-nl_func_type_name                                    = ignore
-nl_func_type_name_class                              = ignore
-nl_func_scope_name                                   = ignore
-nl_func_proto_type_name                              = ignore
-nl_func_paren                                        = ignore
-nl_func_def_paren                                    = ignore
-nl_func_decl_start                                   = ignore
-nl_func_def_start                                    = ignore
-nl_func_decl_start_single                            = ignore
-nl_func_def_start_single                             = ignore
-nl_func_decl_args                                    = ignore
-nl_func_def_args                                     = ignore
-nl_func_decl_end                                     = ignore
-nl_func_def_end                                      = ignore
-nl_func_decl_end_single                              = ignore
-nl_func_def_end_single                               = ignore
-nl_func_decl_empty                                   = ignore
-nl_func_def_empty                                    = ignore
-nl_oc_msg_args                                       = false
-nl_fdef_brace                                        = remove
-nl_cpp_ldef_brace                                    = ignore
-nl_return_expr                                       = ignore
-nl_after_semicolon                                   = false
-nl_paren_dbrace_open                                 = ignore
-nl_after_brace_open                                  = false
-nl_after_brace_open_cmt                              = false
-nl_after_vbrace_open                                 = false
-nl_after_vbrace_open_empty                           = false
-nl_after_brace_close                                 = false
-nl_after_vbrace_close                                = false
-nl_brace_struct_var                                  = ignore
-nl_define_macro                                      = false
-nl_squeeze_ifdef                                     = false
-nl_before_if                                         = ignore
-nl_after_if                                          = ignore
-nl_before_for                                        = ignore
-nl_after_for                                         = ignore
-nl_before_while                                      = ignore
-nl_after_while                                       = ignore
-nl_before_switch                                     = ignore
-nl_after_switch                                      = ignore
-nl_before_do                                         = ignore
-nl_after_do                                          = ignore
-nl_ds_struct_enum_cmt                                = false
-nl_ds_struct_enum_close_brace                        = false
-nl_class_colon                                       = ignore
-nl_constr_colon                                      = ignore
-nl_create_if_one_liner                               = false
-nl_create_for_one_liner                              = false
-nl_create_while_one_liner                            = false
-pos_arith                                            = ignore
-pos_assign                                           = ignore
-pos_bool                                             = ignore
-pos_compare                                          = ignore
-pos_conditional                                      = ignore
-pos_comma                                            = ignore
-pos_class_comma                                      = ignore
-pos_constr_comma                                     = ignore
-pos_class_colon                                      = ignore
-pos_constr_colon                                     = ignore
-code_width                                           = 0
-ls_for_split_full                                    = false
-ls_func_split_full                                   = false
-ls_code_width                                        = false
-nl_max                                               = 3
-nl_after_func_proto                                  = 0
-nl_after_func_proto_group                            = 0
-nl_after_func_body                                   = 2
-nl_after_func_body_class                             = 0
-nl_after_func_body_one_liner                         = 0
-nl_before_block_comment                              = 0
-nl_before_c_comment                                  = 0
-nl_before_cpp_comment                                = 0
-nl_after_multiline_comment                           = false
-nl_after_label_colon                                 = false
-nl_after_struct                                      = 0
-nl_after_class                                       = 0
-nl_before_access_spec                                = 0
-nl_after_access_spec                                 = 0
-nl_comment_func_def                                  = 0
-nl_after_try_catch_finally                           = 0
-nl_around_cs_property                                = 0
-nl_between_get_set                                   = 0
-nl_property_brace                                    = force
-eat_blanks_after_open_brace                          = true
-eat_blanks_before_close_brace                        = true
-nl_remove_extra_newlines                             = 0
-nl_before_return                                     = false
-nl_after_return                                      = false
-nl_after_annotation                                  = ignore
-nl_between_annotation                                = ignore
-mod_full_brace_do                                    = ignore
-mod_full_brace_for                                   = ignore
-mod_full_brace_function                              = ignore
-mod_full_brace_if                                    = ignore
-mod_full_brace_if_chain                              = false
-mod_full_brace_nl                                    = 0
-mod_full_brace_while                                 = ignore
-mod_full_brace_using                                 = ignore
-mod_paren_on_return                                  = ignore
-mod_pawn_semicolon                                   = false
-mod_full_paren_if_bool                               = false
-mod_remove_extra_semicolon                           = true
-mod_add_long_function_closebrace_comment             = 0
-mod_add_long_namespace_closebrace_comment            = 0
-mod_add_long_switch_closebrace_comment               = 0
-mod_add_long_ifdef_endif_comment                     = 0
-mod_add_long_ifdef_else_comment                      = 0
-mod_sort_import                                      = false
-mod_sort_using                                       = false
-mod_sort_include                                     = false
-mod_move_case_break                                  = false
-mod_case_brace                                       = ignore
-mod_remove_empty_return                              = true
-cmt_width                                            = 0
-cmt_reflow_mode                                      = 0
-cmt_convert_tab_to_spaces                            = false
-cmt_indent_multi                                     = false
-cmt_c_group                                          = false
-cmt_c_nl_start                                       = false
-cmt_c_nl_end                                         = false
-cmt_cpp_group                                        = false
-cmt_cpp_nl_start                                     = false
-cmt_cpp_nl_end                                       = false
-cmt_cpp_to_c                                         = false
-cmt_star_cont                                        = false
-cmt_sp_before_star_cont                              = 0
-cmt_sp_after_star_cont                               = 0
-cmt_multi_check_last                                 = false
-cmt_insert_file_header                               = ""
-cmt_insert_file_footer                               = ""
-cmt_insert_func_header                               = ""
-cmt_insert_class_header                              = ""
-cmt_insert_oc_msg_header                             = ""
-cmt_insert_before_preproc                            = false
-pp_indent                                            = ignore
-pp_indent_at_level                                   = false
-pp_indent_count                                      = 1
-pp_space                                             = ignore
-pp_space_count                                       = 0
-pp_indent_region                                     = 0
-pp_region_indent_code                                = false
-pp_indent_if                                         = 0
-pp_if_indent_code                                    = false
-pp_define_at_level                                   = false
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                                     = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/al.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/al.cfg
deleted file mode 100644
index 669cef45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/al.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-sp_compare                      = force
-sp_before_semi_for              = force
-sp_inside_fparens               = remove
-sp_inside_fparen                = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_for_brace                    = add
-nl_before_for                   = add
-# to test convert_value
-nl_ds_struct_enum_close_brace   = t
-nl_after_func_proto_group       = 3
-nl_after_func_body              = 5
-# to test convert_value
-align_func_params               = 1
-align_assign_span               = 1
-align_enum_equ_span             = 10
-align_right_cmt_span            = 3
-align_func_proto_span           = 3
-cmt_cpp_to_c                    = true
-mod_full_brace_for              = add
-mod_add_long_function_closebrace_comment = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-1.cfg
deleted file mode 100644
index 720f003e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-1.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 3
-nl_struct_brace                 = add
-align_var_def_span              = 2
-align_var_def_colon             = true
-align_assign_span               = 2
-align_assign_thresh             = 3
-align_var_struct_span           = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-2.cfg
deleted file mode 100644
index ea78a8d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-2.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_columns                  = 3
-nl_struct_brace                 = add
-align_func_params               = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_var_def_colon             = true
-align_var_struct_span           = 3
-align_var_struct_thresh         = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-3.cfg
deleted file mode 100644
index 1b46c840..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-3.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_columns                  = 3
-nl_struct_brace                 = add
-align_func_params               = true
-align_var_def_span              = 1
-align_var_def_star_style        = 2
-align_var_def_colon             = true
-align_var_struct_span           = 1
-align_var_struct_thresh         = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-330.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-330.cfg
deleted file mode 100644
index 7a2ce116..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-330.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_comma         = force
-indent_columns         = 3
-nl_class_colon         = force
-align_nl_cont          = true
-align_pp_define_gap    = 4
-align_pp_define_span   = 3
-indent_with_tabs       = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-objc-like-xcode.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-objc-like-xcode.cfg
deleted file mode 100644
index 3b321b11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-objc-like-xcode.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_columns = 2
-indent_oc_msg_prioritize_first_colon = false
-indent_oc_msg_colon = 0
-align_oc_msg_spec_span = 0
-align_oc_msg_colon_span = 1
-align_oc_msg_colon_first = true
-sp_after_send_oc_colon = true
-align_oc_msg_colon_xcode_like = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-0.cfg
deleted file mode 100644
index fee6fea1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-0.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_assign_span      = 3
-align_assign_decl_func = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-1.cfg
deleted file mode 100644
index 2175c1e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_assign_span      = 3
-align_assign_decl_func = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-2.cfg
deleted file mode 100644
index 9e3a2779..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_assign_span      = 3
-align_assign_decl_func = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_func_proto_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_func_proto_1.cfg
deleted file mode 100644
index 378039a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_func_proto_1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_assign_span               = 1

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_span-1.cfg
deleted file mode 100644
index fda177f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_span-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_assign_span               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_asterisk_after_type_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_asterisk_after_type_cast.cfg
deleted file mode 100644
index 4a781152..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_asterisk_after_type_cast.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_columns = 4
-output_tab_size = 4
-indent_with_tabs = 0
-
-sp_before_ptr_star = force
-sp_between_ptr_star = remove
-sp_after_ptr_star = remove
-
-sp_after_sparen = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_attr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_attr.cfg
deleted file mode 100644
index 3249cd7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_attr.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-align_var_def_span              = 2
-align_var_def_attribute         = true
-set ATTRIBUTE                     _PREPROCESSOR_SOMETHING
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_class-constr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_class-constr.cfg
deleted file mode 100644
index 8824d97a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_class-constr.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-indent_columns   = 4
-indent_with_tabs = 0
-
-nl_constr_init_args = force
-
-nl_constr_colon     = force
-
-pos_constr_comma    = lead_force
-
-pos_constr_colon=lead
-
-align_constr_value_span = 2
-
-align_constr_value_gap  = 2
-
-indent_class            = true
-
-nl_fdef_brace                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_continuation_left_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_continuation_left_shift.cfg
deleted file mode 100644
index 767f2adc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_continuation_left_shift.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns = 4
-output_tab_size = 4
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_default_after_override.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_default_after_override.cfg
deleted file mode 100644
index 7373e8d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_default_after_override.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_assign_span               = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_eigen_comma_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_eigen_comma_init.cfg
deleted file mode 100644
index a798cc5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_eigen_comma_init.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-align_eigen_comma_init          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall-2.cfg
deleted file mode 100644
index 795a16e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall-2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_comma                  = force
-align_number_right              = true
-align_same_func_call_params     = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall.cfg
deleted file mode 100644
index 2df9b2e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_comma                  = force
-align_same_func_call_params     = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params-t.cfg
deleted file mode 100644
index 6072ca53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_func_params               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_gap.cfg
deleted file mode 100644
index 314c2e1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_gap.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_params_span          = 1
-align_func_params_gap           = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_span-1.cfg
deleted file mode 100644
index 5695e5a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_span-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_func_params_span          = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_1.cfg
deleted file mode 100644
index acae1cc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_params_span          = 1
-align_func_params_thresh        = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_2.cfg
deleted file mode 100644
index 355705f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_params_span          = 1
-align_func_params_thresh        = 8
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_3.cfg
deleted file mode 100644
index 48912fce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_3.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_params_span          = 2
-align_func_params_thresh        = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_4.cfg
deleted file mode 100644
index 284a5ee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_params_span          = 2
-align_func_params_thresh        = 8
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_1.cfg
deleted file mode 100644
index b6a93b5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_proto_span           = 4
-align_func_proto_thresh         = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_2.cfg
deleted file mode 100644
index 363ea06c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_proto_span           = 4
-align_func_proto_thresh         = 15
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_3.cfg
deleted file mode 100644
index 3a5ac106..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_3.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_func_proto_span           = 2
-align_func_proto_thresh         = 5
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_4.cfg
deleted file mode 100644
index 6b084d86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_4.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-align_func_proto_span           = 2
-align_func_proto_thresh         = 15
-align_assign_span               = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_5.cfg
deleted file mode 100644
index 8a8dff6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_5.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-align_func_proto_span           = 2
-align_func_proto_thresh         = -15
-align_assign_span               = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_keep_extra.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_keep_extra.cfg
deleted file mode 100644
index fcaab9f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_keep_extra.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_type                   = ignore
-align_keep_extra_space          = true
-align_var_def_span              = 1
-align_assign_span               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_oc_msg_colon_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_oc_msg_colon_span-1.cfg
deleted file mode 100644
index 9681d152..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_oc_msg_colon_span-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_cmt_gap-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_cmt_gap-1.cfg
deleted file mode 100644
index 46aaf838..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_cmt_gap-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-align_right_cmt_span            = 8
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_comment.cfg
deleted file mode 100644
index 1551b394..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_comment.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_right_cmt_span = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_same_func_call_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_same_func_call_params-t.cfg
deleted file mode 100644
index d1496108..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_same_func_call_params-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_same_func_call_params = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_418.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_418.cfg
deleted file mode 100644
index cdf7f052..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_418.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_same_func_call_params         = true
-align_same_func_call_params_span    = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_419.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_419.cfg
deleted file mode 100644
index a11c2102..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_419.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_same_func_call_params         = true
-align_same_func_call_params_span    = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_416.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_416.cfg
deleted file mode 100644
index 6280b856..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_416.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_comma                        = force
-align_same_func_call_params           = true
-align_same_func_call_params_span      = 3
-align_same_func_call_params_thresh    = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_417.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_417.cfg
deleted file mode 100644
index 9d09abb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_417.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_same_func_call_params         = true
-align_same_func_call_params_thresh  = 20
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_stack.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_stack.cfg
deleted file mode 100644
index d53a6bb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_stack.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-align_var_def_span              = 1
-align_var_def_star_style        = 2    # SS_DANGLE
-align_on_tabstop                = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-1.cfg
deleted file mode 100644
index ea45e4d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_typedef_func              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-2.cfg
deleted file mode 100644
index 252f07ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_after_ptr_star               = remove
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_typedef_func              = 2
-align_typedef_star_style        = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_gap-3_span-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_gap-3_span-5.cfg
deleted file mode 100644
index 338f078f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_gap-3_span-5.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_typedef_gap               = 3
-align_typedef_span              = 5
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_class_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_class_span-1.cfg
deleted file mode 100644
index a1b4122c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_class_span-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_var_class_span            = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_1.cfg
deleted file mode 100644
index 5cadc402..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_var_def_span              = 1
-align_var_def_thresh            = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_2.cfg
deleted file mode 100644
index bb9be8ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span              = 1
-align_var_def_star_style        = 1
-align_var_def_amp_style         = 1
-align_var_def_thresh            = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_3.cfg
deleted file mode 100644
index edb77f43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_3.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span              = 1
-align_var_def_star_style        = 2
-align_var_def_amp_style         = 2
-align_var_def_thresh            = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/amxmodx.cfg
deleted file mode 100644
index 2c87c362..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/amxmodx.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# AMX Mod X style for Pawn (or as close as possible)
-output_tab_size                 = 4
-sp_arith                        = force
-sp_assign                       = force
-sp_before_sparen                = force
-sp_after_comma                  = force
-sp_inside_fparen                = remove
-sp_while_paren_open             = force
-indent_columns                  = 4
-nl_if_brace                     = add
-nl_else_brace                   = add
-align_with_tabs                 = true
-align_on_tabstop                = true
-align_right_cmt_span            = 8
-align_pp_define_span            = 1
-mod_pawn_semicolon              = true
-
-# not needed but without this option, 60030 is unstable!
-input_tab_size      = 4    # tab size on input file: usually 8
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/annotation.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/annotation.cfg
deleted file mode 100644
index 0d800a82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/annotation.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_after_annotation             = force
-nl_between_annotation           = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/anonymous_enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/anonymous_enum.cfg
deleted file mode 100644
index 503a2cb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/anonymous_enum.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_enum_assign                  = add

-sp_enum_colon                   = add

-sp_type_brace_init_lst          = remove

-indent_columns                  = 2

-indent_with_tabs                = 0

-indent_paren_close              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/arith-vs-ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/arith-vs-ptr.cfg
deleted file mode 100644
index 60c8d23c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/arith-vs-ptr.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_arith                        = force
-sp_after_ptr_star               = remove
-
-# issue 1464
-# ------------------------------------------------------------------------------
-# auto p = std::make_pair(r * cos(a), r * sin(a));
-# type of the 'cos' token was incorrectly set to `CT_FUNC_DEF`
-# because of this the first '*' became a `CT_PTR_TYPE` instead of a `CT_ARITH`
-# type
-
-# issue 1466
-# ------------------------------------------------------------------------------
-# A a = {this->r * cos(b)};
-# similar to 1464
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/attribute_specifier_seqs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/attribute_specifier_seqs.cfg
deleted file mode 100644
index 8eec117f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/attribute_specifier_seqs.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_vardef_square  = ignore
-sp_type_brace_init_lst   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon.cfg
deleted file mode 100644
index f3e3ce77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_before_byref                 = remove
-sp_before_square                = force
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-indent_columns                  = 2
-nl_start_of_file                = remove
-nl_struct_brace                 = remove
-nl_fdef_brace                   = force
-nl_after_func_body              = 2
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-mod_full_brace_if               = add
-sp_before_vardef_square         = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon2.cfg
deleted file mode 100644
index 97783b66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon2.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_before_ptr_star              = remove
-sp_before_byref                 = remove
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_angle_paren                  = remove
-sp_angle_paren_empty            = remove
-sp_angle_word                   = force
-sp_before_square                = force
-indent_columns                  = 2
-nl_if_brace                     = remove
-nl_after_func_proto_group       = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon3.cfg
deleted file mode 100644
index 30f50cb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon3.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 2
-indent_class                    = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon4.cfg
deleted file mode 100644
index bdf0f374..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon4.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = force
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_after_comma                  = force
-sp_before_dc                    = remove
-indent_columns                  = 2
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_if_brace                     = remove
-nl_func_decl_args               = remove
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben2.cfg
deleted file mode 100644
index ff3bd751..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben2.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-utf8_byte                       = true
-sp_arith                        = force
-sp_assign                       = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-sp_before_sparen                = force
-sp_after_comma                  = force
-sp_inside_braces                = force
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-indent_label                    = 2
-nl_assign_brace                 = add
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_for_brace                    = add
-nl_switch_brace                 = add
-nl_before_case                  = true
-nl_fdef_brace                   = add
-eat_blanks_after_open_brace     = true
-nl_after_return                 = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
-align_struct_init_span          = 3
-cmt_convert_tab_to_spaces       = true
-cmt_star_cont                   = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
-mod_remove_extra_semicolon      = true
-mod_add_long_function_closebrace_comment = 40
-mod_add_long_switch_closebrace_comment = 40
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_001.cfg
deleted file mode 100644
index e1bce1fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_001.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_comma                  = force
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_003.cfg
deleted file mode 100644
index b6dffc7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_003.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_inside_fparen                = remove
-indent_columns                  = 3
-align_func_params               = true
-align_var_def_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_004.cfg
deleted file mode 100644
index fa3c13c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_004.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_after_ptr_star               = remove
-indent_columns                  = 3
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_005.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_005.cfg
deleted file mode 100644
index 6784d5f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_005.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_assign_default               = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_inside_fparen                = remove
-sp_return_paren                 = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-indent_access_spec              = 2
-nl_class_leave_one_liners       = true
-align_func_params               = true
-align_var_def_star_style        = 1
-mod_remove_extra_semicolon      = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_006.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_006.cfg
deleted file mode 100644
index 2767d063..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_006.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_after_ptr_star               = remove
-sp_inside_fparen                = remove
-sp_brace_typedef                = force
-indent_columns                  = 3
-indent_member                   = 3
-align_enum_equ_span             = 4
-align_struct_init_span          = 3
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_008.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_008.cfg
deleted file mode 100644
index 432f7093..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_008.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_after_ptr_star               = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_try_brace                    = add
-nl_catch_brace                  = add
-mod_full_brace_if               = add
-pp_indent                       = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_009.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_009.cfg
deleted file mode 100644
index 314bb848..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_009.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_after_ptr_star               = remove
-indent_columns                  = 3
-indent_class                    = true
-indent_access_spec              = 2
-align_var_def_star_style        = 1
-align_var_class_span            = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_010.cfg
deleted file mode 100644
index c4536db3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_010.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_byref                 = remove
-align_func_params               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_011.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_011.cfg
deleted file mode 100644
index 6ade29ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_011.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_012.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_012.cfg
deleted file mode 100644
index 47906d8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_012.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = remove
-sp_inside_angle                 = remove
-sp_after_angle                  = force
-indent_columns                  = 3
-indent_class                    = true
-indent_access_spec              = 2
-nl_func_var_def_blk             = 1
-nl_fdef_brace                   = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_013.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_013.cfg
deleted file mode 100644
index be76962d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_013.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-indent_columns                  = 3
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-align_var_def_span              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_014.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_014.cfg
deleted file mode 100644
index cd7b8cff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_014.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-tok_split_gte                   = true
-sp_arith                        = force
-sp_assign                       = force
-sp_assign_default               = remove
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = remove
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_inside_angle_empty           = remove
-sp_angle_paren_empty            = remove
-sp_angle_word                   = force
-sp_inside_square                = remove
-sp_after_comma                  = force
-sp_func_proto_paren             = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-indent_class                    = true
-indent_access_spec              = 2
-nl_func_var_def_blk             = 1
-nl_struct_brace                 = add
-nl_fdef_brace                   = add
-nl_after_brace_open             = true
-nl_after_access_spec            = 1
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-align_var_def_span              = 2
-align_assign_span               = 1
-align_var_class_span            = 2
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_right_cmt_span            = 3
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_015.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_015.cfg
deleted file mode 100644
index 0e139678..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_015.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 3
-align_struct_init_span          = 3
-
-# not needed but without this option, 30029 is unstable!
-sp_after_comma                  = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_016.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_016.cfg
deleted file mode 100644
index 9b863f1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_016.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_inside_fparen                = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_017.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_017.cfg
deleted file mode 100644
index a4acecc3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_017.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_inside_fparen                = remove
-indent_columns                  = 3
-align_var_def_span              = 2
-align_var_def_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_018.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_018.cfg
deleted file mode 100644
index 06fe5b60..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_018.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-indent_columns                  = 3
-align_var_struct_span           = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_020.cfg
deleted file mode 100644
index 8cd270ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_020.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-nl_enum_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_021.cfg
deleted file mode 100644
index 7012173d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_021.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_inside_paren                 = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_after_semicolon              = true
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_022.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_022.cfg
deleted file mode 100644
index 8311b975..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_022.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_inside_paren                 = remove
-sp_before_ptr_star              = force
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-indent_columns                  = 3
-indent_class                    = true
-nl_fdef_brace                   = add
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_023.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_023.cfg
deleted file mode 100644
index acb9b682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_023.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_inside_paren                 = remove
-sp_before_ptr_star              = force
-sp_func_def_paren               = remove
-sp_return_paren                 = remove
-indent_columns                  = 3
-nl_struct_brace                 = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_fdef_brace                   = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_024.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_024.cfg
deleted file mode 100644
index 37954be0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_024.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_ptr_star              = force
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_026.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_026.cfg
deleted file mode 100644
index f7008ee3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_026.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_arith                        = force
-sp_after_ptr_star               = remove
-align_func_params               = true
-align_var_def_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_027.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_027.cfg
deleted file mode 100644
index fbbdb06a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_027.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_class_leave_one_liners       = true
-nl_struct_brace                 = add
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_028.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_028.cfg
deleted file mode 100644
index 62848095..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_028.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_ellipsis              = remove
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_029.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_029.cfg
deleted file mode 100644
index a0c2e18c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_029.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_assign_default               = remove
-sp_inside_paren                 = remove
-indent_columns                  = 3
-nl_enum_brace                   = add
-align_func_params               = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
-align_enum_equ_span             = 4
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_030.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_030.cfg
deleted file mode 100644
index 8663afd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_030.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-indent_columns                  = 3
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_031.cfg
deleted file mode 100644
index fe2182c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_031.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_class                    = true
-indent_label                    = 2
-indent_access_spec              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_032.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_032.cfg
deleted file mode 100644
index e99f12ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_032.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-sp_inside_paren                 = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-align_var_def_span              = 2
-align_assign_span               = 1
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_033.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_033.cfg
deleted file mode 100644
index 3f1ffc6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_033.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_class                    = true
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_034.cfg
deleted file mode 100644
index 0681b1b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_034.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_class                    = true
-eat_blanks_before_close_brace   = true
-align_var_class_span            = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_036.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_036.cfg
deleted file mode 100644
index 5a5f216b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_036.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-nl_func_var_def_blk             = 1
-nl_try_brace                    = add
-nl_after_brace_close            = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_037.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_037.cfg
deleted file mode 100644
index 97daab41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_037.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_inside_paren                 = remove
-sp_func_def_paren               = remove
-indent_columns                  = 3
-indent_class                    = true
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_038.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_038.cfg
deleted file mode 100644
index 4384cfbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_038.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_inside_paren                 = remove
-indent_columns                  = 3
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_042.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_042.cfg
deleted file mode 100644
index c98cdf54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_042.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_043.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_043.cfg
deleted file mode 100644
index fcbc9ddc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_043.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_044.cfg
deleted file mode 100644
index 6815087d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_044.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_inside_paren                 = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-align_var_def_span              = 2
-align_assign_span               = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_045.cfg
deleted file mode 100644
index 3ff68ef5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_045.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_assign           = force
-indent_columns      = 3
-indent_with_tabs    = 0
-indent_class        = true
-nl_func_var_def_blk = 1
-# Add or remove space around the '.' or '-&gt;' operators. Default=Remove.
-sp_member           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_047.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_047.cfg
deleted file mode 100644
index b00b8995..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_047.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-align_right_cmt_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_048.cfg
deleted file mode 100644
index 81d0ba54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_048.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_while_brace                  = add
-nl_do_brace                     = add
-nl_brace_while                  = remove
-nl_fdef_brace                   = add
-sp_brace_close_while            = force
-align_assign_span               = 1
-cmt_star_cont                   = true
-mod_full_brace_do               = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-mod_remove_extra_semicolon      = true
-mod_add_long_function_closebrace_comment = 40
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_049.cfg
deleted file mode 100644
index b8e6f708..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_049.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_assign                       = force
-sp_after_comma                  = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-align_nl_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_050.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_050.cfg
deleted file mode 100644
index 0f0e30ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_050.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_if_brace                     = add
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_051.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_051.cfg
deleted file mode 100644
index 786fb030..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_051.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_052.cfg
deleted file mode 100644
index ba150be7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_052.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_inside_paren                 = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_if_brace                     = add
-nl_for_brace                    = add
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_053.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_053.cfg
deleted file mode 100644
index 7cf1c682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_053.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_defined_paren                = force
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_054.cfg
deleted file mode 100644
index 56661763..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_054.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_sparen                = force
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-align_var_def_span              = 2
-align_assign_span               = 1
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_055.cfg
deleted file mode 100644
index f050b219..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_055.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
-nl_while_brace                  = add
-nl_do_brace                     = add
-nl_brace_while                  = remove
-sp_brace_close_while            = force
-mod_full_brace_do               = add
-mod_full_brace_while            = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_056.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_056.cfg
deleted file mode 100644
index 43e9f6cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_056.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 3
-align_nl_cont                   = true
-pp_space                        = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_057.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_057.cfg
deleted file mode 100644
index fbf24d72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_057.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_assign                       = force
-sp_before_sparen                = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-nl_after_brace_open             = true
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_058.cfg
deleted file mode 100644
index 397ae6e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_058.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_inside_paren                 = remove
-sp_before_sparen                = force
-sp_return_paren                 = remove
-indent_columns                  = 3
-nl_switch_brace                 = add
-eat_blanks_before_close_brace   = true
-align_nl_cont                   = true
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_061.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_061.cfg
deleted file mode 100644
index 89f76fae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_061.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_label                    = 2
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_for_brace                    = add
-nl_after_return                 = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_063.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_063.cfg
deleted file mode 100644
index 3c5e88f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_063.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
-align_var_def_span              = 2
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_064.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_064.cfg
deleted file mode 100644
index f56efbdf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_064.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_comma                  = force
-indent_columns                  = 3
-align_var_def_span              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_065.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_065.cfg
deleted file mode 100644
index 21d55b16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_065.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-eat_blanks_before_close_brace   = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_069.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_069.cfg
deleted file mode 100644
index d42173e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_069.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_inside_fparen                = remove
-indent_columns                  = 3
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_after_brace_open             = true
-nl_after_vbrace_open            = true
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_070.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_070.cfg
deleted file mode 100644
index f304ca8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_070.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 3
-align_assign_span               = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_071.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_071.cfg
deleted file mode 100644
index 869f2a94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_071.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_var_def_span              = 2
-align_var_def_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_072.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_072.cfg
deleted file mode 100644
index 973d8c6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_072.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 3
-eat_blanks_before_close_brace   = true
-align_nl_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_073.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_073.cfg
deleted file mode 100644
index 49f69643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_073.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_cast                   = remove
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-align_assign_span               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_074.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_074.cfg
deleted file mode 100644
index 9b14e775..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_074.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_075.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_075.cfg
deleted file mode 100644
index 9eca8a9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_075.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_inside_fparen                = remove
-align_func_params               = true
-align_var_def_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_076.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_076.cfg
deleted file mode 100644
index fb27ba74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_076.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_ptr_star               = remove
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_077.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_077.cfg
deleted file mode 100644
index 4e9760f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_077.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_comma                  = force
-sp_after_cast                   = remove
-indent_columns                  = 3
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
-mod_add_long_function_closebrace_comment = 40
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_078.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_078.cfg
deleted file mode 100644
index 54fcc628..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_078.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_comma                  = force
-indent_columns                  = 3
-nl_after_brace_open             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_079.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_079.cfg
deleted file mode 100644
index 77a732e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_079.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_comma                  = force
-sp_inside_braces                = force
-indent_columns                  = 3
-nl_assign_brace                 = add
-align_number_right              = true
-align_assign_span               = 1
-align_struct_init_span          = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_080.cfg
deleted file mode 100644
index 45e16a8d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_080.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_inside_paren                 = remove
-sp_before_sparen                = force
-indent_columns                  = 3
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_fdef_brace                   = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_081.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_081.cfg
deleted file mode 100644
index dc15820d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_081.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_before_ellipsis              = remove
-indent_columns                  = 3
-align_nl_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_083.cfg
deleted file mode 100644
index 2ccee465..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_083.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_084.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_084.cfg
deleted file mode 100644
index bbb0e675..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_084.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_inside_paren                 = remove
-sp_before_ptr_star              = force
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-sp_after_comma                  = force
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_struct_brace                 = add
-align_var_def_star_style        = 1
-align_var_struct_span           = 3
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_085.cfg
deleted file mode 100644
index b02673d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_085.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_paren_paren                  = remove
-sp_inside_fparen                = remove
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_086.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_086.cfg
deleted file mode 100644
index ecf99d0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_086.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_before_semi_for_empty        = force
-sp_after_semi_for_empty         = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_enum_brace                   = add
-nl_struct_brace                 = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_for_brace                    = add
-nl_before_case                  = true
-nl_after_brace_open             = true
-align_var_def_star_style        = 1
-align_var_struct_span           = 3
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
-mod_remove_extra_semicolon      = true
-mod_add_long_function_closebrace_comment = 40
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_087.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_087.cfg
deleted file mode 100644
index df282f1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_087.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-sp_before_sparen                = force
-sp_after_comma                  = force
-sp_inside_braces                = force
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_label                    = 2
-nl_assign_brace                 = add
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_for_brace                    = add
-nl_switch_brace                 = add
-nl_before_case                  = true
-eat_blanks_after_open_brace     = true
-nl_after_return                 = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
-align_struct_init_span          = 3
-cmt_star_cont                   = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
-mod_add_long_function_closebrace_comment = 40
-mod_add_long_switch_closebrace_comment = 40
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_088.cfg
deleted file mode 100644
index 19cc7dc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_088.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_sparen                = force
-sp_while_paren_open             = force
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_089.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_089.cfg
deleted file mode 100644
index d3c152df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_089.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_compare                      = force
-sp_before_semi_for_empty        = force
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_090.cfg
deleted file mode 100644
index eba1ab79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_090.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-align_nl_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_091.cfg
deleted file mode 100644
index aec90af1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_091.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_after_comma                  = force
-sp_func_def_paren               = remove
-indent_columns                  = 3
-nl_if_brace                     = add
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_092.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_092.cfg
deleted file mode 100644
index bb993d75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_092.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_after_comma                  = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_if_brace                     = add
-nl_do_brace                     = add
-nl_fdef_brace                   = add
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-cmt_star_cont                   = true
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_093.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_093.cfg
deleted file mode 100644
index 4e50b52b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_093.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-align_asm_colon                 = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_094.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_094.cfg
deleted file mode 100644
index 9ab0c51f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_094.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_inside_paren                 = remove
-sp_after_comma                  = force
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-align_assign_span               = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_095.cfg
deleted file mode 100644
index edb10a4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_095.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_sparen                = force
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_098.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_098.cfg
deleted file mode 100644
index 9dddd073..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_098.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_inside_paren                 = remove
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-align_right_cmt_span            = 3
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_099.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_099.cfg
deleted file mode 100644
index 6cd10860..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_099.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_inside_paren                 = remove
-indent_columns                  = 3
-indent_class                    = true
-nl_fdef_brace                   = add
-eat_blanks_after_open_brace     = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_100.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_100.cfg
deleted file mode 100644
index bb7a14c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_100.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_inside_sparen                = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-nl_for_brace                    = add
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_101.cfg
deleted file mode 100644
index 50078f96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_101.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-nl_for_brace                    = add
-nl_fdef_brace                   = add
-mod_paren_on_return             = add
-mod_remove_extra_semicolon      = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_102.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_102.cfg
deleted file mode 100644
index 82fa033c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_102.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-nl_func_var_def_blk             = 1
-nl_for_brace                    = add
-nl_fdef_brace                   = add
-align_var_def_span              = 2
-align_assign_span               = 1
-mod_paren_on_return             = add
-mod_remove_extra_semicolon      = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_103.cfg
deleted file mode 100644
index 3d212ad4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_103.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-output_tab_size                 = 3
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_class                    = true
-nl_func_var_def_blk             = 1
-nl_for_brace                    = add
-nl_fdef_brace                   = add
-align_var_def_span              = 2
-align_assign_span               = 1
-mod_paren_on_return             = add
-mod_remove_extra_semicolon      = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_104.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_104.cfg
deleted file mode 100644
index 80870cfe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_104.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_func_def_paren               = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_105.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_105.cfg
deleted file mode 100644
index 4b30fcfe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_105.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_inside_paren                 = remove
-sp_after_cast                   = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_if_brace                     = add
-nl_switch_brace                 = add
-nl_before_case                  = true
-nl_fdef_brace                   = add
-mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/block_pointer.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/block_pointer.cfg
deleted file mode 100644
index 70c21bbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/block_pointer.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_ptr_block_caret        = remove   # ignore/add/remove/force
-sp_before_oc_block_caret        = remove   # ignore/add/remove/force
-sp_after_oc_block_caret         = remove   # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/blocks.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/blocks.cfg
deleted file mode 100644
index 74ed7e4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/blocks.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_ptr_star_paren               = remove
-sp_inside_tparen                = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_after_send_oc_colon          = force
-sp_after_oc_type                = force
-sp_after_oc_block_caret         = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-break.cfg
deleted file mode 100644
index d2abdeb6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-break.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-#  moves boolean ops to the end of line
-indent_columns                  = 3
-pos_bool                        = trail_break
-pos_comma                       = trail_break
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-force.cfg
deleted file mode 100644
index 51044559..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-force.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-#  moves boolean ops to the end of line
-indent_columns                  = 3
-pos_bool                        = trail_force
-pos_comma                       = trail_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol.cfg
deleted file mode 100644
index f7fe1330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-#  moves boolean ops to the end of line
-indent_columns                  = 3
-pos_bool                        = trail
-pos_comma                       = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-break.cfg
deleted file mode 100644
index e07ab7e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-break.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#  moves boolean ops to the end of line
-sp_after_comma                  = force
-indent_columns                  = 3
-pos_bool                        = lead_break
-pos_comma                       = lead_break
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-force.cfg
deleted file mode 100644
index 36f81a26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-force.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#  moves boolean ops to the end of line
-sp_after_comma                  = force
-indent_columns                  = 3
-pos_bool                        = lead_force
-pos_comma                       = lead_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol.cfg
deleted file mode 100644
index 9dbcbaf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#  moves boolean ops to the end of line
-sp_after_comma                  = force
-indent_columns                  = 3
-pos_bool                        = lead
-pos_comma                       = lead
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-allman.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-allman.cfg
deleted file mode 100644
index 0e903302..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-allman.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#  Allman style
-indent_with_tabs                = 0
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.cfg
deleted file mode 100644
index 2fc753a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-#  Banner style
-output_tab_size                 = 2
-sp_fparen_brace                 = add
-sp_else_brace                   = force
-sp_do_brace_open                = force
-indent_columns                  = 2
-indent_braces                   = true
-indent_braces_no_func           = true
-nl_if_brace                     = remove
-nl_else_brace                   = remove
-nl_for_brace                    = remove
-nl_while_brace                  = remove
-nl_do_brace                     = remove
-nl_brace_while                  = add
-nl_fdef_brace                   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.rerun.cfg
deleted file mode 100644
index df289545..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.rerun.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-include                           "brace-banner.cfg"
-
-input_tab_size                  = output_tab_size
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-gnu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-gnu.cfg
deleted file mode 100644
index c5bd1371..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-gnu.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#  GNU style
-indent_columns                  = 2
-indent_with_tabs                = 0
-indent_brace                    = 2
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-nl_brace_while                  = add
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-br.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-br.cfg
deleted file mode 100644
index 59bc4084..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-br.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#  K&R style
-sp_else_brace                   = force
-nl_if_brace                     = remove
-nl_after_brace_open             = true
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-nobr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-nobr.cfg
deleted file mode 100644
index 970b1ab0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-nobr.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#  K&R style
-sp_after_sparen                 = force
-sp_brace_else                   = force
-sp_else_brace                   = force
-nl_if_brace                     = remove
-nl_brace_else                   = remove
-nl_else_brace                   = remove
-nl_while_brace                  = remove
-nl_fdef_brace                   = add
-nl_remove_extra_newlines        = 2
-mod_full_brace_if               = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr.cfg
deleted file mode 100644
index 7ef5aa16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-#  K&R style
-sp_else_brace                   = force
-sp_brace_else                   = force
-sp_do_brace_open                = force
-nl_fcall_brace                  = add
-nl_if_brace                     = remove
-nl_brace_else                   = remove
-nl_else_brace                   = remove
-nl_for_brace                    = remove
-nl_while_brace                  = remove
-nl_do_brace                     = remove
-nl_fdef_brace                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-2.cfg
deleted file mode 100644
index 9aa693fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-2.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Removes all unecessary braces unless the body spans more than 2 lines
-mod_full_brace_do               = remove
-mod_full_brace_for              = remove
-mod_full_brace_if               = remove
-mod_full_brace_nl               = 2
-mod_full_brace_while            = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-all.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-all.cfg
deleted file mode 100644
index ca279abd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-all.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Removes all unecessary braces
-nl_else_if                      = remove
-mod_full_brace_do               = remove
-mod_full_brace_for              = remove
-mod_full_brace_if               = remove
-mod_full_brace_while            = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws.cfg
deleted file mode 100644
index 76d8908a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-#  Whitesmith style
-indent_braces                   = true
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-nl_brace_while                  = add
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws2.cfg
deleted file mode 100644
index 55eb6ece..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws2.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-#  Whitesmith style
-indent_braces                   = true
-indent_braces_no_func           = true
-nl_fcall_brace                  = add
-nl_if_brace                     = add
-nl_brace_while                  = add
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1001.cfg
deleted file mode 100644
index d8255ca7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1001.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-#Add or remove space between '&lt;&gt;' and ':'
-sp_angle_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1003.cfg
deleted file mode 100644
index 242b3a13..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1003.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_access_spec_body         = true
-indent_paren_close              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1004.cfg
deleted file mode 100644
index f479bada..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1004.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-output_tab_size                 = 4
-sp_arith                        = force
-indent_columns                  = 4
-align_var_def_span              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1020.cfg
deleted file mode 100644
index 51643e87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1020.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-code_width                      = 190
-ls_func_split_full              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1108.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1108.cfg
deleted file mode 100644
index 741ba79d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1108.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_braces                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1160.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1160.cfg
deleted file mode 100644
index afc7030d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1160.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_continue                 = 4
-indent_class                    = true
-use_indent_continue_only_once   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1161.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1161.cfg
deleted file mode 100644
index c7977cf0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1161.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_class            = true
-indent_access_spec_body = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1169.cfg
deleted file mode 100644
index 0615b330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1169.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_continue                 = 6
-indent_access_spec_body         = true
-code_width                      = 50
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1170.cfg
deleted file mode 100644
index 9171180b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1170.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_continue                 = 6
-indent_class                    = true
-code_width                      = 140
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1236.cfg
deleted file mode 100644
index 0c60d5be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1236.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_ignore_asm_block         = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1296.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1296.cfg
deleted file mode 100644
index 82a970ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1296.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_with_tabs            = 0
-indent_cpp_lambda_only_once = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1315.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1315.cfg
deleted file mode 100644
index 49a716d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1315.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_with_tabs      = 0
-sp_enum_before_assign = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1324.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1324.cfg
deleted file mode 100644
index 289ca9d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1324.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_semi_for               = remove
-sp_after_semi_for_empty         = force
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1340.cfg
deleted file mode 100644
index 6ec6568e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1340.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cpp_lambda_body          = true
-align_assign_span               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1349.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1349.cfg
deleted file mode 100644
index abe4253c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1349.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-code_width                      = 115
-align_struct_init_span          = 5
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1395.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1395.cfg
deleted file mode 100644
index c2bed595..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1395.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_same_func_call_params = true
-nl_cpp_lambda_leave_one_liners  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1402.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1402.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1403.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1403.cfg
deleted file mode 100644
index 8e10acd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1403.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_arith = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1432.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1432.cfg
deleted file mode 100644
index 4ae27492..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1432.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_after_func_proto = 0
-nl_after_func_proto_group = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1439.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1439.cfg
deleted file mode 100644
index f625249d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1439.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_struct = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1452.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1452.cfg
deleted file mode 100755
index dbd0e9b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1452.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_class_leave_one_liners       = true
-nl_func_type_name               = force
-align_var_struct_span           = 99 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1620.cfg
deleted file mode 100644
index 1d7582b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1620.cfg
+++ /dev/null
@@ -1,288 +0,0 @@
-input_tab_size=4

-string_replace_tab_chars=true

-tok_split_gte=false

-disable_processing_cmt=*begin-nonstandard-formatting*

-enable_processing_cmt=*end-nonstandard-formatting*

-utf8_bom=remove

-utf8_byte=false

-utf8_force=false

-indent_columns=4

-indent_with_tabs=0

-indent_cmt_with_tabs=false

-indent_align_string=false

-indent_braces=false

-indent_braces_no_func=false

-indent_braces_no_class=false

-indent_braces_no_struct=false

-indent_brace_parent=false

-indent_cs_delegate_brace=true

-indent_namespace=true

-indent_extern=false

-indent_class=true

-indent_class_colon=false

-indent_else_if=false

-indent_var_def_cont=false

-indent_func_call_param=true

-indent_func_def_param=true

-indent_func_proto_param=true

-indent_func_class_param=false

-indent_func_ctor_var_param=false

-indent_template_param=false

-indent_func_param_double=false

-indent_member_single=false

-indent_relative_single_line_comments=false

-indent_switch_case=4

-indent_case_shift=0

-indent_case_brace=0

-indent_col1_comment=false

-indent_label=-4

-indent_access_spec=-4

-indent_paren_nl=false

-indent_comma_paren=false

-indent_bool_paren=false

-indent_first_bool_expr=false

-indent_square_nl=false

-indent_preserve_sql=false

-indent_align_paren=false

-indent_oc_block_msg_xcode_style=true

-indent_off_after_return_new=true

-indent_single_after_return=true

-sp_arith=add

-sp_assign=add

-sp_assign_default=add

-sp_enum_assign=add

-sp_pp_concat=remove

-sp_pp_stringify=remove

-sp_bool=add

-sp_compare=add

-sp_inside_paren=remove

-sp_paren_paren=remove

-sp_balance_nested_parens=false

-sp_paren_brace=force

-sp_after_type=ignore

-sp_template_angle=remove

-sp_before_angle=remove

-sp_inside_angle=remove

-sp_angle_paren=remove

-sp_angle_paren_empty=remove

-sp_angle_word=add

-sp_angle_shift=remove

-sp_before_sparen=force

-sp_inside_sparen=remove

-sp_after_sparen=add

-sp_sparen_brace=force

-sp_special_semi=force

-sp_before_semi=remove

-sp_before_semi_for=remove

-sp_before_semi_for_empty=remove

-sp_after_semi=add

-sp_after_semi_for=force

-sp_after_semi_for_empty=remove

-sp_before_square=remove

-sp_before_squares=remove

-sp_inside_square=remove

-sp_after_comma=add

-sp_before_comma=ignore

-sp_after_mdatype_commas=remove

-sp_before_mdatype_commas=remove

-sp_between_mdatype_commas=remove

-sp_paren_comma=remove

-sp_after_class_colon=force

-sp_before_class_colon=force

-sp_before_case_colon=remove

-sp_after_operator=remove

-sp_after_operator_sym=remove

-sp_after_operator_sym_empty=remove

-sp_after_cast=remove

-sp_inside_paren_cast=remove

-sp_cpp_cast_paren=remove

-sp_sizeof_paren=remove

-sp_inside_braces_enum=add

-sp_inside_braces_empty=remove

-sp_type_func=ignore

-sp_func_proto_paren=remove

-sp_func_def_paren=remove

-sp_inside_fparens=remove

-sp_inside_fparen=remove

-sp_fparen_brace=add

-sp_func_call_paren=remove

-sp_func_call_paren_empty=remove

-sp_func_call_user_paren=remove

-sp_func_class_paren=remove

-sp_return_paren=add

-sp_defined_paren=remove

-sp_throw_paren=add

-sp_catch_paren=add

-sp_brace_typedef=add

-sp_getset_brace=add

-sp_after_dc=remove

-sp_not=remove

-sp_inv=remove

-sp_addr=remove

-sp_member=remove

-sp_deref=remove

-sp_sign=remove

-sp_incdec=remove

-sp_before_nl_cont=add

-sp_after_oc_scope=force

-sp_after_oc_colon=remove

-sp_before_oc_colon=remove

-sp_after_oc_dict_colon=force

-sp_before_oc_dict_colon=remove

-sp_after_send_oc_colon=force

-sp_before_send_oc_colon=remove

-sp_after_oc_type=remove

-sp_after_oc_return_type=remove

-sp_after_oc_at_sel=remove

-sp_inside_oc_at_sel_parens=remove

-sp_cond_colon=add

-sp_cond_question=add

-sp_case_label=ignore

-sp_after_new=force

-sp_between_new_paren=remove

-sp_skip_vbrace_tokens=true

-align_keep_tabs=false

-align_with_tabs=false

-align_on_tabstop=false

-align_number_right=false

-align_func_params=false

-align_same_func_call_params=false

-align_var_def_colon=false

-align_var_def_attribute=false

-align_var_def_inline=false

-align_right_cmt_mix=false

-align_on_operator=false

-align_mix_var_proto=false

-align_single_line_func=false

-align_single_line_brace=false

-align_nl_cont=false

-align_left_shift=false

-nl_collapse_empty_body=false

-nl_assign_leave_one_liners=true

-nl_class_leave_one_liners=true

-nl_enum_leave_one_liners=true

-nl_getset_leave_one_liners=true

-nl_func_leave_one_liners=true

-nl_cpp_lambda_leave_one_liners=true

-nl_if_leave_one_liners=false

-nl_oc_msg_leave_one_liner=true

-nl_start_of_file=remove

-nl_end_of_file=force

-nl_end_of_file_min=1

-nl_assign_brace=force

-nl_enum_brace=force

-nl_struct_brace=force

-nl_union_brace=force

-nl_if_brace=force

-nl_brace_else=force

-nl_else_brace=force

-nl_else_if=remove

-nl_brace_finally=force

-nl_finally_brace=force

-nl_try_brace=force

-nl_getset_brace=force

-nl_for_brace=force

-nl_catch_brace=force

-nl_brace_catch=force

-nl_while_brace=force

-nl_using_brace=force

-nl_brace_brace=ignore

-nl_do_brace=force

-nl_brace_while=force

-nl_switch_brace=force

-nl_multi_line_cond=false

-nl_before_case=false

-nl_after_case=false

-nl_case_colon_brace=force

-nl_namespace_brace=force

-nl_template_class=ignore

-nl_class_brace=force

-nl_fdef_brace=force

-nl_after_semicolon=false

-nl_after_brace_open=false

-nl_after_brace_open_cmt=false

-nl_after_vbrace_open=false

-nl_after_vbrace_open_empty=false

-nl_after_brace_close=false

-nl_after_vbrace_close=false

-nl_squeeze_ifdef=false

-nl_ds_struct_enum_cmt=false

-nl_ds_struct_enum_close_brace=false

-nl_namespace_two_to_one_liner=false

-nl_create_if_one_liner=false

-nl_create_for_one_liner=false

-nl_create_while_one_liner=false

-nl_create_func_def_one_liner=false

-ls_for_split_full=false

-ls_func_split_full=false

-nl_max=3

-nl_after_func_body=2

-nl_after_multiline_comment=false

-nl_property_brace=force

-eat_blanks_after_open_brace=true

-eat_blanks_before_close_brace=true

-nl_after_return=false

-mod_full_brace_if_chain=false

-mod_paren_on_return=ignore

-mod_pawn_semicolon=false

-mod_full_paren_if_bool=false

-mod_remove_extra_semicolon=true

-mod_move_case_break=false

-mod_remove_empty_return=true

-cmt_convert_tab_to_spaces=True

-cmt_indent_multi=false

-cmt_c_group=false

-cmt_c_nl_start=false

-cmt_c_nl_end=false

-cmt_cpp_group=false

-cmt_cpp_nl_start=false

-cmt_cpp_nl_end=false

-cmt_cpp_to_c=false

-cmt_star_cont=false

-cmt_multi_check_last=false

-cmt_insert_before_preproc=false

-pp_space=ignore

-use_options_overriding_for_qt_macros=false

-warn_level_tabs_found_in_verbatim_string_literals=1

-mod_add_long_ifdef_else_comment=0

-mod_add_long_ifdef_endif_comment=0

-

-

-

-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:

-#

-# x = o.Func2(a, b,

-#         y);

-# o.Func2(a, b,

-#     y);

-#

-# ...but setting it 'true' is often worse:

-#

-# ExtraReallyLongType reallyLongVariableName = someTest

-#                                            ? someTrueExpr

-#                                            : someFalseExpr

-#

-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,

-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.

-# (currently unreported)

-indent_align_assign=false

-

-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space

-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++

-# comment line at the same level of indentation.

-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us

-# (test using Runtime/Allocator/BucketAllocator.h)

-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further

-#sp_cmt_cpp_start=add

-sp_cmt_cpp_start=ignore

-

-# https://sourceforge.net/p/uncrustify/bugs/619/

-#sp_endif_cmt=force

-sp_endif_cmt=ignore

-

-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:

-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp

-#nl_cpp_ldef_brace=force

-indent_paren_open_brace=true

-indent_cs_delegate_brace=false

-indent_paren_close=2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1637.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1637.cfg
deleted file mode 100644
index 40820de1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1637.cfg
+++ /dev/null
@@ -1,286 +0,0 @@
-input_tab_size=4
-string_replace_tab_chars=true
-tok_split_gte=false
-disable_processing_cmt=*begin-nonstandard-formatting*
-enable_processing_cmt=*end-nonstandard-formatting*
-utf8_bom=remove
-utf8_byte=false
-utf8_force=false
-indent_columns=4
-indent_with_tabs=0
-indent_cmt_with_tabs=false
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_braces_no_class=false
-indent_braces_no_struct=false
-indent_brace_parent=false
-indent_cs_delegate_brace=true
-indent_namespace=true
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_var_def_cont=false
-indent_func_call_param=true
-indent_func_def_param=true
-indent_func_proto_param=true
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_member_single=false
-indent_relative_single_line_comments=false
-indent_switch_case=4
-indent_case_shift=0
-indent_case_brace=0
-indent_col1_comment=false
-indent_label=-4
-indent_access_spec=-4
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_first_bool_expr=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_align_paren=false
-indent_oc_block_msg_xcode_style=true
-indent_off_after_return_new=true
-indent_single_after_return=true
-sp_arith=add
-sp_assign=add
-sp_assign_default=add
-sp_enum_assign=add
-sp_pp_concat=remove
-sp_pp_stringify=remove
-sp_bool=add
-sp_compare=add
-sp_inside_paren=remove
-sp_paren_paren=remove
-sp_balance_nested_parens=false
-sp_paren_brace=force
-sp_after_type=ignore
-sp_template_angle=remove
-sp_before_angle=remove
-sp_inside_angle=remove
-sp_angle_paren=remove
-sp_angle_paren_empty=remove
-sp_angle_word=add
-sp_angle_shift=remove
-sp_before_sparen=force
-sp_inside_sparen=remove
-sp_after_sparen=add
-sp_sparen_brace=force
-sp_special_semi=force
-sp_before_semi=remove
-sp_before_semi_for=remove
-sp_before_semi_for_empty=remove
-sp_after_semi=add
-sp_after_semi_for=force
-sp_after_semi_for_empty=remove
-sp_before_square=remove
-sp_before_squares=remove
-sp_inside_square=remove
-sp_after_comma=add
-sp_before_comma=ignore
-sp_after_mdatype_commas=remove
-sp_before_mdatype_commas=remove
-sp_between_mdatype_commas=remove
-sp_paren_comma=remove
-sp_after_class_colon=force
-sp_before_class_colon=force
-sp_before_case_colon=remove
-sp_after_operator=remove
-sp_after_operator_sym=remove
-sp_after_operator_sym_empty=remove
-sp_after_cast=remove
-sp_inside_paren_cast=remove
-sp_cpp_cast_paren=remove
-sp_sizeof_paren=remove
-sp_inside_braces_enum=add
-sp_inside_braces_empty=remove
-sp_type_func=ignore
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_inside_fparens=remove
-sp_inside_fparen=remove
-sp_fparen_brace=add
-sp_func_call_paren=remove
-sp_func_call_paren_empty=remove
-sp_func_call_user_paren=remove
-sp_func_class_paren=remove
-sp_return_paren=add
-sp_defined_paren=remove
-sp_throw_paren=add
-sp_catch_paren=add
-sp_brace_typedef=add
-sp_getset_brace=add
-sp_after_dc=remove
-sp_not=remove
-sp_inv=remove
-sp_addr=remove
-sp_member=remove
-sp_deref=remove
-sp_sign=remove
-sp_incdec=remove
-sp_before_nl_cont=add
-sp_after_oc_scope=force
-sp_after_oc_colon=remove
-sp_before_oc_colon=remove
-sp_after_oc_dict_colon=force
-sp_before_oc_dict_colon=remove
-sp_after_send_oc_colon=force
-sp_before_send_oc_colon=remove
-sp_after_oc_type=remove
-sp_after_oc_return_type=remove
-sp_after_oc_at_sel=remove
-sp_inside_oc_at_sel_parens=remove
-sp_cond_colon=add
-sp_cond_question=add
-sp_case_label=ignore
-sp_after_new=force
-sp_between_new_paren=remove
-sp_skip_vbrace_tokens=true
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_right=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=true
-nl_class_leave_one_liners=true
-nl_enum_leave_one_liners=true
-nl_getset_leave_one_liners=true
-nl_func_leave_one_liners=true
-nl_cpp_lambda_leave_one_liners=true
-nl_if_leave_one_liners=false
-nl_oc_msg_leave_one_liner=true
-nl_start_of_file=remove
-nl_end_of_file=force
-nl_end_of_file_min=1
-nl_assign_brace=force
-nl_enum_brace=force
-nl_struct_brace=force
-nl_union_brace=force
-nl_if_brace=force
-nl_brace_else=force
-nl_else_brace=force
-nl_else_if=remove
-nl_brace_finally=force
-nl_finally_brace=force
-nl_try_brace=force
-nl_getset_brace=force
-nl_for_brace=force
-nl_catch_brace=force
-nl_brace_catch=force
-nl_while_brace=force
-nl_using_brace=force
-nl_brace_brace=ignore
-nl_do_brace=force
-nl_brace_while=force
-nl_switch_brace=force
-nl_multi_line_cond=false
-nl_before_case=false
-nl_after_case=false
-nl_case_colon_brace=force
-nl_namespace_brace=force
-nl_template_class=ignore
-nl_class_brace=force
-nl_fdef_brace=force
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_vbrace_open_empty=false
-nl_after_brace_close=false
-nl_after_vbrace_close=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_namespace_two_to_one_liner=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-nl_create_func_def_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_max=3
-nl_after_func_body=2
-nl_after_multiline_comment=false
-nl_property_brace=force
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-nl_after_return=false
-mod_full_brace_if_chain=false
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=true
-mod_move_case_break=false
-mod_remove_empty_return=true
-cmt_convert_tab_to_spaces=True
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=false
-cmt_insert_before_preproc=false
-pp_space=ignore
-use_options_overriding_for_qt_macros=false
-warn_level_tabs_found_in_verbatim_string_literals=1
-mod_add_long_ifdef_else_comment=0
-mod_add_long_ifdef_endif_comment=0
-
-
-
-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:
-#
-# x = o.Func2(a, b,
-#         y);
-# o.Func2(a, b,
-#     y);
-#
-# ...but setting it 'true' is often worse:
-#
-# ExtraReallyLongType reallyLongVariableName = someTest
-#                                            ? someTrueExpr
-#                                            : someFalseExpr
-#
-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,
-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.
-# (currently unreported)
-indent_align_assign=false
-
-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space
-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++
-# comment line at the same level of indentation.
-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us
-# (test using Runtime/Allocator/BucketAllocator.h)
-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further
-#sp_cmt_cpp_start=add
-sp_cmt_cpp_start=ignore
-
-# https://sourceforge.net/p/uncrustify/bugs/619/
-#sp_endif_cmt=force
-sp_endif_cmt=ignore
-
-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:
-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp
-#nl_cpp_ldef_brace=force
-
-mod_paren_on_return=remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1649.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1649.cfg
deleted file mode 100644
index 472975ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1649.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_noexcept = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1650.cfg
deleted file mode 100644
index cd5a2504..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1650.cfg
+++ /dev/null
@@ -1,287 +0,0 @@
-input_tab_size=4

-string_replace_tab_chars=true

-tok_split_gte=false

-disable_processing_cmt=*begin-nonstandard-formatting*

-enable_processing_cmt=*end-nonstandard-formatting*

-utf8_bom=remove

-utf8_byte=false

-utf8_force=false

-indent_columns=4

-indent_with_tabs=0

-indent_cmt_with_tabs=false

-indent_align_string=false

-indent_braces=false

-indent_braces_no_func=false

-indent_braces_no_class=false

-indent_braces_no_struct=false

-indent_brace_parent=false

-indent_cs_delegate_brace=true

-indent_namespace=true

-indent_extern=false

-indent_class=true

-indent_class_colon=false

-indent_else_if=false

-indent_var_def_cont=false

-indent_func_call_param=true

-indent_func_def_param=true

-indent_func_proto_param=true

-indent_func_class_param=false

-indent_func_ctor_var_param=false

-indent_template_param=false

-indent_func_param_double=false

-indent_relative_single_line_comments=false

-indent_switch_case=4

-indent_case_shift=0

-indent_case_brace=0

-indent_col1_comment=false

-indent_label=-4

-indent_access_spec=-4

-indent_paren_nl=false

-indent_comma_paren=false

-indent_bool_paren=false

-indent_first_bool_expr=false

-indent_square_nl=false

-indent_preserve_sql=false

-indent_align_paren=false			

-indent_oc_block_msg_xcode_style=true

-indent_off_after_return_new=true

-indent_single_after_return=true

-sp_arith=add

-sp_assign=add

-sp_assign_default=add

-sp_enum_assign=add

-sp_pp_concat=remove

-sp_pp_stringify=remove

-sp_bool=add

-sp_compare=add

-sp_inside_paren=remove

-sp_paren_paren=remove

-sp_balance_nested_parens=false

-sp_paren_brace=force

-sp_after_type=ignore

-sp_template_angle=remove

-sp_before_angle=remove

-sp_inside_angle=remove

-sp_angle_paren=remove

-sp_angle_paren_empty=remove

-sp_angle_word=add

-sp_angle_shift=remove

-sp_before_sparen=force

-sp_inside_sparen=remove

-sp_after_sparen=add

-sp_sparen_brace=force

-sp_special_semi=force

-sp_before_semi=remove

-sp_before_semi_for=remove

-sp_before_semi_for_empty=remove

-sp_after_semi=add

-sp_after_semi_for=force

-sp_after_semi_for_empty=remove

-sp_before_square=remove

-sp_before_squares=remove

-sp_inside_square=remove

-sp_after_comma=add

-sp_before_comma=ignore

-sp_after_mdatype_commas=remove

-sp_before_mdatype_commas=remove

-sp_between_mdatype_commas=remove

-sp_paren_comma=remove

-sp_after_class_colon=force

-sp_before_class_colon=force

-sp_before_case_colon=remove

-sp_after_operator=remove

-sp_after_operator_sym=remove

-sp_after_operator_sym_empty=remove

-sp_after_cast=remove

-sp_inside_paren_cast=remove

-sp_cpp_cast_paren=remove

-sp_sizeof_paren=remove

-sp_inside_braces_enum=add

-sp_inside_braces_empty=remove

-sp_type_func=ignore

-sp_func_proto_paren=remove

-sp_func_def_paren=remove

-sp_inside_fparens=remove

-sp_inside_fparen=remove

-sp_fparen_brace=add

-sp_func_call_paren=remove

-sp_func_call_paren_empty=remove

-sp_func_call_user_paren=remove

-sp_func_class_paren=remove

-sp_return_paren=add

-sp_defined_paren=remove

-sp_throw_paren=add

-sp_catch_paren=add

-sp_getset_brace=add

-sp_after_dc=remove

-sp_not=remove

-sp_inv=remove

-sp_addr=remove

-sp_member=remove

-sp_deref=remove

-sp_sign=remove

-sp_incdec=remove

-sp_before_nl_cont=add

-sp_after_oc_scope=force

-sp_after_oc_colon=remove

-sp_before_oc_colon=remove

-sp_after_oc_dict_colon=force

-sp_before_oc_dict_colon=remove

-sp_after_send_oc_colon=force

-sp_before_send_oc_colon=remove

-sp_after_oc_type=remove

-sp_after_oc_return_type=remove

-sp_after_oc_at_sel=remove

-sp_inside_oc_at_sel_parens=remove

-sp_cond_colon=add

-sp_cond_question=add

-sp_case_label=ignore

-sp_after_new=force

-sp_between_new_paren=remove

-sp_skip_vbrace_tokens=true

-align_keep_tabs=false

-align_with_tabs=false

-align_on_tabstop=false

-align_number_right=false

-align_func_params=false

-align_same_func_call_params=false

-align_var_def_colon=false

-align_var_def_attribute=false

-align_var_def_inline=false

-align_right_cmt_mix=false

-align_on_operator=false

-align_mix_var_proto=false

-align_single_line_func=false

-align_single_line_brace=false

-align_nl_cont=false

-align_left_shift=false

-nl_collapse_empty_body=false

-nl_assign_leave_one_liners=true

-nl_class_leave_one_liners=true

-nl_enum_leave_one_liners=true

-nl_getset_leave_one_liners=true

-nl_func_leave_one_liners=true

-nl_cpp_lambda_leave_one_liners=true

-nl_if_leave_one_liners=false

-nl_oc_msg_leave_one_liner=true

-nl_start_of_file=remove

-nl_end_of_file=force

-nl_end_of_file_min=1

-nl_assign_brace=force

-nl_enum_brace=force

-nl_struct_brace=force

-nl_union_brace=force

-nl_if_brace=force

-nl_brace_else=force

-nl_else_brace=force

-nl_else_if=remove

-nl_brace_finally=force

-nl_finally_brace=force

-nl_try_brace=force

-nl_getset_brace=force

-nl_for_brace=force

-nl_catch_brace=force

-nl_brace_catch=force

-nl_while_brace=force

-nl_using_brace=force

-nl_brace_brace=ignore

-nl_do_brace=force

-nl_brace_while=force

-nl_switch_brace=force

-nl_multi_line_cond=false

-nl_before_case=false

-nl_after_case=false

-nl_case_colon_brace=force

-nl_namespace_brace=force

-nl_template_class=ignore

-nl_class_brace=force

-nl_fdef_brace=force

-nl_after_semicolon=false

-nl_after_brace_open=false

-nl_after_brace_open_cmt=false

-nl_after_vbrace_open=false

-nl_after_vbrace_open_empty=false

-nl_after_brace_close=false

-nl_after_vbrace_close=false

-nl_squeeze_ifdef=false

-nl_ds_struct_enum_cmt=false

-nl_ds_struct_enum_close_brace=false

-nl_namespace_two_to_one_liner=false

-nl_create_if_one_liner=false

-nl_create_for_one_liner=false

-nl_create_while_one_liner=false

-nl_create_func_def_one_liner=false

-ls_for_split_full=false

-ls_func_split_full=false

-nl_max=3

-nl_after_func_body=2

-nl_after_multiline_comment=false

-nl_property_brace=force

-eat_blanks_after_open_brace=true

-eat_blanks_before_close_brace=true

-nl_after_return=false

-mod_full_brace_if_chain=false

-mod_paren_on_return=ignore

-mod_pawn_semicolon=false

-mod_full_paren_if_bool=false

-mod_remove_extra_semicolon=true

-mod_move_case_break=false

-mod_remove_empty_return=true

-cmt_convert_tab_to_spaces=True

-cmt_indent_multi=false

-cmt_c_group=false

-cmt_c_nl_start=false

-cmt_c_nl_end=false

-cmt_cpp_group=false

-cmt_cpp_nl_start=false

-cmt_cpp_nl_end=false

-cmt_cpp_to_c=false

-cmt_star_cont=false

-cmt_multi_check_last=false

-cmt_insert_before_preproc=false

-pp_space=ignore

-use_options_overriding_for_qt_macros=false

-warn_level_tabs_found_in_verbatim_string_literals=1

-mod_add_long_ifdef_else_comment=0

-mod_add_long_ifdef_endif_comment=0

-

-

-

-# Setting this 'false' will cause an extra tab to be added to function call args from an assignment:

-#

-# x = o.Func2(a, b,

-#         y);

-# o.Func2(a, b,

-#     y);

-#

-# ...but setting it 'true' is often worse:

-#

-# ExtraReallyLongType reallyLongVariableName = someTest

-#                                            ? someTrueExpr

-#                                            : someFalseExpr

-#

-# ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or,

-# better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did.

-# (currently unreported)

-indent_align_assign=false

-

-# this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space

-# if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++

-# comment line at the same level of indentation.

-# REVISIT: work was done to have it eliminate space for doxygen markup in c6aca7b, maybe can improve on it for us

-# (test using Runtime/Allocator/BucketAllocator.h)

-# IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further

-#sp_cmt_cpp_start=add

-sp_cmt_cpp_start=ignore

-

-# https://sourceforge.net/p/uncrustify/bugs/619/

-#sp_endif_cmt=force

-sp_endif_cmt=ignore

-

-# want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example:

-# Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp

-#nl_cpp_ldef_brace=force

-indent_cs_delegate_body=true

-indent_paren_open_brace=true

-indent_member_single=true

-indent_paren_close=2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_167.cfg
deleted file mode 100644
index 6ed02f2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_167.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Add or remove newline between function signature and '{'
-nl_fdef_brace                            = force   # ignore/add/remove/force
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                         = remove   # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1689.cfg
deleted file mode 100644
index 0660e498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1689.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_unnamed_byref = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1691.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1691.cfg
deleted file mode 100644
index 03600f80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1691.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-align_var_def_span              = 1
-align_var_def_thresh            = 30
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1702.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1702.cfg
deleted file mode 100644
index 1c415eec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1702.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-nl_after_struct                 = 2
-
-align_var_def_inline            = true
-align_var_def_span              = 1
-align_var_def_star_style        = 2
-align_var_struct_span           = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1717.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1717.cfg
deleted file mode 100644
index a6c7322f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1717.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_assign_span = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1718.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1718.cfg
deleted file mode 100644
index e55de095..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1718.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_switch_pp = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1758-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1758-f.cfg
deleted file mode 100644
index 90d17ebd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1758-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_for              = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1854.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1854.cfg
deleted file mode 100644
index ebc5c5e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1854.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_semi = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1862.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1862.cfg
deleted file mode 100644
index c23b9027..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1862.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Controls the spaces between #else or #endif and a trailing comment.
-sp_endif_cmt=remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2285.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2285.cfg
deleted file mode 100644
index fa3b437b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2285.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_with_tabs                = 0
-indent_columns                  = 4
-indent_continue                 = 4
-nl_constr_colon                 = force
-nl_constr_init_args             = force
-pos_constr_colon                = trail_force
-pos_constr_comma                = trail_force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2322.cfg
deleted file mode 100644
index 9743a828..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2322.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-indent_columns          = 4
-output_tab_size         = 4
-indent_with_tabs        = 0
-sp_while_paren_open     = force
-mod_full_brace_if_chain = true
-
-mod_full_brace_for      = remove
-mod_full_brace_if       = remove
-mod_full_brace_do       = remove
-mod_full_brace_while    = remove
-mod_full_brace_using    = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2331.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2331.cfg
deleted file mode 100644
index 4a4af2f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2331.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_square = remove
-sp_before_square_asm_block = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2371.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2371.cfg
deleted file mode 100644
index 1f207beb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2371.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_class = true
-align_assign_span = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2402.cfg
deleted file mode 100644
index 85c3a458..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2402.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_assign_leave_one_liners      = true
-nl_after_brace_open             = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_1.cfg
deleted file mode 100644
index 17fd04a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_1.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 4
-indent_class                    = true
-nl_before_class                 = 2
-nl_after_class                  = 2
-nl_before_namespace             = 2
-nl_after_namespace              = 2
-mod_remove_extra_semicolon      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_2.cfg
deleted file mode 100644
index 89f0b916..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_2.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 4
-indent_class                    = true
-nl_before_class                 = 2
-nl_after_class                  = 2
-nl_before_namespace             = 2
-nl_inside_namespace             = 2
-nl_after_namespace              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_340.cfg
deleted file mode 100644
index f56e7a43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_340.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_ptr_star              = add
-sp_after_oc_colon               = remove
-sp_after_send_oc_colon          = remove
-sp_after_oc_type                = remove
-indent_columns                  = 2
-eat_blanks_after_open_brace     = true
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_472.cfg
deleted file mode 100644
index 68d6f99b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_472.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_proto_type_name         = remove
-type                              dbgTrace
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_488.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_488.cfg
deleted file mode 100644
index 0319ef54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_488.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_continue                 = -4
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_489.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_489.cfg
deleted file mode 100644
index 61d4693c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_489.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-newlines                        = crlf
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_620.cfg
deleted file mode 100644
index 4486cd45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_620.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_class                    = true
-nl_getset_leave_one_liners      = true
-nl_getset_brace                 = force
-nl_after_brace_close            = true
-nl_property_brace               = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_633.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_633.cfg
deleted file mode 100644
index 61833884..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_633.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# bug 633
-indent_columns                  = 4
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_657.cfg
deleted file mode 100644
index 109e3750..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_657.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_with_tabs                = 0
-indent_class_colon              = true
-nl_class_init_args              = force
-pos_class_comma                 = lead
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_664.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_664.cfg
deleted file mode 100644
index 3799bd89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_664.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_inside_square                = add
-sp_inside_square_empty          = add
-indent_columns                  = 4
-nl_max                          = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_670.cfg
deleted file mode 100644
index fe57c0af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_670.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_inside_fparen                = force
-sp_cmt_cpp_start                = force
-indent_columns                  = 4
-indent_continue                 = 8
-indent_func_def_param           = true
-indent_func_proto_param         = true
-nl_func_type_name               = force
-nl_func_proto_type_name         = force
-nl_func_decl_start              = force
-nl_func_def_start               = force
-nl_func_decl_args               = force
-nl_func_def_args                = force
-align_func_params               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_671.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_671.cfg
deleted file mode 100644
index 00c0cf36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_671.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = add
-sp_inside_square                = add
-sp_inside_fparen                = add
-indent_columns                  = 4
-nl_func_type_name               = add
-align_func_params               = true
-align_var_def_span              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_841.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_841.cfg
deleted file mode 100644
index 2ab54cc1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_841.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-align_oc_msg_colon_span = 1
-#
-indent_oc_msg_prioritize_first_colon = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-f.cfg
deleted file mode 100644
index 1f03334a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-f.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns   = 3
-indent_with_tabs = 0
-nl_enum_brace    = force
-sp_enum_assign   = force
-mod_enum_last_comma = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-r.cfg
deleted file mode 100644
index 82e3cb22..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-r.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns   = 3
-indent_with_tabs = 0
-nl_enum_brace    = force
-sp_enum_assign   = force
-mod_enum_last_comma = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_125-412.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_125-412.cfg
deleted file mode 100644
index 2498ac1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_125-412.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_oc_msg_args                  = true
-align_oc_msg_colon_span         = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_322.cfg
deleted file mode 100644
index e49770be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_322.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_359.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_359.cfg
deleted file mode 100644
index ab9c63fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_359.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_case_label                   = force
-indent_columns                  = 4
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_405.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_405.cfg
deleted file mode 100644
index 0bdfce99..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_405.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_paren_close              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-create.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-create.cfg
deleted file mode 100644
index ec0f6ca4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-create.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_create_if_one_liner          = true
-nl_create_for_one_liner         = true
-nl_create_while_one_liner       = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-split.cfg
deleted file mode 100644
index 9e272905..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-split.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-nl_split_if_one_liner           = true
-nl_split_for_one_liner          = true
-nl_split_while_one_liner        = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_478.cfg
deleted file mode 100644
index 18db9a6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_478.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_continue                 = 5
-indent_with_tabs                = 0
-use_indent_continue_only_once   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_663.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_663.cfg
deleted file mode 100644
index 9d780855..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_663.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_switch_case              = 4
-indent_case_brace               = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_666.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_666.cfg
deleted file mode 100644
index 6acabd49..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_666.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_else_if       = true
-nl_after_brace_close = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_752.cfg
deleted file mode 100644
index 7bc4c41d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_752.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_tr_emb_cmt            = force
-sp_num_before_tr_emb_cmt        = 4
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_771.cfg
deleted file mode 100644
index 69b6e1a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_771.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-align_var_def_star_style        = 1
-align_var_struct_span           = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-2.cfg
deleted file mode 100644
index fccbbfe8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_before_byref                 = force
-sp_after_byref                  = force
-sp_addr                         = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-center.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-center.cfg
deleted file mode 100644
index 9d8bdc1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-center.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Places the byref as follows: "int & foo"
-sp_before_byref                 = force
-indent_columns                  = 3
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-left.cfg
deleted file mode 100644
index 6bc66685..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-left.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Places the byref as follows: "int &foo"
-sp_before_byref      = force
-sp_after_byref       = remove
-indent_columns       = 3
-indent_class         = true
-
-# Add or remove space after a reference sign '&amp;', if followed by a func proto/def.
-sp_after_byref_func  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-right.cfg
deleted file mode 100644
index 60a2fbbc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-right.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Places the byref as follows: "int& foo"
-sp_before_byref                 = remove
-indent_columns                  = 3
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-1.cfg
deleted file mode 100644
index 7c65a819..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-nl_before_case                  = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-2.cfg
deleted file mode 100644
index 07c0566d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-indent_switch_case              = 3
-nl_before_case                  = true
-mod_move_case_break             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-3.cfg
deleted file mode 100644
index 74f16293..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-3.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-indent_switch_case              = 3
-indent_case_brace               = -3
-nl_before_case                  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-a.cfg
deleted file mode 100644
index 488198a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-a.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_comma                  = force
-sp_after_cast                   = remove
-sp_inside_paren_cast            = force
-indent_columns                  = 3
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-r.cfg
deleted file mode 100644
index 1d0138a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-r.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_comma                  = force
-sp_after_cast                   = remove
-indent_columns                  = 3
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-type.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-type.cfg
deleted file mode 100644
index 5900ffd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-type.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_comma                  = force
-sp_after_cast                   = remove
-indent_columns                  = 3
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
-type                              UINT
-type                              Uint
-type                              uint32_t
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-types.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-types.txt
deleted file mode 100644
index cfc74c6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-types.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# a simple list of stuff that should be detected as a CT_TYPE
-# this usually isn't necessary because types are detected from the context.
-#
-# In the future, I may allow arbitrary CT_xxx stuff to be specified, as
-# well as a language
-#
-
-INT8
-UINT8
-INT16
-UINT16
-INT32
-UINT32
-INT64
-UINT64
-FLOAT
-CHAR
-DOUBLE
-TRUE
-FALSE
-BOOL
-FILE
-DIR
-
-# this is for the type-cast.c test
-bat
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast.cfg
deleted file mode 100644
index feac5350..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_cast                   = force
-sp_inside_paren_cast            = force
-sp_cpp_cast_paren               = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cgal.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cgal.cfg
deleted file mode 100644
index a4ec1fa0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cgal.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_inside_sparen                = force
-sp_inside_sparen_close          = remove
-sp_inside_sparen_open           = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_if_brace                     = add
-mod_full_brace_if               = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clang-has_include.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clang-has_include.cfg
deleted file mode 100644
index 35d668f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clang-has_include.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_bool                         = force
-sp_func_call_paren              = remove
-pp_space                        = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.cfg
deleted file mode 100644
index 2ea5739a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-input_tab_size                  = 2
-sp_arith                        = add
-sp_assign                       = add
-sp_compare                      = add
-sp_before_sparen                = add
-sp_inside_sparen                = remove
-sp_after_comma                  = add
-sp_inside_braces                = force
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 2
-indent_with_tabs                = 0
-indent_braces                   = true
-indent_sing_line_comments       = 2
-indent_switch_case              = 2
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_for_brace                    = add
-nl_brace_while                  = add
-nl_switch_brace                 = add
-nl_before_case                  = true
-nl_before_if                    = force
-nl_after_if                     = force
-nl_before_for                   = force
-nl_after_for                    = force
-nl_before_while                 = force
-nl_after_while                  = force
-nl_before_switch                = force
-nl_after_switch                 = force
-nl_before_do                    = force
-nl_after_func_body              = 2
-mod_full_brace_for              = remove
-mod_full_brace_if               = remove
-mod_full_brace_nl               = 3
-mod_full_brace_while            = remove
-mod_paren_on_return             = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.rerun.cfg
deleted file mode 100644
index 3b33c7d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.rerun.cfg
+++ /dev/null
@@ -1 +0,0 @@
-include "clark.cfg"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol-add.cfg
deleted file mode 100644
index fb14545e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol-add.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#  moves class colon ops to the end of line
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-nl_class_init_args              = add
-nl_constr_init_args             = add
-nl_class_colon                  = add
-nl_constr_colon                 = add
-pos_class_comma                 = trail
-pos_constr_comma                = trail
-pos_constr_colon                = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol.cfg
deleted file mode 100644
index ddb0e11b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-#  moves class colon ops to the end of line
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-indent_class_colon              = true
-indent_constr_colon             = true
-pos_constr_colon                = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol-add.cfg
deleted file mode 100644
index 960dade0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol-add.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-#  moves class colon ops to the end of line
-sp_paren_paren                  = force
-sp_inside_fparen                = force
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-sp_before_nl_cont               = force
-indent_columns                  = 3
-indent_class_colon              = true
-indent_constr_colon             = true
-nl_class_init_args              = add
-nl_constr_init_args             = add
-nl_class_colon                  = add
-nl_constr_colon                 = add
-pos_class_comma                 = trail
-pos_constr_comma                = trail
-pos_class_colon                 = lead
-pos_constr_colon                = lead
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol.cfg
deleted file mode 100644
index a57e30d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-indent_class_colon              = true
-indent_constr_colon             = true
-pos_class_colon                 = lead
-pos_constr_colon                = lead
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-header.h
deleted file mode 100644
index 32e68a34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-header.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * CLASS:  $(class)
- * TODO: DESCRIPTION
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add.cfg
deleted file mode 100644
index d60ffa9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-#  moves class colon ops to the end of line
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-nl_class_init_args              = add
-nl_constr_init_args             = add
-nl_fdef_brace                   = force
-nl_class_colon                  = add
-nl_constr_colon                 = add
-pos_class_comma                 = trail
-pos_constr_comma                = trail
-pos_constr_colon                = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add2.cfg
deleted file mode 100644
index f8a35e0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#  moves class colon ops to the end of line
-sp_before_byref                 = remove
-sp_after_comma                  = force
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-indent_class                    = true
-indent_access_spec              = 2
-nl_class_init_args              = add
-nl_constr_init_args             = remove
-nl_fdef_brace                   = force
-nl_class_colon                  = add
-nl_constr_colon                 = remove
-eat_blanks_after_open_brace     = true
-pos_class_comma                 = trail
-align_nl_cont                   = true
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-del.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-del.cfg
deleted file mode 100644
index b90f2f75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-del.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-#  moves class colon ops to the end of line
-sp_fparen_brace                 = force
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-nl_class_init_args              = add
-nl_constr_init_args             = add
-nl_fdef_brace                   = remove
-nl_class_colon                  = add
-nl_constr_colon                 = add
-pos_class_comma                 = trail
-pos_constr_comma                = trail
-pos_constr_colon                = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-on-colon-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-on-colon-indent.cfg
deleted file mode 100644
index 86fec34f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-on-colon-indent.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-#  moves class colon ops to the end of line
-sp_paren_paren                  = force
-sp_after_comma                  = force
-sp_inside_fparen                = force
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 3
-indent_class_colon              = true
-indent_class_on_colon           = true
-nl_class_init_args              = add
-nl_constr_init_args             = add
-nl_class_colon                  = remove
-nl_constr_colon                 = add
-pos_class_comma                 = lead
-pos_constr_comma                = lead
-pos_constr_colon                = lead_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_convert_tab_to_spaces-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_convert_tab_to_spaces-t.cfg
deleted file mode 100644
index 98b3bcf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_convert_tab_to_spaces-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_convert_tab_to_spaces       = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_cpp_to_c-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_cpp_to_c-t.cfg
deleted file mode 100644
index 85c3fec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_cpp_to_c-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_cpp_to_c                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-1.cfg
deleted file mode 100644
index 8d0a8a16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-1.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 2
-indent_namespace                = true
-indent_class                    = true
-nl_collapse_empty_body          = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-2.cfg
deleted file mode 100644
index fd9b9d25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-2.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 2
-indent_namespace                = true
-indent_class                    = true
-nl_collapse_empty_body          = true
-# to test convert_value
-cmt_indent_multi                = f
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-3.cfg
deleted file mode 100644
index c8e6ce41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-3.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 2
-indent_namespace                = true
-indent_class                    = true
-nl_collapse_empty_body          = true
-cmt_star_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent_multi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent_multi-f.cfg
deleted file mode 100644
index 1bd265a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent_multi-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_indent_multi                = false
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-0.cfg
deleted file mode 100644
index 86d05f95..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-0.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-cmt_insert_file_header          = "file-header.h"
-cmt_insert_func_header          = "func-header.h"
-cmt_insert_class_header         = "class-header.h"
-cmt_insert_oc_msg_header        = "msg-header.h"
-cmt_insert_before_preproc       = true
-cmt_insert_before_inlines       = false
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-1.cfg
deleted file mode 100644
index 91dbf03a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-1.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-cmt_insert_file_header          = "file-header.h"
-cmt_insert_func_header          = "func-header.h"
-cmt_insert_class_header         = "class-header.h"
-cmt_insert_oc_msg_header        = "msg-header.h"
-cmt_insert_before_preproc       = true
-cmt_insert_before_ctor_dtor     = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_check_last-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_check_last-f.cfg
deleted file mode 100644
index 7fdebde0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_check_last-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_multi_check_last            = false
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_first_len_minimum-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_first_len_minimum-1.cfg
deleted file mode 100644
index e7d99a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_first_len_minimum-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_multi_first_len_minimum     = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_nl_end.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_nl_end.cfg
deleted file mode 100644
index 1c0b396a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_nl_end.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-nl_before_if                    = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_reflow.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_reflow.cfg
deleted file mode 100644
index 9b280d18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_reflow.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-cmt_align_doxygen_javadoc_tags = true
-cmt_indent_multi = true
-cmt_reflow_indent_to_paragraph_start = true
-cmt_reflow_mode = 2
-cmt_sp_after_star_cont = 2
-cmt_width = 70
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-70.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-70.cfg
deleted file mode 100644
index 07c25e5c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-70.cfg
+++ /dev/null
@@ -1 +0,0 @@
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-80.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-80.cfg
deleted file mode 100644
index 4bdb0ce7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-80.cfg
+++ /dev/null
@@ -1 +0,0 @@
-code_width                      = 80
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cond-1.cfg
deleted file mode 100644
index 61669da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cond-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_cond_colon                   = force
-sp_cond_question                = force
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/const_throw.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/const_throw.cfg
deleted file mode 100644
index 41b3ecef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/const_throw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#indent class member function declarations. This is to test
-#that a 'const' qualifier is continuation indented
-indent_class                    = true
-indent_func_const               = 69
-indent_func_throw               = 41
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/constr_colon.cfg
deleted file mode 100644
index 3397573a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/constr_colon.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_columns      = 3
-indent_with_tabs    = 0
-indent_class        = true
-
-nl_constr_init_args = force
-nl_constr_colon     = force
-pos_constr_comma    = lead_force
-pos_class_colon     = lead_force
-pos_constr_colon    = lead_force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp17.cfg
deleted file mode 100644
index 1865e0c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp17.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_before_struct_binding    = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-1.cfg
deleted file mode 100644
index 83e3aa7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-1.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# CPP to C comment conversion
-indent_columns                  = 4
-indent_with_tabs                = 0
-code_width                      = 80
-cmt_cpp_to_c                    = true
-cmt_star_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-2.cfg
deleted file mode 100644
index 9f0d9e3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-2.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# CPP to C comment conversion
-indent_columns                  = 4
-indent_with_tabs                = 0
-cmt_cpp_group                   = true
-cmt_cpp_to_c                    = true
-cmt_star_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-3.cfg
deleted file mode 100644
index 20bbb9e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-3.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-# CPP to C comment conversion
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_after_multiline_comment      = true
-cmt_cpp_group                   = true
-cmt_cpp_nl_start                = true
-cmt_cpp_nl_end                  = true
-cmt_cpp_to_c                    = true
-cmt_star_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cs_generics.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cs_generics.cfg
deleted file mode 100644
index e4320a80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cs_generics.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_angle_paren_empty            = remove
-sp_angle_shift                  = remove
-sp_sizeof_paren                 = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cu.cfg
deleted file mode 100644
index 40dff3e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cu.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# minuses:
-#   do not place NL after if ()
-#   bad split if(long-condition) to multiple lines
-sp_assign                       = add
-sp_compare                      = add
-sp_before_sparen                = add
-indent_columns                  = 2
-indent_with_tabs                = 0
-nl_func_type_name               = add
-code_width                      = 78
-ls_for_split_full               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open.cfg
deleted file mode 100644
index 5b4539e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-macro-open                        MACRO2_BEGIN_STUFF
-macro-else                        MACRO2_ELSE_STUFF
-macro-close                       MACRO2_END_STUFF
-macro-open                        MACRO_BEGIN_STUFF
-macro-else                        MACRO_ELSE_STUFF
-macro-close                       MACRO_END_STUFF
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open2.cfg
deleted file mode 100644
index 38e507b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open2.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-# Set to something differently initially, to test reassigning a custom keyword's type
-set word                          MACRO2_BEGIN_STUFF
-macro-open                        MACRO2_BEGIN_STUFF
-macro-else                        MACRO2_ELSE_STUFF
-macro-close                       MACRO2_END_STUFF
-macro-open                        MACRO_BEGIN_STUFF
-macro-else                        MACRO_ELSE_STUFF
-macro-close                       MACRO_END_STUFF
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom_types_ssl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom_types_ssl.cfg
deleted file mode 100644
index 4005234e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom_types_ssl.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-output_tab_size                 = 4
-sp_assign                       = add
-sp_func_proto_paren             = add
-sp_func_def_paren               = add
-sp_inside_fparen                = add
-indent_columns                  = 4
-indent_func_def_param           = true
-indent_func_proto_param         = true
-align_func_params               = true
-set TYPE_WRAP                     LHASH_OF
-set TYPE_WRAP                     STACK_OF
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d-tst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d-tst2.cfg
deleted file mode 100644
index db15aa59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d-tst2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-align_var_def_span              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d.cfg
deleted file mode 100644
index 8b63fd62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_before_square                = remove
-sp_before_squares               = remove
-sp_after_comma                  = force
-sp_after_cast                   = remove
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-sp_range                        = force
-sp_while_paren_open             = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_case_brace               = 4
-indent_label                    = 2
-nl_func_var_def_blk             = 1
-nl_enum_brace                   = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_else_if                      = remove
-nl_for_brace                    = add
-nl_before_case                  = true
-nl_fdef_brace                   = add
-nl_after_brace_open             = true
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-nl_after_return                 = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
-align_enum_equ_span             = 4
-align_var_class_span            = 2
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_typedef_star_style        = 1
-align_right_cmt_span            = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d2.cfg
deleted file mode 100644
index ab3eebcf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d2.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-sp_arith                        = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_template_paren        = force
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_after_comma                  = force
-sp_after_cast                   = remove
-sp_func_def_paren               = remove
-sp_inside_fparen                = remove
-sp_fparen_brace                 = force
-sp_else_brace                   = force
-sp_do_brace_open                = force
-sp_while_paren_open             = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_case_brace               = 4
-nl_start_of_file                = remove
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
-nl_enum_brace                   = remove
-nl_if_brace                     = remove
-nl_else_brace                   = remove
-nl_for_brace                    = remove
-nl_while_brace                  = remove
-nl_do_brace                     = remove
-nl_switch_brace                 = remove
-nl_before_case                  = true
-nl_fdef_brace                   = remove
-nl_after_brace_open             = true
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-nl_after_return                 = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
-align_enum_equ_span             = 4
-align_var_class_span            = 2
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_right_cmt_span            = 3
-cmt_star_cont                   = true
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3.cfg
deleted file mode 100644
index 53a311b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-sp_assign                       = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_squares               = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_label                    = 2
-nl_assign_square                = remove
-nl_func_var_def_blk             = 1
-nl_before_case                  = true
-eat_blanks_before_close_brace   = true
-align_var_def_span              = 2
-align_assign_span               = 1
-align_var_struct_span           = 3
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_typedef_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3a.cfg
deleted file mode 100644
index f3cf7bb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3a.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_squares               = remove
-sp_inside_square                = force
-sp_d_array_colon                = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_label                    = 2
-nl_assign_square                = force
-nl_func_var_def_blk             = 1
-nl_before_case                  = true
-eat_blanks_before_close_brace   = true
-align_var_def_span              = 2
-align_assign_span               = 1
-align_var_struct_span           = 3
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_typedef_star_style        = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d_sp_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d_sp_paren.cfg
deleted file mode 100644
index 5b3443e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d_sp_paren.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_sparen                = force
-sp_catch_paren                  = remove
-sp_version_paren                = remove
-sp_scope_paren                  = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/del_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/del_semicolon.cfg
deleted file mode 100644
index 13434168..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/del_semicolon.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_semi_for               = remove
-mod_remove_extra_semicolon      = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/delete-space-oc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/delete-space-oc.cfg
deleted file mode 100644
index 4d8a15cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/delete-space-oc.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_oc_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/disable_nl_cont.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/disable_nl_cont.cfg
deleted file mode 100644
index 9ea9350f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/disable_nl_cont.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-disable_processing_nl_cont    = true
-sp_compare                    = force
-sp_assign                     = force
-sp_arith                      = force
-indent_class                  = true
-sp_before_nl_cont             = ignore
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-detab-strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-detab-strings.cfg
deleted file mode 100644
index 9e36729d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-detab-strings.cfg
+++ /dev/null
@@ -1 +0,0 @@
-string_replace_tab_chars = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-process-defines.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-process-defines.cfg
deleted file mode 100644
index bfb66ec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-process-defines.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-set                             = WORD                         define
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double-indent-objc-dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double-indent-objc-dict.cfg
deleted file mode 100644
index d4e9a1ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double-indent-objc-dict.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_align_assign = false
-indent_single_after_return = false
-indent_continue = 0
-use_indent_continue_only_once = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_1.cfg
deleted file mode 100644
index 73319da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_1.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = true     # true/false
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = remove   # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_2.cfg
deleted file mode 100644
index 8d12b193..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_2.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = true     # true/false
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add   # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_3.cfg
deleted file mode 100644
index da6a41c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_3.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = true     # true/false
-
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = ignore   # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-no.cfg
deleted file mode 100644
index bd2bd258..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-no.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_cmt_cpp_start                = add
-nl_start_of_file                = add
-nl_start_of_file_min            = 5
-nl_end_of_file                  = add
-nl_end_of_file_min              = 2
-align_on_tabstop                = true
-align_var_def_span              = 8
-align_var_def_gap               = 8
-align_right_cmt_span            = 16
-align_right_cmt_at_col          = 64
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-yes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-yes.cfg
deleted file mode 100644
index 74043b68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-yes.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_cmt_cpp_start                = add
-sp_cmt_cpp_doxygen              = true
-nl_start_of_file                = add
-nl_start_of_file_min            = 5
-nl_end_of_file                  = add
-nl_end_of_file_min              = 2
-align_on_tabstop                = true
-align_var_def_span              = 8
-align_var_def_gap               = 8
-align_right_cmt_span            = 16
-align_right_cmt_at_col          = 64
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-javadoc-alignment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-javadoc-alignment.cfg
deleted file mode 100644
index 786a9ac7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-javadoc-alignment.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-cmt_reflow_mode = 2
-cmt_width = 70
-cmt_sp_after_star_cont = 1
-cmt_indent_multi = true
-cmt_align_doxygen_javadoc_tags = true
-cmt_sp_before_doxygen_javadoc_tags = 1
-cmt_reflow_fold_regex_file="reflow_fold_regex.txt"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/eat_blanks_after_codewidth.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/eat_blanks_after_codewidth.cfg
deleted file mode 100644
index 1b24a7ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/eat_blanks_after_codewidth.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-cmt_width=30
-code_width=30
-eat_blanks_after_open_brace=true
-nl_inside_empty_func=2
-nl_fdef_brace=force
-indent_columns=4
-indent_class=true
-indent_with_tabs=0
-input_tab_size=4
-nl_func_type_name=force
-nl_before_func_body_def=2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-1.cfg
deleted file mode 100644
index b4e4aecb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 2
-nl_else_if                      = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-2.cfg
deleted file mode 100644
index 75d7936e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 2
-indent_else_if                  = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty_body.cfg
deleted file mode 100644
index 0276b19a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty_body.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = force
-indent_columns                  = 4
-nl_collapse_empty_body          = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/endif.cfg
deleted file mode 100644
index ff69251b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/endif.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-pp_indent_at_level              = true
-pp_if_indent_code               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum.cfg
deleted file mode 100644
index b39c0840..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_enum_assign                  = force
-sp_enum_colon                   = force
-indent_columns                  = 3
-nl_enum_brace                   = force
-nl_enum_class                   = remove
-nl_enum_class_identifier        = remove
-nl_enum_identifier_colon        = remove
-nl_enum_colon_type              = remove
-nl_max                          = 3
-pos_enum_comma                  = trail_force
-align_enum_equ_span             = 4
-align_right_cmt_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-3.cfg
deleted file mode 100644
index 7fe548e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-3.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-pos_comma                       = lead_break
-pos_enum_comma                  = trail_break
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-4.cfg
deleted file mode 100644
index d42e6b1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-pos_comma                       = trail_force
-pos_enum_comma                  = lead
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-6.cfg
deleted file mode 100644
index 6d4279ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-6.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_comma                  = force
-pos_comma                       = trail_break
-pos_enum_comma                  = lead_break
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma_ifdef.cfg
deleted file mode 100644
index a2622767..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma_ifdef.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_enum_last_comma = force
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comment_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comment_wrap.cfg
deleted file mode 100644
index e42e00a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comment_wrap.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-input_tab_size = 4
-indent_columns = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/extern_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/extern_func.cfg
deleted file mode 100644
index a6135e8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/extern_func.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_before_func_body_def         = 2
-nl_var_def_blk_start            = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file-header.h
deleted file mode 100644
index 63fb5185..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file-header.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @file $(filename)
- * Description
- *
- * $Id$
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_footer.txt
deleted file mode 100644
index 7ce80bad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_footer.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/**

- * CVS History:

- * $Log $

- *

- */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_header.txt
deleted file mode 100644
index 5431d0ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_header.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-/*******************************************************************************//**

- *                                                                                  

- *  @file        $(filename)

- *                                                                                 

- *  <Description>                        

- *                                                                                 

- ***********************************************************************************/

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/footer.txt
deleted file mode 100644
index 1d2f941f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/footer.txt
+++ /dev/null
@@ -1 +0,0 @@
-// @filename $(filename) as input file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/force_tab_after_define-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/force_tab_after_define-t.cfg
deleted file mode 100644
index 67b04e78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/force_tab_after_define-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-force_tab_after_define          = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/freebsd.cfg
deleted file mode 100644
index e34be04f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/freebsd.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-sp_arith                        = force
-sp_bool                         = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_semi_for_empty        = force
-sp_after_semi_for_empty         = force
-sp_type_func                    = force
-sp_brace_else                   = force
-indent_continue                 = 4
-nl_brace_else                   = remove
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_switch_brace                 = add
-nl_before_case                  = true
-nl_after_func_proto_group       = 2
-nl_after_func_body              = 3
-pos_arith                       = trail
-align_var_def_span              = 1
-align_var_def_star_style        = 1
-align_typedef_gap               = 3
-align_typedef_span              = 5
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-mod_full_paren_if_bool          = true
-mod_remove_extra_semicolon      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-1.cfg
deleted file mode 100644
index 14879a94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-1.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_before_ptr_star              = force
-indent_columns                  = 3
-nl_func_type_name               = add
-nl_func_proto_type_name         = add
-nl_func_decl_start              = add
-nl_func_def_start               = add
-nl_func_decl_args               = add
-nl_func_def_args                = add
-nl_func_decl_end                = add
-nl_func_def_end                 = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-2.cfg
deleted file mode 100644
index f9cf836c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_ptr_star              = force
-indent_columns                  = 3
-nl_func_type_name               = add
-nl_func_proto_type_name         = remove
-nl_func_decl_end                = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-3.cfg
deleted file mode 100644
index c868ae02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-3.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_before_ptr_star              = force
-indent_columns                  = 3
-nl_func_type_name               = remove
-nl_func_proto_type_name         = remove
-nl_func_decl_args               = remove
-nl_func_decl_end                = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header.h
deleted file mode 100644
index e6f83943..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * $(function)
- * TODO: DESCRIPTION
- * $(javaparam)
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header2.h
deleted file mode 100644
index 52bdf970..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header2.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * CLASS:  $(fclass)
- * METHOD: $(function)
- * TODO: DESCRIPTION
- * $(javaparam)
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_call_user.cfg
deleted file mode 100644
index 504fb3d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_call_user.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 4
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-align_var_def_span              = 20
-align_assign_span               = 1
-mod_add_long_function_closebrace_comment = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_class.cfg
deleted file mode 100644
index 7f01b7be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_class.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_class                    = true
-nl_before_func_class_def        = 3
-nl_before_func_class_proto      = 1
-nl_before_func_body_def         = 3
-nl_before_func_body_proto       = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_param.cfg
deleted file mode 100644
index 3ad93ace..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_param.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_paren_paren                  = remove
-sp_after_ptr_star               = remove
-sp_func_proto_paren             = remove
-sp_inside_fparen                = remove
-sp_after_tparen_close           = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/function_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/function_header.txt
deleted file mode 100644
index c6508a02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/function_header.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/***********************************************************************************

- *  $(function) 

- *******************************************************************************//**

- *

- *  <Description>       

- *

- *  $(javaparam) 

- *   

- **********************************************************************************/

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-f.cfg
deleted file mode 100644
index 746b15f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_byref                            = force
-sp_after_ptr_star                         = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-r.cfg
deleted file mode 100644
index 1576135f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_byref                            = remove
-sp_after_ptr_star                         = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ger.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ger.cfg
deleted file mode 100644
index 976c0c35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ger.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-output_tab_size                 = 4
-sp_arith                        = add
-sp_assign                       = add
-sp_pp_concat                    = remove
-sp_before_sparen                = add
-sp_after_comma                  = add
-indent_columns                  = 4
-indent_func_call_param          = true
-indent_func_def_param           = true
-indent_func_proto_param         = true
-indent_func_param_double        = true
-nl_end_of_file                  = add
-nl_end_of_file_min              = 2
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_multi_line_define            = true
-nl_ds_struct_enum_cmt           = true
-nl_after_func_body              = 2
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-nl_after_return                 = true
-align_var_def_span              = 3
-align_var_def_thresh            = 5
-align_var_struct_span           = 2
-align_var_struct_thresh         = 5
-align_right_cmt_span            = 4
-align_right_cmt_at_col          = 1
-cmt_star_cont                   = true
-mod_add_long_ifdef_endif_comment = 1
-mod_add_long_ifdef_else_comment = 1
-type                              BIO
-set TYPE_WRAP                     LHASH_OF
-set TYPE_WRAP                     STACK_OF
-type                              stname
-type                              type
-
-# not needed but without this option, 02501 is unstable!
-align_right_cmt_mix             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/getset.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/getset.cfg
deleted file mode 100644
index 1e1ab8e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/getset.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_with_tabs                = 0
-nl_getset_brace                 = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh137.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh137.cfg
deleted file mode 100644
index 83da02ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh137.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.a.cfg
deleted file mode 100644
index e875a54b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.a.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_braces                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.b.cfg
deleted file mode 100644
index 1dc357ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.b.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1516.cfg
deleted file mode 100644
index 8c03f30e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1516.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_func_var_def_blk             = 2
-nl_var_def_blk_start            = 2
-nl_var_def_blk_end              = 2
-nl_var_def_blk_in               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.cfg
deleted file mode 100644
index 5506f68c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_insert_func_header = "i1536.txt"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.txt
deleted file mode 100644
index d34c497d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.txt
+++ /dev/null
@@ -1 +0,0 @@
-// $(function)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1564.cfg
deleted file mode 100644
index 74c53e52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1564.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-pos_comma                       = lead
-pos_enum_comma                  = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1768.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1768.cfg
deleted file mode 100644
index 9174483a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1768.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_call_paren              = remove
-nl_func_decl_start              = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i683.cfg
deleted file mode 100644
index 2b6edefe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i683.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-# https://github.com/uncrustify/uncrustify/issues/683
-#
-enable_digraphs                 = true
-# with enable_digraphs, if spaces in
-#   arithmetic, assign and bool
-#   and preprocessor, stringify, characterize and concatenation operators
-#   and before empty brackets
-# are shortened down,
-sp_arith                        = force
-sp_assign                       = force
-sp_pp_concat                    = force
-sp_pp_stringify                 = force
-sp_bool                         = force
-sp_before_squares               = force
-# AND if spaces inside brackets are added,
-sp_inside_square                = add
-# AND function definition braces are on a new line
-# (closing ones will be moved by default, if recognized)
-nl_fdef_brace                   = force
-# than every di/tri-grahp was correctly tokenized
-
-sp_before_vardef_square         = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain.cfg
deleted file mode 100644
index b59d69f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_else_brace                   = force
-sp_brace_else                   = force
-nl_if_brace                     = remove
-nl_brace_else                   = remove
-nl_else_brace                   = remove
-align_right_cmt_span            = 3
-mod_full_brace_if_chain         = true
-mod_full_brace_nl               = 3
-mod_full_brace_while            = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain_braces_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain_braces_2.cfg
deleted file mode 100644
index aa9251c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain_braces_2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_full_brace_if_chain         = true
-mod_full_brace_if_chain_only    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-1.cfg
deleted file mode 100644
index 943d0eb6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_switch_case              = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-multistring-coulmn1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-multistring-coulmn1.cfg
deleted file mode 100644
index 8ce9a4ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-multistring-coulmn1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_col1_multi_string_literal = True
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-objc-block.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-objc-block.cfg
deleted file mode 100644
index aee5aace..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-objc-block.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-output_tab_size = 2
-indent_columns = output_tab_size
-indent_member = output_tab_size
-indent_oc_block = false
-indent_oc_block_msg = output_tab_size
-use_indent_continue_only_once = true
-indent_oc_block_msg_xcode_style = true
-indent_oc_block_msg_from_keyword = false
-indent_oc_block_msg_from_caret = false
-indent_oc_block_msg_from_colon = false
-
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-vbrace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-vbrace.cfg
deleted file mode 100644
index 7e6ca7c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-vbrace.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_assign                       = add
-sp_inside_sparen                = add
-sp_inside_fparen                = add
-indent_columns                  = 1
-indent_with_tabs                = 0
-indent_vbrace_open_on_tabstop   = true
-nl_after_func_body              = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_assign.cfg
deleted file mode 100644
index 6bad61f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_assign.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_align_assign             = false
-indent_off_after_assign         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_boxed.cfg
deleted file mode 100644
index e20f0820..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_boxed.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-sp_cond_question_after               = remove
-sp_cond_question_before              = add
-align_oc_decl_colon                  = false
-align_oc_msg_colon_first             = false
-align_oc_msg_colon_span              = 10
-align_oc_msg_spec_span               = 10
-indent_columns                       = 4
-indent_continue                      = 4
-indent_oc_block                      = false
-indent_oc_block_msg                  = 0
-indent_oc_block_msg_from_brace       = false
-indent_oc_block_msg_from_caret       = false
-indent_oc_block_msg_from_colon       = false
-indent_oc_block_msg_from_keyword     = false
-indent_oc_block_msg_xcode_style      = true
-indent_oc_msg_colon                  = 0
-indent_oc_msg_prioritize_first_colon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_braces_no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_braces_no.cfg
deleted file mode 100644
index 24ca060b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_braces_no.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 2
-indent_braces                   = true
-indent_braces_no_func           = true
-indent_braces_no_class          = true
-indent_braces_no_struct         = true
-indent_class                    = true
-nl_start_of_file                = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t.cfg
deleted file mode 100644
index 78320e8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_class         = true
-sp_enum_after_assign = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t_columns-4.cfg
deleted file mode 100644
index 5184fc9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t_columns-4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-11.cfg
deleted file mode 100644
index 15cef67e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-11.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 11
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-2.cfg
deleted file mode 100644
index f33cb665..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-3.cfg
deleted file mode 100644
index 9c9e205f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-3.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns   = 3
-sp_cond_colon    = add
-sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-4.cfg
deleted file mode 100644
index f4f5183a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-4.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comma_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comma_brace.cfg
deleted file mode 100644
index 635c6cdf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comma_brace.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-code_width                      = 60
-indent_columns                  = 4
-indent_comma_brace              = true
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comment_align_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comment_align_thresh_2.cfg
deleted file mode 100644
index 2f5d5cab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comment_align_thresh_2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_col1_comment             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-false.cfg
deleted file mode 100644
index b686aabe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-false.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_compound_literal_return = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-true.cfg
deleted file mode 100644
index 9fa1d2ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-true.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_compound_literal_return = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_continue-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_continue-8.cfg
deleted file mode 100644
index 9bc69559..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_continue-8.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_continue                 = 8
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_cs_delegate_brace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_cs_delegate_brace-t.cfg
deleted file mode 100644
index 9a4e6382..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_cs_delegate_brace-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_cs_delegate_brace        = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init.cfg
deleted file mode 100644
index cb1cef12..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-indent_columns                  = 2
-indent_before_class_colon       = 4
-indent_class_colon              = true
-indent_constr_colon             = true
-indent_ctor_init                = 2
-indent_func_class_param         = true
-indent_func_param_double        = true
-indent_access_spec              = 2
-nl_collapse_empty_body          = true
-nl_constr_init_args             = add
-nl_func_def_start               = add
-nl_func_def_args                = add
-nl_before_access_spec           = 2
-pos_constr_comma                = trail_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init_leading.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init_leading.cfg
deleted file mode 100644
index ce8fb22f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init_leading.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-indent_columns                  = 2
-indent_before_class_colon       = -2
-indent_class_colon              = true
-indent_constr_colon             = true
-indent_ctor_init_leading        = 5
-indent_ctor_init                = 2
-indent_func_class_param         = true
-indent_func_param_double        = true
-indent_access_spec              = 2
-nl_collapse_empty_body          = true
-nl_constr_init_args             = add
-nl_func_def_start               = add
-nl_func_def_args                = add
-nl_before_access_spec           = 2
-pos_constr_comma                = trail_force
-nl_class_colon                  = force
-pos_class_colon                 = lead_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_members_twice.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_members_twice.cfg
deleted file mode 100644
index 82c708d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_members_twice.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_constr_colon             = true
-indent_ctor_init                = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_else_if-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_else_if-t.cfg
deleted file mode 100644
index 2dcd9a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_else_if-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_else_if                  = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_first_for_expr-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_first_for_expr-t.cfg
deleted file mode 100644
index ff68e85c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_first_for_expr-t.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_semicolon_for_paren      = true                                         #
-indent_first_for_expr           = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_call_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_call_param.cfg
deleted file mode 100644
index 26b4e03a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_call_param.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-indent_func_call_param          = true
-nl_func_type_name               = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_def_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_def_param.cfg
deleted file mode 100644
index c448b21f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_def_param.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-indent_func_def_param           = true
-nl_func_proto_type_name         = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_param.cfg
deleted file mode 100644
index 7db464b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_param.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-indent_func_call_param          = true
-indent_func_def_param           = true
-indent_func_proto_param         = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_proto_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_proto_param.cfg
deleted file mode 100644
index 6cfb83ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_proto_param.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-output_tab_size                 = 3
-indent_columns                  = 3
-indent_func_proto_param         = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_inside_ternary_operator.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_inside_ternary_operator.cfg
deleted file mode 100644
index ad5f98ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_inside_ternary_operator.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_align_paren              = false
-pos_conditional                 = lead
-nl_func_call_args_multi_line_ignore_closures = true
-indent_ternary_operator         = 0
-indent_inside_ternary_operator  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-false.cfg
deleted file mode 100644
index f9e3bdca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-false.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_macro_brace = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-true.cfg
deleted file mode 100644
index 62573cad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-true.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_macro_brace = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace-t.cfg
deleted file mode 100644
index 90bbdaec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace-t.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_namespace                = true
-indent_namespace_single_indent  = true
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace_single_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace_single_indent.cfg
deleted file mode 100644
index 9f66fea4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace_single_indent.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_namespace                = true
-indent_namespace_single_indent  = true
-indent_extern                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_oc_inside_msg_sel.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_oc_inside_msg_sel.cfg
deleted file mode 100644
index b140f071..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_oc_inside_msg_sel.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_oc_inside_msg_sel        = true
-indent_with_tabs                = 0
-indent_align_paren              = false
-align_oc_msg_colon_span         = 1
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_off_after_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_off_after_return.cfg
deleted file mode 100644
index 077c5f94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_off_after_return.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_off_after_return     = true
-indent_off_after_return_new = false
-sp_after_decltype           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_once.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_once.cfg
deleted file mode 100644
index 013985b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_once.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 2
-indent_continue                 = 5
-use_indent_continue_only_once   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_param.cfg
deleted file mode 100644
index 07d98897..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_param.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_param                    = 3
-indent_func_proto_param         = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_call-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_call-t.cfg
deleted file mode 100644
index eafffebc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_call-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_paren_after_func_call    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_decl-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_decl-t.cfg
deleted file mode 100644
index c4db2ffe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_decl-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_paren_after_func_decl    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_def-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_def-t.cfg
deleted file mode 100644
index 5d2895e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_def-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_paren_after_func_def     = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-1.cfg
deleted file mode 100644
index 309be3e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-1.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_after_comma                  = force
-sp_inside_fparen                = force
-indent_paren_close              = 1
-indent_comma_paren              = true
-indent_bool_paren               = true
-pos_comma                       = lead
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-2.cfg
deleted file mode 100644
index 2a77fedf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_paren_close              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_semicolon_for_paren-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_semicolon_for_paren-t.cfg
deleted file mode 100644
index 6b49dbd6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_semicolon_for_paren-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_semicolon_for_paren      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_shift.cfg
deleted file mode 100644
index 8a848c34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_shift.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_continue                 = 4
-indent_shift                    = true
-align_left_shift                = false
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_single_newline.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_single_newline.cfg
deleted file mode 100644
index 1496b522..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_single_newline.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_single_newlines = true
-indent_columns                          = 4             # number
-indent_with_tabs                        = 0             # number
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_sparen_extra-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_sparen_extra-8.cfg
deleted file mode 100644
index 6344ceb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_sparen_extra-8.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_sparen_extra = 8
-indent_continue = 8
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-1.cfg
deleted file mode 100644
index 80ea4e7a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_ternary_operator         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-2.cfg
deleted file mode 100644
index 1d5a91ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_ternary_operator         = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_using_block-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_using_block-f.cfg
deleted file mode 100644
index 2bfca802..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_using_block-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_using_block              = false
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def.cfg
deleted file mode 100644
index 2faffc24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_assign                       = force
-indent_columns                  = 3
-indent_class                    = true
-indent_var_def_blk              = -3
-nl_func_var_def_blk             = 1
-nl_fdef_brace                   = add
-align_var_def_span              = 1
-align_assign_span               = 1
-align_assign_thresh             = 12
-align_var_class_span            = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def_cont-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def_cont-t.cfg
deleted file mode 100644
index f439a00b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def_cont-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_var_def_cont             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_with_tabs-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_with_tabs-0.cfg
deleted file mode 100644
index bd2c3a08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_with_tabs-0.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_with_tabs      = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/initlist_leading_commas.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/initlist_leading_commas.cfg
deleted file mode 100644
index ebd35547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/initlist_leading_commas.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-nl_constr_init_args             = force
-pos_constr_comma                = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/interface-keyword-in-cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/interface-keyword-in-cpp.cfg
deleted file mode 100644
index cbbf215b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/interface-keyword-in-cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_dc = remove
-sp_after_dc  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/invariant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/invariant.cfg
deleted file mode 100644
index a462b4d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/invariant.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_invariant_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1778.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1778.cfg
deleted file mode 100644
index 2f4bd642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1778.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_ptr_star               = add
-sp_after_byref                  = add
-sp_inside_sparen                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1782.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1782.cfg
deleted file mode 100644
index 6d50bfeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1782.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_compare                      = force
-sp_inside_paren                 = force
-sp_paren_paren                  = force
-sp_before_angle                 = remove
-sp_inside_angle                 = force
-sp_angle_paren                  = remove
-sp_angle_paren_empty            = remove
-sp_angle_word                   = force
-sp_inside_fparens               = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-sp_func_call_paren_empty        = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1804.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1804.cfg
deleted file mode 100644
index 4c424b89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1804.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_after_type                   = force
-sp_after_cast                   = remove
-sp_inside_paren_cast            = remove
-sp_cpp_cast_paren               = remove
-sp_addr                         = remove
-sp_after_byref                  = force
-sp_inside_paren                 = force
-sp_inside_fparen                = force
-sp_inside_square                = force
-sp_before_square                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1887.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1887.cfg
deleted file mode 100644
index 956ea6a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1887.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_with_tabs                = 0
-align_right_cmt_span            = 3
-align_right_cmt_same_level      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1916.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1916.cfg
deleted file mode 100644
index 414a4a96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1916.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_type                   = ignore
-sp_after_cast                   = force
-sp_sizeof_paren                 = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1985.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1985.cfg
deleted file mode 100644
index 3be58c29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1985.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-nl_class_leave_one_liners       = true
-nl_class_leave_one_liner_groups = true
-nl_after_func_proto_group       = 3
-nl_after_func_class_proto_group = 3
-nl_before_func_body_def         = 3
-eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1997.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1997.cfg
deleted file mode 100644
index 1f79d36e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1997.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_arith               = force
-sp_after_decltype      = remove
-sp_type_brace_init_lst = remove
-nl_after_brace_open    = true
-nl_after_brace_close   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-1.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-1.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-2.cfg
deleted file mode 100644
index 34866fe3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_full_brace_if_chain         = true
-mod_full_brace_nl               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2209.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2209.cfg
deleted file mode 100644
index 414a7273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2209.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_inside_namespace             = 2
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-code_width                      = 74
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_1.cfg
deleted file mode 100644
index 56ab3a56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_1.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-tok_split_gte = false
-sp_permit_cpp11_shift = true
-sp_angle_shift = remove
-sp_inside_angle = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_2.cfg
deleted file mode 100644
index 2848fb59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-tok_split_gte = false
-sp_permit_cpp11_shift = true
-sp_angle_shift = force
-sp_inside_angle = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_3.cfg
deleted file mode 100644
index 52d17555..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_3.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-tok_split_gte = false
-sp_permit_cpp11_shift = true
-sp_angle_shift = ignore
-sp_inside_angle = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2643.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2643.cfg
deleted file mode 100644
index 7f188f21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2643.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_oc_block_caret        = remove
-sp_after_oc_block_caret         = force
-indent_oc_block                 = true
-indent_oc_block_msg_from_caret  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2656.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2656.cfg
deleted file mode 100644
index 3b020c33..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2656.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_ptr_star = remove
-sp_before_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2675.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2675.cfg
deleted file mode 100644
index 0eab0244..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2675.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-input_tab_size = 2
-output_tab_size = input_tab_size
-macro-open SOME_MACRO_OPEN
-macro-close SOME_MACRO_CLOSE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3031.cfg
deleted file mode 100644
index 8234c643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3031.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-nl_class_colon = force
-sp_after_class_colon = force
-sp_before_class_colon = force
-sp_after_send_oc_colon = remove
-sp_before_send_oc_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3116.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3116.cfg
deleted file mode 100644
index 03aecb39..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3116.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_cpp_lambda_body = true
-indent_columns = 4
-indent_with_tabs = 0
-indent_continue = 4
-indent_paren_close = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_527.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_527.cfg
deleted file mode 100644
index 855f218d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_527.cfg
+++ /dev/null
@@ -1,265 +0,0 @@
-## Ingres coding style config for http://uncrustify.sourceforge.net/

-##

-## Based on defaults.cfg file (from uncrustify-0.40).

-## Main diffs are spaces for tabs and tab length.

-### FIXME find out why old 0.38 version removed spaces in "# if..." 0.40 retains them.

-##

-## There is a GUI from http://universalindent.sourceforge.net/

-## which can use different formatters too, e.g.

-##      gnu indent (no suport for EXEC SQL)

-##      bcpp

-

-## FIXME try different settings for indent_preserve_sql - not seeing any difference!

-##indent_preserve_sql           = false    # false/true

-

-# How to run:

-#   $ uncrustify -c ./ingres.cfg -f dirtyfile.c > cleanfile.c

-#   > uncrustify   -c ingres.cfg -f dirtyfile.c > cleanfile.c

-#

-

-##############################

-

-newlines                      = auto

-input_tab_size                = 4

-output_tab_size               = 4

-string_escape_char            = 92

-string_escape_char2           = 0

-indent_columns                = 4

-indent_with_tabs              = 0

-indent_align_string           = false

-indent_xml_string             = 0

-indent_brace                  = 0

-indent_braces                 = false

-indent_braces_no_func         = false

-indent_brace_parent           = false

-indent_namespace              = false

-indent_class                  = false

-indent_class_colon            = false

-indent_func_call_param        = false

-indent_member                 = 0

-indent_sing_line_comments     = 0

-indent_switch_case            = indent_columns

-indent_case_shift             = 0

-indent_case_brace             = 0

-indent_col1_comment           = false

-indent_label                  = 1

-indent_access_spec            = 1

-indent_paren_nl               = false

-indent_paren_close            = 0

-indent_comma_paren            = false

-indent_bool_paren             = false

-indent_square_nl              = false

-indent_preserve_sql           = false

-sp_arith                      = ignore

-sp_assign                     = ignore

-sp_bool                       = ignore

-sp_compare                    = ignore

-sp_inside_paren               = ignore

-sp_paren_paren                = ignore

-sp_balance_nested_parens      = false

-sp_paren_brace                = ignore

-sp_before_ptr_star            = ignore

-sp_between_ptr_star           = ignore

-sp_after_ptr_star             = ignore

-sp_before_byref               = ignore

-sp_after_byref                = ignore

-sp_before_angle               = ignore

-sp_after_angle                = ignore

-sp_angle_paren                = ignore

-sp_angle_word                 = ignore

-sp_before_sparen              = add

-sp_inside_sparen              = remove

-sp_after_sparen               = remove

-sp_sparen_brace               = ignore

-sp_special_semi               = ignore

-sp_before_semi                = remove

-sp_before_semi_for            = ignore

-sp_before_semi_for_empty      = ignore

-sp_after_semi_for_empty       = ignore

-sp_before_square              = remove

-sp_before_squares             = remove

-sp_inside_square              = remove

-sp_after_comma                = add

-sp_before_comma               = remove

-sp_after_operator             = ignore

-sp_after_cast                 = add

-sp_inside_paren_cast          = remove

-sp_sizeof_paren               = remove

-sp_after_tag                  = ignore

-sp_inside_braces_enum         = ignore

-sp_inside_braces_struct       = ignore

-sp_inside_braces              = ignore

-sp_inside_angle               = remove

-sp_type_func                  = remove

-sp_func_proto_paren           = remove

-sp_func_def_paren             = remove

-sp_inside_fparens             = remove

-sp_inside_fparen              = remove

-sp_square_fparen              = ignore

-sp_fparen_brace               = ignore

-sp_func_call_paren            = ignore

-sp_func_class_paren           = ignore

-sp_return_paren               = ignore

-sp_attribute_paren            = ignore

-sp_macro                      = ignore

-sp_macro_func                 = ignore

-sp_else_brace                 = ignore

-sp_brace_else                 = ignore

-sp_catch_brace                = ignore

-sp_brace_catch                = ignore

-sp_finally_brace              = ignore

-sp_brace_finally              = ignore

-sp_try_brace                  = ignore

-sp_getset_brace               = ignore

-sp_before_dc                  = ignore

-sp_after_dc                   = ignore

-sp_d_array_colon              = ignore

-sp_not                        = remove

-sp_inv                        = remove

-sp_addr                       = remove

-sp_deref                      = remove

-align_keep_tabs               = false

-align_with_tabs               = false

-align_on_tabstop              = false

-align_number_right            = false

-align_func_params             = false

-align_var_def_span            = 1

-align_var_def_star_style      = 1

-align_var_def_amp_style       = 0

-align_var_def_thresh          = 0

-align_var_def_colon           = false

-align_var_def_inline          = false

-align_assign_span             = 0

-align_assign_thresh           = 0

-align_enum_equ_span           = 0

-align_enum_equ_thresh         = 0

-align_var_struct_span         = 0

-align_var_struct_thresh       = 0

-align_struct_init_span        = 0

-align_typedef_gap             = 0

-align_typedef_span            = 0

-align_typedef_func            = 0

-align_typedef_star_style      = 0

-align_typedef_amp_style       = 0

-align_right_cmt_span          = 0

-align_func_proto_span         = 0

-align_nl_cont                 = false

-align_pp_define_gap           = 0

-align_pp_define_span          = 0

-nl_collapse_empty_body        = false

-nl_assign_leave_one_liners    = false

-nl_class_leave_one_liners     = false

-nl_enum_leave_one_liners      = false

-nl_getset_leave_one_liners    = false

-nl_func_leave_one_liners      = false

-nl_if_leave_one_liners        = false

-nl_start_of_file              = ignore

-nl_start_of_file_min          = 0

-nl_end_of_file                = ignore

-nl_end_of_file_min            = 0

-nl_assign_brace               = ignore

-nl_assign_square              = ignore

-nl_after_square_assign        = ignore

-nl_func_var_def_blk           = 0

-nl_fcall_brace                = ignore

-nl_enum_brace                 = ignore

-nl_struct_brace               = ignore

-nl_union_brace                = ignore

-nl_if_brace                   = force

-nl_brace_else                 = force

-nl_elseif_brace               = force

-nl_else_brace                 = force

-nl_brace_finally              = ignore

-nl_finally_brace              = ignore

-nl_try_brace                  = ignore

-nl_getset_brace               = ignore

-nl_for_brace                  = force

-nl_catch_brace                = ignore

-nl_brace_catch                = ignore

-nl_while_brace                = force

-nl_do_brace                   = force

-nl_brace_while                = force

-nl_switch_brace               = force

-nl_multi_line_cond            = false

-nl_before_case                = false

-nl_after_case                 = false

-nl_namespace_brace            = ignore

-nl_template_class             = ignore

-nl_class_brace                = ignore

-nl_class_init_args            = ignore

-nl_func_type_name             = ignore

-nl_func_paren                 = force

-nl_func_decl_start            = ignore

-nl_func_decl_args             = ignore

-nl_func_decl_end              = ignore

-nl_fdef_brace                 = ignore

-nl_after_return               = false

-nl_after_semicolon            = false

-nl_after_brace_open           = false

-nl_after_vbrace_open          = false

-nl_define_macro               = false

-nl_squeeze_ifdef              = false

-nl_before_if                  = ignore

-nl_after_if                   = ignore

-nl_before_for                 = ignore

-nl_after_for                  = ignore

-nl_before_while               = ignore

-nl_after_while                = ignore

-nl_before_switch              = ignore

-nl_after_switch               = ignore

-nl_before_do                  = ignore

-nl_after_do                   = ignore

-nl_ds_struct_enum_cmt         = false

-nl_ds_struct_enum_close_brace = false

-nl_class_colon                = ignore

-nl_create_if_one_liner        = false

-nl_create_for_one_liner       = false

-nl_create_while_one_liner     = false

-pos_bool                      = ignore

-pos_comma                     = ignore

-pos_class_comma               = ignore

-pos_class_colon               = ignore

-code_width                    = 0

-ls_for_split_full             = false

-ls_func_split_full            = false

-nl_max                        = 0

-nl_after_func_proto           = 0

-nl_after_func_proto_group     = 0

-nl_after_func_body            = 0

-nl_after_func_body_one_liner  = 0

-nl_before_block_comment       = 0

-nl_before_c_comment           = 0

-nl_before_cpp_comment         = 0

-nl_after_multiline_comment    = false

-nl_before_access_spec         = 0

-nl_after_access_spec          = 0

-eat_blanks_after_open_brace   = false

-eat_blanks_before_close_brace = false

-mod_full_brace_do             = ignore

-mod_full_brace_for            = ignore

-mod_full_brace_function       = ignore

-mod_full_brace_if             = ignore

-mod_full_brace_nl             = 0

-mod_full_brace_while          = ignore

-mod_paren_on_return           = ignore

-mod_pawn_semicolon            = false

-mod_full_paren_if_bool        = false

-mod_remove_extra_semicolon    = false

-cmt_width                     = 0

-cmt_c_group                   = false

-cmt_c_nl_start                = false

-cmt_c_nl_end                  = false

-cmt_cpp_group                 = false

-cmt_cpp_nl_start              = false

-cmt_cpp_nl_end                = false

-cmt_cpp_to_c                  = false

-cmt_star_cont                 = false

-cmt_sp_before_star_cont       = 0

-cmt_sp_after_star_cont        = 0

-pp_indent                     = ignore

-pp_indent_at_level            = false

-pp_space                      = ignore

-pp_indent_region              = 0

-pp_region_indent_code         = false

-pp_indent_if                  = 0

-pp_if_indent_code             = false

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_564.cfg
deleted file mode 100644
index d1496108..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_564.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_same_func_call_params = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-a.cfg
deleted file mode 100644
index 24a1a182..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-a.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = force
-sp_after_byref                  = remove
-sp_inside_fparen                = remove
-indent_columns                  = 4
-indent_class                    = true
-nl_class_brace                  = force
-sp_after_assign                 = remove
-sp_assign                       = force
-sp_assign_default               = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-b.cfg
deleted file mode 100644
index b61ac3e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-b.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = force
-sp_after_byref                  = remove
-sp_inside_fparen                = remove
-indent_columns                  = 4
-indent_class                    = true
-nl_class_brace                  = force
-sp_before_assign                = remove
-sp_assign                       = force
-sp_assign_default               = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574.cfg
deleted file mode 100644
index 925ee5fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = force
-sp_after_byref                  = remove
-sp_inside_fparen                = remove
-indent_columns                  = 4
-indent_class                    = true
-nl_class_brace                  = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_672.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_672.cfg
deleted file mode 100644
index fb436753..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_672.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_columns             = 4

-indent_continue            = 16

-indent_continue_class_head = 16

-indent_class               = true

-code_width                 = 80

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_foreach.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_foreach.cfg
deleted file mode 100644
index 56ec94cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_foreach.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_for_colon             = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-nl_start_of_file                = remove
-nl_end_of_file                  = add
-code_width                      = 80
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_1.cfg
deleted file mode 100644
index e57bba91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_1.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_sparen                = force
-sp_inside_sparen                = force
-indent_class                    = true
-nl_synchronized_brace           = force
-nl_class_brace                  = force
-nl_before_synchronized          = force
-nl_after_synchronized           = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_2.cfg
deleted file mode 100644
index 3512cdc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_class                    = true
-nl_synchronized_brace           = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-f.cfg
deleted file mode 100644
index fde00f38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-nl_paren_dbrace_open            = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-r.cfg
deleted file mode 100644
index ed2a6942..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_fparen_dbrace                = force
-indent_columns                  = 3
-nl_paren_dbrace_open            = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim2.cfg
deleted file mode 100644
index 18b12bbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim2.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_func_def_paren               = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-sp_before_dc                    = remove
-sp_after_dc                     = remove
-indent_columns                  = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim3.cfg
deleted file mode 100644
index 0fe42133..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim3.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_paren_paren                  = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-indent_columns                  = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim5.cfg
deleted file mode 100644
index 56a1b3da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim5.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_before_sparen                = force
-indent_columns                  = 4
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst.cfg
deleted file mode 100644
index 163d6f64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_namespace                = true
-cmt_insert_file_header          = "file-header.h"
-cmt_insert_func_header          = "func-header.h"
-cmt_insert_class_header         = "class-header.h"
-cmt_insert_before_preproc       = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst2.cfg
deleted file mode 100644
index 7f531264..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-cmt_insert_file_header          = "file-header.h"
-cmt_insert_func_header          = "func-header2.h"
-cmt_insert_class_header         = "class-header.h"
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst3.cfg
deleted file mode 100644
index 7dc7a63b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst3.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-input_tab_size                  = 4
-output_tab_size                 = 4
-sp_arith                        = add
-sp_assign                       = add
-sp_enum_assign                  = add
-sp_bool                         = add
-sp_compare                      = add
-sp_before_sparen                = add
-sp_inside_sparen                = remove
-sp_after_sparen                 = add
-sp_sparen_brace                 = add
-sp_special_semi                 = add
-sp_after_comma                  = add
-sp_sizeof_paren                 = remove
-sp_type_func                    = add
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_inside_fparens               = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-sp_else_brace                   = add
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_switch_case              = 4
-nl_end_of_file                  = add
-nl_end_of_file_min              = 1
-nl_assign_brace                 = add
-nl_func_var_def_blk             = 1
-nl_enum_brace                   = add
-nl_struct_brace                 = add
-nl_union_brace                  = add
-nl_if_brace                     = add
-nl_brace_else                   = add
-nl_elseif_brace                 = add
-nl_else_brace                   = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_do_brace                     = add
-nl_switch_brace                 = add
-nl_before_case                  = true
-nl_after_case                   = true
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-nl_after_brace_open_cmt         = true
-nl_after_func_proto_group       = 4
-nl_after_func_body              = 4
-nl_after_func_body_one_liner    = 4
-nl_after_return                 = true
-align_var_def_span              = 10
-align_var_def_star_style        = 1
-align_var_def_amp_style         = 1
-align_var_def_colon             = true
-align_assign_span               = 10
-align_assign_thresh             = 4
-align_enum_equ_span             = 10
-cmt_sp_before_star_cont         = 1
-cmt_insert_file_header          = "file_header.txt"
-cmt_insert_file_footer          = "file_footer.txt"
-cmt_insert_func_header          = "function_header.txt"
-mod_full_brace_do               = add
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-mod_remove_extra_semicolon      = true
-mod_add_long_function_closebrace_comment = 50
-mod_add_long_switch_closebrace_comment = 50
-pp_indent_at_level              = true
-pp_if_indent_code               = true
-pp_define_at_level              = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst4.cfg
deleted file mode 100644
index a269bdf8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst4.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cmt_indent_multi                = false
-cmt_insert_file_header          = "file-header.h"
-cmt_insert_func_header          = "func-header2.h"
-cmt_insert_class_header         = "class-header.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_1.cfg
deleted file mode 100644
index 5c394f28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_1.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-nl_before_case                  = true
-nl_after_semicolon              = true
-nl_after_label_colon            = true
-nl_remove_extra_newlines        = 2
-align_var_struct_span           = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_2.cfg
deleted file mode 100644
index b1fafca7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_before_case                  = true
-nl_after_semicolon              = true
-nl_remove_extra_newlines        = 2
-align_var_struct_span           = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda1.cfg
deleted file mode 100644
index 2535bb05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda1.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_cpp_lambda_assign            = remove
-sp_cpp_lambda_square_paren      = force
-sp_inside_paren                 = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = remove
-sp_inside_braces                = force
-sp_fparen_brace                 = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_cpp_lambda_leave_one_liners  = true
-nl_cpp_ldef_brace               = remove
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda2.cfg
deleted file mode 100644
index 9f698209..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda2.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_cpp_lambda_assign            = remove
-sp_cpp_lambda_square_paren      = force
-sp_inside_paren                 = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = remove
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_brace_fparen                 = add
-nl_cpp_ldef_brace               = add
-nl_after_semicolon              = true
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda3.cfg
deleted file mode 100644
index ffed35eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda3.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_cpp_lambda_assign            = remove
-sp_cpp_lambda_square_paren      = force
-sp_inside_paren                 = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_before_byref                 = remove
-sp_inside_braces                = force
-sp_fparen_brace                 = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_cpp_lambda_body          = true
-nl_cpp_lambda_leave_one_liners  = true
-nl_cpp_ldef_brace               = remove
-eat_blanks_before_close_brace   = true
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda_in_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda_in_one_liner.cfg
deleted file mode 100644
index 7b61e767..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda_in_one_liner.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_cpp_lambda_square_brace      = remove
-sp_before_square                = remove
-nl_func_leave_one_liners        = true
-nl_cpp_lambda_leave_one_liners  = true
-nl_after_brace_open             = true
-sp_inside_braces                = force
-sp_inside_type_brace_init_lst   = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leading-tabs-for-java-lambda.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leading-tabs-for-java-lambda.cfg
deleted file mode 100644
index ba1f063e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leading-tabs-for-java-lambda.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_with_tabs = 1
-indent_class = true
-cmt_indent_multi = false
-indent_cs_delegate_body = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leave_one_liners.cfg
deleted file mode 100644
index 931e9465..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leave_one_liners.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-nl_assign_brace                         = force
-nl_enum_brace                           = force
-nl_if_brace                             = force
-nl_while_brace                          = force
-nl_do_brace                             = force
-nl_for_brace                            = force
-
-nl_assign_leave_one_liners              = true
-nl_enum_leave_one_liners                = true
-nl_func_leave_one_liners                = true
-nl_if_leave_one_liners                  = true
-nl_while_leave_one_liners               = true
-nl_do_leave_one_liners                  = true
-nl_for_leave_one_liners                 = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/libd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/libd.cfg
deleted file mode 100644
index a29c77a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/libd.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-input_tab_size                  = 4
-output_tab_size                 = 4
-indent_columns                  = 4
-nl_end_of_file                  = add
-nl_end_of_file_min              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Mac.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Mac.cfg
deleted file mode 100644
index d8b41944..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Mac.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-indent_columns   = 3
-indent_with_tabs = 0
-
-# The span for aligning on '=' in assignments (0=don't align)
-align_assign_span = 2
-
-
-# The type of line endings. Default=Auto.
-# Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto
-newlines = cr
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Unix.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Unix.cfg
deleted file mode 100644
index e6cf9411..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Unix.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_columns   = 3
-indent_with_tabs = 0
-
-# The span for aligning on '=' in assignments (0=don't align)
-align_assign_span = 2
-
-# The type of line endings. Default=Auto.
-# Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto
-newlines = lf
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Win.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Win.cfg
deleted file mode 100644
index cb40d365..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Win.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_columns   = 3
-indent_with_tabs = 0
-
-# The span for aligning on '=' in assignments (0=don't align)
-align_assign_span = 2
-
-# The type of line endings. Default=Auto.
-# Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto
-newlines = crlf
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_br_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_br_cmt.cfg
deleted file mode 100644
index f66ee7c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_br_cmt.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_sparen                = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_class                    = true
-indent_access_spec              = 2
-nl_class_leave_one_liners       = true
-nl_after_access_spec            = 1
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-mod_add_long_function_closebrace_comment = 10
-mod_add_long_namespace_closebrace_comment = 10
-mod_add_long_class_closebrace_comment = 8
-mod_add_long_switch_closebrace_comment = 8
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_namespace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_namespace.cfg
deleted file mode 100644
index 74f99a18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_namespace.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_namespace                = true
-indent_namespace_limit          = 6
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_a.cfg
deleted file mode 100644
index b05558b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_a.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_comma                  = add
-sp_after_mdatype_commas         = force
-sp_before_mdatype_commas        = force
-sp_between_mdatype_commas       = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_c.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_c.cfg
deleted file mode 100644
index 9bfcef37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_c.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_comma                  = add
-sp_between_mdatype_commas       = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/misc-failures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/misc-failures.cfg
deleted file mode 100644
index 36b9e694..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/misc-failures.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_func_call_param          = true
-indent_align_assign             = false
-nl_assign_brace                 = force
-nl_max                          = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren.cfg
deleted file mode 100644
index 2c0049ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-sp_bool                         = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_return_paren                 = remove
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 3
-nl_start_of_file                = remove
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_if_brace                     = add
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-mod_full_brace_if               = add
-mod_paren_on_return             = add
-mod_full_paren_if_bool          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren2.cfg
deleted file mode 100644
index 113ee868..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-sp_bool                         = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 3
-nl_start_of_file                = remove
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_if_brace                     = add
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-mod_full_brace_if               = add
-mod_paren_on_return             = remove
-mod_full_paren_if_bool          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_class_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_class_closebrace_comment-1.cfg
deleted file mode 100644
index c1e8e0ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_class_closebrace_comment-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_add_long_class_closebrace_comment = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_namespace_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_namespace_closebrace_comment-1.cfg
deleted file mode 100644
index a94f5a62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_namespace_closebrace_comment-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_add_long_namespace_closebrace_comment = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_add.cfg
deleted file mode 100644
index bfcca51a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_add.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_case_brace               = 3
-nl_before_case                  = true
-nl_after_case                   = true
-mod_case_brace                  = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_rm.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_rm.cfg
deleted file mode 100644
index 51252b69..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_rm.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_case_brace               = 3
-nl_switch_brace                 = add
-nl_before_case                  = true
-nl_after_case                   = true
-mod_case_brace                  = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_function-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_function-f.cfg
deleted file mode 100644
index 8d44cc3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_function-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_function         = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain-t.cfg
deleted file mode 100644
index 32a552ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if_chain         = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain_only-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain_only-t.cfg
deleted file mode 100644
index ec61c84b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain_only-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if_chain_only    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg
deleted file mode 100644
index c187d46a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-mod_full_brace_for              = remove
-mod_full_brace_if               = remove
-mod_full_brace_nl_block_rem_mlcond = true
-mod_full_brace_while            = remove
-mod_full_brace_using            = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg
deleted file mode 100644
index 800ba158..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_full_brace_if_chain         = true
-mod_full_brace_nl_block_rem_mlcond = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_paren_if_bool.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_paren_if_bool.cfg
deleted file mode 100644
index f75f8801..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_paren_if_bool.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_paren_if_bool = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_move_case_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_move_case_brace.cfg
deleted file mode 100644
index acb25734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_move_case_brace.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_case_brace               = 3
-nl_before_case                  = true
-nl_after_case                   = true
-mod_move_case_break             = true
-mod_case_brace                  = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-a.cfg
deleted file mode 100644
index 6e5a38ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-r.cfg
deleted file mode 100644
index fb547f72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_paren_on_return             = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_empty_return-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_empty_return-t.cfg
deleted file mode 100644
index 3e1bcd1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_empty_return-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_remove_empty_return = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_extra_semicolon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_extra_semicolon-t.cfg
deleted file mode 100644
index 0f2d5246..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_extra_semicolon-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_remove_extra_semicolon      = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_grouping_enabled.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_grouping_enabled.cfg
deleted file mode 100644
index d88bf262..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_grouping_enabled.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-mod_sort_import                 = true
-mod_sort_using                  = true
-mod_sort_include                = true
-mod_sort_incl_import_prioritize_extensionless = true
-mod_sort_incl_import_prioritize_angle_over_quotes = true
-mod_sort_incl_import_ignore_extension = true
-mod_sort_incl_import_grouping_enabled = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_ignore_extension.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_ignore_extension.cfg
deleted file mode 100644
index d49491cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_ignore_extension.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-mod_sort_import                 = true
-mod_sort_using                  = true
-mod_sort_include                = true
-mod_sort_incl_import_ignore_extension = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_angle_over_quotes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
deleted file mode 100644
index 475ab734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-mod_sort_import                 = true
-mod_sort_using                  = true
-mod_sort_include                = true
-mod_sort_incl_import_prioritize_angle_over_quotes = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_extensionless.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_extensionless.cfg
deleted file mode 100644
index aa9eb1db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_extensionless.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-mod_sort_import                 = true
-mod_sort_using                  = true
-mod_sort_include                = true
-mod_sort_incl_import_prioritize_extensionless = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_filename.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_filename.cfg
deleted file mode 100644
index 2661a68a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_filename.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-mod_sort_import                 = true
-mod_sort_using                  = true
-mod_sort_include                = true
-mod_sort_incl_import_prioritize_filename = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_using-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_using-t.cfg
deleted file mode 100644
index 805fc734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_using-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_sort_using                  = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mono.cfg
deleted file mode 100644
index 726b1eda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mono.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-sp_before_square                = add
-sp_func_call_paren              = force
-indent_with_tabs                = 0
-indent_class                    = true
-nl_func_var_def_blk             = 1
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/msg-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/msg-header.h
deleted file mode 100644
index 79a0919f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/msg-header.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * $(scope)[$(class)$(category) $(message)]
- *
- * $(javaparam)
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_1.cfg
deleted file mode 100644
index fe15ff0a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_decl_start_multi_line   = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_10.cfg
deleted file mode 100644
index e5b917e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_10.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_call_end_multi_line     = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_2.cfg
deleted file mode 100644
index b4063fd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_def_start_multi_line    = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_3.cfg
deleted file mode 100644
index d1c40d07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_3.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_decl_end_multi_line     = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_4.cfg
deleted file mode 100644
index 651b4823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_def_end_multi_line      = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_5.cfg
deleted file mode 100644
index 94140b21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_5.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_decl_args_multi_line    = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_6.cfg
deleted file mode 100644
index 4fd7a077..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_6.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_def_args_multi_line     = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_7.cfg
deleted file mode 100644
index 4ee5733c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_7.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-nl_func_decl_start_multi_line   = true
-nl_func_def_start_multi_line    = true
-nl_func_decl_args_multi_line    = true
-nl_func_def_args_multi_line     = true
-nl_func_decl_end_multi_line     = true
-nl_func_def_end_multi_line      = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_8.cfg
deleted file mode 100644
index 5d6d9c63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_8.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_call_start_multi_line   = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_9.cfg
deleted file mode 100644
index be9a43e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_9.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_call_args_multi_line    = true
-code_width                      = 70
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/my_conf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/my_conf.cfg
deleted file mode 100644
index 6bfddbb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/my_conf.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-sp_assign                       = add

-sp_before_sparen                = add

-sp_inside_sparen                = remove

-sp_func_def_paren               = force

-indent_columns                  = 4

-indent_with_tabs                = 0

-indent_switch_case              = 4

-indent_switch_break_with_case   = true

-nl_end_of_file                  = force

-nl_end_of_file_min              = 1

-nl_if_brace                     = add

-nl_else_brace                   = add

-nl_switch_brace                 = add

-nl_before_case                  = true

-cmt_width                       = 80

-mod_full_brace_for              = add

-mod_full_brace_if               = add

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nSolve.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nSolve.cfg
deleted file mode 100644
index 6cc6fc27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nSolve.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-nl_func_leave_one_liners        = true
-align_var_def_span              = 1
-align_assign_span               = 1
-align_func_proto_span           = 1
-align_single_line_func          = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/negative_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/negative_indent.cfg
deleted file mode 100644
index 39b1b007..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/negative_indent.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-indent_columns                  = 4
-indent_continue                 = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_class_colon              = true
-indent_constr_colon             = true
-indent_ctor_init                = -2
-indent_access_spec              = -2
-nl_class_init_args              = force
-nl_class_colon                  = remove
-nl_constr_colon                 = force
-pos_class_comma                 = trail
-pos_constr_colon                = lead
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nepenthes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nepenthes.cfg
deleted file mode 100644
index 150294da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nepenthes.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-input_tab_size                  = 4
-output_tab_size                 = 4
-indent_columns                  = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new-constraint-paren-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new-constraint-paren-space.cfg
deleted file mode 100644
index f96e03b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new-constraint-paren-space.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_new=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_a.cfg
deleted file mode 100644
index d7501092..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_a.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_paren_paren                  = remove
-sp_between_new_paren            = add
-sp_after_newop_paren            = add
-sp_inside_newop_paren           = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_f.cfg
deleted file mode 100644
index 16784899..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_paren_paren                  = force
-sp_between_new_paren            = force
-sp_after_newop_paren            = force
-sp_inside_newop_paren           = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_paren_open_close.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_paren_open_close.cfg
deleted file mode 100644
index 789c7abe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_paren_open_close.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_paren_paren                  = force
-sp_inside_newop_paren_open      = force
-sp_inside_newop_paren_close     = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_r.cfg
deleted file mode 100644
index b72cd2ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_paren_paren                  = force
-sp_between_new_paren            = remove
-sp_after_newop_paren            = remove
-sp_inside_newop_paren           = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/newline_after_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/newline_after_endif.cfg
deleted file mode 100644
index afd7693d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/newline_after_endif.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-pp_if_indent_code               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-brAfter-fcallParen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-brAfter-fcallParen.cfg
deleted file mode 100644
index 6a83f800..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-brAfter-fcallParen.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_call_paren              = remove
-nl_after_brace_close            = true                                         #
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-comment.cfg
deleted file mode 100644
index c6ef78f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-comment.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_for_brace                    = add
-nl_before_block_comment         = 3
-nl_before_c_comment             = 3
-nl_before_cpp_comment           = 4
-mod_full_brace_for              = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_access_spec.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_access_spec.cfg
deleted file mode 100644
index a5d98c44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_access_spec.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_class                    = true
-indent_access_spec              = 2
-nl_class_brace                  = force
-nl_after_semicolon              = true
-nl_before_access_spec           = 3
-nl_after_access_spec            = 2
-nl_after_func_body_class        = 2
-nl_after_struct                 = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_annotation-f.cfg
deleted file mode 100644
index 405f8ef4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_annotation-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_annotation             = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-2.cfg
deleted file mode 100644
index 9c9e7d57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-2.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_fparen_brace                 = force
-indent_class                    = true
-nl_class_leave_one_liners       = true
-nl_fdef_brace                   = remove
-nl_after_func_body              = 4
-nl_after_func_body_one_liner    = 2
-eat_blanks_before_close_brace   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-3.cfg
deleted file mode 100644
index 65f1fa5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-3.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-nl_after_func_body              = 3
-indent_oc_inside_msg_sel        = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body.cfg
deleted file mode 100644
index 68633b6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_fparen_brace                 = force
-indent_class                    = true
-nl_fdef_brace                   = remove
-nl_after_func_body              = 4
-eat_blanks_before_close_brace   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_class_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_class_proto-3.cfg
deleted file mode 100644
index 87b84e91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_class_proto-3.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_func_class_proto       = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto-3.cfg
deleted file mode 100644
index c9bc1f45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto-3.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_func_proto             = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto_group-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto_group-3.cfg
deleted file mode 100644
index 63fa256a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto_group-3.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_func_proto_group       = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign1.cfg
deleted file mode 100644
index 1f4da850..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign1.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-indent_columns                  = 4
-pos_arith                       = lead
-pos_assign                      = lead
-code_width                      = 60
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign2.cfg
deleted file mode 100644
index b4cfb4d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_assign                       = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-pos_assign                      = trail
-code_width                      = 60
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign_leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign_leave_one_liners.cfg
deleted file mode 100644
index 6914813b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign_leave_one_liners.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_type_brace_init_lst=force
-nl_type_brace_init_lst_close=force
-nl_type_brace_init_lst_open=force
-nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_after.cfg
deleted file mode 100644
index b80dafa0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_after.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 4
-indent_class                    = true
-nl_before_class                 = 2
-nl_after_class                  = 2
-nl_before_namespace             = 2
-nl_after_namespace              = 2
-nl_template_class               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.cfg
deleted file mode 100644
index 03ee374a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_func_body_def         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.rerun.cfg
deleted file mode 100644
index dc225a1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.rerun.cfg
+++ /dev/null
@@ -1 +0,0 @@
-include "nl_before_func_body_def-1.cfg"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-2.cfg
deleted file mode 100644
index 2f3ba945..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_func_body_def         = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-f.cfg
deleted file mode 100644
index 39539a4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_if_closing_paren      = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-r.cfg
deleted file mode 100644
index d3ab2d68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_if_closing_paren      = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_false.cfg
deleted file mode 100644
index 7636745b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_false.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_return = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_true.cfg
deleted file mode 100644
index 1e6976fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_true.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_return = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_between_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_between_annotation-f.cfg
deleted file mode 100644
index 6a67c354..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_between_annotation-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_between_annotation           = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_brace-a.cfg
deleted file mode 100644
index 25d3c271..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_brace-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_brace_brace                  = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-f.cfg
deleted file mode 100644
index 0a731344..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_brace_fparen                 = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-r.cfg
deleted file mode 100644
index 5a749682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_brace_fparen                 = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_square.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_square.cfg
deleted file mode 100644
index e0f11f90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_square.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_ptr_star_paren               = remove
-sp_inside_tparen                = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_after_send_oc_colon          = force
-sp_after_oc_type                = force
-sp_after_oc_block_caret         = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_test.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_test.cfg
deleted file mode 100644
index c9faeb04..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_test.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_assign                       = force
-sp_compare                      = force
-sp_before_sparen                = add
-sp_func_def_paren               = add
-sp_return_paren                 = add
-indent_columns                  = 2
-nl_func_var_def_blk             = 1
-nl_if_brace                     = force
-nl_for_brace                    = add
-nl_fdef_brace                   = force
-nl_after_brace_open             = true
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-a.cfg
deleted file mode 100644
index 8c1eb70e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-a.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_namespace                = true
-indent_class                    = true
-nl_class_brace                  = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-r.cfg
deleted file mode 100644
index 29cc4dc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_namespace                = true
-indent_class                    = true
-nl_class_brace                  = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_create_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_create_one_liner.cfg
deleted file mode 100644
index ec8b120c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_create_one_liner.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-nl_create_if_one_liner          = true
-nl_create_for_one_liner         = true
-nl_create_while_one_liner       = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum-2.cfg
deleted file mode 100644
index 01c60de4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum-2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Double-space commented struct/enum/union blocks
-# Add an extra newline before the close brace
-nl_ds_struct_enum_cmt           = true
-nl_ds_struct_enum_close_brace   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum_cmt-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum_cmt-t.cfg
deleted file mode 100644
index 1864b51d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum_cmt-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_ds_struct_enum_cmt           = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_endif.cfg
deleted file mode 100644
index b056153e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_endif.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_squeeze_ifdef                = true
-pp_if_indent_code               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.cfg
deleted file mode 100644
index b6a28869..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_enum_own_lines               = remove
-code_width                      = 80
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.rerun.cfg
deleted file mode 100644
index f0d3f7b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.rerun.cfg
+++ /dev/null
@@ -1 +0,0 @@
-include "nl_enum_own_lines-3.cfg"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-4.cfg
deleted file mode 100644
index 70973ec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_enum_own_lines               = force
-nl_remove_extra_newlines        = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-a.cfg
deleted file mode 100644
index 66e7dbfa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_enum_own_lines               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
deleted file mode 100644
index 7aac9635..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_fdef_brace                   = remove
-nl_collapse_empty_body          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-f.cfg
deleted file mode 100644
index 7f08f9e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_fdef_brace                   = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-fr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-fr.cfg
deleted file mode 100644
index affe7156..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-fr.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_fdef_brace                   = force
-nl_fdef_brace_cond              = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-r.cfg
deleted file mode 100644
index e64f7f0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_fdef_brace                   = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-rf.cfg
deleted file mode 100644
index 9b12913e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-rf.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_fdef_brace                   = remove
-nl_fdef_brace_cond              = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-f.cfg
deleted file mode 100644
index bdcceefd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_for_brace = force

-nl_for_leave_one_liners = false

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-t.cfg
deleted file mode 100644
index 4d11891e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-t.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_for_brace = force

-nl_for_leave_one_liners = true

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_args_multi_line_ignore_closures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_args_multi_line_ignore_closures.cfg
deleted file mode 100644
index e480140e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_args_multi_line_ignore_closures.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_func_call_start_multi_line = true
-nl_func_call_args_multi_line = true
-nl_func_call_end_multi_line = true
-nl_func_call_args_multi_line_ignore_closures = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_empty-r.cfg
deleted file mode 100644
index da04d6fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_empty-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_call_empty              = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren-f.cfg
deleted file mode 100644
index 480ce89f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_call_paren              = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren_empty-r.cfg
deleted file mode 100644
index 48612eb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren_empty-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_call_paren_empty        = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_class_scope-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_class_scope-a.cfg
deleted file mode 100644
index dc9b2ec5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_class_scope-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_class_scope             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_1.cfg
deleted file mode 100644
index 438afe8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_1.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# a few options to make the output pretty
-sp_after_comma                  = force
-sp_inside_fparen                = force
-# ---
-nl_func_paren                   = remove
-nl_func_def_paren               = force
-nl_func_decl_start              = remove
-nl_func_def_start               = force
-nl_func_decl_args               = remove
-nl_func_def_args                = force
-nl_func_decl_end                = remove
-nl_func_def_end                 = force
-nl_func_def_empty               = force
-nl_inside_empty_func            = 2
-nl_collapse_empty_body          = true # this option overrides nl_inside_empty_func
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_2.cfg
deleted file mode 100644
index c0495a4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_2.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-nl_func_paren                   = force
-nl_func_def_paren               = remove
-nl_func_decl_start              = force
-nl_func_def_start               = remove
-nl_func_decl_args               = force
-nl_func_def_args                = remove
-nl_func_decl_end                = force
-nl_func_def_end                 = remove
-nl_func_decl_empty              = force
-nl_func_def_empty               = remove
-nl_inside_empty_func            = 5
-nl_max_blank_in_func            = 3 # this option limits nl_inside_empty_func to 3
-
-# a few more options to make the output pretty
-sp_after_comma                  = force
-sp_inside_fparen                = force
-align_func_params               = true
-
-# test nl_inside_empty_func option with code width constraints and
-# 'eat_blanks_before_close_brace' and 'eat_blanks_after_open_brace' set to true
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-code_width                      = 25
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_def_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_def_paren_empty-r.cfg
deleted file mode 100644
index ddc5e5d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_def_paren_empty-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# The option that is being overridden by nl_func_def_paren_empty
-nl_func_def_paren               = force
-
-nl_func_def_paren_empty         = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_paren_empty.cfg
deleted file mode 100644
index 63f0b8ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_paren_empty.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_paren                   = force   # should be overridden by nl_func_paren_empty
-nl_func_paren_empty             = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_scope_name-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_scope_name-a.cfg
deleted file mode 100644
index c814477d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_scope_name-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_scope_name              = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name-r.cfg
deleted file mode 100644
index 9cc10873..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_type_name               = remove                                       #
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_class.cfg
deleted file mode 100644
index fcb08501..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_class.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_cmt_cpp_start                = add
-nl_func_type_name               = force
-nl_func_type_name_class         = remove
-nl_func_proto_type_name         = force
-align_func_proto_span           = 16
-align_on_operator               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_force.cfg
deleted file mode 100644
index ef8b317e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_force.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_cmt_cpp_start                = add
-nl_func_type_name               = force
-nl_func_proto_type_name         = force
-align_func_proto_span           = 16
-align_on_operator               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_mixed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_mixed.cfg
deleted file mode 100644
index 515400f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_mixed.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_cmt_cpp_start                = add
-nl_func_type_name               = force
-nl_func_proto_type_name         = remove
-align_func_proto_span           = 16
-align_on_operator               = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_remove.cfg
deleted file mode 100644
index ee38dd7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_remove.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cmt_cpp_start                = add
-nl_func_type_name               = remove
-align_func_proto_span           = 16
-align_on_operator               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_var_def_blk-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_var_def_blk-1.cfg
deleted file mode 100644
index 2fc79eb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_var_def_blk-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_var_def_blk             = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_1.cfg
deleted file mode 100644
index c84309ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_inside_namespace             = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_2.cfg
deleted file mode 100644
index 9edefd02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_inside_namespace             = 2
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-1.cfg
deleted file mode 100644
index 9aa3416c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_max_blank_in_func            = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-4.cfg
deleted file mode 100644
index 8d0bdf67..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-4.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_max_blank_in_func            = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-a.cfg
deleted file mode 100644
index bc5d6469..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-a.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_namespace                = true
-nl_namespace_brace              = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-r.cfg
deleted file mode 100644
index ca9c198d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_namespace                = true
-nl_namespace_brace              = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_oc_block_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_oc_block_brace-f.cfg
deleted file mode 100644
index 824fc747..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_oc_block_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_oc_block_brace               = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_remove_extra_newlines-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_remove_extra_newlines-1.cfg
deleted file mode 100644
index 2d0c48b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_remove_extra_newlines-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_remove_extra_newlines        = 1        # unsigned number
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_semicolon.cfg
deleted file mode 100644
index d099e0c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_semicolon.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_columns                  = 3
-nl_struct_brace                 = add
-nl_for_brace                    = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-align_var_def_star_style        = 1
-align_var_struct_span           = 3
-mod_full_brace_for              = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-f.cfg
deleted file mode 100644
index dafe1c9d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-f.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-# Forces a newline between template '>' and class
-tok_split_gte                   = true
-sp_arith                        = force
-sp_compare                      = force
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_after_angle                  = force
-sp_angle_paren_empty            = remove
-sp_after_operator               = force
-sp_inside_braces_struct         = force
-sp_inside_braces                = force
-sp_func_proto_paren             = remove
-indent_columns                  = 3
-indent_class                    = true
-nl_template_class               = force
-nl_template_func                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-r.cfg
deleted file mode 100644
index 6220a8db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-r.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Removes newlines between template '>' and class
-tok_split_gte                   = true
-sp_arith                        = force
-sp_compare                      = force
-sp_before_unnamed_ptr_star      = remove
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_after_angle                  = force
-sp_angle_paren_empty            = remove
-sp_after_operator               = force
-sp_after_cast                   = force
-sp_inside_braces_struct         = force
-sp_inside_braces                = force
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-indent_columns                  = 3
-indent_class                    = true
-nl_template_class               = remove
-nl_template_func                = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_try-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_try-a.cfg
deleted file mode 100644
index b85fcb08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_try-a.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_try_brace                    = force
-nl_catch_brace                  = force
-nl_brace_catch                  = force
-nl_after_vbrace_open            = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-f.cfg
deleted file mode 100644
index 1b29c5cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_type_brace_init_lst          = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-r.cfg
deleted file mode 100644
index ef8d1de1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_type_brace_init_lst = remove
-sp_after_decltype      = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-f.cfg
deleted file mode 100644
index 4e070657..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_type_brace_init_lst_close    = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-r.cfg
deleted file mode 100644
index d4834efd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_type_brace_init_lst_close    = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-f.cfg
deleted file mode 100644
index 1e9289e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_type_brace_init_lst_open     = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-r.cfg
deleted file mode 100644
index 7d493c8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_type_brace_init_lst_open     = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_whole_file_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_whole_file_ifdef.cfg
deleted file mode 100644
index 1d6a585a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_whole_file_ifdef.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-nl_squeeze_ifdef                = true
-nl_squeeze_ifdef_top_level      = true
-nl_after_func_proto             = 2
-nl_before_whole_file_ifdef      = 3
-nl_after_whole_file_ifdef       = 3
-nl_before_whole_file_endif      = 3
-nl_after_whole_file_endif       = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/no_squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/no_squeeze_ifdef.cfg
deleted file mode 100644
index af4a3020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/no_squeeze_ifdef.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-nl_before_return                = true
-nl_after_return                 = true
-nl_before_cpp_comment           = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-available.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-available.cfg
deleted file mode 100644
index f77790fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-available.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                          = 4             # number
-indent_with_tabs                        = 0             # number
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-properties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-properties.cfg
deleted file mode 100644
index 98241779..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-properties.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_inside_paren                 = remove
-mod_sort_oc_properties          = true
-mod_sort_oc_property_thread_safe_weight = 6
-mod_sort_oc_property_readwrite_weight = 5
-mod_sort_oc_property_reference_weight = 4
-mod_sort_oc_property_getter_weight = 2
-mod_sort_oc_property_nullability_weight = 3
-mod_sort_oc_property_class_weight = 7
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_bug_497.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_bug_497.cfg
deleted file mode 100644
index 0015f97d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_bug_497.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_continue                 = 10
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_complex_method.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_complex_method.cfg
deleted file mode 100644
index 3e713117..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_complex_method.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_ptr_star               = force
-sp_after_oc_return_type         = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
-align_oc_msg_colon_span         = 1
-cmt_star_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc1.cfg
deleted file mode 100644
index 659131cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc1.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-output_tab_size                 = 3
-sp_after_oc_colon               = force
-sp_before_oc_colon              = remove
-sp_after_oc_type                = force
-indent_columns                  = output_tab_size
-indent_with_tabs                = 0
-nl_fdef_brace                   = add
-align_oc_msg_spec_span          = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc10.cfg
deleted file mode 100644
index d50a20d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc10.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_before_ptr_star              = force
-sp_inside_square                = remove
-sp_after_comma                  = force
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-sp_after_oc_scope               = remove
-sp_after_oc_msg_receiver        = force
-indent_columns                  = 3
-nl_fdef_brace                   = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc11.cfg
deleted file mode 100644
index e355d765..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc11.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_inside_braces         = force
-sp_after_send_oc_colon   = force
-sp_cond_ternary_short    = remove
-sp_cond_colon            = add
-sp_cond_question         = add
-indent_with_tabs         = 0
-nl_end_of_file           = force
-nl_end_of_file_min       = 1
-nl_after_semicolon       = true
-align_var_def_span       = 2
-align_var_def_star_style = 1
-align_assign_span        = 1
-align_oc_msg_colon_span  = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc12.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc12.cfg
deleted file mode 100644
index 4f069fed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc12.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_after_angle                  = force
-sp_after_cast                   = remove
-sp_after_oc_scope               = remove
-indent_columns                  = 3
-nl_for_brace                    = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc13.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc13.cfg
deleted file mode 100644
index 925a2739..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc13.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_after_oc_scope               = remove
-sp_after_send_oc_colon          = force
-indent_columns                  = 3
-indent_continue                 = 3
-indent_align_assign             = false
-nl_func_var_def_blk             = 1
-nl_fdef_brace                   = add
-nl_after_brace_open             = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc14.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc14.cfg
deleted file mode 100644
index a44950db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc14.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_after_send_oc_colon          = force
-indent_columns                  = 3
-indent_oc_block                 = true
-nl_oc_msg_args                  = true
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-align_oc_msg_colon_span         = 1
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc16.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc16.cfg
deleted file mode 100644
index 5eec46e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc16.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_after_ptr_star               = remove
-sp_after_send_oc_colon          = force
-indent_columns                  = 3
-indent_oc_block                 = true
-nl_for_brace                    = add
-nl_oc_msg_args                  = true
-align_oc_msg_colon_span         = 1
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc17.cfg
deleted file mode 100644
index 18b27823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc17.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 3
-align_var_def_span              = 2
-align_assign_span               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc18.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc18.cfg
deleted file mode 100644
index 96003cf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc18.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_columns                  = 3
-indent_continue                 = 3
-indent_align_assign             = false
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_after_brace_open             = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc19.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc19.cfg
deleted file mode 100644
index d68c95f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc19.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_after_oc_scope               = remove
-indent_columns                  = 3
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_switch_brace                 = add
-nl_fdef_brace                   = add
-eat_blanks_after_open_brace     = true
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc2.cfg
deleted file mode 100644
index 43d02a66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc2.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_inside_fparen                = remove
-indent_columns                  = 3
-nl_fdef_brace                   = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc4.cfg
deleted file mode 100644
index f2de050e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc4.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_before_oc_colon              = remove
-sp_after_oc_type                = force
-indent_columns                  = 3
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc5.cfg
deleted file mode 100644
index 77a7a7af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc5.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_before_angle                 = remove
-sp_after_oc_colon               = force
-sp_after_oc_type                = force
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_fdef_brace                   = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc6.cfg
deleted file mode 100644
index c1bcd8d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc6.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_inside_fparen                = remove
-sp_after_send_oc_colon          = force
-indent_columns                  = 3
-nl_finally_brace                = add
-nl_try_brace                    = add
-nl_catch_brace                  = add
-nl_fdef_brace                   = add
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc7.cfg
deleted file mode 100644
index 972ab19a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc7.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_compare                      = force
-sp_after_comma                  = force
-sp_inside_braces                = force
-sp_after_oc_scope               = remove
-sp_before_oc_colon              = remove
-sp_after_send_oc_colon          = force
-indent_columns                  = 3
-nl_oc_msg_leave_one_liner       = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_for_brace                    = add
-nl_oc_msg_args                  = true
-align_assign_span               = 1
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc8.cfg
deleted file mode 100644
index 3f577ab8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc8.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_inside_paren                 = remove
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_after_angle                  = force
-sp_inside_sparen                = remove
-sp_inside_fparen                = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_after_send_oc_colon          = force
-indent_columns                  = 3
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_if_brace                     = add
-mod_full_brace_if               = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc9.cfg
deleted file mode 100644
index 92ed39d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc9.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_comma                  = force
-indent_columns                  = 3
-indent_continue                 = 3
-indent_align_assign             = false
-nl_fdef_brace                   = add
-nl_after_brace_open             = true
-align_assign_span               = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1674.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1674.cfg
deleted file mode 100644
index 31e4537c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1674.cfg
+++ /dev/null
@@ -1,49 +0,0 @@
-# File Created With UncrustifyX 0.4.3 (252)
-
-sp_enum_paren = remove
-sp_cond_ternary_short = remove
-indent_paren_open_brace = true
-
-align_oc_decl_colon                     = true
-align_oc_msg_colon_span                 = 1
-nl_after_func_body                      = 2
-mod_full_brace_do                       = add
-mod_full_brace_if                       = add
-mod_full_brace_for                      = add
-mod_full_brace_while                    = add
-indent_oc_block                         = true
-indent_columns                          = 4
-indent_switch_case                      = 4
-indent_with_tabs                        = 0
-nl_after_brace_close                    = true
-nl_after_brace_open                     = true
-nl_after_case                           = true
-nl_brace_while                          = remove
-nl_collapse_empty_body                  = false
-nl_end_of_file                          = add
-sp_after_oc_block_caret                 = remove
-sp_after_oc_colon                       = remove
-sp_after_send_oc_colon                  = remove
-sp_after_oc_property                    = add
-sp_after_oc_return_type                 = remove
-sp_after_oc_scope                       = force
-sp_after_oc_type                        = remove
-sp_after_angle                          = add
-sp_after_comma                          = add
-sp_after_sparen                         = add
-sp_after_ptr_star                       = remove
-sp_arith                                = add
-sp_assign                               = add
-sp_bool                                 = add
-sp_compare                              = add
-sp_member                               = remove
-sp_cond_colon                           = add
-sp_cond_question                        = add
-sp_before_oc_block_caret                = ignore
-sp_before_oc_colon                      = remove
-sp_before_send_oc_colon                 = remove
-sp_before_sparen                        = add
-sp_before_ptr_star                      = add
-sp_before_unnamed_ptr_star              = add
-sp_angle_word                           = add
-sp_between_ptr_star                     = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1683.cfg
deleted file mode 100644
index b5d4249d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1683.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_brace_close                    = true          # boolean (false/true)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_cond_colon.cfg
deleted file mode 100644
index b86516e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_cond_colon.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_send_oc_colon         = force
-sp_after_send_oc_colon          = force
-sp_cond_colon                   = remove
-# without this, no_space_table's {CT_UNKNOWN,CT_SQUARE_OPEN} combo removes the space between ? and CT_SQUARE_OPEN, but not between ? and CT_WORD
-sp_cond_question                = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-force.cfg
deleted file mode 100644
index fb2b90ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-force.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Forces a space after an operator
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_after_operator               = force
-sp_after_operator_sym           = force
-indent_columns                  = 3
-indent_class                    = true
-align_right_cmt_span            = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-1.cfg
deleted file mode 100644
index ceebcf9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-1.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Removes a space after an operator
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_after_operator               = remove
-sp_after_operator_sym           = remove
-indent_columns                  = 3
-indent_class                    = true
-align_var_def_span              = 2
-align_var_class_span            = 2
-align_right_cmt_span            = 2
-align_mix_var_proto             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-2.cfg
deleted file mode 100644
index f7fb60f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-2.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Removes a space after an operator
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_after_operator               = remove
-sp_after_operator_sym           = remove
-indent_columns                  = 3
-indent_class                    = true
-align_var_def_span              = 2
-align_var_class_span            = 2
-align_right_cmt_span            = 2
-align_on_operator               = true
-align_mix_var_proto             = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove.cfg
deleted file mode 100644
index 5c034f26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Removes a space after an operator
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_after_operator               = remove
-sp_after_operator_sym           = remove
-indent_columns                  = 3
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op_sym_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op_sym_empty.cfg
deleted file mode 100644
index d9a57ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op_sym_empty.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_operator               = remove
-sp_after_operator_sym           = force
-sp_after_operator_sym_empty     = remove
-sp_inside_fparens               = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-F.cfg
deleted file mode 100644
index 77d9e08c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-F.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns   = 3
-indent_with_tabs = 0
-# to test convert_value
-align_keep_tabs  = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-T.cfg
deleted file mode 100644
index a48c3ebb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-T.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns   = 3
-indent_with_tabs = 0
-align_keep_tabs  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pascal_ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pascal_ptr.cfg
deleted file mode 100644
index 2da7f0ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pascal_ptr.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = force
-indent_columns                  = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn-escape.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn-escape.cfg
deleted file mode 100644
index 8d10ec23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn-escape.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-string_escape_char              = 94  # '^'
-indent_columns                  = 4
-indent_with_tabs                = 0
-mod_pawn_semicolon              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn.cfg
deleted file mode 100644
index 53858314..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-input_tab_size                  = 4
-sp_arith                        = force
-sp_after_tag                    = remove
-sp_inside_braces                = add
-sp_brace_else                   = force
-sp_else_brace                   = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_brace_else                   = remove
-nl_fdef_brace                   = force
-mod_full_brace_for              = add
-mod_full_brace_function         = add
-mod_full_brace_if               = add
-mod_pawn_semicolon              = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-lf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-lf.cfg
deleted file mode 100644
index 9f2daab6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-lf.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pos_comma                       = lead_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-tb.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-tb.cfg
deleted file mode 100644
index 3530982a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-tb.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pos_comma                       = trail_break
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-eol.cfg
deleted file mode 100644
index 90267209..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-eol.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_compare                      = force
-pos_compare                     = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-sol.cfg
deleted file mode 100644
index a4235d7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-sol.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_compare                      = force
-pos_compare                     = lead
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-l.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-l.cfg
deleted file mode 100644
index 11eb46fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-l.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-pos_conditional  = lead
-sp_cond_colon    = add
-sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-t.cfg
deleted file mode 100644
index 79bb52d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-t.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-pos_conditional  = trail
-sp_cond_colon    = add
-sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_enum_comma-tf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_enum_comma-tf.cfg
deleted file mode 100644
index 26cf3dff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_enum_comma-tf.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pos_enum_comma                  = trail_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-join.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-join.cfg
deleted file mode 100644
index 69ce2c94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-join.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_arith = add
-pos_shift = join
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-lead.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-lead.cfg
deleted file mode 100644
index 08e7d5de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-lead.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_arith = add
-pos_shift = lead
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-trail.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-trail.cfg
deleted file mode 100644
index a6b45298..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-trail.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_arith = add
-pos_shift = trail
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-indent-2.cfg
deleted file mode 100644
index 64f53643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-indent-2.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#  Remove all PP spacing and indent
-pp_indent                       = remove
-pp_space                        = add
-# Gives the format
-# |#ifdef SOMETHING
-# |#  define X
-# |#endif
-pp_space_count                  = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-pragma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-pragma.cfg
deleted file mode 100644
index e143a69c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-pragma.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-pp_indent_at_level              = true
-pp_if_indent_code               = true
-pp_define_at_level              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-space.cfg
deleted file mode 100644
index e91685ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-space.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-output_tab_size                 = 4
-pp_indent                       = add
-pp_indent_count                 = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_define_at_level-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_define_at_level-1.cfg
deleted file mode 100644
index 12d12161..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_define_at_level-1.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-pp_define_at_level              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-0.cfg
deleted file mode 100644
index 82f11f27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-0.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# default region indent
-indent_columns                  = 4
-pp_indent                       = add
-pp_indent_at_level              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-1.cfg
deleted file mode 100644
index 7c01e819..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-1.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# indented region code
-indent_columns                  = 4
-pp_indent                       = add
-pp_indent_at_level              = true
-pp_if_indent_code               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-2.cfg
deleted file mode 100644
index 6f912806..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# out-dented region preprocs
-indent_columns                  = 4
-pp_indent                       = add
-pp_indent_at_level              = true
-pp_indent_if                    = -4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-3.cfg
deleted file mode 100644
index 4b876498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-3.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Abs column region preproc
-indent_columns                  = 4
-indent_col1_comment             = true
-pp_indent                       = add
-pp_if_indent_code               = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-4.cfg
deleted file mode 100644
index fe29f734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-4.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# indented region code
-indent_columns                  = 4
-pp_indent                       = add
-pp_indent_at_level              = true
-pp_if_indent_code               = true
-pp_define_at_level              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_indent-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_indent-a.cfg
deleted file mode 100644
index f9f9b3b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_indent-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pp_indent                       = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_multi_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_multi_comment.cfg
deleted file mode 100644
index 0c23b380..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_multi_comment.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_comma       = force
-indent_columns       = 3
-nl_class_colon       = force
-align_nl_cont        = true
-align_pp_define_gap  = 4
-align_pp_define_span = 3
-indent_with_tabs     = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_ret.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_ret.cfg
deleted file mode 100644
index b1fb2000..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_ret.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/preproc-cleanup.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/preproc-cleanup.cfg
deleted file mode 100644
index 3bd31722..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/preproc-cleanup.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-#  Clean up preprocessor output, ie from "gcc -E"
-sp_arith                        = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_after_ptr_star               = remove
-sp_after_cast                   = remove
-sp_sizeof_paren                 = remove
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_inside_fparen                = remove
-sp_after_tparen_close           = remove
-sp_func_call_paren              = remove
-sp_return_paren                 = remove
-sp_attribute_paren              = remove
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 3
-nl_enum_brace                   = add
-nl_struct_brace                 = add
-nl_union_brace                  = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-nl_max                          = 4
-nl_after_func_proto_group       = 2
-nl_after_func_body              = 2
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-align_var_def_star_style        = 1
-align_var_def_inline            = true
-align_enum_equ_span             = 16
-align_var_struct_span           = 99
-align_typedef_gap               = 3
-align_typedef_span              = 5
-mod_paren_on_return             = add
-pp_space                        = remove
-sp_before_vardef_square         = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr-arith.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr-arith.cfg
deleted file mode 100644
index 2aeab486..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr-arith.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_arith                        = add                                     # keep
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-1.cfg
deleted file mode 100644
index cde1e26b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-2.cfg
deleted file mode 100644
index 36e38d4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-2.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_before_ptr_star              = force
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-sp_before_byref                 = force
-sp_after_byref                  = remove
-
-macro-close NS_SWIFT_NAME
-macro-close VIEW_CONTROLLER_MACRO
-macro-close MACRO_FUNCTION
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-3.cfg
deleted file mode 100644
index cbfef35f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-3.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_ptr_star              = force
-sp_before_unnamed_ptr_star      = remove
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-sp_after_ptr_star_func          = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/qt-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/qt-1.cfg
deleted file mode 100644
index b15663f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/qt-1.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_before_ptr_star              = force
-sp_inside_fparens               = force
-indent_columns                  = 4
-indent_class                    = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_class_brace                  = force
-nl_after_semicolon              = true
-nl_before_access_spec           = 2
-nl_after_access_spec            = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/rdan.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/rdan.cfg
deleted file mode 100644
index b000b33d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/rdan.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-sp_arith                        = force
-sp_assign                       = force
-sp_enum_assign                  = force
-sp_bool                         = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_before_sparen                = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-indent_func_def_force_col1      = true
-indent_col1_comment             = true
-indent_bool_paren               = true
-indent_first_bool_expr          = true
-nl_func_var_def_blk             = 2
-nl_if_brace                     = force
-nl_while_brace                  = force
-nl_after_semicolon              = true
-nl_max                          = 3
-nl_after_func_proto_group       = 2
-nl_after_func_body              = 2
-pos_bool                        = lead_force
-pos_compare                     = lead
-code_width                      = 80
-ls_for_split_full               = true
-align_assign_span               = 1
-align_enum_equ_span             = 1
-cmt_width                       = 80
-cmt_star_cont                   = true
-mod_full_paren_if_bool          = true
-pp_indent                       = add
-pp_indent_at_level              = true
-pp_indent_count                 = 3
-pp_if_indent_code               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/reflow_fold_regex.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/reflow_fold_regex.txt
deleted file mode 100644
index 9a24626f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/reflow_fold_regex.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-end_of_prev_line_regex[0] = "(?:[\w,\]\)]|\.\.\.|;|\})$"
-beg_of_next_line_regex[0] = "^(?:[\w,\[\(]|\.\.\.|\{)"
-end_of_prev_line_regex[1] = "[^\.]\.$"
-beg_of_next_line_regex[1] = "^[A-Z]"
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-0.cfg
deleted file mode 100644
index a837d86f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-0.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# default region indent
-indent_columns                  = 4
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-1.cfg
deleted file mode 100644
index 48ae77f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-1.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# indented region code
-indent_columns                  = 4
-indent_class                    = true
-pp_region_indent_code           = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-2.cfg
deleted file mode 100644
index 5beed445..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# out-dented region preprocs
-indent_columns                  = 4
-indent_class                    = true
-pp_indent_region                = -4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-3.cfg
deleted file mode 100644
index 30a01c96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-3.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Abs column region preproc
-indent_columns                  = 4
-indent_class                    = true
-pp_indent_region                = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-1.cfg
deleted file mode 100644
index 996ca632..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-1.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_inside_paren                 = remove
-indent_columns                  = 4
-nl_return_expr                  = remove
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-2.cfg
deleted file mode 100644
index 87b361d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-nl_return_expr                  = remove
-mod_paren_on_return             = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-3.cfg
deleted file mode 100644
index 9caf1a7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-3.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-nl_return_expr                  = force
-mod_paren_on_return             = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-4.cfg
deleted file mode 100644
index 9a885287..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-4.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_inside_paren                 = remove
-indent_columns                  = 4
-nl_return_expr                  = force
-nl_before_return                = true
-mod_paren_on_return             = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sef.cfg
deleted file mode 100644
index ee467d79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sef.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-newlines                        = crlf
-output_tab_size                 = 4
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = add
-indent_columns                  = 4
-indent_func_class_param         = true
-indent_func_ctor_var_param      = true
-indent_func_param_double        = true
-nl_constr_init_args             = force
-nl_constr_colon                 = add
-nl_after_func_body              = 3
-pos_constr_comma                = trail
-pos_constr_colon                = lead
-code_width                      = 80
-ls_func_split_full              = true
-cmt_width                       = 80
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-f.cfg
deleted file mode 100644
index 46a15bac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_comma                  = force
-sp_inside_fparen                = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-r.cfg
deleted file mode 100644
index 8f6c0f6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-r.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_inside_paren                 = force
-sp_paren_paren                  = force
-sp_inside_sparen                = force
-sp_after_comma                  = force
-sp_before_ellipsis              = remove
-sp_inside_fparen                = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.3315874.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.3315874.cfg
deleted file mode 100644
index 68abb2a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.3315874.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_before_byref                 = force
-sp_after_byref                  = remove
-sp_after_operator_sym           = remove
-sp_func_proto_paren             = force
-sp_inside_fparen                = force
-nl_max                          = 2
-align_var_def_amp_style         = 1
-align_right_cmt_span            = 15
-align_func_proto_span           = 100
-align_func_proto_gap            = 5
-align_on_operator               = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf537.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf537.cfg
deleted file mode 100644
index 400c7e0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf537.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_assign                       = remove
-sp_before_ptr_star              = add
-indent_columns                  = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf538.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf538.cfg
deleted file mode 100644
index 8c6d149b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf538.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_arith                        = remove
-sp_before_semi                  = force
-indent_columns                  = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf574.cfg
deleted file mode 100644
index 8fc266f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf574.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-nl_start_of_file                = remove
-nl_end_of_file                  = force
-nl_end_of_file_min              = 2
-nl_fdef_brace                   = force
-eat_blanks_before_close_brace   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf607.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf607.cfg
deleted file mode 100644
index ac5c0069..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf607.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_getset_brace                 = force
-nl_property_brace               = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sim.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sim.cfg
deleted file mode 100644
index d92fba11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sim.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_after_ptr_star               = force
-sp_before_angle                 = remove
-sp_after_angle                  = remove
-indent_columns                  = 2
-indent_class                    = true
-nl_collapse_empty_body          = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_template_class               = force
-eat_blanks_after_open_brace     = true
-pos_class_colon                 = trail
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_imports.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_imports.cfg
deleted file mode 100644
index 655a684f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_imports.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-mod_sort_import                 = true
-mod_sort_using                  = true
-mod_sort_include                = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_using_categ.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_using_categ.cfg
deleted file mode 100644
index bf7f26e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_using_categ.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_sort_using                  = true
-include_category_0              = "System"
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-1.cfg
deleted file mode 100644
index cae5bbb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_angle                  = force
-sp_inside_fparen                = remove
-use_sp_after_angle_always       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-2.cfg
deleted file mode 100644
index c14d7901..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_angle                  = force
-sp_inside_fparen                = remove
-use_sp_after_angle_always       = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-3.cfg
deleted file mode 100644
index d0428a10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-3.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_angle                  = ignore
-sp_inside_fparen                = remove
-use_sp_after_angle_always       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-f.cfg
deleted file mode 100644
index d92ffb0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_cast                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-r.cfg
deleted file mode 100644
index 130602eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_cast                   = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast.cfg
deleted file mode 100644
index c16cc978..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_arith                        = force
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_after_comma                  = force
-sp_after_cast                   = force
-sp_inside_paren_cast            = remove
-sp_inside_fparen                = remove
-indent_columns                  = 3
-align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_comma-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_comma-a.cfg
deleted file mode 100644
index 3f67ae0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_comma-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_comma                  = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_constr_colon.cfg
deleted file mode 100644
index aa1189dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_constr_colon.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_after_constr_colon           = remove
-indent_columns                  = 2
-indent_class_colon              = true
-indent_constr_colon             = true
-indent_ctor_init                = 2
-nl_collapse_empty_body          = true
-nl_constr_init_args             = remove
-nl_func_def_args                = force
-pos_constr_comma                = trail_force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-f.cfg
deleted file mode 100644
index 077c5f94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-f.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_off_after_return     = true
-indent_off_after_return_new = false
-sp_after_decltype           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-r.cfg
deleted file mode 100644
index 64a318a0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_decltype               = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_for_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_for_colon.cfg
deleted file mode 100644
index 70b19e50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_for_colon.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_for_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_add.cfg
deleted file mode 100644
index 817ec7c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_add.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_inside_paren                 = remove
-sp_inside_square                = remove
-sp_after_oc_at_sel              = add
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_force.cfg
deleted file mode 100644
index b2a79b8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_force.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_inside_paren                 = remove
-sp_inside_square                = remove
-sp_after_oc_at_sel              = force
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_remove.cfg
deleted file mode 100644
index 98b6de42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_remove.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_inside_paren                 = remove
-sp_inside_square                = remove
-sp_after_oc_at_sel              = remove
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_add.cfg
deleted file mode 100644
index 56e22330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_add.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_ptr_star_paren               = remove
-sp_inside_tparen                = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_after_send_oc_colon          = force
-sp_after_oc_type                = force
-sp_after_oc_block_caret         = add
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_force.cfg
deleted file mode 100644
index 516271f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_force.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_ptr_star_paren               = remove
-sp_inside_tparen                = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_after_send_oc_colon          = force
-sp_after_oc_type                = force
-sp_after_oc_block_caret         = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_add.cfg
deleted file mode 100644
index b321b9aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_add.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_after_oc_colon               = force
-sp_after_oc_type                = force
-sp_after_oc_return_type         = add
-indent_columns                  = 4
-nl_fdef_brace                   = force
-align_oc_msg_spec_span          = 2
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_force.cfg
deleted file mode 100644
index fb8b9a1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_force.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_after_oc_colon               = force
-sp_after_oc_type                = force
-sp_after_oc_return_type         = force
-indent_columns                  = 4
-nl_fdef_brace                   = force
-align_oc_msg_spec_span          = 2
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_remove.cfg
deleted file mode 100644
index 1110a1eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_remove.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_after_oc_colon               = force
-sp_after_oc_type                = force
-sp_after_oc_return_type         = remove
-indent_columns                  = 4
-nl_fdef_brace                   = force
-align_oc_msg_spec_span          = 2
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_ptr_star_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_ptr_star_qualifier-f.cfg
deleted file mode 100644
index 7e26046f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_ptr_star_qualifier-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_ptr_star_qualifier     = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_send_oc_colon-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_send_oc_colon-f.cfg
deleted file mode 100644
index 2a54dd6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_send_oc_colon-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_send_oc_colon          = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_sparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_sparen.cfg
deleted file mode 100644
index c9b9afbf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_sparen.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# test for bug # 637
-sp_before_semi                  = force
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_throw_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_throw_remove.cfg
deleted file mode 100644
index 6b6bc0ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_throw_remove.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_inside_fparen                = remove
-sp_after_throw                  = remove
-sp_after_send_oc_colon          = force
-indent_columns                  = 3
-nl_finally_brace                = add
-nl_try_brace                    = add
-nl_catch_brace                  = add
-nl_fdef_brace                   = add
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-a.cfg
deleted file mode 100644
index da7a3edb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-f.cfg
deleted file mode 100644
index b7fa74f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_type     = force
-sp_after_decltype = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-i.cfg
deleted file mode 100644
index bd45658a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-r.cfg
deleted file mode 100644
index 78a64119..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_type     = remove
-sp_after_decltype = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-f.cfg
deleted file mode 100644
index d3b744b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type_brace_init_lst_open = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-r.cfg
deleted file mode 100644
index f370b82e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type_brace_init_lst_open = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_colon.cfg
deleted file mode 100644
index e247bbbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_colon.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add or remove space between '&lt;&gt;' and ':'
-sp_angle_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren-f.cfg
deleted file mode 100644
index 0b3d2f92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_angle_paren                  = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren_empty.cfg
deleted file mode 100644
index 1e3c592b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren_empty.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_angle_paren                  = force
-sp_angle_paren_empty            = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-a.cfg
deleted file mode 100644
index 4d60daa9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_arith = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-f.cfg
deleted file mode 100644
index 6cd2b6b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_arith                        = force
-
-# c/09605  don't add space before the minus sign in: frames = ((frames + 15) & -16); 
-# oc/50609 don't add space before the minus sign in: NSNumber *foo1 = @-1;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-f.cfg
deleted file mode 100644
index 8e6f0585..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-f.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# sp_arith_additive overwrites sp_arith
-sp_arith                        = remove
-sp_arith_additive               = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-r.cfg
deleted file mode 100644
index e01e86f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# sp_arith_additive overwrites sp_arith
-sp_arith                        = force
-sp_arith_additive               = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign-a.cfg
deleted file mode 100644
index 78ee09f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_assign                       = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign_default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign_default.cfg
deleted file mode 100644
index 29411834..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign_default.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_assign_default = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_balance_nested_parens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_balance_nested_parens.cfg
deleted file mode 100644
index 8e9dbb6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_balance_nested_parens.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_balance_nested_parens        = true
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref-r.cfg
deleted file mode 100644
index cf8228ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_byref                 = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref_func.cfg
deleted file mode 100644
index 6f5e2783..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref_func.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Places the byref as follows: "int &foo"
-indent_columns       = 3
-indent_class         = true
-
-# Add or remove space before a reference sign '&amp;', if followed by a func proto/def.
-sp_before_byref_func = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_comma-f.cfg
deleted file mode 100644
index dc25e313..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_comma-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_comma                 = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_constr_colon.cfg
deleted file mode 100644
index 9d0ec317..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_constr_colon.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-sp_before_constr_colon          = remove
-indent_columns                  = 2
-indent_class_colon              = true
-indent_constr_colon             = true
-indent_ctor_init                = 2
-nl_collapse_empty_body          = true
-nl_constr_init_args             = remove
-nl_func_def_args                = remove
-pos_constr_comma                = trail_force
-pos_constr_colon                = trail_force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-f.cfg
deleted file mode 100644
index 07527d5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_ellipsis              = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-r.cfg
deleted file mode 100644
index faec4b72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_ellipsis              = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_force.cfg
deleted file mode 100644
index 727fcf06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_force.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_ptr_star_paren               = remove
-sp_inside_tparen                = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_after_send_oc_colon          = force
-sp_after_oc_type                = force
-sp_after_oc_block_caret         = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_remove.cfg
deleted file mode 100644
index 37c6104a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_remove.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-sp_arith                        = force
-sp_before_ptr_star              = force
-sp_after_ptr_star               = remove
-sp_ptr_star_paren               = remove
-sp_inside_tparen                = remove
-sp_after_oc_scope               = remove
-sp_after_oc_colon               = force
-sp_after_send_oc_colon          = force
-sp_after_oc_type                = force
-sp_before_oc_block_caret        = remove
-sp_after_oc_block_caret         = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
-nl_if_brace                     = add
-nl_for_brace                    = add
-nl_while_brace                  = add
-nl_fdef_brace                   = add
-nl_after_semicolon              = true
-nl_after_brace_open             = true
-mod_full_brace_for              = add
-mod_full_brace_if               = add
-mod_full_brace_while            = add
-
-# Add or remove newline between method declaration and '{'
-nl_oc_mdef_brace                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_add.cfg
deleted file mode 100644
index 3374e228..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_add.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_oc_proto_list         = add
-sp_oc_classname_paren           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_force.cfg
deleted file mode 100644
index 5be78fac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_force.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_oc_proto_list         = force
-sp_oc_classname_paren           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_remove.cfg
deleted file mode 100644
index 9f93f4a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_remove.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_oc_proto_list         = remove
-sp_oc_classname_paren           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-f.cfg
deleted file mode 100644
index 7653ec0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_ptr_star              = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-r.cfg
deleted file mode 100644
index 55f99c73..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# https://github.com/uncrustify/uncrustify/issues/1112#issuecomment-295247085
-#    CT_STAR -> CT_PTR_TYPE in: CT_PRIVATE_COLON CT_DC_MEMBER CT_WORD CT_STAR
-sp_before_ptr_star              = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-a.cfg
deleted file mode 100644
index b2391821..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-a.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_tr_emb_cmt            = add
-sp_num_before_tr_emb_cmt        = 2
-indent_columns                  = 2
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-f.cfg
deleted file mode 100644
index c0e72b53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-f.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_tr_emb_cmt            = force
-sp_num_before_tr_emb_cmt        = 2
-indent_columns                  = 2
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-f.cfg
deleted file mode 100644
index 3dda0281..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_type_brace_init_lst_close = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-r.cfg
deleted file mode 100644
index 5fb0bf36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_type_brace_init_lst_close = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_between_new_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_between_new_paren.cfg
deleted file mode 100644
index 0a338bd2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_between_new_paren.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_new                    = force
-sp_between_new_paren            = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument.cfg
deleted file mode 100644
index 60c651fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_after_send_oc_colon          = force
-sp_before_oc_block_caret        = remove
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-indent_oc_block_msg_from_keyword = true
-nl_if_brace                     = add
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument2.cfg
deleted file mode 100644
index 8f297d7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument2.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_send_oc_colon          = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-indent_oc_block_msg_from_colon  = true
-nl_if_brace                     = add
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument3.cfg
deleted file mode 100644
index 17059e47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument3.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_send_oc_colon          = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-indent_oc_block_msg_from_brace  = true
-nl_if_brace                     = add
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument4.cfg
deleted file mode 100644
index 8caf60bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument4.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_send_oc_colon          = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block                 = true
-indent_oc_block_msg_from_caret  = true
-nl_if_brace                     = add
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument5.cfg
deleted file mode 100644
index 42e8c380..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument5.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_after_send_oc_colon          = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_oc_block_msg_xcode_style = true
-nl_oc_msg_args                  = true
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-align_oc_msg_colon_span         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-f.cfg
deleted file mode 100644
index 84c0238e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_bool                         = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-r.cfg
deleted file mode 100644
index 0bce4fb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_bool                         = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-f.cfg
deleted file mode 100644
index 465ee3cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_brace_brace                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-r.cfg
deleted file mode 100644
index 73e4d429..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_brace_brace                  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_catch.cfg
deleted file mode 100644
index 7ee0209d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_catch.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_brace_catch = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_catch_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_catch_brace.cfg
deleted file mode 100644
index d2da6d91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_catch_brace.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_catch_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt.cfg
deleted file mode 100644
index fb7f6ef1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_cmt_cpp_start                = add
-sp_cmt_cpp_doxygen              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-f.cfg
deleted file mode 100644
index 1c626401..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_cmt_cpp_start                = remove
-sp_cmt_cpp_region               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-r.cfg
deleted file mode 100644
index 67a0ff11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_cmt_cpp_start                = force
-sp_cmt_cpp_region               = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-a.cfg
deleted file mode 100644
index d7e6adf1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cmt_cpp_start                = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-r.cfg
deleted file mode 100644
index 13ceebfc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cmt_cpp_start                = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start_force.cfg
deleted file mode 100644
index e87c9b0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start_force.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_cmt_cpp_start                = force
-cmt_width                       = 40
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cond_colon.cfg
deleted file mode 100644
index d39afa14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cond_colon.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_cond_colon_before            = remove
-sp_cond_colon_after             = add
-sp_cond_question_before         = remove
-sp_cond_question_after          = force
-indent_columns                  = 3
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-f.cfg
deleted file mode 100644
index c2af4d15..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-f.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_cparen_oparen                = force
-indent_with_tabs                = 0
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-r.cfg
deleted file mode 100644
index f584c02d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_cparen_oparen                = remove
-indent_with_tabs                = 0
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-f.cfg
deleted file mode 100644
index f45270e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_square_paren      = force
-sp_cpp_lambda_square_brace      = force
-sp_cpp_lambda_fparen            = force
-nl_cpp_lambda_leave_one_liners  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-r.cfg
deleted file mode 100644
index c64da54c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_square_paren      = remove
-sp_cpp_lambda_square_brace      = remove
-sp_cpp_lambda_fparen            = remove
-nl_cpp_lambda_leave_one_liners  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-f.cfg
deleted file mode 100644
index 8dc95ae1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_lambda_paren_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-r.cfg
deleted file mode 100644
index 8875383e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_lambda_paren_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-f.cfg
deleted file mode 100644
index baea51dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_lambda_square_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-r.cfg
deleted file mode 100644
index 703f0bcc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_lambda_square_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-f.cfg
deleted file mode 100644
index 93609c5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_lambda_square_paren = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-r.cfg
deleted file mode 100644
index e1e00b21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_cpp_lambda_square_paren = remove
-sp_type_brace_init_lst     = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_dc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_dc.cfg
deleted file mode 100644
index c9b14cc2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_dc.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_dc                    = remove
-sp_after_dc                     = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-f.cfg
deleted file mode 100644
index 3636cd02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_decltype_paren               = force
-sp_after_type                   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-r.cfg
deleted file mode 100644
index b11add96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_decltype_paren               = remove
-sp_after_type                   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon-r.cfg
deleted file mode 100644
index 87f44474..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_enum_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon.cfg
deleted file mode 100644
index 27716eca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_enum_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_paren-r.cfg
deleted file mode 100644
index f155e201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_paren-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_enum_paren                   = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_empty.cfg
deleted file mode 100644
index 0848c080..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_empty.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_before_byref                 = remove
-sp_after_comma                  = force
-sp_func_call_paren              = force
-sp_func_call_paren_empty        = remove
-sp_return_paren                 = remove
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-nl_fdef_brace                   = add
-align_func_params               = true
-align_var_def_star_style        = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_paren.cfg
deleted file mode 100644
index c5f8927b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_paren.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-macro-open         BEGIN_MESSAGE_MAP
-macro-close        END_MESSAGE_MAP
-sp_after_comma     = force
-indent_columns     = 3
-sp_func_call_paren = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_user_inside_fparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_user_inside_fparen.cfg
deleted file mode 100644
index e5650760..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_user_inside_fparen.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Add or remove space inside user function '(' and ')'
-# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
-sp_func_call_user_inside_fparen = force
-
-set FUNC_CALL_USER USER
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_class_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_class_empty.cfg
deleted file mode 100644
index 252b598b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_class_empty.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_before_byref                 = remove
-sp_after_comma                  = force
-sp_func_call_paren              = force
-sp_func_call_paren_empty        = remove
-sp_func_class_paren_empty       = force
-sp_return_paren                 = remove
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-nl_fdef_brace                   = add
-align_func_params               = true
-align_var_def_star_style        = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_def_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_def_empty.cfg
deleted file mode 100644
index 688918b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_def_empty.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_before_byref                 = remove
-sp_after_comma                  = force
-sp_func_def_paren_empty         = force
-sp_func_call_paren              = force
-sp_func_call_paren_empty        = remove
-sp_return_paren                 = remove
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-nl_fdef_brace                   = add
-align_func_params               = true
-align_var_def_star_style        = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_proto_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_proto_empty.cfg
deleted file mode 100644
index b0601328..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_proto_empty.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_before_byref                 = remove
-sp_after_comma                  = force
-sp_func_proto_paren_empty       = force
-sp_func_call_paren              = force
-sp_func_call_paren_empty        = remove
-sp_return_paren                 = remove
-indent_columns                  = 3
-nl_func_var_def_blk             = 1
-nl_fcall_brace                  = add
-nl_fdef_brace                   = add
-align_func_params               = true
-align_var_def_star_style        = 1
-mod_paren_on_return             = add
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_braces_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_braces_empty-r.cfg
deleted file mode 100644
index f7b1b239..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_braces_empty-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_braces_empty          = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-f.cfg
deleted file mode 100644
index 2b159a36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_fparen                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-r.cfg
deleted file mode 100644
index 98f867f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_fparen                = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparens-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparens-f.cfg
deleted file mode 100644
index b56756d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparens-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_fparens               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-f.cfg
deleted file mode 100644
index 63de9668..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_type_brace_init_lst   = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-r.cfg
deleted file mode 100644
index b0881eaf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_type_brace_init_lst   = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_boxed.cfg
deleted file mode 100644
index 73939de1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_boxed.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_oc_dict_colon          = add      # ignore/add/remove/force
-sp_before_oc_dict_colon         = remove   # ignore/add/remove/force
-sp_inside_square_oc_array       = add      # ignore/add/remove/force
-sp_inside_braces_oc_dict        = add      # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_catch.cfg
deleted file mode 100644
index 7367541a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_catch.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_oc_catch_paren               = force
-sp_catch_paren                  = add      # ignore/add/remove/force
-sp_oc_catch_brace               = add      # ignore/add/remove/force
-sp_catch_brace                  = force    # ignore/add/remove/force
-sp_oc_brace_catch               = add      # ignore/add/remove/force
-sp_brace_catch                  = force    # ignore/add/remove/force
-nl_oc_catch_brace               = remove   # ignore/add/remove/force
-nl_catch_brace                  = remove   # ignore/add/remove/force
-nl_oc_brace_catch               = add      # ignore/add/remove/force
-nl_brace_catch                  = remove   # ignore/add/remove/force
-sp_finally_brace                = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_classname_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_classname_paren-r.cfg
deleted file mode 100644
index ba92279e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_classname_paren-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_angle       = remove
-sp_angle_colon        = remove
-sp_after_class_colon  = remove
-sp_oc_classname_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_synchronized.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_synchronized.cfg
deleted file mode 100644
index 5056f70f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_synchronized.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_oc_synchronized        = force    # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_comma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_comma.cfg
deleted file mode 100644
index f54ca437..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_comma.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Add or remove space between an open paren and comma: '(,' vs. '( ,'. Default=Force.
-sp_paren_comma = remove
-
-# should not be used
-sp_before_comma = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-f.cfg
deleted file mode 100644
index a9662d76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_ellipsis               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-r.cfg
deleted file mode 100644
index 4d547370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_ellipsis               = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_noexcept-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_noexcept-f.cfg
deleted file mode 100644
index 35e76a33..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_noexcept-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_noexcept = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_qualifier-f.cfg
deleted file mode 100644
index f91f2aee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_qualifier-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_qualifier = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-f.cfg
deleted file mode 100644
index bdea1673..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_brace                 = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-r.cfg
deleted file mode 100644
index a2541527..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_brace                 = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-f.cfg
deleted file mode 100644
index 11637ca1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_paren                 = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-r.cfg
deleted file mode 100644
index 8fbef0b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_paren                 = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-f.cfg
deleted file mode 100644
index 743b18f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_sizeof_ellipsis              = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-r.cfg
deleted file mode 100644
index e54a000c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_sizeof_ellipsis              = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-f.cfg
deleted file mode 100644
index 43cffee2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_sizeof_ellipsis_paren        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-r.cfg
deleted file mode 100644
index ae307eac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_sizeof_ellipsis_paren        = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_skip_vbrace_tokens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_skip_vbrace_tokens.cfg
deleted file mode 100644
index d5ce739d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_skip_vbrace_tokens.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# test for issue #546
-input_tab_size                  = 4
-sp_skip_vbrace_tokens           = true
-indent_columns                  = 4
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_this_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_this_paren.cfg
deleted file mode 100644
index fc80bb28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_this_paren.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_super_paren                  = force
-sp_this_paren                   = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-f.cfg
deleted file mode 100644
index 611cd750..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_throw_paren                  = force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-r.cfg
deleted file mode 100644
index 893c8782..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_throw_paren                  = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-f.cfg
deleted file mode 100644
index 9e1fe074..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_trailing_return = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-r.cfg
deleted file mode 100644
index b26929ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_trailing_return = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-f.cfg
deleted file mode 100644
index 2f0d5258..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_type_brace_init_lst = force
-sp_word_brace_init_lst = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-r.cfg
deleted file mode 100644
index 199dc1eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_type_brace_init_lst= remove
-sp_word_brace_init_lst= remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-f.cfg
deleted file mode 100644
index d16265f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_type_ellipsis                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-r.cfg
deleted file mode 100644
index a68216c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_type_ellipsis                = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-1.cfg
deleted file mode 100644
index 010876e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_byref_func                       = add
-sp_after_ptr_star_func                    = add
-sp_type_func                              = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-2.cfg
deleted file mode 100644
index de86218b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_after_byref                            = add
-sp_after_ptr_star                         = add
-sp_type_func                              = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-f.cfg
deleted file mode 100644
index bf878d19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_type_func                              = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-r.cfg
deleted file mode 100644
index aec00124..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_type_func                              = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_force.cfg
deleted file mode 100644
index d9c53345..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_force.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_with_tabs       = 0
-sp_word_brace_init_lst = force
-sp_word_brace_ns       = remove
-sp_type_brace_init_lst = remove
-sp_inside_braces       = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_remove.cfg
deleted file mode 100644
index 3fd1fa26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_remove.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_with_tabs       = 0
-sp_word_brace_init_lst = remove
-sp_word_brace_ns       = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_class-t_columns-4.cfg
deleted file mode 100644
index a454237c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_class-t_columns-4.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-3.cfg
deleted file mode 100644
index ec130371..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-3.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-4.cfg
deleted file mode 100644
index f05c685f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze-paren-close-Option.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze-paren-close-Option.cfg
deleted file mode 100644
index 9d4a4f70..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze-paren-close-Option.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_func_call_param          = true
-indent_paren_close              = 2
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
-nl_squeeze_paren_close          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef.cfg
deleted file mode 100644
index fa3f980c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_before_return                = true
-nl_after_return                 = true
-nl_before_cpp_comment           = 2
-nl_squeeze_ifdef                = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef_top.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef_top.cfg
deleted file mode 100644
index 6b45f49a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef_top.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-nl_before_cpp_comment           = 2
-nl_after_func_proto             = 2
-nl_after_func_proto_group       = 2
-nl_squeeze_ifdef                = true
-nl_squeeze_ifdef_top_level      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-0.cfg
deleted file mode 100644
index 6798b186..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-0.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Places the byref as follows: "int &foo"
-sp_before_ptr_star              = remove
-sp_after_ptr_star               = force
-sp_before_byref                 = remove
-indent_columns                  = 3
-align_var_def_span              = 2
-align_var_struct_span           = 2
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_typedef_func              = 1
-align_func_proto_span           = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-1.cfg
deleted file mode 100644
index 6c9f5806..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-1.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Places the byref as follows: "int &foo"
-sp_after_ptr_star               = remove
-sp_after_byref                  = remove
-indent_columns                  = 3
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_var_def_amp_style         = 1
-align_var_struct_span           = 2
-align_typedef_gap               = 3
-align_typedef_span              = 2
-align_typedef_star_style        = 1
-align_typedef_amp_style         = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-2.cfg
deleted file mode 100644
index dc1f45fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-2.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Places the byref as follows: "int &foo"
-sp_after_ptr_star               = remove
-sp_after_byref                  = remove
-indent_columns                  = 3
-align_var_def_span              = 2
-align_var_def_star_style        = 2
-align_var_def_amp_style         = 2
-align_var_struct_span           = 2
-align_typedef_gap               = 3
-align_typedef_span              = 2
-align_typedef_star_style        = 2
-align_typedef_amp_style         = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/string_replace_tab_chars-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/string_replace_tab_chars-t.cfg
deleted file mode 100644
index 9e36729d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/string_replace_tab_chars-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-string_replace_tab_chars = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tab-0-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tab-0-11.cfg
deleted file mode 100644
index 96f745a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tab-0-11.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 11
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tcf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tcf.cfg
deleted file mode 100644
index dd7fa193..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tcf.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_finally_brace                = force
-nl_after_try_catch_finally      = 3
-nl_around_cs_property           = 2
-nl_between_get_set              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_angles.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_angles.cfg
deleted file mode 100644
index 14680e53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_angles.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_angle_paren_empty            = remove
-sp_angle_shift                  = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-force.cfg
deleted file mode 100644
index d36e014a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-force.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Forces a newline between template '>' and class
-tok_split_gte                   = true
-sp_arith                        = force
-sp_compare                      = remove  # just to show a difference
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_template_angle               = remove
-sp_before_angle                 = force
-sp_inside_angle                 = force
-sp_inside_angle_empty           = force
-sp_after_angle                  = force
-sp_angle_paren                  = force
-sp_angle_paren_empty            = force
-sp_after_operator               = force
-sp_inside_braces_struct         = force
-sp_inside_braces                = force
-sp_func_proto_paren             = remove
-indent_columns                  = 3
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-remove.cfg
deleted file mode 100644
index e950e113..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-remove.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-# remove spaces around template defs
-tok_split_gte                   = true
-sp_arith                        = force
-sp_compare                      = force
-sp_before_byref                 = remove
-sp_after_byref                  = force
-sp_before_angle                 = remove
-sp_inside_angle                 = remove
-sp_inside_angle_empty           = remove
-sp_after_angle                  = remove
-sp_angle_paren_empty            = remove
-sp_inside_braces_struct         = force
-sp_inside_braces                = force
-sp_func_proto_paren             = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ternary_short.cfg
deleted file mode 100644
index 55e708cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ternary_short.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cond_colon_after     = add
-sp_cond_question_after  = add
-sp_cond_question_before = add
-sp_cond_ternary_short   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt.cfg
deleted file mode 100644
index 08ef987e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt.cfg
+++ /dev/null
@@ -1 +0,0 @@
-disable_processing_cmt          = " **ABC**"
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt2.cfg
deleted file mode 100644
index 0b9be532..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-enable_processing_cmt           = " ??DEF??"
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt3.cfg
deleted file mode 100644
index d7f1f675..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt3.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-cmt_indent_multi = true
-cmt_reflow_mode = 2
-cmt_sp_after_star_cont = 1
-cmt_star_cont=true
-cmt_width = 70
-disable_processing_cmt="\\\\verbatim|[ \t]*(?:\\*INDENT-OFF\\*|\\*\\*ABC\\*\\*)"
-enable_processing_cmt="\\\\endverbatim|[ \t]*(?:\\*INDENT-ON\\*|\\?\\?DEF\\?\\?)"
-processing_cmt_as_regex=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt4.cfg
deleted file mode 100644
index ccd7bb03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt4.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-cmt_sp_after_star_cont = 1
-cmt_width = 70
-disable_processing_cmt="\\\\verbatim|[ \t]*(?:\\*INDENT-OFF\\*|\\*\\*ABC\\*\\*)"
-enable_processing_cmt="\\\\endverbatim|[ \t]*(?:\\*INDENT-ON\\*|\\?\\?DEF\\?\\?)"
-processing_cmt_as_regex=true
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/type_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/type_wrap.cfg
deleted file mode 100644
index eeea5786..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/type_wrap.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_assign                       = force
-sp_after_ptr_star               = remove
-set TYPE_WRAP                     STACK_OF
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/var_def_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/var_def_gap.cfg
deleted file mode 100644
index 3d77d117..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/var_def_gap.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-sp_after_ptr_star               = remove
-sp_after_byref                  = force
-align_var_def_span              = 3
-align_var_def_star_style        = 2
-align_var_def_amp_style         = 2
-align_var_def_gap               = 5
-align_assign_span               = 1
-align_typedef_span              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/verbatim_strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/verbatim_strings.cfg
deleted file mode 100644
index 65e1756d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/verbatim_strings.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-string_replace_tab_chars        = true
-indent_columns                  = 4
-indent_class                    = true
-
-# needed to suppress warnings about a
-# 'Detected non-replaceable tab char in literal string' in
-# input/cs/verbatim_strings.cs:4
-warn_level_tabs_found_in_verbatim_string_literals=3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/wessex.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/wessex.cfg
deleted file mode 100644
index 77fc3303..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/wessex.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_namespace                = true
-indent_switch_case              = 4
-nl_max                          = 2
-macro-open                        BEGIN_MESSAGE_MAP
-macro-close                       END_MESSAGE_MAP
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.cfg
deleted file mode 100644
index 6c18a158..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# width stuff
-sp_arith                        = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_if_brace                     = remove
-code_width                      = 60
-ls_for_split_full               = true
-cmt_width                       = 60
-cmt_c_group                     = true
-cmt_c_nl_end                    = true
-cmt_cpp_group                   = true
-cmt_cpp_to_c                    = true
-cmt_star_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.rerun.cfg
deleted file mode 100644
index c74e4020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.rerun.cfg
+++ /dev/null
@@ -1 +0,0 @@
-include "width-2.cfg"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-3.cfg
deleted file mode 100644
index 843f6669..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-3.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# width stuff
-sp_arith                        = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_if_brace                     = remove
-code_width                      = 80
-ls_func_split_full              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width.cfg
deleted file mode 100644
index 10cb731c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# width stuff
-sp_arith                        = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_if_brace                     = remove
-code_width                      = 60
-ls_func_split_full              = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/xml-str.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/xml-str.cfg
deleted file mode 100644
index bd667ab4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/xml-str.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_assign                       = force
-indent_columns                  = 3
-indent_align_string             = true
-indent_xml_string               = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cpp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cpp.test
deleted file mode 100644
index 84bbaa0f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cpp.test
+++ /dev/null
@@ -1,961 +0,0 @@
-#
-# Test cases specifically for the C++ language.
-#
-# Range: 30000 - 39999
-# test.name  config.file  input.file
-
-# there are additional tests inside imported.test.
-
-02102  clark.cfg                            cpp/indent-c.cpp
-02103  clark.cfg                            cpp/output.cpp
-
-30000  ben_001.cfg                          cpp/cout.cpp
-30001  sp_angle_colon.cfg                   cpp/alt_tokens.cpp
-30002  ben_003.cfg                          cpp/constructor.cpp
-30003  ben_004.cfg                          cpp/strings.cpp
-
-30010  ben_005.cfg                          cpp/class.h
-30011  ben_006.cfg                          cpp/misc.cpp
-30012  avalon2.cfg                          cpp/misc2.cpp
-30013  sim.cfg                              cpp/sim.h
-30014  indent_columns-3.cfg                 cpp/ctor-var.cpp
-30015  ben_008.cfg                          cpp/exception.cpp
-30016  custom-open.cfg                      cpp/custom-open.cpp
-30017  custom-open2.cfg                     cpp/custom-open.cpp
-30018  ben_009.cfg                          cpp/class-addr.h
-30019  ben_010.cfg                          cpp/wacky-template.cpp
-
-30020  ben_011.cfg                          cpp/bool.cpp
-30021  ben_012.cfg                          cpp/byref.cpp
-30022  ben_013.cfg                          cpp/extern_c.h
-30023  ben_014.cfg                          cpp/templates.cpp
-30024  class-nl_func-add.cfg                cpp/class-init.cpp
-30025  class-nl_func-del.cfg                cpp/class-init.cpp
-30026  byref-left.cfg                       cpp/byref.cpp
-30027  byref-right.cfg                      cpp/byref.cpp
-30028  byref-center.cfg                     cpp/byref.cpp
-30029  ben_015.cfg                          cpp/init_align.h
-
-30030  avalon.cfg                           cpp/Timestamp.h
-30031  avalon.cfg                           cpp/operator.cpp
-30032  op-space-force.cfg                   cpp/operator.cpp
-30033  op-space-remove.cfg                  cpp/operator.cpp
-30034  op-space-force.cfg                   cpp/operator_proto.cpp
-30035  op-space-remove.cfg                  cpp/operator_proto.cpp
-30036  op-space-remove-align-1.cfg          cpp/operator.cpp
-30037  op-space-remove-align-1.cfg          cpp/operator_proto.cpp
-30038  op-space-remove-align-2.cfg          cpp/operator.cpp
-30039  op-space-remove-align-2.cfg          cpp/operator_proto.cpp
-
-30040  nl_class-r.cfg                       cpp/nl-class.h
-30041  nl_class-a.cfg                       cpp/nl-class.h
-30042  Issue_2020.cfg                       cpp/Issue_2020.cpp
-30043  nl_func_call_empty-r.cfg             cpp/nl_func_call_empty.cpp
-30044  nl_func_call_paren_empty-r.cfg       cpp/nl_func_call_paren_empty.cpp
-30045  nl_func_decl_1.cfg                   cpp/nl_func_decl.cpp
-30046  nl_func_decl_2.cfg                   cpp/nl_func_decl.cpp
-30047  nl_func_paren_empty.cfg              cpp/nl_func_paren_empty.cpp
-30048  nl_func_def_paren_empty-r.cfg        cpp/nl_func_def_paren_empty.cpp
-30049  nl_func_call_paren-f.cfg             cpp/nl_func_call_paren.cpp
-
-30050  nl_namespace-r.cfg                   cpp/nl-namespace.h
-30051  nl_namespace-a.cfg                   cpp/nl-namespace.h
-30052  nl_try-a.cfg                         cpp/try-catch-nl.cpp
-30053  sp_catch_brace.cfg                   cpp/exception.cpp
-30054  Issue_2091.cfg                       cpp/Issue_2091.cpp
-30055  nl_after_func_body.cfg               cpp/nl_func.cpp
-30056  nl_after_func_body-2.cfg             cpp/nl_func.cpp
-30057  nl_inside_namespace_1.cfg            cpp/nl_inside_namespace.cpp
-30058  nl_inside_namespace_2.cfg            cpp/nl_inside_namespace.cpp
-30059  Issue_2186.cfg                       cpp/Issue_2186.cpp
-
-30060  Issue_1734.cfg                       cpp/Issue_1734.cpp
-
-# Class colon positioning
-30061  class-colon-pos-eol.cfg              cpp/class-init.cpp
-30062  class-colon-pos-sol.cfg              cpp/class-init.cpp
-30063  class-colon-pos-eol-add.cfg          cpp/class-init.cpp
-30064  class-colon-pos-sol-add.cfg          cpp/class-init.cpp
-30065  class-colon-pos-sol.cfg              cpp/Example.h
-30066  class-on-colon-indent.cfg            cpp/class-init.cpp
-30067  nl_func_class_scope-a.cfg            cpp/nl_func_type_name.cpp
-30068  nl_func_class_scope-a.cfg            cpp/nl_func_scope_name.cpp
-30069  nl_func_class_scope-a.cfg            cpp/class-implementation.cpp
-
-30070  nl_func_scope_name-a.cfg             cpp/nl_func_scope_name.cpp
-30071  lineEndings-to-Win.cfg               cpp/lineEndings-Mac.cpp
-30072  lineEndings-to-Unix.cfg              cpp/lineEndings-Win.cpp
-30073  lineEndings-to-Mac.cfg               cpp/lineEndings-Unix.cpp
-30074  empty.cfg                            cpp/bom.cpp
-30075  empty.cfg                            cpp/goto.cpp
-30076  Issue_2594.cfg                       cpp/Issue_2594.cpp
-30077  Issue_2596.cfg                       cpp/Issue_2596.cpp
-30078  empty.cfg                            cpp/Issue_2672-a.cpp
-30079  empty.cfg                            cpp/Issue_2672-b.cpp
-
-30080  nl_brace_brace-a.cfg                 cpp/nl_brace_brace.cpp
-30081  Issue_2383.cfg                       cpp/Issue_2383.cpp
-30082  Issue_931.cfg                        cpp/Issue_931.cpp
-30083  Issue_995-do.cfg                     cpp/Issue_995-do.cpp
-30084  Issue_1184.cfg                       cpp/Issue_1184.cpp
-30085  nSolve.cfg                           cpp/align_class.cpp
-30086  align_class-constr.cfg               cpp/align_class-constr.cpp
-30087  Issue_1511.cfg                       cpp/Issue_1511.cpp
-30088  Issue_2561.cfg                       cpp/Issue_2561.cpp
-30089  Issue_2281.cfg                       cpp/Issue_2281.cpp
-
-30090  bug_488.cfg                          cpp/bug_488.cpp
-30091  bug_472.cfg                          cpp/bug_472.cpp
-30092  ben_016.cfg                          cpp/bug_481.cpp
-30093  sp_after_cast.cfg                    cpp/bug_484.cpp
-30094  align-1.cfg                          cpp/bug_495.cpp
-30095  ben_017.cfg                          cpp/bug_485.cpp
-30096  bug_1854.cfg                         cpp/bug_1854.cpp
-30097  align-1.cfg                          cpp/issue_1946.cpp
-30098  Issue_2692.cfg                       cpp/Issue_2692.cpp
-30099  sp_arith-f.cfg                       cpp/bug_1127.cpp
-
-30100  nl_template-f.cfg                    cpp/templates.cpp
-30101  nl_template-r.cfg                    cpp/templates.cpp
-30102  template_sp-force.cfg                cpp/templates.cpp
-30103  template_sp-remove.cfg               cpp/templates.cpp
-30104  avalon3.cfg                          cpp/templ_class.h
-30105  avalon4.cfg                          cpp/av.h
-30106  nl_template-f.cfg                    cpp/templates2.cpp
-30107  nl_template-r.cfg                    cpp/templates2.cpp
-30108  nl_template-r.cfg                    cpp/templates3.cpp
-30109  empty.cfg                            cpp/templates4.cpp
-
-30110  class-nl_func-add2.cfg               cpp/class-init.cpp
-30111  indent_columns-4.cfg                 cpp/bug_1346.h
-30112  bug_1432.cfg                         cpp/bug_1432.cpp
-30113  bug_1452.cfg                         cpp/bug_1452.cpp
-30114  template_sp-remove.cfg               cpp/bug_1462.cpp
-30115  empty.cfg                            cpp/Issue_1704.cpp
-30116  Issue_1052.cfg                       cpp/Issue_1052.cpp
-30117  Issue_2343.cfg                       cpp/Issue_2343.cpp
-30118  Issue_2758.cfg                       cpp/Issue_2758.cpp
-30119  Issue_2879.cfg                       cpp/Issue_2879.cpp
-
-30120  template_sp-force.cfg                cpp/sp_after_angle.cpp
-30121  template_sp-remove.cfg               cpp/sp_after_angle.cpp
-30122  sp_inside_fparen-f.cfg               cpp/sp_after_angle.cpp
-30123  sp_inside_fparen-r.cfg               cpp/sp_after_angle.cpp
-30124  sp_after_angle-1.cfg                 cpp/sp_after_angle.cpp
-30125  sp_after_angle-2.cfg                 cpp/sp_after_angle.cpp
-30126  sp_after_angle-3.cfg                 cpp/sp_after_angle.cpp
-30127  empty.cfg                            cpp/Issue_2565.cpp
-30128  Issue_2873.cfg                       cpp/Issue_2873.cpp
-30129  Issue_2890.cfg                       cpp/Issue_2890.cpp
-
-30130  brace-allman.cfg                     cpp/if-constexpr.cpp
-30131  Issue_3010.cfg                       cpp/Issue_3010.cpp
-30132  sp_brace_catch.cfg                   cpp/sp_brace_catch.cpp
-
-30200  bug_1862.cfg                         cpp/bug_1862.cpp
-30201  cmt_indent-1.cfg                     cpp/cmt_indent.cpp
-30202  cmt_indent-2.cfg                     cpp/cmt_indent.cpp
-30203  cmt_indent-3.cfg                     cpp/cmt_indent.cpp
-30204  indent_columns-4.cfg                 cpp/comment-align.cpp
-30205  indent_columns-4.cfg                 cpp/cmt_right.cpp
-30206  empty.cfg                            cpp/cmt_backslash_eol.cpp
-30207  indent_class-t_columns-4.cfg         cpp/cmt_indent_pp.h
-30208  bug_1108.cfg                         cpp/bug_1108.cpp
-30209  empty.cfg                            cpp/bug_1134.cpp
-
-30210  empty.cfg                            cpp/bug_1338.cpp
-30211  space_indent_class-t_columns-4.cfg   cpp/indent_comment_align_thresh.cpp
-30212  indent_comment_align_thresh_2.cfg    cpp/indent_comment_align_thresh.cpp
-30213  align_right_comment.cfg              cpp/align_right_comment.cpp
-30214  issue_1887.cfg                       cpp/align_across_braces.cpp
-30215  empty.cfg                            cpp/Issue_2099.cpp
-30216  Issue_2302.cfg                       cpp/Issue_2302.cpp
-30217  empty.cfg                            cpp/2138.cpp
-30218  sp_trailing_return-f.cfg             cpp/trailing_return.cpp
-30219  sp_trailing_return-r.cfg             cpp/trailing_return.cpp
-
-30220  bug_1340.cfg                         cpp/bug_1340.cpp
-30221  Issue_2914.cfg                       cpp/Issue_2914.cpp
-30222  sp_assign_default.cfg                cpp/trailing_return.cpp
-30223  sp_enum_colon.cfg                    cpp/sp_enum_colon.cpp
-30224  sp_enum_colon-r.cfg                  cpp/sp_enum_colon.cpp
-
-30230  sp_type_func-r.cfg                   cpp/sp_type_func.cpp
-30231  sp_type_func-f.cfg                   cpp/sp_type_func.cpp
-30232  sp_type_func-1.cfg                   cpp/sp_type_func.cpp
-30233  sp_type_func-2.cfg                   cpp/sp_type_func.cpp
-30234  functype_param-r.cfg                 cpp/functype_param.cpp
-30235  functype_param-f.cfg                 cpp/functype_param.cpp
-
-30240  align_func_params-t.cfg              cpp/align_func_params.cpp
-30241  align_func_params_span-1.cfg         cpp/align_func_params.cpp
-30242  align_func_params_gap.cfg            cpp/align_func_params.cpp
-30243  align_func_params_thresh_1.cfg       cpp/align_func_params.cpp
-30244  align_func_params_thresh_2.cfg       cpp/align_func_params.cpp
-30245  align_func_params_thresh_3.cfg       cpp/align_func_params.cpp
-30246  align_func_params_thresh_4.cfg       cpp/align_func_params.cpp
-30247  empty.cfg                            cpp/Issue_2332.cpp
-30248  Issue_2831.cfg                       cpp/Issue_2831.cpp
-30249  align-330.cfg                        cpp/align-330.cpp
-
-30250  align_fcall.cfg                      cpp/align_fcall.cpp
-30251  align_fcall-2.cfg                    cpp/align_fcall.cpp
-30253  empty.cfg                            cpp/align_left_shift.cpp
-30254  empty.cfg                            cpp/align_left_shift2.cpp
-30255  ben_018.cfg                          cpp/align_constr.cpp
-30256  empty.cfg                            cpp/func_call.cpp
-30257  indent_columns-4.cfg                 cpp/func_call_chain.cpp
-30258  indent_columns-3.cfg                 cpp/casts.cpp
-30259  sp_after_constr_colon.cfg            cpp/sp_after_constr_colon.cpp
-
-30260  var_def_gap.cfg                      cpp/var_def_gap.cpp
-30261  align_var_def_thresh_1.cfg           cpp/align_var_def_thresh.cpp
-30262  align_var_def_thresh_2.cfg           cpp/align_var_def_thresh.cpp
-30263  align_var_def_thresh_3.cfg           cpp/align_var_def_thresh.cpp
-30264  Issue_2668.cfg                       cpp/Issue_2668.cpp
-30265  long_br_cmt.cfg                      cpp/long_br_cmt.cpp
-30266  Issue_2921.cfg                       cpp/Issue_2921.cpp
-30267  Issue_2930.cfg                       cpp/Issue_2930.cpp
-30268  Issue_2692.cfg                       cpp/Issue_3018.cpp
-
-30270  const_throw.cfg                      cpp/const_throw.cpp
-30271  sp_throw_paren-r.cfg                 cpp/sp_throw_paren.cpp
-30272  sp_throw_paren-f.cfg                 cpp/sp_throw_paren.cpp
-30273  sp_cparen_oparen-f.cfg               cpp/sp_cparen_oparen.cpp
-30274  sp_cparen_oparen-r.cfg               cpp/sp_cparen_oparen.cpp
-30275  empty.cfg                            cpp/bug_1321.cpp
-30278  bug_1439.cfg                         cpp/bug_1439.cpp
-30279  indent_inside_ternary_operator.cfg   cpp/indent-inside-ternary-operator.cpp
-
-30280  sp_dc.cfg                            cpp/sf557.cpp
-30281  Issue_2478.cfg                       cpp/Issue_2478.cpp
-30282  Issue_2703.cfg                       cpp/Issue_2703.cpp
-
-30290  indent_shift.cfg                     cpp/align_left_shift.cpp
-30291  indent_shift.cfg                     cpp/indent_shift.cpp
-30292  align_eigen_comma_init.cfg           cpp/eigen.cpp
-30293  pos_shift-lead.cfg                   cpp/pos_shift.cpp
-30294  pos_shift-trail.cfg                  cpp/pos_shift.cpp
-30295  pos_shift-join.cfg                   cpp/pos_shift.cpp
-
-30300  ben_020.cfg                          cpp/enum_shr.cpp
-30301  al.cfg                               cpp/enum_class.h
-30302  bug_1315.cfg                         cpp/bug_1315.cpp
-30303  Issue_2902.cfg                       cpp/Issue_2902.cpp
-
-# TODO: Make a tests for a braced_init_list. See also 34153-34166.
-30310  sp_word_brace_force.cfg              cpp/braced_init_list.cpp
-30311  sp_word_brace_remove.cfg             cpp/uniform_initialization.cpp
-30312  sp_inside_type_brace_init_lst-f.cfg  cpp/return_init_list.cpp
-30313  sp_brace_brace-r.cfg                 cpp/sp_brace_brace.cpp
-30314  sp_brace_brace-f.cfg                 cpp/sp_brace_brace.cpp
-30315  issue_1997.cfg                       cpp/return_braced_init.cpp
-30316  Issue_2428.cfg                       cpp/Issue_2428.cpp
-30317  pos_comma-tb.cfg                     cpp/braced_init_template_decltype.cpp
-30318  Issue_2949.cfg                       cpp/Issue_2949.cpp
-30319  Issue_2886.cfg                       cpp/Issue_2886.cpp
-
-30320  sp_return_paren-r.cfg                cpp/returns.cpp
-30321  sp_return_paren-f.cfg                cpp/returns.cpp
-30322  sp_return_brace-r.cfg                cpp/returns.cpp
-30323  sp_return_brace-f.cfg                cpp/returns.cpp
-30324  mod_paren_on_return-a.cfg            cpp/returns.cpp
-30325  mod_paren_on_return-r.cfg            cpp/returns.cpp
-30326  indent_off_after_return.cfg          cpp/indent_off_after_return.cpp
-30327  indent_off_after_return.cfg          cpp/indent_off_after_return.cpp
-30328  nl_type_brace_init_lst-f.cfg         cpp/call_brace_init_lst.cpp
-30329  nl_type_brace_init_lst-r.cfg         cpp/call_brace_init_lst.cpp
-
-30330  Issue_3080.cfg                       cpp/Issue_3080.cpp
-
-30400  attribute_specifier_seqs.cfg         cpp/attribute_specifier_seqs.cpp
-30401  Issue_2570.cfg                       cpp/Issue_2570.cpp
-
-# function def newlines
-30701  func-def-1.cfg                       cpp/function-def.cpp
-30702  func-def-2.cfg                       cpp/function-def.cpp
-30703  func-def-3.cfg                       cpp/function-def.cpp
-
-30705  func_param.cfg                       cpp/func_param.cpp
-30706  bug_1020.cfg                         cpp/bug_1020.cpp
-
-30711  del_semicolon.cfg                    cpp/semicolons.cpp
-30712  empty.cfg                            cpp/bug_1158.cpp
-30713  empty.cfg                            cpp/fix_for_relational_operators.cpp
-30714  empty.cfg                            cpp/Issue_1733.cpp
-30715  Issue_2942.cfg                       cpp/Issue_2942.cpp
-
-30720  wessex.cfg                           cpp/custom-open-2.cpp
-30721  Issue_2386.cfg                       cpp/Issue_2386.cpp
-
-30730  qt-1.cfg                             cpp/qt-1.cpp
-30731  nl_access_spec.cfg                   cpp/qt-1.cpp
-30732  Issue_2734.cfg                       cpp/Issue_2734.cpp
-
-30740  sef.cfg                              cpp/sef.cpp
-30741  al.cfg                               cpp/al.cpp
-30742  indent_columns-2.cfg                 cpp/delete.cpp
-
-30745  Issue_2170.cfg                       cpp/Issue_2170.cpp
-30746  DefaultAndDelete-0.cfg               cpp/DefaultAndDelete.cpp
-30747  DefaultAndDelete-1.cfg               cpp/DefaultAndDelete.cpp
-30748  DefaultAndDelete-2.cfg               cpp/DefaultAndDelete.cpp
-
-# TODO: Reduce the number of options, leave only those that affect lambda.
-# TODO: Add tests for nested lambdas.
-
-30750  ben_021.cfg                          cpp/lambda.cpp
-30751  lambda1.cfg                          cpp/lambda.cpp
-30752  lambda2.cfg                          cpp/lambda.cpp
-30753  lambda3.cfg                          cpp/lambda2.cpp
-30754  indent_with_tabs-0.cfg               cpp/bug_i_682.h
-30755  empty.cfg                            cpp/bug_i_938.h
-30756  bug_1296.cfg                         cpp/bug_1296.cpp
-30757  Issue_3054.cfg                       cpp/Issue_3054.cpp
-30758  Issue_3054-2.cfg                     cpp/Issue_3054-2.cpp
-
-30761  out-668-F.cfg                        cpp/out-668.cpp
-30762  out-668-T.cfg                        cpp/out-668.cpp
-30763  Issue_2166.cfg                       cpp/Issue_2166.cpp
-30764  Issue_2591.cfg                       cpp/Issue_2591.cpp
-
-30770 sp_cpp_lambda_square_paren-r.cfg      cpp/lambda.cpp
-30771 sp_cpp_lambda_square_paren-f.cfg      cpp/lambda.cpp
-30772 sp_cpp_lambda_square_brace-r.cfg      cpp/lambda.cpp
-30773 sp_cpp_lambda_square_brace-f.cfg      cpp/lambda.cpp
-30774 sp_cpp_lambda_paren_brace-r.cfg       cpp/lambda.cpp
-30775 sp_cpp_lambda_paren_brace-f.cfg       cpp/lambda.cpp
-30776 sp_cpp_lambda_fparen-r.cfg            cpp/sp_cpp_lambda_fparen.cpp
-30777 sp_cpp_lambda_fparen-f.cfg            cpp/sp_cpp_lambda_fparen.cpp
-
-30780 lambda_in_one_liner.cfg               cpp/lambda_in_one_liner.cpp
-30781 lambda_in_one_liner.cfg               cpp/lambda_brace_list.cpp
-
-30790 Issue_2795.cfg                        cpp/Issue_2795.cpp
-
-30800  star_pos-0.cfg                       cpp/align-star-amp-pos.cpp
-30801  star_pos-1.cfg                       cpp/align-star-amp-pos.cpp
-30802  star_pos-2.cfg                       cpp/align-star-amp-pos.cpp
-30803  bug_1403.cfg                         cpp/bug_1403.cpp
-30804  block_pointer.cfg                    cpp/block_pointer.cpp
-30805  ptr_star-1.cfg                       cpp/ptr-star.cpp
-30806  ptr_star-2.cfg                       cpp/ptr-star.cpp
-30807  ptr_star-3.cfg                       cpp/ptr-star.cpp
-30808  sp_after_ptr_star_qualifier-f.cfg    cpp/ptr-star.cpp
-30809  empty.cfg                            cpp/bug_1289.cpp
-
-30810  ben_022.cfg                          cpp/ptr-star.cpp
-30811  avalon4.cfg                          cpp/misc3.cpp
-30812  ben_023.cfg                          cpp/misc4.cpp
-30813  ben_024.cfg                          cpp/misc5.cpp
-30814  empty.cfg                            cpp/misc6.cpp
-30815  width-2.cfg                          cpp/cmt-reflow.cpp
-30816  cu.cfg                               cpp/for_long.cpp
-30817  indent_columns-3.cfg                 cpp/cmt-cpp-cont.cpp
-30818  bug_1169.cfg                         cpp/bug_1169.cpp
-30819  bug_1170.cfg                         cpp/bug_1170.cpp
-
-30820  pp_define_at_level-1.cfg             cpp/pp-define-indent.cpp
-30821  empty.cfg                            cpp/pp_indent_case.cpp
-30822  empty.cfg                            cpp/pp_indent_brace.cpp
-30823  empty.cfg                            cpp/pp_indent_func_def.cpp
-30824  empty.cfg                            cpp/pp_indent_extern.cpp
-30825  Issue_1966.cfg                       cpp/Issue_1966.cpp
-30826  Issue_2319.cfg                       cpp/Issue_2319.cpp
-30827  Issue_1167.cfg                       cpp/Issue_1167.cpp
-30828  bug_1691.cfg                         cpp/bug_1691.cpp
-30829  ptr_star-2.cfg                       cpp/Issue_2726.cpp
-
-30830  kw_subst2.cfg                        cpp/kw_subst.cpp
-30831  kw_subst.cfg                         cpp/kw_subst2.cpp
-30832  kw_subst4.cfg                        cpp/kw_subst.cpp
-
-30840  nl_func_type_name_remove.cfg         cpp/nl_func_type_name.cpp
-30841  nl_func_type_name_force.cfg          cpp/nl_func_type_name.cpp
-30842  nl_func_type_name_class.cfg          cpp/nl_func_type_name.cpp
-30843  nl_func_type_name_mixed.cfg          cpp/nl_func_type_name.cpp
-30844  Issue_2771.cfg                       cpp/Issue_2771.cpp
-30845  ben_026.cfg                          cpp/deref.cpp
-
-30850  sp_cmt_cpp_start_force.cfg           cpp/sp_cmt_cpp_start.cc
-30852  sp_paren_qualifier-f.cfg             cpp/Issue_2138.cpp
-30853  sp_paren_noexcept-f.cfg              cpp/noexcept.cpp
-30854  Issue_1703.cfg                       cpp/Issue_1703.cpp
-30855  empty.cfg                            cpp/cpp_move.cpp
-30856  sp_cmt_cpp_region-f.cfg              cpp/sp_cmt_cpp_region.cpp
-30857  sp_cmt_cpp_region-r.cfg              cpp/sp_cmt_cpp_region.cpp
-
-30860  sf574.cfg                            cpp/sf574.cpp
-
-30870  cmt_insert-0.cfg                     cpp/cmt_insert.cpp
-30871  cmt_insert-1.cfg                     cpp/cmt_insert.cpp
-30872  Issue_2752.cfg                       cpp/Issue_2752.cpp
-#      will also use the file footer.txt
-
-30880  empty.cfg                            cpp/bug_1758.cpp
-30881  bug_1758-f.cfg                       cpp/bug_1758-f.cpp
-
-30900  region-0.cfg                         cpp/region.cpp
-30901  region-1.cfg                         cpp/region.cpp
-30902  region-2.cfg                         cpp/region.cpp
-30903  region-3.cfg                         cpp/region.cpp
-30907  Issue_1813.cfg                       cpp/Issue_1813.cpp
-30908  Issue_1813.cfg                       cpp/Issue_1813-2.cpp
-30909  Issue_1813.cfg                       cpp/Issue_1813-3.cpp
-
-30910  indent_namespace-t.cfg               cpp/indent_namespace.h
-30911  indent_class-t.cfg                   cpp/indent_namespace.h
-30912  long_namespace.cfg                   cpp/long_namespace.cpp
-30913  indent_namespace-t.cfg               cpp/indent_namespace2.h
-30914  indent_namespace_single_indent.cfg   cpp/indent_namespace_single_indent.h
-30915  empty.cfg                            cpp/bug_1235.cpp
-30916  empty.cfg                            cpp/Issue_1737.cpp
-30917  Issue_2345.cfg                       cpp/Issue_2345-3.cpp
-30918  Issue_2345.cfg                       cpp/Issue_2345-4.cpp
-30919  empty.cfg                            cpp/Issue_2387.cpp
-
-30920  ben_027.cfg                          cpp/indent-off.cpp
-30921  ben_028.cfg                          cpp/variadic-template.h
-30922  sp_before_ellipsis-f.cfg             cpp/variadic-template.h
-30923  sf.2886991-f.cfg                     cpp/sf.2886991.cpp
-30924  sf.2886991-r.cfg                     cpp/sf.2886991.cpp
-30925  sp_func_call_empty.cfg               cpp/function-def.cpp
-30926  sp_func_class_empty.cfg              cpp/function-def.cpp
-30927  sp_func_def_empty.cfg                cpp/function-def.cpp
-30928  sp_func_proto_empty.cfg              cpp/function-def.cpp
-30929  bug_1324.cfg                         cpp/bug_1324.cpp
-
-30930  indent_var_def.cfg                   cpp/indent_var_def.cpp
-30931  indent_var_def_cont-t.cfg            cpp/indent_var_def_cont.cpp
-30932  empty.cfg                            cpp/indent_var_def_cont.cpp
-30933  indent_paren_after_func_def-t.cfg    cpp/indent_paren_after_func_def.cpp
-30934  indent_paren_after_func_decl-t.cfg   cpp/indent_paren_after_func_decl.cpp
-30935  ben_029.cfg                          cpp/indent-misc.cpp
-30936  indent_braces_no.cfg                 cpp/indent_braces_no.h
-30937  indent_param.cfg                     cpp/indent_param.cpp
-30938  empty.cfg                            cpp/indent_switch_pp.cpp
-30939  indent_paren_after_func_call-t.cfg   cpp/indent_paren_after_func_call.cpp
-
-30940  mod_case_brace_rm.cfg                cpp/case-brace-remove.cpp
-30941  Issue_2150.cfg                       cpp/Issue_2150.cpp
-30942  Issue_1692.cfg                       cpp/Issue_1692.cpp
-30943  Issue_2735.cfg                       cpp/Issue_2735.cpp
-30944  sp_paren_comma.cfg                   cpp/sp_paren_comma.cpp
-30945  sp_before_byref-r.cfg                cpp/sf.3266678.cpp
-30946  sf.3315874.cfg                       cpp/sf.3315874.h
-30947  bug_1689.cfg                         cpp/bug_1689.cpp
-30948  sp_before_byref_func.cfg             cpp/sp_before_byref_func.cpp
-30949  Issue_2757.cfg                       cpp/Issue_2757.cpp
-
-30950  sp_before_tr_emb_cmt-f.cfg           cpp/sp_before_tr_emb_cmt_input.cpp
-30951  sp_before_tr_emb_cmt-a.cfg           cpp/sp_before_tr_emb_cmt_input.cpp
-30952  sp_before_constr_colon.cfg           cpp/sp_before_constr_colon.cpp
-30953  constr_colon.cfg                     cpp/constr_colon.cpp
-30954  Issue_2305.cfg                       cpp/Issue_2305.cpp
-30955  indent_ctor_init.cfg                 cpp/indent_ctor_init.cpp
-30956  indent_ctor_init_leading.cfg         cpp/indent_ctor_init.cpp
-30957  negative_indent.cfg                  cpp/class-init.cpp
-30958  nl_for_leave_one_liners-f.cfg        cpp/nl_for_leave_one_liners.cpp
-30959  nl_for_leave_one_liners-t.cfg        cpp/nl_for_leave_one_liners.cpp
-
-30960  Issue_2151.cfg                       cpp/Issue_2151.cpp
-30961  Issue_2232.cfg                       cpp/Issue_2232.cpp
-30962  nl_assign_leave_one_liners.cfg       cpp/nl_assign_leave_one_liners.cpp
-30963  Issue_2907.cfg                       cpp/Issue_2907.cpp
-30964  Issue_2823.cfg                       cpp/Issue_2823.cpp
-
-30970  Issue_2219.cfg                       cpp/Issue_2219.cpp
-30971  Issue_2224.cfg                       cpp/Issue_2224.cpp
-30972  Issue_2229.cfg                       cpp/Issue_2229.cpp
-30973  Issue_2236.cfg                       cpp/Issue_2236.cpp
-30974  empty.cfg                            cpp/using-alias-in-define.cpp
-
-31000  empty.cfg                            cpp/digraph.cpp
-31001  ben_030.cfg                          cpp/digraph.cpp
-
-31562  space_indent_class-t_columns-4.cfg   cpp/sf562.cpp
-31567  align_same_func_call_params-t.cfg    cpp/sf567.cpp
-31568  Issue_2368.cfg                       cpp/Issue_2368.cpp
-
-31583  empty.cfg                            cpp/sf583.cpp
-31593  indent_continue-8.cfg                cpp/sf593.cpp
-31594  issue_672.cfg                        cpp/issue_672.cpp
-31595  issue_1778.cfg                       cpp/issue_1778.cpp
-31596  issue_1782.cfg                       cpp/issue_1782.cpp
-31597  issue_1804.cfg                       cpp/issue_1804.cpp
-31598  Issue_1753.cfg                       cpp/Issue_1753.cpp
-
-31600  sp_paren_ellipsis-f.cfg              cpp/parameter-packs.cpp
-31601  sp_paren_ellipsis-r.cfg              cpp/parameter-packs.cpp
-31602  sp_sizeof_ellipsis-f.cfg             cpp/parameter-packs.cpp
-31603  sp_sizeof_ellipsis-r.cfg             cpp/parameter-packs.cpp
-31604  sp_before_ellipsis-f.cfg             cpp/parameter-packs.cpp
-31605  sp_before_ellipsis-r.cfg             cpp/parameter-packs.cpp
-31606  sp_type_ellipsis-f.cfg               cpp/parameter-packs.cpp
-31607  sp_type_ellipsis-r.cfg               cpp/parameter-packs.cpp
-31608  sp_sizeof_ellipsis_paren-f.cfg       cpp/parameter-packs.cpp
-31609  sp_sizeof_ellipsis_paren-r.cfg       cpp/parameter-packs.cpp
-
-31610  Issue_2085.cfg                       cpp/Issue_2085.cpp
-
-31620  sp_after_type-f.cfg                  cpp/sp_after_type.cpp
-31621  sp_after_type-i.cfg                  cpp/sp_after_type.cpp
-31622  sp_after_cast-f.cfg                  cpp/sp_after_type.cpp
-31623  sp_after_cast-r.cfg                  cpp/sp_after_type.cpp
-31624  sp_before_ptr_star-f.cfg             cpp/sp_after_type.cpp
-31625  sp_before_ptr_star-r.cfg             cpp/sp_after_type.cpp
-31626  sp_decltype_paren-f.cfg              cpp/issue_1916.cpp
-31627  sp_decltype_paren-r.cfg              cpp/issue_1916.cpp
-31628  sp_after_decltype-f.cfg              cpp/issue_1916.cpp
-31629  sp_after_decltype-r.cfg              cpp/issue_1916.cpp
-
-31630  sp_after_type-f.cfg                  cpp/issue_1916.cpp
-31631  sp_after_type-r.cfg                  cpp/issue_1916.cpp
-31632  issue_1916.cfg                       cpp/issue_1916.cpp
-31633  sp_after_decltype-f.cfg              cpp/sp_after_decltype.cpp
-31634  sp_after_decltype-r.cfg              cpp/sp_after_decltype.cpp
-31635  empty.cfg                            cpp/sp_decltype.cpp
-31636  Issue_1923.cfg                       cpp/Issue_1923.cpp
-
-31660  nl_func_var_def_blk-1.cfg            cpp/issue_1919.cpp
-31661  Issue_3097.cfg                       cpp/Issue_3097.cpp
-
-31700  toggle_processing_cmt.cfg            cpp/toggle_processing_cmt.cpp
-31701  toggle_processing_cmt2.cfg           cpp/toggle_processing_cmt2.cpp
-31702  toggle_processing_cmt3.cfg           cpp/toggle_processing_cmt.cpp
-31703  toggle_processing_cmt4.cfg           cpp/toggle_processing_cmt.cpp
-
-31710  empty.cfg                            cpp/string_replace_tab_chars.cpp
-31711  string_replace_tab_chars-t.cfg       cpp/string_replace_tab_chars.cpp
-
-31720  ben_031.cfg                          cpp/bit-colon.cpp
-31721  Issue_2689.cfg                       cpp/Issue_2689.cpp
-
-31730  sp_arith-a.cfg                       cpp/ms-style-ref.cpp
-
-31740  empty.cfg                            cpp/I2102.cpp
-
-32000  sp_skip_vbrace_tokens.cfg            cpp/sp_skip_vbrace_tokens.cpp
-32001  empty.cfg                            cpp/issue_547_for_each.cpp
-32002  empty.cfg                            cpp/proto-wrap.cpp
-32003  align_var_class_span-1.cfg           cpp/issue_633_typename.cpp
-32004  empty.cfg                            cpp/issue_624_angle.cpp
-32005  align_var_class_span-1.cfg           cpp/issue_633_typename.cpp
-32006  space_indent_columns-4.cfg           cpp/bug_i_687.cpp
-32007  Issue_3052.cfg                       cpp/Issue_3052.cpp
-32008  Issue_3034.cfg                       cpp/Issue_3034.cpp
-
-32100  cpp17.cfg                            cpp/cpp17.cpp
-32105  I2103.cfg                            cpp/I2103.cpp
-
-32115  2185.cfg                             cpp/2185.cpp
-
-33000  tab-0-11.cfg                         cpp/tab-0.cpp
-33001  indent_columns-11.cfg                cpp/tab-1.cpp
-33002  empty.cfg                            cpp/cmt_convert_tab_to_spaces.cpp
-33003  cmt_convert_tab_to_spaces-t.cfg      cpp/cmt_convert_tab_to_spaces.cpp
-33004  sp_cmt_cpp_start-a.cfg               cpp/DoxygenComments.cpp
-33005  sp_cmt.cfg                           cpp/DoxygenComments.cpp
-33006  empty.cfg                            cpp/string_replace_tab_chars.cpp
-33007  empty.cfg                            cpp/NewLine.cpp
-33008  NewLine-r.cfg                        cpp/NewLine.cpp
-33009  NewLine-f.cfg                        cpp/NewLine0.cpp
-
-33010  indent_columns-4.cfg                 cpp/Q_EMIT.cpp
-33011  indent_class-t_columns-4.cfg         cpp/static.h
-33012  kdepim2.cfg                          cpp/Q_SIGNAL_SLOT.cpp
-33013  kdepim3.cfg                          cpp/Q_2.cpp
-33014  indent_columns-4.cfg                 cpp/DB.cpp
-33015  kdepim5.cfg                          cpp/Q_FOREACH.cpp
-33016  indent_once.cfg                      cpp/indent.cpp
-33017  bug_1160.cfg                         cpp/bug_1160.cpp
-33018  byref-2.cfg                          cpp/byref-2.cpp
-33019  bug_657.cfg                          cpp/bug_657.cpp
-
-33020  sp_cmt.cfg                           cpp/bug_662.cpp
-33021  bug_633.cfg                          cpp/bug_633.cpp
-33022  empty.cfg                            cpp/bug_634.cpp
-33023  indent_once.cfg                      cpp/bug_651.cpp
-33024  empty.cfg                            cpp/bug_653.cpp
-33025  empty.cfg                            cpp/bug_654.cpp
-33026  empty.cfg                            cpp/bug_631.cpp
-33027  bug_664.cfg                          cpp/bug_664.cpp
-33028  sp_inside_braces_empty-r.cfg         cpp/braces_empty.cpp
-33029  cast.cfg                             cpp/cast.cpp
-
-33030  space_indent_columns-4.cfg           cpp/Q_FOREVER.cpp
-33031  align_assign_span-1.cfg              cpp/bug_612.cpp
-33032  bug_670.cfg                          cpp/bug_670.cpp
-33033  bug_670.cfg                          cpp/bug_670.h
-33034  bug_671.cfg                          cpp/bug_671.h
-33035  cmt_cpp_to_c-t.cfg                   cpp/patch_32.cpp
-33036  empty.cfg                            cpp/bug_663.cpp
-33037  func_class.cfg                       cpp/func_class.cpp
-33038  func_class.cfg                       cpp/func_class.h
-33039  mod_remove_empty_return-t.cfg        cpp/mod_remove_empty_return.cpp
-
-33040  nl_after_func_proto_group-3.cfg      cpp/bug_i_411.cpp
-33041  nl_after_func_proto-3.cfg            cpp/bug_i_411.cpp
-33042  nl_after_func_class_proto-3.cfg      cpp/bug_i_411.cpp
-33043  bug_i_478.cfg                        cpp/bug_i_478.cpp
-33044  sp_before_comma-f.cfg                cpp/bug_i_481.cpp
-33045  indent_columns-4.cfg                 cpp/bug_i_width.cpp
-33046  bug_i_409-split.cfg                  cpp/bug_i_409.cpp
-33047  bug_i_409-create.cfg                 cpp/bug_i_409.cpp
-33048  bug_i_405.cfg                        cpp/bug_i_405.cpp
-33049  pp-pragma.cfg                        cpp/pp-pragma.cpp
-
-33050  empty.cfg                            cpp/issue_523.cpp
-33051  empty.cfg                            cpp/bug_i_503.cpp
-33052  empty.cfg                            cpp/bug_i_512.cpp
-33053  space_indent_columns-4.cfg           cpp/for_auto.cpp
-33054  indent_columns-3.cfg                 cpp/bug_i_825.cpp
-33056  empty.cfg                            cpp/bug_33056.cpp
-33057  bug_1349.cfg                         cpp/bug_1349.cpp
-#33058  sp_arith-a.cfg                       cpp/stdcall.cpp
-33059  mod_remove_empty_return-t.cfg        cpp/mod_remove_empty_return-2.cpp
-
-33060  empty.cfg                            cpp/if_constexpr.cpp
-33061  empty.cfg                            cpp/if_chain_braces.cpp
-33062  mod_full_brace_if_chain-t.cfg        cpp/if_chain_braces.cpp
-33063  mod_full_brace_if_chain_only-t.cfg   cpp/if_chain_braces.cpp
-33064  if_chain_braces_2.cfg                cpp/if_chain_braces.cpp
-33069  Issue_2195.cfg                       cpp/Issue_2195.cpp
-
-33070  code_width-70.cfg                    cpp/multi_line.cpp
-33071  multi_line_1.cfg                     cpp/multi_line.cpp
-33072  multi_line_2.cfg                     cpp/multi_line.cpp
-33073  multi_line_3.cfg                     cpp/multi_line.cpp
-33074  multi_line_4.cfg                     cpp/multi_line.cpp
-33075  multi_line_5.cfg                     cpp/multi_line.cpp
-33076  multi_line_6.cfg                     cpp/multi_line.cpp
-33077  multi_line_7.cfg                     cpp/multi_line.cpp
-33078  multi_line_8.cfg                     cpp/multi_line.cpp
-33079  multi_line_9.cfg                     cpp/multi_line.cpp
-
-33080  multi_line_10.cfg                    cpp/multi_line.cpp
-33081  space_indent_columns-4.cfg           cpp/bug_i_552.cpp
-33082  empty.cfg                            cpp/namespace_namespace.cpp
-33083  bug_i_359.cfg                        cpp/bug_i_359.cpp
-33084  op_sym_empty.cfg                     cpp/op_sym_empty.cpp
-33085  indent_with_tabs-0.cfg               cpp/bug_i_323.cpp
-33086  indent_class-t.cfg                   cpp/bug_i_568.cpp
-33087  space_indent_columns-4.cfg           cpp/bug_i_596.cpp
-33088  empty.cfg                            cpp/bug_i_197.cpp
-33089  indent_class-t_columns-4.cfg         cpp/bug_643.cpp
-
-33090  empty.cfg                            cpp/gh555.cpp
-33091  no_squeeze_ifdef.cfg                 cpp/squeeze_ifdef.cpp
-33092  squeeze_ifdef.cfg                    cpp/squeeze_ifdef.cpp
-33093  sp_angle_paren-f.cfg                 cpp/sp_angle_paren.cpp
-33094  sp_angle_paren_empty.cfg             cpp/sp_angle_paren.cpp
-33095  bug_i_322.cfg                        cpp/bug_i_322.cpp
-33096  squeeze_ifdef_top.cfg                cpp/squeeze_ifdef.cpp
-33097  pos_enum_comma-tf.cfg                cpp/enum_comma.h
-33098  pos_comma-lf.cfg                     cpp/enum_comma.h
-33099  enum_comma-3.cfg                     cpp/enum_comma.h
-
-33100  enum_comma-4.cfg                     cpp/enum_comma.h
-33101  pos_comma-tb.cfg                     cpp/enum_comma.h
-33102  enum_comma-6.cfg                     cpp/enum_comma.h
-33103  bug_858-f.cfg                        cpp/bug_858.cpp
-33104  bug_858-r.cfg                        cpp/bug_858.cpp
-33105  bug_1001.cfg                         cpp/bug_1001.cpp
-33106  bool-pos-eol-force.cfg               cpp/pos_bool_in_template.h
-33107  Issue_2688.cfg                       cpp/Issue_2688.cpp
-33108  Issue_2045.cfg                       cpp/Issue_2045.cpp
-
-33110  enum.cfg                             cpp/enum.cpp
-33120  Issue_2149.cfg                       cpp/Issue_2149.cpp
-
-33150  indent_columns-4.cfg                 cpp/bug_i_753.cpp
-33151  bug_i_752.cfg                        cpp/bug_i_752.cpp
-33152  bug_1004.cfg                         cpp/bug_1004.cpp
-
-33160  sp_before_byref-r.cfg                cpp/bug_1112.cpp
-33161  sp_before_byref-r.cfg                cpp/byref-3.cpp
-
-33180  pp_multi_comment.cfg                 cpp/pp_multi_comment.cpp
-33181  Issue_2759.cfg                       cpp/Issue_2759.cpp
-33182  Issue_2794.cfg                       cpp/Issue_2794.cpp
-
-33200  cmt_multi_first_len_minimum-1.cfg    cpp/first_len_minimum.cpp
-
-33201  indent_ctor_members_twice.cfg        cpp/indent_ctor_members_twice.cpp
-33202  initlist_leading_commas.cfg          cpp/initlist_leading_commas.cpp
-33203  Issue_2574.cfg                       cpp/Issue_2574.cpp
-33204  Issue_2582.cfg                       cpp/Issue_2582.cpp
-
-33210  disable_nl_cont.cfg                  cpp/templates4.cpp
-33211  disable_nl_cont.cfg                  cpp/pp_multi_comment.cpp
-33212  disable_nl_cont.cfg                  cpp/pp-define-indent.cpp
-33213  disable_nl_cont.cfg                  cpp/disable_macro.cpp
-33214  Issue_2742.cfg                       cpp/Issue_2742.cpp
-33215  Issue_3055.cfg                       cpp/Issue_3055.cpp
-33216  Issue_3055.cfg                       cpp/Issue_3055-a.cpp
-33217  empty.cfg                            cpp/Issue_3113.cpp
-
-34001  nl_before_after.cfg                  cpp/nl_before_after.h
-34002  indent_columns-3.cfg                 cpp/bug_i_793.cpp
-34003  nl_max_blank_in_func-1.cfg           cpp/nl_max_blank_in_func.cpp
-34004  nl_max_blank_in_func-4.cfg           cpp/nl_max_blank_in_func.cpp
-34005  empty.cfg                            cpp/nl_max_blank_in_func.cpp
-34006  empty.cfg                            cpp/bug_i_575.cpp
-34007  indent_with_tabs-0.cfg               cpp/bug_i_928.cpp
-
-34100  empty.cfg                            cpp/bug_i_525.cpp
-34101  empty.cfg                            cpp/bug_i_646.cpp
-34105  bug_i_663.cfg                        cpp/bug_i_663.cpp
-34108  bug_i_666.cfg                        cpp/bug_i_666.cpp
-
-34112  sp_after_cast-r.cfg                  cpp/bug_i_889.cpp
-34113  nl_before_func_body_def-1.cfg        cpp/bug_902.cpp
-34114  nl_before_func_body_def-2.cfg        cpp/bug_902.cpp
-34115  nl_before_func_body_def-2.cfg        cpp/nl_before_func_body_def.cpp
-34116  nl_before_func_body_def-2.cfg        cpp/issue_2000.cpp
-34117  extern_func.cfg                      cpp/extern_func.cpp
-34118  Issue_2163.cfg                       cpp/Issue_2163.cpp
-
-34120  align_assign_span-1.cfg              cpp/bug_i_999.cpp
-34121  bug_1717.cfg                         cpp/bug_1717.cpp
-34122  Issue_2440.cfg                       cpp/Issue_2440.cpp
-34123  Issue_2440_nl.cfg                    cpp/Issue_2440_nl.cpp
-
-34130  nl_brace_fparen-f.cfg                cpp/bug_i_1000.cpp
-34131  nl_brace_fparen-r.cfg                cpp/bug_i_1000.cpp
-34132  new_op_a.cfg                         cpp/new_op.cpp
-34133  new_op_f.cfg                         cpp/new_op.cpp
-34134  new_op_r.cfg                         cpp/new_op.cpp
-34135  new_op_paren_open_close.cfg          cpp/new_op.cpp
-34136  sp_balance_nested_parens.cfg         cpp/sp_balance_nested_parens.cpp
-
-34140  empty.cfg                            cpp/bug_1027.cpp
-34141  empty.cfg                            cpp/bug_1005.cpp
-34142  sp_before_byref-r.cfg                cpp/I1112-1.cpp
-34143  I1112-2.cfg                          cpp/I1112-2.cpp
-34144  sp_before_ptr_star-r.cfg             cpp/I1112-3.cpp
-34145  i683.cfg                             cpp/i683.cpp
-34146  sp_bool-f.cfg                        cpp/bug_1002.cpp
-34147  sp_bool-r.cfg                        cpp/bug_1002.cpp
-34148  nl_before_if_closing_paren-f.cfg     cpp/bug_1139.cpp
-34149  nl_before_if_closing_paren-r.cfg     cpp/bug_1139.cpp
-
-34150  empty.cfg                            cpp/bug_1032.cpp
-34151  indent_else_if-t.cfg                 cpp/bug_666.cpp
-34152  empty.cfg                            cpp/bug_1068.cpp
-34153  nl_type_brace_init_lst-f.cfg         cpp/type_brace_init_lst.cpp
-34154  nl_type_brace_init_lst-r.cfg         cpp/type_brace_init_lst.cpp
-34155  nl_type_brace_init_lst_open-f.cfg    cpp/type_brace_init_lst.cpp
-34156  nl_type_brace_init_lst_open-r.cfg    cpp/type_brace_init_lst.cpp
-34157  nl_type_brace_init_lst_close-f.cfg   cpp/type_brace_init_lst.cpp
-34158  nl_type_brace_init_lst_close-r.cfg   cpp/type_brace_init_lst.cpp
-34159  sp_type_brace_init_lst-f.cfg         cpp/type_brace_init_lst.cpp
-
-34160  sp_type_brace_init_lst-r.cfg         cpp/type_brace_init_lst.cpp
-34161  sp_inside_type_brace_init_lst-f.cfg  cpp/type_brace_init_lst.cpp
-34162  sp_inside_type_brace_init_lst-r.cfg  cpp/type_brace_init_lst.cpp
-34163  sp_after_type_brace_init_lst_open-f.cfg  cpp/type_brace_init_lst.cpp
-34164  sp_after_type_brace_init_lst_open-r.cfg  cpp/type_brace_init_lst.cpp
-34165  sp_before_type_brace_init_lst_close-f.cfg  cpp/type_brace_init_lst.cpp
-34166  sp_before_type_brace_init_lst_close-r.cfg  cpp/type_brace_init_lst.cpp
-34167  nl_func_call_args_multi_line_ignore_closures.cfg cpp/nl_func_call_args_multi_line_ignore_closures.cpp
-34168  nl_type_brace_init_lst-r.cfg         cpp/Issue_2910.cpp
-34169  sp_inside_fparens-f.cfg              cpp/init-list-call.cpp
-
-34170  empty.cfg                            cpp/i1082.cpp
-34171  empty.cfg                            cpp/i1181.cpp
-34172  space_indent_columns-4.cfg           cpp/i1165.cpp
-34173  arith-vs-ptr.cfg                     cpp/i1464.cpp
-34174  arith-vs-ptr.cfg                     cpp/i1466.cpp
-34175  align_assign_span-1.cfg              cpp/i1509.cpp
-34176  align_assign_span-1.cfg              cpp/i1509_bug_1112_correction.cpp
-34177  sp_func_call_paren.cfg               cpp/sp_func_call_paren.cpp
-
-34180  bug_1402.cfg                         cpp/bug_1402.cpp
-
-34190  bug_1003.cfg                         cpp/bug_1003.cpp
-34191  empty.cfg                            cpp/comment-align-multiline.cpp
-34192  mod_remove_extra_semicolon-t.cfg     cpp/i1207.cpp
-34193  empty.cfg                            cpp/i1218.cpp
-34194  sp_arith_additive-f.cfg              cpp/sp_arith_additive.cpp
-34195  sp_arith_additive-r.cfg              cpp/sp_arith_additive.cpp
-34196  Issue_1460.cfg                       cpp/Issue_1460.h
-34197  bug_1161.cfg                         cpp/bug_1161.cpp
-34198  sp_dc.cfg                            cpp/bug_1249.cpp
-34199  empty.cfg                            cpp/not_lambda.cpp
-
-34200  i1536.cfg                            cpp/i1536.cpp
-34201  mod_add_long_namespace_closebrace_comment-1.cfg  cpp/i1565.cpp
-34202  mod_add_long_namespace_closebrace_comment-1.cfg  cpp/i1617.cpp
-34203  i1516.cfg                            cpp/i1516.cpp
-34204  align_func_params_span-1.cfg         cpp/func_param_indent_leading_comma.cpp
-34205  bug_1395.cfg                         cpp/bug_1395.cpp
-34206  indent_semicolon_for_paren-t.cfg     cpp/for_loop_head.cpp
-34207  indent_first_for_expr-t.cfg          cpp/for_loop_head.cpp
-34208  nl_func_type_name-r.cfg              cpp/conversion_operator.cpp
-34209  nl-brAfter-fcallParen.cfg            cpp/lambda_selfcalling.cpp
-
-# TODO: Find relevant test cases for 'override'.
-34210  empty.cfg                            cpp/override_virtual.cpp
-34211  anonymous_enum.cfg                   cpp/anonymous_enum.cpp
-
-34250  empty.cfg                            cpp/bug_1607.cpp
-34251  bug_1649.cfg                         cpp/bug_1649.cpp
-34252  nl_after_func_proto_group-3.cfg      cpp/issue_2001.cpp
-34253  nl_after_func_proto_group-3.cfg      cpp/friends.cpp
-34254  issue_1985.cfg                       cpp/issue_1985.cpp
-34255  eat_blanks_after_codewidth.cfg       cpp/eat_blanks_after_codewidth.cpp
-34256  Issue_2836.cfg                       cpp/Issue_2836.cpp
-
-34280  UNI-29935.cfg                        cpp/UNI-29935.cpp
-
-34290  sp_type_brace_init_lst-f.cfg         cpp/brace_brace_init_lst.cpp
-34291  sp_type_brace_init_lst-r.cfg         cpp/brace_brace_init_lst.cpp
-34292  sp_inside_type_brace_init_lst-f.cfg  cpp/brace_brace_init_lst.cpp
-34293  sp_inside_type_brace_init_lst-r.cfg  cpp/brace_brace_init_lst.cpp
-34294  sp_after_type_brace_init_lst_open-f.cfg  cpp/brace_brace_init_lst.cpp
-34295  sp_after_type_brace_init_lst_open-r.cfg  cpp/brace_brace_init_lst.cpp
-34296  i1768.cfg                            cpp/i1768.cpp
-34297  align_assign_decl_func-0.cfg         cpp/align-assign-mixed.cpp
-34298  align_assign_decl_func-1.cfg         cpp/align-assign-mixed.cpp
-34299  align_assign_decl_func-2.cfg         cpp/align-assign-mixed.cpp
-
-# __asm__
-34300  bug_1236.cfg                         cpp/bug_1236.cpp
-34301  nl_fdef_brace_cond-f.cfg             cpp/nl_fdef_brace_cond-f.cpp
-34302  nl_fdef_brace_cond-r.cfg             cpp/nl_fdef_brace_cond-r.cpp
-34303  nl_fdef_brace_cond-fr.cfg            cpp/nl_fdef_brace_cond-fr.cpp
-34304  nl_fdef_brace_cond-rf.cfg            cpp/nl_fdef_brace_cond-rf.cpp
-34305  issue_2124-1.cfg                     cpp/issue_2124-1.cpp
-34306  issue_2124-2.cfg                     cpp/issue_2124-2.cpp
-34307  2203.cfg                             cpp/2203.cpp
-34308  enum_comment_wrap.cfg                cpp/enum_comment_wrap.cpp
-34309  issue_2209.cfg                       cpp/issue_2209-1.cpp
-
-34310  issue_2209.cfg                       cpp/issue_2209-2.cpp
-34311  Issue_2250.cfg                       cpp/Issue_2250.cpp
-34312  Issue_2101.cfg                       cpp/Issue_2101.cpp
-34313  Issue_2437.cfg                       cpp/Issue_2437.cpp
-34314  Issue_2604.cfg                       cpp/Issue_2604.cpp
-34315  align_func_proto_thresh_1.cfg        cpp/align_func_proto_thresh.cpp
-34316  align_func_proto_thresh_2.cfg        cpp/align_func_proto_thresh.cpp
-34317  align_func_proto_thresh_3.cfg        cpp/align_func_proto_thresh.cpp
-34318  align_assign_func_proto_1.cfg        cpp/align_assign_func_proto.cpp
-34319  align_func_proto_thresh_4.cfg        cpp/align_func_proto_thresh2.cpp
-
-34320  align_func_proto_thresh_5.cfg        cpp/align_func_proto_thresh2.cpp
-34321  bug_2285.cfg                         cpp/bug_2285.cpp
-34322  issue_2623_1.cfg                     cpp/issue_2623.cpp
-34323  issue_2623_2.cfg                     cpp/issue_2623.cpp
-34324  issue_2623_3.cfg                     cpp/issue_2623.cpp
-34325  Issue_3025.cfg                       cpp/Issue_3025.cpp
-34326  Issue_3040.cfg                       cpp/Issue_3040.cpp
-34327  Issue_3044.cfg                       cpp/Issue_3044.cpp
-34328  Issue_3048.cfg                       cpp/Issue_3048.cpp
-
-34330  Issue_3061_0nl.cfg                   cpp/Issue_3061_0nl.cpp
-34331  Issue_3061_0nl.cfg                   cpp/Issue_3061_1nl.cpp
-34332  Issue_3061_0nl.cfg                   cpp/Issue_3061_2nl.cpp
-34333  Issue_3061_1nl.cfg                   cpp/Issue_3061_0nl.cpp
-34334  Issue_3061_1nl.cfg                   cpp/Issue_3061_1nl.cpp
-34335  Issue_3061_1nl.cfg                   cpp/Issue_3061_2nl.cpp
-34336  Issue_3061_2nl.cfg                   cpp/Issue_3061_0nl.cpp
-34337  Issue_3061_2nl.cfg                   cpp/Issue_3061_1nl.cpp
-34338  Issue_3061_2nl.cfg                   cpp/Issue_3061_2nl.cpp
-34339  Issue_3061_3nl.cfg                   cpp/Issue_3061_0nl.cpp
-34340  Issue_3061_3nl.cfg                   cpp/Issue_3061_1nl.cpp
-34341  Issue_3061_3nl.cfg                   cpp/Issue_3061_2nl.cpp
-
-34350  indent_comma_brace.cfg               cpp/indent_comma_brace_glob.cpp
-34351  indent_comma_brace.cfg               cpp/indent_comma_brace_func.cpp
-
-# Adopt some UT tests
-10000  empty.cfg                            cpp/621_this-spacing.cpp
-10001  empty.cfg                            cpp/622_ifdef-indentation.cpp
-10002  623_caret-spacing.cfg                cpp/623_caret-spacing.cpp
-10003  633_decl-in-func-typedef.cfg         cpp/633_decl-in-func-typedef.cpp
-10004  empty.cfg                            cpp/634_extern-c-no-block.cpp
-10005  Uncrustify.Cpp.cfg                   cpp/define-indentation.cpp
-10006  dont-detab-strings.cfg               cpp/dont-detab-strings.cpp
-10007  dont-process-defines.cfg             cpp/dont-process-defines.cpp
-10008  empty.cfg                            cpp/PR326_invalid-backslash-eol-csharp.cpp
-10009  STUCK_macro-difficulties.cfg         cpp/STUCK_macro-difficulties.cpp
-
-10020  U02-Cpp.cfg                          cpp/macro_spaces.cpp
-10021  U03-Cpp.cfg                          cpp/braces_align.cpp
-10022  U04-Cpp.cfg                          cpp/foreach.cpp
-10023  U05-Cpp.cfg                          cpp/for_auto.cpp
-10024  U06-Cpp.cfg                          cpp/ifcomment.cpp
-10025  U07-Cpp.cfg                          cpp/qtargs.cpp
-10026  sp_before_ellipsis-r.cfg             cpp/gcc_case_ellipsis.cpp
-10027  Issue_3058.cfg                       cpp/Issue_3058.cpp
-
-10047  U16-Cpp.cfg                          cpp/UNI-1334.cpp
-10048  empty.cfg                            cpp/UNI-1335.cpp
-
-10050  U18-Cpp.cfg                          cpp/UNI-1337.cpp
-10052  empty.cfg                            cpp/UNI-1339.cpp
-10053  UNI-1340.cfg                         cpp/UNI-1340.cpp
-10054  UNI-1344.cfg                         cpp/UNI-1344.cpp
-10056  UNI-1346.cfg                         cpp/UNI-1346.cpp
-10057  UNI-1347.cfg                         cpp/UNI-1347.cpp
-
-10060  UNI-1350.cfg                         cpp/UNI-1350.cpp
-10062  UNI-1356.cfg                         cpp/UNI-1356.cpp
-10063  UNI-1358.cfg                         cpp/UNI-1358.cpp
-10069  empty.cfg                            cpp/UNI-1980.cpp
-
-10070  U21-Cpp.cfg                          cpp/UNI-1981.cpp
-10071  empty.cfg                            cpp/UNI-1983.cpp
-10079  U23-Cpp.cfg                          cpp/UNI-9650.cpp
-
-10080  UNI-10496.cfg                        cpp/UNI-10496.cpp
-
-10100  issue_564.cfg                        cpp/issue_564.cpp
-10101  issue_574.cfg                        cpp/issue_574.cpp
-10102  issue_574-i-a.cfg                    cpp/issue_574.cpp
-10103  issue_574-i-b.cfg                    cpp/issue_574.cpp
-
-10566  empty.cfg                            cpp/issue_1752.cpp
-
-11000  UNI-12046.cfg                        cpp/UNI-12046.cpp
-
-20002  UNI-32657.cfg                        cpp/UNI-32657.cpp
-
-20011  empty.cfg                            cpp/UNI-38381.cpp
-
-60001  UNI-2650.cfg                         cpp/UNI-2650.cpp
-60002  U25-Cpp.cfg                          cpp/UNI-16283.cpp
-60003  U26-Cpp.cfg                          cpp/UNI-1288.cpp
-60006  UNI-2049.cfg                         cpp/UNI-2049.cpp
-60017  U27-Cpp.cfg                          cpp/UNI-2683.cpp
-
-60022  U28-Cpp.cfg                          cpp/UNI-18439.cpp
-60025  U29-Cpp.cfg                          cpp/UNI-19894.cpp
-60027  U30-Cpp.cfg                          cpp/UNI-21506.cpp
-60028  U31-Cpp.cfg                          cpp/UNI-21509.cpp
-60029  empty.cfg                            cpp/UNI-21510.cpp
-
-60030  U33-Cpp.cfg                          cpp/UNI-21727.cpp
-60031  empty.cfg                            cpp/UNI-21728.cpp
-60032  empty.cfg                            cpp/UNI-21729.cpp
-60036  UNI-2680.cfg                         cpp/UNI-2680.cpp
-60038  UNI-30088.cfg                        cpp/UNI-30088.cpp
-60039  U36-Cpp.cfg                          cpp/UNI-30628.cpp
-
-60042  UNI-18777.cfg                        cpp/UNI-18777.cpp
-60043  nl_remove_extra_newlines-1.cfg       cpp/i2033.cpp
-60044  nl_fdef_brace-r__nl_collapse_empty_body-t.cfg  cpp/i2116.cpp
-60045  align_asterisk_after_type_cast.cfg   cpp/align_asterisk_after_type_cast.cpp
-60046  align_continuation_left_shift.cfg    cpp/align_continuation_left_shift.cpp
-60047  align_default_after_override.cfg     cpp/align_default_after_override.cpp
-60048  bug_2322.cfg                         cpp/bug_2322.cpp
-60049  bug_2402.cfg                         cpp/bug_2402.cpp
-
-60050  mod_remove_extra_semicolon-t.cfg     cpp/semicolon-removal-after-ternary-operator.cpp
-60051  bug_2371.cfg                         cpp/bug_2371.cpp
-60052  bug_2433_1.cfg                       cpp/bug_2433_1.cpp
-60053  bug_2433_2.cfg                       cpp/bug_2433_2.cpp
-60054  interface-keyword-in-cpp.cfg         cpp/interface-keyword-in-cpp.cpp
-60055  issue_3116.cfg                       cpp/issue_3116.cpp
-60056  issue_3116.cfg                       cpp/issue_3116-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/d.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/d.test
deleted file mode 100644
index 59322029..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/d.test
+++ /dev/null
@@ -1,68 +0,0 @@
-# d.test ===========
-#
-# Test cases specifically for the D language.
-#
-# Range: 40000 - 49999
-# test.name  config.file  input.file  output.file
-
-40000  d.cfg                                d/HashMap.d
-40001  d.cfg                                d/imports.d
-40002  d.cfg                                d/volatile.d
-40003  d.cfg                                d/volatile-1.d
-40004  d.cfg                                d/volatile-2.d
-40005  d.cfg                                d/volatile-3.d
-40006  d.cfg                                d/Lexer.d
-40007  d2.cfg                               d/Lexer.d
-40010  d.cfg                                d/template.d
-40011  d2.cfg                               d/template.d
-40020  d.cfg                                d/funcfunc.d
-40021  d.cfg                                d/tst01.d
-40022  d-tst2.cfg                           d/tst02.d
-40023  d.cfg                                d/bug-indent.d
-40024  d3.cfg                               d/tst03.d
-40025  d3a.cfg                              d/tst03.d
-
-40026  empty.cfg                            d/wysiwyg_strings.d
-40027  empty.cfg                            d/static_if_in_struct.d
-
-40030  d.cfg                                d/delegate.d
-40035  d.cfg                                d/enum.d
-
-40040  sort_imports.cfg                     d/sort_import.d
-
-40050  d.cfg                                d/strings.d
-40051  d.cfg                                d/numbers.d
-40052  d2.cfg                               d/numbers.d
-
-40060  d.cfg                                d/casts.d
-40061  d.cfg                                d/const.d
-
-40070  d_sp_paren.cfg                       d/d_sp_paren.d
-
-40080  d.cfg                                d/static_if.d
-
-40090  libd.cfg                             d/square_indent_tab.d
-
-40100  1438.cfg                             d/1438.d
-
-40201  invariant.cfg                        d/invariant.d
-
-40300  d.cfg                                d/extern_.d
-
-40400  mod_full_brace_if_chain_only-t.cfg   d/vbraces000.d
-40401  empty.cfg                            d/vbraces001.d
-40402  mod_full_brace_if_chain_only-t.cfg   d/vbraces002.d
-
-40403  empty.cfg                            d/template_use.d
-
-40500  empty.cfg                            d/template_spacing000.d
-40501  sp_after_type-r.cfg                  d/template_spacing001.d
-40502  sp_after_type-f.cfg                  d/template_spacing001.d
-40503  sp_after_type-a.cfg                  d/template_spacing001.d
-40504  sp_after_type-r.cfg                  d/type_spacing000.d
-40505  sp_after_type-f.cfg                  d/type_spacing000.d
-40506  sp_after_type-a.cfg                  d/type_spacing000.d
-
-
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/difftest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/difftest.sh
deleted file mode 100755
index 053cae17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/difftest.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Shows the difference for a failed test
-#
-
-if [ -n "$1" ] ; then
-    case  "$1" in
-        -h|--help|--usage)
-            fn=$(basename $0)
-            echo "Usage: $fn [TEST [LANG]]"
-            echo
-            echo "  TEST : the test number pattern, may contain wildcards"
-            echo "  LANG : the language folder name: c, cpp, cs, d, java, oc, pawn, sql"
-            echo
-            echo "The script will find all matching tests in the output folder and diff them against the same"
-            echo "file in the results folder.  The language is only required if the same test number is used"
-            echo "for multiple languages and you only want to see one of them."
-            echo
-            echo "Examples:"
-            echo "$fn            # show all test failures"
-            echo "$fn 30014      # show test failure 30014"
-            echo "$fn '*' cpp    # show all CPP test failure"
-            exit 1
-	    ;;
-    esac
-fi
-
-# Use '*' as the pattern if one wasn't defined
-patt=$1
-if [ -z "$patt" ] ; then
-    patt="*"
-fi
-path="output"
-if [ -n "$2" ] ; then
-    path="$path/$2"
-fi
-
-# Find the tests that match, remove the .svn folders
-files=$(find $path -name "$patt-*" -type f | sed "/\.svn/d")
-
-did1=''
-for t in $files ; do
-    other=$(echo $t | sed "s/^output/results/")
-    diff -u $t $other
-    if [ "$?" = "1" ] ; then
-       did1='yup'
-    fi
-done
-
-if [ -z "$did1" ] ; then
-    echo "No differences"
-fi
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/ecma.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/ecma.test
deleted file mode 100644
index fdce3a7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/ecma.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Test cases specifically for the ECMA language.
-#
-# Range: 90000 - 99999
-# test.name  config.file  input.file
-
-90000  ben_098.cfg                          ecma/example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00000-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00000-comment-indent.c
deleted file mode 100644
index b59ab389..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00000-comment-indent.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-{
-   int idx;
-   int res = 0;      // trailing comment
-                     // that spans two lines
-   for (idx = 1; idx < bar; idx++)
-      /* comment in virtual braces */
-      res += idx;
-
-   res *= idx;        // some comment
-
-   // almost continued, but a NL in between
-
-// col1 comment in level 1
-// second comment
-   return(res);
-}
-
-// col1 comment in level 0
-// and another
-
-void foo()
-{
-   if( bar )
-   {
-      foo();
-   }
-   /*else if( bar2 )
-      {
-      foo2();
-      }
-    */else if( bar3 )
-   {
-      foo3();
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00001-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00001-comment-indent.c
deleted file mode 100644
index e4ba53de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00001-comment-indent.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-{
-    int idx;
-    int res = 0;     /* trailing comment */
-                     /* that spans two lines */
-    for (idx = 1; idx < bar; idx++)
-        /* comment in virtual braces */
-        res += idx;
-
-    res *= idx;       /* some comment */
-
-    /* almost continued, but a NL in between */
-
-/* col1 comment in level 1 */
-/* second comment */
-    return(res);
-}
-
-/* col1 comment in level 0 */
-/* and another */
-
-void foo()
-{
-    if( bar )
-    {
-        foo();
-    }
-    /*else if( bar2 )
-     * {
-     * foo2();
-     * }
-     */else if( bar3 )
-    {
-        foo3();
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00002-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00002-comment-indent.c
deleted file mode 100644
index 09ca01ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00002-comment-indent.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-{
-    int idx;
-    int res = 0;     /* trailing comment
-                      * that spans two lines */
-    for (idx = 1; idx < bar; idx++)
-        /* comment in virtual braces */
-        res += idx;
-
-    res *= idx;       /* some comment */
-
-    /* almost continued, but a NL in between */
-
-/* col1 comment in level 1
- * second comment */
-    return(res);
-}
-
-/* col1 comment in level 0
- * and another */
-
-void foo()
-{
-    if( bar )
-    {
-        foo();
-    }
-    /*else if( bar2 )
-     * {
-     * foo2();
-     * }
-     */else if( bar3 )
-    {
-        foo3();
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00003-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00003-comment-indent.c
deleted file mode 100644
index 0f906f2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00003-comment-indent.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-{
-    int idx;
-    int res = 0;     /*
-                      * trailing comment
-                      * that spans two lines
-                      */
-    for (idx = 1; idx < bar; idx++)
-        /* comment in virtual braces */
-        res += idx;
-
-    res *= idx;       /* some comment */
-
-    /* almost continued, but a NL in between */
-
-/*
- * col1 comment in level 1
- * second comment
- */
-    return(res);
-}
-
-/*
- * col1 comment in level 0
- * and another
- */
-
-void foo()
-{
-    if( bar )
-    {
-        foo();
-    }
-    /*else if( bar2 )
-     * {
-     * foo2();
-     * }
-     */
-    else if( bar3 )
-    {
-        foo3();
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00004-switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00004-switch.c
deleted file mode 100644
index ffb54327..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00004-switch.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-int foo(int op)
-{
-	switch (op)
-	{
-		case 1: {
-			do_something();
-			return 0;
-		}
-
-		case 2:
-			do_something_else();
-			return 1;
-
-		case 3:
-		case 4:
-			/* don't do anything */
-			break;
-
-		case 5:
-			return 3;
-
-		default:
-			break;
-	}
-
-	return -1;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00005-cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00005-cmt-align.c
deleted file mode 100644
index 0a9684c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00005-cmt-align.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef HAVE_FOO
-void foo(void)
-{
-   if (bar)
-   {
-      call_some_function(); /* call the function */
-      return(foo);          /* comment */
-   }                        /* if (bar) */
-}
-#endif                      /* HAVE_FOO */
-#ifndef HAVE_BAR            /* bar isn't available on all HW */
-void bar(void)
-{
-   if (foo)
-   {
-      call_some_function(); /* call the function */
-      return(foo);          /* comment */
-   } /* if (foo) */
-}
-#endif /* HAVE_BAR */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00006-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00006-comment-convert.c
deleted file mode 100644
index c7a019f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00006-comment-convert.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// This is your typical header comment
-int foo(int bar)
-{
-   int idx;
-   int res = 0;      // trailing comment
-                     // that spans two lines
-
-
-   // Comment with embedded /* C comment */
-   for (idx = 1; idx < bar; idx++)
-      /* comment in virtual braces */
-      res += idx;
-
-   // Multi-line comment with embedded /* C comment */ and junk
-   // afterwards
-   res *= idx;        // some comment
-
-   // almost continued, but a NL in between
-
-// col1 comment in level 1
-// second comment
-   return(res);
-}
-
-// col1 comment in level 0
-// and another
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00007-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00007-comment-convert.c
deleted file mode 100644
index 886d7698..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00007-comment-convert.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This is your typical header comment */
-int foo(int bar)
-{
-    int idx;
-    int res = 0;     /* trailing comment */
-                     /* that spans two lines */
-
-
-    /* Comment with embedded / * C comment * / */
-    for (idx = 1; idx < bar; idx++)
-        /* comment in virtual braces */
-        res += idx;
-
-    /* Multi-line comment with embedded / * C comment * / and junk */
-    /* afterwards */
-    res *= idx;       /* some comment */
-
-    /* almost continued, but a NL in between */
-
-/* col1 comment in level 1 */
-/* second comment */
-    return(res);
-}
-
-/* col1 comment in level 0 */
-/* and another */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00008-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00008-comment-convert.c
deleted file mode 100644
index c2af0f8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00008-comment-convert.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This is your typical header comment */
-int foo(int bar)
-{
-    int idx;
-    int res = 0;     /* trailing comment
-                      * that spans two lines */
-
-
-    /* Comment with embedded / * C comment * / */
-    for (idx = 1; idx < bar; idx++)
-        /* comment in virtual braces */
-        res += idx;
-
-    /* Multi-line comment with embedded / * C comment * / and junk
-     * afterwards */
-    res *= idx;       /* some comment */
-
-    /* almost continued, but a NL in between */
-
-/* col1 comment in level 1
- * second comment */
-    return(res);
-}
-
-/* col1 comment in level 0
- * and another */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00009-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00009-comment-convert.c
deleted file mode 100644
index 0d3f218a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00009-comment-convert.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This is your typical header comment */
-int foo(int bar)
-{
-    int idx;
-    int res = 0;     /*
-                      * trailing comment
-                      * that spans two lines
-                      */
-
-
-    /* Comment with embedded / * C comment * / */
-    for (idx = 1; idx < bar; idx++)
-        /* comment in virtual braces */
-        res += idx;
-
-    /*
-     * Multi-line comment with embedded / * C comment * / and junk
-     * afterwards
-     */
-    res *= idx;       /* some comment */
-
-    /* almost continued, but a NL in between */
-
-/*
- * col1 comment in level 1
- * second comment
- */
-    return(res);
-}
-
-/*
- * col1 comment in level 0
- * and another
- */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00010-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00010-braces.c
deleted file mode 100644
index c4dc5faf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00010-braces.c
+++ /dev/null
@@ -1,101 +0,0 @@
-
-void foo(void)
-{
-   int a = 0;
-
-   while (a < 3)
-   {
-      a++;
-   }
-
-   while (b < a)  // trailing C++ comment
-   {
-      b++;
-   }
-
-   do  // trailing C++ comment
-   {
-      a--;
-   } while (a > 0);
-
-   do
-   {
-      a--;
-   } while (a > 0);
-
-   for (a = 0; a < 10; a++) // trailing C++ comment
-   {
-      printf("a=%d\n", a);
-   }
-
-   if (a == 10)  // trailing C++ comment
-   {
-      printf("a looks good\n");
-   }
-   else // trailing C++ comment
-   {
-      printf("not so good\n");
-   }
-
-   if (state == ST_RUN)
-   {
-      if ((foo < bar) &&
-          (bar > foo2))
-      {
-         if (a < 5)
-         {
-            a *= a;
-         }
-         else if (b != 0)
-         {
-            a /= b;
-         }
-         else // trailing C++ comment
-         {
-            a += b;
-         }
-      }
-   }
-
-   list_for_each(k)
-   {
-      if (a)
-      {
-         if (b)
-         {
-            c++;
-         }
-      }
-   }
-
-
-   while (1)
-   {
-      /* hang forever */
-   }
-} /* foo */
-
-void f()
-{
-   if (buf[0] == '~' && strchr(tmp, '/') == NULL)
-   {
-      buf     = mallocstrcpy(buf, tmp);
-      matches = username_tab_completion(tmp, &num_matches);
-   }
-   /* If we're in the middle of the original line, copy the string
-    * only up to the cursor position into buf, so tab completion
-    * will result in buf's containing only the tab-completed
-    * path/filename. */
-   else if (strlen(buf) > strlen(tmp))
-   {
-      buf = mallocstrcpy(buf, tmp);
-   }
-}
-
-void f()
-{
-}
-void g()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00011-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00011-braces.c
deleted file mode 100644
index 893a32f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00011-braces.c
+++ /dev/null
@@ -1,87 +0,0 @@
-
-void foo(void)
-{
-        int a = 0;
-        while (a < 3)
-        {
-                a++;
-        }
-
-        while (b < a) // trailing C++ comment
-                b++;
-
-        do // trailing C++ comment
-        {
-                a--;
-        } while (a > 0);
-
-        do
-                a--;
-        while (a > 0);
-
-        for (a = 0; a < 10; a++) // trailing C++ comment
-        {
-                printf("a=%d\n", a);
-        }
-
-        if (a == 10) // trailing C++ comment
-        {
-                printf("a looks good\n");
-        }
-        else // trailing C++ comment
-        {
-                printf("not so good\n");
-        }
-
-        if (state == ST_RUN)
-        {
-                if ((foo < bar) &&
-                    (bar > foo2))
-                {
-                        if (a < 5)
-                        {
-                                a *= a;
-                        }
-                        else if (b != 0)
-                                a /= b;
-                        else // trailing C++ comment
-                                a += b;
-                }
-        }
-
-        list_for_each(k)
-        {
-                if (a)
-                        if (b)
-                        {
-                                c++;
-                        }
-        }
-
-
-        while (1)
-                ; /* hang forever */
-}
-
-void f()
-{
-        if (buf[0] == '~' && strchr(tmp, '/') == NULL)
-        {
-                buf = mallocstrcpy(buf, tmp);
-                matches = username_tab_completion(tmp, &num_matches);
-        }
-        /* If we're in the middle of the original line, copy the string
-           only up to the cursor position into buf, so tab completion
-           will result in buf's containing only the tab-completed
-           path/filename. */
-        else if (strlen(buf) > strlen(tmp))
-                buf = mallocstrcpy(buf, tmp);
-}
-
-void f()
-{
-}
-void g()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00012-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00012-braces.c
deleted file mode 100644
index 851f4df9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00012-braces.c
+++ /dev/null
@@ -1,73 +0,0 @@
-
-void foo(void) {
-	int a = 0;
-	while (a < 3) {
-		a++;
-		}
-
-	while (b < a)   // trailing C++ comment
-		b++;
-
-	do { // trailing C++ comment
-		a--;
-		}
-	while (a > 0);
-
-	do
-		a--;
-	while (a > 0);
-
-	for (a = 0; a < 10; a++) { // trailing C++ comment
-		printf("a=%d\n", a);
-		}
-
-	if (a == 10) { // trailing C++ comment
-		printf("a looks good\n");
-		}
-	else { // trailing C++ comment
-		printf("not so good\n");
-		}
-
-	if (state == ST_RUN) {
-		if ((foo < bar) &&
-		    (bar > foo2)) {
-			if (a < 5) {
-				a *= a;
-				}
-			else if (b != 0)
-				a /= b;
-			else    // trailing C++ comment
-				a += b;
-			}
-		}
-
-	list_for_each(k) {
-		if (a)
-			if (b) {
-				c++;
-				}
-		}
-
-
-	while (1)
-		;    /* hang forever */
-}
-
-void f() {
-	if (buf[0] == '~' && strchr(tmp, '/') == NULL) {
-		buf = mallocstrcpy(buf, tmp);
-		matches = username_tab_completion(tmp, &num_matches);
-		}
-	/* If we're in the middle of the original line, copy the string
-	   only up to the cursor position into buf, so tab completion
-	   will result in buf's containing only the tab-completed
-	   path/filename. */
-	else if (strlen(buf) > strlen(tmp))
-		buf = mallocstrcpy(buf, tmp);
-}
-
-void f() {
-}
-void g() {
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00013-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00013-braces.c
deleted file mode 100644
index 2adcab76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00013-braces.c
+++ /dev/null
@@ -1,88 +0,0 @@
-
-void foo(void)
-{
-  int a = 0;
-  while (a < 3)
-    {
-      a++;
-    }
-
-  while (b < a)   // trailing C++ comment
-    b++;
-
-  do   // trailing C++ comment
-    {
-      a--;
-    }
-  while (a > 0);
-
-  do
-    a--;
-  while (a > 0);
-
-  for (a = 0; a < 10; a++)  // trailing C++ comment
-    {
-      printf("a=%d\n", a);
-    }
-
-  if (a == 10)   // trailing C++ comment
-    {
-      printf("a looks good\n");
-    }
-  else  // trailing C++ comment
-    {
-      printf("not so good\n");
-    }
-
-  if (state == ST_RUN)
-    {
-      if ((foo < bar) &&
-          (bar > foo2))
-        {
-          if (a < 5)
-            {
-              a *= a;
-            }
-          else if (b != 0)
-            a /= b;
-          else // trailing C++ comment
-            a += b;
-        }
-    }
-
-  list_for_each(k)
-  {
-    if (a)
-      if (b)
-        {
-          c++;
-        }
-  }
-
-
-  while (1)
-    ;    /* hang forever */
-}
-
-void f()
-{
-  if (buf[0] == '~' && strchr(tmp, '/') == NULL)
-    {
-      buf = mallocstrcpy(buf, tmp);
-      matches = username_tab_completion(tmp, &num_matches);
-    }
-  /* If we're in the middle of the original line, copy the string
-     only up to the cursor position into buf, so tab completion
-     will result in buf's containing only the tab-completed
-     path/filename. */
-  else if (strlen(buf) > strlen(tmp))
-    buf = mallocstrcpy(buf, tmp);
-}
-
-void f()
-{
-}
-void g()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00014-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00014-braces.c
deleted file mode 100644
index 1966a0c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00014-braces.c
+++ /dev/null
@@ -1,75 +0,0 @@
-
-void foo(void)
-{
-	int a = 0;
-	while (a < 3) {
-		a++;
-	}
-
-	while (b < a) // trailing C++ comment
-		b++;
-
-	do { // trailing C++ comment
-		a--;
-	} while (a > 0);
-
-	do
-		a--;
-	while (a > 0);
-
-	for (a = 0; a < 10; a++) { // trailing C++ comment
-		printf("a=%d\n", a);
-	}
-
-	if (a == 10) { // trailing C++ comment
-		printf("a looks good\n");
-	} else { // trailing C++ comment
-		printf("not so good\n");
-	}
-
-	if (state == ST_RUN) {
-		if ((foo < bar) &&
-		    (bar > foo2)) {
-			if (a < 5) {
-				a *= a;
-			} else if (b != 0)
-				a /= b;
-			else // trailing C++ comment
-				a += b;
-		}
-	}
-
-	list_for_each(k)
-	{
-		if (a)
-			if (b) {
-				c++;
-			}
-	}
-
-
-	while (1)
-		; /* hang forever */
-}
-
-void f()
-{
-	if (buf[0] == '~' && strchr(tmp, '/') == NULL) {
-		buf = mallocstrcpy(buf, tmp);
-		matches = username_tab_completion(tmp, &num_matches);
-	}
-	/* If we're in the middle of the original line, copy the string
-	   only up to the cursor position into buf, so tab completion
-	   will result in buf's containing only the tab-completed
-	   path/filename. */
-	else if (strlen(buf) > strlen(tmp))
-		buf = mallocstrcpy(buf, tmp);
-}
-
-void f()
-{
-}
-void g()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00015-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00015-braces.c
deleted file mode 100644
index c29cdecd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00015-braces.c
+++ /dev/null
@@ -1,88 +0,0 @@
-
-void foo(void)
-	{
-	int a = 0;
-	while (a < 3)
-		{
-		a++;
-		}
-
-	while (b < a) // trailing C++ comment
-		b++;
-
-	do // trailing C++ comment
-		{
-		a--;
-		}
-	while (a > 0);
-
-	do
-		a--;
-	while (a > 0);
-
-	for (a = 0; a < 10; a++) // trailing C++ comment
-		{
-		printf("a=%d\n", a);
-		}
-
-	if (a == 10) // trailing C++ comment
-		{
-		printf("a looks good\n");
-		}
-	else // trailing C++ comment
-		{
-		printf("not so good\n");
-		}
-
-	if (state == ST_RUN)
-		{
-		if ((foo < bar) &&
-		    (bar > foo2))
-			{
-			if (a < 5)
-				{
-				a *= a;
-				}
-			else if (b != 0)
-				a /= b;
-			else // trailing C++ comment
-				a += b;
-			}
-		}
-
-	list_for_each(k)
-		{
-		if (a)
-			if (b)
-				{
-				c++;
-				}
-		}
-
-
-	while (1)
-		; /* hang forever */
-	}
-
-void f()
-	{
-	if (buf[0] == '~' && strchr(tmp, '/') == NULL)
-		{
-		buf = mallocstrcpy(buf, tmp);
-		matches = username_tab_completion(tmp, &num_matches);
-		}
-	/* If we're in the middle of the original line, copy the string
-	   only up to the cursor position into buf, so tab completion
-	   will result in buf's containing only the tab-completed
-	   path/filename. */
-	else if (strlen(buf) > strlen(tmp))
-		buf = mallocstrcpy(buf, tmp);
-	}
-
-void f()
-	{
-	}
-void g()
-	{
-	}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00016-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00016-braces.c
deleted file mode 100644
index ce7df756..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00016-braces.c
+++ /dev/null
@@ -1,88 +0,0 @@
-
-void foo(void)
-{
-	int a = 0;
-	while (a < 3)
-		{
-		a++;
-		}
-
-	while (b < a) // trailing C++ comment
-		b++;
-
-	do // trailing C++ comment
-		{
-		a--;
-		}
-	while (a > 0);
-
-	do
-		a--;
-	while (a > 0);
-
-	for (a = 0; a < 10; a++) // trailing C++ comment
-		{
-		printf("a=%d\n", a);
-		}
-
-	if (a == 10) // trailing C++ comment
-		{
-		printf("a looks good\n");
-		}
-	else // trailing C++ comment
-		{
-		printf("not so good\n");
-		}
-
-	if (state == ST_RUN)
-		{
-		if ((foo < bar) &&
-		    (bar > foo2))
-			{
-			if (a < 5)
-				{
-				a *= a;
-				}
-			else if (b != 0)
-				a /= b;
-			else // trailing C++ comment
-				a += b;
-			}
-		}
-
-	list_for_each(k)
-		{
-		if (a)
-			if (b)
-				{
-				c++;
-				}
-		}
-
-
-	while (1)
-		; /* hang forever */
-}
-
-void f()
-{
-	if (buf[0] == '~' && strchr(tmp, '/') == NULL)
-		{
-		buf = mallocstrcpy(buf, tmp);
-		matches = username_tab_completion(tmp, &num_matches);
-		}
-	/* If we're in the middle of the original line, copy the string
-	   only up to the cursor position into buf, so tab completion
-	   will result in buf's containing only the tab-completed
-	   path/filename. */
-	else if (strlen(buf) > strlen(tmp))
-		buf = mallocstrcpy(buf, tmp);
-}
-
-void f()
-{
-}
-void g()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00020-define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00020-define-if-indent.c
deleted file mode 100644
index f7efd78c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00020-define-if-indent.c
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#define foobar(x)             \
-   {                          \
-      for (i = 0; i < x; i++) \
-      {                       \
-         junk(i, x);          \
-      }                       \
-   }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00050-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00050-brace-remove.c
deleted file mode 100644
index 857e4031..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00050-brace-remove.c
+++ /dev/null
@@ -1,69 +0,0 @@
-
-void foo(void)
-{
-	int a = 0;
-	while (a < 3)
-		a++;
-
-	while (b < a)
-		b++;
-
-	do
-		a--;
-	while (a > 0);
-
-	for (a = 0; a < 10; a++)
-		printf("a=%d\n", a);
-
-	if (a == 10)
-		printf("a looks good\n");
-
-	if (state == ST_RUN)
-	{
-		if ((foo < bar) &&
-		    (bar > foo2))
-		{
-			if (a < 5)
-				a *= a;
-		}
-	}
-
-	while (*ptr++ != ',')
-	{
-	}
-}
-
-// mod_full_brace_for = remove should not remove the braces in this example:
-int main() {
-	if(true)   // indent=1
-		for(int i = 0; i < 3; i++) {
-			if(false)
-				continue; // indent=4
-		}
-	else
-		return; // indent=2
-}
-
-// mod_full_brace_if = remove should not remove the braces in this example:
-int main() {
-	if(true) {
-		for(int i = 0; i < 3; i++)
-			if(false)
-				continue; // indent=4
-	}
-	else
-		return; // indent=2
-}
-
-int main()
-{
-	while (1) {
-		if (0)
-			break;
-		switch (1) {
-		case 1:
-			break;
-		}
-	}
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00051-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00051-brace-remove.c
deleted file mode 100644
index bef3e64d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00051-brace-remove.c
+++ /dev/null
@@ -1,65 +0,0 @@
-
-void foo(void)
-{
-	int a = 0;
-	while (a < 3)
-		a++;
-
-	while (b < a)
-		b++;
-
-	do
-		a--;
-	while (a > 0);
-
-	for (a = 0; a < 10; a++)
-		printf("a=%d\n", a);
-
-	if (a == 10)
-		printf("a looks good\n");
-
-	if (state == ST_RUN)
-		if ((foo < bar) &&
-		    (bar > foo2))
-			if (a < 5)
-				a *= a;
-
-	while (*ptr++ != ',')
-	{
-	}
-}
-
-// mod_full_brace_for = remove should not remove the braces in this example:
-int main() {
-	if(true)   // indent=1
-		for(int i = 0; i < 3; i++) {
-			if(false)
-				continue; // indent=4
-		}
-	else
-		return; // indent=2
-}
-
-// mod_full_brace_if = remove should not remove the braces in this example:
-int main() {
-	if(true) {
-		for(int i = 0; i < 3; i++)
-			if(false)
-				continue; // indent=4
-	}
-	else
-		return; // indent=2
-}
-
-int main()
-{
-	while (1) {
-		if (0)
-			break;
-		switch (1) {
-		case 1:
-			break;
-		}
-	}
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00052-brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00052-brace-remove2.c
deleted file mode 100644
index 30f352c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00052-brace-remove2.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* else is tied to if(two) */
-int main() {
-	if (one) {
-		if (two)
-			sleep (1);
-		else
-			sleep (2);
-	}
-
-	if (three)
-		sleep(1);
-	else if (four)
-		sleep(2);
-}
-
-/* else is tied to if(one) */
-int main() {
-	if (one) {
-		if (two)
-			sleep (1);
-	}
-	else if (three)
-		sleep (2);
-}
-
-/* else.1 is tied to if(two), else.2 is tied to if(one) */
-int main() {
-	if (one) {
-		if (two)
-			sleep (1);
-		else if (three)
-			sleep (2);
-	}
-	else
-		sleep (3);
-}
-int main() {
-
-	if (read_write == I2C_SMBUS_READ)
-		msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-	else
-		msg[0].len = data->block[0] + 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00053-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00053-brace.c
deleted file mode 100644
index 55c45a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00053-brace.c
+++ /dev/null
@@ -1,18 +0,0 @@
-

-

-

-int function (int arg)

-{

-  int i;

-

-  for (i = 0; i < 5; i++)

-  {

-    /* Do something... */

-  }

-  if (i < 0)

-  {

-    /*Do something else...*/

-  }

-

-  return (0);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00054-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00054-if_chain.c
deleted file mode 100644
index a6e0c561..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00054-if_chain.c
+++ /dev/null
@@ -1,79 +0,0 @@
-void foo(void)
-{
-	if (cond_a) {
-		fcn_a();
-		fcn_b();
-	} else {
-		fcn_c();
-	}
-
-	if (cond_b)
-		fcn_d();
-	else
-		fcn_e();
-
-	if (cond_c) {
-		fcn_f();
-		fcn_g();
-	} else {
-		fcn_h();
-	}
-
-	if (cond_d) {
-		fcn_i();
-	} else {
-		fcn_j();
-		fcn_k();
-	}
-
-	if (cond_e)
-		fcn_l();
-	else
-		fcn_m();
-
-	if (cond_f) {
-		fcn_n();
-	} else if (cond_g) {
-		fcn_o();
-		while (cond_g)
-			fcn_p();
-	} else if (cond_h) {
-		while (cond_i) {
-			fcn_q();
-			fcn_r();
-		}
-	} else {
-		fcn_s();
-	}
-}
-
-/* this next bit test whether vbraces can be successfully converted
- * when the closing brace is in an #ifdef.
- * Note that the author should have braced the code to begin with.
- */
-void bar(void)
-{
-	if (jiffies >= hw_priv->Counter[ port ].time) {
-		hw_priv->Counter[ port ].fRead = 1;
-		if (port == MAIN_PORT)
-			hw_priv->Counter[ MAIN_PORT ].time = jiffies + HZ * 6;
-		else
-			hw_priv->Counter[ port ].time =
-
-#ifdef SOME_DEFINE
-				hw_priv->Counter[ port - 1 ].time + HZ * 2;
-
-#else /* ifdef SOME_DEFINE */
-				hw_priv->Counter[ MAIN_PORT ].time + HZ * 2;
-#endif /* ifdef SOME_DEFINE */
-	}
-}
-
-void funct(int v1, int v2, int v3)
-{
-	if (v1) {
-		if (v2) f1();
-	} else {
-		if (v3) f2();
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00055-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00055-braces-2.c
deleted file mode 100644
index 38447f86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00055-braces-2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-while (a >= 0)
-{
-   if (b)
-   {
-      for (j = 0; j < 10; j++)
-      {
-         if (j == b)
-         {
-            return;
-         }
-         a++;
-      }
-   }
-   b--;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00056-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00056-brace-remove3.c
deleted file mode 100644
index 258ca555..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00056-brace-remove3.c
+++ /dev/null
@@ -1,30 +0,0 @@
-void foo()
-{
-	if(myBoolean) {
-#ifdef DEBUG
-		printf("ACK");
-#endif
-	}
-	return true;
-}
-
-void foo2()
-{
-	if (m_errno == ERR_NONE) {
-		function1(variables);
-		function2(variables);
-	} else
-		function1(varialbes);
-	//MyComment1
-	//MyComment2
-}
-
-void foo3()
-{
-	if (statment)
-		if (statment) {
-			condition;
-			return true;
-		}
-	return false;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00057-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00057-brace-remove3.c
deleted file mode 100644
index 26b22e2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00057-brace-remove3.c
+++ /dev/null
@@ -1,32 +0,0 @@
-void foo()
-{
-	if (myBoolean) {
-#ifdef DEBUG
-		printf("ACK");
-#endif
-	}
-	return true;
-}
-
-void foo2()
-{
-	if (m_errno == ERR_NONE) {
-		function1(variables);
-		function2(variables);
-	} else {
-		function1(varialbes);
-	}
-	//MyComment1
-	//MyComment2
-}
-
-void foo3()
-{
-	if (statment) {
-		if (statment) {
-			condition;
-			return true;
-		}
-	}
-	return false;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00058-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00058-if_chain.c
deleted file mode 100644
index ba15dc8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00058-if_chain.c
+++ /dev/null
@@ -1,69 +0,0 @@
-void foo(void)
-{
-	if (cond_a) {
-		fcn_a(); fcn_b();
-	} else {
-		fcn_c();
-	} if (cond_b) {
-		fcn_d();
-	} else {
-		fcn_e();
-	} if (cond_c) {
-		fcn_f(); fcn_g();
-	} else {
-		fcn_h();
-	} if (cond_d) {
-		fcn_i();
-	} else {
-		fcn_j(); fcn_k();
-	} if (cond_e) {
-		fcn_l();
-	} else {
-		fcn_m();
-	} if (cond_f) {
-		fcn_n();
-	} else if (cond_g) {
-		fcn_o(); while (cond_g) {
-			fcn_p();
-		}
-	} else if (cond_h) {
-		while (cond_i) {
-			fcn_q(); fcn_r();
-		}
-	} else {
-		fcn_s();
-	}
-}
-/* this next bit test whether vbraces can be successfully converted
- * when the closing brace is in an #ifdef.
- * Note that the author should have braced the code to begin with.
- */
-void bar(void)
-{
-	if (jiffies >= hw_priv->Counter[ port ].time) {
-		hw_priv->Counter[ port ].fRead = 1; if (port == MAIN_PORT) {
-			hw_priv->Counter[ MAIN_PORT ].time = jiffies + HZ * 6;
-		} else {
-			hw_priv->Counter[ port ].time =
-
-#ifdef SOME_DEFINE
-				hw_priv->Counter[ port - 1 ].time + HZ * 2;
-		}
-
-#else /* ifdef SOME_DEFINE */
-				hw_priv->Counter[ MAIN_PORT ].time + HZ * 2;
-#endif /* ifdef SOME_DEFINE */
-	}
-}
-void funct(int v1, int v2, int v3)
-{
-	if ( v1 ) {
-		if ( v2 ) {
-			f1();
-		}
-	} else {
-		if ( v3 ) {
-			f2();
-		}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00060-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00060-braces-2.c
deleted file mode 100644
index 38447f86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00060-braces-2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-while (a >= 0)
-{
-   if (b)
-   {
-      for (j = 0; j < 10; j++)
-      {
-         if (j == b)
-         {
-            return;
-         }
-         a++;
-      }
-   }
-   b--;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00061-braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00061-braces-3.c
deleted file mode 100644
index 18784b82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00061-braces-3.c
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-   list_for_each(k)
-   {
-      if (a)
-      {
-         if (b)
-         {
-            c++;
-         }
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00062-braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00062-braces-4.c
deleted file mode 100644
index 05c0d9b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00062-braces-4.c
+++ /dev/null
@@ -1,16 +0,0 @@
-int foo(int bar)
-{
-#ifndef CONFIG_1
-   bar -= 3;
-#else
-   for (j = 0; j < NR_CPUS; j++)
-   {
-      if (cpu_online(j))
-      {
-         bar++;
-      }
-   }
-#endif
-   return(0);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00065-braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00065-braces-5.c
deleted file mode 100644
index 6e1e6cab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00065-braces-5.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * this is a really tough case - perhaps we shouldn't keep any #if crap
- * unless they all end with the same stack?
- */
-void foo(void)
-{
-   int a;
-
-#ifdef CONFIG_BLK_DEV_INITRD
-   if (initrd_start)
-   {
-      ROOT_DEV = Root_RAM0;
-   }
-#elif defined (CONFIG_ROOT_NFS)
-   ROOT_DEV = Root_NFS;
-#elif defined (CONFIG_BLK_DEV_IDEDISK)
-   ROOT_DEV = Root_HDA1;
-#else
-   ROOT_DEV = Root_SDA1;
-#endif
-   return;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00066-vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00066-vb-while.c
deleted file mode 100644
index c189b7b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00066-vb-while.c
+++ /dev/null
@@ -1,52 +0,0 @@
-unsigned long xdl_adler32(unsigned long adler, unsigned char const *buf,
-                          unsigned int len)
-{
-   int           k;
-   unsigned long s1 = adler & 0xffff;
-   unsigned long s2 = (adler >> 16) & 0xffff;
-
-   if (!buf)
-   {
-      return(1);
-   }
-
-   while (len > 0)
-   {
-      k    = len < NMAX ? len : NMAX;
-      len -= k;
-      while (k >= 16)
-      {
-         DO16(buf);
-         buf += 16;
-         k   -= 16;
-      }
-      if (k != 0)
-      {
-         do
-         {
-            s1 += *buf++;
-            s2 += s1;
-         } while (--k);
-      }
-      s1 %= BASE;
-      s2 %= BASE;
-   }
-
-   return((s2 << 16) | s1);
-}
-
-void f()
-{
-   while (1)
-   {
-      if (2)
-      {
-         3;
-      }
-      else
-      {
-         4;
-      }
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00067-vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00067-vb-do.c
deleted file mode 100644
index 79c6dedf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00067-vb-do.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-struct beef a =
-{
-   1, 2, 3
-};
-
-void get_name(void)
-{
-   int _ = 3;
-
-   do
-   {
-      a--;
-   } while (a);
-
-   while (a) //something
-   {
-      a--;
-   }
-
-   do
-   {
-      while (a) //something
-      {
-         a--;
-      }
-   } while (b--);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00068-bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00068-bsnl.c
deleted file mode 100644
index 310e0eb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00068-bsnl.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define SOME_MACRO \
-   bool has_err;   \
-   bool is_comp;   \
-   struct some_stream ostream
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00069-vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00069-vb-pp.c
deleted file mode 100644
index 9fb79a06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00069-vb-pp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-
-void f()
-{
-   if (0)
-#pragma omp atomic
-   {
-      i++;
-   }
-}
-
-
-void f()
-{
-   if (0)
-#if foo
-   {
-      i++;
-   }
-#else
-   {
-      i += 2;
-   }
-#endif
-}
-
-void f()
-{
-   while (108)
-   {
-      if (42)
-#pragma omp critical
-      { }
-      if (23)
-#pragma omp critical
-      {
-         ++i;
-      }
-      while (16)
-      {
-      }
-      int i = 15;
-      if (8)
-#pragma omp atomic
-      {
-         i += 4;
-      }
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00070-return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00070-return-multi.c
deleted file mode 100644
index d351cdb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00070-return-multi.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-static inline long
-get_tv32(struct timeval *o, struct timeval32 __user *i)
-{
-   return(!access_ok(VERIFY_READ, i, sizeof(*i)) ||
-          (__get_user(o->tv_sec, &i->tv_sec) |
-           __get_user(o->tv_usec, &i->tv_usec)));
-}
-
-static inline long
-get_tv32(struct timeval *o, struct timeval32 __user *i)
-{
-   return(!access_ok(VERIFY_READ, i, sizeof(*i)) ||
-          (__get_user(o->tv_sec, &i->tv_sec) |
-           __get_user(o->tv_usec, &i->tv_usec)));
-}
-
-const char *
-dcrp_license_feature(int32_t idx)
-{
-#define FEATURESTR(f)      \
-case DCRMIB_LICENSE_ ## f: \
-   return(DCRP_LICENSE_FEATURE_ ## f ## _STR)
-
-   switch (idx)
-   {
-      DCRP_LICENSE_FOREACH_FEATURES(FEATURESTR);
-   }
-
-   return("");
-}
-
-
-static int
-isValidLicenseType(int32_t idx)
-{
-#define CHECKFEATURE(f)    \
-case DCRMIB_LICENSE_ ## f: \
-   return(1)
-
-   switch (idx)
-   {
-      DCRP_LICENSE_FOREACH_FEATURES(CHECKFEATURE);
-   }
-
-   return(n * foo(5));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00071-include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00071-include_define.h
deleted file mode 100644
index 89f11e5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00071-include_define.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define MY_HEADER    <foo/inc.h>
-
-#include MY_HEADER
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00072-align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00072-align-proto.c
deleted file mode 100644
index 15746cd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00072-align-proto.c
+++ /dev/null
@@ -1,4 +0,0 @@
-unsigned int align_here();
-int          this_works(int x);
-int          bug(int); // BUG: left-aligned
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00073-nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00073-nl_proto_endif.c
deleted file mode 100644
index f50766b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00073-nl_proto_endif.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#include <stdio.h>
-
-static void status_cb(status_t *status);
-static int add_conn(const char *path);
-
-#ifdef USE_FOO_CMD
-static void foo_cmd(void *user, const info_t *info);
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00074-clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00074-clang-has_include.h
deleted file mode 100644
index 976de29d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00074-clang-has_include.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if __has_include(<tr1/unordered_set>)
-#include <tr1/unordered_set>
-#endif
-#if __has_include("unordered_set.h") || __has_include_next(<tr1/unordered_set>)
-#include <tr1/unordered_set>
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00076-1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00076-1225.c
deleted file mode 100644
index 5b51cf3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00076-1225.c
+++ /dev/null
@@ -1,6 +0,0 @@
-float        ign_guy(){}
-a            alig_guy(){}
-int          align_guy(){}
-unsigned int align_here();
-int          this_works(int x);
-int          bug(int);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00081-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00081-else-if.c
deleted file mode 100644
index ff5f5b21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00081-else-if.c
+++ /dev/null
@@ -1,28 +0,0 @@
-int test (int A, int B) {
-
-  int C;
-
-  if (A == 0)
-    if (B == 0)
-      C = 1;
-    else if (B == 1)
-      C = 2;
-    else
-      C = 3;
-  else if (A == 1)
-    if (B == 0)
-      C = 4;
-    else if (B == 1)
-      C = 5;
-    else
-      C = 6;
-  else if (B == 0)
-    C = 7;
-  else if (B == 1)
-    C = 8;
-  else
-    C = 9;
-
-  return C;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00082-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00082-else-if.c
deleted file mode 100644
index 06cc37f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00082-else-if.c
+++ /dev/null
@@ -1,29 +0,0 @@
-int test (int A, int B) {
-
-  int C;
-
-  if (A == 0)
-    if (B == 0)
-      C = 1;
-    else if (B == 1)
-      C = 2;
-    else
-      C = 3;
-  else if (A == 1)
-    if (B == 0)
-      C = 4;
-    else if (B == 1)
-      C = 5;
-    else
-      C = 6;
-  else
-    if (B == 0)
-      C = 7;
-    else if (B == 1)
-      C = 8;
-    else
-      C = 9;
-
-  return C;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00091-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00091-cond.c
deleted file mode 100644
index 840d4a6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00091-cond.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-int foo1(bool b, int tv, int fv)
-{
-   return b ? tv : fv;
-}
-
-int foo2(bool b, int tv, int fv)
-{
-   return b ? tv : fv;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00092-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00092-cond.c
deleted file mode 100644
index a718a48b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00092-cond.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-int foo1(bool b, int tv, int fv)
-{
-   return b   ?   tv   : fv;
-}
-
-int foo2(bool b, int tv, int fv)
-{
-   return b ? tv : fv;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00093-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00093-cond.c
deleted file mode 100644
index 8d55652a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00093-cond.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-int foo1(bool b, int tv, int fv)
-{
-   return(b? tv: fv);
-}
-
-int foo2(bool b, int tv, int fv)
-{
-   return(b? tv: fv);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00101-bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00101-bugs-1.c
deleted file mode 100644
index abc2e08e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00101-bugs-1.c
+++ /dev/null
@@ -1,69 +0,0 @@
-int oldfoo(bar)
-char bar;
-{
-   return(bar - 2);
-}
-
-int i2c_use_client(struct i2c_client *client)
-{
-   int ret;
-
-   ret = i2c_inc_use_client(client);
-   if (ret)
-   {
-      return(ret);
-   }
-
-   if ((client->flags & I2C_CLIENT_ALLOW_USE) || (a &&
-                                                  something_else))
-   {
-      if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-      {
-         client->usage_count++;
-      }
-      else if (client->usage_count > 0)
-      {
-         goto busy;
-      }
-      else
-      {
-         client->usage_count++;
-      }
-   }
-
-   return(0);
-
- busy:
-   i2c_dec_use_client(client);
-   return(-EBUSY);
-}
-
-void get_name(void)
-{
-   a = (int)5;
-
-   if (a)
-   {
-      if (b)
-      {
-         b--;
-      }
-      else
-      {
-         a++;
-      }
-   }
-   for (a = 0; a < 10; a++)
-   {
-      if (b)
-      {
-         b--;
-      }
-      else
-      {
-         a++;
-      }
-   }
-   return;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00102-bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00102-bugs-2.c
deleted file mode 100644
index 42bed259..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00102-bugs-2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-static void tcps_proc_server_msg(void *p_user, const ptc_msg_info_t *p_info)
-{
-   if (z)
-   {
-      if (a)
-      /* comment */
-      {
-         a++;
-      }
-      /* comment */
-      else if (b)
-      {
-         b++;
-      }
-      /* Comment */
-      else
-      {
-         c++;
-      }
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00103-bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00103-bugs-3.c
deleted file mode 100644
index 07d410b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00103-bugs-3.c
+++ /dev/null
@@ -1,49 +0,0 @@
-
-#ifdef CRUD
-#define JUNK    a
-#endif
-
-#ifdef __QNX__
-/**
- * Does all that QNX trickery to get the MAC address of the interface
- *
- * @param if_name The interface name: ie "en0" or "eth0"
- * @param mac     Pointer to a 6-byte array
- * @return        SUCCESS or FAILURE
- */
-static INT32 socket_get_mac_qnx(const CHAR *if_name, UINT8 *mac)
-{
-   CHAR  ionet_name[50];
-   INT32 en_fd;
-
-#if QNX_RELEASE >= 630
-   nic_config_t nic;
-   INT32        dcmd = DCMD_IO_NET_GET_CONFIG;
-#else
-   Nic_t        nic;
-   INT32        dcmd = DCMD_IO_NET_NICINFO;
-#endif
-   INT32        ret_val = FAILURE;
-
-   memset(mac, 0, 6);
-
-   /* Build the full name */
-   snprintf(ionet_name, sizeof(ionet_name), "/dev/io-net/%s", if_name);
-
-   /* Open the device */
-   en_fd = open(ionet_name, O_RDWR);
-   if (en_fd >= 0)
-   {
-      /* Get the interface info */
-      if (devctl(en_fd, dcmd, &nic, sizeof(nic), NULL) == EOK)
-      {
-         memcpy(mac, nic.current_address, 6);
-         ret_val = SUCCESS;
-      }
-
-      close(en_fd);
-   }
-   return(ret_val);
-}
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00104-bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00104-bugs-4.c
deleted file mode 100644
index 61885443..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00104-bugs-4.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-static void set_md_connected(CHAR *msg_data)
-{
-   UINT32 rd_idx = 0;
-   CHAR   mobile_device_id[MOBILE_DEVICE_NAME_LEN];
-   CHAR   ip_addr[IP_ADDRESS_LEN];
-   CHAR   mac_addr[MAC_ADDR_LEN];
-   CHAR   ap_name[AP_NAME_LEN];
-
-   rdc_strz(msg_data, MAX_SIZE, &rd_idx, mobile_device_id, 0);
-   rdc_strz(msg_data, MAX_SIZE, &rd_idx, ip_addr, 0);
-   rdc_strz(msg_data, MAX_SIZE, &rd_idx, mac_addr, 0);
-   rdc_strz(msg_data, MAX_SIZE, &rd_idx, ap_name, 0);
-
-#if defined (DB_MGR_ORACLE)
-   (void)db_set_md_connected(mobile_device_id, ip_addr, mac_addr, ap_name);
-   LOG(LFTR, "CONNECTED Loco %s, IP Addr %s,MAC Addr %s, AP Name %s",
-       mobile_device_id, ip_addr, mac_addr, ap_name);
-#elif defined (DB_MGR_FILE)
-   LOG(LFTR, "%s CONNECTED Loco %s, IP Addr %s,MAC Addr %s, AP Name %s",
-       status_str, mobile_device_id, ip_addr, mac_addr, ap_name);
-#else
-#error Unknown device type must be DB_MGR_ORACLE or DB_MGR_FILE
-#endif
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00105-bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00105-bugs-5.c
deleted file mode 100644
index 72bfbe4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00105-bugs-5.c
+++ /dev/null
@@ -1,12 +0,0 @@
-
-static void log_roll_file(log_output_t *plo)
-{
-   INT32      retcode;
-   const CHAR *name_save;
-   const CHAR *name_temp;
-
-   if (plo->pfile != NULL)
-   {
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00106-bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00106-bugs-6.c
deleted file mode 100644
index 302c2328..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00106-bugs-6.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*=-------------------------------------------------------------------------=*\
-*
-|  FUNCTION NAME: mult2
-|
-|  DESCRIPTION:
-|     Multiplies a number by two.
-|
-|  INPUTS/OUTPUTS:
-|     val - the number to double
-|
-|  RETURNS:
-|     val * 2
-*
-\*=-------------------------------------------------------------------------=*/
-int mult2(int val)
-{
-   return(val * 2);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00107-bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00107-bugs-7.c
deleted file mode 100644
index 34fc146e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00107-bugs-7.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-struct somestruct *
-mult2(int val);
-
-somestruct *
-dumb_func(int val);
-
-
-
-struct somestruct *
-mult2(int val)
-{
-   int a;
-
-   a = val + (foo * bar);
-
-   a = val + (bar);
-
-   a = val + (CFoo::bar_t)7;
-
-   a = val + (myfoo.size);
-
-   return(NULL);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00108-bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00108-bugs-8.c
deleted file mode 100644
index 0eae4dff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00108-bugs-8.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-void foo(void)
-{
-   p[0].x = x + (rx * cos(rs));
-   p[0].y = y - (ry * sin(rs));
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00110-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00110-misc.c
deleted file mode 100644
index fdca271b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00110-misc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/********************/
-/* Before Unrustify */
-/********************/
-
-#define MACRO(cond, action)    if ((cond)) (action)
-
-void hurz(murks)
-{
-   if (murks = 4)              // This comment belongs to (murks = 4)
-   {
-      schrott();               // And this to schrott()
-   }
-#ifdef SCHNIEPEL
-   else if (murks = 6)         // This comment belongs to (murks = 6)
-                               // I had to write more comment than one line
-                               // so I inserted some comment only blocks
-   {
-      schniepel();
-   }
-#endif // SCHNIEPEL
-   else
-   {
-      flursen();
-   }
-
-   if (murks = 4)              // This comment belongs to (murks = 4)
-#ifdef FOO
-   {
-      foo();
-   }
-#else
-   {
-      bar();
-   }
-#endif
-   if (murks = 4)                 // This comment belongs to (murks = 4)
-   {
-      schrott();                  // And this to schrott()
-   }
-   return;
-} // hurz()
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00111-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00111-misc.c
deleted file mode 100644
index ad40a4ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00111-misc.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/********************/
-/* Before Unrustify */
-/********************/
-
-#define MACRO( cond, action ) if ((cond)) (action)
-
-void hurz(murks)
-{
-	if (murks = 4) {       // This comment belongs to (murks = 4)
-		schrott();     // And this to schrott()
-	}
-#ifdef SCHNIEPEL
-	else if (murks = 6) {  // This comment belongs to (murks = 6)
-		               // I had to write more comment than one line
-		               // so I inserted some comment only blocks
-		schniepel();
-	}
-#endif // SCHNIEPEL
-	else {
-		flursen();
-	}
-
-	if (murks = 4)         // This comment belongs to (murks = 4)
-#ifdef FOO
-	{
-		foo();
-	}
-#else
-	{
-		bar();
-	}
-#endif
-	if (murks = 4) {          // This comment belongs to (murks = 4)
-		schrott();        // And this to schrott()
-	}
-	return;
-} // hurz()
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00120-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00120-sp_cmt_cpp_start.c
deleted file mode 100644
index 74a333c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00120-sp_cmt_cpp_start.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-//zero
-//one
-//two
-//three
-void foo(void);
-
-////four
-//// five
-//// six
-void bar(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00121-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00121-sp_cmt_cpp_start.c
deleted file mode 100644
index 3160a288..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00121-sp_cmt_cpp_start.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-// zero
-// one
-//  two
-//   three
-void foo(void);
-
-////four
-//// five
-//// six
-void bar(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00122-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00122-sp_cmt_cpp_start.c
deleted file mode 100644
index fe237c5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00122-sp_cmt_cpp_start.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-// zero
-// one
-// two
-// three
-void foo(void);
-
-////four
-//// five
-//// six
-void bar(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00123-cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00123-cmt_reflow.c
deleted file mode 100644
index 44e0cf34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00123-cmt_reflow.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Search the tree for a match that satisfies specific comparison
- * criteria, branch contains the desired data for which to search the
- * tree
- * @param  compareFunc is a binary function object that defines how to
- *                     compare nodes
- * @param  bRetrieve   indicates whether or not the input search
- *                     branch should be modified to reflect a branch
- *                     in the tree, assuming a match satisfying the
- *                     given search criteria exists
- * @return             true if a branch matching the input is found or
- *                     returns nullptr otherwise
- *
- *    It was the best of times, it was the worst of times, it was the
- *    age of wisdom, it was the age of foolishness, it was the epoch
- *    of belief, it was the epoch of incredulity, it was the season of
- *    Light, it was the season of Darkness, it was the spring of hope,
- *    it was the winter of despair, we had everything before us, we
- *    had nothing before us, we were all going direct to Heaven, we
- *    were all going direct the other way--in short, the period was so
- *    far like the present period, that some of its noisiest
- *    authorities insisted on its being received, for good or for
- *    evil, in the superlative degree of comparison only.
- *
- *        There were a king with a large jaw and a queen with a plain
- *        face on the throne of England; there were a king with a
- *        large jaw and a queen with a fair face, on the throne of
- *        France. In both countries it was clearer than crystal to the
- *        lords of the State preserves of loaves and fishes, that
- *        things in general were settled for ever.
- *
- *            It was the year of Our Lord one thousand seven hundred
- *            and seventy-five. Spiritual revelations were conceded to
- *            England at that favoured period, as at this. Mrs.
- *            Southcott had recently attained her five-and-twentieth
- *            blessed birthday, of whom a prophetic private in the
- *            Life Guards had heralded the sublime appearance by
- *            announcing that arrangements were made for the
- *            swallowing up of London and Westminster. Even the
- *            Cock-lane ghost had been laid only a round dozen of
- *            years, after rapping out its messages, as the spirits of
- *            this very year last past (supernaturally deficient in
- *            originality) rapped out theirs. Mere messages in the
- *            earthly order of events had lately come to the English
- *            Crown and People, from a congress of British subjects in
- *            America: which, strange to relate, have proved more
- *            important to the human race than any communications yet
- *            received through any of the chickens of the Cock-lane
- *            brood.
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00130-minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00130-minus-minus.c
deleted file mode 100644
index debe70a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00130-minus-minus.c
+++ /dev/null
@@ -1,33 +0,0 @@
-int a  = 5;
-int *b = &a;
-int negneg(void)
-{
-   return(- -a);
-}
-
-int pospos(void)
-{
-   return(+ +a);
-}
-
-int negpos(void)
-{
-   return(- +a);
-}
-
-int posneg(void)
-{
-   return(+ -a);
-}
-
-#if VERSION < -5
-int negnegneg(void)
-{
-   return(- - -a);
-}
-#else
-int negat(void)
-{
-   return(-*b);
-}
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00135-br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00135-br_cmt.c
deleted file mode 100644
index 9e6c6de9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00135-br_cmt.c
+++ /dev/null
@@ -1,14 +0,0 @@
-int main()
-{
-	if( foo == bar )
-	{ /* this works */
-		a;
-	}else
-	if( ranz != bar )
-	{ /* this works too */
-		b;
-	}else
-	{ /* this is broken */
-		c;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00140-global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00140-global-vars.c
deleted file mode 100644
index 0df79336..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00140-global-vars.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-static int       another_try;
-struct something yup;
-align_me_t       please;
-const char       *name = "hello";
-static nothing   really;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00141-deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00141-deref.c
deleted file mode 100644
index a7ad3f5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00141-deref.c
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo(int *pA, int *pB)
-{
-   *pB = some.arr[*pA];
-
-   foo(sizeof bar / sizeof *bar, baz);
-}
-
-#define MEM_READ_BYTE(phwi, addr, data) \
-   *data = *((PUCHAR)((phwi)->m_pVirtualMemory + addr))
-
-#define MEM_WRITE_BYTE(phwi, addr, data) \
-   *((PUCHAR)((phwi)->m_pVirtualMemory + addr)) = (UCHAR)(data)
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00142-type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00142-type-cast.c
deleted file mode 100644
index 93076825..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00142-type-cast.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-void foo(void)
-{
-   drab bar;
-
-   bar = (bat) * r;
-   bar = (int)*r;
-   bar = (UINT8)*r;
-   bar = (time_t)*r;
-
-   a  = &arg[dog * 13];
-   b  = arg[dog * cat];
-   hc = "0123456789ABCDEF"[0xf & *val];
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00143-t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00143-t3.in.c
deleted file mode 100644
index b40fbd17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00143-t3.in.c
+++ /dev/null
@@ -1,10 +0,0 @@
-extern /*@observer@*/ /*@null@*/ const dcroid_t *dcrp_oidget
-(
-   /*@in@*/ const char *h,
-   /*@in@*/ const char *t
-) /*@ensures maxRead(result) >= 0@*/;
-
-extern /*@observer@*/ const char *dcrp_oidlabel
-(
-   /*@in@*/ const dcroid_t *oid
-);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00144-align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00144-align-proto-vars.c
deleted file mode 100644
index c7bf6081..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00144-align-proto-vars.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int doStuff(int   i,
-            float f);
-
-int doStuff(int   i,
-            float f);
-
-
-MACRO_MODIFIER int doStuff(int   i,
-                           float f);
-
-typedef void (*my_callback)(int  id,
-                            void *context);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00145-vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00145-vardefcol.c
deleted file mode 100644
index 1238be0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00145-vardefcol.c
+++ /dev/null
@@ -1,14 +0,0 @@
-static string foo,
-              bar;
-
-void f()
-{
-   SomeNamedType *var1,
-                 *var2;
-}
-
-void b()
-{
-   AnotherType var1,
-               var2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00150-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00150-casts.c
deleted file mode 100644
index d89ad598..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00150-casts.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#define SOME_VAL1    ((MYINT)-1)
-#define SOME_VAL2    (-2)
-#define SOME_VAL3    -3
-#define MULT(X, Y)    (X)*(Y)
-#define SOME_JUNK    /*lint -e123 */ (const mytype *)-1
-
-typedef (*my_fcn_ptr_t)(char *, int);
-typedef (my_fcn_t)(char *, int);
-
-void foo(void)
-{
-   uint crc = crc32_calc_full((const UINT8 *)"String", 6);
-
-   crc = crc32_calc_full((const UINT8 *)&crc, sizeof(crc));
-
-   a = (b) - 4;
-
-   a = (UINT)-4;
-   a = (UINT)+4;
-   a = (UINT) * 4;
-   a = (UINT) & 4;
-
-   a = (uint32_t)-pb;
-   a = (uint32_t) + pb;
-   a = (uint32_t)*pb;
-   a = (uint32_t)&pb;
-
-   a = (Uint) - 4;
-   a = (Uint) + 4;
-   a = (Uint) * 4;
-   a = (Uint) & 4;
-
-   a = b * (int)flt;
-   a = b * ((int)flt);
-
-   a = b * (int)flt;
-   a = b * (INT8)flt;
-   a = b * (Uint)flt;
-
-   a = *(int)&b;
-   a = *(CHAR)&b;
-   a = *(Uint) & b;
-
-   a = (int)*pb;
-   a = (CHAR)*pb;
-   a = (Uint) * pb;
-
-   a = (int)'a';
-   a = (UINT8)'a';
-   a = (Uint)'a';
-
-   a = (int)*'a';
-   a = (UINT8) * 'a';
-   a = (Uint) * 'a';
-
-   a = (int)*5;
-   a = (UINT) * 5;
-   a = (Uint) * 5;
-
-   a = (int)*ape;
-   a = (UINT)*ape;
-   a = (Uint) * ape;
-
-   a = (int)ape;
-   a = (UINT)ape;
-   a = (Uint)ape;
-
-   a = (int)sizeof(x);
-   a = (INT16)sizeof(x);
-   a = (Uint)sizeof(x);
-
-   a = (int)foo(x);
-   a = (CHAR)foo(x);
-   a = (Uint)foo(x);
-
-   a = (int)(x);
-   a = (CHAR)(x);
-   a = (Uint)(x);
-
-   a = (int)*(x);
-   a = (CHAR)*(x);
-   a = (Uint) * (x);
-
-   a = (unsigned int)(1 + 4);
-   a = (int)(1 + 1);
-   a = (void *)(&str);
-} /* foo */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00151-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00151-casts.c
deleted file mode 100644
index 9f2a13de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00151-casts.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#define SOME_VAL1    ((MYINT)-1)
-#define SOME_VAL2    (-2)
-#define SOME_VAL3    -3
-#define MULT(X, Y)    (X)*(Y)
-#define SOME_JUNK    /*lint -e123 */ (const mytype *)-1
-
-typedef (*my_fcn_ptr_t)(char *, int);
-typedef (my_fcn_t)(char *, int);
-
-void foo(void)
-{
-   uint crc = crc32_calc_full((const UINT8 *)"String", 6);
-
-   crc = crc32_calc_full((const UINT8 *)&crc, sizeof(crc));
-
-   a = (b) - 4;
-
-   a = (UINT)-4;
-   a = (UINT)+4;
-   a = (UINT) * 4;
-   a = (UINT) & 4;
-
-   a = (uint32_t)-pb;
-   a = (uint32_t) + pb;
-   a = (uint32_t)*pb;
-   a = (uint32_t)&pb;
-
-   a = (Uint) - 4;
-   a = (Uint) + 4;
-   a = (Uint) * 4;
-   a = (Uint) & 4;
-
-   a = b * (int)flt;
-   a = b * ((int)flt);
-
-   a = b * (int)flt;
-   a = b * (INT8)flt;
-   a = b * (Uint)flt;
-
-   a = *(int)&b;
-   a = *(CHAR)&b;
-   a = *(Uint) & b;
-
-   a = (int)*pb;
-   a = (CHAR)*pb;
-   a = (Uint) * pb;
-
-   a = (int)'a';
-   a = (UINT8)'a';
-   a = (Uint)'a';
-
-   a = (int)*'a';
-   a = (UINT8) * 'a';
-   a = (Uint) * 'a';
-
-   a = (int)*5;
-   a = (UINT) * 5;
-   a = (Uint) * 5;
-
-   a = (int)*ape;
-   a = (UINT)*ape;
-   a = (Uint) * ape;
-
-   a = (int)ape;
-   a = (UINT)ape;
-   a = (Uint)ape;
-
-   a = (int)sizeof(x);
-   a = (INT16)sizeof(x);
-   a = (Uint)sizeof(x);
-
-   a = (int)foo(x);
-   a = (CHAR)foo(x);
-   a = (Uint)foo(x);
-
-   a = (int)(x);
-   a = (CHAR)(x);
-   a = (Uint)(x);
-
-   a = (int)*(x);
-   a = (CHAR)*(x);
-   a = (Uint) * (x);
-
-   a = (unsigned int)(1 + 4);
-   a = (int)(1 + 1);
-   a = (void *)(&str);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00152-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00152-casts.c
deleted file mode 100644
index acc2ebe4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00152-casts.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#define SOME_VAL1    (( MYINT )-1)
-#define SOME_VAL2    (-2)
-#define SOME_VAL3    -3
-#define MULT(X, Y)    ( X )*(Y)
-#define SOME_JUNK    /*lint -e123 */ ( const mytype * )-1
-
-typedef (*my_fcn_ptr_t)(char *, int);
-typedef (my_fcn_t)(char *, int);
-
-void foo(void)
-{
-   uint crc = crc32_calc_full(( const UINT8 * )"String", 6);
-
-   crc = crc32_calc_full(( const UINT8 * )&crc, sizeof(crc));
-
-   a = (b) - 4;
-
-   a = ( UINT )-4;
-   a = ( UINT )+4;
-   a = (UINT) * 4;
-   a = (UINT) & 4;
-
-   a = ( uint32_t )-pb;
-   a = (uint32_t) + pb;
-   a = ( uint32_t )*pb;
-   a = ( uint32_t )&pb;
-
-   a = (Uint) - 4;
-   a = (Uint) + 4;
-   a = (Uint) * 4;
-   a = (Uint) & 4;
-
-   a = b * ( int )flt;
-   a = b * (( int )flt);
-
-   a = b * ( int )flt;
-   a = b * ( INT8 )flt;
-   a = b * ( Uint )flt;
-
-   a = *( int )&b;
-   a = *( CHAR )&b;
-   a = *(Uint) & b;
-
-   a = ( int )*pb;
-   a = ( CHAR )*pb;
-   a = (Uint) * pb;
-
-   a = ( int )'a';
-   a = ( UINT8 )'a';
-   a = ( Uint )'a';
-
-   a = ( int )*'a';
-   a = (UINT8) * 'a';
-   a = (Uint) * 'a';
-
-   a = ( int )*5;
-   a = (UINT) * 5;
-   a = (Uint) * 5;
-
-   a = ( int )*ape;
-   a = ( UINT )*ape;
-   a = (Uint) * ape;
-
-   a = ( int )ape;
-   a = ( UINT )ape;
-   a = ( Uint )ape;
-
-   a = ( int )sizeof(x);
-   a = ( INT16 )sizeof(x);
-   a = ( Uint )sizeof(x);
-
-   a = ( int )foo(x);
-   a = ( CHAR )foo(x);
-   a = ( Uint )foo(x);
-
-   a = ( int )(x);
-   a = ( CHAR )(x);
-   a = ( Uint )(x);
-
-   a = ( int )*(x);
-   a = ( CHAR )*(x);
-   a = (Uint) * (x);
-
-   a = ( unsigned int )(1 + 4);
-   a = ( int )(1 + 1);
-   a = ( void * )(&str);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00153-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00153-casts.c
deleted file mode 100644
index 8bf710b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00153-casts.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#define SOME_VAL1    ((MYINT)-1)
-#define SOME_VAL2    (-2)
-#define SOME_VAL3    -3
-#define MULT(X, Y)    (X)*(Y)
-#define SOME_JUNK    /*lint -e123 */ (const mytype *)-1
-
-typedef (*my_fcn_ptr_t)(char *, int);
-typedef (my_fcn_t)(char *, int);
-
-void foo(void)
-{
-   uint crc = crc32_calc_full((const UINT8 *)"String", 6);
-
-   crc = crc32_calc_full((const UINT8 *)&crc, sizeof(crc));
-
-   a = (b) - 4;
-
-   a = (UINT)-4;
-   a = (UINT)+4;
-   a = (UINT)*4;
-   a = (UINT)&4;
-
-   a = (uint32_t)-pb;
-   a = (uint32_t)+pb;
-   a = (uint32_t)*pb;
-   a = (uint32_t)&pb;
-
-   a = (Uint)-4;
-   a = (Uint)+4;
-   a = (Uint)*4;
-   a = (Uint)&4;
-
-   a = b * (int)flt;
-   a = b * ((int)flt);
-
-   a = b * (int)flt;
-   a = b * (INT8)flt;
-   a = b * (Uint)flt;
-
-   a = *(int)&b;
-   a = *(CHAR)&b;
-   a = *(Uint)&b;
-
-   a = (int)*pb;
-   a = (CHAR)*pb;
-   a = (Uint)*pb;
-
-   a = (int)'a';
-   a = (UINT8)'a';
-   a = (Uint)'a';
-
-   a = (int)*'a';
-   a = (UINT8)*'a';
-   a = (Uint)*'a';
-
-   a = (int)*5;
-   a = (UINT)*5;
-   a = (Uint)*5;
-
-   a = (int)*ape;
-   a = (UINT)*ape;
-   a = (Uint)*ape;
-
-   a = (int)ape;
-   a = (UINT)ape;
-   a = (Uint)ape;
-
-   a = (int)sizeof(x);
-   a = (INT16)sizeof(x);
-   a = (Uint)sizeof(x);
-
-   a = (int)foo(x);
-   a = (CHAR)foo(x);
-   a = (Uint)foo(x);
-
-   a = (int)(x);
-   a = (CHAR)(x);
-   a = (Uint)(x);
-
-   a = (int)*(x);
-   a = (CHAR)*(x);
-   a = (Uint)*(x);
-
-   a = (unsigned int)(1 + 4);
-   a = (int)(1 + 1);
-   a = (void *)(&str);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00154-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00154-casts.c
deleted file mode 100644
index fca4010b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00154-casts.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#define SOME_VAL1    ((MYINT) -1)
-#define SOME_VAL2    (-2)
-#define SOME_VAL3    -3
-#define MULT(X, Y)    (X) *(Y)
-#define SOME_JUNK    /*lint -e123 */ (const mytype *) -1
-
-typedef (*my_fcn_ptr_t)(char *, int);
-typedef (my_fcn_t)(char *, int);
-
-void foo(void)
-{
-   uint crc = crc32_calc_full((const UINT8 *) "String", 6);
-
-   crc = crc32_calc_full((const UINT8 *) &crc, sizeof(crc));
-
-   a = (b) - 4;
-
-   a = (UINT) -4;
-   a = (UINT) +4;
-   a = (UINT) * 4;
-   a = (UINT) & 4;
-
-   a = (uint32_t) -pb;
-   a = (uint32_t) + pb;
-   a = (uint32_t) *pb;
-   a = (uint32_t) &pb;
-
-   a = (Uint) - 4;
-   a = (Uint) + 4;
-   a = (Uint) * 4;
-   a = (Uint) & 4;
-
-   a = b * (int) flt;
-   a = b * ((int) flt);
-
-   a = b * (int) flt;
-   a = b * (INT8) flt;
-   a = b * (Uint) flt;
-
-   a = *(int) &b;
-   a = *(CHAR) &b;
-   a = *(Uint) & b;
-
-   a = (int) *pb;
-   a = (CHAR) *pb;
-   a = (Uint) * pb;
-
-   a = (int) 'a';
-   a = (UINT8) 'a';
-   a = (Uint) 'a';
-
-   a = (int) *'a';
-   a = (UINT8) * 'a';
-   a = (Uint) * 'a';
-
-   a = (int) *5;
-   a = (UINT) * 5;
-   a = (Uint) * 5;
-
-   a = (int) *ape;
-   a = (UINT) *ape;
-   a = (Uint) * ape;
-
-   a = (int) ape;
-   a = (UINT) ape;
-   a = (Uint) ape;
-
-   a = (int) sizeof(x);
-   a = (INT16) sizeof(x);
-   a = (Uint) sizeof(x);
-
-   a = (int) foo(x);
-   a = (CHAR) foo(x);
-   a = (Uint) foo(x);
-
-   a = (int) (x);
-   a = (CHAR) (x);
-   a = (Uint) (x);
-
-   a = (int) *(x);
-   a = (CHAR) *(x);
-   a = (Uint) * (x);
-
-   a = (unsigned int) (1 + 4);
-   a = (int) (1 + 1);
-   a = (void *) (&str);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00155-cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00155-cast_brace.c
deleted file mode 100644
index 6e8f12b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00155-cast_brace.c
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-void disappearing_semicolon(void)
-{
-   r = (recordtypecast){
-      a, b, c
-   };                          //<--
-   p = Table_put(t, a, &r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00160-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00160-fcn_indent.c
deleted file mode 100644
index 23c173c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00160-fcn_indent.c
+++ /dev/null
@@ -1,35 +0,0 @@
-int this_is_a_function_proto(int a,
-	char * b);
-
-int this_is_a_function_def(int a,
-	char * b)
-{
-	this_is_a_function_call(a,
-		b);
-
-	a = another_function_call(a,
-		b);
-
-}
-
-typedef const char * pu8_t;
-
-typedef short (*hello1)(char coolParam,
-	ushort *,
-	unsigned int anotherone);
-
-typedef const unsigned char * (getfcn_t)(
-	int idx, ulong op);
-
-short (*hello2)(char coolParam,
-	ulong *,
-	uchar,
-	unsigned int anotherone);
-
-const unsigned char * (*getstr) (
-	int idx,
-	ulong op);
-
-short hello3 (char coolParam,
-	ushort *,
-	unsigned int anotherone);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00161-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00161-fcn_indent.c
deleted file mode 100644
index 90342554..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00161-fcn_indent.c
+++ /dev/null
@@ -1,36 +0,0 @@
-int this_is_a_function_proto(int a,
-                             char * b);
-
-int
-this_is_a_function_def(int a,
-                       char * b)
-{
-	this_is_a_function_call(a,
-		b);
-
-	a = another_function_call(a,
-		b);
-
-}
-
-typedef const char * pu8_t;
-
-typedef short (*hello1)(char coolParam,
-                        ushort *,
-                        unsigned int anotherone);
-
-typedef const unsigned char * (getfcn_t)(
-	int idx, ulong op);
-
-short (*hello2)(char coolParam,
-                ulong *,
-                uchar,
-                unsigned int anotherone);
-
-const unsigned char * (*getstr) (
-	int idx,
-	ulong op);
-
-short hello3 (char coolParam,
-              ushort *,
-              unsigned int anotherone);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00162-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00162-fcn_indent.c
deleted file mode 100644
index c8f152d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00162-fcn_indent.c
+++ /dev/null
@@ -1,37 +0,0 @@
-int
-this_is_a_function_proto(int a,
-                         char * b);
-
-int this_is_a_function_def(int a,
-	char * b)
-{
-	this_is_a_function_call(a,
-	                        b);
-
-	a = another_function_call(a,
-	                          b);
-
-}
-
-typedef const char * pu8_t;
-
-typedef short (*hello1)(char coolParam,
-                        ushort *,
-                        unsigned int anotherone);
-
-typedef const unsigned char * (getfcn_t)(
-	int idx, ulong op);
-
-short (*hello2)(char coolParam,
-                ulong *,
-                uchar,
-                unsigned int anotherone);
-
-const unsigned char * (*getstr) (
-	int idx,
-	ulong op);
-
-short
-hello3 (char coolParam,
-        ushort *,
-        unsigned int anotherone);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00163-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00163-fcn_indent.c
deleted file mode 100644
index bbf36763..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00163-fcn_indent.c
+++ /dev/null
@@ -1,35 +0,0 @@
-int this_is_a_function_proto(int a,
-	char * b);
-
-int this_is_a_function_def(int a,
-                           char * b)
-{
-	this_is_a_function_call(a,
-	                        b);
-
-	a = another_function_call(a,
-	                          b);
-
-}
-
-typedef const char * pu8_t;
-
-typedef short (*hello1)(char coolParam,
-	ushort *,
-	unsigned int anotherone);
-
-typedef const unsigned char * (getfcn_t)(
-	int idx, ulong op);
-
-short (*hello2)(char coolParam,
-	ulong *,
-	uchar,
-	unsigned int anotherone);
-
-const unsigned char * (*getstr) (
-	int idx,
-	ulong op);
-
-short hello3 (char coolParam,
-	ushort *,
-	unsigned int anotherone);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00164-fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
deleted file mode 100644
index c029669a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#if A
-   /* dfsdsdfd */
-   int X;
-#endif
-
-#if A
-   void func1_1(void);
-
-#endif
-
-#if A
-   #if A
-      int X1;
-void func1_1(void)
-{
-   #if A
-      /* ttiti */
-      if (B)
-      {
-         #if A
-            /* dsfdf */
-            a = 5;
-         #endif
-      }
-   #endif
-}
-
-      int Y1;
-
-void func1_2(void)
-{
-}
-
-      int Z1;
-   #endif
-#endif
-
-#if A
-   #if A
-      int X2;
-/* fsdsfd */
-void func2_1(void)
-{
-   #if A
-      /* ttiti */
-      if (B)
-      {
-         #if A
-            /* dsfdf */
-            a = 5;
-         #endif
-      }
-   #endif
-}
-
-      int Y2;
-   #endif
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
deleted file mode 100644
index af30d708..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
+++ /dev/null
@@ -1 +0,0 @@
-USER( foo[0] );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00170-beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00170-beautifier-off.c
deleted file mode 100644
index 351d76ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00170-beautifier-off.c
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + bar2), bar3, bar4);
-
-/* *INDENT-OFF* */
-   int foo[] = {
-      1,   3,   5,
-      3,   5,   7,
-      5,   7,   9,
-   };
-/* *INDENT-ON* */
-
-#define multilinemacro do { (x+5); } while (0); \
-	printf("a multilinemacro"); \
-	printf("a multilinemacro2");
-
-int main(int argc, char *argv[])
-{
-/* *INDENT-OFF* */
-
-   int a, b;
-a = 1; // stupid comment \
-b = 2;
-
-/* *INDENT-ON* */
-	return(a+b);
-}
-
-/* *INDENT-OFF* */
-int a;
-/* *INDENT-ON* */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00180-lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00180-lvalue.c
deleted file mode 100644
index a8121da4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00180-lvalue.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()
-{
-  if (c*ssize < initialCapacity) ;
-  if (Item* item=nextItem()) ;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00201-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00201-case.c
deleted file mode 100644
index 0d004c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00201-case.c
+++ /dev/null
@@ -1,73 +0,0 @@
-void foo(void)
-{
-	switch(ch)
-	{
-	// handle 'a'
-	case 'a':
-	{
-		handle_a();
-		multiline(123,
-		          345);
-		break;
-	}
-
-	// handle 'b'
-	case 'b':
-		handle_b();
-		multiline(123,
-		          345);
-		break;
-
-	// handle 'c' and 'd'
-	case 'c':
-	case 'd':
-		// c and d are really the same thing
-		handle_cd();
-		multiline(123,
-		          345);
-		break;
-
-	case 'e':
-	{
-		handle_a();
-		multiline(123,
-		          345);
-	}
-	break;
-
-	// case1
-	case (case1):
-	{
-		//do stuff
-		break;
-	}
-
-	case (case2):
-	{
-		//do stuff
-		break;
-	}
-
-	case (case3):
-
-		/*do stuff*/
-		break;
-
-	case (case3):
-		statement();
-		{
-			another_statement();
-		}
-		break;
-
-	// really should not get here
-	default:
-		handle_default();
-		multiline(123,
-		          345);
-		break;
-	}
-	multiline(123,
-	          345);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00202-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00202-case.c
deleted file mode 100644
index d5175084..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00202-case.c
+++ /dev/null
@@ -1,73 +0,0 @@
-void foo(void)
-{
-	switch(ch)
-	{
-		// handle 'a'
-		case 'a':
-		{
-			handle_a();
-			multiline(123,
-			          345);
-			break;
-		}
-
-		// handle 'b'
-		case 'b':
-			handle_b();
-			multiline(123,
-			          345);
-			break;
-
-		// handle 'c' and 'd'
-		case 'c':
-		case 'd':
-			// c and d are really the same thing
-			handle_cd();
-			multiline(123,
-			          345);
-			break;
-
-		case 'e':
-		{
-			handle_a();
-			multiline(123,
-			          345);
-			break;
-		}
-
-		// case1
-		case (case1):
-		{
-			//do stuff
-			break;
-		}
-
-		case (case2):
-		{
-			//do stuff
-			break;
-		}
-
-		case (case3):
-
-			/*do stuff*/
-			break;
-
-		case (case3):
-			statement();
-			{
-				another_statement();
-			}
-			break;
-
-		// really should not get here
-		default:
-			handle_default();
-			multiline(123,
-			          345);
-			break;
-	}
-	multiline(123,
-	          345);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00203-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00203-case.c
deleted file mode 100644
index 548a2a64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00203-case.c
+++ /dev/null
@@ -1,73 +0,0 @@
-void foo(void)
-{
-	switch(ch)
-	{
-		// handle 'a'
-		case 'a':
-	{
-		handle_a();
-		multiline(123,
-		          345);
-		break;
-	}
-
-		// handle 'b'
-		case 'b':
-			handle_b();
-			multiline(123,
-			          345);
-			break;
-
-		// handle 'c' and 'd'
-		case 'c':
-		case 'd':
-			// c and d are really the same thing
-			handle_cd();
-			multiline(123,
-			          345);
-			break;
-
-		case 'e':
-	{
-		handle_a();
-		multiline(123,
-		          345);
-	}
-	break;
-
-		// case1
-		case (case1):
-	{
-		//do stuff
-		break;
-	}
-
-		case (case2):
-	{
-		//do stuff
-		break;
-	}
-
-		case (case3):
-
-			/*do stuff*/
-			break;
-
-		case (case3):
-			statement();
-			{
-				another_statement();
-			}
-			break;
-
-		// really should not get here
-		default:
-			handle_default();
-			multiline(123,
-			          345);
-			break;
-	}
-	multiline(123,
-	          345);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00204-bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00204-bug_1718.c
deleted file mode 100644
index eaddc974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00204-bug_1718.c
+++ /dev/null
@@ -1,8 +0,0 @@
-switch (code)
-{
-case A:
-#ifdef XXX
-	func(code);
-#endif
-	break;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00205-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00205-case-nl_before_return.c
deleted file mode 100644
index b650d7ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00205-case-nl_before_return.c
+++ /dev/null
@@ -1,77 +0,0 @@
-int foo(int arg)
-{
-	switch (arg)
-	{
-	case 0: return 1;
-	case 1:
-		return 2;
-	case 2:
-		printf("Hello world!\n");
-		return 3;
-	case 3:
-	{
-		int a = 4;
-		return a;
-	}
-	case 4:
-
-		return 5;
-	case 5:
-		printf("Hello world!\n");
-
-		return 6;
-	case 6:
-	{
-		int a = 7;
-
-		return a;
-	}
-	case 7: /* comment */ return 8;
-	case 8:
-		/* C-style comment */
-		return 9;
-	case 9: /* trailing comment */
-		return 10;
-	case 10: /* trailing comment */
-		/* C-style comment */
-		return 11;
-	case 11:
-		// C++-style comment
-		return 12;
-	case 12:
-		// Multi-line
-		// C++-style comment
-		return 13;
-	case 13: // trailing comment
-		// Multi-line
-		// C++-style comment
-		return 14;
-	case 14:
-
-		// Multi-line
-		// C++-style comment
-		return 15;
-	case 15:
-
-		/* C-style comment */
-		return 16;
-	case 16:
-		/*
-		 * Multi-line C-style comment
-		 */
-		return 17;
-	case 17:
-		/*--------------------*/
-		/* Multi-part comment */
-		/*--------------------*/
-		return 18;
-	case 18:
-		/*---------------------*/
-		// Mixed-style comment
-		/*---------------------*/
-		return 19;
-	default:
-		return arg++;
-	}
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00206-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00206-case-nl_before_return.c
deleted file mode 100644
index d0b6bbbb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00206-case-nl_before_return.c
+++ /dev/null
@@ -1,80 +0,0 @@
-int foo(int arg)
-{
-	switch (arg)
-	{
-	case 0: return 1;
-	case 1:
-		return 2;
-	case 2:
-		printf("Hello world!\n");
-
-		return 3;
-	case 3:
-	{
-		int a = 4;
-
-		return a;
-	}
-	case 4:
-
-		return 5;
-	case 5:
-		printf("Hello world!\n");
-
-		return 6;
-	case 6:
-	{
-		int a = 7;
-
-		return a;
-	}
-	case 7: /* comment */ return 8;
-	case 8:
-		/* C-style comment */
-		return 9;
-	case 9: /* trailing comment */
-		return 10;
-	case 10: /* trailing comment */
-		/* C-style comment */
-		return 11;
-	case 11:
-		// C++-style comment
-		return 12;
-	case 12:
-		// Multi-line
-		// C++-style comment
-		return 13;
-	case 13: // trailing comment
-		// Multi-line
-		// C++-style comment
-		return 14;
-	case 14:
-
-		// Multi-line
-		// C++-style comment
-		return 15;
-	case 15:
-
-		/* C-style comment */
-		return 16;
-	case 16:
-		/*
-		 * Multi-line C-style comment
-		 */
-		return 17;
-	case 17:
-		/*--------------------*/
-		/* Multi-part comment */
-		/*--------------------*/
-		return 18;
-	case 18:
-		/*---------------------*/
-		// Mixed-style comment
-		/*---------------------*/
-		return 19;
-	default:
-		return arg++;
-	}
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00301-align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00301-align-struct-init.c
deleted file mode 100644
index cfa44035..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00301-align-struct-init.c
+++ /dev/null
@@ -1,52 +0,0 @@
-
-const char *token_names[] =
-{
-   [CT_POUND]        = "POUND",
-   [CT_PREPROC]      = "PREPROC",
-   [CT_PREPROC_BODY] = "PREPROC_BODY",
-   [CT_PP]           = "PP",
-   [CT_ELIPSIS]      = "ELIPSIS",
-   [CT_NAMESPACE]    = "NAMESPACE",
-   [CT_NEW]          = "NEW",
-   [CT_OPERATOR]     = "OPERATOR",
-   [CT_THROW]        = "THROW",
-   [CT_TRY]          = "TRY",
-   [CT_USING]        = "USING",
-   [CT_PAREN_OPEN]   = "PAREN_OPEN",
-};
-
-
-int main(int argc, char *argv[])
-{
-   struct junk a[] =
-   {
-      { "version",  0,   0,   0 },
-      { "file",     1, 150, 'f' },
-      { "config",   1,   0, 'c' },
-      { "parsed",  25,   0, 'p' },
-      { NULL,       0,   0,   0 }
-   };
-}
-
-color_t colors[] =
-{
-   { "red",   { 255, 0,   0 } }, { "blue",   {   0, 255, 0 } },
-   { "green", {   0, 0, 255 } }, { "purple", { 255, 255, 0 } },
-};
-
-struct foo_t bar =
-{
-   .name = "bar",
-   .age  = 21
-};
-
-
-
-struct foo_t bars[] =
-{
-   [0] = { .name = "bar",
-           .age  = 21 },
-   [1] = { .name = "barley",
-           .age  = 55 },
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00302-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00302-one-liner-init.c
deleted file mode 100644
index 63c86afe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00302-one-liner-init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-
-enum boo { FOO = 1 };
-
-void foo(void)
-{
-   char str[123] = { 0 };
-
-   enum hoo { NOO = 1 };
-
-   strcat(str, "foo");
-}
-
-void f()
-{
-   if (bar())
-   {
-      baz(1);
-   }
-   else
-   {
-      baz(2);
-   }
-}
-
-int foo()
-{
-   return(0);
-}
-
-void foo(int a, int b)
-{
-   if (a == b)
-   {
-      a++;
-   }
-   else
-   {
-      b++;
-   }
-   if (a == b)
-   {
-      a++;
-   }
-   else
-   {
-      b++;
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00303-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00303-one-liner-init.c
deleted file mode 100644
index 503eedfb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00303-one-liner-init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-enum boo
-{
-   FOO = 1
-};
-
-void foo(void)
-{
-   char str[123] =
-   {
-      0
-   };
-
-   enum hoo
-   {
-      NOO = 1
-   };
-
-   strcat(str, "foo");
-}
-
-void f()
-{
-   if (bar())
-      baz(1);
-   else
-      baz(2);
-}
-
-int foo()
-{
-   return 0;
-}
-
-void foo(int a, int b)
-{
-   if (a == b)
-   {
-      a++;
-   }
-   else
-   {
-      b++;
-   }
-   if (a == b)
-      a++;
-   else
-      b++;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00304-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00304-one-liner-init.c
deleted file mode 100644
index 471aaa2d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00304-one-liner-init.c
+++ /dev/null
@@ -1,22 +0,0 @@
-enum boo { FOO = 1 };
-
-void foo(void)
-{
-   char str[123] = { 0 };
-
-   enum hoo { NOO = 1 };
-
-   strcat(str, "foo");
-}
-
-void f() { if (bar()) { baz(1); } else { baz(2); } }
-
-int foo() { return(0); }
-
-void foo(int a, int b)
-{
-   if (a == b) { a++; }
-   else { b++; }
-   if (a == b) { a++; }
-   else { b++; }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00305-one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00305-one-liner-define.c
deleted file mode 100644
index 99f24f5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00305-one-liner-define.c
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-
-#define LOG_FMT(sev, args...) \
-   do { foo(); } while (0)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00310-sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00310-sp_embed_comment.c
deleted file mode 100644
index 3dc105aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00310-sp_embed_comment.c
+++ /dev/null
@@ -1,8 +0,0 @@
-void f();
-void g(int);
-void h()
-{
-	f(/*foo*/);
-	g(42 /*foo*/);
-	g(/*foo*/ 42);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00320-indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00320-indent_first_bool_expr.c
deleted file mode 100644
index 0dcaa413..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00320-indent_first_bool_expr.c
+++ /dev/null
@@ -1,53 +0,0 @@
-void test(void)

-{

-   b1 = a & b

-        || c == d;

-   b2 = (a & b)

-        || c == d;

-   b3 = (  a & b

-        || c == d);

-

-

-   if (  (a == 3)

-      && (b == 2 & c)

-      || d

-      && r)

-   {

-   }

-

-

-   if (  /*test*/ a

-      || b)

-   {

-   }

-

-   if (  /*test*/ a

-      || /*truc*/ b)

-   {

-   }

-

-   if (  a/*test*/

-      || b)

-   {

-   }

-

-   if (  a

-      || /*test*/ b)

-   {

-   }

-

-   a = 3;

-   if (  (aaaaaaaaaaaaaaa == sqddqsqsdqsdqsd)

-      && (  dfdssdfsdfsdfsdfs

-         || (qsdfsdfsdfqsdfqsdfqsdsd == fsdqfsdfsdfsdf)))

-   {

-      a++;

-   }

-

-   while (  (aaaaaaaaaaaaaaa == sqddqsqsdqsdqsd)

-         && (  dfdssdfsdfsdfsdfs

-            || (qsdfsdfsdfqsdfqsdfqsdsd == fsdqfsdfsdfsdf)))

-   {

-      a++;

-   }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00401-align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00401-align-equ.c
deleted file mode 100644
index 9b213f96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00401-align-equ.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// note - set threshold to three
-void foo(void)
-{
-   a      = 1;
-   bb     = 2;
-   ccc    = 3;
-   dddd   = 4;
-   eeeee  = 5;
-   ffffff = 6;
-
-
-
-   a = 1;
-   eeeeee  = 5;
-   fffffff = 6;
-
-
-
-   a      = 1;
-   eeeee  = 5;
-   ccc    = 3;
-   ffffff = 6;
-
-
-   a      = 1;
-   iiiiiiiiiiiiieeeee = 5;
-   ccc    = 3;
-   ffffff = 6;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00402-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00402-align-var.c
deleted file mode 100644
index d7396d46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00402-align-var.c
+++ /dev/null
@@ -1,54 +0,0 @@
-struct foo1
-{
-   unsigned int   d_ino;
-   const char *   d_reclen;
-   unsigned short d_namlen;
-   char           d_name[1];
-};
-
-struct foo2
-{
-   unsigned int   a   : 1;
-   unsigned int   bcd : 3;
-   unsigned int   ef  : 2;
-   unsigned int       : 2;
-
-   unsigned short more;
-
-   int            fields;
-};
-
-typedef struct
-{
-   bitfld a : 8;
-   bitfld b : 16;
-   bitfld   : 8;
-} type_t;
-
-struct foo { int a; char *b };
-
-static int           idx;
-static const char ** tmp;
-
-static char          buf[64];
-static unsigned long how_long;
-// comment
-static int **        tmp;
-static char          buf[64];
-
-
-void bar(int someval,
-         void *puser,
-         const char *filename,
-         struct willy *the_list,
-         int list_len)
-{
-   int           idx;
-   const char ** tmp;
-   char          buf[64];
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00403-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00403-align-var.c
deleted file mode 100644
index cb62295e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00403-align-var.c
+++ /dev/null
@@ -1,54 +0,0 @@
-struct foo1
-{
-   unsigned int   d_ino;
-   const char     *d_reclen;
-   unsigned short d_namlen;
-   char d_name[1];
-};
-
-struct foo2
-{
-   unsigned int   a   : 1;
-   unsigned int   bcd : 3;
-   unsigned int   ef  : 2;
-   unsigned int       : 2;
-
-   unsigned short more;
-
-   int fields;
-};
-
-typedef struct
-{
-   bitfld a : 8;
-   bitfld b : 16;
-   bitfld   : 8;
-} type_t;
-
-struct foo { int a; char *b };
-
-static int           idx;
-static const char    **tmp;
-
-static char          buf[64];
-static unsigned long how_long;
-// comment
-static int           **tmp;
-static char          buf[64];
-
-
-void bar(int          someval,
-         void         *puser,
-         const char   *filename,
-         struct willy *the_list,
-         int          list_len)
-{
-   int           idx;
-   const char    **tmp;
-   char          buf[64];
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00404-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00404-align-var.c
deleted file mode 100644
index 48af3d3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00404-align-var.c
+++ /dev/null
@@ -1,54 +0,0 @@
-struct foo1
-{
-   unsigned int   d_ino;
-   const char    *d_reclen;
-   unsigned short d_namlen;
-   char d_name[1];
-};
-
-struct foo2
-{
-   unsigned int a   : 1;
-   unsigned int bcd : 3;
-   unsigned int ef  : 2;
-   unsigned int     : 2;
-
-   unsigned short more;
-
-   int fields;
-};
-
-typedef struct
-{
-   bitfld a : 8;
-   bitfld b : 16;
-   bitfld   : 8;
-} type_t;
-
-struct foo { int a; char *b };
-
-static int          idx;
-static const char **tmp;
-
-static char          buf[64];
-static unsigned long how_long;
-// comment
-static int **tmp;
-static char  buf[64];
-
-
-void bar(int           someval,
-         void         *puser,
-         const char   *filename,
-         struct willy *the_list,
-         int           list_len)
-{
-   int          idx;
-   const char **tmp;
-   char         buf[64];
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00405-bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00405-bits.c
deleted file mode 100644
index 9a5a6ceb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00405-bits.c
+++ /dev/null
@@ -1,8 +0,0 @@
-struct foo
-{
-   unsigned long bar;
-   u_int ndots : 4,
-         nsort : 4,
-               : 0;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00406-bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00406-bug_i_771.c
deleted file mode 100644
index 9c2b1cc2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00406-bug_i_771.c
+++ /dev/null
@@ -1,17 +0,0 @@
-typedef struct Foo_s {
-    int    a;
-    int    *b;
-    float  **c;
-    bool   *******d;
-    FooBar ***A;
-    FoBar  ***B;
-}FooS;
-
-typedef struct Foo_a {
-    int    a;
-    int    *b;
-    float  **c;
-    bool   *******d;
-    FooBar ***A;
-    FoBar  ***B;
-}FooA;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00411-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00411-align-typedef.c
deleted file mode 100644
index 001e4a52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00411-align-typedef.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-typedef int                           MY_INT;
-typedef int *                         MY_INTP;
-typedef int (*foo_t)(void *bar);
-typedef int (*somefunc_t)(void *barstool);
-typedef int                           int8_t __attribute__((__mode__(__QI__)));
-typedef int                           uint8_t;
-typedef struct _IDirectFBSurface      IDirectFBSurface;
-typedef struct _IDirectFBPalette      IDirectFBPalette;
-typedef struct timezone *__restrict   __timezone_ptr_t;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00412-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00412-align-typedef.c
deleted file mode 100644
index 001e4a52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00412-align-typedef.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-typedef int                           MY_INT;
-typedef int *                         MY_INTP;
-typedef int (*foo_t)(void *bar);
-typedef int (*somefunc_t)(void *barstool);
-typedef int                           int8_t __attribute__((__mode__(__QI__)));
-typedef int                           uint8_t;
-typedef struct _IDirectFBSurface      IDirectFBSurface;
-typedef struct _IDirectFBPalette      IDirectFBPalette;
-typedef struct timezone *__restrict   __timezone_ptr_t;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00413-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00413-align-typedef.c
deleted file mode 100644
index d5f826e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00413-align-typedef.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-typedef int                           MY_INT;
-typedef int *                         MY_INTP;
-typedef int                           (*foo_t)(void *bar);
-typedef int                           (*somefunc_t)(void *barstool);
-typedef int                           int8_t __attribute__((__mode__(__QI__)));
-typedef int                           uint8_t;
-typedef struct _IDirectFBSurface      IDirectFBSurface;
-typedef struct _IDirectFBPalette      IDirectFBPalette;
-typedef struct timezone *__restrict   __timezone_ptr_t;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00414-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00414-align-typedef.c
deleted file mode 100644
index 8e63e499..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00414-align-typedef.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-typedef int                           MY_INT;
-typedef int                          *MY_INTP;
-typedef int                         (*foo_t)(void *bar);
-typedef int                         (*somefunc_t)(void *barstool);
-typedef int                           int8_t __attribute__((__mode__(__QI__)));
-typedef int                           uint8_t;
-typedef struct _IDirectFBSurface      IDirectFBSurface;
-typedef struct _IDirectFBPalette      IDirectFBPalette;
-typedef struct timezone *__restrict   __timezone_ptr_t;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00415-align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00415-align_stack.c
deleted file mode 100644
index 507d6da2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00415-align_stack.c
+++ /dev/null
@@ -1,5 +0,0 @@
-static int              idx;
-static const char       **tmp;
-
-static int      ** tmp;
-static char     buf[64];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00416-align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00416-align_sf_call_thresh_416.c
deleted file mode 100644
index 36fbca84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00416-align_sf_call_thresh_416.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main(int argc, char const *argv[])
-{
-	align_prams( param1 + longParamToWhichLargeIndentToAlignFor, param2, param3 );
-	align_prams( p4,                                             p5,     p6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00417-align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00417-align_sf_call_thresh_417.c
deleted file mode 100644
index 3047b932..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00417-align_sf_call_thresh_417.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main(int argc, char const *argv[])
-{
-	align_prams( param1 + longParamToWhichLargeIndentToAlignFor, param2, param3 );
-	align_prams( p4, p5, p6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00418-align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00418-align_sf_call_span_418.c
deleted file mode 100644
index 82444a2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00418-align_sf_call_span_418.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char const *argv[])
-{
-	align_prams( param1 + param1, param2, param3 );
-
-
-	align_prams( p4, p5, p6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00419-align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00419-align_sf_call_span_419.c
deleted file mode 100644
index 20b9705a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00419-align_sf_call_span_419.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char const *argv[])
-{
-	align_prams( param1 + param1, param2, param3 );
-
-
-	align_prams( p4,              p5,     p6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00420-Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00420-Issue-2278.c
deleted file mode 100644
index 2bab88ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00420-Issue-2278.c
+++ /dev/null
@@ -1,10 +0,0 @@
-typedef int LIST_tzHEAD;
-typedef int tucBOOL;
-struct LIST_zNODE { int a; int b;};
-struct LIST_zzzDATA { int a; int b;};
-
-int foo1( LIST_tzHEAD *pList,
-          tucBOOL (   *pFn )( struct LIST_zNODE   *pNode,
-                              struct LIST_zzzDATA *pListData,
-                              void                *arg1 ),
-          void        *arg2 );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00421-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00421-nl_ds_struct_enum.c
deleted file mode 100644
index ec5bcc31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00421-nl_ds_struct_enum.c
+++ /dev/null
@@ -1,24 +0,0 @@
-struct foo {
-	unsigned int d_ino;
-
-	/* Comment */
-	unsigned short d_reclen;
-	unsigned short d_namlen;
-
-	/* Comment */
-	char d_name[1];
-};
-
-struct foo
-{
-	/* Comment */
-	unsigned int d_ino;
-	unsigned short d_reclen;
-	unsigned short d_namlen;
-
-	/* Comment */
-	char d_name[1];
-};
-
-struct foo { int a; char *b };
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00422-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00422-nl_ds_struct_enum.c
deleted file mode 100644
index d45b2add..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00422-nl_ds_struct_enum.c
+++ /dev/null
@@ -1,26 +0,0 @@
-struct foo {
-	unsigned int d_ino;
-
-	/* Comment */
-	unsigned short d_reclen;
-	unsigned short d_namlen;
-
-	/* Comment */
-	char d_name[1];
-
-};
-
-struct foo
-{
-	/* Comment */
-	unsigned int d_ino;
-	unsigned short d_reclen;
-	unsigned short d_namlen;
-
-	/* Comment */
-	char d_name[1];
-
-};
-
-struct foo { int a; char *b };
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00423-bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00423-bug_1702.c
deleted file mode 100644
index bf74c8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00423-bug_1702.c
+++ /dev/null
@@ -1,29 +0,0 @@
-extern struct device device_list[];
-extern struct device device_list_end[];
-
-static int
-device_probe(struct device *dev)
-{
-	int err;
-}
-
-/* ===================== */
-struct scpi_mem {
-	struct scpi_msg tx_msg; /**< The reply to be sent to a client. */
-	struct scpi_msg rx_msg; /**< The request received from a client. */
-};
-
-struct scpi_buffer {
-	struct scpi_mem mem;    /**< Memory for the request/reply messages. */
-	uint8_t         client; /**< Client that should receive the reply. */
-	bool            busy;   /**< Flag telling if this buffer is in use. */
-};
-
-static void
-scpi_receive_message(struct device *dev __unused, uint8_t client, uint32_t msg)
-{
-	struct scpi_buffer *buffer;
-	struct scpi_msg    *rx_msg = &SCPI_MEM_AREA(client).rx_msg;
-
-	assert(dev == scpi_msgbox);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00430-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00430-paren-indent.c
deleted file mode 100644
index f6b148ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00430-paren-indent.c
+++ /dev/null
@@ -1,46 +0,0 @@
-static void *foo(int param1,
-                 char *param2
-                 );
-
-
-static void *foo
-(
-	int param1,
-	char *param2
-)
-{
-	for (
-		int i = 0;
-		i< 10;
-		i++
-		)
-	{
-		bar(
-			arg1,
-			arg2
-			);
-		if ( ( abc < bcd )
-		     &&( 123 < abc )
-		     )
-		{
-			none(arg1,
-			     arg2,
-			     arg3
-			     );
-		}
-	}
-}
-
-
-void CWarningAnalyzer::SetEffect(int FilterNumber
-                                 ,bool Exclude
-                                 , int Red
-                                 , int Green
-                                 , int Blue
-                                 , bool Italic
-                                 , bool Bold
-                                 , bool Underlined
-                                 )
-{
-	/* TODO */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00431-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00431-paren-indent.c
deleted file mode 100644
index 51a80854..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00431-paren-indent.c
+++ /dev/null
@@ -1,46 +0,0 @@
-static void *foo( int param1
-                , char *param2
-                );
-
-
-static void *foo
-(
-	int param1
-, char *param2
-)
-{
-	for (
-		int i = 0;
-		i< 10;
-		i++
-	    )
-	{
-		bar(
-			arg1
-		   , arg2
-		   );
-		if ( ( abc < bcd )
-		   &&( 123 < abc )
-		   )
-		{
-			none( arg1
-			    , arg2
-			    , arg3
-			    );
-		}
-	}
-}
-
-
-void CWarningAnalyzer::SetEffect( int FilterNumber
-                                , bool Exclude
-                                , int Red
-                                , int Green
-                                , int Blue
-                                , bool Italic
-                                , bool Bold
-                                , bool Underlined
-                                )
-{
-	/* TODO */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00432-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00432-paren-indent.c
deleted file mode 100644
index 9ab77831..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00432-paren-indent.c
+++ /dev/null
@@ -1,46 +0,0 @@
-static void *foo(int param1,
-                 char *param2
-);
-
-
-static void *foo
-(
-	int param1,
-	char *param2
-)
-{
-	for (
-		int i = 0;
-		i< 10;
-		i++
-	)
-	{
-		bar(
-			arg1,
-			arg2
-		);
-		if ( ( abc < bcd )
-		     &&( 123 < abc )
-		)
-		{
-			none(arg1,
-			     arg2,
-			     arg3
-			);
-		}
-	}
-}
-
-
-void CWarningAnalyzer::SetEffect(int FilterNumber
-                                 ,bool Exclude
-                                 , int Red
-                                 , int Green
-                                 , int Blue
-                                 , bool Italic
-                                 , bool Bold
-                                 , bool Underlined
-)
-{
-	/* TODO */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00440-bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00440-bug_489.c
deleted file mode 100644
index 47a5da06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00440-bug_489.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define UHI_AOA { \

-		.install = uhi_aoa_install, \

-		.enable = uhi_aoa_enable, \

-		.uninstall = uhi_aoa_uninstall, \

-		.sof_notify = NULL, \

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00451-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00451-enum_gallery.c
deleted file mode 100644
index 3cb8db3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00451-enum_gallery.c
+++ /dev/null
@@ -1,28 +0,0 @@
-enum one { liner };
-
-enum not {
-
-	a, one,
-
-	liner
-};
-
-enum foo { bar, baz, quux };
-
-/*
- * In some tests, the following line remains longer than 80
- * characters. Perhaps a bug?
- */
-enum longer_enum_that { will, not, all, fit, on, one, line, as, longg, as, the,
-	                cutoff, is, reasonable, because, this, is, a, very,
-	                very, wide, line };
-
-enum q { w,
-	 e,r,
-	 t,
-
-
-	 y}
-
-
-;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00452-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00452-enum_gallery.c
deleted file mode 100644
index cb235c3d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00452-enum_gallery.c
+++ /dev/null
@@ -1,61 +0,0 @@
-enum one {
-	liner
-};
-
-enum not {
-
-	a,
-	one,
-
-	liner
-};
-
-enum foo {
-	bar,
-	baz,
-	quux
-};
-
-/*
- * In some tests, the following line remains longer than 80
- * characters. Perhaps a bug?
- */
-enum longer_enum_that {
-	will,
-	not,
-	all,
-	fit,
-	on,
-	one,
-	line,
-	as,
-	longg,
-	as,
-	the,
-	cutoff,
-	is,
-	reasonable,
-	because,
-	this,
-	is,
-	a,
-	very,
-	very,
-	wide,
-	line
-};
-
-enum q {
-	w,
-	e,
-	r,
-	t,
-
-
-	y
-
-
-}
-
-
-;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.c
deleted file mode 100644
index af537d1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.c
+++ /dev/null
@@ -1,18 +0,0 @@
-enum one { liner };
-
-enum not {a, one,liner };
-
-enum foo { bar, baz, quux };
-
-/*
- * In some tests, the following line remains longer than 80
- * characters. Perhaps a bug?
- */
-enum longer_enum_that { will, not, all, fit, on, one, line, as, longg, as, the,
-	                cutoff, is, reasonable, because, this, is, a, very,
-	                very, wide, line };
-
-enum q { w,e,r,t,y}
-
-
-;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.rerun.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.rerun.c
deleted file mode 100644
index 148f1970..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.rerun.c
+++ /dev/null
@@ -1,18 +0,0 @@
-enum one { liner };
-
-enum not {a, one,liner };
-
-enum foo { bar, baz, quux };
-
-/*
- * In some tests, the following line remains longer than 80
- * characters. Perhaps a bug?
- */
-enum longer_enum_that { will, not, all, fit, on, one, line, as, longg, as, the,
-	                cutoff, is, reasonable, because, this, is, a, very,very,
-	                wide, line };
-
-enum q { w,e,r,t,y}
-
-
-;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00454-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00454-enum_gallery.c
deleted file mode 100644
index 8d00cbce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00454-enum_gallery.c
+++ /dev/null
@@ -1,45 +0,0 @@
-enum one {
-	liner
-}; enum not {
-	a,
-	one,
-	liner
-}; enum foo {
-	bar,
-	baz,
-	quux
-};
-/*
- * In some tests, the following line remains longer than 80
- * characters. Perhaps a bug?
- */
-enum longer_enum_that {
-	will,
-	not,
-	all,
-	fit,
-	on,
-	one,
-	line,
-	as,
-	longg,
-	as,
-	the,
-	cutoff,
-	is,
-	reasonable,
-	because,
-	this,
-	is,
-	a,
-	very,
-	very,
-	wide,
-	line
-}; enum q {
-	w,
-	e,
-	r,
-	t,
-	y
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00501-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00501-bool-pos.c
deleted file mode 100644
index b9d537a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00501-bool-pos.c
+++ /dev/null
@@ -1,61 +0,0 @@
-void foo(void)
-{
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0) && (d > 0))
-   {
-      printf("hi");
-   }
-
-   if (flag1
-#ifdef FLAG2
-       || flag2
-#endif
-       )
-   {
-      printf("yar");
-   }
-
-   if (flag1 &&
-#ifdef FLAG2
-       flag2 &&
-#endif
-       flag3)
-   {
-      printf("bo");
-   }
-
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if ((a != 0)
-       &&
-       (b == 0)
-       &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if (!this->writeOwiFile () ||                // comment1
-       broken () || !saveArchiveData () ||      /* comment2 */
-       broken () || !deleteCentralArchive () || // comment3
-       broken () || !copyArchivFiles () ||      // comment4
-       broken () || !appendToPlanetDb ())       // comment5
-   {
-      ;
-   }
-
-   foobar(param1,
-          param2, param3,
-          param4);
-
-   foobar2(param1,
-           param2, param3,
-           param4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00502-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00502-bool-pos.c
deleted file mode 100644
index 7890fcd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00502-bool-pos.c
+++ /dev/null
@@ -1,61 +0,0 @@
-void foo(void)
-{
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0) && (d > 0))
-   {
-      printf("hi");
-   }
-
-   if (flag1
-#ifdef FLAG2
-       || flag2
-#endif
-       )
-   {
-      printf("yar");
-   }
-
-   if (flag1 &&
-#ifdef FLAG2
-       flag2 &&
-#endif
-       flag3)
-   {
-      printf("bo");
-   }
-
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0))
-   {
-      printf("hi");
-   }
-
-   if ((a != 0)
-       &&
-       (b == 0)
-       &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if (!this->writeOwiFile ()                   // comment1
-       || broken () || !saveArchiveData ()      /* comment2 */
-       || broken () || !deleteCentralArchive () // comment3
-       || broken () || !copyArchivFiles ()      // comment4
-       || broken () || !appendToPlanetDb ())    // comment5
-   {
-      ;
-   }
-
-   foobar(param1
-          , param2, param3
-          , param4);
-
-   foobar2(param1
-           , param2, param3
-           , param4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00503-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00503-pos_compare.c
deleted file mode 100644
index cc809a09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00503-pos_compare.c
+++ /dev/null
@@ -1,11 +0,0 @@
-void foo(void)
-{
-	if ((a_really_long_number
-	     > another_really_long_number)
-	    ||
-	    (some_really_long_bool
-	     != another_really_long_bool))
-	{
-		foo2();
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00504-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00504-pos_compare.c
deleted file mode 100644
index fe16e10e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00504-pos_compare.c
+++ /dev/null
@@ -1,11 +0,0 @@
-void foo(void)
-{
-	if ((a_really_long_number >
-	     another_really_long_number)
-	    ||
-	    (some_really_long_bool !=
-	     another_really_long_bool))
-	{
-		foo2();
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00505-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00505-pos_conditional.c
deleted file mode 100644
index 91f17d57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00505-pos_conditional.c
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo(void)
-{
-	// conditional colon
-	a = bar() ? 2
-	    : 3;
-	a = bar() ? 2
-	    : 3;
-
-	// conditional question
-	a = bar()
-	    ? 2 : 3;
-	a = bar()
-	    ? 2 : 3;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00506-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00506-pos_conditional.c
deleted file mode 100644
index 23945656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00506-pos_conditional.c
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo(void)
-{
-	// conditional colon
-	a = bar() ? 2 :
-	    3;
-	a = bar() ? 2 :
-	    3;
-
-	// conditional question
-	a = bar() ?
-	    2 : 3;
-	a = bar() ?
-	    2 : 3;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00510-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00510-bool-pos.c
deleted file mode 100644
index 5958e3c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00510-bool-pos.c
+++ /dev/null
@@ -1,68 +0,0 @@
-void foo(void)
-{
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0) &&
-       (d > 0))
-   {
-      printf("hi");
-   }
-
-   if (flag1
-#ifdef FLAG2
-       || flag2
-#endif
-       )
-   {
-      printf("yar");
-   }
-
-   if (flag1 &&
-#ifdef FLAG2
-       flag2 &&
-#endif
-       flag3)
-   {
-      printf("bo");
-   }
-
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if ((a != 0)
-       &&
-       (b == 0)
-       &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if (!this->writeOwiFile () ||                // comment1
-       broken () ||
-       !saveArchiveData () ||                   /* comment2 */
-       broken () ||
-       !deleteCentralArchive () ||              // comment3
-       broken () ||
-       !copyArchivFiles () ||                   // comment4
-       broken () ||
-       !appendToPlanetDb ())                    // comment5
-   {
-      ;
-   }
-
-   foobar(param1,
-          param2,
-          param3,
-          param4);
-
-   foobar2(param1,
-           param2,
-           param3,
-           param4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00511-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00511-bool-pos.c
deleted file mode 100644
index 8f6effd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00511-bool-pos.c
+++ /dev/null
@@ -1,68 +0,0 @@
-void foo(void)
-{
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0)
-       && (d > 0))
-   {
-      printf("hi");
-   }
-
-   if (flag1
-#ifdef FLAG2
-       || flag2
-#endif
-       )
-   {
-      printf("yar");
-   }
-
-   if (flag1 &&
-#ifdef FLAG2
-       flag2 &&
-#endif
-       flag3)
-   {
-      printf("bo");
-   }
-
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0))
-   {
-      printf("hi");
-   }
-
-   if ((a != 0)
-       &&
-       (b == 0)
-       &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if (!this->writeOwiFile ()                   // comment1
-       || broken ()
-       || !saveArchiveData ()                   /* comment2 */
-       || broken ()
-       || !deleteCentralArchive ()              // comment3
-       || broken ()
-       || !copyArchivFiles ()                   // comment4
-       || broken ()
-       || !appendToPlanetDb ())                 // comment5
-   {
-      ;
-   }
-
-   foobar(param1
-          , param2
-          , param3
-          , param4);
-
-   foobar2(param1
-           , param2
-           , param3
-           , param4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00512-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00512-bool-pos.c
deleted file mode 100644
index 2e82b7ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00512-bool-pos.c
+++ /dev/null
@@ -1,66 +0,0 @@
-void foo(void)
-{
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0) &&
-       (d > 0))
-   {
-      printf("hi");
-   }
-
-   if (flag1
-#ifdef FLAG2
-       || flag2
-#endif
-       )
-   {
-      printf("yar");
-   }
-
-   if (flag1 &&
-#ifdef FLAG2
-       flag2 &&
-#endif
-       flag3)
-   {
-      printf("bo");
-   }
-
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if (!this->writeOwiFile () ||                // comment1
-       broken () ||
-       !saveArchiveData () ||                   /* comment2 */
-       broken () ||
-       !deleteCentralArchive () ||              // comment3
-       broken () ||
-       !copyArchivFiles () ||                   // comment4
-       broken () ||
-       !appendToPlanetDb ())                    // comment5
-   {
-      ;
-   }
-
-   foobar(param1,
-          param2,
-          param3,
-          param4);
-
-   foobar2(param1,
-           param2,
-           param3,
-           param4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00513-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00513-bool-pos.c
deleted file mode 100644
index cad844c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00513-bool-pos.c
+++ /dev/null
@@ -1,66 +0,0 @@
-void foo(void)
-{
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0)
-       && (d > 0))
-   {
-      printf("hi");
-   }
-
-   if (flag1
-#ifdef FLAG2
-       || flag2
-#endif
-       )
-   {
-      printf("yar");
-   }
-
-   if (flag1 &&
-#ifdef FLAG2
-       flag2 &&
-#endif
-       flag3)
-   {
-      printf("bo");
-   }
-
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0))
-   {
-      printf("hi");
-   }
-
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0))
-   {
-      printf("hi");
-   }
-
-   if (!this->writeOwiFile ()                   // comment1
-       || broken ()
-       || !saveArchiveData ()                   /* comment2 */
-       || broken ()
-       || !deleteCentralArchive ()              // comment3
-       || broken ()
-       || !copyArchivFiles ()                   // comment4
-       || broken ()
-       || !appendToPlanetDb ())                 // comment5
-   {
-      ;
-   }
-
-   foobar(param1
-          , param2
-          , param3
-          , param4);
-
-   foobar2(param1
-           , param2
-           , param3
-           , param4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00514-my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00514-my_infile.c
deleted file mode 100644
index 3f4c76fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00514-my_infile.c
+++ /dev/null
@@ -1,199 +0,0 @@
-#include <stdlib.h> /* exit */
-#include <unistd.h> /* _exit */
-
-int foo(int);
-
-extern int baz;
-
-int foo (int bar)
-{
-/* Switch blocks: */
-    switch (c)
-    {
-        case 1:
-        case 2:
-            bar += 2;
-        break;
-
-        case 3:
-            bar++;
-            baz++;
-
-        case 4:
-        break;
-
-        default:
-        break;
-    }
-
-    switch (bar)
-    {
-        case 0:
-            bar++;
-        break;
-
-        case 1:
-            bar++;
-            return bar;
-
-        case 2:
-            bar++;
-            goto x;
-
-        case 3:
-            bar++;
-
-        /*FALLTHROUGH*/
-        case 4:
-            bar++;
-            exit(bar);
-
-        /*NOTREACHED*/
-        case 5:
-            bar++;
-            _exit(bar);
-
-        /*NOTREACHED*/
-        case 6:
-            bar++;
-            if (baz > 2)
-            {
-                break;      /* inside if statement; don't align with case */
-            }
-            else
-            {
-                return baz; /* inside if statement; don't align with case */
-            }
-
-        /*NOTREACHED*/
-        case 7:
-            switch (baz)
-            {
-                case 0: /* do nothing */
-                break;
-
-                case 1:
-                    return baz;
-
-                case 2:
-                    baz--;
-                    goto x;
-
-                case 3:
-                    exit(baz);
-
-                /*NOTREACHED*/
-                case 4:
-                    _exit(baz);
-
-                /*NOTREACHED*/
-                case 5:
-                    baz--;
-
-                /*FALLTHROUGH*/
-                default:
-                    for (; baz > 0; baz--) {
-                        if (baz == bar)
-                        {
-                            break; /* break out of for loop, unrelated to switch
-                                      statement */
-                        }
-                        else
-                        {
-                            bar++;
-                        }
-                    }
-                break;
-            }
-        break;
-
-        default:
-            bar++;
-        break;
-    }
-
-
-    switch (a)
-    {
-        case 0:
-            // code
-        break;
-    }
-
-
-    switch (a)
-    {
-        case 0:
-            if (k > 0)
-            {
-                break;
-            }
-            z = 1;
-        break;
-
-        case 1:
-            if (k < 0)
-            {
-                break;
-            }
-            z = 2;
-
-        case 2:
-            z = 3;
-        break;
-    }
-
-
-    return bar;
-}
-
-
-int foo2 (int op)
-{
-    switch (op)
-    {
-        case 1:
-            do_something();
-        break;
-
-        case 2:
-            do_something_else();
-
-        case 3:
-            do_something_different();
-            do_something_more();
-        break;
-    }
-    return -1;
-}
-
-int foo3 (int op)
-{
-    for (int nnn = op; nnn <= 100; nnn++)
-    {
-        switch (nnn)
-        {
-            case 1:
-                do_something();
-            break;
-
-            case 2:
-                do_something_else();
-
-            case 3:
-                if (do_something_different())
-                {
-                    do_this();
-                    break;
-                }
-                do_something_more();
-            break;
-
-            default:
-                ; // nothing
-            break;
-
-        }
-    }
-    return -1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00600-dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00600-dos.c
deleted file mode 100644
index a0482ba3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00600-dos.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/**

- * This is your typical header comment

- */

-int foo(int bar)

-{

-   int idx;

-   int res = 0;      // trailing comment

-                     // that spans two lines

-   for (idx = 1; idx < bar; idx++)

-   {

-      /* comment in virtual braces */

-      res += idx;

-   }

-

-

-   res *= idx;        // some comment

-

-   // almost continued, but a NL in between

-

-// col1 comment in level 1

-   return(res);

-}

-

-// col1 comment in level 0

-

-/*

-   Silly multiline comment.

-

-   Oh yes.

-

-   Really

- */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00601-mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00601-mac.c
deleted file mode 100644
index 2be04c61..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00601-mac.c
+++ /dev/null
@@ -1 +0,0 @@
-/**
 * This is your typical header comment
 */
int foo(int bar)
{
   int idx;
   int res = 0;      // trailing comment
                     // that spans two lines
   for (idx = 1; idx < bar; idx++)
      /* comment in virtual braces */
      res += idx;

   res *= idx;        // some comment

   // almost continued, but a NL in between

// col1 comment in level 1
   return(res);
}

// col1 comment in level 0

\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00611-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00611-pp-space.c
deleted file mode 100644
index 217fc89a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00611-pp-space.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Some file header comment thingy.
- */
-#ifndef SOME_H_INCLUDED
-#define SOME_H_INCLUDED
-
-#include "Somefile.h"
-
-#define SOMEMACRO    (1+4)
-
-#ifdef WIN32
-
-#include "windows_compat.h"
-
-#else /* not WIN32 */
-
-#if defined HAVE_STDINT_H
-#include <stdint.h>
-#elif defined HAVE_INTTYPES_H
-#include <inttypes.h>
-#define YOUR_OS_SUCKS
-#else
-#error "Don't know where int8_t is defined"
-#endif
-
-typedef uint32_t UINT32;
-
-#endif   /* ifdef WIN32 */
-
-#endif   /* SOME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00612-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00612-pp-space.c
deleted file mode 100644
index 7c19bf1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00612-pp-space.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Some file header comment thingy.
- */
-#ifndef SOME_H_INCLUDED
-#define SOME_H_INCLUDED
-
-#include "Somefile.h"
-
-#define SOMEMACRO    (1+4)
-
-#ifdef WIN32
-
-#  include "windows_compat.h"
-
-#else /* not WIN32 */
-
-#  if defined HAVE_STDINT_H
-#    include <stdint.h>
-#  elif defined HAVE_INTTYPES_H
-#    include <inttypes.h>
-#    define YOUR_OS_SUCKS
-#  else
-#    error "Don't know where int8_t is defined"
-#  endif
-
-typedef uint32_t UINT32;
-
-#endif   /* ifdef WIN32 */
-
-#endif   /* SOME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00613-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00613-pp-space.c
deleted file mode 100644
index 7092a193..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00613-pp-space.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Some file header comment thingy.
- */
-#ifndef SOME_H_INCLUDED
-#define SOME_H_INCLUDED
-
-#include "Somefile.h"
-
-#define SOMEMACRO    (1+4)
-
-#ifdef WIN32
-
- #include "windows_compat.h"
-
-#else /* not WIN32 */
-
- #if defined HAVE_STDINT_H
-  #include <stdint.h>
- #elif defined HAVE_INTTYPES_H
-  #include <inttypes.h>
-  #define YOUR_OS_SUCKS
- #else
-  #error "Don't know where int8_t is defined"
- #endif
-
-typedef uint32_t UINT32;
-
-#endif   /* ifdef WIN32 */
-
-#endif   /* SOME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00614-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00614-pp-space.c
deleted file mode 100644
index 103c2ca4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00614-pp-space.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Some file header comment thingy.
- */
-#ifndef SOME_H_INCLUDED
-#define SOME_H_INCLUDED
-
-#include "Somefile.h"
-
-#define SOMEMACRO    (1+4)
-
-#ifdef WIN32
-
-	#include "windows_compat.h"
-
-#else /* not WIN32 */
-
-	#if defined HAVE_STDINT_H
-		#include <stdint.h>
-	#elif defined HAVE_INTTYPES_H
-		#include <inttypes.h>
-		#define YOUR_OS_SUCKS
-	#else
-		#error "Don't know where int8_t is defined"
-	#endif
-
-typedef uint32_t UINT32;
-
-#endif   /* ifdef WIN32 */
-
-#endif   /* SOME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00615-pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00615-pp-nest.c
deleted file mode 100644
index 5e99a1d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00615-pp-nest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#if AA
-int foo() {
-#  if BB
-#  else
-#    if CC
-#    else
-#    endif
-#  endif
-}
-#endif
-
-int bar()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00616-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00616-pp-if-indent.c
deleted file mode 100644
index dc2dea10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00616-pp-if-indent.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* this is a comment */
-
-/* should be in a H file but put in this file to avoid multiplying the number of test files */
-#ifndef COMSTACK_TYPES_H
-#define COMSTACK_TYPES_H
-
-#include "STD_TYPES.h"
-#ifdef COMINL_coENABLE_1
- #ifdef COMINL_coENABLE_2
-  #include "def.h"
- #endif
-#endif
-
-#if (COMINL_coMINIMUM_DELAY_TIME_1 == COMINL_coENABLE)
- #if (COMINL_coMINIMUM_DELAY_TIME_2 == COMINL_coENABLE)
-  #include "def1.h"
-  #define COMINL_coMINIMUM_DELAY_TIME_1
-  #include "def2.h"
- #endif
-#endif
-
-/* no indentation */
-#if COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE
- #include "MEMSRV.h"
-#endif
-
-/* already well indented  */
-#ifndef COMINL_coAPPLI_TX_CONFIRMATION
- #error "Define COMINL_coAPPLI_TX_CONFIRMATION is undefined"
-#endif
-
-/* bad indentation */
-#ifndef COMINL_coENABLE
- #error "Define COMINL_coENABLE is undefined"
-#endif
-
-
-#ifdef COMINL_coENABLE_3
-    typedef enum
-    {
-	BUFREQ_OK            =0,
-	BUFREQ_E_NOT_OK      =     1,
-	BUFREQ_E_BUSY=2,
-	BUFREQ_E_OVFL    =3
-    }
-    BufReq_ReturnType;
-#endif
-
-
-
-#if COMINL_coSTART_STOP_PERIODIC == COMINL_coENABLE
-    void COMINL_vidInit(void)
-    {
-	uint8 u8LocalMsgIdx;
-
-	if (COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer < COMINL_udtNB_MESSAGES_RX)
-	{
-	    u8LocalMsgIdx = E_OK;
-	}
-	else
-	{
-	    u8LocalMsgIdx = E_NOT_OK;
-	}
-
-/* nested #if...already well indented */
-	#if COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE
-	    /*!Trace to: VEES_R_11_04044_004.01*/
-	    for(u8LocalMsgIdx = 0; u8LocalMsgIdx < COMINL_udtNB_MESSAGES_RX; u8LocalMsgIdx++)
-	    {
-		#if COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE
-		    COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-		#else /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-		    COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer = 0;
-		#endif /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-	    }
-	#endif /* COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE */
-
-
-
-/* nested #if... no indentation  */
-	#if COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE
-	    /*!Trace to: VEES_R_11_04044_004.01*/
-	    for(u8LocalMsgIdx = 0; u8LocalMsgIdx < COMINL_udtNB_MESSAGES_TX; u8LocalMsgIdx++)
-	    {
-		#if COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bDeadlineMonEnable  = FALSE;
-		#endif /* COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE */
-		#if COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer = 0;
-		#else /* COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE */
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtMDTTimer   = 0;
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bMDTMsgToSend = FALSE;
-		#endif /*COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE*/
-		#if COMINL_coMIXED_MODE != COMINL_coDISABLE
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtPeriodicTimer = 0;
-		#endif
-	    }
-	#endif /* COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE */
-    }
-#endif
-
-
-void myfunction(void)
-{
-    int i;
-    #ifdef COMINL_coTX_MESSAGE_VAR
-	#ifndef COMINL_coMIXED_MODE
-	#pragma MyPragma
-	    int j;
-	#endif
-    #endif
-    int k;
-}
-
-
-#endif /* COMSTACK_TYPES_H */
-
-/*------------------------------- end of file --------------------------------*/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00617-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00617-pp-if-indent.c
deleted file mode 100644
index 2caf73d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00617-pp-if-indent.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* this is a comment */
-
-/* should be in a H file but put in this file to avoid multiplying the number of
- * test files */
-#ifndef COMSTACK_TYPES_H
-#define COMSTACK_TYPES_H
-
-#include "STD_TYPES.h"
-#ifdef COMINL_coENABLE_1
-   #ifdef COMINL_coENABLE_2
-      #include "def.h"
-   #endif
-#endif
-
-#if (COMINL_coMINIMUM_DELAY_TIME_1 == COMINL_coENABLE)
-   #if (COMINL_coMINIMUM_DELAY_TIME_2 == COMINL_coENABLE)
-      #include "def1.h"
-      #define COMINL_coMINIMUM_DELAY_TIME_1
-      #include "def2.h"
-   #endif
-#endif
-
-/* no indentation */
-#if COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE
-   #include "MEMSRV.h"
-#endif
-
-/* already well indented  */
-#ifndef COMINL_coAPPLI_TX_CONFIRMATION
-   #error "Define COMINL_coAPPLI_TX_CONFIRMATION is undefined"
-#endif
-
-/* bad indentation */
-#ifndef COMINL_coENABLE
-   #error "Define COMINL_coENABLE is undefined"
-#endif
-
-
-#ifdef COMINL_coENABLE_3
-   typedef enum
-   {
-      BUFREQ_OK       = 0,
-      BUFREQ_E_NOT_OK = 1,
-      BUFREQ_E_BUSY   = 2,
-      BUFREQ_E_OVFL   = 3
-   }
-   BufReq_ReturnType;
-#endif
-
-
-#if COMINL_coSTART_STOP_PERIODIC == COMINL_coENABLE
-void COMINL_vidInit(void)
-{
-   uint8 u8LocalMsgIdx;
-
-
-   if (COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer
-       < COMINL_udtNB_MESSAGES_RX)
-   {
-      u8LocalMsgIdx = E_OK;
-   }
-   else
-   {
-      u8LocalMsgIdx = E_NOT_OK;
-   }
-
-   /* nested #if...already well indented */
-   #if COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE
-      /*!Trace to: VEES_R_11_04044_004.01*/
-      for (u8LocalMsgIdx = 0;
-           u8LocalMsgIdx < COMINL_udtNB_MESSAGES_RX;
-           u8LocalMsgIdx++)
-      {
-         #if COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE
-            COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-         #else /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-            COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer = 0;
-         #endif /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-      }
-   #endif /* COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE */
-
-
-   /* nested #if... no indentation  */
-   #if COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE
-      /*!Trace to: VEES_R_11_04044_004.01*/
-      for (u8LocalMsgIdx = 0;
-           u8LocalMsgIdx < COMINL_udtNB_MESSAGES_TX;
-           u8LocalMsgIdx++)
-      {
-         #if COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE
-            COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-            COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bDeadlineMonEnable  =
-               FALSE;
-         #endif /* COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE */
-         #if COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE
-            COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer =
-               0;
-         #else /* COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE */
-            COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtMDTTimer   = 0;
-            COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bMDTMsgToSend = FALSE;
-         #endif /*COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE*/
-         #if COMINL_coMIXED_MODE != COMINL_coDISABLE
-            COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtPeriodicTimer = 0;
-         #endif
-      }
-   #endif /* COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE */
-}
-
-#endif
-
-
-void myfunction(void)
-{
-   int i;
-
-
-   #ifdef COMINL_coTX_MESSAGE_VAR
-      #ifndef COMINL_coMIXED_MODE
-      #pragma MyPragma
-         int j;
-      #endif
-   #endif
-   int k;
-}
-
-#endif /* COMSTACK_TYPES_H */
-
-/*------------------------------- end of file --------------------------------*/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00618-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00618-pp-if-indent.c
deleted file mode 100644
index f7b3d270..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00618-pp-if-indent.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* this is a comment */
-
-/* should be in a H file but put in this file to avoid multiplying the number of test files */
-#ifndef COMSTACK_TYPES_H
-#define COMSTACK_TYPES_H
-
-#include "STD_TYPES.h"
-#ifdef COMINL_coENABLE_1
- #ifdef COMINL_coENABLE_2
-  #include "def.h"
- #endif
-#endif
-
-#if (COMINL_coMINIMUM_DELAY_TIME_1 == COMINL_coENABLE)
- #if (COMINL_coMINIMUM_DELAY_TIME_2 == COMINL_coENABLE)
-  #include "def1.h"
-	#define COMINL_coMINIMUM_DELAY_TIME_1
-  #include "def2.h"
- #endif
-#endif
-
-/* no indentation */
-#if COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE
- #include "MEMSRV.h"
-#endif
-
-/* already well indented  */
-#ifndef COMINL_coAPPLI_TX_CONFIRMATION
- #error "Define COMINL_coAPPLI_TX_CONFIRMATION is undefined"
-#endif
-
-/* bad indentation */
-#ifndef COMINL_coENABLE
- #error "Define COMINL_coENABLE is undefined"
-#endif
-
-
-#ifdef COMINL_coENABLE_3
-    typedef enum
-    {
-	BUFREQ_OK            =0,
-	BUFREQ_E_NOT_OK      =     1,
-	BUFREQ_E_BUSY=2,
-	BUFREQ_E_OVFL    =3
-    }
-    BufReq_ReturnType;
-#endif
-
-
-
-#if COMINL_coSTART_STOP_PERIODIC == COMINL_coENABLE
-    void COMINL_vidInit(void)
-    {
-	uint8 u8LocalMsgIdx;
-
-	if (COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer < COMINL_udtNB_MESSAGES_RX)
-	{
-	    u8LocalMsgIdx = E_OK;
-	}
-	else
-	{
-	    u8LocalMsgIdx = E_NOT_OK;
-	}
-
-/* nested #if...already well indented */
-	#if COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE
-	    /*!Trace to: VEES_R_11_04044_004.01*/
-	    for(u8LocalMsgIdx = 0; u8LocalMsgIdx < COMINL_udtNB_MESSAGES_RX; u8LocalMsgIdx++)
-	    {
-		#if COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE
-		    COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-		#else /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-		    COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer = 0;
-		#endif /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-	    }
-	#endif /* COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE */
-
-
-
-/* nested #if... no indentation  */
-	#if COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE
-	    /*!Trace to: VEES_R_11_04044_004.01*/
-	    for(u8LocalMsgIdx = 0; u8LocalMsgIdx < COMINL_udtNB_MESSAGES_TX; u8LocalMsgIdx++)
-	    {
-		#if COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bDeadlineMonEnable  = FALSE;
-		#endif /* COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE */
-		#if COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer = 0;
-		#else /* COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE */
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtMDTTimer   = 0;
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bMDTMsgToSend = FALSE;
-		#endif /*COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE*/
-		#if COMINL_coMIXED_MODE != COMINL_coDISABLE
-		    COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtPeriodicTimer = 0;
-		#endif
-	    }
-	#endif /* COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE */
-    }
-#endif
-
-
-void myfunction(void)
-{
-    int i;
-    #ifdef COMINL_coTX_MESSAGE_VAR
-	#ifndef COMINL_coMIXED_MODE
-	    #pragma MyPragma
-	    int j;
-	#endif
-    #endif
-    int k;
-}
-
-
-#endif /* COMSTACK_TYPES_H */
-
-/*------------------------------- end of file --------------------------------*/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00620-indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00620-indent-assign.c
deleted file mode 100644
index c01e146a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00620-indent-assign.c
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo(void)
-{
-   int a;
-
-   junk(a = 3);
-}
-
-void f()
-{
-   int x = size_t(1.0) +
-           2;
-   int y = (size_t(1.0) +
-            5);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00621-nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00621-nl_endif.c
deleted file mode 100644
index bae6272c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00621-nl_endif.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int main

-(

-)

-{

-   #ifdef useJPLvelocity

-      for(i = 0; i < x; i++)

-         y++;

-   #endif

-

-   return (0);

-} /* main */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00622-indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00622-indent-off-after-assign.c
deleted file mode 100644
index eb083f7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00622-indent-off-after-assign.c
+++ /dev/null
@@ -1,29 +0,0 @@
-void foo(void)
-{
-	int a;
-	int b =
-	veryLongMethodCall(
-		arg1,
-		longMethodCall(
-			arg2,
-			methodCall(
-				arg3, arg4
-				)
-			)
-		);
-	junk(a =
-	     3);
-}
-
-void f()
-{
-	int x = size_t(1.0) +
-	2;
-	int y = (size_t(1.0) +
-	         5);
-
-	int z =
-	size_t(1.0)
-	+ 5
-	+ size_t(2.0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00631-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00631-nl_assign.c
deleted file mode 100644
index 7319d498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00631-nl_assign.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-void foo()
-{
-    some.really_long.variable_name
-        = another.big.one[55]
-          + something_else;
-
-    some.really_long.variable_name
-        = another.big.one[55]
-          + something_else;
-
-    some.really_long.variable_name = another.big.one[55]
-                                     + something_else;
-
-    a_really_long_assignment_to_test
-        = line_breaks_around_assign_and_arith;
-
-    a_really_long_assignment_to_test = line_breaks_around
-                                       + assign_and_arith;
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00632-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00632-nl_assign.c
deleted file mode 100644
index 2452e773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00632-nl_assign.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-void foo()
-{
-    some.really_long.variable_name =
-        another.big.one[55] +
-        something_else;
-
-    some.really_long.variable_name =
-        another.big.one[55] +
-        something_else;
-
-    some.really_long.variable_name = another.big.one[55] +
-                                     something_else;
-
-    a_really_long_assignment_to_test =
-        line_breaks_around_assign_and_arith;
-
-    a_really_long_assignment_to_test = line_breaks_around +
-                                       assign_and_arith;
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00633-bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00633-bug_3156.c
deleted file mode 100644
index 508a0098..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00633-bug_3156.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define X 1 +
-int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00701-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00701-function-def.c
deleted file mode 100644
index 6f0133e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00701-function-def.c
+++ /dev/null
@@ -1,51 +0,0 @@
-void
-foo1(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-void
-foo2(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-void
-foo3(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-struct whoopee *
-foo4(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-const struct snickers *
-foo5(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-
-void
-foo(
-   int param1,
-   int param2,
-   char *param2
-   )
-{
-   printf("boo!\n");
-}
-
-EXPORT int
-DoStuff(
-   int Num
-   );
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00702-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00702-function-def.c
deleted file mode 100644
index eaa568da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00702-function-def.c
+++ /dev/null
@@ -1,23 +0,0 @@
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int param1,
-          int param2,
-          char *param2);
-
-void foo3(int param1,
-          int param2,
-          char *param2);
-
-struct whoopee *foo4(int param1, int param2, char *param2);
-
-const struct snickers *foo5(int param1, int param2, char *param2);
-
-
-void
-foo(int param1, int param2, char *param2)
-{
-   printf("boo!\n");
-}
-
-EXPORT int DoStuff(int Num);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00703-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00703-function-def.c
deleted file mode 100644
index 76cf664f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00703-function-def.c
+++ /dev/null
@@ -1,18 +0,0 @@
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int param1,int param2,char *param2);
-
-void foo3(int param1,int param2,char *param2);
-
-struct whoopee *foo4(int param1, int param2, char *param2);
-
-const struct snickers *foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf("boo!\n");
-}
-
-EXPORT int DoStuff(int Num);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00710-add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00710-add_long_comment.c
deleted file mode 100644
index 82bf680e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00710-add_long_comment.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * trailing comments are added at 8 newlines in this test.
- *
- *
- */
-void short_function(void)
-{
-	/* this is a 'short' function, so no added comment */
-}
-
-void long_function(void)
-{
-	/* this is a 'long' function, so a comment is added */
-	switch (some_int_value())
-	{
-	case 0:
-		handle_zero();
-		break;
-
-	case 50:
-		handle_fifty();
-		break;
-
-	case 127:
-		handle_another_value();
-		break;
-
-	default:
-		boy_do_i_lack_imagination();
-		break;
-	} /* switch */
-
-	/* call one last function... */
-	one_last_func_call();
-} /* long_function */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00721-nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00721-nl-semicolon.c
deleted file mode 100644
index 441091b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00721-nl-semicolon.c
+++ /dev/null
@@ -1,35 +0,0 @@
-void foo(void)
-{
-   a = 5;
-   b = 3;
-   j = 6;
-
-   for (a = 0; a < j; a++)
-   {
-      b *= (a + b);
-   }
-}
-
-struct somestruct
-{
-   int  a;
-   char b;
-   foo  c;
-   bar  *d;
-};
-
-struct foo
-{
-   int  a;
-   char *b
-};
-
-void f()
-{
-   for (;;)
-   {
-      nothing();
-   }
-   foobar();
-}
-;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00801-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00801-fcn_type.c
deleted file mode 100644
index 72af3fa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00801-fcn_type.c
+++ /dev/null
@@ -1,43 +0,0 @@
-typedef void (*my_fcn_ptr)(char *, int);
-typedef const char *(my_fcn_ptr)(char *, int);
-typedef int (my_fcn_ptr)(char *, int);
-typedef struct foo *(my_fcn_ptr)(char *, int);
-typedef enum foo *(*my_fcn_ptr)(char *, int);
-typedef const struct foo *(*my_fcn_ptr)(char *, int);
-typedef BOOL (my_fcn_ptr)(char *, int);
-typedef INT32 (*my_fcn_ptr)(char *, int);
-typedef int INT32;
-typedef struct foo
-{
-   int a;
-} fooey;
-
-typedef struct
-{
-   int a;
-} queso;
-
-struct myfoo
-{
-   INT32            age;
-   const struct foo *(*my_fcn_ptr)(char *, int);
-   const CHAR       *name;
-   MYTYPE           (*foo)(int, char);
-   void             *user;
-   void             (*foo)(int, char);
-};
-
-SMU foo(void)
-{
-   double AAA = 1.e-3, BBB = 0.016, CCC = 2 * DDD * sqrt(EEE);
-
-   a = 4;
-   (*ABC)();
-   return(SMUIFY(a));
-}
-
-typedef struct
-{
-   void (*newObject)(const object_info *info, const IObject **interface, struct object_h *instance);
-} IObjectFactory;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00802-funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00802-funcfunc.c
deleted file mode 100644
index 4d0f0432..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00802-funcfunc.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main()
-{
-   mWriter("class Clst_"c)(cluster.getChild(HO_SHORT_NAME).getText())(" : Cluster {"c).newline;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00803-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00803-fcn_type.c
deleted file mode 100644
index 9e1e5c55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00803-fcn_type.c
+++ /dev/null
@@ -1,38 +0,0 @@
-typedef void (*my_fcn_ptr)(char *, int);
-typedef const char *(my_fcn_ptr)(char *, int);
-typedef int (my_fcn_ptr)(char *, int);
-typedef struct foo *(my_fcn_ptr)(char *, int);
-typedef enum foo *(*my_fcn_ptr)(char *, int);
-typedef const struct foo *(*my_fcn_ptr)(char *, int);
-typedef BOOL (my_fcn_ptr)(char *, int);
-typedef INT32 (*my_fcn_ptr)(char *, int);
-typedef int INT32;
-typedef struct foo {
-  int a;
-} fooey;
-
-typedef struct {
-  int a;
-} queso;
-
-struct myfoo {
-  INT32 age;
-  const struct foo *(*my_fcn_ptr)(char *, int);
-  const CHAR *name;
-  MYTYPE (*foo)(int, char);
-  void *user;
-  void (*foo)(int, char);
-};
-
-SMU foo(void)
-{
-  double AAA=1.e-3,BBB=0.016,CCC=2*DDD*sqrt(EEE);
-  a=4;
-  ( *ABC )();
-  return SMUIFY(a);
-}
-
-typedef struct {
-  void (*newObject)(const object_info * info, const IObject * *interface, struct object_h * instance);
-} IObjectFactory;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00901-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00901-code_width.c
deleted file mode 100644
index 672f9153..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00901-code_width.c
+++ /dev/null
@@ -1,87 +0,0 @@
-
-static int short_function_name(struct device *dev,
-                               struct device_driver *drv);
-
-/* Assuming a 60-column limit */
-static int short_function_name(struct device *dev,
-                               struct device_driver *drv)
-{
-    this->translateLabels(labelID,
-                          completedLabelID,
-                          selectedLabelID,
-                          text,
-                          selectedText,
-                          completedText,
-                          fontId,
-                          selectedFontId,
-                          completedFontId);
-    call_some_really_long_function.of_some_sort(
-        some_long_parameter1,
-        some_long_parameter2);
-
-    abc = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1,
-        some_long_parameter2);
-
-    abc.def.ghi =
-        call_some_other_really_long_function.of_some_sort(
-            some_long_parameter1,
-            some_long_parameter2);
-
-    abcdefghijklmnopqrstuvwxyz = abc + def + ghi + jkl +
-                                 mno + prq + stu + vwx + yz;
-
-    return 1;
-}
-
-typedef
-    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-    yyyyyyyyyyyyyyyyyyyyyy;
-
-typedef some_return_value (*some_function_type)(another_type
-                                                parameter1,
-                                                another_type
-                                                parameter2);
-
-typedef struct
-    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-{
-    int yyyyyyyyyyyyyyyyyyyyyy;
-} x_t;
-
-static void some_really_long_function_name(
-    struct device *dev,
-    struct device_driver *drv)
-{
-    if ((some_variable_name &&
-         somefunction(param1, param2, param3))) {
-        asdfghjk = asdfasdfasd.aasdfasd +
-                   (asdfasd.asdas * 1234.65);
-    }
-
-    for (struct something_really_really_excessive *
-         a_long_ptr_name = get_first_item();
-         a_long_ptr_name != NULL;
-         a_long_ptr_name = get_next_item(a_long_ptr_name))
-    {
-    }
-
-    for (a = get_first(); a != NULL; a = get_next(a))
-    {
-    }
-
-    for (a_ptr = get_first(); a_ptr != NULL;
-         a_ptr = get_next(a))
-    {
-    }
-
-    register_clcmd( "examine",
-                    "do_examine",
-                    -1,
-                    "-Allows a player to examine the health and armor of a teammate" );
-    register_clcmd( "/examine",
-                    "do_examine",
-                    -1,
-                    "-Allows a player to examine the health and armor of a teammate" );
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00902-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00902-code_width.c
deleted file mode 100644
index 9c5a4cec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00902-code_width.c
+++ /dev/null
@@ -1,76 +0,0 @@
-
-static int short_function_name(struct device *dev,
-                               struct device_driver *drv);
-
-/* Assuming a 60-column limit */
-static int short_function_name(struct device *dev,
-                               struct device_driver *drv)
-{
-    this->translateLabels(labelID, completedLabelID,
-                          selectedLabelID, text,
-                          selectedText, completedText,
-                          fontId, selectedFontId,
-                          completedFontId);
-    call_some_really_long_function.of_some_sort(
-        some_long_parameter1, some_long_parameter2);
-
-    abc = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1, some_long_parameter2);
-
-    abc.def.ghi =
-        call_some_other_really_long_function.of_some_sort(
-            some_long_parameter1, some_long_parameter2);
-
-    abcdefghijklmnopqrstuvwxyz = abc + def + ghi + jkl +
-                                 mno + prq + stu + vwx + yz;
-
-    return 1;
-}
-
-typedef
-    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-    yyyyyyyyyyyyyyyyyyyyyy;
-
-typedef some_return_value (*some_function_type)(another_type
-                                                parameter1,
-                                                another_type
-                                                parameter2);
-
-typedef struct
-    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-{
-    int yyyyyyyyyyyyyyyyyyyyyy;
-} x_t;
-
-static void some_really_long_function_name(
-    struct device *dev, struct device_driver *drv)
-{
-    if ((some_variable_name &&
-         somefunction(param1, param2, param3))) {
-        asdfghjk = asdfasdfasd.aasdfasd +
-                   (asdfasd.asdas * 1234.65);
-    }
-
-    for (struct something_really_really_excessive *
-         a_long_ptr_name = get_first_item();
-         a_long_ptr_name != NULL;
-         a_long_ptr_name = get_next_item(a_long_ptr_name))
-    {
-    }
-
-    for (a = get_first(); a != NULL; a = get_next(a))
-    {
-    }
-
-    for (a_ptr = get_first();
-         a_ptr != NULL;
-         a_ptr = get_next(a))
-    {
-    }
-
-    register_clcmd( "examine", "do_examine", -1,
-                    "-Allows a player to examine the health and armor of a teammate" );
-    register_clcmd( "/examine", "do_examine", -1,
-                    "-Allows a player to examine the health and armor of a teammate" );
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00903-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00903-code_width.c
deleted file mode 100644
index 049e952d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00903-code_width.c
+++ /dev/null
@@ -1,75 +0,0 @@
-
-static int short_function_name(struct device *dev, struct device_driver *drv);
-
-/* Assuming a 60-column limit */
-static int short_function_name(struct device *dev, struct device_driver *drv)
-{
-    this->translateLabels(labelID,
-                          completedLabelID,
-                          selectedLabelID,
-                          text,
-                          selectedText,
-                          completedText,
-                          fontId,
-                          selectedFontId,
-                          completedFontId);
-    call_some_really_long_function.of_some_sort(some_long_parameter1,
-                                                some_long_parameter2);
-
-    abc = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1,
-        some_long_parameter2);
-
-    abc.def.ghi = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1,
-        some_long_parameter2);
-
-    abcdefghijklmnopqrstuvwxyz = abc + def + ghi + jkl + mno + prq + stu + vwx +
-                                 yz;
-
-    return 1;
-}
-
-typedef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-    yyyyyyyyyyyyyyyyyyyyyy;
-
-typedef some_return_value (*some_function_type)(another_type parameter1,
-                                                another_type parameter2);
-
-typedef struct xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-{
-    int yyyyyyyyyyyyyyyyyyyyyy;
-} x_t;
-
-static void some_really_long_function_name(struct device *dev,
-                                           struct device_driver *drv)
-{
-    if ((some_variable_name && somefunction(param1, param2, param3))) {
-        asdfghjk = asdfasdfasd.aasdfasd + (asdfasd.asdas * 1234.65);
-    }
-
-    for (struct something_really_really_excessive *a_long_ptr_name =
-             get_first_item();
-         a_long_ptr_name != NULL;
-         a_long_ptr_name = get_next_item(a_long_ptr_name))
-    {
-    }
-
-    for (a = get_first(); a != NULL; a = get_next(a))
-    {
-    }
-
-    for (a_ptr = get_first(); a_ptr != NULL; a_ptr = get_next(a))
-    {
-    }
-
-    register_clcmd( "examine",
-                    "do_examine",
-                    -1,
-                    "-Allows a player to examine the health and armor of a teammate" );
-    register_clcmd( "/examine",
-                    "do_examine",
-                    -1,
-                    "-Allows a player to examine the health and armor of a teammate" );
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00910-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00910-pascal_ptr.c
deleted file mode 100644
index 27a9cdef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00910-pascal_ptr.c
+++ /dev/null
@@ -1,13 +0,0 @@
-foobar_t* a;
-int* b;
-int* c;
-something no;
-
-char* main()
-{
-    int i = (5 * 3) + 2;
-}
-
-void foo(int* a, int* b, int* c)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00911-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00911-pascal_ptr.c
deleted file mode 100644
index 4c0d0dde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00911-pascal_ptr.c
+++ /dev/null
@@ -1,12 +0,0 @@
-foobar_t* a;
-int* b;
-int* c;
-something no;
-
-char* main()
-{
-    int i = (5 * 3) + 2;
-}
-
-void foo(int* a, int* b, int* c)
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01000-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01000-mod-paren.c
deleted file mode 100644
index ca919f77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01000-mod-paren.c
+++ /dev/null
@@ -1,78 +0,0 @@
-int foo(int a, int b)
-{
-   if (!(a || b))
-   {
-      return(1);
-   }
-   return(0);
-}
-
-void fooo()
-{
-   if (enabled)
-   {
-      value = 1;
-   }
-
-   if (enabled && (value == 100))
-   {
-   }
-
-   if (value == 100)
-   {
-   }
-
-   if ((value == 100) && (i < 15) || enabled)
-   {
-   }
-
-   if (!failed && ((value == 100) && (i < 15)) || enabled)
-   {
-   }
-}
-
-void foo3()
-{
-   if ((strcmp(a, b) == 0) && (total < 5))
-   {
-      add_item(a);
-   }
-
-   if (glob_add_path(gd, gd->dir, NULL,
-                     (flags & GLOB_MARK) && S_ISDIR(gd->st.st_mode)) != 0)
-   {
-      bar();
-   }
-   return;
-}
-
-int foo1(void)
-{
-   FOO_ERROR("connect: can only connected from state CLOSED", pcb->state == CLOSED, return ERR_ISCONN);
-   return(ERR_OK);
-}
-
-int foo2(void)
-{
-   return(-1);
-}
-
-void foo(void)
-{
-   if (!value
-#ifdef OPTION
-       || value == SOMECONST
-#endif /* comment */
-       )
-   {
-   }
-}
-
-void foo3(void)
-{
-   if ((*p == '-') && (p[1] != ']') ?
-       (*text <= *++p) && (*text >= last) : (*text == *p))
-   {
-      matched = TRUE;
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01001-nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01001-nl-comment.c
deleted file mode 100644
index ecac3e2a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01001-nl-comment.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-{
-   int idx;
-   int res = 0;      // trailing comment
-
-   // that spans two lines
-
-
-   /* multi-line comment
-    */
-   idx = 50;
-
-
-   /* single line comment */
-   for (idx = 1; idx < bar; idx++)
-   {
-      /* comment in virtual braces */
-      res += idx;
-   }
-   switch (res)
-   {
-   case 1:
-      // C++-style comment
-      res++;
-      break;
-   case 2:
-      /* C-style comment */
-      res--;
-      break;
-   case 3:
-      /* Multi-line comment
-       */
-      res = 0;
-      break;
-   case 4:
-
-      // C++-style comment
-      res++;
-      break;
-   case 5:
-
-      /* C-style comment */
-      res--;
-      break;
-   default:
-
-      /* Multi-line comment
-       */
-      res = 0;
-      break;
-   }
-
-   res *= idx;        // some comment
-
-   // almost continued, but a NL in between
-
-   i++;
-
-
-
-// col1 comment in level 1
-// second comment
-   return(res);
-}
-
-
-
-// col1 comment in level 0
-// and another
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01002-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01002-mod-paren.c
deleted file mode 100644
index 2537330f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01002-mod-paren.c
+++ /dev/null
@@ -1,78 +0,0 @@
-int foo(int a, int b)
-{
-   if (!(a || b))
-   {
-      return 1;
-   }
-   return 0;
-}
-
-void fooo()
-{
-   if (enabled)
-   {
-      value = 1;
-   }
-
-   if (enabled && (value == 100))
-   {
-   }
-
-   if (value == 100)
-   {
-   }
-
-   if ((value == 100) && (i < 15) || enabled)
-   {
-   }
-
-   if (!failed && ((value == 100) && (i < 15)) || enabled)
-   {
-   }
-}
-
-void foo3()
-{
-   if ((strcmp(a, b) == 0) && (total < 5))
-   {
-      add_item(a);
-   }
-
-   if (glob_add_path(gd, gd->dir, NULL,
-                     (flags & GLOB_MARK) && S_ISDIR(gd->st.st_mode)) != 0)
-   {
-      bar();
-   }
-   return;
-}
-
-int foo1(void)
-{
-   FOO_ERROR("connect: can only connected from state CLOSED", pcb->state == CLOSED, return ERR_ISCONN);
-   return ERR_OK;
-}
-
-int foo2(void)
-{
-   return -1;
-}
-
-void foo(void)
-{
-   if (!value
-#ifdef OPTION
-       || value == SOMECONST
-#endif /* comment */
-       )
-   {
-   }
-}
-
-void foo3(void)
-{
-   if ((*p == '-') && (p[1] != ']') ?
-       (*text <= *++p) && (*text >= last) : (*text == *p))
-   {
-      matched = TRUE;
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01005-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01005-mod_case_brace.c
deleted file mode 100644
index caeae178..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01005-mod_case_brace.c
+++ /dev/null
@@ -1,71 +0,0 @@
-int foo(int bar)
-{
-   switch (bar)
-   {
-   case 0:
-      {
-         showit(0);
-      }
-      c++;
-      break;
-
-   case 1:
-      {
-         showit(bar);
-         break;
-      }
-
-   case 2:
-      {
-         break;
-      }
-
-   case 3:
-      {
-         int a = bar * 3;
-         showit(a);
-      }
-      c++;
-      break;
-
-   case 4:
-      {
-         foo(bar - 1);
-         {
-            showit(0);
-         }
-      }
-
-   case 10:
-      {
-         switch (gl_bug)
-         {
-         case 'a':
-            {
-               gl_foo = true;
-               break;
-            }
-
-         case 'b':
-         case 'c':
-            {
-               gl_foo = false;
-               break;
-            }
-
-         default:
-            {
-               // nothing
-            }
-            break;
-         }
-         break;
-      }
-
-   default:
-      {
-      }
-      break;
-   }
-   return(-1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01006-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01006-mod_case_brace.c
deleted file mode 100644
index 371bd5cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01006-mod_case_brace.c
+++ /dev/null
@@ -1,55 +0,0 @@
-int foo(int bar)
-{
-   switch (bar)
-   {
-   case 0:
-      {
-         showit(0);
-      }
-      c++;
-      break;
-
-   case 1:
-      showit(bar);
-      break;
-
-   case 2:
-      break;
-
-   case 3:
-      {
-         int a = bar * 3;
-         showit(a);
-      }
-      c++;
-      break;
-
-   case 4:
-      foo(bar - 1);
-      {
-         showit(0);
-      }
-
-   case 10:
-      switch (gl_bug)
-      {
-      case 'a':
-         gl_foo = true;
-         break;
-
-      case 'b':
-      case 'c':
-         gl_foo = false;
-         break;
-
-      default:
-         // nothing
-         break;
-      }
-      break;
-
-   default:
-      break;
-   }
-   return(-1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01007-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01007-mod_case_brace.c
deleted file mode 100644
index 2ea3dea5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01007-mod_case_brace.c
+++ /dev/null
@@ -1,71 +0,0 @@
-int foo(int bar)
-{
-   switch (bar)
-   {
-   case 0:
-      {
-         showit(0);
-      }
-      c++;
-      break;
-
-   case 1:
-      {
-         showit(bar);
-         break;
-      }
-
-   case 2:
-      {
-         break;
-      }
-
-   case 3:
-      {
-         int a = bar * 3;
-         showit(a);
-      }
-      c++;
-      break;
-
-   case 4:
-      {
-         foo(bar - 1);
-         {
-            showit(0);
-         }
-      }
-
-   case 10:
-      {
-         switch (gl_bug)
-         {
-         case 'a':
-            {
-               gl_foo = true;
-               break;
-            }
-
-         case 'b':
-         case 'c':
-            {
-               gl_foo = false;
-               break;
-            }
-
-         default:
-            {
-               // nothing
-               break;
-            }
-         }
-         break;
-      }
-
-   default:
-      {
-         break;
-      }
-   }
-   return(-1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01011-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01011-semicolons.c
deleted file mode 100644
index 962ec588..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01011-semicolons.c
+++ /dev/null
@@ -1,74 +0,0 @@
-
-int foo(int bar)
-{
-	for (;;)
-	{
-		break;
-	}
-	if (a)
-	{
-		foo();
-	}
-
-	if (b)
-		if (c)
-			bar();
-		else
-			;
-
-	else
-	{
-		foo();
-	}
-	switch (a)
-	{
-	case 1: break;
-	case 2: break;
-	default: break;
-	}
-	while (b-->0)
-	{
-		bar();
-	}
-	do
-	{
-		bar();
-	} while (b-->0  );
-}
-
-enum FPP {
-	FPP_ONE = 1,
-	FPP_TWO = 2,
-};
-
-struct narg {
-	int abc;
-	char def;
-	const char *ghi;
-};
-
-void f2(void)
-{
-	{ i++; }
-
-	for (;;);
-
-	for (;;) {   }
-}
-
-int main(int argc, char *argv[])
-{
-	if( argc == 1 )
-	{
-		printf("one");
-	}
-	else if( argc == 2 )
-	{
-		printf("two");
-	}
-	else
-	{
-		printf("%d", argc);
-	}
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01012-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01012-semicolons.c
deleted file mode 100644
index 54d895e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01012-semicolons.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-int foo(int bar)
-{
-   for ( ; ; )
-   {
-      break;
-   }
-   if (a)
-   {
-      foo();
-   }
-
-   if (b)
-   {
-      if (c)
-      {
-         bar();
-      }
-      else
-      {
-      }
-   }
-
-   else
-   {
-      foo();
-   }
-   switch (a)
-   {
-   case 1: break;
-
-   case 2: break;
-
-   default: break;
-   }
-   while (b-- > 0)
-   {
-      bar();
-   }
-   do
-   {
-      bar();
-   } while (b-- > 0);
-} /* foo */
-
-enum FPP
-{
-   FPP_ONE = 1,
-   FPP_TWO = 2,
-};
-
-struct narg
-{
-   int        abc;
-   char       def;
-   const char *ghi;
-};
-
-void f2(void)
-{
-   {
-      i++;
-   }
-
-   for ( ; ; )
-   {
-   }
-
-   for ( ; ; )
-   {
-   }
-}
-
-int main(int argc, char *argv[])
-{
-   if (argc == 1)
-   {
-      printf("one");
-   }
-   else if (argc == 2)
-   {
-      printf("two");
-   }
-   else
-   {
-      printf("%d", argc);
-   }
-   return(0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01015-paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01015-paren_indent.c
deleted file mode 100644
index d993315c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01015-paren_indent.c
+++ /dev/null
@@ -1,12 +0,0 @@
-function1
-        (something1);
-
-function2
-        (something2);
-
-x = (float)
-    (number);
-
-x = (float)
-    (number);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01016-align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01016-align_attr.c
deleted file mode 100644
index 012217e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01016-align_attr.c
+++ /dev/null
@@ -1,4 +0,0 @@
-
-char test[3]                _PREPROCESSOR_SOMETHING;
-int  numberThatIsReallyCool _PREPROCESSOR_SOMETHING;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01020-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01020-kw_subst.c
deleted file mode 100644
index 61b43c3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01020-kw_subst.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file kw_subst.c
- * Description
- *
- * $Id$
- */
-#include <string>
-
-/**
- * foo1
- * TODO: DESCRIPTION
- * @return TODO
- */
-int foo1()
-{
-}
-
-/** header comment */
-#if 2
-/**
- * foo2
- * TODO: DESCRIPTION
- * @return TODO
- */
-int foo2(void)
-{
-}
-#endif
-
-#if 1
-/**
- * foo3
- * TODO: DESCRIPTION
- * @param a TODO
- */
-void foo3(int a)
-{
-}
-#endif
-
-/**
- * foo4
- * TODO: DESCRIPTION
- * @param a TODO
- * @param b TODO
- * @param c TODO
- * @return TODO
- */
-void *foo4(int a, int b, int c)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01021-hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01021-hello.c
deleted file mode 100644
index 6ba46ef7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01021-hello.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************//**

- *

- *  @file        hello.c

- *

- *  <Description>

- *

- ***********************************************************************************/

-#include <stdio.h>

-

-/***********************************************************************************

-  *  HelloWorld

-  *******************************************************************************//**

-  *

-  *  <Description>

-  *

-  *  @param pString TODO

-  *

-  **********************************************************************************/

-void HelloWorld(char* pString)

-{

-    printf("%s\n", pString);

-} /* HelloWorld */

-

-

-

-/***********************************************************************************

-  *  main

-  *******************************************************************************//**

-  *

-  *  <Description>

-  *

-  *  @return TODO

-  *

-  **********************************************************************************/

-int main()

-{

-    HelloWorld("Hello world");

-

-    return 0;

-} /* main */

-

-

-

-/**

-  * CVS History:

-  * $Log $

-  *

-  */

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01022-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01022-kw_subst.c
deleted file mode 100644
index 6cba8370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01022-kw_subst.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************//**

- *

- *  @file        kw_subst.c

- *

- *  <Description>

- *

- ***********************************************************************************/

-#include <string>

-

-/***********************************************************************************

-  *  foo1

-  *******************************************************************************//**

-  *

-  *  <Description>

-  *

-  *  @return TODO

-  *

-  **********************************************************************************/

-int foo1()

-{

-}

-

-

-

-/** header comment */

-#if 2

-    int foo2(void)

-    {

-    }

-

-

-

-#endif

-

-#if 1

-    /***********************************************************************************

-      *  foo3

-      *******************************************************************************//**

-      *

-      *  <Description>

-      *

-      *  @param a TODO

-      *

-      **********************************************************************************/

-    void foo3(int a)

-    {

-    }

-

-

-

-#endif

-

-/***********************************************************************************

-  *  foo4

-  *******************************************************************************//**

-  *

-  *  <Description>

-  *

-  *  @param a TODO

-  *  @param b TODO

-  *  @param c TODO

-  *  @return TODO

-  *

-  **********************************************************************************/

-void * foo4(int a, int b, int c)

-{

-}

-

-

-

-/**

-  * CVS History:

-  * $Log $

-  *

-  */

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01030-multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01030-multi.h
deleted file mode 100644
index 14a599c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01030-multi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-This is a multiline
-comment that should
-not be indented
-*/
-{
-	/*
-	No trailing spaces
-
-	in this comment
-	*/
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01035-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01035-func_wrap.c
deleted file mode 100644
index b2f86805..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01035-func_wrap.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void FSUB(MPI_Foo)(MPI_Fint* sendcount);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01036-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01036-func_wrap.c
deleted file mode 100644
index 24e932ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01036-func_wrap.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void FSUB( MPI_Foo )( MPI_Fint* sendcount );
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01037-type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01037-type_wrap.c
deleted file mode 100644
index c3c23569..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01037-type_wrap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void foo(void)
-{
-	STACK_OF(X509) *st = sk_X509_new_null();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01040-newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01040-newline_after_endif.c
deleted file mode 100644
index 2a0cbe62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01040-newline_after_endif.c
+++ /dev/null
@@ -1,53 +0,0 @@
-int main

-(

-)

-{

-   #ifdef useJPLvelocity

-      for(i = 0; i < x; i++)

-         y++;

-   #endif

-

-   return (0);

-} /* main */

-

-int main

-(

-)

-{

-   if(y < 3)

-      y++;

-

-   #ifdef ABC

-      if(y < 3)

-         y++ // comment

-   #endif

-

-   if(y < 3)

-      y++;

-

-   y++;

-

-   return (0);

-} /* main */

-

-int main

-(

-)

-{

-   #ifdef ABC

-      if(j < y)

-      {

-         if(j < x)

-         {

-            j++;

-            #ifdef XYZ

-               if(j < x)

-                  j++;

-            #endif

-         }

-      }

-   #endif

-

-   return (0);

-} /* main */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01050-func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01050-func_call_user.c
deleted file mode 100644
index 82eba7cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01050-func_call_user.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func(n)
-{
-    int   a   = foo ();
-    char *a   = _("some text");
-    char *str = N_("other text");
-} /* func */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01060-backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01060-backslash-newline-lex.c
deleted file mode 100644
index f5000b82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01060-backslash-newline-lex.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void f () {
-	g ("\
-");
-	g ("\n", stdout);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01070-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01070-various_colons.c
deleted file mode 100644
index 0850b17e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01070-various_colons.c
+++ /dev/null
@@ -1,22 +0,0 @@
-struct foo {unsigned int a : 4;
-	    int          b : 4;
-};
-int bar(int x){
-	switch (x) {
-	case 1: return 2;
-
-	case 4: return 4;
-
-	case 6: return 8;
-
-	case 10: return 19;
-	} return 0;
-}
-int main(void){
-	bar(10);
-foo:
-	bar(-9);
-	bar(9);
-baz:
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01071-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01071-various_colons.c
deleted file mode 100644
index e25134ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01071-various_colons.c
+++ /dev/null
@@ -1,20 +0,0 @@
-struct foo {unsigned int a : 4;
-	    int          b : 4;
-};
-int bar(int x){
-	switch (x) {
-	case 1: return 2;
-
-	case 4: return 4;
-
-	case 6: return 8;
-
-	case 10: return 19;
-	} return 0;
-}
-int main(void){
-	bar(10);
-foo:    bar(-9);
-	bar(9);
-baz:    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01080-bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01080-bug_1196.c
deleted file mode 100644
index 9fdabca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01080-bug_1196.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef __cplusplus

-extern "C" {

-#endif

-

-void foo(void);

-

-#ifdef __cplusplus

-}

-#endif
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02000-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02000-i2c-core.c
deleted file mode 100644
index cfe6b053..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02000-i2c-core.c
+++ /dev/null
@@ -1,1457 +0,0 @@
-/* i2c-core.c - a device driver for the iic-bus interface		     */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-99 Simon G. Vogl
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
- * All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
- * SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/idr.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-
-
-static LIST_HEAD(adapters);
-static LIST_HEAD(drivers);
-static DECLARE_MUTEX(core_lists);
-static DEFINE_IDR(i2c_adapter_idr);
-
-static int i2c_device_match(struct device *dev, struct device_driver *drv)
-{
-   return(1);
-}
-
-static int i2c_bus_suspend(struct device *dev, pm_message_t state)
-{
-   int rc = 0;
-
-   if (dev->driver && dev->driver->suspend)
-   {
-      rc = dev->driver->suspend(dev, state, 0);
-   }
-   return(rc);
-}
-
-static int i2c_bus_resume(struct device *dev)
-{
-   int rc = 0;
-
-   if (dev->driver && dev->driver->resume)
-   {
-      rc = dev->driver->resume(dev, 0);
-   }
-   return(rc);
-}
-
-struct bus_type i2c_bus_type =
-{
-   .name    = "i2c",
-   .match   = i2c_device_match,
-   .suspend = i2c_bus_suspend,
-   .resume  = i2c_bus_resume,
-};
-
-static int i2c_device_probe(struct device *dev)
-{
-   return(-ENODEV);
-}
-
-static int i2c_device_remove(struct device *dev)
-{
-   return(0);
-}
-
-void i2c_adapter_dev_release(struct device *dev)
-{
-   struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-   complete(&adap->dev_released);
-}
-
-struct device_driver i2c_adapter_driver =
-{
-   .name   = "i2c_adapter",
-   .bus    = &i2c_bus_type,
-   .probe  = i2c_device_probe,
-   .remove = i2c_device_remove,
-};
-
-static void i2c_adapter_class_dev_release(struct class_device *dev)
-{
-   struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-
-   complete(&adap->class_dev_released);
-}
-
-struct class i2c_adapter_class =
-{
-   .name    = "i2c-adapter",
-   .release = &i2c_adapter_class_dev_release,
-};
-
-static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-   struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-   return(sprintf(buf, "%s\n", adap->name));
-}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
-static void i2c_client_release(struct device *dev)
-{
-   struct i2c_client *client = to_i2c_client(dev);
-
-   complete(&client->released);
-}
-
-static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-   struct i2c_client *client = to_i2c_client(dev);
-
-   return(sprintf(buf, "%s\n", client->name));
-}
-
-/*
- * We can't use the DEVICE_ATTR() macro here as we want the same filename for a
- * different type of a device.  So beware if the DEVICE_ATTR() macro ever
- * changes, this definition will also have to change.
- */
-static struct device_attribute dev_attr_client_name =
-{
-   .attr = { .name = "name", .mode = S_IRUGO, .owner = THIS_MODULE },
-   .show = &show_client_name,
-};
-
-
-/* ---------------------------------------------------
- * registering functions
- * ---------------------------------------------------
- */
-
-/* -----
- * i2c_add_adapter is called from within the algorithm layer,
- * when a new hw adapter registers. A new device is register to be
- * available for clients.
- */
-int i2c_add_adapter(struct i2c_adapter *adap)
-{
-   int               id, res = 0;
-   struct list_head  *item;
-   struct i2c_driver *driver;
-
-   down(&core_lists);
-
-   if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
-   {
-      res = -ENOMEM;
-      goto out_unlock;
-   }
-
-   res = idr_get_new(&i2c_adapter_idr, adap, &id);
-   if (res < 0)
-   {
-      if (res == -EAGAIN)
-      {
-         res = -ENOMEM;
-      }
-      goto out_unlock;
-   }
-
-   adap->nr = id & MAX_ID_MASK;
-   init_MUTEX(&adap->bus_lock);
-   init_MUTEX(&adap->clist_lock);
-   list_add_tail(&adap->list, &adapters);
-   INIT_LIST_HEAD(&adap->clients);
-
-   /* Add the adapter to the driver core.
-    * If the parent pointer is not set up,
-    * we add this adapter to the host bus.
-    */
-   if (adap->dev.parent == NULL)
-   {
-      adap->dev.parent = &platform_bus;
-   }
-   sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
-   adap->dev.driver  = &i2c_adapter_driver;
-   adap->dev.release = &i2c_adapter_dev_release;
-   device_register(&adap->dev);
-   device_create_file(&adap->dev, &dev_attr_name);
-
-   /* Add this adapter to the i2c_adapter class */
-   memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-   adap->class_dev.dev   = &adap->dev;
-   adap->class_dev.class = &i2c_adapter_class;
-   strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-   class_device_register(&adap->class_dev);
-
-   dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
-
-   /* inform drivers of new adapters */
-   list_for_each(item, &drivers)
-   {
-      driver = list_entry(item, struct i2c_driver, list);
-      if (driver->flags & I2C_DF_NOTIFY)
-      {
-         /* We ignore the return code; if it fails, too bad */
-         driver->attach_adapter(adap);
-      }
-   }
-
- out_unlock:
-   up(&core_lists);
-   return(res);
-} /* i2c_add_adapter */
-
-
-int i2c_del_adapter(struct i2c_adapter *adap)
-{
-   struct list_head   *item, *_n;
-   struct i2c_adapter *adap_from_list;
-   struct i2c_driver  *driver;
-   struct i2c_client  *client;
-   int                res = 0;
-
-   down(&core_lists);
-
-   /* First make sure that this adapter was ever added */
-   list_for_each_entry(adap_from_list, &adapters, list)
-   {
-      if (adap_from_list == adap)
-      {
-         break;
-      }
-   }
-   if (adap_from_list != adap)
-   {
-      pr_debug("i2c-core: attempting to delete unregistered "
-               "adapter [%s]\n", adap->name);
-      res = -EINVAL;
-      goto out_unlock;
-   }
-
-   list_for_each(item, &drivers)
-   {
-      driver = list_entry(item, struct i2c_driver, list);
-      if (driver->detach_adapter)
-      {
-         if ((res = driver->detach_adapter(adap)))
-         {
-            dev_err(&adap->dev, "detach_adapter failed "
-                    "for driver [%s]\n", driver->name);
-            goto out_unlock;
-         }
-      }
-   }
-
-   /* detach any active clients. This must be done first, because
-    * it can fail; in which case we give up. */
-   list_for_each_safe(item, _n, &adap->clients)
-   {
-      client = list_entry(item, struct i2c_client, list);
-
-      /* detaching devices is unconditional of the set notify
-       * flag, as _all_ clients that reside on the adapter
-       * must be deleted, as this would cause invalid states.
-       */
-      if ((res = client->driver->detach_client(client)))
-      {
-         dev_err(&adap->dev, "detach_client failed for client "
-                 "[%s] at address 0x%02x\n", client->name,
-                 client->addr);
-         goto out_unlock;
-      }
-   }
-
-   /* clean up the sysfs representation */
-   init_completion(&adap->dev_released);
-   init_completion(&adap->class_dev_released);
-   class_device_unregister(&adap->class_dev);
-   device_remove_file(&adap->dev, &dev_attr_name);
-   device_unregister(&adap->dev);
-   list_del(&adap->list);
-
-   /* wait for sysfs to drop all references */
-   wait_for_completion(&adap->dev_released);
-   wait_for_completion(&adap->class_dev_released);
-
-   /* free dynamically allocated bus id */
-   idr_remove(&i2c_adapter_idr, adap->nr);
-
-   dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
-
- out_unlock:
-   up(&core_lists);
-   return(res);
-} /* i2c_del_adapter */
-
-
-/* -----
- * What follows is the "upwards" interface: commands for talking to clients,
- * which implement the functions to access the physical information of the
- * chips.
- */
-
-int i2c_add_driver(struct i2c_driver *driver)
-{
-   struct list_head   *item;
-   struct i2c_adapter *adapter;
-   int                res = 0;
-
-   down(&core_lists);
-
-   /* add the driver to the list of i2c drivers in the driver core */
-   driver->driver.name   = driver->name;
-   driver->driver.bus    = &i2c_bus_type;
-   driver->driver.probe  = i2c_device_probe;
-   driver->driver.remove = i2c_device_remove;
-
-   res = driver_register(&driver->driver);
-   if (res)
-   {
-      goto out_unlock;
-   }
-
-   list_add_tail(&driver->list, &drivers);
-   pr_debug("i2c-core: driver [%s] registered\n", driver->name);
-
-   /* now look for instances of driver on our adapters */
-   if (driver->flags & I2C_DF_NOTIFY)
-   {
-      list_for_each(item, &adapters)
-      {
-         adapter = list_entry(item, struct i2c_adapter, list);
-         driver->attach_adapter(adapter);
-      }
-   }
-
- out_unlock:
-   up(&core_lists);
-   return(res);
-}
-
-int i2c_del_driver(struct i2c_driver *driver)
-{
-   struct list_head   *item1, *item2, *_n;
-   struct i2c_client  *client;
-   struct i2c_adapter *adap;
-
-   int                res = 0;
-
-   down(&core_lists);
-
-   /* Have a look at each adapter, if clients of this driver are still
-    * attached. If so, detach them to be able to kill the driver
-    * afterwards.
-    *
-    * Removing clients does not depend on the notify flag, else
-    * invalid operation might (will!) result, when using stale client
-    * pointers.
-    */
-   list_for_each(item1, &adapters)
-   {
-      adap = list_entry(item1, struct i2c_adapter, list);
-      if (driver->detach_adapter)
-      {
-         if ((res = driver->detach_adapter(adap)))
-         {
-            dev_err(&adap->dev, "detach_adapter failed "
-                    "for driver [%s]\n", driver->name);
-            goto out_unlock;
-         }
-      }
-      else
-      {
-         list_for_each_safe(item2, _n, &adap->clients)
-         {
-            client = list_entry(item2, struct i2c_client, list);
-            if (client->driver != driver)
-            {
-               continue;
-            }
-            dev_dbg(&adap->dev, "detaching client [%s] "
-                    "at 0x%02x\n", client->name,
-                    client->addr);
-            if ((res = driver->detach_client(client)))
-            {
-               dev_err(&adap->dev, "detach_client "
-                       "failed for client [%s] at "
-                       "0x%02x\n", client->name,
-                       client->addr);
-               goto out_unlock;
-            }
-         }
-      }
-   }
-
-   driver_unregister(&driver->driver);
-   list_del(&driver->list);
-   pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
-
- out_unlock:
-   up(&core_lists);
-   return(0);
-} /* i2c_del_driver */
-
-static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
-{
-   struct list_head  *item;
-   struct i2c_client *client;
-
-   list_for_each(item, &adapter->clients)
-   {
-      client = list_entry(item, struct i2c_client, list);
-      if (client->addr == addr)
-      {
-         return(-EBUSY);
-      }
-   }
-   return(0);
-}
-
-int i2c_check_addr(struct i2c_adapter *adapter, int addr)
-{
-   int rval;
-
-   down(&adapter->clist_lock);
-   rval = __i2c_check_addr(adapter, addr);
-   up(&adapter->clist_lock);
-
-   return(rval);
-}
-
-int i2c_attach_client(struct i2c_client *client)
-{
-   struct i2c_adapter *adapter = client->adapter;
-
-   down(&adapter->clist_lock);
-   if (__i2c_check_addr(client->adapter, client->addr))
-   {
-      up(&adapter->clist_lock);
-      return(-EBUSY);
-   }
-   list_add_tail(&client->list, &adapter->clients);
-   up(&adapter->clist_lock);
-
-   if (adapter->client_register)
-   {
-      if (adapter->client_register(client))
-      {
-         dev_dbg(&adapter->dev, "client_register "
-                 "failed for client [%s] at 0x%02x\n",
-                 client->name, client->addr);
-      }
-   }
-
-   if (client->flags & I2C_CLIENT_ALLOW_USE)
-   {
-      client->usage_count = 0;
-   }
-
-   client->dev.parent  = &client->adapter->dev;
-   client->dev.driver  = &client->driver->driver;
-   client->dev.bus     = &i2c_bus_type;
-   client->dev.release = &i2c_client_release;
-
-   snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-            "%d-%04x", i2c_adapter_id(adapter), client->addr);
-   dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-           client->name, client->dev.bus_id);
-   device_register(&client->dev);
-   device_create_file(&client->dev, &dev_attr_client_name);
-
-   return(0);
-} /* i2c_attach_client */
-
-
-int i2c_detach_client(struct i2c_client *client)
-{
-   struct i2c_adapter *adapter = client->adapter;
-   int                res      = 0;
-
-   if ((client->flags & I2C_CLIENT_ALLOW_USE)
-       && (client->usage_count > 0))
-   {
-      dev_warn(&client->dev, "Client [%s] still busy, "
-               "can't detach\n", client->name);
-      return(-EBUSY);
-   }
-
-   if (adapter->client_unregister)
-   {
-      res = adapter->client_unregister(client);
-      if (res)
-      {
-         dev_err(&client->dev,
-                 "client_unregister [%s] failed, "
-                 "client not detached\n", client->name);
-         goto out;
-      }
-   }
-
-   down(&adapter->clist_lock);
-   list_del(&client->list);
-   init_completion(&client->released);
-   device_remove_file(&client->dev, &dev_attr_client_name);
-   device_unregister(&client->dev);
-   up(&adapter->clist_lock);
-   wait_for_completion(&client->released);
-
- out:
-   return(res);
-}
-
-static int i2c_inc_use_client(struct i2c_client *client)
-{
-   if (!try_module_get(client->driver->owner))
-   {
-      return(-ENODEV);
-   }
-   if (!try_module_get(client->adapter->owner))
-   {
-      module_put(client->driver->owner);
-      return(-ENODEV);
-   }
-
-   return(0);
-}
-
-static void i2c_dec_use_client(struct i2c_client *client)
-{
-   module_put(client->driver->owner);
-   module_put(client->adapter->owner);
-}
-
-int i2c_use_client(struct i2c_client *client)
-{
-   int ret;
-
-   ret = i2c_inc_use_client(client);
-   if (ret)
-   {
-      return(ret);
-   }
-
-   if (client->flags & I2C_CLIENT_ALLOW_USE)
-   {
-      if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-      {
-         client->usage_count++;
-      }
-      else if (client->usage_count > 0)
-      {
-         goto busy;
-      }
-      else
-      {
-         client->usage_count++;
-      }
-   }
-
-   return(0);
-
- busy:
-   i2c_dec_use_client(client);
-   return(-EBUSY);
-}
-
-int i2c_release_client(struct i2c_client *client)
-{
-   if (client->flags & I2C_CLIENT_ALLOW_USE)
-   {
-      if (client->usage_count > 0)
-      {
-         client->usage_count--;
-      }
-      else
-      {
-         pr_debug("i2c-core: %s used one too many times\n",
-                  __FUNCTION__);
-         return(-EPERM);
-      }
-   }
-
-   i2c_dec_use_client(client);
-
-   return(0);
-}
-
-void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
-{
-   struct list_head  *item;
-   struct i2c_client *client;
-
-   down(&adap->clist_lock);
-   list_for_each(item, &adap->clients)
-   {
-      client = list_entry(item, struct i2c_client, list);
-      if (!try_module_get(client->driver->owner))
-      {
-         continue;
-      }
-      if (NULL != client->driver->command)
-      {
-         up(&adap->clist_lock);
-         client->driver->command(client, cmd, arg);
-         down(&adap->clist_lock);
-      }
-      module_put(client->driver->owner);
-   }
-   up(&adap->clist_lock);
-}
-
-static int __init i2c_init(void)
-{
-   int retval;
-
-   retval = bus_register(&i2c_bus_type);
-   if (retval)
-   {
-      return(retval);
-   }
-   retval = driver_register(&i2c_adapter_driver);
-   if (retval)
-   {
-      return(retval);
-   }
-   return(class_register(&i2c_adapter_class));
-}
-
-static void __exit i2c_exit(void)
-{
-   class_unregister(&i2c_adapter_class);
-   driver_unregister(&i2c_adapter_driver);
-   bus_unregister(&i2c_bus_type);
-}
-
-subsys_initcall(i2c_init);
-module_exit(i2c_exit);
-
-/* ----------------------------------------------------
- * the functional interface to the i2c busses.
- * ----------------------------------------------------
- */
-
-int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
-{
-   int ret;
-
-   if (adap->algo->master_xfer)
-   {
-#ifdef DEBUG
-      for (ret = 0; ret < num; ret++)
-      {
-         dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
-                 "len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
-                 'R' : 'W', msgs[ret].addr, msgs[ret].len);
-      }
-#endif
-
-      down(&adap->bus_lock);
-      ret = adap->algo->master_xfer(adap, msgs, num);
-      up(&adap->bus_lock);
-
-      return(ret);
-   }
-   else
-   {
-      dev_dbg(&adap->dev, "I2C level transfers not supported\n");
-      return(-ENOSYS);
-   }
-}
-
-int i2c_master_send(struct i2c_client *client, const char *buf, int count)
-{
-   int                ret;
-   struct i2c_adapter *adap = client->adapter;
-   struct i2c_msg     msg;
-
-   msg.addr  = client->addr;
-   msg.flags = client->flags & I2C_M_TEN;
-   msg.len   = count;
-   msg.buf   = (char *)buf;
-
-   ret = i2c_transfer(adap, &msg, 1);
-
-   /* If everything went ok (i.e. 1 msg transmitted), return #bytes
-    * transmitted, else error code. */
-   return((ret == 1) ? count : ret);
-}
-
-int i2c_master_recv(struct i2c_client *client, char *buf, int count)
-{
-   struct i2c_adapter *adap = client->adapter;
-   struct i2c_msg     msg;
-   int                ret;
-
-   msg.addr   = client->addr;
-   msg.flags  = client->flags & I2C_M_TEN;
-   msg.flags |= I2C_M_RD;
-   msg.len    = count;
-   msg.buf    = buf;
-
-   ret = i2c_transfer(adap, &msg, 1);
-
-   /* If everything went ok (i.e. 1 msg transmitted), return #bytes
-    * transmitted, else error code. */
-   return((ret == 1) ? count : ret);
-}
-
-
-int i2c_control(struct i2c_client *client,
-                unsigned int cmd, unsigned long arg)
-{
-   int                ret   = 0;
-   struct i2c_adapter *adap = client->adapter;
-
-   dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
-   switch (cmd)
-   {
-   case I2C_RETRIES:
-      adap->retries = arg;
-      break;
-
-   case I2C_TIMEOUT:
-      adap->timeout = arg;
-      break;
-
-   default:
-      if (adap->algo->algo_control != NULL)
-      {
-         ret = adap->algo->algo_control(adap, cmd, arg);
-      }
-   }
-   return(ret);
-}
-
-/* ----------------------------------------------------
- * the i2c address scanning function
- * Will not work for 10-bit addresses!
- * ----------------------------------------------------
- */
-static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-                             int (*found_proc)(struct i2c_adapter *, int, int))
-{
-   int err;
-
-   /* Make sure the address is valid */
-   if (addr < 0x03 || addr > 0x77)
-   {
-      dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-               addr);
-      return(-EINVAL);
-   }
-
-   /* Skip if already in use */
-   if (i2c_check_addr(adapter, addr))
-   {
-      return(0);
-   }
-
-   /* Make sure there is something at this address, unless forced */
-   if (kind < 0)
-   {
-      if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                         I2C_SMBUS_QUICK, NULL) < 0)
-      {
-         return(0);
-      }
-
-      /* prevent 24RF08 corruption */
-      if ((addr & ~0x0f) == 0x50)
-      {
-         i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                        I2C_SMBUS_QUICK, NULL);
-      }
-   }
-
-   /* Finally call the custom detection function */
-   err = found_proc(adapter, addr, kind);
-
-   /* -ENODEV can be returned if there is a chip at the given address
-    * but it isn't supported by this chip driver. We catch it here as
-    * this isn't an error. */
-   return((err == -ENODEV) ? 0 : err);
-}
-
-int i2c_probe(struct i2c_adapter *adapter,
-              struct i2c_client_address_data *address_data,
-              int (*found_proc)(struct i2c_adapter *, int, int))
-{
-   int i, err;
-   int adap_id = i2c_adapter_id(adapter);
-
-   /* Forget it if we can't probe using SMBUS_QUICK */
-   if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK))
-   {
-      return(-1);
-   }
-
-   /* Force entries are done first, and are not affected by ignore
-    * entries */
-   if (address_data->forces)
-   {
-      unsigned short **forces = address_data->forces;
-      int            kind;
-
-      for (kind = 0; forces[kind]; kind++)
-      {
-         for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-              i += 2)
-         {
-            if (forces[kind][i] == adap_id
-                || forces[kind][i] == ANY_I2C_BUS)
-            {
-               dev_dbg(&adapter->dev, "found force "
-                       "parameter for adapter %d, "
-                       "addr 0x%02x, kind %d\n",
-                       adap_id, forces[kind][i + 1],
-                       kind);
-               err = i2c_probe_address(adapter,
-                                       forces[kind][i + 1],
-                                       kind, found_proc);
-               if (err)
-               {
-                  return(err);
-               }
-            }
-         }
-      }
-   }
-
-   /* Probe entries are done second, and are not affected by ignore
-    * entries either */
-   for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2)
-   {
-      if (address_data->probe[i] == adap_id
-          || address_data->probe[i] == ANY_I2C_BUS)
-      {
-         dev_dbg(&adapter->dev, "found probe parameter for "
-                 "adapter %d, addr 0x%02x\n", adap_id,
-                 address_data->probe[i + 1]);
-         err = i2c_probe_address(adapter,
-                                 address_data->probe[i + 1],
-                                 -1, found_proc);
-         if (err)
-         {
-            return(err);
-         }
-      }
-   }
-
-   /* Normal entries are done last, unless shadowed by an ignore entry */
-   for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1)
-   {
-      int j, ignore;
-
-      ignore = 0;
-      for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-           j += 2)
-      {
-         if ((address_data->ignore[j] == adap_id ||
-              address_data->ignore[j] == ANY_I2C_BUS)
-             && address_data->ignore[j + 1]
-             == address_data->normal_i2c[i])
-         {
-            dev_dbg(&adapter->dev, "found ignore "
-                    "parameter for adapter %d, "
-                    "addr 0x%02x\n", adap_id,
-                    address_data->ignore[j + 1]);
-         }
-         ignore = 1;
-         break;
-      }
-      if (ignore)
-      {
-         continue;
-      }
-
-      dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-              "addr 0x%02x\n", adap_id,
-              address_data->normal_i2c[i]);
-      err = i2c_probe_address(adapter, address_data->normal_i2c[i],
-                              -1, found_proc);
-      if (err)
-      {
-         return(err);
-      }
-   }
-
-   return(0);
-} /* i2c_probe */
-
-struct i2c_adapter *i2c_get_adapter(int id)
-{
-   struct i2c_adapter *adapter;
-
-   down(&core_lists);
-   adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
-   if (adapter && !try_module_get(adapter->owner))
-   {
-      adapter = NULL;
-   }
-
-   up(&core_lists);
-   return(adapter);
-}
-
-void i2c_put_adapter(struct i2c_adapter *adap)
-{
-   module_put(adap->owner);
-}
-
-/* The SMBus parts */
-
-#define POLY    (0x1070U << 3)
-static u8
-crc8(u16 data)
-{
-   int i;
-
-   for (i = 0; i < 8; i++)
-   {
-      if (data & 0x8000)
-      {
-         data = data ^ POLY;
-      }
-      data = data << 1;
-   }
-   return((u8)(data >> 8));
-}
-
-/* CRC over count bytes in the first array plus the bytes in the rest
- * array if it is non-null. rest[0] is the (length of rest) - 1
- * and is included. */
-static u8 i2c_smbus_partial_pec(u8 crc, int count, u8 *first, u8 *rest)
-{
-   int i;
-
-   for (i = 0; i < count; i++)
-   {
-      crc = crc8((crc ^ first[i]) << 8);
-   }
-   if (rest != NULL)
-   {
-      for (i = 0; i <= rest[0]; i++)
-      {
-         crc = crc8((crc ^ rest[i]) << 8);
-      }
-   }
-   return(crc);
-}
-
-static u8 i2c_smbus_pec(int count, u8 *first, u8 *rest)
-{
-   return(i2c_smbus_partial_pec(0, count, first, rest));
-}
-
-/* Returns new "size" (transaction type)
- * Note that we convert byte to byte_data and byte_data to word_data
- * rather than invent new xxx_PEC transactions. */
-static int i2c_smbus_add_pec(u16 addr, u8 command, int size,
-                             union i2c_smbus_data *data)
-{
-   u8 buf[3];
-
-   buf[0] = addr << 1;
-   buf[1] = command;
-   switch (size)
-   {
-   case I2C_SMBUS_BYTE:
-      data->byte = i2c_smbus_pec(2, buf, NULL);
-      size       = I2C_SMBUS_BYTE_DATA;
-      break;
-
-   case I2C_SMBUS_BYTE_DATA:
-      buf[2]     = data->byte;
-      data->word = buf[2] ||
-                   (i2c_smbus_pec(3, buf, NULL) << 8);
-      size = I2C_SMBUS_WORD_DATA;
-      break;
-
-   case I2C_SMBUS_WORD_DATA:
-      /* unsupported */
-      break;
-
-   case I2C_SMBUS_BLOCK_DATA:
-      data->block[data->block[0] + 1] =
-         i2c_smbus_pec(2, buf, data->block);
-      size = I2C_SMBUS_BLOCK_DATA_PEC;
-      break;
-   }
-   return(size);
-}
-
-static int i2c_smbus_check_pec(u16 addr, u8 command, int size, u8 partial,
-                               union i2c_smbus_data *data)
-{
-   u8 buf[3], rpec, cpec;
-
-   buf[1] = command;
-   switch (size)
-   {
-   case I2C_SMBUS_BYTE_DATA:
-      buf[0] = (addr << 1) | 1;
-      cpec   = i2c_smbus_pec(2, buf, NULL);
-      rpec   = data->byte;
-      break;
-
-   case I2C_SMBUS_WORD_DATA:
-      buf[0] = (addr << 1) | 1;
-      buf[2] = data->word & 0xff;
-      cpec   = i2c_smbus_pec(3, buf, NULL);
-      rpec   = data->word >> 8;
-      break;
-
-   case I2C_SMBUS_WORD_DATA_PEC:
-      /* unsupported */
-      cpec = rpec = 0;
-      break;
-
-   case I2C_SMBUS_PROC_CALL_PEC:
-      /* unsupported */
-      cpec = rpec = 0;
-      break;
-
-   case I2C_SMBUS_BLOCK_DATA_PEC:
-      buf[0] = (addr << 1);
-      buf[2] = (addr << 1) | 1;
-      cpec   = i2c_smbus_pec(3, buf, data->block);
-      rpec   = data->block[data->block[0] + 1];
-      break;
-
-   case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-      buf[0] = (addr << 1) | 1;
-      rpec   = i2c_smbus_partial_pec(partial, 1,
-                                     buf, data->block);
-      cpec = data->block[data->block[0] + 1];
-      break;
-
-   default:
-      cpec = rpec = 0;
-      break;
-   } /* switch */
-   if (rpec != cpec)
-   {
-      pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n",
-               rpec, cpec);
-      return(-1);
-   }
-   return(0);
-} /* i2c_smbus_check_pec */
-
-s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
-{
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         value, 0, I2C_SMBUS_QUICK, NULL));
-}
-
-s32 i2c_smbus_read_byte(struct i2c_client *client)
-{
-   union i2c_smbus_data data;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      return(0x0FF & data.byte);
-   }
-}
-
-s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
-{
-   union i2c_smbus_data data;           /* only for PEC */
-
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, &data));
-}
-
-s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
-{
-   union i2c_smbus_data data;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, command, I2C_SMBUS_BYTE_DATA, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      return(0x0FF & data.byte);
-   }
-}
-
-s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
-{
-   union i2c_smbus_data data;
-
-   data.byte = value;
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, command,
-                         I2C_SMBUS_BYTE_DATA, &data));
-}
-
-s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
-{
-   union i2c_smbus_data data;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, command, I2C_SMBUS_WORD_DATA, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      return(0x0FFFF & data.word);
-   }
-}
-
-s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
-{
-   union i2c_smbus_data data;
-
-   data.word = value;
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, command,
-                         I2C_SMBUS_WORD_DATA, &data));
-}
-
-s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
-                               u8 length, u8 *values)
-{
-   union i2c_smbus_data data;
-   int                  i;
-
-   if (length > I2C_SMBUS_BLOCK_MAX)
-   {
-      length = I2C_SMBUS_BLOCK_MAX;
-   }
-   for (i = 1; i <= length; i++)
-   {
-      data.block[i] = values[i - 1];
-   }
-   data.block[0] = length;
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, command,
-                         I2C_SMBUS_BLOCK_DATA, &data));
-}
-
-/* Returns the number of read bytes */
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
-{
-   union i2c_smbus_data data;
-   int                  i;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, command,
-                      I2C_SMBUS_I2C_BLOCK_DATA, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      for (i = 1; i <= data.block[0]; i++)
-      {
-         values[i - 1] = data.block[i];
-      }
-      return(data.block[0]);
-   }
-}
-
-/* Simulate a SMBus command using the i2c protocol
- * No checking of parameters is done!  */
-static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,
-                                   unsigned short flags,
-                                   char read_write, u8 command, int size,
-                                   union i2c_smbus_data *data)
-{
-   /* So we need to generate a series of msgs. In the case of writing, we
-    * need to use only one message; when reading, we need two. We initialize
-    * most things with sane defaults, to keep the code below somewhat
-    * simpler. */
-   unsigned char  msgbuf0[34];
-   unsigned char  msgbuf1[34];
-   int            num    = read_write == I2C_SMBUS_READ ? 2 : 1;
-   struct i2c_msg msg[2] = { { addr, flags,            1, msgbuf0 },
-                             { addr, flags | I2C_M_RD, 0, msgbuf1 } };
-   int            i;
-
-   msgbuf0[0] = command;
-   switch (size)
-   {
-   case I2C_SMBUS_QUICK:
-      msg[0].len = 0;
-      /* Special case: The read/write field is used as data */
-      msg[0].flags = flags | (read_write == I2C_SMBUS_READ) ? I2C_M_RD : 0;
-      num          = 1;
-      break;
-
-   case I2C_SMBUS_BYTE:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         /* Special case: only a read! */
-         msg[0].flags = I2C_M_RD | flags;
-         num          = 1;
-      }
-      break;
-
-   case I2C_SMBUS_BYTE_DATA:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         msg[1].len = 1;
-      }
-      else
-      {
-         msg[0].len = 2;
-         msgbuf0[1] = data->byte;
-      }
-      break;
-
-   case I2C_SMBUS_WORD_DATA:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         msg[1].len = 2;
-      }
-      else
-      {
-         msg[0].len = 3;
-         msgbuf0[1] = data->word & 0xff;
-         msgbuf0[2] = (data->word >> 8) & 0xff;
-      }
-      break;
-
-   case I2C_SMBUS_PROC_CALL:
-      num        = 2;    /* Special case */
-      read_write = I2C_SMBUS_READ;
-      msg[0].len = 3;
-      msg[1].len = 2;
-      msgbuf0[1] = data->word & 0xff;
-      msgbuf0[2] = (data->word >> 8) & 0xff;
-      break;
-
-   case I2C_SMBUS_BLOCK_DATA:
-   case I2C_SMBUS_BLOCK_DATA_PEC:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         dev_err(&adapter->dev, "Block read not supported "
-                 "under I2C emulation!\n");
-         return(-1);
-      }
-      else
-      {
-         msg[0].len = data->block[0] + 2;
-         if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2)
-         {
-            dev_err(&adapter->dev, "smbus_access called with "
-                    "invalid block write size (%d)\n",
-                    data->block[0]);
-            return(-1);
-         }
-         if (size == I2C_SMBUS_BLOCK_DATA_PEC)
-         {
-            (msg[0].len)++;
-         }
-         for (i = 1; i <= msg[0].len; i++)
-         {
-            msgbuf0[i] = data->block[i - 1];
-         }
-      }
-      break;
-
-   case I2C_SMBUS_BLOCK_PROC_CALL:
-   case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-      dev_dbg(&adapter->dev, "Block process call not supported "
-              "under I2C emulation!\n");
-      return(-1);
-
-   case I2C_SMBUS_I2C_BLOCK_DATA:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-      }
-      else
-      {
-         msg[0].len = data->block[0] + 1;
-         if (msg[0].len > I2C_SMBUS_I2C_BLOCK_MAX + 1)
-         {
-            dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "
-                    "invalid block write size (%d)\n",
-                    data->block[0]);
-            return(-1);
-         }
-         for (i = 1; i <= data->block[0]; i++)
-         {
-            msgbuf0[i] = data->block[i];
-         }
-      }
-      break;
-
-   default:
-      dev_err(&adapter->dev, "smbus_access called with invalid size (%d)\n",
-              size);
-      return(-1);
-   } /* switch */
-
-   if (i2c_transfer(adapter, msg, num) < 0)
-   {
-      return(-1);
-   }
-
-   if (read_write == I2C_SMBUS_READ)
-   {
-      switch (size)
-      {
-      case I2C_SMBUS_BYTE:
-         data->byte = msgbuf0[0];
-         break;
-
-      case I2C_SMBUS_BYTE_DATA:
-         data->byte = msgbuf1[0];
-         break;
-
-      case I2C_SMBUS_WORD_DATA:
-      case I2C_SMBUS_PROC_CALL:
-         data->word = msgbuf1[0] | (msgbuf1[1] << 8);
-         break;
-
-      case I2C_SMBUS_I2C_BLOCK_DATA:
-         /* fixed at 32 for now */
-         data->block[0] = I2C_SMBUS_I2C_BLOCK_MAX;
-         for (i = 0; i < I2C_SMBUS_I2C_BLOCK_MAX; i++)
-         {
-            data->block[i + 1] = msgbuf1[i];
-         }
-         break;
-      }
-   }
-   return(0);
-} /* i2c_smbus_xfer_emulated */
-
-
-s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
-                   char read_write, u8 command, int size,
-                   union i2c_smbus_data *data)
-{
-   s32 res;
-   int swpec   = 0;
-   u8  partial = 0;
-
-   flags &= I2C_M_TEN | I2C_CLIENT_PEC;
-   if ((flags & I2C_CLIENT_PEC) &&
-       !(i2c_check_functionality(adapter, I2C_FUNC_SMBUS_HWPEC_CALC)))
-   {
-      swpec = 1;
-      if (read_write == I2C_SMBUS_READ &&
-          size == I2C_SMBUS_BLOCK_DATA)
-      {
-         size = I2C_SMBUS_BLOCK_DATA_PEC;
-      }
-      else if (size == I2C_SMBUS_PROC_CALL)
-      {
-         size = I2C_SMBUS_PROC_CALL_PEC;
-      }
-      else if (size == I2C_SMBUS_BLOCK_PROC_CALL)
-      {
-         i2c_smbus_add_pec(addr, command,
-                           I2C_SMBUS_BLOCK_DATA, data);
-         partial = data->block[data->block[0] + 1];
-         size    = I2C_SMBUS_BLOCK_PROC_CALL_PEC;
-      }
-      else if (read_write == I2C_SMBUS_WRITE &&
-               size != I2C_SMBUS_QUICK &&
-               size != I2C_SMBUS_I2C_BLOCK_DATA)
-      {
-         size = i2c_smbus_add_pec(addr, command, size, data);
-      }
-   }
-
-   if (adapter->algo->smbus_xfer)
-   {
-      down(&adapter->bus_lock);
-      res = adapter->algo->smbus_xfer(adapter, addr, flags, read_write,
-                                      command, size, data);
-      up(&adapter->bus_lock);
-   }
-   else
-   {
-      res = i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
-                                    command, size, data);
-   }
-
-   if (res >= 0 && swpec &&
-       size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA &&
-       (read_write == I2C_SMBUS_READ || size == I2C_SMBUS_PROC_CALL_PEC ||
-        size == I2C_SMBUS_BLOCK_PROC_CALL_PEC))
-   {
-      if (i2c_smbus_check_pec(addr, command, size, partial, data))
-      {
-         return(-1);
-      }
-   }
-   return(res);
-} /* i2c_smbus_xfer */
-
-
-/* Next four are needed by i2c-isa */
-EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
-EXPORT_SYMBOL_GPL(i2c_adapter_driver);
-EXPORT_SYMBOL_GPL(i2c_adapter_class);
-EXPORT_SYMBOL_GPL(i2c_bus_type);
-
-EXPORT_SYMBOL(i2c_add_adapter);
-EXPORT_SYMBOL(i2c_del_adapter);
-EXPORT_SYMBOL(i2c_add_driver);
-EXPORT_SYMBOL(i2c_del_driver);
-EXPORT_SYMBOL(i2c_attach_client);
-EXPORT_SYMBOL(i2c_detach_client);
-EXPORT_SYMBOL(i2c_use_client);
-EXPORT_SYMBOL(i2c_release_client);
-EXPORT_SYMBOL(i2c_clients_command);
-EXPORT_SYMBOL(i2c_check_addr);
-
-EXPORT_SYMBOL(i2c_master_send);
-EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_control);
-EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_get_adapter);
-EXPORT_SYMBOL(i2c_put_adapter);
-EXPORT_SYMBOL(i2c_probe);
-
-EXPORT_SYMBOL(i2c_smbus_xfer);
-EXPORT_SYMBOL(i2c_smbus_write_quick);
-EXPORT_SYMBOL(i2c_smbus_read_byte);
-EXPORT_SYMBOL(i2c_smbus_write_byte);
-EXPORT_SYMBOL(i2c_smbus_read_byte_data);
-EXPORT_SYMBOL(i2c_smbus_write_byte_data);
-EXPORT_SYMBOL(i2c_smbus_read_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
-
-MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
-MODULE_DESCRIPTION("I2C-Bus main module");
-MODULE_LICENSE("GPL");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02001-directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02001-directfb.h
deleted file mode 100644
index 3c7ffc18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02001-directfb.h
+++ /dev/null
@@ -1,2001 +0,0 @@
-typedef unsigned int                           size_t;
-typedef unsigned char                          __u_char;
-typedef unsigned short int                     __u_short;
-typedef unsigned int                           __u_int;
-typedef unsigned long int                      __u_long;
-typedef signed char                            __int8_t;
-typedef unsigned char                          __uint8_t;
-typedef signed short int                       __int16_t;
-typedef unsigned short int                     __uint16_t;
-typedef signed int                             __int32_t;
-typedef unsigned int                           __uint32_t;
-__extension__ typedef signed long long int     __int64_t;
-__extension__ typedef unsigned long long int   __uint64_t;
-__extension__ typedef long long int            __quad_t;
-__extension__ typedef unsigned long long int   __u_quad_t;
-__extension__ typedef __u_quad_t               __dev_t;
-__extension__ typedef unsigned int             __uid_t;
-__extension__ typedef unsigned int             __gid_t;
-__extension__ typedef unsigned long int        __ino_t;
-__extension__ typedef __u_quad_t               __ino64_t;
-__extension__ typedef unsigned int             __mode_t;
-__extension__ typedef unsigned int             __nlink_t;
-__extension__ typedef long int                 __off_t;
-__extension__ typedef __quad_t                 __off64_t;
-__extension__ typedef int                      __pid_t;
-__extension__ typedef struct
-{
-   int __val[2];
-} __fsid_t;
-__extension__ typedef long int                 __clock_t;
-__extension__ typedef unsigned long int        __rlim_t;
-__extension__ typedef __u_quad_t               __rlim64_t;
-__extension__ typedef unsigned int             __id_t;
-__extension__ typedef long int                 __time_t;
-__extension__ typedef unsigned int             __useconds_t;
-__extension__ typedef long int                 __suseconds_t;
-__extension__ typedef int                      __daddr_t;
-__extension__ typedef long int                 __swblk_t;
-__extension__ typedef int                      __key_t;
-__extension__ typedef int                      __clockid_t;
-__extension__ typedef int                      __timer_t;
-__extension__ typedef long int                 __blksize_t;
-__extension__ typedef long int                 __blkcnt_t;
-__extension__ typedef __quad_t                 __blkcnt64_t;
-__extension__ typedef unsigned long int        __fsblkcnt_t;
-__extension__ typedef __u_quad_t               __fsblkcnt64_t;
-__extension__ typedef unsigned long int        __fsfilcnt_t;
-__extension__ typedef __u_quad_t               __fsfilcnt64_t;
-__extension__ typedef int                      __ssize_t;
-typedef __off64_t                              __loff_t;
-typedef __quad_t *                             __qaddr_t;
-typedef char *                                 __caddr_t;
-__extension__ typedef int                      __intptr_t;
-__extension__ typedef unsigned int             __socklen_t;
-typedef __u_char                               u_char;
-typedef __u_short                              u_short;
-typedef __u_int                                u_int;
-typedef __u_long                               u_long;
-typedef __quad_t                               quad_t;
-typedef __u_quad_t                             u_quad_t;
-typedef __fsid_t                               fsid_t;
-typedef __loff_t                               loff_t;
-typedef __ino_t                                ino_t;
-typedef __dev_t                                dev_t;
-typedef __gid_t                                gid_t;
-typedef __mode_t                               mode_t;
-typedef __nlink_t                              nlink_t;
-typedef __uid_t                                uid_t;
-typedef __off_t                                off_t;
-typedef __pid_t                                pid_t;
-typedef __id_t                                 id_t;
-typedef __ssize_t                              ssize_t;
-typedef __daddr_t                              daddr_t;
-typedef __caddr_t                              caddr_t;
-typedef __key_t                                key_t;
-typedef __time_t                               time_t;
-typedef __clockid_t                            clockid_t;
-typedef __timer_t                              timer_t;
-typedef unsigned long int                      ulong;
-typedef unsigned short int                     ushort;
-typedef unsigned int                           uint;
-typedef int                                    int8_t __attribute__((__mode__(__QI__)));
-typedef int                                    int16_t __attribute__((__mode__(__HI__)));
-typedef int                                    int32_t __attribute__((__mode__(__SI__)));
-typedef int                                    int64_t __attribute__((__mode__(__DI__)));
-typedef unsigned int                           u_int8_t __attribute__((__mode__(__QI__)));
-typedef unsigned int                           u_int16_t __attribute__((__mode__(__HI__)));
-typedef unsigned int                           u_int32_t __attribute__((__mode__(__SI__)));
-typedef unsigned int                           u_int64_t __attribute__((__mode__(__DI__)));
-typedef int                                    register_t __attribute__((__mode__(__word__)));
-typedef int                                    __sig_atomic_t;
-typedef struct
-{
-   unsigned long int __val[(1024 / (8 * sizeof(unsigned long int)))];
-} __sigset_t;
-typedef __sigset_t                             sigset_t;
-struct timespec
-{
-   __time_t tv_sec;
-   long int tv_nsec;
-};
-struct timeval
-{
-   __time_t      tv_sec;
-   __suseconds_t tv_usec;
-};
-typedef __suseconds_t   suseconds_t;
-typedef long int        __fd_mask;
-typedef struct
-{
-   __fd_mask __fds_bits[1024 / (8 * sizeof(__fd_mask))];
-} fd_set;
-typedef __fd_mask       fd_mask;
-extern int select(int __nfds, fd_set *__restrict __readfds,
-                  fd_set *__restrict __writefds,
-                  fd_set *__restrict __exceptfds,
-                  struct timeval *__restrict __timeout);
-__extension__
-extern __inline unsigned int gnu_dev_major(unsigned long long int __dev)
-__attribute__((__nothrow__));
-__extension__
-extern __inline unsigned int gnu_dev_minor(unsigned long long int __dev)
-__attribute__((__nothrow__));
-__extension__
-extern __inline unsigned long long int gnu_dev_makedev(unsigned int __major,
-                                                       unsigned int __minor)
-__attribute__((__nothrow__));
-
-__extension__ extern __inline unsigned int
-__attribute__((__nothrow__)) gnu_dev_major(unsigned long long int __dev)
-{
-   return(((__dev >> 8) & 0xfff) | ((unsigned int)(__dev >> 32) & ~0xfff));
-}
-
-__extension__ extern __inline unsigned int
-__attribute__((__nothrow__)) gnu_dev_minor(unsigned long long int __dev)
-{
-   return((__dev & 0xff) | ((unsigned int)(__dev >> 12) & ~0xff));
-}
-
-__extension__ extern __inline unsigned long long int
-__attribute__((__nothrow__)) gnu_dev_makedev(unsigned int __major, unsigned int __minor)
-{
-   return((__minor & 0xff) | ((__major & 0xfff) << 8)
-          | (((unsigned long long int)(__minor & ~0xff)) << 12)
-          | (((unsigned long long int)(__major & ~0xfff)) << 32));
-}
-
-typedef __blkcnt_t     blkcnt_t;
-typedef __fsblkcnt_t   fsblkcnt_t;
-typedef __fsfilcnt_t   fsfilcnt_t;
-struct __sched_param
-{
-   int __sched_priority;
-};
-typedef int            __atomic_lock_t;
-struct _pthread_fastlock
-{
-   long int        __status;
-   __atomic_lock_t __spinlock;
-};
-typedef struct _pthread_descr_struct *_pthread_descr;
-typedef struct __pthread_attr_s
-{
-   int                  __detachstate;
-   int                  __schedpolicy;
-   struct __sched_param __schedparam;
-   int                  __inheritsched;
-   int                  __scope;
-   size_t               __guardsize;
-   int                  __stackaddr_set;
-   void                 *__stackaddr;
-   size_t               __stacksize;
-} pthread_attr_t;
-__extension__ typedef long long __pthread_cond_align_t;
-typedef struct
-{
-   struct _pthread_fastlock __c_lock;
-   _pthread_descr           __c_waiting;
-   char                     __padding[48 - sizeof(struct _pthread_fastlock)
-                                      - sizeof(_pthread_descr) - sizeof(__pthread_cond_align_t)];
-   __pthread_cond_align_t   __align;
-} pthread_cond_t;
-typedef struct
-{
-   int __dummy;
-} pthread_condattr_t;
-typedef unsigned int pthread_key_t;
-typedef struct
-{
-   int                      __m_reserved;
-   int                      __m_count;
-   _pthread_descr           __m_owner;
-   int                      __m_kind;
-   struct _pthread_fastlock __m_lock;
-} pthread_mutex_t;
-typedef struct
-{
-   int __mutexkind;
-} pthread_mutexattr_t;
-typedef int               pthread_once_t;
-typedef unsigned long int pthread_t;
-typedef struct
-{
-   unsigned long fds_bits [(1024 / (8 * sizeof(unsigned long)))];
-} __kernel_fd_set;
-typedef void (*__kernel_sighandler_t)(int);
-typedef int                  __kernel_key_t;
-typedef int                  __kernel_mqd_t;
-typedef unsigned long        __kernel_ino_t;
-typedef unsigned short       __kernel_mode_t;
-typedef unsigned short       __kernel_nlink_t;
-typedef long                 __kernel_off_t;
-typedef int                  __kernel_pid_t;
-typedef unsigned short       __kernel_ipc_pid_t;
-typedef unsigned short       __kernel_uid_t;
-typedef unsigned short       __kernel_gid_t;
-typedef unsigned int         __kernel_size_t;
-typedef int                  __kernel_ssize_t;
-typedef int                  __kernel_ptrdiff_t;
-typedef long                 __kernel_time_t;
-typedef long                 __kernel_suseconds_t;
-typedef long                 __kernel_clock_t;
-typedef int                  __kernel_timer_t;
-typedef int                  __kernel_clockid_t;
-typedef int                  __kernel_daddr_t;
-typedef char *               __kernel_caddr_t;
-typedef unsigned short       __kernel_uid16_t;
-typedef unsigned short       __kernel_gid16_t;
-typedef unsigned int         __kernel_uid32_t;
-typedef unsigned int         __kernel_gid32_t;
-typedef unsigned short       __kernel_old_uid_t;
-typedef unsigned short       __kernel_old_gid_t;
-typedef unsigned short       __kernel_old_dev_t;
-typedef long long            __kernel_loff_t;
-typedef struct
-{
-   int __val[2];
-} __kernel_fsid_t;
-typedef unsigned short       umode_t;
-typedef __signed__ char      __s8;
-typedef unsigned char        __u8;
-typedef __signed__ short     __s16;
-typedef unsigned short       __u16;
-typedef __signed__ int       __s32;
-typedef unsigned int         __u32;
-typedef __signed__ long long __s64;
-typedef unsigned long long   __u64;
-typedef __u16                __le16;
-typedef __u16                __be16;
-typedef __u32                __le32;
-typedef __u32                __be32;
-typedef __u64                __le64;
-typedef __u64                __be64;
-struct timezone
-{
-   int tz_minuteswest;
-   int tz_dsttime;
-};
-typedef struct timezone *__restrict __timezone_ptr_t;
-extern int gettimeofday(struct timeval *__restrict __tv,
-                        __timezone_ptr_t __tz) __attribute__((__nothrow__));
-extern int settimeofday(__const struct timeval *__tv,
-                        __const struct timezone *__tz) __attribute__((__nothrow__));
-extern int adjtime(__const struct timeval *__delta,
-                   struct timeval *__olddelta) __attribute__((__nothrow__));
-
-enum __itimer_which
-{
-   ITIMER_REAL    = 0,
-   ITIMER_VIRTUAL = 1,
-   ITIMER_PROF    = 2
-};
-struct itimerval
-{
-   struct timeval it_interval;
-   struct timeval it_value;
-};
-typedef int __itimer_which_t;
-extern int getitimer(__itimer_which_t __which,
-                     struct itimerval *__value) __attribute__((__nothrow__));
-extern int setitimer(__itimer_which_t __which,
-                     __const struct itimerval *__restrict __new,
-                     struct itimerval *__restrict __old) __attribute__((__nothrow__));
-extern int utimes(__const char *__file, __const struct timeval __tvp[2])
-__attribute__((__nothrow__));
-extern int lutimes(__const char *__file, __const struct timeval __tvp[2])
-__attribute__((__nothrow__));
-extern int futimes(int __fd, __const struct timeval __tvp[2]) __attribute__((__nothrow__));
-
-typedef enum
-{
-   DIKT_UNICODE    = 0x0000,
-   DIKT_SPECIAL    = 0xF000,
-   DIKT_FUNCTION   = 0xF100,
-   DIKT_MODIFIER   = 0xF200,
-   DIKT_LOCK       = 0xF300,
-   DIKT_DEAD       = 0xF400,
-   DIKT_CUSTOM     = 0xF500,
-   DIKT_IDENTIFIER = 0xF600
-} DFBInputDeviceKeyType;
-typedef enum
-{
-   DIMKI_SHIFT,
-   DIMKI_CONTROL,
-   DIMKI_ALT,
-   DIMKI_ALTGR,
-   DIMKI_META,
-   DIMKI_SUPER,
-   DIMKI_HYPER,
-   DIMKI_FIRST = DIMKI_SHIFT,
-   DIMKI_LAST  = DIMKI_HYPER
-} DFBInputDeviceModifierKeyIdentifier;
-typedef enum
-{
-   DIKI_UNKNOWN = ((DIKT_IDENTIFIER) | (0)),
-   DIKI_A,
-   DIKI_B,
-   DIKI_C,
-   DIKI_D,
-   DIKI_E,
-   DIKI_F,
-   DIKI_G,
-   DIKI_H,
-   DIKI_I,
-   DIKI_J,
-   DIKI_K,
-   DIKI_L,
-   DIKI_M,
-   DIKI_N,
-   DIKI_O,
-   DIKI_P,
-   DIKI_Q,
-   DIKI_R,
-   DIKI_S,
-   DIKI_T,
-   DIKI_U,
-   DIKI_V,
-   DIKI_W,
-   DIKI_X,
-   DIKI_Y,
-   DIKI_Z,
-   DIKI_0,
-   DIKI_1,
-   DIKI_2,
-   DIKI_3,
-   DIKI_4,
-   DIKI_5,
-   DIKI_6,
-   DIKI_7,
-   DIKI_8,
-   DIKI_9,
-   DIKI_F1,
-   DIKI_F2,
-   DIKI_F3,
-   DIKI_F4,
-   DIKI_F5,
-   DIKI_F6,
-   DIKI_F7,
-   DIKI_F8,
-   DIKI_F9,
-   DIKI_F10,
-   DIKI_F11,
-   DIKI_F12,
-   DIKI_SHIFT_L,
-   DIKI_SHIFT_R,
-   DIKI_CONTROL_L,
-   DIKI_CONTROL_R,
-   DIKI_ALT_L,
-   DIKI_ALT_R,
-   DIKI_ALTGR,
-   DIKI_META_L,
-   DIKI_META_R,
-   DIKI_SUPER_L,
-   DIKI_SUPER_R,
-   DIKI_HYPER_L,
-   DIKI_HYPER_R,
-   DIKI_CAPS_LOCK,
-   DIKI_NUM_LOCK,
-   DIKI_SCROLL_LOCK,
-   DIKI_ESCAPE,
-   DIKI_LEFT,
-   DIKI_RIGHT,
-   DIKI_UP,
-   DIKI_DOWN,
-   DIKI_TAB,
-   DIKI_ENTER,
-   DIKI_SPACE,
-   DIKI_BACKSPACE,
-   DIKI_INSERT,
-   DIKI_DELETE,
-   DIKI_HOME,
-   DIKI_END,
-   DIKI_PAGE_UP,
-   DIKI_PAGE_DOWN,
-   DIKI_PRINT,
-   DIKI_PAUSE,
-   DIKI_QUOTE_LEFT,
-   DIKI_MINUS_SIGN,
-   DIKI_EQUALS_SIGN,
-   DIKI_BRACKET_LEFT,
-   DIKI_BRACKET_RIGHT,
-   DIKI_BACKSLASH,
-   DIKI_SEMICOLON,
-   DIKI_QUOTE_RIGHT,
-   DIKI_COMMA,
-   DIKI_PERIOD,
-   DIKI_SLASH,
-   DIKI_LESS_SIGN,
-   DIKI_KP_DIV,
-   DIKI_KP_MULT,
-   DIKI_KP_MINUS,
-   DIKI_KP_PLUS,
-   DIKI_KP_ENTER,
-   DIKI_KP_SPACE,
-   DIKI_KP_TAB,
-   DIKI_KP_F1,
-   DIKI_KP_F2,
-   DIKI_KP_F3,
-   DIKI_KP_F4,
-   DIKI_KP_EQUAL,
-   DIKI_KP_SEPARATOR,
-   DIKI_KP_DECIMAL,
-   DIKI_KP_0,
-   DIKI_KP_1,
-   DIKI_KP_2,
-   DIKI_KP_3,
-   DIKI_KP_4,
-   DIKI_KP_5,
-   DIKI_KP_6,
-   DIKI_KP_7,
-   DIKI_KP_8,
-   DIKI_KP_9,
-   DIKI_KEYDEF_END,
-   DIKI_NUMBER_OF_KEYS = DIKI_KEYDEF_END - ((DIKT_IDENTIFIER) | (0))
-} DFBInputDeviceKeyIdentifier;
-typedef enum
-{
-   DIKS_NULL                  = ((DIKT_UNICODE) | (0x00)),
-   DIKS_BACKSPACE             = ((DIKT_UNICODE) | (0x08)),
-   DIKS_TAB                   = ((DIKT_UNICODE) | (0x09)),
-   DIKS_RETURN                = ((DIKT_UNICODE) | (0x0D)),
-   DIKS_CANCEL                = ((DIKT_UNICODE) | (0x18)),
-   DIKS_ESCAPE                = ((DIKT_UNICODE) | (0x1B)),
-   DIKS_SPACE                 = ((DIKT_UNICODE) | (0x20)),
-   DIKS_EXCLAMATION_MARK      = ((DIKT_UNICODE) | (0x21)),
-   DIKS_QUOTATION             = ((DIKT_UNICODE) | (0x22)),
-   DIKS_NUMBER_SIGN           = ((DIKT_UNICODE) | (0x23)),
-   DIKS_DOLLAR_SIGN           = ((DIKT_UNICODE) | (0x24)),
-   DIKS_PERCENT_SIGN          = ((DIKT_UNICODE) | (0x25)),
-   DIKS_AMPERSAND             = ((DIKT_UNICODE) | (0x26)),
-   DIKS_APOSTROPHE            = ((DIKT_UNICODE) | (0x27)),
-   DIKS_PARENTHESIS_LEFT      = ((DIKT_UNICODE) | (0x28)),
-   DIKS_PARENTHESIS_RIGHT     = ((DIKT_UNICODE) | (0x29)),
-   DIKS_ASTERISK              = ((DIKT_UNICODE) | (0x2A)),
-   DIKS_PLUS_SIGN             = ((DIKT_UNICODE) | (0x2B)),
-   DIKS_COMMA                 = ((DIKT_UNICODE) | (0x2C)),
-   DIKS_MINUS_SIGN            = ((DIKT_UNICODE) | (0x2D)),
-   DIKS_PERIOD                = ((DIKT_UNICODE) | (0x2E)),
-   DIKS_SLASH                 = ((DIKT_UNICODE) | (0x2F)),
-   DIKS_0                     = ((DIKT_UNICODE) | (0x30)),
-   DIKS_1                     = ((DIKT_UNICODE) | (0x31)),
-   DIKS_2                     = ((DIKT_UNICODE) | (0x32)),
-   DIKS_3                     = ((DIKT_UNICODE) | (0x33)),
-   DIKS_4                     = ((DIKT_UNICODE) | (0x34)),
-   DIKS_5                     = ((DIKT_UNICODE) | (0x35)),
-   DIKS_6                     = ((DIKT_UNICODE) | (0x36)),
-   DIKS_7                     = ((DIKT_UNICODE) | (0x37)),
-   DIKS_8                     = ((DIKT_UNICODE) | (0x38)),
-   DIKS_9                     = ((DIKT_UNICODE) | (0x39)),
-   DIKS_COLON                 = ((DIKT_UNICODE) | (0x3A)),
-   DIKS_SEMICOLON             = ((DIKT_UNICODE) | (0x3B)),
-   DIKS_LESS_THAN_SIGN        = ((DIKT_UNICODE) | (0x3C)),
-   DIKS_EQUALS_SIGN           = ((DIKT_UNICODE) | (0x3D)),
-   DIKS_GREATER_THAN_SIGN     = ((DIKT_UNICODE) | (0x3E)),
-   DIKS_QUESTION_MARK         = ((DIKT_UNICODE) | (0x3F)),
-   DIKS_AT                    = ((DIKT_UNICODE) | (0x40)),
-   DIKS_CAPITAL_A             = ((DIKT_UNICODE) | (0x41)),
-   DIKS_CAPITAL_B             = ((DIKT_UNICODE) | (0x42)),
-   DIKS_CAPITAL_C             = ((DIKT_UNICODE) | (0x43)),
-   DIKS_CAPITAL_D             = ((DIKT_UNICODE) | (0x44)),
-   DIKS_CAPITAL_E             = ((DIKT_UNICODE) | (0x45)),
-   DIKS_CAPITAL_F             = ((DIKT_UNICODE) | (0x46)),
-   DIKS_CAPITAL_G             = ((DIKT_UNICODE) | (0x47)),
-   DIKS_CAPITAL_H             = ((DIKT_UNICODE) | (0x48)),
-   DIKS_CAPITAL_I             = ((DIKT_UNICODE) | (0x49)),
-   DIKS_CAPITAL_J             = ((DIKT_UNICODE) | (0x4A)),
-   DIKS_CAPITAL_K             = ((DIKT_UNICODE) | (0x4B)),
-   DIKS_CAPITAL_L             = ((DIKT_UNICODE) | (0x4C)),
-   DIKS_CAPITAL_M             = ((DIKT_UNICODE) | (0x4D)),
-   DIKS_CAPITAL_N             = ((DIKT_UNICODE) | (0x4E)),
-   DIKS_CAPITAL_O             = ((DIKT_UNICODE) | (0x4F)),
-   DIKS_CAPITAL_P             = ((DIKT_UNICODE) | (0x50)),
-   DIKS_CAPITAL_Q             = ((DIKT_UNICODE) | (0x51)),
-   DIKS_CAPITAL_R             = ((DIKT_UNICODE) | (0x52)),
-   DIKS_CAPITAL_S             = ((DIKT_UNICODE) | (0x53)),
-   DIKS_CAPITAL_T             = ((DIKT_UNICODE) | (0x54)),
-   DIKS_CAPITAL_U             = ((DIKT_UNICODE) | (0x55)),
-   DIKS_CAPITAL_V             = ((DIKT_UNICODE) | (0x56)),
-   DIKS_CAPITAL_W             = ((DIKT_UNICODE) | (0x57)),
-   DIKS_CAPITAL_X             = ((DIKT_UNICODE) | (0x58)),
-   DIKS_CAPITAL_Y             = ((DIKT_UNICODE) | (0x59)),
-   DIKS_CAPITAL_Z             = ((DIKT_UNICODE) | (0x5A)),
-   DIKS_SQUARE_BRACKET_LEFT   = ((DIKT_UNICODE) | (0x5B)),
-   DIKS_BACKSLASH             = ((DIKT_UNICODE) | (0x5C)),
-   DIKS_SQUARE_BRACKET_RIGHT  = ((DIKT_UNICODE) | (0x5D)),
-   DIKS_CIRCUMFLEX_ACCENT     = ((DIKT_UNICODE) | (0x5E)),
-   DIKS_UNDERSCORE            = ((DIKT_UNICODE) | (0x5F)),
-   DIKS_GRAVE_ACCENT          = ((DIKT_UNICODE) | (0x60)),
-   DIKS_SMALL_A               = ((DIKT_UNICODE) | (0x61)),
-   DIKS_SMALL_B               = ((DIKT_UNICODE) | (0x62)),
-   DIKS_SMALL_C               = ((DIKT_UNICODE) | (0x63)),
-   DIKS_SMALL_D               = ((DIKT_UNICODE) | (0x64)),
-   DIKS_SMALL_E               = ((DIKT_UNICODE) | (0x65)),
-   DIKS_SMALL_F               = ((DIKT_UNICODE) | (0x66)),
-   DIKS_SMALL_G               = ((DIKT_UNICODE) | (0x67)),
-   DIKS_SMALL_H               = ((DIKT_UNICODE) | (0x68)),
-   DIKS_SMALL_I               = ((DIKT_UNICODE) | (0x69)),
-   DIKS_SMALL_J               = ((DIKT_UNICODE) | (0x6A)),
-   DIKS_SMALL_K               = ((DIKT_UNICODE) | (0x6B)),
-   DIKS_SMALL_L               = ((DIKT_UNICODE) | (0x6C)),
-   DIKS_SMALL_M               = ((DIKT_UNICODE) | (0x6D)),
-   DIKS_SMALL_N               = ((DIKT_UNICODE) | (0x6E)),
-   DIKS_SMALL_O               = ((DIKT_UNICODE) | (0x6F)),
-   DIKS_SMALL_P               = ((DIKT_UNICODE) | (0x70)),
-   DIKS_SMALL_Q               = ((DIKT_UNICODE) | (0x71)),
-   DIKS_SMALL_R               = ((DIKT_UNICODE) | (0x72)),
-   DIKS_SMALL_S               = ((DIKT_UNICODE) | (0x73)),
-   DIKS_SMALL_T               = ((DIKT_UNICODE) | (0x74)),
-   DIKS_SMALL_U               = ((DIKT_UNICODE) | (0x75)),
-   DIKS_SMALL_V               = ((DIKT_UNICODE) | (0x76)),
-   DIKS_SMALL_W               = ((DIKT_UNICODE) | (0x77)),
-   DIKS_SMALL_X               = ((DIKT_UNICODE) | (0x78)),
-   DIKS_SMALL_Y               = ((DIKT_UNICODE) | (0x79)),
-   DIKS_SMALL_Z               = ((DIKT_UNICODE) | (0x7A)),
-   DIKS_CURLY_BRACKET_LEFT    = ((DIKT_UNICODE) | (0x7B)),
-   DIKS_VERTICAL_BAR          = ((DIKT_UNICODE) | (0x7C)),
-   DIKS_CURLY_BRACKET_RIGHT   = ((DIKT_UNICODE) | (0x7D)),
-   DIKS_TILDE                 = ((DIKT_UNICODE) | (0x7E)),
-   DIKS_DELETE                = ((DIKT_UNICODE) | (0x7F)),
-   DIKS_ENTER                 = DIKS_RETURN,
-   DIKS_CURSOR_LEFT           = ((DIKT_SPECIAL) | (0x00)),
-   DIKS_CURSOR_RIGHT          = ((DIKT_SPECIAL) | (0x01)),
-   DIKS_CURSOR_UP             = ((DIKT_SPECIAL) | (0x02)),
-   DIKS_CURSOR_DOWN           = ((DIKT_SPECIAL) | (0x03)),
-   DIKS_INSERT                = ((DIKT_SPECIAL) | (0x04)),
-   DIKS_HOME                  = ((DIKT_SPECIAL) | (0x05)),
-   DIKS_END                   = ((DIKT_SPECIAL) | (0x06)),
-   DIKS_PAGE_UP               = ((DIKT_SPECIAL) | (0x07)),
-   DIKS_PAGE_DOWN             = ((DIKT_SPECIAL) | (0x08)),
-   DIKS_PRINT                 = ((DIKT_SPECIAL) | (0x09)),
-   DIKS_PAUSE                 = ((DIKT_SPECIAL) | (0x0A)),
-   DIKS_OK                    = ((DIKT_SPECIAL) | (0x0B)),
-   DIKS_SELECT                = ((DIKT_SPECIAL) | (0x0C)),
-   DIKS_GOTO                  = ((DIKT_SPECIAL) | (0x0D)),
-   DIKS_CLEAR                 = ((DIKT_SPECIAL) | (0x0E)),
-   DIKS_POWER                 = ((DIKT_SPECIAL) | (0x0F)),
-   DIKS_POWER2                = ((DIKT_SPECIAL) | (0x10)),
-   DIKS_OPTION                = ((DIKT_SPECIAL) | (0x11)),
-   DIKS_MENU                  = ((DIKT_SPECIAL) | (0x12)),
-   DIKS_HELP                  = ((DIKT_SPECIAL) | (0x13)),
-   DIKS_INFO                  = ((DIKT_SPECIAL) | (0x14)),
-   DIKS_TIME                  = ((DIKT_SPECIAL) | (0x15)),
-   DIKS_VENDOR                = ((DIKT_SPECIAL) | (0x16)),
-   DIKS_ARCHIVE               = ((DIKT_SPECIAL) | (0x17)),
-   DIKS_PROGRAM               = ((DIKT_SPECIAL) | (0x18)),
-   DIKS_CHANNEL               = ((DIKT_SPECIAL) | (0x19)),
-   DIKS_FAVORITES             = ((DIKT_SPECIAL) | (0x1A)),
-   DIKS_EPG                   = ((DIKT_SPECIAL) | (0x1B)),
-   DIKS_PVR                   = ((DIKT_SPECIAL) | (0x1C)),
-   DIKS_MHP                   = ((DIKT_SPECIAL) | (0x1D)),
-   DIKS_LANGUAGE              = ((DIKT_SPECIAL) | (0x1E)),
-   DIKS_TITLE                 = ((DIKT_SPECIAL) | (0x1F)),
-   DIKS_SUBTITLE              = ((DIKT_SPECIAL) | (0x20)),
-   DIKS_ANGLE                 = ((DIKT_SPECIAL) | (0x21)),
-   DIKS_ZOOM                  = ((DIKT_SPECIAL) | (0x22)),
-   DIKS_MODE                  = ((DIKT_SPECIAL) | (0x23)),
-   DIKS_KEYBOARD              = ((DIKT_SPECIAL) | (0x24)),
-   DIKS_PC                    = ((DIKT_SPECIAL) | (0x25)),
-   DIKS_SCREEN                = ((DIKT_SPECIAL) | (0x26)),
-   DIKS_TV                    = ((DIKT_SPECIAL) | (0x27)),
-   DIKS_TV2                   = ((DIKT_SPECIAL) | (0x28)),
-   DIKS_VCR                   = ((DIKT_SPECIAL) | (0x29)),
-   DIKS_VCR2                  = ((DIKT_SPECIAL) | (0x2A)),
-   DIKS_SAT                   = ((DIKT_SPECIAL) | (0x2B)),
-   DIKS_SAT2                  = ((DIKT_SPECIAL) | (0x2C)),
-   DIKS_CD                    = ((DIKT_SPECIAL) | (0x2D)),
-   DIKS_TAPE                  = ((DIKT_SPECIAL) | (0x2E)),
-   DIKS_RADIO                 = ((DIKT_SPECIAL) | (0x2F)),
-   DIKS_TUNER                 = ((DIKT_SPECIAL) | (0x30)),
-   DIKS_PLAYER                = ((DIKT_SPECIAL) | (0x31)),
-   DIKS_TEXT                  = ((DIKT_SPECIAL) | (0x32)),
-   DIKS_DVD                   = ((DIKT_SPECIAL) | (0x33)),
-   DIKS_AUX                   = ((DIKT_SPECIAL) | (0x34)),
-   DIKS_MP3                   = ((DIKT_SPECIAL) | (0x35)),
-   DIKS_PHONE                 = ((DIKT_SPECIAL) | (0x36)),
-   DIKS_AUDIO                 = ((DIKT_SPECIAL) | (0x37)),
-   DIKS_VIDEO                 = ((DIKT_SPECIAL) | (0x38)),
-   DIKS_INTERNET              = ((DIKT_SPECIAL) | (0x39)),
-   DIKS_MAIL                  = ((DIKT_SPECIAL) | (0x3A)),
-   DIKS_NEWS                  = ((DIKT_SPECIAL) | (0x3B)),
-   DIKS_DIRECTORY             = ((DIKT_SPECIAL) | (0x3C)),
-   DIKS_LIST                  = ((DIKT_SPECIAL) | (0x3D)),
-   DIKS_CALCULATOR            = ((DIKT_SPECIAL) | (0x3E)),
-   DIKS_MEMO                  = ((DIKT_SPECIAL) | (0x3F)),
-   DIKS_CALENDAR              = ((DIKT_SPECIAL) | (0x40)),
-   DIKS_EDITOR                = ((DIKT_SPECIAL) | (0x41)),
-   DIKS_RED                   = ((DIKT_SPECIAL) | (0x42)),
-   DIKS_GREEN                 = ((DIKT_SPECIAL) | (0x43)),
-   DIKS_YELLOW                = ((DIKT_SPECIAL) | (0x44)),
-   DIKS_BLUE                  = ((DIKT_SPECIAL) | (0x45)),
-   DIKS_CHANNEL_UP            = ((DIKT_SPECIAL) | (0x46)),
-   DIKS_CHANNEL_DOWN          = ((DIKT_SPECIAL) | (0x47)),
-   DIKS_BACK                  = ((DIKT_SPECIAL) | (0x48)),
-   DIKS_FORWARD               = ((DIKT_SPECIAL) | (0x49)),
-   DIKS_FIRST                 = ((DIKT_SPECIAL) | (0x4A)),
-   DIKS_LAST                  = ((DIKT_SPECIAL) | (0x4B)),
-   DIKS_VOLUME_UP             = ((DIKT_SPECIAL) | (0x4C)),
-   DIKS_VOLUME_DOWN           = ((DIKT_SPECIAL) | (0x4D)),
-   DIKS_MUTE                  = ((DIKT_SPECIAL) | (0x4E)),
-   DIKS_AB                    = ((DIKT_SPECIAL) | (0x4F)),
-   DIKS_PLAYPAUSE             = ((DIKT_SPECIAL) | (0x50)),
-   DIKS_PLAY                  = ((DIKT_SPECIAL) | (0x51)),
-   DIKS_STOP                  = ((DIKT_SPECIAL) | (0x52)),
-   DIKS_RESTART               = ((DIKT_SPECIAL) | (0x53)),
-   DIKS_SLOW                  = ((DIKT_SPECIAL) | (0x54)),
-   DIKS_FAST                  = ((DIKT_SPECIAL) | (0x55)),
-   DIKS_RECORD                = ((DIKT_SPECIAL) | (0x56)),
-   DIKS_EJECT                 = ((DIKT_SPECIAL) | (0x57)),
-   DIKS_SHUFFLE               = ((DIKT_SPECIAL) | (0x58)),
-   DIKS_REWIND                = ((DIKT_SPECIAL) | (0x59)),
-   DIKS_FASTFORWARD           = ((DIKT_SPECIAL) | (0x5A)),
-   DIKS_PREVIOUS              = ((DIKT_SPECIAL) | (0x5B)),
-   DIKS_NEXT                  = ((DIKT_SPECIAL) | (0x5C)),
-   DIKS_BEGIN                 = ((DIKT_SPECIAL) | (0x5D)),
-   DIKS_DIGITS                = ((DIKT_SPECIAL) | (0x5E)),
-   DIKS_TEEN                  = ((DIKT_SPECIAL) | (0x5F)),
-   DIKS_TWEN                  = ((DIKT_SPECIAL) | (0x60)),
-   DIKS_BREAK                 = ((DIKT_SPECIAL) | (0x61)),
-   DIKS_EXIT                  = ((DIKT_SPECIAL) | (0x62)),
-   DIKS_SETUP                 = ((DIKT_SPECIAL) | (0x63)),
-   DIKS_CURSOR_LEFT_UP        = ((DIKT_SPECIAL) | (0x64)),
-   DIKS_CURSOR_LEFT_DOWN      = ((DIKT_SPECIAL) | (0x65)),
-   DIKS_CURSOR_UP_RIGHT       = ((DIKT_SPECIAL) | (0x66)),
-   DIKS_CURSOR_DOWN_RIGHT     = ((DIKT_SPECIAL) | (0x67)),
-   DIKS_F1                    = (((DIKT_FUNCTION) | (1))),
-   DIKS_F2                    = (((DIKT_FUNCTION) | (2))),
-   DIKS_F3                    = (((DIKT_FUNCTION) | (3))),
-   DIKS_F4                    = (((DIKT_FUNCTION) | (4))),
-   DIKS_F5                    = (((DIKT_FUNCTION) | (5))),
-   DIKS_F6                    = (((DIKT_FUNCTION) | (6))),
-   DIKS_F7                    = (((DIKT_FUNCTION) | (7))),
-   DIKS_F8                    = (((DIKT_FUNCTION) | (8))),
-   DIKS_F9                    = (((DIKT_FUNCTION) | (9))),
-   DIKS_F10                   = (((DIKT_FUNCTION) | (10))),
-   DIKS_F11                   = (((DIKT_FUNCTION) | (11))),
-   DIKS_F12                   = (((DIKT_FUNCTION) | (12))),
-   DIKS_SHIFT                 = (((DIKT_MODIFIER) | ((1 << DIMKI_SHIFT)))),
-   DIKS_CONTROL               = (((DIKT_MODIFIER) | ((1 << DIMKI_CONTROL)))),
-   DIKS_ALT                   = (((DIKT_MODIFIER) | ((1 << DIMKI_ALT)))),
-   DIKS_ALTGR                 = (((DIKT_MODIFIER) | ((1 << DIMKI_ALTGR)))),
-   DIKS_META                  = (((DIKT_MODIFIER) | ((1 << DIMKI_META)))),
-   DIKS_SUPER                 = (((DIKT_MODIFIER) | ((1 << DIMKI_SUPER)))),
-   DIKS_HYPER                 = (((DIKT_MODIFIER) | ((1 << DIMKI_HYPER)))),
-   DIKS_CAPS_LOCK             = ((DIKT_LOCK) | (0x00)),
-   DIKS_NUM_LOCK              = ((DIKT_LOCK) | (0x01)),
-   DIKS_SCROLL_LOCK           = ((DIKT_LOCK) | (0x02)),
-   DIKS_DEAD_ABOVEDOT         = ((DIKT_DEAD) | (0x00)),
-   DIKS_DEAD_ABOVERING        = ((DIKT_DEAD) | (0x01)),
-   DIKS_DEAD_ACUTE            = ((DIKT_DEAD) | (0x02)),
-   DIKS_DEAD_BREVE            = ((DIKT_DEAD) | (0x03)),
-   DIKS_DEAD_CARON            = ((DIKT_DEAD) | (0x04)),
-   DIKS_DEAD_CEDILLA          = ((DIKT_DEAD) | (0x05)),
-   DIKS_DEAD_CIRCUMFLEX       = ((DIKT_DEAD) | (0x06)),
-   DIKS_DEAD_DIAERESIS        = ((DIKT_DEAD) | (0x07)),
-   DIKS_DEAD_DOUBLEACUTE      = ((DIKT_DEAD) | (0x08)),
-   DIKS_DEAD_GRAVE            = ((DIKT_DEAD) | (0x09)),
-   DIKS_DEAD_IOTA             = ((DIKT_DEAD) | (0x0A)),
-   DIKS_DEAD_MACRON           = ((DIKT_DEAD) | (0x0B)),
-   DIKS_DEAD_OGONEK           = ((DIKT_DEAD) | (0x0C)),
-   DIKS_DEAD_SEMIVOICED_SOUND = ((DIKT_DEAD) | (0x0D)),
-   DIKS_DEAD_TILDE            = ((DIKT_DEAD) | (0x0E)),
-   DIKS_DEAD_VOICED_SOUND     = ((DIKT_DEAD) | (0x0F)),
-   DIKS_CUSTOM0               = (((DIKT_CUSTOM) | (0))),
-   DIKS_CUSTOM1               = (((DIKT_CUSTOM) | (1))),
-   DIKS_CUSTOM2               = (((DIKT_CUSTOM) | (2))),
-   DIKS_CUSTOM3               = (((DIKT_CUSTOM) | (3))),
-   DIKS_CUSTOM4               = (((DIKT_CUSTOM) | (4))),
-   DIKS_CUSTOM5               = (((DIKT_CUSTOM) | (5))),
-   DIKS_CUSTOM6               = (((DIKT_CUSTOM) | (6))),
-   DIKS_CUSTOM7               = (((DIKT_CUSTOM) | (7))),
-   DIKS_CUSTOM8               = (((DIKT_CUSTOM) | (8))),
-   DIKS_CUSTOM9               = (((DIKT_CUSTOM) | (9)))
-} DFBInputDeviceKeySymbol;
-typedef enum
-{
-   DILS_SCROLL = 0x00000001,
-   DILS_NUM    = 0x00000002,
-   DILS_CAPS   = 0x00000004
-} DFBInputDeviceLockState;
-typedef enum
-{
-   DIKSI_BASE       = 0x00,
-   DIKSI_BASE_SHIFT = 0x01,
-   DIKSI_ALT        = 0x02,
-   DIKSI_ALT_SHIFT  = 0x03,
-   DIKSI_LAST       = DIKSI_ALT_SHIFT
-} DFBInputDeviceKeymapSymbolIndex;
-typedef struct
-{
-   int                         code;
-   DFBInputDeviceLockState     locks;
-   DFBInputDeviceKeyIdentifier identifier;
-   DFBInputDeviceKeySymbol     symbols[DIKSI_LAST + 1];
-} DFBInputDeviceKeymapEntry;
-extern const unsigned int directfb_major_version;
-extern const unsigned int directfb_minor_version;
-extern const unsigned int directfb_micro_version;
-extern const unsigned int directfb_binary_age;
-extern const unsigned int directfb_interface_age;
-const char *DirectFBCheckVersion(unsigned int required_major,
-                                 unsigned int required_minor,
-                                 unsigned int required_micro);
-
-typedef struct _IDirectFB              IDirectFB;
-typedef struct _IDirectFBScreen        IDirectFBScreen;
-typedef struct _IDirectFBDisplayLayer  IDirectFBDisplayLayer;
-typedef struct _IDirectFBSurface       IDirectFBSurface;
-typedef struct _IDirectFBPalette       IDirectFBPalette;
-typedef struct _IDirectFBWindow        IDirectFBWindow;
-typedef struct _IDirectFBInputDevice   IDirectFBInputDevice;
-typedef struct _IDirectFBEventBuffer   IDirectFBEventBuffer;
-typedef struct _IDirectFBFont          IDirectFBFont;
-typedef struct _IDirectFBImageProvider IDirectFBImageProvider;
-typedef struct _IDirectFBVideoProvider IDirectFBVideoProvider;
-typedef struct _IDirectFBDataBuffer    IDirectFBDataBuffer;
-typedef struct _IDirectFBGL            IDirectFBGL;
-typedef enum
-{
-   DFB_OK,
-   DFB_FAILURE,
-   DFB_INIT,
-   DFB_BUG,
-   DFB_DEAD,
-   DFB_UNSUPPORTED,
-   DFB_UNIMPLEMENTED,
-   DFB_ACCESSDENIED,
-   DFB_INVARG,
-   DFB_NOSYSTEMMEMORY,
-   DFB_NOVIDEOMEMORY,
-   DFB_LOCKED,
-   DFB_BUFFEREMPTY,
-   DFB_FILENOTFOUND,
-   DFB_IO,
-   DFB_BUSY,
-   DFB_NOIMPL,
-   DFB_MISSINGFONT,
-   DFB_TIMEOUT,
-   DFB_MISSINGIMAGE,
-   DFB_THIZNULL,
-   DFB_IDNOTFOUND,
-   DFB_INVAREA,
-   DFB_DESTROYED,
-   DFB_FUSION,
-   DFB_BUFFERTOOLARGE,
-   DFB_INTERRUPTED,
-   DFB_NOCONTEXT,
-   DFB_TEMPUNAVAIL,
-   DFB_LIMITEXCEEDED,
-   DFB_NOSUCHMETHOD,
-   DFB_NOSUCHINSTANCE,
-   DFB_ITEMNOTFOUND,
-   DFB_VERSIONMISMATCH,
-   DFB_NOSHAREDMEMORY
-} DFBResult;
-typedef enum
-{
-   DFB_FALSE = 0,
-   DFB_TRUE  = !DFB_FALSE
-} DFBBoolean;
-typedef struct
-{
-   int x;
-   int y;
-} DFBPoint;
-typedef struct
-{
-   int x;
-   int w;
-} DFBSpan;
-typedef struct
-{
-   int w;
-   int h;
-} DFBDimension;
-typedef struct
-{
-   int x;
-   int y;
-   int w;
-   int h;
-} DFBRectangle;
-typedef struct
-{
-   float x;
-   float y;
-   float w;
-   float h;
-} DFBLocation;
-typedef struct
-{
-   int x1;
-   int y1;
-   int x2;
-   int y2;
-} DFBRegion;
-typedef struct
-{
-   int l;
-   int t;
-   int r;
-   int b;
-} DFBInsets;
-typedef struct
-{
-   int x1;
-   int y1;
-   int x2;
-   int y2;
-   int x3;
-   int y3;
-} DFBTriangle;
-typedef struct
-{
-   __u8 a;
-   __u8 r;
-   __u8 g;
-   __u8 b;
-} DFBColor;
-DFBResult DirectFBError(
-   const char *msg,
-   DFBResult result
-   );
-DFBResult DirectFBErrorFatal(
-   const char *msg,
-   DFBResult result
-   );
-const char *DirectFBErrorString(
-   DFBResult result
-   );
-const char *DirectFBUsageString(void);
-DFBResult DirectFBInit(
-   int *argc,
-   char **argv[]
-   );
-DFBResult DirectFBSetOption(
-   const char *name,
-   const char *value
-   );
-DFBResult DirectFBCreate(
-   IDirectFB **interface
-   );
-
-typedef unsigned int DFBScreenID;
-typedef unsigned int DFBDisplayLayerID;
-typedef unsigned int DFBDisplayLayerSourceID;
-typedef unsigned int DFBWindowID;
-typedef unsigned int DFBInputDeviceID;
-typedef __u32        DFBDisplayLayerIDs;
-typedef enum
-{
-   DFSCL_NORMAL = 0x00000000,
-   DFSCL_FULLSCREEN,
-   DFSCL_EXCLUSIVE
-} DFBCooperativeLevel;
-typedef enum
-{
-   DLCAPS_NONE              = 0x00000000,
-   DLCAPS_SURFACE           = 0x00000001,
-   DLCAPS_OPACITY           = 0x00000002,
-   DLCAPS_ALPHACHANNEL      = 0x00000004,
-   DLCAPS_SCREEN_LOCATION   = 0x00000008,
-   DLCAPS_FLICKER_FILTERING = 0x00000010,
-   DLCAPS_DEINTERLACING     = 0x00000020,
-   DLCAPS_SRC_COLORKEY      = 0x00000040,
-   DLCAPS_DST_COLORKEY      = 0x00000080,
-   DLCAPS_BRIGHTNESS        = 0x00000100,
-   DLCAPS_CONTRAST          = 0x00000200,
-   DLCAPS_HUE               = 0x00000400,
-   DLCAPS_SATURATION        = 0x00000800,
-   DLCAPS_LEVELS            = 0x00001000,
-   DLCAPS_FIELD_PARITY      = 0x00002000,
-   DLCAPS_WINDOWS           = 0x00004000,
-   DLCAPS_SOURCES           = 0x00008000,
-   DLCAPS_ALPHA_RAMP        = 0x00010000,
-   DLCAPS_PREMULTIPLIED     = 0x00020000,
-   DLCAPS_SCREEN_POSITION   = 0x00100000,
-   DLCAPS_SCREEN_SIZE       = 0x00200000,
-   DLCAPS_ALL               = 0x0033FFFF
-} DFBDisplayLayerCapabilities;
-typedef enum
-{
-   DSCCAPS_NONE             = 0x00000000,
-   DSCCAPS_VSYNC            = 0x00000001,
-   DSCCAPS_POWER_MANAGEMENT = 0x00000002,
-   DSCCAPS_MIXERS           = 0x00000010,
-   DSCCAPS_ENCODERS         = 0x00000020,
-   DSCCAPS_OUTPUTS          = 0x00000040,
-   DSCCAPS_ALL              = 0x00000073
-} DFBScreenCapabilities;
-typedef enum
-{
-   DLOP_NONE              = 0x00000000,
-   DLOP_ALPHACHANNEL      = 0x00000001,
-   DLOP_FLICKER_FILTERING = 0x00000002,
-   DLOP_DEINTERLACING     = 0x00000004,
-   DLOP_SRC_COLORKEY      = 0x00000008,
-   DLOP_DST_COLORKEY      = 0x00000010,
-   DLOP_OPACITY           = 0x00000020,
-   DLOP_FIELD_PARITY      = 0x00000040
-} DFBDisplayLayerOptions;
-typedef enum
-{
-   DLBM_UNKNOWN    = 0x00000000,
-   DLBM_FRONTONLY  = 0x00000001,
-   DLBM_BACKVIDEO  = 0x00000002,
-   DLBM_BACKSYSTEM = 0x00000004,
-   DLBM_TRIPLE     = 0x00000008,
-   DLBM_WINDOWS    = 0x00000010
-} DFBDisplayLayerBufferMode;
-typedef enum
-{
-   DSDESC_CAPS         = 0x00000001,
-   DSDESC_WIDTH        = 0x00000002,
-   DSDESC_HEIGHT       = 0x00000004,
-   DSDESC_PIXELFORMAT  = 0x00000008,
-   DSDESC_PREALLOCATED = 0x00000010,
-   DSDESC_PALETTE      = 0x00000020
-} DFBSurfaceDescriptionFlags;
-typedef enum
-{
-   DPDESC_CAPS    = 0x00000001,
-   DPDESC_SIZE    = 0x00000002,
-   DPDESC_ENTRIES = 0x00000004
-} DFBPaletteDescriptionFlags;
-typedef enum
-{
-   DSCAPS_NONE          = 0x00000000,
-   DSCAPS_PRIMARY       = 0x00000001,
-   DSCAPS_SYSTEMONLY    = 0x00000002,
-   DSCAPS_VIDEOONLY     = 0x00000004,
-   DSCAPS_DOUBLE        = 0x00000010,
-   DSCAPS_SUBSURFACE    = 0x00000020,
-   DSCAPS_INTERLACED    = 0x00000040,
-   DSCAPS_SEPARATED     = 0x00000080,
-   DSCAPS_STATIC_ALLOC  = 0x00000100,
-   DSCAPS_TRIPLE        = 0x00000200,
-   DSCAPS_PREMULTIPLIED = 0x00001000,
-   DSCAPS_DEPTH         = 0x00010000,
-   DSCAPS_ALL           = 0x000113F7,
-   DSCAPS_FLIPPING      = DSCAPS_DOUBLE | DSCAPS_TRIPLE
-} DFBSurfaceCapabilities;
-typedef enum
-{
-   DPCAPS_NONE = 0x00000000
-} DFBPaletteCapabilities;
-typedef enum
-{
-   DSDRAW_NOFX            = 0x00000000,
-   DSDRAW_BLEND           = 0x00000001,
-   DSDRAW_DST_COLORKEY    = 0x00000002,
-   DSDRAW_SRC_PREMULTIPLY = 0x00000004,
-   DSDRAW_DST_PREMULTIPLY = 0x00000008,
-   DSDRAW_DEMULTIPLY      = 0x00000010,
-   DSDRAW_XOR             = 0x00000020
-} DFBSurfaceDrawingFlags;
-typedef enum
-{
-   DSBLIT_NOFX               = 0x00000000,
-   DSBLIT_BLEND_ALPHACHANNEL = 0x00000001,
-   DSBLIT_BLEND_COLORALPHA   = 0x00000002,
-   DSBLIT_COLORIZE           = 0x00000004,
-   DSBLIT_SRC_COLORKEY       = 0x00000008,
-   DSBLIT_DST_COLORKEY       = 0x00000010,
-   DSBLIT_SRC_PREMULTIPLY    = 0x00000020,
-   DSBLIT_DST_PREMULTIPLY    = 0x00000040,
-   DSBLIT_DEMULTIPLY         = 0x00000080,
-   DSBLIT_DEINTERLACE        = 0x00000100
-} DFBSurfaceBlittingFlags;
-typedef enum
-{
-   DFXL_NONE          = 0x00000000,
-   DFXL_FILLRECTANGLE = 0x00000001,
-   DFXL_DRAWRECTANGLE = 0x00000002,
-   DFXL_DRAWLINE      = 0x00000004,
-   DFXL_FILLTRIANGLE  = 0x00000008,
-   DFXL_BLIT          = 0x00010000,
-   DFXL_STRETCHBLIT   = 0x00020000,
-   DFXL_TEXTRIANGLES  = 0x00040000,
-   DFXL_DRAWSTRING    = 0x01000000,
-   DFXL_ALL           = 0x0107000F
-} DFBAccelerationMask;
-typedef struct
-{
-   DFBAccelerationMask     acceleration_mask;
-   DFBSurfaceDrawingFlags  drawing_flags;
-   DFBSurfaceBlittingFlags blitting_flags;
-   unsigned int            video_memory;
-} DFBCardCapabilities;
-typedef enum
-{
-   DLTF_NONE          = 0x00000000,
-   DLTF_GRAPHICS      = 0x00000001,
-   DLTF_VIDEO         = 0x00000002,
-   DLTF_STILL_PICTURE = 0x00000004,
-   DLTF_BACKGROUND    = 0x00000008,
-   DLTF_ALL           = 0x0000000F
-} DFBDisplayLayerTypeFlags;
-typedef enum
-{
-   DIDTF_NONE     = 0x00000000,
-   DIDTF_KEYBOARD = 0x00000001,
-   DIDTF_MOUSE    = 0x00000002,
-   DIDTF_JOYSTICK = 0x00000004,
-   DIDTF_REMOTE   = 0x00000008,
-   DIDTF_VIRTUAL  = 0x00000010,
-   DIDTF_ALL      = 0x0000001F
-} DFBInputDeviceTypeFlags;
-typedef enum
-{
-   DICAPS_KEYS    = 0x00000001,
-   DICAPS_AXES    = 0x00000002,
-   DICAPS_BUTTONS = 0x00000004,
-   DICAPS_ALL     = 0x00000007
-} DFBInputDeviceCapabilities;
-typedef enum
-{
-   DIBI_LEFT   = 0x00000000,
-   DIBI_RIGHT  = 0x00000001,
-   DIBI_MIDDLE = 0x00000002,
-   DIBI_FIRST  = DIBI_LEFT,
-   DIBI_LAST   = 0x0000001F
-} DFBInputDeviceButtonIdentifier;
-typedef enum
-{
-   DIAI_X     = 0x00000000,
-   DIAI_Y     = 0x00000001,
-   DIAI_Z     = 0x00000002,
-   DIAI_FIRST = DIAI_X,
-   DIAI_LAST  = 0x0000001F
-} DFBInputDeviceAxisIdentifier;
-typedef enum
-{
-   DWDESC_CAPS         = 0x00000001,
-   DWDESC_WIDTH        = 0x00000002,
-   DWDESC_HEIGHT       = 0x00000004,
-   DWDESC_PIXELFORMAT  = 0x00000008,
-   DWDESC_POSX         = 0x00000010,
-   DWDESC_POSY         = 0x00000020,
-   DWDESC_SURFACE_CAPS = 0x00000040
-} DFBWindowDescriptionFlags;
-typedef enum
-{
-   DBDESC_FILE   = 0x00000001,
-   DBDESC_MEMORY = 0x00000002
-} DFBDataBufferDescriptionFlags;
-typedef enum
-{
-   DWCAPS_NONE         = 0x00000000,
-   DWCAPS_ALPHACHANNEL = 0x00000001,
-   DWCAPS_DOUBLEBUFFER = 0x00000002,
-   DWCAPS_INPUTONLY    = 0x00000004,
-   DWCAPS_NODECORATION = 0x00000008,
-   DWCAPS_ALL          = 0x0000000F
-} DFBWindowCapabilities;
-typedef enum
-{
-   DFFA_NONE       = 0x00000000,
-   DFFA_NOKERNING  = 0x00000001,
-   DFFA_NOHINTING  = 0x00000002,
-   DFFA_MONOCHROME = 0x00000004,
-   DFFA_NOCHARMAP  = 0x00000008
-} DFBFontAttributes;
-typedef enum
-{
-   DFDESC_ATTRIBUTES   = 0x00000001,
-   DFDESC_HEIGHT       = 0x00000002,
-   DFDESC_WIDTH        = 0x00000004,
-   DFDESC_INDEX        = 0x00000008,
-   DFDESC_FIXEDADVANCE = 0x00000010
-} DFBFontDescriptionFlags;
-typedef struct
-{
-   DFBFontDescriptionFlags flags;
-   DFBFontAttributes       attributes;
-   int                     height;
-   int                     width;
-   unsigned int            index;
-   int                     fixed_advance;
-} DFBFontDescription;
-typedef enum
-{
-   DSPF_UNKNOWN  = 0x00000000,
-   DSPF_ARGB1555 = ((((0) & 0x7F)) | (((15) & 0x1F) << 7) | (((1) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((2) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_RGB16    = ((((1) & 0x7F)) | (((16) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((2) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_RGB24    = ((((2) & 0x7F)) | (((24) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((3) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_RGB32    = ((((3) & 0x7F)) | (((24) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((4) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_ARGB     = ((((4) & 0x7F)) | (((24) & 0x1F) << 7) | (((8) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((4) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_A8       = ((((5) & 0x7F)) | (((0) & 0x1F) << 7) | (((8) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_YUY2     = ((((6) & 0x7F)) | (((16) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((2) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_RGB332   = ((((7) & 0x7F)) | (((8) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_UYVY     = ((((8) & 0x7F)) | (((16) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((2) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_I420     = ((((9) & 0x7F)) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((2) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_YV12     = ((((10) & 0x7F)) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((2) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_LUT8     = ((((11) & 0x7F)) | (((8) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((1) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_ALUT44   = ((((12) & 0x7F)) | (((4) & 0x1F) << 7) | (((4) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((1) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_AiRGB    = ((((13) & 0x7F)) | (((24) & 0x1F) << 7) | (((8) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((4) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((1) ? 1 : 0) << 31)),
-   DSPF_A1       = ((((14) & 0x7F)) | (((0) & 0x1F) << 7) | (((1) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((1) & 0x07) << 17) | (((0) & 0x07) << 20) | (((7) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_NV12     = ((((15) & 0x7F)) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((2) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_NV16     = ((((16) & 0x7F)) | (((24) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((2) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_ARGB2554 = ((((17) & 0x7F)) | (((14) & 0x1F) << 7) | (((2) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((2) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_ARGB4444 = ((((18) & 0x7F)) | (((12) & 0x1F) << 7) | (((4) & 0x0F) << 12) | (((1) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((2) & 0x07) << 20) | (((0) & 0x07) << 23) | (((0) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31)),
-   DSPF_NV21     = ((((19) & 0x7F)) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0) ? 1 : 0) << 16) | (((0) & 0x07) << 17) | (((1) & 0x07) << 20) | (((0) & 0x07) << 23) | (((2) & 0x03) << 26) | (((0) & 0x03) << 28) | (((0) ? 1 : 0) << 30) | (((0) ? 1 : 0) << 31))
-} DFBSurfacePixelFormat;
-typedef struct
-{
-   DFBSurfaceDescriptionFlags flags;
-   DFBSurfaceCapabilities     caps;
-   int                        width;
-   int                        height;
-   DFBSurfacePixelFormat      pixelformat;
-   struct
-   {
-      void *data;
-      int  pitch;
-   }                          preallocated[2];
-   struct
-   {
-      DFBColor     *entries;
-      unsigned int size;
-   }                          palette;
-} DFBSurfaceDescription;
-typedef struct
-{
-   DFBPaletteDescriptionFlags flags;
-   DFBPaletteCapabilities     caps;
-   unsigned int               size;
-   DFBColor                   *entries;
-} DFBPaletteDescription;
-typedef struct
-{
-   DFBDisplayLayerTypeFlags    type;
-   DFBDisplayLayerCapabilities caps;
-   char                        name[32];
-   int                         level;
-   int                         regions;
-   int                         sources;
-} DFBDisplayLayerDescription;
-typedef struct
-{
-   DFBDisplayLayerSourceID source_id;
-   char                    name[24];
-} DFBDisplayLayerSourceDescription;
-typedef struct
-{
-   DFBScreenCapabilities caps;
-   char                  name[32];
-   int                   mixers;
-   int                   encoders;
-   int                   outputs;
-} DFBScreenDescription;
-typedef struct
-{
-   DFBInputDeviceTypeFlags        type;
-   DFBInputDeviceCapabilities     caps;
-   int                            min_keycode;
-   int                            max_keycode;
-   DFBInputDeviceAxisIdentifier   max_axis;
-   DFBInputDeviceButtonIdentifier max_button;
-   char                           name[32];
-   char                           vendor[40];
-} DFBInputDeviceDescription;
-typedef struct
-{
-   DFBWindowDescriptionFlags flags;
-   DFBWindowCapabilities     caps;
-   int                       width;
-   int                       height;
-   DFBSurfacePixelFormat     pixelformat;
-   int                       posx;
-   int                       posy;
-   DFBSurfaceCapabilities    surface_caps;
-} DFBWindowDescription;
-typedef struct
-{
-   DFBDataBufferDescriptionFlags flags;
-   const char                    *file;
-   struct
-   {
-      const void   *data;
-      unsigned int length;
-   }                             memory;
-} DFBDataBufferDescription;
-typedef enum
-{
-   DFENUM_OK     = 0x00000000,
-   DFENUM_CANCEL = 0x00000001
-} DFBEnumerationResult;
-typedef DFBEnumerationResult (*DFBVideoModeCallback)(
-   int width,
-   int height,
-   int bpp,
-   void *callbackdata
-   );
-typedef DFBEnumerationResult (*DFBScreenCallback)(
-   DFBScreenID screen_id,
-   DFBScreenDescription desc,
-   void *callbackdata
-   );
-typedef DFBEnumerationResult (*DFBDisplayLayerCallback)(
-   DFBDisplayLayerID layer_id,
-   DFBDisplayLayerDescription desc,
-   void *callbackdata
-   );
-typedef DFBEnumerationResult (*DFBInputDeviceCallback)(
-   DFBInputDeviceID device_id,
-   DFBInputDeviceDescription desc,
-   void *callbackdata
-   );
-typedef int (*DFBGetDataCallback)(
-   void *buffer,
-   unsigned int length,
-   void *callbackdata
-   );
-typedef enum
-{
-   DVCAPS_BASIC      = 0x00000000,
-   DVCAPS_SEEK       = 0x00000001,
-   DVCAPS_SCALE      = 0x00000002,
-   DVCAPS_INTERLACED = 0x00000004,
-   DVCAPS_BRIGHTNESS = 0x00000010,
-   DVCAPS_CONTRAST   = 0x00000020,
-   DVCAPS_HUE        = 0x00000040,
-   DVCAPS_SATURATION = 0x00000080
-} DFBVideoProviderCapabilities;
-typedef enum
-{
-   DCAF_NONE       = 0x00000000,
-   DCAF_BRIGHTNESS = 0x00000001,
-   DCAF_CONTRAST   = 0x00000002,
-   DCAF_HUE        = 0x00000004,
-   DCAF_SATURATION = 0x00000008
-} DFBColorAdjustmentFlags;
-typedef struct
-{
-   DFBColorAdjustmentFlags flags;
-   __u16                   brightness;
-   __u16                   contrast;
-   __u16                   hue;
-   __u16                   saturation;
-} DFBColorAdjustment;
-struct _IDirectFB
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFB *thiz);
-   DFBResult (*Release)(IDirectFB *thiz);
-   DFBResult (*SetCooperativeLevel)(IDirectFB *thiz, DFBCooperativeLevel level);
-   DFBResult (*SetVideoMode)(IDirectFB *thiz, int width, int height, int bpp);
-   DFBResult (*GetCardCapabilities)(IDirectFB *thiz, DFBCardCapabilities *ret_caps);
-   DFBResult (*EnumVideoModes)(IDirectFB *thiz, DFBVideoModeCallback callback, void *callbackdata);
-   DFBResult (*CreateSurface)(IDirectFB *thiz, const DFBSurfaceDescription *desc, IDirectFBSurface **ret_interface);
-   DFBResult (*CreatePalette)(IDirectFB *thiz, const DFBPaletteDescription *desc, IDirectFBPalette **ret_interface);
-   DFBResult (*EnumScreens)(IDirectFB *thiz, DFBScreenCallback callback, void *callbackdata);
-   DFBResult (*GetScreen)(IDirectFB *thiz, DFBScreenID screen_id, IDirectFBScreen **ret_interface);
-   DFBResult (*EnumDisplayLayers)(IDirectFB *thiz, DFBDisplayLayerCallback callback, void *callbackdata);
-   DFBResult (*GetDisplayLayer)(IDirectFB *thiz, DFBDisplayLayerID layer_id, IDirectFBDisplayLayer **ret_interface);
-   DFBResult (*EnumInputDevices)(IDirectFB *thiz, DFBInputDeviceCallback callback, void *callbackdata);
-   DFBResult (*GetInputDevice)(IDirectFB *thiz, DFBInputDeviceID device_id, IDirectFBInputDevice **ret_interface);
-   DFBResult (*CreateEventBuffer)(IDirectFB *thiz, IDirectFBEventBuffer **ret_buffer);
-   DFBResult (*CreateInputEventBuffer)(IDirectFB *thiz, DFBInputDeviceCapabilities caps, DFBBoolean global, IDirectFBEventBuffer **ret_buffer);
-   DFBResult (*CreateImageProvider)(IDirectFB *thiz, const char *filename, IDirectFBImageProvider **ret_interface);
-   DFBResult (*CreateVideoProvider)(IDirectFB *thiz, const char *filename, IDirectFBVideoProvider **ret_interface);
-   DFBResult (*CreateFont)(IDirectFB *thiz, const char *filename, const DFBFontDescription *desc, IDirectFBFont **ret_interface);
-   DFBResult (*CreateDataBuffer)(IDirectFB *thiz, const DFBDataBufferDescription *desc, IDirectFBDataBuffer **ret_interface);
-   DFBResult (*SetClipboardData)(IDirectFB *thiz, const char *mime_type, const void *data, unsigned int size, struct timeval *ret_timestamp);
-   DFBResult (*GetClipboardData)(IDirectFB *thiz, char **ret_mimetype, void **ret_data, unsigned int *ret_size);
-   DFBResult (*GetClipboardTimeStamp)(IDirectFB *thiz, struct timeval *ret_timestamp);
-   DFBResult (*Suspend)(IDirectFB *thiz);
-   DFBResult (*Resume)(IDirectFB *thiz);
-   DFBResult (*WaitIdle)(IDirectFB *thiz);
-   DFBResult (*WaitForSync)(IDirectFB *thiz);
-   DFBResult (*GetInterface)(IDirectFB *thiz, const char *type, const char *implementation, void *arg, void **ret_interface);
-};
-typedef enum
-{
-   DLSCL_SHARED = 0,
-   DLSCL_EXCLUSIVE,
-   DLSCL_ADMINISTRATIVE
-} DFBDisplayLayerCooperativeLevel;
-typedef enum
-{
-   DLBM_DONTCARE = 0,
-   DLBM_COLOR,
-   DLBM_IMAGE,
-   DLBM_TILE
-} DFBDisplayLayerBackgroundMode;
-typedef enum
-{
-   DLCONF_NONE         = 0x00000000,
-   DLCONF_WIDTH        = 0x00000001,
-   DLCONF_HEIGHT       = 0x00000002,
-   DLCONF_PIXELFORMAT  = 0x00000004,
-   DLCONF_BUFFERMODE   = 0x00000008,
-   DLCONF_OPTIONS      = 0x00000010,
-   DLCONF_SOURCE       = 0x00000020,
-   DLCONF_SURFACE_CAPS = 0x00000040,
-   DLCONF_ALL          = 0x0000007F
-} DFBDisplayLayerConfigFlags;
-typedef struct
-{
-   DFBDisplayLayerConfigFlags flags;
-   int                        width;
-   int                        height;
-   DFBSurfacePixelFormat      pixelformat;
-   DFBDisplayLayerBufferMode  buffermode;
-   DFBDisplayLayerOptions     options;
-   DFBDisplayLayerSourceID    source;
-   DFBSurfaceCapabilities     surface_caps;
-} DFBDisplayLayerConfig;
-typedef enum
-{
-   DSPM_ON = 0,
-   DSPM_STANDBY,
-   DSPM_SUSPEND,
-   DSPM_OFF
-} DFBScreenPowerMode;
-typedef enum
-{
-   DSMCAPS_NONE       = 0x00000000,
-   DSMCAPS_FULL       = 0x00000001,
-   DSMCAPS_SUB_LEVEL  = 0x00000002,
-   DSMCAPS_SUB_LAYERS = 0x00000004,
-   DSMCAPS_BACKGROUND = 0x00000008
-} DFBScreenMixerCapabilities;
-typedef struct
-{
-   DFBScreenMixerCapabilities caps;
-   DFBDisplayLayerIDs         layers;
-   int                        sub_num;
-   DFBDisplayLayerIDs         sub_layers;
-   char                       name[24];
-} DFBScreenMixerDescription;
-typedef enum
-{
-   DSMCONF_NONE       = 0x00000000,
-   DSMCONF_TREE       = 0x00000001,
-   DSMCONF_LEVEL      = 0x00000002,
-   DSMCONF_LAYERS     = 0x00000004,
-   DSMCONF_BACKGROUND = 0x00000010,
-   DSMCONF_ALL        = 0x00000017
-} DFBScreenMixerConfigFlags;
-typedef enum
-{
-   DSMT_UNKNOWN    = 0x00000000,
-   DSMT_FULL       = 0x00000001,
-   DSMT_SUB_LEVEL  = 0x00000002,
-   DSMT_SUB_LAYERS = 0x00000003
-} DFBScreenMixerTree;
-typedef struct
-{
-   DFBScreenMixerConfigFlags flags;
-   DFBScreenMixerTree        tree;
-   int                       level;
-   DFBDisplayLayerIDs        layers;
-   DFBColor                  background;
-} DFBScreenMixerConfig;
-typedef enum
-{
-   DSOCAPS_NONE          = 0x00000000,
-   DSOCAPS_CONNECTORS    = 0x00000001,
-   DSOCAPS_ENCODER_SEL   = 0x00000010,
-   DSOCAPS_SIGNAL_SEL    = 0x00000020,
-   DSOCAPS_CONNECTOR_SEL = 0x00000040,
-   DSOCAPS_ALL           = 0x00000071
-} DFBScreenOutputCapabilities;
-typedef enum
-{
-   DSOC_UNKNOWN = 0x00000000,
-   DSOC_VGA     = 0x00000001,
-   DSOC_SCART   = 0x00000002,
-   DSOC_YC      = 0x00000004,
-   DSOC_CVBS    = 0x00000008
-} DFBScreenOutputConnectors;
-typedef enum
-{
-   DSOS_NONE  = 0x00000000,
-   DSOS_VGA   = 0x00000001,
-   DSOS_YC    = 0x00000002,
-   DSOS_CVBS  = 0x00000004,
-   DSOS_RGB   = 0x00000008,
-   DSOS_YCBCR = 0x00000010
-} DFBScreenOutputSignals;
-typedef struct
-{
-   DFBScreenOutputCapabilities caps;
-   DFBScreenOutputConnectors   all_connectors;
-   DFBScreenOutputSignals      all_signals;
-   char                        name[24];
-} DFBScreenOutputDescription;
-typedef enum
-{
-   DSOCONF_NONE       = 0x00000000,
-   DSOCONF_ENCODER    = 0x00000001,
-   DSOCONF_SIGNALS    = 0x00000002,
-   DSOCONF_CONNECTORS = 0x00000004,
-   DSOCONF_ALL        = 0x00000007
-} DFBScreenOutputConfigFlags;
-typedef struct
-{
-   DFBScreenOutputConfigFlags flags;
-   int                        encoder;
-   DFBScreenOutputSignals     out_signals;
-   DFBScreenOutputConnectors  out_connectors;
-} DFBScreenOutputConfig;
-typedef enum
-{
-   DSECAPS_NONE         = 0x00000000,
-   DSECAPS_TV_STANDARDS = 0x00000001,
-   DSECAPS_TEST_PICTURE = 0x00000002,
-   DSECAPS_MIXER_SEL    = 0x00000004,
-   DSECAPS_OUT_SIGNALS  = 0x00000008,
-   DSECAPS_SCANMODE     = 0x00000010,
-   DSECAPS_BRIGHTNESS   = 0x00000100,
-   DSECAPS_CONTRAST     = 0x00000200,
-   DSECAPS_HUE          = 0x00000400,
-   DSECAPS_SATURATION   = 0x00000800,
-   DSECAPS_ALL          = 0x00000f1f
-} DFBScreenEncoderCapabilities;
-typedef enum
-{
-   DSET_UNKNOWN = 0x00000000,
-   DSET_CRTC    = 0x00000001,
-   DSET_TV      = 0x00000002
-} DFBScreenEncoderType;
-typedef enum
-{
-   DSETV_UNKNOWN = 0x00000000,
-   DSETV_PAL     = 0x00000001,
-   DSETV_NTSC    = 0x00000002,
-   DSETV_SECAM   = 0x00000004
-} DFBScreenEncoderTVStandards;
-typedef enum
-{
-   DSESM_UNKNOWN     = 0x00000000,
-   DSESM_INTERLACED  = 0x00000001,
-   DSESM_PROGRESSIVE = 0x00000002
-} DFBScreenEncoderScanMode;
-typedef struct
-{
-   DFBScreenEncoderCapabilities caps;
-   DFBScreenEncoderType         type;
-   DFBScreenEncoderTVStandards  tv_standards;
-   DFBScreenOutputSignals       out_signals;
-   char                         name[24];
-} DFBScreenEncoderDescription;
-typedef enum
-{
-   DSECONF_NONE         = 0x00000000,
-   DSECONF_TV_STANDARD  = 0x00000001,
-   DSECONF_TEST_PICTURE = 0x00000002,
-   DSECONF_MIXER        = 0x00000004,
-   DSECONF_OUT_SIGNALS  = 0x00000008,
-   DSECONF_SCANMODE     = 0x00000010,
-   DSECONF_TEST_COLOR   = 0x00000020,
-   DSECONF_ADJUSTMENT   = 0x00000040,
-   DSECONF_ALL          = 0x0000007F
-} DFBScreenEncoderConfigFlags;
-typedef enum
-{
-   DSETP_OFF     = 0x00000000,
-   DSETP_MULTI   = 0x00000001,
-   DSETP_SINGLE  = 0x00000002,
-   DSETP_WHITE   = 0x00000010,
-   DSETP_YELLOW  = 0x00000020,
-   DSETP_CYAN    = 0x00000030,
-   DSETP_GREEN   = 0x00000040,
-   DSETP_MAGENTA = 0x00000050,
-   DSETP_RED     = 0x00000060,
-   DSETP_BLUE    = 0x00000070,
-   DSETP_BLACK   = 0x00000080
-} DFBScreenEncoderTestPicture;
-typedef struct
-{
-   DFBScreenEncoderConfigFlags flags;
-   DFBScreenEncoderTVStandards tv_standard;
-   DFBScreenEncoderTestPicture test_picture;
-   int                         mixer;
-   DFBScreenOutputSignals      out_signals;
-   DFBScreenEncoderScanMode    scanmode;
-   DFBColor                    test_color;
-   DFBColorAdjustment          adjustment;
-} DFBScreenEncoderConfig;
-struct _IDirectFBScreen
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBScreen *thiz);
-   DFBResult (*Release)(IDirectFBScreen *thiz);
-   DFBResult (*GetID)(IDirectFBScreen *thiz, DFBScreenID *ret_screen_id);
-   DFBResult (*GetDescription)(IDirectFBScreen *thiz, DFBScreenDescription *ret_desc);
-   DFBResult (*EnumDisplayLayers)(IDirectFBScreen *thiz, DFBDisplayLayerCallback callback, void *callbackdata);
-   DFBResult (*SetPowerMode)(IDirectFBScreen *thiz, DFBScreenPowerMode mode);
-   DFBResult (*WaitForSync)(IDirectFBScreen *thiz);
-   DFBResult (*GetMixerDescriptions)(IDirectFBScreen *thiz, DFBScreenMixerDescription *ret_descriptions);
-   DFBResult (*GetMixerConfiguration)(IDirectFBScreen *thiz, int mixer, DFBScreenMixerConfig *ret_config);
-   DFBResult (*TestMixerConfiguration)(IDirectFBScreen *thiz, int mixer, const DFBScreenMixerConfig *config, DFBScreenMixerConfigFlags *ret_failed);
-   DFBResult (*SetMixerConfiguration)(IDirectFBScreen *thiz, int mixer, const DFBScreenMixerConfig *config);
-   DFBResult (*GetEncoderDescriptions)(IDirectFBScreen *thiz, DFBScreenEncoderDescription *ret_descriptions);
-   DFBResult (*GetEncoderConfiguration)(IDirectFBScreen *thiz, int encoder, DFBScreenEncoderConfig *ret_config);
-   DFBResult (*TestEncoderConfiguration)(IDirectFBScreen *thiz, int encoder, const DFBScreenEncoderConfig *config, DFBScreenEncoderConfigFlags *ret_failed);
-   DFBResult (*SetEncoderConfiguration)(IDirectFBScreen *thiz, int encoder, const DFBScreenEncoderConfig *config);
-   DFBResult (*GetOutputDescriptions)(IDirectFBScreen *thiz, DFBScreenOutputDescription *ret_descriptions);
-   DFBResult (*GetOutputConfiguration)(IDirectFBScreen *thiz, int output, DFBScreenOutputConfig *ret_config);
-   DFBResult (*TestOutputConfiguration)(IDirectFBScreen *thiz, int output, const DFBScreenOutputConfig *config, DFBScreenOutputConfigFlags *ret_failed);
-   DFBResult (*SetOutputConfiguration)(IDirectFBScreen *thiz, int output, const DFBScreenOutputConfig *config);
-};
-struct _IDirectFBDisplayLayer
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBDisplayLayer *thiz);
-   DFBResult (*Release)(IDirectFBDisplayLayer *thiz);
-   DFBResult (*GetID)(IDirectFBDisplayLayer *thiz, DFBDisplayLayerID *ret_layer_id);
-   DFBResult (*GetDescription)(IDirectFBDisplayLayer *thiz, DFBDisplayLayerDescription *ret_desc);
-   DFBResult (*GetSourceDescriptions)(IDirectFBDisplayLayer *thiz, DFBDisplayLayerSourceDescription *ret_descriptions);
-   DFBResult (*GetCurrentOutputField)(IDirectFBDisplayLayer *thiz, int *ret_field);
-   DFBResult (*GetSurface)(IDirectFBDisplayLayer *thiz, IDirectFBSurface **ret_interface);
-   DFBResult (*GetScreen)(IDirectFBDisplayLayer *thiz, IDirectFBScreen **ret_interface);
-   DFBResult (*SetCooperativeLevel)(IDirectFBDisplayLayer *thiz, DFBDisplayLayerCooperativeLevel level);
-   DFBResult (*GetConfiguration)(IDirectFBDisplayLayer *thiz, DFBDisplayLayerConfig *ret_config);
-   DFBResult (*TestConfiguration)(IDirectFBDisplayLayer *thiz, const DFBDisplayLayerConfig *config, DFBDisplayLayerConfigFlags *ret_failed);
-   DFBResult (*SetConfiguration)(IDirectFBDisplayLayer *thiz, const DFBDisplayLayerConfig *config);
-   DFBResult (*SetScreenLocation)(IDirectFBDisplayLayer *thiz, float x, float y, float width, float height);
-   DFBResult (*SetScreenPosition)(IDirectFBDisplayLayer *thiz, int x, int y);
-   DFBResult (*SetScreenRectangle)(IDirectFBDisplayLayer *thiz, int x, int y, int width, int height);
-   DFBResult (*SetOpacity)(IDirectFBDisplayLayer *thiz, __u8 opacity);
-   DFBResult (*SetSourceRectangle)(IDirectFBDisplayLayer *thiz, int x, int y, int width, int height);
-   DFBResult (*SetFieldParity)(IDirectFBDisplayLayer *thiz, int field);
-   DFBResult (*SetSrcColorKey)(IDirectFBDisplayLayer *thiz, __u8 r, __u8 g, __u8 b);
-   DFBResult (*SetDstColorKey)(IDirectFBDisplayLayer *thiz, __u8 r, __u8 g, __u8 b);
-   DFBResult (*GetLevel)(IDirectFBDisplayLayer *thiz, int *ret_level);
-   DFBResult (*SetLevel)(IDirectFBDisplayLayer *thiz, int level);
-   DFBResult (*SetBackgroundMode)(IDirectFBDisplayLayer *thiz, DFBDisplayLayerBackgroundMode mode);
-   DFBResult (*SetBackgroundImage)(IDirectFBDisplayLayer *thiz, IDirectFBSurface *surface);
-   DFBResult (*SetBackgroundColor)(IDirectFBDisplayLayer *thiz, __u8 r, __u8 g, __u8 b, __u8 a);
-   DFBResult (*GetColorAdjustment)(IDirectFBDisplayLayer *thiz, DFBColorAdjustment *ret_adj);
-   DFBResult (*SetColorAdjustment)(IDirectFBDisplayLayer *thiz, const DFBColorAdjustment *adj);
-   DFBResult (*CreateWindow)(IDirectFBDisplayLayer *thiz, const DFBWindowDescription *desc, IDirectFBWindow **ret_interface);
-   DFBResult (*GetWindow)(IDirectFBDisplayLayer *thiz, DFBWindowID window_id, IDirectFBWindow **ret_interface);
-   DFBResult (*EnableCursor)(IDirectFBDisplayLayer *thiz, int enable);
-   DFBResult (*GetCursorPosition)(IDirectFBDisplayLayer *thiz, int *ret_x, int *ret_y);
-   DFBResult (*WarpCursor)(IDirectFBDisplayLayer *thiz, int x, int y);
-   DFBResult (*SetCursorAcceleration)(IDirectFBDisplayLayer *thiz, int numerator, int denominator, int threshold);
-   DFBResult (*SetCursorShape)(IDirectFBDisplayLayer *thiz, IDirectFBSurface *shape, int hot_x, int hot_y);
-   DFBResult (*SetCursorOpacity)(IDirectFBDisplayLayer *thiz, __u8 opacity);
-   DFBResult (*WaitForSync)(IDirectFBDisplayLayer *thiz);
-};
-typedef enum
-{
-   DSFLIP_NONE        = 0x00000000,
-   DSFLIP_WAIT        = 0x00000001,
-   DSFLIP_BLIT        = 0x00000002,
-   DSFLIP_ONSYNC      = 0x00000004,
-   DSFLIP_PIPELINE    = 0x00000008,
-   DSFLIP_WAITFORSYNC = DSFLIP_WAIT | DSFLIP_ONSYNC
-} DFBSurfaceFlipFlags;
-typedef enum
-{
-   DSTF_LEFT         = 0x00000000,
-   DSTF_CENTER       = 0x00000001,
-   DSTF_RIGHT        = 0x00000002,
-   DSTF_TOP          = 0x00000004,
-   DSTF_BOTTOM       = 0x00000008,
-   DSTF_TOPLEFT      = DSTF_TOP | DSTF_LEFT,
-   DSTF_TOPCENTER    = DSTF_TOP | DSTF_CENTER,
-   DSTF_TOPRIGHT     = DSTF_TOP | DSTF_RIGHT,
-   DSTF_BOTTOMLEFT   = DSTF_BOTTOM | DSTF_LEFT,
-   DSTF_BOTTOMCENTER = DSTF_BOTTOM | DSTF_CENTER,
-   DSTF_BOTTOMRIGHT  = DSTF_BOTTOM | DSTF_RIGHT
-} DFBSurfaceTextFlags;
-typedef enum
-{
-   DSLF_READ  = 0x00000001,
-   DSLF_WRITE = 0x00000002
-} DFBSurfaceLockFlags;
-typedef enum
-{
-   DSPD_NONE     = 0,
-   DSPD_CLEAR    = 1,
-   DSPD_SRC      = 2,
-   DSPD_SRC_OVER = 3,
-   DSPD_DST_OVER = 4,
-   DSPD_SRC_IN   = 5,
-   DSPD_DST_IN   = 6,
-   DSPD_SRC_OUT  = 7,
-   DSPD_DST_OUT  = 8
-} DFBSurfacePorterDuffRule;
-typedef enum
-{
-   DSBF_ZERO         = 1,
-   DSBF_ONE          = 2,
-   DSBF_SRCCOLOR     = 3,
-   DSBF_INVSRCCOLOR  = 4,
-   DSBF_SRCALPHA     = 5,
-   DSBF_INVSRCALPHA  = 6,
-   DSBF_DESTALPHA    = 7,
-   DSBF_INVDESTALPHA = 8,
-   DSBF_DESTCOLOR    = 9,
-   DSBF_INVDESTCOLOR = 10,
-   DSBF_SRCALPHASAT  = 11
-} DFBSurfaceBlendFunction;
-typedef struct
-{
-   float x;
-   float y;
-   float z;
-   float w;
-   float s;
-   float t;
-} DFBVertex;
-typedef enum
-{
-   DTTF_LIST,
-   DTTF_STRIP,
-   DTTF_FAN
-} DFBTriangleFormation;
-struct _IDirectFBSurface
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBSurface *thiz);
-   DFBResult (*Release)(IDirectFBSurface *thiz);
-   DFBResult (*GetCapabilities)(IDirectFBSurface *thiz, DFBSurfaceCapabilities *ret_caps);
-   DFBResult (*GetSize)(IDirectFBSurface *thiz, int *ret_width, int *ret_height);
-   DFBResult (*GetVisibleRectangle)(IDirectFBSurface *thiz, DFBRectangle *ret_rect);
-   DFBResult (*GetPixelFormat)(IDirectFBSurface *thiz, DFBSurfacePixelFormat *ret_format);
-   DFBResult (*GetAccelerationMask)(IDirectFBSurface *thiz, IDirectFBSurface *source, DFBAccelerationMask *ret_mask);
-   DFBResult (*GetPalette)(IDirectFBSurface *thiz, IDirectFBPalette **ret_interface);
-   DFBResult (*SetPalette)(IDirectFBSurface *thiz, IDirectFBPalette *palette);
-   DFBResult (*SetAlphaRamp)(IDirectFBSurface *thiz, __u8 a0, __u8 a1, __u8 a2, __u8 a3);
-   DFBResult (*Lock)(IDirectFBSurface *thiz, DFBSurfaceLockFlags flags, void **ret_ptr, int *ret_pitch);
-   DFBResult (*Unlock)(IDirectFBSurface *thiz);
-   DFBResult (*Flip)(IDirectFBSurface *thiz, const DFBRegion *region, DFBSurfaceFlipFlags flags);
-   DFBResult (*SetField)(IDirectFBSurface *thiz, int field);
-   DFBResult (*Clear)(IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b, __u8 a);
-   DFBResult (*SetClip)(IDirectFBSurface *thiz, const DFBRegion *clip);
-   DFBResult (*SetColor)(IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b, __u8 a);
-   DFBResult (*SetColorIndex)(IDirectFBSurface *thiz, unsigned int index);
-   DFBResult (*SetSrcBlendFunction)(IDirectFBSurface *thiz, DFBSurfaceBlendFunction function);
-   DFBResult (*SetDstBlendFunction)(IDirectFBSurface *thiz, DFBSurfaceBlendFunction function);
-   DFBResult (*SetPorterDuff)(IDirectFBSurface *thiz, DFBSurfacePorterDuffRule rule);
-   DFBResult (*SetSrcColorKey)(IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b);
-   DFBResult (*SetSrcColorKeyIndex)(IDirectFBSurface *thiz, unsigned int index);
-   DFBResult (*SetDstColorKey)(IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b);
-   DFBResult (*SetDstColorKeyIndex)(IDirectFBSurface *thiz, unsigned int index);
-   DFBResult (*SetBlittingFlags)(IDirectFBSurface *thiz, DFBSurfaceBlittingFlags flags);
-   DFBResult (*Blit)(IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rect, int x, int y);
-   DFBResult (*TileBlit)(IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rect, int x, int y);
-   DFBResult (*BatchBlit)(IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rects, const DFBPoint *dest_points, int num);
-   DFBResult (*StretchBlit)(IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rect, const DFBRectangle *destination_rect);
-   DFBResult (*TextureTriangles)(IDirectFBSurface *thiz, IDirectFBSurface *texture, const DFBVertex *vertices, const int *indices, int num, DFBTriangleFormation formation);
-   DFBResult (*SetDrawingFlags)(IDirectFBSurface *thiz, DFBSurfaceDrawingFlags flags);
-   DFBResult (*FillRectangle)(IDirectFBSurface *thiz, int x, int y, int w, int h);
-   DFBResult (*DrawRectangle)(IDirectFBSurface *thiz, int x, int y, int w, int h);
-   DFBResult (*DrawLine)(IDirectFBSurface *thiz, int x1, int y1, int x2, int y2);
-   DFBResult (*DrawLines)(IDirectFBSurface *thiz, const DFBRegion *lines, unsigned int num_lines);
-   DFBResult (*FillTriangle)(IDirectFBSurface *thiz, int x1, int y1, int x2, int y2, int x3, int y3);
-   DFBResult (*FillRectangles)(IDirectFBSurface *thiz, const DFBRectangle *rects, unsigned int num);
-   DFBResult (*FillSpans)(IDirectFBSurface *thiz, int y, const DFBSpan *spans, unsigned int num);
-   DFBResult (*SetFont)(IDirectFBSurface *thiz, IDirectFBFont *font);
-   DFBResult (*GetFont)(IDirectFBSurface *thiz, IDirectFBFont **ret_font);
-   DFBResult (*DrawString)(IDirectFBSurface *thiz, const char *text, int bytes, int x, int y, DFBSurfaceTextFlags flags);
-   DFBResult (*DrawGlyph)(IDirectFBSurface *thiz, unsigned int index, int x, int y, DFBSurfaceTextFlags flags);
-   DFBResult (*GetSubSurface)(IDirectFBSurface *thiz, const DFBRectangle *rect, IDirectFBSurface **ret_interface);
-   DFBResult (*GetGL)(IDirectFBSurface *thiz, IDirectFBGL **ret_interface);
-   DFBResult (*Dump)(IDirectFBSurface *thiz, const char *directory, const char *prefix);
-};
-struct _IDirectFBPalette
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBPalette *thiz);
-   DFBResult (*Release)(IDirectFBPalette *thiz);
-   DFBResult (*GetCapabilities)(IDirectFBPalette *thiz, DFBPaletteCapabilities *ret_caps);
-   DFBResult (*GetSize)(IDirectFBPalette *thiz, unsigned int *ret_size);
-   DFBResult (*SetEntries)(IDirectFBPalette *thiz, const DFBColor *entries, unsigned int num_entries, unsigned int offset);
-   DFBResult (*GetEntries)(IDirectFBPalette *thiz, DFBColor *ret_entries, unsigned int num_entries, unsigned int offset);
-   DFBResult (*FindBestMatch)(IDirectFBPalette *thiz, __u8 r, __u8 g, __u8 b, __u8 a, unsigned int *ret_index);
-   DFBResult (*CreateCopy)(IDirectFBPalette *thiz, IDirectFBPalette **ret_interface);
-};
-typedef enum
-{
-   DIKS_UP   = 0x00000000,
-   DIKS_DOWN = 0x00000001
-} DFBInputDeviceKeyState;
-typedef enum
-{
-   DIBS_UP   = 0x00000000,
-   DIBS_DOWN = 0x00000001
-} DFBInputDeviceButtonState;
-typedef enum
-{
-   DIBM_LEFT   = 0x00000001,
-   DIBM_RIGHT  = 0x00000002,
-   DIBM_MIDDLE = 0x00000004
-} DFBInputDeviceButtonMask;
-typedef enum
-{
-   DIMM_SHIFT   = (1 << DIMKI_SHIFT),
-   DIMM_CONTROL = (1 << DIMKI_CONTROL),
-   DIMM_ALT     = (1 << DIMKI_ALT),
-   DIMM_ALTGR   = (1 << DIMKI_ALTGR),
-   DIMM_META    = (1 << DIMKI_META),
-   DIMM_SUPER   = (1 << DIMKI_SUPER),
-   DIMM_HYPER   = (1 << DIMKI_HYPER)
-} DFBInputDeviceModifierMask;
-struct _IDirectFBInputDevice
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBInputDevice *thiz);
-   DFBResult (*Release)(IDirectFBInputDevice *thiz);
-   DFBResult (*GetID)(IDirectFBInputDevice *thiz, DFBInputDeviceID *ret_device_id);
-   DFBResult (*GetDescription)(IDirectFBInputDevice *thiz, DFBInputDeviceDescription *ret_desc);
-   DFBResult (*GetKeymapEntry)(IDirectFBInputDevice *thiz, int keycode, DFBInputDeviceKeymapEntry *ret_entry);
-   DFBResult (*CreateEventBuffer)(IDirectFBInputDevice *thiz, IDirectFBEventBuffer **ret_buffer);
-   DFBResult (*AttachEventBuffer)(IDirectFBInputDevice *thiz, IDirectFBEventBuffer *buffer);
-   DFBResult (*GetKeyState)(IDirectFBInputDevice *thiz, DFBInputDeviceKeyIdentifier key_id, DFBInputDeviceKeyState *ret_state);
-   DFBResult (*GetModifiers)(IDirectFBInputDevice *thiz, DFBInputDeviceModifierMask *ret_modifiers);
-   DFBResult (*GetLockState)(IDirectFBInputDevice *thiz, DFBInputDeviceLockState *ret_locks);
-   DFBResult (*GetButtons)(IDirectFBInputDevice *thiz, DFBInputDeviceButtonMask *ret_buttons);
-   DFBResult (*GetButtonState)(IDirectFBInputDevice *thiz, DFBInputDeviceButtonIdentifier button, DFBInputDeviceButtonState *ret_state);
-   DFBResult (*GetAxis)(IDirectFBInputDevice *thiz, DFBInputDeviceAxisIdentifier axis, int *ret_pos);
-   DFBResult (*GetXY)(IDirectFBInputDevice *thiz, int *ret_x, int *ret_y);
-};
-typedef enum
-{
-   DFEC_NONE   = 0x00,
-   DFEC_INPUT  = 0x01,
-   DFEC_WINDOW = 0x02,
-   DFEC_USER   = 0x03
-} DFBEventClass;
-typedef enum
-{
-   DIET_UNKNOWN = 0,
-   DIET_KEYPRESS,
-   DIET_KEYRELEASE,
-   DIET_BUTTONPRESS,
-   DIET_BUTTONRELEASE,
-   DIET_AXISMOTION
-} DFBInputEventType;
-typedef enum
-{
-   DIEF_NONE      = 0x000,
-   DIEF_TIMESTAMP = 0x001,
-   DIEF_AXISABS   = 0x002,
-   DIEF_AXISREL   = 0x004,
-   DIEF_KEYCODE   = 0x008,
-   DIEF_KEYID     = 0x010,
-   DIEF_KEYSYMBOL = 0x020,
-   DIEF_MODIFIERS = 0x040,
-   DIEF_LOCKS     = 0x080,
-   DIEF_BUTTONS   = 0x100,
-   DIEF_GLOBAL    = 0x200
-} DFBInputEventFlags;
-typedef struct
-{
-   DFBEventClass                  clazz;
-   DFBInputEventType              type;
-   DFBInputDeviceID               device_id;
-   DFBInputEventFlags             flags;
-   struct timeval                 timestamp;
-   int                            key_code;
-   DFBInputDeviceKeyIdentifier    key_id;
-   DFBInputDeviceKeySymbol        key_symbol;
-   DFBInputDeviceModifierMask     modifiers;
-   DFBInputDeviceLockState        locks;
-   DFBInputDeviceButtonIdentifier button;
-   DFBInputDeviceButtonMask       buttons;
-   DFBInputDeviceAxisIdentifier   axis;
-   int                            axisabs;
-   int                            axisrel;
-} DFBInputEvent;
-typedef enum
-{
-   DWET_NONE          = 0x00000000,
-   DWET_POSITION      = 0x00000001,
-   DWET_SIZE          = 0x00000002,
-   DWET_CLOSE         = 0x00000004,
-   DWET_DESTROYED     = 0x00000008,
-   DWET_GOTFOCUS      = 0x00000010,
-   DWET_LOSTFOCUS     = 0x00000020,
-   DWET_KEYDOWN       = 0x00000100,
-   DWET_KEYUP         = 0x00000200,
-   DWET_BUTTONDOWN    = 0x00010000,
-   DWET_BUTTONUP      = 0x00020000,
-   DWET_MOTION        = 0x00040000,
-   DWET_ENTER         = 0x00080000,
-   DWET_LEAVE         = 0x00100000,
-   DWET_WHEEL         = 0x00200000,
-   DWET_POSITION_SIZE = DWET_POSITION | DWET_SIZE,
-   DWET_ALL           = 0x003F033F
-} DFBWindowEventType;
-typedef struct
-{
-   DFBEventClass                  clazz;
-   DFBWindowEventType             type;
-   DFBWindowID                    window_id;
-   int                            x;
-   int                            y;
-   int                            cx;
-   int                            cy;
-   int                            step;
-   int                            w;
-   int                            h;
-   int                            key_code;
-   DFBInputDeviceKeyIdentifier    key_id;
-   DFBInputDeviceKeySymbol        key_symbol;
-   DFBInputDeviceModifierMask     modifiers;
-   DFBInputDeviceLockState        locks;
-   DFBInputDeviceButtonIdentifier button;
-   DFBInputDeviceButtonMask       buttons;
-   struct timeval                 timestamp;
-} DFBWindowEvent;
-typedef struct
-{
-   DFBEventClass clazz;
-   unsigned int  type;
-   void          *data;
-} DFBUserEvent;
-typedef union
-{
-   DFBEventClass  clazz;
-   DFBInputEvent  input;
-   DFBWindowEvent window;
-   DFBUserEvent   user;
-} DFBEvent;
-struct _IDirectFBEventBuffer
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBEventBuffer *thiz);
-   DFBResult (*Release)(IDirectFBEventBuffer *thiz);
-   DFBResult (*Reset)(IDirectFBEventBuffer *thiz);
-   DFBResult (*WaitForEvent)(IDirectFBEventBuffer *thiz);
-   DFBResult (*WaitForEventWithTimeout)(IDirectFBEventBuffer *thiz, unsigned int seconds, unsigned int milli_seconds);
-   DFBResult (*GetEvent)(IDirectFBEventBuffer *thiz, DFBEvent *ret_event);
-   DFBResult (*PeekEvent)(IDirectFBEventBuffer *thiz, DFBEvent *ret_event);
-   DFBResult (*HasEvent)(IDirectFBEventBuffer *thiz);
-   DFBResult (*PostEvent)(IDirectFBEventBuffer *thiz, const DFBEvent *event);
-   DFBResult (*WakeUp)(IDirectFBEventBuffer *thiz);
-   DFBResult (*CreateFileDescriptor)(IDirectFBEventBuffer *thiz, int *ret_fd);
-};
-typedef enum
-{
-   DWOP_NONE           = 0x00000000,
-   DWOP_COLORKEYING    = 0x00000001,
-   DWOP_ALPHACHANNEL   = 0x00000002,
-   DWOP_OPAQUE_REGION  = 0x00000004,
-   DWOP_SHAPED         = 0x00000008,
-   DWOP_KEEP_POSITION  = 0x00000010,
-   DWOP_KEEP_SIZE      = 0x00000020,
-   DWOP_KEEP_STACKING  = 0x00000040,
-   DWOP_GHOST          = 0x00001000,
-   DWOP_INDESTRUCTIBLE = 0x00002000,
-   DWOP_ALL            = 0x0000307F
-} DFBWindowOptions;
-typedef enum
-{
-   DWSC_MIDDLE = 0x00000000,
-   DWSC_UPPER  = 0x00000001,
-   DWSC_LOWER  = 0x00000002
-} DFBWindowStackingClass;
-struct _IDirectFBWindow
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBWindow *thiz);
-   DFBResult (*Release)(IDirectFBWindow *thiz);
-   DFBResult (*GetID)(IDirectFBWindow *thiz, DFBWindowID *ret_window_id);
-   DFBResult (*GetPosition)(IDirectFBWindow *thiz, int *ret_x, int *ret_y);
-   DFBResult (*GetSize)(IDirectFBWindow *thiz, int *ret_width, int *ret_height);
-   DFBResult (*CreateEventBuffer)(IDirectFBWindow *thiz, IDirectFBEventBuffer **ret_buffer);
-   DFBResult (*AttachEventBuffer)(IDirectFBWindow *thiz, IDirectFBEventBuffer *buffer);
-   DFBResult (*EnableEvents)(IDirectFBWindow *thiz, DFBWindowEventType mask);
-   DFBResult (*DisableEvents)(IDirectFBWindow *thiz, DFBWindowEventType mask);
-   DFBResult (*GetSurface)(IDirectFBWindow *thiz, IDirectFBSurface **ret_surface);
-   DFBResult (*SetOptions)(IDirectFBWindow *thiz, DFBWindowOptions options);
-   DFBResult (*GetOptions)(IDirectFBWindow *thiz, DFBWindowOptions *ret_options);
-   DFBResult (*SetColorKey)(IDirectFBWindow *thiz, __u8 r, __u8 g, __u8 b);
-   DFBResult (*SetColorKeyIndex)(IDirectFBWindow *thiz, unsigned int index);
-   DFBResult (*SetOpacity)(IDirectFBWindow *thiz, __u8 opacity);
-   DFBResult (*SetOpaqueRegion)(IDirectFBWindow *thiz, int x1, int y1, int x2, int y2);
-   DFBResult (*GetOpacity)(IDirectFBWindow *thiz, __u8 *ret_opacity);
-   DFBResult (*SetCursorShape)(IDirectFBWindow *thiz, IDirectFBSurface *shape, int hot_x, int hot_y);
-   DFBResult (*RequestFocus)(IDirectFBWindow *thiz);
-   DFBResult (*GrabKeyboard)(IDirectFBWindow *thiz);
-   DFBResult (*UngrabKeyboard)(IDirectFBWindow *thiz);
-   DFBResult (*GrabPointer)(IDirectFBWindow *thiz);
-   DFBResult (*UngrabPointer)(IDirectFBWindow *thiz);
-   DFBResult (*GrabKey)(IDirectFBWindow *thiz, DFBInputDeviceKeySymbol symbol, DFBInputDeviceModifierMask modifiers);
-   DFBResult (*UngrabKey)(IDirectFBWindow *thiz, DFBInputDeviceKeySymbol symbol, DFBInputDeviceModifierMask modifiers);
-   DFBResult (*Move)(IDirectFBWindow *thiz, int dx, int dy);
-   DFBResult (*MoveTo)(IDirectFBWindow *thiz, int x, int y);
-   DFBResult (*Resize)(IDirectFBWindow *thiz, int width, int height);
-   DFBResult (*SetStackingClass)(IDirectFBWindow *thiz, DFBWindowStackingClass stacking_class);
-   DFBResult (*Raise)(IDirectFBWindow *thiz);
-   DFBResult (*Lower)(IDirectFBWindow *thiz);
-   DFBResult (*RaiseToTop)(IDirectFBWindow *thiz);
-   DFBResult (*LowerToBottom)(IDirectFBWindow *thiz);
-   DFBResult (*PutAtop)(IDirectFBWindow *thiz, IDirectFBWindow *lower);
-   DFBResult (*PutBelow)(IDirectFBWindow *thiz, IDirectFBWindow *upper);
-   DFBResult (*Close)(IDirectFBWindow *thiz);
-   DFBResult (*Destroy)(IDirectFBWindow *thiz);
-};
-struct _IDirectFBFont
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBFont *thiz);
-   DFBResult (*Release)(IDirectFBFont *thiz);
-   DFBResult (*GetAscender)(IDirectFBFont *thiz, int *ret_ascender);
-   DFBResult (*GetDescender)(IDirectFBFont *thiz, int *ret_descender);
-   DFBResult (*GetHeight)(IDirectFBFont *thiz, int *ret_height);
-   DFBResult (*GetMaxAdvance)(IDirectFBFont *thiz, int *ret_maxadvance);
-   DFBResult (*GetKerning)(IDirectFBFont *thiz, unsigned int prev_index, unsigned int current_index, int *ret_kern_x, int *ret_kern_y);
-   DFBResult (*GetStringWidth)(IDirectFBFont *thiz, const char *text, int bytes, int *ret_width);
-   DFBResult (*GetStringExtents)(IDirectFBFont *thiz, const char *text, int bytes, DFBRectangle *ret_logical_rect, DFBRectangle *ret_ink_rect);
-   DFBResult (*GetGlyphExtents)(IDirectFBFont *thiz, unsigned int index, DFBRectangle *ret_rect, int *ret_advance);
-};
-typedef enum
-{
-   DICAPS_NONE         = 0x00000000,
-   DICAPS_ALPHACHANNEL = 0x00000001,
-   DICAPS_COLORKEY     = 0x00000002
-} DFBImageCapabilities;
-typedef struct
-{
-   DFBImageCapabilities caps;
-   __u8                 colorkey_r;
-   __u8                 colorkey_g;
-   __u8                 colorkey_b;
-} DFBImageDescription;
-typedef void (*DIRenderCallback)(DFBRectangle *rect, void *ctx);
-struct _IDirectFBImageProvider
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBImageProvider *thiz);
-   DFBResult (*Release)(IDirectFBImageProvider *thiz);
-   DFBResult (*GetSurfaceDescription)(IDirectFBImageProvider *thiz, DFBSurfaceDescription *ret_dsc);
-   DFBResult (*GetImageDescription)(IDirectFBImageProvider *thiz, DFBImageDescription *ret_dsc);
-   DFBResult (*RenderTo)(IDirectFBImageProvider *thiz, IDirectFBSurface *destination, const DFBRectangle *destination_rect);
-   DFBResult (*SetRenderCallback)(IDirectFBImageProvider *thiz, DIRenderCallback callback, void *callback_data);
-};
-typedef int (*DVFrameCallback)(void *ctx);
-struct _IDirectFBVideoProvider
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBVideoProvider *thiz);
-   DFBResult (*Release)(IDirectFBVideoProvider *thiz);
-   DFBResult (*GetCapabilities)(IDirectFBVideoProvider *thiz, DFBVideoProviderCapabilities *ret_caps);
-   DFBResult (*GetSurfaceDescription)(IDirectFBVideoProvider *thiz, DFBSurfaceDescription *ret_dsc);
-   DFBResult (*PlayTo)(IDirectFBVideoProvider *thiz, IDirectFBSurface *destination, const DFBRectangle *destination_rect, DVFrameCallback callback, void *ctx);
-   DFBResult (*Stop)(IDirectFBVideoProvider *thiz);
-   DFBResult (*SeekTo)(IDirectFBVideoProvider *thiz, double seconds);
-   DFBResult (*GetPos)(IDirectFBVideoProvider *thiz, double *ret_seconds);
-   DFBResult (*GetLength)(IDirectFBVideoProvider *thiz, double *ret_seconds);
-   DFBResult (*GetColorAdjustment)(IDirectFBVideoProvider *thiz, DFBColorAdjustment *ret_adj);
-   DFBResult (*SetColorAdjustment)(IDirectFBVideoProvider *thiz, const DFBColorAdjustment *adj);
-};
-struct _IDirectFBDataBuffer
-{
-   void      *priv;
-   int       magic;
-   DFBResult (*AddRef)(IDirectFBDataBuffer *thiz);
-   DFBResult (*Release)(IDirectFBDataBuffer *thiz);
-   DFBResult (*Flush)(IDirectFBDataBuffer *thiz);
-   DFBResult (*SeekTo)(IDirectFBDataBuffer *thiz, unsigned int offset);
-   DFBResult (*GetPosition)(IDirectFBDataBuffer *thiz, unsigned int *ret_offset);
-   DFBResult (*GetLength)(IDirectFBDataBuffer *thiz, unsigned int *ret_length);
-   DFBResult (*WaitForData)(IDirectFBDataBuffer *thiz, unsigned int length);
-   DFBResult (*WaitForDataWithTimeout)(IDirectFBDataBuffer *thiz, unsigned int length, unsigned int seconds, unsigned int milli_seconds);
-   DFBResult (*GetData)(IDirectFBDataBuffer *thiz, unsigned int length, void *ret_data, unsigned int *ret_read);
-   DFBResult (*PeekData)(IDirectFBDataBuffer *thiz, unsigned int length, int offset, void *ret_data, unsigned int *ret_read);
-   DFBResult (*HasData)(IDirectFBDataBuffer *thiz);
-   DFBResult (*PutData)(IDirectFBDataBuffer *thiz, const void *data, unsigned int length);
-   DFBResult (*CreateImageProvider)(IDirectFBDataBuffer *thiz, IDirectFBImageProvider **interface);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02002-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02002-i2c-core.c
deleted file mode 100644
index 1acca5ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02002-i2c-core.c
+++ /dev/null
@@ -1,1457 +0,0 @@
-/* i2c-core.c - a device driver for the iic-bus interface                    */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-99 Simon G. Vogl
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
- * All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
- * SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/idr.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-
-
-static LIST_HEAD(adapters);
-static LIST_HEAD(drivers);
-static DECLARE_MUTEX(core_lists);
-static DEFINE_IDR(i2c_adapter_idr);
-
-static int i2c_device_match(struct device *dev, struct device_driver *drv)
-{
-   return(1);
-}
-
-static int i2c_bus_suspend(struct device *dev, pm_message_t state)
-{
-   int rc = 0;
-
-   if (dev->driver && dev->driver->suspend)
-   {
-      rc = dev->driver->suspend(dev, state, 0);
-   }
-   return(rc);
-}
-
-static int i2c_bus_resume(struct device *dev)
-{
-   int rc = 0;
-
-   if (dev->driver && dev->driver->resume)
-   {
-      rc = dev->driver->resume(dev, 0);
-   }
-   return(rc);
-}
-
-struct bus_type i2c_bus_type =
-{
-   .name    = "i2c",
-   .match   = i2c_device_match,
-   .suspend = i2c_bus_suspend,
-   .resume  = i2c_bus_resume,
-};
-
-static int i2c_device_probe(struct device *dev)
-{
-   return(-ENODEV);
-}
-
-static int i2c_device_remove(struct device *dev)
-{
-   return(0);
-}
-
-void i2c_adapter_dev_release(struct device *dev)
-{
-   struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-   complete(&adap->dev_released);
-}
-
-struct device_driver i2c_adapter_driver =
-{
-   .name   = "i2c_adapter",
-   .bus    = &i2c_bus_type,
-   .probe  = i2c_device_probe,
-   .remove = i2c_device_remove,
-};
-
-static void i2c_adapter_class_dev_release(struct class_device *dev)
-{
-   struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-
-   complete(&adap->class_dev_released);
-}
-
-struct class i2c_adapter_class =
-{
-   .name    = "i2c-adapter",
-   .release = &i2c_adapter_class_dev_release,
-};
-
-static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-   struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-   return(sprintf(buf, "%s\n", adap->name));
-}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
-static void i2c_client_release(struct device *dev)
-{
-   struct i2c_client *client = to_i2c_client(dev);
-
-   complete(&client->released);
-}
-
-static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-   struct i2c_client *client = to_i2c_client(dev);
-
-   return(sprintf(buf, "%s\n", client->name));
-}
-
-/*
- * We can't use the DEVICE_ATTR() macro here as we want the same filename for a
- * different type of a device.  So beware if the DEVICE_ATTR() macro ever
- * changes, this definition will also have to change.
- */
-static struct device_attribute dev_attr_client_name =
-{
-   .attr = { .name = "name", .mode = S_IRUGO, .owner = THIS_MODULE },
-   .show = &show_client_name,
-};
-
-
-/* ---------------------------------------------------
- * registering functions
- * ---------------------------------------------------
- */
-
-/* -----
- * i2c_add_adapter is called from within the algorithm layer,
- * when a new hw adapter registers. A new device is register to be
- * available for clients.
- */
-int i2c_add_adapter(struct i2c_adapter *adap)
-{
-   int               id, res = 0;
-   struct list_head  *item;
-   struct i2c_driver *driver;
-
-   down(&core_lists);
-
-   if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
-   {
-      res = -ENOMEM;
-      goto out_unlock;
-   }
-
-   res = idr_get_new(&i2c_adapter_idr, adap, &id);
-   if (res < 0)
-   {
-      if (res == -EAGAIN)
-      {
-         res = -ENOMEM;
-      }
-      goto out_unlock;
-   }
-
-   adap->nr = id & MAX_ID_MASK;
-   init_MUTEX(&adap->bus_lock);
-   init_MUTEX(&adap->clist_lock);
-   list_add_tail(&adap->list, &adapters);
-   INIT_LIST_HEAD(&adap->clients);
-
-   /* Add the adapter to the driver core.
-    * If the parent pointer is not set up,
-    * we add this adapter to the host bus.
-    */
-   if (adap->dev.parent == NULL)
-   {
-      adap->dev.parent = &platform_bus;
-   }
-   sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
-   adap->dev.driver  = &i2c_adapter_driver;
-   adap->dev.release = &i2c_adapter_dev_release;
-   device_register(&adap->dev);
-   device_create_file(&adap->dev, &dev_attr_name);
-
-   /* Add this adapter to the i2c_adapter class */
-   memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-   adap->class_dev.dev   = &adap->dev;
-   adap->class_dev.class = &i2c_adapter_class;
-   strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-   class_device_register(&adap->class_dev);
-
-   dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
-
-   /* inform drivers of new adapters */
-   list_for_each(item, &drivers)
-   {
-      driver = list_entry(item, struct i2c_driver, list);
-      if (driver->flags & I2C_DF_NOTIFY)
-      {
-         /* We ignore the return code; if it fails, too bad */
-         driver->attach_adapter(adap);
-      }
-   }
-
- out_unlock:
-   up(&core_lists);
-   return(res);
-} /* i2c_add_adapter */
-
-
-int i2c_del_adapter(struct i2c_adapter *adap)
-{
-   struct list_head   *item, *_n;
-   struct i2c_adapter *adap_from_list;
-   struct i2c_driver  *driver;
-   struct i2c_client  *client;
-   int                res = 0;
-
-   down(&core_lists);
-
-   /* First make sure that this adapter was ever added */
-   list_for_each_entry(adap_from_list, &adapters, list)
-   {
-      if (adap_from_list == adap)
-      {
-         break;
-      }
-   }
-   if (adap_from_list != adap)
-   {
-      pr_debug("i2c-core: attempting to delete unregistered "
-               "adapter [%s]\n", adap->name);
-      res = -EINVAL;
-      goto out_unlock;
-   }
-
-   list_for_each(item, &drivers)
-   {
-      driver = list_entry(item, struct i2c_driver, list);
-      if (driver->detach_adapter)
-      {
-         if ((res = driver->detach_adapter(adap)))
-         {
-            dev_err(&adap->dev, "detach_adapter failed "
-                    "for driver [%s]\n", driver->name);
-            goto out_unlock;
-         }
-      }
-   }
-
-   /* detach any active clients. This must be done first, because
-    * it can fail; in which case we give up. */
-   list_for_each_safe(item, _n, &adap->clients)
-   {
-      client = list_entry(item, struct i2c_client, list);
-
-      /* detaching devices is unconditional of the set notify
-       * flag, as _all_ clients that reside on the adapter
-       * must be deleted, as this would cause invalid states.
-       */
-      if ((res = client->driver->detach_client(client)))
-      {
-         dev_err(&adap->dev, "detach_client failed for client "
-                 "[%s] at address 0x%02x\n", client->name,
-                 client->addr);
-         goto out_unlock;
-      }
-   }
-
-   /* clean up the sysfs representation */
-   init_completion(&adap->dev_released);
-   init_completion(&adap->class_dev_released);
-   class_device_unregister(&adap->class_dev);
-   device_remove_file(&adap->dev, &dev_attr_name);
-   device_unregister(&adap->dev);
-   list_del(&adap->list);
-
-   /* wait for sysfs to drop all references */
-   wait_for_completion(&adap->dev_released);
-   wait_for_completion(&adap->class_dev_released);
-
-   /* free dynamically allocated bus id */
-   idr_remove(&i2c_adapter_idr, adap->nr);
-
-   dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
-
- out_unlock:
-   up(&core_lists);
-   return(res);
-} /* i2c_del_adapter */
-
-
-/* -----
- * What follows is the "upwards" interface: commands for talking to clients,
- * which implement the functions to access the physical information of the
- * chips.
- */
-
-int i2c_add_driver(struct i2c_driver *driver)
-{
-   struct list_head   *item;
-   struct i2c_adapter *adapter;
-   int                res = 0;
-
-   down(&core_lists);
-
-   /* add the driver to the list of i2c drivers in the driver core */
-   driver->driver.name   = driver->name;
-   driver->driver.bus    = &i2c_bus_type;
-   driver->driver.probe  = i2c_device_probe;
-   driver->driver.remove = i2c_device_remove;
-
-   res = driver_register(&driver->driver);
-   if (res)
-   {
-      goto out_unlock;
-   }
-
-   list_add_tail(&driver->list, &drivers);
-   pr_debug("i2c-core: driver [%s] registered\n", driver->name);
-
-   /* now look for instances of driver on our adapters */
-   if (driver->flags & I2C_DF_NOTIFY)
-   {
-      list_for_each(item, &adapters)
-      {
-         adapter = list_entry(item, struct i2c_adapter, list);
-         driver->attach_adapter(adapter);
-      }
-   }
-
- out_unlock:
-   up(&core_lists);
-   return(res);
-}
-
-int i2c_del_driver(struct i2c_driver *driver)
-{
-   struct list_head   *item1, *item2, *_n;
-   struct i2c_client  *client;
-   struct i2c_adapter *adap;
-
-   int                res = 0;
-
-   down(&core_lists);
-
-   /* Have a look at each adapter, if clients of this driver are still
-    * attached. If so, detach them to be able to kill the driver
-    * afterwards.
-    *
-    * Removing clients does not depend on the notify flag, else
-    * invalid operation might (will!) result, when using stale client
-    * pointers.
-    */
-   list_for_each(item1, &adapters)
-   {
-      adap = list_entry(item1, struct i2c_adapter, list);
-      if (driver->detach_adapter)
-      {
-         if ((res = driver->detach_adapter(adap)))
-         {
-            dev_err(&adap->dev, "detach_adapter failed "
-                    "for driver [%s]\n", driver->name);
-            goto out_unlock;
-         }
-      }
-      else
-      {
-         list_for_each_safe(item2, _n, &adap->clients)
-         {
-            client = list_entry(item2, struct i2c_client, list);
-            if (client->driver != driver)
-            {
-               continue;
-            }
-            dev_dbg(&adap->dev, "detaching client [%s] "
-                    "at 0x%02x\n", client->name,
-                    client->addr);
-            if ((res = driver->detach_client(client)))
-            {
-               dev_err(&adap->dev, "detach_client "
-                       "failed for client [%s] at "
-                       "0x%02x\n", client->name,
-                       client->addr);
-               goto out_unlock;
-            }
-         }
-      }
-   }
-
-   driver_unregister(&driver->driver);
-   list_del(&driver->list);
-   pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
-
- out_unlock:
-   up(&core_lists);
-   return(0);
-} /* i2c_del_driver */
-
-static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
-{
-   struct list_head  *item;
-   struct i2c_client *client;
-
-   list_for_each(item, &adapter->clients)
-   {
-      client = list_entry(item, struct i2c_client, list);
-      if (client->addr == addr)
-      {
-         return(-EBUSY);
-      }
-   }
-   return(0);
-}
-
-int i2c_check_addr(struct i2c_adapter *adapter, int addr)
-{
-   int rval;
-
-   down(&adapter->clist_lock);
-   rval = __i2c_check_addr(adapter, addr);
-   up(&adapter->clist_lock);
-
-   return(rval);
-}
-
-int i2c_attach_client(struct i2c_client *client)
-{
-   struct i2c_adapter *adapter = client->adapter;
-
-   down(&adapter->clist_lock);
-   if (__i2c_check_addr(client->adapter, client->addr))
-   {
-      up(&adapter->clist_lock);
-      return(-EBUSY);
-   }
-   list_add_tail(&client->list, &adapter->clients);
-   up(&adapter->clist_lock);
-
-   if (adapter->client_register)
-   {
-      if (adapter->client_register(client))
-      {
-         dev_dbg(&adapter->dev, "client_register "
-                 "failed for client [%s] at 0x%02x\n",
-                 client->name, client->addr);
-      }
-   }
-
-   if (client->flags & I2C_CLIENT_ALLOW_USE)
-   {
-      client->usage_count = 0;
-   }
-
-   client->dev.parent  = &client->adapter->dev;
-   client->dev.driver  = &client->driver->driver;
-   client->dev.bus     = &i2c_bus_type;
-   client->dev.release = &i2c_client_release;
-
-   snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-            "%d-%04x", i2c_adapter_id(adapter), client->addr);
-   dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-           client->name, client->dev.bus_id);
-   device_register(&client->dev);
-   device_create_file(&client->dev, &dev_attr_client_name);
-
-   return(0);
-} /* i2c_attach_client */
-
-
-int i2c_detach_client(struct i2c_client *client)
-{
-   struct i2c_adapter *adapter = client->adapter;
-   int                res      = 0;
-
-   if ((client->flags & I2C_CLIENT_ALLOW_USE)
-       && (client->usage_count > 0))
-   {
-      dev_warn(&client->dev, "Client [%s] still busy, "
-               "can't detach\n", client->name);
-      return(-EBUSY);
-   }
-
-   if (adapter->client_unregister)
-   {
-      res = adapter->client_unregister(client);
-      if (res)
-      {
-         dev_err(&client->dev,
-                 "client_unregister [%s] failed, "
-                 "client not detached\n", client->name);
-         goto out;
-      }
-   }
-
-   down(&adapter->clist_lock);
-   list_del(&client->list);
-   init_completion(&client->released);
-   device_remove_file(&client->dev, &dev_attr_client_name);
-   device_unregister(&client->dev);
-   up(&adapter->clist_lock);
-   wait_for_completion(&client->released);
-
- out:
-   return(res);
-}
-
-static int i2c_inc_use_client(struct i2c_client *client)
-{
-   if (!try_module_get(client->driver->owner))
-   {
-      return(-ENODEV);
-   }
-   if (!try_module_get(client->adapter->owner))
-   {
-      module_put(client->driver->owner);
-      return(-ENODEV);
-   }
-
-   return(0);
-}
-
-static void i2c_dec_use_client(struct i2c_client *client)
-{
-   module_put(client->driver->owner);
-   module_put(client->adapter->owner);
-}
-
-int i2c_use_client(struct i2c_client *client)
-{
-   int ret;
-
-   ret = i2c_inc_use_client(client);
-   if (ret)
-   {
-      return(ret);
-   }
-
-   if (client->flags & I2C_CLIENT_ALLOW_USE)
-   {
-      if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-      {
-         client->usage_count++;
-      }
-      else if (client->usage_count > 0)
-      {
-         goto busy;
-      }
-      else
-      {
-         client->usage_count++;
-      }
-   }
-
-   return(0);
-
- busy:
-   i2c_dec_use_client(client);
-   return(-EBUSY);
-}
-
-int i2c_release_client(struct i2c_client *client)
-{
-   if (client->flags & I2C_CLIENT_ALLOW_USE)
-   {
-      if (client->usage_count > 0)
-      {
-         client->usage_count--;
-      }
-      else
-      {
-         pr_debug("i2c-core: %s used one too many times\n",
-                  __FUNCTION__);
-         return(-EPERM);
-      }
-   }
-
-   i2c_dec_use_client(client);
-
-   return(0);
-}
-
-void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
-{
-   struct list_head  *item;
-   struct i2c_client *client;
-
-   down(&adap->clist_lock);
-   list_for_each(item, &adap->clients)
-   {
-      client = list_entry(item, struct i2c_client, list);
-      if (!try_module_get(client->driver->owner))
-      {
-         continue;
-      }
-      if (NULL != client->driver->command)
-      {
-         up(&adap->clist_lock);
-         client->driver->command(client, cmd, arg);
-         down(&adap->clist_lock);
-      }
-      module_put(client->driver->owner);
-   }
-   up(&adap->clist_lock);
-}
-
-static int __init i2c_init(void)
-{
-   int retval;
-
-   retval = bus_register(&i2c_bus_type);
-   if (retval)
-   {
-      return(retval);
-   }
-   retval = driver_register(&i2c_adapter_driver);
-   if (retval)
-   {
-      return(retval);
-   }
-   return(class_register(&i2c_adapter_class));
-}
-
-static void __exit i2c_exit(void)
-{
-   class_unregister(&i2c_adapter_class);
-   driver_unregister(&i2c_adapter_driver);
-   bus_unregister(&i2c_bus_type);
-}
-
-subsys_initcall(i2c_init);
-module_exit(i2c_exit);
-
-/* ----------------------------------------------------
- * the functional interface to the i2c busses.
- * ----------------------------------------------------
- */
-
-int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
-{
-   int ret;
-
-   if (adap->algo->master_xfer)
-   {
-#ifdef DEBUG
-      for (ret = 0; ret < num; ret++)
-      {
-         dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
-                 "len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
-                 'R' : 'W', msgs[ret].addr, msgs[ret].len);
-      }
-#endif
-
-      down(&adap->bus_lock);
-      ret = adap->algo->master_xfer(adap, msgs, num);
-      up(&adap->bus_lock);
-
-      return(ret);
-   }
-   else
-   {
-      dev_dbg(&adap->dev, "I2C level transfers not supported\n");
-      return(-ENOSYS);
-   }
-}
-
-int i2c_master_send(struct i2c_client *client, const char *buf, int count)
-{
-   int                ret;
-   struct i2c_adapter *adap = client->adapter;
-   struct i2c_msg     msg;
-
-   msg.addr  = client->addr;
-   msg.flags = client->flags & I2C_M_TEN;
-   msg.len   = count;
-   msg.buf   = (char *)buf;
-
-   ret = i2c_transfer(adap, &msg, 1);
-
-   /* If everything went ok (i.e. 1 msg transmitted), return #bytes
-    * transmitted, else error code. */
-   return((ret == 1) ? count : ret);
-}
-
-int i2c_master_recv(struct i2c_client *client, char *buf, int count)
-{
-   struct i2c_adapter *adap = client->adapter;
-   struct i2c_msg     msg;
-   int                ret;
-
-   msg.addr   = client->addr;
-   msg.flags  = client->flags & I2C_M_TEN;
-   msg.flags |= I2C_M_RD;
-   msg.len    = count;
-   msg.buf    = buf;
-
-   ret = i2c_transfer(adap, &msg, 1);
-
-   /* If everything went ok (i.e. 1 msg transmitted), return #bytes
-    * transmitted, else error code. */
-   return((ret == 1) ? count : ret);
-}
-
-
-int i2c_control(struct i2c_client *client,
-                unsigned int cmd, unsigned long arg)
-{
-   int                ret   = 0;
-   struct i2c_adapter *adap = client->adapter;
-
-   dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
-   switch (cmd)
-   {
-   case I2C_RETRIES:
-      adap->retries = arg;
-      break;
-
-   case I2C_TIMEOUT:
-      adap->timeout = arg;
-      break;
-
-   default:
-      if (adap->algo->algo_control != NULL)
-      {
-         ret = adap->algo->algo_control(adap, cmd, arg);
-      }
-   }
-   return(ret);
-}
-
-/* ----------------------------------------------------
- * the i2c address scanning function
- * Will not work for 10-bit addresses!
- * ----------------------------------------------------
- */
-static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-                             int (*found_proc)(struct i2c_adapter *, int, int))
-{
-   int err;
-
-   /* Make sure the address is valid */
-   if (addr < 0x03 || addr > 0x77)
-   {
-      dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-               addr);
-      return(-EINVAL);
-   }
-
-   /* Skip if already in use */
-   if (i2c_check_addr(adapter, addr))
-   {
-      return(0);
-   }
-
-   /* Make sure there is something at this address, unless forced */
-   if (kind < 0)
-   {
-      if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                         I2C_SMBUS_QUICK, NULL) < 0)
-      {
-         return(0);
-      }
-
-      /* prevent 24RF08 corruption */
-      if ((addr & ~0x0f) == 0x50)
-      {
-         i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                        I2C_SMBUS_QUICK, NULL);
-      }
-   }
-
-   /* Finally call the custom detection function */
-   err = found_proc(adapter, addr, kind);
-
-   /* -ENODEV can be returned if there is a chip at the given address
-    * but it isn't supported by this chip driver. We catch it here as
-    * this isn't an error. */
-   return((err == -ENODEV) ? 0 : err);
-}
-
-int i2c_probe(struct i2c_adapter *adapter,
-              struct i2c_client_address_data *address_data,
-              int (*found_proc)(struct i2c_adapter *, int, int))
-{
-   int i, err;
-   int adap_id = i2c_adapter_id(adapter);
-
-   /* Forget it if we can't probe using SMBUS_QUICK */
-   if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK))
-   {
-      return(-1);
-   }
-
-   /* Force entries are done first, and are not affected by ignore
-    * entries */
-   if (address_data->forces)
-   {
-      unsigned short **forces = address_data->forces;
-      int            kind;
-
-      for (kind = 0; forces[kind]; kind++)
-      {
-         for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-              i += 2)
-         {
-            if (forces[kind][i] == adap_id
-                || forces[kind][i] == ANY_I2C_BUS)
-            {
-               dev_dbg(&adapter->dev, "found force "
-                       "parameter for adapter %d, "
-                       "addr 0x%02x, kind %d\n",
-                       adap_id, forces[kind][i + 1],
-                       kind);
-               err = i2c_probe_address(adapter,
-                                       forces[kind][i + 1],
-                                       kind, found_proc);
-               if (err)
-               {
-                  return(err);
-               }
-            }
-         }
-      }
-   }
-
-   /* Probe entries are done second, and are not affected by ignore
-    * entries either */
-   for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2)
-   {
-      if (address_data->probe[i] == adap_id
-          || address_data->probe[i] == ANY_I2C_BUS)
-      {
-         dev_dbg(&adapter->dev, "found probe parameter for "
-                 "adapter %d, addr 0x%02x\n", adap_id,
-                 address_data->probe[i + 1]);
-         err = i2c_probe_address(adapter,
-                                 address_data->probe[i + 1],
-                                 -1, found_proc);
-         if (err)
-         {
-            return(err);
-         }
-      }
-   }
-
-   /* Normal entries are done last, unless shadowed by an ignore entry */
-   for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1)
-   {
-      int j, ignore;
-
-      ignore = 0;
-      for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-           j += 2)
-      {
-         if ((address_data->ignore[j] == adap_id ||
-              address_data->ignore[j] == ANY_I2C_BUS)
-             && address_data->ignore[j + 1]
-             == address_data->normal_i2c[i])
-         {
-            dev_dbg(&adapter->dev, "found ignore "
-                    "parameter for adapter %d, "
-                    "addr 0x%02x\n", adap_id,
-                    address_data->ignore[j + 1]);
-         }
-         ignore = 1;
-         break;
-      }
-      if (ignore)
-      {
-         continue;
-      }
-
-      dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-              "addr 0x%02x\n", adap_id,
-              address_data->normal_i2c[i]);
-      err = i2c_probe_address(adapter, address_data->normal_i2c[i],
-                              -1, found_proc);
-      if (err)
-      {
-         return(err);
-      }
-   }
-
-   return(0);
-} /* i2c_probe */
-
-struct i2c_adapter *i2c_get_adapter(int id)
-{
-   struct i2c_adapter *adapter;
-
-   down(&core_lists);
-   adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
-   if (adapter && !try_module_get(adapter->owner))
-   {
-      adapter = NULL;
-   }
-
-   up(&core_lists);
-   return(adapter);
-}
-
-void i2c_put_adapter(struct i2c_adapter *adap)
-{
-   module_put(adap->owner);
-}
-
-/* The SMBus parts */
-
-#define POLY    (0x1070U << 3)
-static u8
-crc8(u16 data)
-{
-   int i;
-
-   for (i = 0; i < 8; i++)
-   {
-      if (data & 0x8000)
-      {
-         data = data ^ POLY;
-      }
-      data = data << 1;
-   }
-   return((u8)(data >> 8));
-}
-
-/* CRC over count bytes in the first array plus the bytes in the rest
- * array if it is non-null. rest[0] is the (length of rest) - 1
- * and is included. */
-static u8 i2c_smbus_partial_pec(u8 crc, int count, u8 *first, u8 *rest)
-{
-   int i;
-
-   for (i = 0; i < count; i++)
-   {
-      crc = crc8((crc ^ first[i]) << 8);
-   }
-   if (rest != NULL)
-   {
-      for (i = 0; i <= rest[0]; i++)
-      {
-         crc = crc8((crc ^ rest[i]) << 8);
-      }
-   }
-   return(crc);
-}
-
-static u8 i2c_smbus_pec(int count, u8 *first, u8 *rest)
-{
-   return(i2c_smbus_partial_pec(0, count, first, rest));
-}
-
-/* Returns new "size" (transaction type)
- * Note that we convert byte to byte_data and byte_data to word_data
- * rather than invent new xxx_PEC transactions. */
-static int i2c_smbus_add_pec(u16 addr, u8 command, int size,
-                             union i2c_smbus_data *data)
-{
-   u8 buf[3];
-
-   buf[0] = addr << 1;
-   buf[1] = command;
-   switch (size)
-   {
-   case I2C_SMBUS_BYTE:
-      data->byte = i2c_smbus_pec(2, buf, NULL);
-      size       = I2C_SMBUS_BYTE_DATA;
-      break;
-
-   case I2C_SMBUS_BYTE_DATA:
-      buf[2]     = data->byte;
-      data->word = buf[2] ||
-                   (i2c_smbus_pec(3, buf, NULL) << 8);
-      size = I2C_SMBUS_WORD_DATA;
-      break;
-
-   case I2C_SMBUS_WORD_DATA:
-      /* unsupported */
-      break;
-
-   case I2C_SMBUS_BLOCK_DATA:
-      data->block[data->block[0] + 1] =
-         i2c_smbus_pec(2, buf, data->block);
-      size = I2C_SMBUS_BLOCK_DATA_PEC;
-      break;
-   }
-   return(size);
-}
-
-static int i2c_smbus_check_pec(u16 addr, u8 command, int size, u8 partial,
-                               union i2c_smbus_data *data)
-{
-   u8 buf[3], rpec, cpec;
-
-   buf[1] = command;
-   switch (size)
-   {
-   case I2C_SMBUS_BYTE_DATA:
-      buf[0] = (addr << 1) | 1;
-      cpec   = i2c_smbus_pec(2, buf, NULL);
-      rpec   = data->byte;
-      break;
-
-   case I2C_SMBUS_WORD_DATA:
-      buf[0] = (addr << 1) | 1;
-      buf[2] = data->word & 0xff;
-      cpec   = i2c_smbus_pec(3, buf, NULL);
-      rpec   = data->word >> 8;
-      break;
-
-   case I2C_SMBUS_WORD_DATA_PEC:
-      /* unsupported */
-      cpec = rpec = 0;
-      break;
-
-   case I2C_SMBUS_PROC_CALL_PEC:
-      /* unsupported */
-      cpec = rpec = 0;
-      break;
-
-   case I2C_SMBUS_BLOCK_DATA_PEC:
-      buf[0] = (addr << 1);
-      buf[2] = (addr << 1) | 1;
-      cpec   = i2c_smbus_pec(3, buf, data->block);
-      rpec   = data->block[data->block[0] + 1];
-      break;
-
-   case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-      buf[0] = (addr << 1) | 1;
-      rpec   = i2c_smbus_partial_pec(partial, 1,
-                                     buf, data->block);
-      cpec = data->block[data->block[0] + 1];
-      break;
-
-   default:
-      cpec = rpec = 0;
-      break;
-   } /* switch */
-   if (rpec != cpec)
-   {
-      pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n",
-               rpec, cpec);
-      return(-1);
-   }
-   return(0);
-} /* i2c_smbus_check_pec */
-
-s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
-{
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         value, 0, I2C_SMBUS_QUICK, NULL));
-}
-
-s32 i2c_smbus_read_byte(struct i2c_client *client)
-{
-   union i2c_smbus_data data;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      return(0x0FF & data.byte);
-   }
-}
-
-s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
-{
-   union i2c_smbus_data data;           /* only for PEC */
-
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, &data));
-}
-
-s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
-{
-   union i2c_smbus_data data;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, command, I2C_SMBUS_BYTE_DATA, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      return(0x0FF & data.byte);
-   }
-}
-
-s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
-{
-   union i2c_smbus_data data;
-
-   data.byte = value;
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, command,
-                         I2C_SMBUS_BYTE_DATA, &data));
-}
-
-s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
-{
-   union i2c_smbus_data data;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, command, I2C_SMBUS_WORD_DATA, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      return(0x0FFFF & data.word);
-   }
-}
-
-s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
-{
-   union i2c_smbus_data data;
-
-   data.word = value;
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, command,
-                         I2C_SMBUS_WORD_DATA, &data));
-}
-
-s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
-                               u8 length, u8 *values)
-{
-   union i2c_smbus_data data;
-   int                  i;
-
-   if (length > I2C_SMBUS_BLOCK_MAX)
-   {
-      length = I2C_SMBUS_BLOCK_MAX;
-   }
-   for (i = 1; i <= length; i++)
-   {
-      data.block[i] = values[i - 1];
-   }
-   data.block[0] = length;
-   return(i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                         I2C_SMBUS_WRITE, command,
-                         I2C_SMBUS_BLOCK_DATA, &data));
-}
-
-/* Returns the number of read bytes */
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
-{
-   union i2c_smbus_data data;
-   int                  i;
-
-   if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                      I2C_SMBUS_READ, command,
-                      I2C_SMBUS_I2C_BLOCK_DATA, &data))
-   {
-      return(-1);
-   }
-   else
-   {
-      for (i = 1; i <= data.block[0]; i++)
-      {
-         values[i - 1] = data.block[i];
-      }
-      return(data.block[0]);
-   }
-}
-
-/* Simulate a SMBus command using the i2c protocol
- * No checking of parameters is done!  */
-static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,
-                                   unsigned short flags,
-                                   char read_write, u8 command, int size,
-                                   union i2c_smbus_data *data)
-{
-   /* So we need to generate a series of msgs. In the case of writing, we
-    * need to use only one message; when reading, we need two. We initialize
-    * most things with sane defaults, to keep the code below somewhat
-    * simpler. */
-   unsigned char  msgbuf0[34];
-   unsigned char  msgbuf1[34];
-   int            num    = read_write == I2C_SMBUS_READ ? 2 : 1;
-   struct i2c_msg msg[2] = { { addr, flags,            1, msgbuf0 },
-                             { addr, flags | I2C_M_RD, 0, msgbuf1 } };
-   int            i;
-
-   msgbuf0[0] = command;
-   switch (size)
-   {
-   case I2C_SMBUS_QUICK:
-      msg[0].len = 0;
-      /* Special case: The read/write field is used as data */
-      msg[0].flags = flags | (read_write == I2C_SMBUS_READ) ? I2C_M_RD : 0;
-      num          = 1;
-      break;
-
-   case I2C_SMBUS_BYTE:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         /* Special case: only a read! */
-         msg[0].flags = I2C_M_RD | flags;
-         num          = 1;
-      }
-      break;
-
-   case I2C_SMBUS_BYTE_DATA:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         msg[1].len = 1;
-      }
-      else
-      {
-         msg[0].len = 2;
-         msgbuf0[1] = data->byte;
-      }
-      break;
-
-   case I2C_SMBUS_WORD_DATA:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         msg[1].len = 2;
-      }
-      else
-      {
-         msg[0].len = 3;
-         msgbuf0[1] = data->word & 0xff;
-         msgbuf0[2] = (data->word >> 8) & 0xff;
-      }
-      break;
-
-   case I2C_SMBUS_PROC_CALL:
-      num        = 2;    /* Special case */
-      read_write = I2C_SMBUS_READ;
-      msg[0].len = 3;
-      msg[1].len = 2;
-      msgbuf0[1] = data->word & 0xff;
-      msgbuf0[2] = (data->word >> 8) & 0xff;
-      break;
-
-   case I2C_SMBUS_BLOCK_DATA:
-   case I2C_SMBUS_BLOCK_DATA_PEC:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         dev_err(&adapter->dev, "Block read not supported "
-                 "under I2C emulation!\n");
-         return(-1);
-      }
-      else
-      {
-         msg[0].len = data->block[0] + 2;
-         if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2)
-         {
-            dev_err(&adapter->dev, "smbus_access called with "
-                    "invalid block write size (%d)\n",
-                    data->block[0]);
-            return(-1);
-         }
-         if (size == I2C_SMBUS_BLOCK_DATA_PEC)
-         {
-            (msg[0].len)++;
-         }
-         for (i = 1; i <= msg[0].len; i++)
-         {
-            msgbuf0[i] = data->block[i - 1];
-         }
-      }
-      break;
-
-   case I2C_SMBUS_BLOCK_PROC_CALL:
-   case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-      dev_dbg(&adapter->dev, "Block process call not supported "
-              "under I2C emulation!\n");
-      return(-1);
-
-   case I2C_SMBUS_I2C_BLOCK_DATA:
-      if (read_write == I2C_SMBUS_READ)
-      {
-         msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-      }
-      else
-      {
-         msg[0].len = data->block[0] + 1;
-         if (msg[0].len > I2C_SMBUS_I2C_BLOCK_MAX + 1)
-         {
-            dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "
-                    "invalid block write size (%d)\n",
-                    data->block[0]);
-            return(-1);
-         }
-         for (i = 1; i <= data->block[0]; i++)
-         {
-            msgbuf0[i] = data->block[i];
-         }
-      }
-      break;
-
-   default:
-      dev_err(&adapter->dev, "smbus_access called with invalid size (%d)\n",
-              size);
-      return(-1);
-   } /* switch */
-
-   if (i2c_transfer(adapter, msg, num) < 0)
-   {
-      return(-1);
-   }
-
-   if (read_write == I2C_SMBUS_READ)
-   {
-      switch (size)
-      {
-      case I2C_SMBUS_BYTE:
-         data->byte = msgbuf0[0];
-         break;
-
-      case I2C_SMBUS_BYTE_DATA:
-         data->byte = msgbuf1[0];
-         break;
-
-      case I2C_SMBUS_WORD_DATA:
-      case I2C_SMBUS_PROC_CALL:
-         data->word = msgbuf1[0] | (msgbuf1[1] << 8);
-         break;
-
-      case I2C_SMBUS_I2C_BLOCK_DATA:
-         /* fixed at 32 for now */
-         data->block[0] = I2C_SMBUS_I2C_BLOCK_MAX;
-         for (i = 0; i < I2C_SMBUS_I2C_BLOCK_MAX; i++)
-         {
-            data->block[i + 1] = msgbuf1[i];
-         }
-         break;
-      }
-   }
-   return(0);
-} /* i2c_smbus_xfer_emulated */
-
-
-s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
-                   char read_write, u8 command, int size,
-                   union i2c_smbus_data *data)
-{
-   s32 res;
-   int swpec   = 0;
-   u8  partial = 0;
-
-   flags &= I2C_M_TEN | I2C_CLIENT_PEC;
-   if ((flags & I2C_CLIENT_PEC) &&
-       !(i2c_check_functionality(adapter, I2C_FUNC_SMBUS_HWPEC_CALC)))
-   {
-      swpec = 1;
-      if (read_write == I2C_SMBUS_READ &&
-          size == I2C_SMBUS_BLOCK_DATA)
-      {
-         size = I2C_SMBUS_BLOCK_DATA_PEC;
-      }
-      else if (size == I2C_SMBUS_PROC_CALL)
-      {
-         size = I2C_SMBUS_PROC_CALL_PEC;
-      }
-      else if (size == I2C_SMBUS_BLOCK_PROC_CALL)
-      {
-         i2c_smbus_add_pec(addr, command,
-                           I2C_SMBUS_BLOCK_DATA, data);
-         partial = data->block[data->block[0] + 1];
-         size    = I2C_SMBUS_BLOCK_PROC_CALL_PEC;
-      }
-      else if (read_write == I2C_SMBUS_WRITE &&
-               size != I2C_SMBUS_QUICK &&
-               size != I2C_SMBUS_I2C_BLOCK_DATA)
-      {
-         size = i2c_smbus_add_pec(addr, command, size, data);
-      }
-   }
-
-   if (adapter->algo->smbus_xfer)
-   {
-      down(&adapter->bus_lock);
-      res = adapter->algo->smbus_xfer(adapter, addr, flags, read_write,
-                                      command, size, data);
-      up(&adapter->bus_lock);
-   }
-   else
-   {
-      res = i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
-                                    command, size, data);
-   }
-
-   if (res >= 0 && swpec &&
-       size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA &&
-       (read_write == I2C_SMBUS_READ || size == I2C_SMBUS_PROC_CALL_PEC ||
-        size == I2C_SMBUS_BLOCK_PROC_CALL_PEC))
-   {
-      if (i2c_smbus_check_pec(addr, command, size, partial, data))
-      {
-         return(-1);
-      }
-   }
-   return(res);
-} /* i2c_smbus_xfer */
-
-
-/* Next four are needed by i2c-isa */
-EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
-EXPORT_SYMBOL_GPL(i2c_adapter_driver);
-EXPORT_SYMBOL_GPL(i2c_adapter_class);
-EXPORT_SYMBOL_GPL(i2c_bus_type);
-
-EXPORT_SYMBOL(i2c_add_adapter);
-EXPORT_SYMBOL(i2c_del_adapter);
-EXPORT_SYMBOL(i2c_add_driver);
-EXPORT_SYMBOL(i2c_del_driver);
-EXPORT_SYMBOL(i2c_attach_client);
-EXPORT_SYMBOL(i2c_detach_client);
-EXPORT_SYMBOL(i2c_use_client);
-EXPORT_SYMBOL(i2c_release_client);
-EXPORT_SYMBOL(i2c_clients_command);
-EXPORT_SYMBOL(i2c_check_addr);
-
-EXPORT_SYMBOL(i2c_master_send);
-EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_control);
-EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_get_adapter);
-EXPORT_SYMBOL(i2c_put_adapter);
-EXPORT_SYMBOL(i2c_probe);
-
-EXPORT_SYMBOL(i2c_smbus_xfer);
-EXPORT_SYMBOL(i2c_smbus_write_quick);
-EXPORT_SYMBOL(i2c_smbus_read_byte);
-EXPORT_SYMBOL(i2c_smbus_write_byte);
-EXPORT_SYMBOL(i2c_smbus_read_byte_data);
-EXPORT_SYMBOL(i2c_smbus_write_byte_data);
-EXPORT_SYMBOL(i2c_smbus_read_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
-
-MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
-MODULE_DESCRIPTION("I2C-Bus main module");
-MODULE_LICENSE("GPL");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02100-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02100-i2c-core.c
deleted file mode 100644
index 899b0dd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02100-i2c-core.c
+++ /dev/null
@@ -1,1393 +0,0 @@
-/* i2c-core.c - a device driver for the iic-bus interface		     */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-99 Simon G. Vogl
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
-   All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
-   SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/idr.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-
-
-static LIST_HEAD(adapters);
-static LIST_HEAD(drivers);
-static DECLARE_MUTEX(core_lists);
-static DEFINE_IDR(i2c_adapter_idr);
-
-static int i2c_device_match(struct device *dev, struct device_driver *drv)
-  {
-  return 1;
-  }
-
-static int i2c_bus_suspend(struct device * dev, pm_message_t state)
-  {
-  int rc = 0;
-
-  if (dev->driver && dev->driver->suspend)
-    rc = dev->driver->suspend(dev, state, 0);
-
-  return rc;
-  }
-
-static int i2c_bus_resume(struct device * dev)
-  {
-  int rc = 0;
-
-  if (dev->driver && dev->driver->resume)
-    rc = dev->driver->resume(dev, 0);
-
-  return rc;
-  }
-
-struct bus_type i2c_bus_type = {
-  .name =   "i2c",
-  .match =  i2c_device_match,
-  .suspend =      i2c_bus_suspend,
-  .resume =       i2c_bus_resume,
-  };
-
-static int i2c_device_probe(struct device *dev)
-  {
-  return -ENODEV;
-  }
-
-static int i2c_device_remove(struct device *dev)
-  {
-  return 0;
-  }
-
-void i2c_adapter_dev_release(struct device *dev)
-  {
-  struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-  complete(&adap->dev_released);
-  }
-
-struct device_driver i2c_adapter_driver = {
-  .name = "i2c_adapter",
-  .bus = &i2c_bus_type,
-  .probe = i2c_device_probe,
-  .remove = i2c_device_remove,
-  };
-
-static void i2c_adapter_class_dev_release(struct class_device *dev)
-  {
-  struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-
-  complete(&adap->class_dev_released);
-  }
-
-struct class i2c_adapter_class = {
-  .name =   "i2c-adapter",
-  .release =  &i2c_adapter_class_dev_release,
-  };
-
-static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
-  {
-  struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-
-  return sprintf(buf, "%s\n", adap->name);
-  }
-
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
-static void i2c_client_release(struct device *dev)
-  {
-  struct i2c_client *client = to_i2c_client(dev);
-
-  complete(&client->released);
-  }
-
-static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
-  {
-  struct i2c_client *client = to_i2c_client(dev);
-
-  return sprintf(buf, "%s\n", client->name);
-  }
-
-/*
- * We can't use the DEVICE_ATTR() macro here as we want the same filename for a
- * different type of a device.  So beware if the DEVICE_ATTR() macro ever
- * changes, this definition will also have to change.
- */
-static struct device_attribute dev_attr_client_name = {
-  .attr = { .name = "name", .mode = S_IRUGO, .owner = THIS_MODULE },
-  .show = &show_client_name,
-  };
-
-
-/* ---------------------------------------------------
- * registering functions
- * ---------------------------------------------------
- */
-
-/* -----
- * i2c_add_adapter is called from within the algorithm layer,
- * when a new hw adapter registers. A new device is register to be
- * available for clients.
- */
-int i2c_add_adapter(struct i2c_adapter *adap)
-  {
-  int id, res = 0;
-  struct list_head   *item;
-  struct i2c_driver  *driver;
-
-  down(&core_lists);
-
-  if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
-    {
-    res = -ENOMEM;
-    goto out_unlock;
-    }
-
-  res = idr_get_new(&i2c_adapter_idr, adap, &id);
-
-  if (res < 0)
-    {
-    if (res == -EAGAIN)
-      res = -ENOMEM;
-
-    goto out_unlock;
-    }
-
-  adap->nr =  id & MAX_ID_MASK;
-  init_MUTEX(&adap->bus_lock);
-  init_MUTEX(&adap->clist_lock);
-  list_add_tail(&adap->list, &adapters);
-  INIT_LIST_HEAD(&adap->clients);
-
-  /* Add the adapter to the driver core.
-   * If the parent pointer is not set up,
-   * we add this adapter to the host bus.
-   */
-  if (adap->dev.parent == NULL)
-    adap->dev.parent = &platform_bus;
-
-  sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
-  adap->dev.driver = &i2c_adapter_driver;
-  adap->dev.release = &i2c_adapter_dev_release;
-  device_register(&adap->dev);
-  device_create_file(&adap->dev, &dev_attr_name);
-
-    /* Add this adapter to the i2c_adapter class */
-  memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-  adap->class_dev.dev = &adap->dev;
-  adap->class_dev.class = &i2c_adapter_class;
-  strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-  class_device_register(&adap->class_dev);
-
-  dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
-
-    /* inform drivers of new adapters */
-  list_for_each(item, &drivers) {
-    driver = list_entry(item, struct i2c_driver, list);
-
-    if (driver->flags & I2C_DF_NOTIFY)
-        /* We ignore the return code; if it fails, too bad */
-      driver->attach_adapter(adap);
-    }
-
-out_unlock:
-  up(&core_lists);
-  return res;
-  }
-
-int i2c_del_adapter(struct i2c_adapter *adap)
-  {
-  struct list_head  *item, *_n;
-  struct i2c_adapter *adap_from_list;
-  struct i2c_driver *driver;
-  struct i2c_client *client;
-  int res = 0;
-
-  down(&core_lists);
-
-    /* First make sure that this adapter was ever added */
-  list_for_each_entry(adap_from_list, &adapters, list) {
-    if (adap_from_list == adap)
-      break;
-    }
-
-  if (adap_from_list != adap)
-    {
-    pr_debug("i2c-core: attempting to delete unregistered "
-             "adapter [%s]\n", adap->name);
-    res = -EINVAL;
-    goto out_unlock;
-    }
-
-  list_for_each(item, &drivers) {
-    driver = list_entry(item, struct i2c_driver, list);
-
-    if (driver->detach_adapter)
-      if ((res = driver->detach_adapter(adap)))
-        {
-        dev_err(&adap->dev, "detach_adapter failed "
-                "for driver [%s]\n", driver->name);
-        goto out_unlock;
-        }
-    }
-
-  /* detach any active clients. This must be done first, because
-   * it can fail; in which case we give up. */
-  list_for_each_safe(item, _n, &adap->clients) {
-    client = list_entry(item, struct i2c_client, list);
-
-    /* detaching devices is unconditional of the set notify
-     * flag, as _all_ clients that reside on the adapter
-     * must be deleted, as this would cause invalid states.
-     */
-    if ((res = client->driver->detach_client(client)))
-      {
-      dev_err(&adap->dev, "detach_client failed for client "
-              "[%s] at address 0x%02x\n", client->name,
-              client->addr);
-      goto out_unlock;
-      }
-    }
-
-    /* clean up the sysfs representation */
-  init_completion(&adap->dev_released);
-  init_completion(&adap->class_dev_released);
-  class_device_unregister(&adap->class_dev);
-  device_remove_file(&adap->dev, &dev_attr_name);
-  device_unregister(&adap->dev);
-  list_del(&adap->list);
-
-    /* wait for sysfs to drop all references */
-  wait_for_completion(&adap->dev_released);
-  wait_for_completion(&adap->class_dev_released);
-
-    /* free dynamically allocated bus id */
-  idr_remove(&i2c_adapter_idr, adap->nr);
-
-  dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
-
-out_unlock:
-  up(&core_lists);
-  return res;
-  }
-
-/* -----
- * What follows is the "upwards" interface: commands for talking to clients,
- * which implement the functions to access the physical information of the
- * chips.
- */
-
-int i2c_add_driver(struct i2c_driver *driver)
-  {
-  struct list_head   *item;
-  struct i2c_adapter *adapter;
-  int res = 0;
-
-  down(&core_lists);
-
-    /* add the driver to the list of i2c drivers in the driver core */
-  driver->driver.name = driver->name;
-  driver->driver.bus = &i2c_bus_type;
-  driver->driver.probe = i2c_device_probe;
-  driver->driver.remove = i2c_device_remove;
-
-  res = driver_register(&driver->driver);
-
-  if (res)
-    goto out_unlock;
-
-  list_add_tail(&driver->list, &drivers);
-  pr_debug("i2c-core: driver [%s] registered\n", driver->name);
-
-    /* now look for instances of driver on our adapters */
-  if (driver->flags & I2C_DF_NOTIFY)
-    {
-    list_for_each(item, &adapters) {
-      adapter = list_entry(item, struct i2c_adapter, list);
-      driver->attach_adapter(adapter);
-      }
-    }
-
-out_unlock:
-  up(&core_lists);
-  return res;
-  }
-
-int i2c_del_driver(struct i2c_driver *driver)
-  {
-  struct list_head   *item1, *item2, *_n;
-  struct i2c_client  *client;
-  struct i2c_adapter *adap;
-
-  int res = 0;
-
-  down(&core_lists);
-
-  /* Have a look at each adapter, if clients of this driver are still
-   * attached. If so, detach them to be able to kill the driver
-   * afterwards.
-   *
-   * Removing clients does not depend on the notify flag, else
-   * invalid operation might (will!) result, when using stale client
-   * pointers.
-   */
-  list_for_each(item1, &adapters) {
-    adap = list_entry(item1, struct i2c_adapter, list);
-
-    if (driver->detach_adapter)
-      {
-      if ((res = driver->detach_adapter(adap)))
-        {
-        dev_err(&adap->dev, "detach_adapter failed "
-                "for driver [%s]\n", driver->name);
-        goto out_unlock;
-        }
-      }
-    else
-      {
-      list_for_each_safe(item2, _n, &adap->clients) {
-        client = list_entry(item2, struct i2c_client, list);
-
-        if (client->driver != driver)
-          continue;
-
-        dev_dbg(&adap->dev, "detaching client [%s] "
-                "at 0x%02x\n", client->name,
-                client->addr);
-
-        if ((res = driver->detach_client(client)))
-          {
-          dev_err(&adap->dev, "detach_client "
-                  "failed for client [%s] at "
-                  "0x%02x\n", client->name,
-                  client->addr);
-          goto out_unlock;
-          }
-        }
-      }
-    }
-
-  driver_unregister(&driver->driver);
-  list_del(&driver->list);
-  pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
-
-out_unlock:
-  up(&core_lists);
-  return 0;
-  }
-
-static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
-  {
-  struct list_head   *item;
-  struct i2c_client  *client;
-
-  list_for_each(item, &adapter->clients) {
-    client = list_entry(item, struct i2c_client, list);
-
-    if (client->addr == addr)
-      return -EBUSY;
-    }
-  return 0;
-  }
-
-int i2c_check_addr(struct i2c_adapter *adapter, int addr)
-  {
-  int rval;
-
-  down(&adapter->clist_lock);
-  rval = __i2c_check_addr(adapter, addr);
-  up(&adapter->clist_lock);
-
-  return rval;
-  }
-
-int i2c_attach_client(struct i2c_client *client)
-  {
-  struct i2c_adapter *adapter = client->adapter;
-
-  down(&adapter->clist_lock);
-
-  if (__i2c_check_addr(client->adapter, client->addr))
-    {
-    up(&adapter->clist_lock);
-    return -EBUSY;
-    }
-
-  list_add_tail(&client->list, &adapter->clients);
-  up(&adapter->clist_lock);
-
-  if (adapter->client_register)
-    {
-    if (adapter->client_register(client))
-      {
-      dev_dbg(&adapter->dev, "client_register "
-              "failed for client [%s] at 0x%02x\n",
-              client->name, client->addr);
-      }
-    }
-
-  if (client->flags & I2C_CLIENT_ALLOW_USE)
-    client->usage_count = 0;
-
-  client->dev.parent = &client->adapter->dev;
-  client->dev.driver = &client->driver->driver;
-  client->dev.bus = &i2c_bus_type;
-  client->dev.release = &i2c_client_release;
-
-  snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-           "%d-%04x", i2c_adapter_id(adapter), client->addr);
-  dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-          client->name, client->dev.bus_id);
-  device_register(&client->dev);
-  device_create_file(&client->dev, &dev_attr_client_name);
-
-  return 0;
-  }
-
-int i2c_detach_client(struct i2c_client *client)
-  {
-  struct i2c_adapter *adapter = client->adapter;
-  int res = 0;
-
-  if ((client->flags & I2C_CLIENT_ALLOW_USE)
-      && (client->usage_count > 0))
-    {
-    dev_warn(&client->dev, "Client [%s] still busy, "
-             "can't detach\n", client->name);
-    return -EBUSY;
-    }
-
-  if (adapter->client_unregister)
-    {
-    res = adapter->client_unregister(client);
-
-    if (res)
-      {
-      dev_err(&client->dev,
-              "client_unregister [%s] failed, "
-              "client not detached\n", client->name);
-      goto out;
-      }
-    }
-
-  down(&adapter->clist_lock);
-  list_del(&client->list);
-  init_completion(&client->released);
-  device_remove_file(&client->dev, &dev_attr_client_name);
-  device_unregister(&client->dev);
-  up(&adapter->clist_lock);
-  wait_for_completion(&client->released);
-
-out:
-  return res;
-  }
-
-static int i2c_inc_use_client(struct i2c_client *client)
-  {
-
-  if (!try_module_get(client->driver->owner))
-    return -ENODEV;
-
-  if (!try_module_get(client->adapter->owner))
-    {
-    module_put(client->driver->owner);
-    return -ENODEV;
-    }
-
-  return 0;
-  }
-
-static void i2c_dec_use_client(struct i2c_client *client)
-  {
-  module_put(client->driver->owner);
-  module_put(client->adapter->owner);
-  }
-
-int i2c_use_client(struct i2c_client *client)
-  {
-  int ret;
-
-  ret = i2c_inc_use_client(client);
-
-  if (ret)
-    return ret;
-
-  if (client->flags & I2C_CLIENT_ALLOW_USE)
-    {
-    if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-      client->usage_count++;
-    else if (client->usage_count > 0)
-      goto busy;
-    else
-      client->usage_count++;
-    }
-
-  return 0;
-busy:
-  i2c_dec_use_client(client);
-  return -EBUSY;
-  }
-
-int i2c_release_client(struct i2c_client *client)
-  {
-  if (client->flags & I2C_CLIENT_ALLOW_USE)
-    {
-    if (client->usage_count > 0)
-      client->usage_count--;
-    else
-      {
-      pr_debug("i2c-core: %s used one too many times\n",
-               __FUNCTION__);
-      return -EPERM;
-      }
-    }
-
-  i2c_dec_use_client(client);
-
-  return 0;
-  }
-
-void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
-  {
-  struct list_head  *item;
-  struct i2c_client *client;
-
-  down(&adap->clist_lock);
-  list_for_each(item, &adap->clients) {
-    client = list_entry(item, struct i2c_client, list);
-
-    if (!try_module_get(client->driver->owner))
-      continue;
-
-    if (NULL != client->driver->command)
-      {
-      up(&adap->clist_lock);
-      client->driver->command(client, cmd, arg);
-      down(&adap->clist_lock);
-      }
-
-    module_put(client->driver->owner);
-    }
-  up(&adap->clist_lock);
-  }
-
-static int __init i2c_init(void)
-  {
-  int retval;
-
-  retval = bus_register(&i2c_bus_type);
-
-  if (retval)
-    return retval;
-
-  retval = driver_register(&i2c_adapter_driver);
-
-  if (retval)
-    return retval;
-
-  return class_register(&i2c_adapter_class);
-  }
-
-static void __exit i2c_exit(void)
-  {
-  class_unregister(&i2c_adapter_class);
-  driver_unregister(&i2c_adapter_driver);
-  bus_unregister(&i2c_bus_type);
-  }
-
-subsys_initcall(i2c_init);
-module_exit(i2c_exit);
-
-/* ----------------------------------------------------
- * the functional interface to the i2c busses.
- * ----------------------------------------------------
- */
-
-int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
-  {
-  int ret;
-
-  if (adap->algo->master_xfer)
-    {
-#ifdef DEBUG
-
-    for (ret = 0; ret < num; ret++)
-      {
-      dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
-              "len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
-              'R' : 'W', msgs[ret].addr, msgs[ret].len);
-      }
-
-#endif
-
-    down(&adap->bus_lock);
-    ret = adap->algo->master_xfer(adap, msgs, num);
-    up(&adap->bus_lock);
-
-    return ret;
-    }
-  else
-    {
-    dev_dbg(&adap->dev, "I2C level transfers not supported\n");
-    return -ENOSYS;
-    }
-  }
-
-int i2c_master_send(struct i2c_client *client, const char *buf, int count)
-  {
-  int ret;
-  struct i2c_adapter *adap = client->adapter;
-  struct i2c_msg msg;
-
-  msg.addr = client->addr;
-  msg.flags = client->flags & I2C_M_TEN;
-  msg.len = count;
-  msg.buf = (char *)buf;
-
-  ret = i2c_transfer(adap, &msg, 1);
-
-  /* If everything went ok (i.e. 1 msg transmitted), return #bytes
-     transmitted, else error code. */
-  return (ret == 1) ? count : ret;
-  }
-
-int i2c_master_recv(struct i2c_client *client, char *buf, int count)
-  {
-  struct i2c_adapter *adap = client->adapter;
-  struct i2c_msg msg;
-  int ret;
-
-  msg.addr = client->addr;
-  msg.flags = client->flags & I2C_M_TEN;
-  msg.flags |= I2C_M_RD;
-  msg.len = count;
-  msg.buf = buf;
-
-  ret = i2c_transfer(adap, &msg, 1);
-
-  /* If everything went ok (i.e. 1 msg transmitted), return #bytes
-     transmitted, else error code. */
-  return (ret == 1) ? count : ret;
-  }
-
-int i2c_control(struct i2c_client *client,
-                unsigned int cmd, unsigned long arg)
-  {
-  int ret = 0;
-  struct i2c_adapter *adap = client->adapter;
-
-  dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
-
-  switch (cmd)
-    {
-    case I2C_RETRIES:
-      adap->retries = arg;
-      break;
-
-    case I2C_TIMEOUT:
-      adap->timeout = arg;
-      break;
-
-    default:
-
-      if (adap->algo->algo_control != NULL)
-        ret = adap->algo->algo_control(adap, cmd, arg);
-    }
-
-  return ret;
-  }
-
-/* ----------------------------------------------------
- * the i2c address scanning function
- * Will not work for 10-bit addresses!
- * ----------------------------------------------------
- */
-static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-                             int (*found_proc)(struct i2c_adapter *, int, int))
-  {
-  int err;
-
-    /* Make sure the address is valid */
-  if (addr < 0x03 || addr > 0x77)
-    {
-    dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-             addr);
-    return -EINVAL;
-    }
-
-    /* Skip if already in use */
-  if (i2c_check_addr(adapter, addr))
-    return 0;
-
-    /* Make sure there is something at this address, unless forced */
-  if (kind < 0)
-    {
-    if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                       I2C_SMBUS_QUICK, NULL) < 0)
-      return 0;
-
-      /* prevent 24RF08 corruption */
-    if ((addr & ~0x0f) == 0x50)
-      i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                     I2C_SMBUS_QUICK, NULL);
-    }
-
-    /* Finally call the custom detection function */
-  err = found_proc(adapter, addr, kind);
-
-  /* -ENODEV can be returned if there is a chip at the given address
-     but it isn't supported by this chip driver. We catch it here as
-     this isn't an error. */
-  return (err == -ENODEV) ? 0 : err;
-  }
-
-int i2c_probe(struct i2c_adapter *adapter,
-              struct i2c_client_address_data *address_data,
-              int (*found_proc)(struct i2c_adapter *, int, int))
-  {
-  int i, err;
-  int adap_id = i2c_adapter_id(adapter);
-
-    /* Forget it if we can't probe using SMBUS_QUICK */
-  if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK))
-    return -1;
-
-  /* Force entries are done first, and are not affected by ignore
-     entries */
-  if (address_data->forces)
-    {
-    unsigned short **forces = address_data->forces;
-    int kind;
-
-    for (kind = 0; forces[kind]; kind++)
-      {
-      for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-           i += 2)
-        {
-        if (forces[kind][i] == adap_id
-            || forces[kind][i] == ANY_I2C_BUS)
-          {
-          dev_dbg(&adapter->dev, "found force "
-                  "parameter for adapter %d, "
-                  "addr 0x%02x, kind %d\n",
-                  adap_id, forces[kind][i + 1],
-                  kind);
-          err = i2c_probe_address(adapter,
-                                  forces[kind][i + 1],
-                                  kind, found_proc);
-
-          if (err)
-            return err;
-          }
-        }
-      }
-    }
-
-  /* Probe entries are done second, and are not affected by ignore
-     entries either */
-  for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2)
-    {
-    if (address_data->probe[i] == adap_id
-        || address_data->probe[i] == ANY_I2C_BUS)
-      {
-      dev_dbg(&adapter->dev, "found probe parameter for "
-              "adapter %d, addr 0x%02x\n", adap_id,
-              address_data->probe[i + 1]);
-      err = i2c_probe_address(adapter,
-                              address_data->probe[i + 1],
-                              -1, found_proc);
-
-      if (err)
-        return err;
-      }
-    }
-
-    /* Normal entries are done last, unless shadowed by an ignore entry */
-  for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1)
-    {
-    int j, ignore;
-
-    ignore = 0;
-
-    for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-         j += 2)
-      {
-      if ((address_data->ignore[j] == adap_id ||
-           address_data->ignore[j] == ANY_I2C_BUS)
-          && address_data->ignore[j + 1]
-          == address_data->normal_i2c[i])
-        {
-        dev_dbg(&adapter->dev, "found ignore "
-                "parameter for adapter %d, "
-                "addr 0x%02x\n", adap_id,
-                address_data->ignore[j + 1]);
-        }
-
-      ignore = 1;
-      break;
-      }
-
-    if (ignore)
-      continue;
-
-    dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-            "addr 0x%02x\n", adap_id,
-            address_data->normal_i2c[i]);
-    err = i2c_probe_address(adapter, address_data->normal_i2c[i],
-                            -1, found_proc);
-
-    if (err)
-      return err;
-    }
-
-  return 0;
-  }
-
-struct i2c_adapter* i2c_get_adapter(int id)
-  {
-  struct i2c_adapter *adapter;
-
-  down(&core_lists);
-  adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
-
-  if (adapter && !try_module_get(adapter->owner))
-    adapter = NULL;
-
-  up(&core_lists);
-  return adapter;
-  }
-
-void i2c_put_adapter(struct i2c_adapter *adap)
-  {
-  module_put(adap->owner);
-  }
-
-/* The SMBus parts */
-
-#define POLY    (0x1070U << 3)
-static u8
-crc8(u16 data)
-  {
-  int i;
-
-  for (i = 0; i < 8; i++)
-    {
-    if (data & 0x8000)
-      data = data ^ POLY;
-
-    data = data << 1;
-    }
-
-  return (u8)(data >> 8);
-  }
-
-/* CRC over count bytes in the first array plus the bytes in the rest
-   array if it is non-null. rest[0] is the (length of rest) - 1
-   and is included. */
-static u8 i2c_smbus_partial_pec(u8 crc, int count, u8 *first, u8 *rest)
-  {
-  int i;
-
-  for (i = 0; i < count; i++)
-    crc = crc8((crc ^ first[i]) << 8);
-
-  if (rest != NULL)
-    for (i = 0; i <= rest[0]; i++)
-      crc = crc8((crc ^ rest[i]) << 8);
-
-  return crc;
-  }
-
-static u8 i2c_smbus_pec(int count, u8 *first, u8 *rest)
-  {
-  return i2c_smbus_partial_pec(0, count, first, rest);
-  }
-
-/* Returns new "size" (transaction type)
-   Note that we convert byte to byte_data and byte_data to word_data
-   rather than invent new xxx_PEC transactions. */
-static int i2c_smbus_add_pec(u16 addr, u8 command, int size,
-                             union i2c_smbus_data *data)
-  {
-  u8 buf[3];
-
-  buf[0] = addr << 1;
-  buf[1] = command;
-
-  switch (size)
-    {
-    case I2C_SMBUS_BYTE:
-      data->byte = i2c_smbus_pec(2, buf, NULL);
-      size = I2C_SMBUS_BYTE_DATA;
-      break;
-
-    case I2C_SMBUS_BYTE_DATA:
-      buf[2] = data->byte;
-      data->word = buf[2] ||
-                   (i2c_smbus_pec(3, buf, NULL) << 8);
-      size = I2C_SMBUS_WORD_DATA;
-      break;
-
-    case I2C_SMBUS_WORD_DATA:
-        /* unsupported */
-      break;
-
-    case I2C_SMBUS_BLOCK_DATA:
-      data->block[data->block[0] + 1] =
-        i2c_smbus_pec(2, buf, data->block);
-      size = I2C_SMBUS_BLOCK_DATA_PEC;
-      break;
-    }
-
-  return size;
-  }
-
-static int i2c_smbus_check_pec(u16 addr, u8 command, int size, u8 partial,
-                               union i2c_smbus_data *data)
-  {
-  u8 buf[3], rpec, cpec;
-
-  buf[1] = command;
-
-  switch (size)
-    {
-    case I2C_SMBUS_BYTE_DATA:
-      buf[0] = (addr << 1) | 1;
-      cpec = i2c_smbus_pec(2, buf, NULL);
-      rpec = data->byte;
-      break;
-
-    case I2C_SMBUS_WORD_DATA:
-      buf[0] = (addr << 1) | 1;
-      buf[2] = data->word & 0xff;
-      cpec = i2c_smbus_pec(3, buf, NULL);
-      rpec = data->word >> 8;
-      break;
-
-    case I2C_SMBUS_WORD_DATA_PEC:
-        /* unsupported */
-      cpec = rpec = 0;
-      break;
-
-    case I2C_SMBUS_PROC_CALL_PEC:
-        /* unsupported */
-      cpec = rpec = 0;
-      break;
-
-    case I2C_SMBUS_BLOCK_DATA_PEC:
-      buf[0] = (addr << 1);
-      buf[2] = (addr << 1) | 1;
-      cpec = i2c_smbus_pec(3, buf, data->block);
-      rpec = data->block[data->block[0] + 1];
-      break;
-
-    case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-      buf[0] = (addr << 1) | 1;
-      rpec = i2c_smbus_partial_pec(partial, 1,
-                                   buf, data->block);
-      cpec = data->block[data->block[0] + 1];
-      break;
-
-    default:
-      cpec = rpec = 0;
-      break;
-    }
-
-  if (rpec != cpec)
-    {
-    pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n",
-             rpec, cpec);
-    return -1;
-    }
-
-  return 0;
-  }
-
-s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
-  {
-  return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                        value, 0, I2C_SMBUS_QUICK, NULL);
-  }
-
-s32 i2c_smbus_read_byte(struct i2c_client *client)
-  {
-  union i2c_smbus_data data;
-
-  if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                     I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, &data))
-    return -1;
-  else
-    return 0x0FF & data.byte;
-  }
-
-s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
-  {
-  union i2c_smbus_data data;  /* only for PEC */
-
-  return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                        I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, &data);
-  }
-
-s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
-  {
-  union i2c_smbus_data data;
-
-  if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                     I2C_SMBUS_READ, command, I2C_SMBUS_BYTE_DATA, &data))
-    return -1;
-  else
-    return 0x0FF & data.byte;
-  }
-
-s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
-  {
-  union i2c_smbus_data data;
-
-  data.byte = value;
-  return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                        I2C_SMBUS_WRITE, command,
-                        I2C_SMBUS_BYTE_DATA, &data);
-  }
-
-s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
-  {
-  union i2c_smbus_data data;
-
-  if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                     I2C_SMBUS_READ, command, I2C_SMBUS_WORD_DATA, &data))
-    return -1;
-  else
-    return 0x0FFFF & data.word;
-  }
-
-s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
-  {
-  union i2c_smbus_data data;
-
-  data.word = value;
-  return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                        I2C_SMBUS_WRITE, command,
-                        I2C_SMBUS_WORD_DATA, &data);
-  }
-
-s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
-                               u8 length, u8 *values)
-  {
-  union i2c_smbus_data data;
-  int i;
-
-  if (length > I2C_SMBUS_BLOCK_MAX)
-    length = I2C_SMBUS_BLOCK_MAX;
-
-  for (i = 1; i <= length; i++)
-    data.block[i] = values[i - 1];
-
-  data.block[0] = length;
-  return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                        I2C_SMBUS_WRITE, command,
-                        I2C_SMBUS_BLOCK_DATA, &data);
-  }
-
-/* Returns the number of read bytes */
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
-  {
-  union i2c_smbus_data data;
-  int i;
-
-  if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                     I2C_SMBUS_READ, command,
-                     I2C_SMBUS_I2C_BLOCK_DATA, &data))
-    return -1;
-  else
-    {
-    for (i = 1; i <= data.block[0]; i++)
-      values[i - 1] = data.block[i];
-
-    return data.block[0];
-    }
-  }
-
-/* Simulate a SMBus command using the i2c protocol
-   No checking of parameters is done!  */
-static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
-                                   unsigned short flags,
-                                   char read_write, u8 command, int size,
-                                   union i2c_smbus_data * data)
-  {
-  /* So we need to generate a series of msgs. In the case of writing, we
-     need to use only one message; when reading, we need two. We initialize
-     most things with sane defaults, to keep the code below somewhat
-     simpler. */
-  unsigned char msgbuf0[34];
-  unsigned char msgbuf1[34];
-  int num = read_write == I2C_SMBUS_READ ? 2 : 1;
-  struct i2c_msg msg[2] = { { addr, flags, 1, msgbuf0 },
-                              { addr, flags | I2C_M_RD, 0, msgbuf1 } };
-  int i;
-
-  msgbuf0[0] = command;
-
-  switch (size)
-    {
-    case I2C_SMBUS_QUICK:
-      msg[0].len = 0;
-        /* Special case: The read/write field is used as data */
-      msg[0].flags = flags | (read_write == I2C_SMBUS_READ) ? I2C_M_RD : 0;
-      num = 1;
-      break;
-
-    case I2C_SMBUS_BYTE:
-
-      if (read_write == I2C_SMBUS_READ)
-        {
-          /* Special case: only a read! */
-        msg[0].flags = I2C_M_RD | flags;
-        num = 1;
-        }
-
-      break;
-
-    case I2C_SMBUS_BYTE_DATA:
-
-      if (read_write == I2C_SMBUS_READ)
-        msg[1].len = 1;
-      else
-        {
-        msg[0].len = 2;
-        msgbuf0[1] = data->byte;
-        }
-
-      break;
-
-    case I2C_SMBUS_WORD_DATA:
-
-      if (read_write == I2C_SMBUS_READ)
-        msg[1].len = 2;
-      else
-        {
-        msg[0].len = 3;
-        msgbuf0[1] = data->word & 0xff;
-        msgbuf0[2] = (data->word >> 8) & 0xff;
-        }
-
-      break;
-
-    case I2C_SMBUS_PROC_CALL:
-      num = 2; /* Special case */
-      read_write = I2C_SMBUS_READ;
-      msg[0].len = 3;
-      msg[1].len = 2;
-      msgbuf0[1] = data->word & 0xff;
-      msgbuf0[2] = (data->word >> 8) & 0xff;
-      break;
-
-    case I2C_SMBUS_BLOCK_DATA:
-    case I2C_SMBUS_BLOCK_DATA_PEC:
-
-      if (read_write == I2C_SMBUS_READ)
-        {
-        dev_err(&adapter->dev, "Block read not supported "
-                "under I2C emulation!\n");
-        return -1;
-        }
-      else
-        {
-        msg[0].len = data->block[0] + 2;
-
-        if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2)
-          {
-          dev_err(&adapter->dev, "smbus_access called with "
-                  "invalid block write size (%d)\n",
-                  data->block[0]);
-          return -1;
-          }
-
-        if (size == I2C_SMBUS_BLOCK_DATA_PEC)
-          (msg[0].len)++;
-
-        for (i = 1; i <= msg[0].len; i++)
-          msgbuf0[i] = data->block[i - 1];
-        }
-
-      break;
-
-    case I2C_SMBUS_BLOCK_PROC_CALL:
-    case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-      dev_dbg(&adapter->dev, "Block process call not supported "
-              "under I2C emulation!\n");
-      return -1;
-
-    case I2C_SMBUS_I2C_BLOCK_DATA:
-
-      if (read_write == I2C_SMBUS_READ)
-        msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-      else
-        {
-        msg[0].len = data->block[0] + 1;
-
-        if (msg[0].len > I2C_SMBUS_I2C_BLOCK_MAX + 1)
-          {
-          dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "
-                  "invalid block write size (%d)\n",
-                  data->block[0]);
-          return -1;
-          }
-
-        for (i = 1; i <= data->block[0]; i++)
-          msgbuf0[i] = data->block[i];
-        }
-
-      break;
-
-    default:
-      dev_err(&adapter->dev, "smbus_access called with invalid size (%d)\n",
-              size);
-      return -1;
-    }
-
-  if (i2c_transfer(adapter, msg, num) < 0)
-    return -1;
-
-  if (read_write == I2C_SMBUS_READ)
-    switch (size)
-      {
-      case I2C_SMBUS_BYTE:
-        data->byte = msgbuf0[0];
-        break;
-
-      case I2C_SMBUS_BYTE_DATA:
-        data->byte = msgbuf1[0];
-        break;
-
-      case I2C_SMBUS_WORD_DATA:
-      case I2C_SMBUS_PROC_CALL:
-        data->word = msgbuf1[0] | (msgbuf1[1] << 8);
-        break;
-
-      case I2C_SMBUS_I2C_BLOCK_DATA:
-          /* fixed at 32 for now */
-        data->block[0] = I2C_SMBUS_I2C_BLOCK_MAX;
-
-        for (i = 0; i < I2C_SMBUS_I2C_BLOCK_MAX; i++)
-          data->block[i + 1] = msgbuf1[i];
-
-        break;
-      }
-
-  return 0;
-  }
-
-s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
-                   char read_write, u8 command, int size,
-                   union i2c_smbus_data * data)
-  {
-  s32 res;
-  int swpec = 0;
-  u8 partial = 0;
-
-  flags &= I2C_M_TEN | I2C_CLIENT_PEC;
-
-  if ((flags & I2C_CLIENT_PEC) &&
-      !(i2c_check_functionality(adapter, I2C_FUNC_SMBUS_HWPEC_CALC)))
-    {
-    swpec = 1;
-
-    if (read_write == I2C_SMBUS_READ &&
-        size == I2C_SMBUS_BLOCK_DATA)
-      size = I2C_SMBUS_BLOCK_DATA_PEC;
-    else if (size == I2C_SMBUS_PROC_CALL)
-      size = I2C_SMBUS_PROC_CALL_PEC;
-    else if (size == I2C_SMBUS_BLOCK_PROC_CALL)
-      {
-      i2c_smbus_add_pec(addr, command,
-                        I2C_SMBUS_BLOCK_DATA, data);
-      partial = data->block[data->block[0] + 1];
-      size = I2C_SMBUS_BLOCK_PROC_CALL_PEC;
-      }
-    else if (read_write == I2C_SMBUS_WRITE &&
-             size != I2C_SMBUS_QUICK &&
-             size != I2C_SMBUS_I2C_BLOCK_DATA)
-      size = i2c_smbus_add_pec(addr, command, size, data);
-    }
-
-  if (adapter->algo->smbus_xfer)
-    {
-    down(&adapter->bus_lock);
-    res = adapter->algo->smbus_xfer(adapter, addr, flags, read_write,
-                                    command, size, data);
-    up(&adapter->bus_lock);
-    }
-  else
-    res = i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
-                                  command, size, data);
-
-  if (res >= 0 && swpec &&
-      size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA &&
-      (read_write == I2C_SMBUS_READ || size == I2C_SMBUS_PROC_CALL_PEC ||
-       size == I2C_SMBUS_BLOCK_PROC_CALL_PEC))
-    if (i2c_smbus_check_pec(addr, command, size, partial, data))
-      return -1;
-
-  return res;
-  }
-
-/* Next four are needed by i2c-isa */
-EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
-EXPORT_SYMBOL_GPL(i2c_adapter_driver);
-EXPORT_SYMBOL_GPL(i2c_adapter_class);
-EXPORT_SYMBOL_GPL(i2c_bus_type);
-
-EXPORT_SYMBOL(i2c_add_adapter);
-EXPORT_SYMBOL(i2c_del_adapter);
-EXPORT_SYMBOL(i2c_add_driver);
-EXPORT_SYMBOL(i2c_del_driver);
-EXPORT_SYMBOL(i2c_attach_client);
-EXPORT_SYMBOL(i2c_detach_client);
-EXPORT_SYMBOL(i2c_use_client);
-EXPORT_SYMBOL(i2c_release_client);
-EXPORT_SYMBOL(i2c_clients_command);
-EXPORT_SYMBOL(i2c_check_addr);
-
-EXPORT_SYMBOL(i2c_master_send);
-EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_control);
-EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_get_adapter);
-EXPORT_SYMBOL(i2c_put_adapter);
-EXPORT_SYMBOL(i2c_probe);
-
-EXPORT_SYMBOL(i2c_smbus_xfer);
-EXPORT_SYMBOL(i2c_smbus_write_quick);
-EXPORT_SYMBOL(i2c_smbus_read_byte);
-EXPORT_SYMBOL(i2c_smbus_write_byte);
-EXPORT_SYMBOL(i2c_smbus_read_byte_data);
-EXPORT_SYMBOL(i2c_smbus_write_byte_data);
-EXPORT_SYMBOL(i2c_smbus_read_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
-
-MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
-MODULE_DESCRIPTION("I2C-Bus main module");
-MODULE_LICENSE("GPL");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02101-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02101-comment-indent.c
deleted file mode 100644
index 7c5f0f0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02101-comment-indent.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * This is your typical header comment
- */
-int foo(int bar)
-  {
-  int idx;
-  int res = 0;       // trailing comment
-
-    // that spans two lines
-  for (idx = 1; idx < bar; idx++)
-      /* comment in virtual braces */
-    res += idx;
-
-  res *= idx;         // some comment
-
-  // almost continued, but a NL in between
-
-// col1 comment in level 1
-// second comment
-  return res;
-  }
-
-// col1 comment in level 0
-// and another
-
-void foo()
-  {
-  if (bar)
-    foo();
-  /*else if( bar2 )
-     {
-     foo2();
-     }
-   */else if (bar3)
-    foo3();
-  }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02200-xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02200-xml.c
deleted file mode 100644
index 62bd81d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02200-xml.c
+++ /dev/null
@@ -1,9 +0,0 @@
-void foo(void)
-{
-   const char *a = "<xml>"
-                     "<data Parent=\"%d\" Name=\"%s\">"
-                       "<Child Id=\"%d\"/>"
-                     "</data>"
-                   "</xml>";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02201-align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02201-align-string.c
deleted file mode 100644
index 0b2cf25a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02201-align-string.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// note - set threshold to three
-void foo(void)
-{
-   printf("This is the first line\n"
-          "And this is the second.\n");
-
-   fprintf(stderr, "This is the first line\n"
-                   "And this is the second.\n");
-
-   fprintf(stderr, "Format string: %s", "This is the first line\n"
-                                        "And this is the second.\n");
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02300-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02300-preproc-if.c
deleted file mode 100644
index 8e20a744..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02300-preproc-if.c
+++ /dev/null
@@ -1,36 +0,0 @@
-
-int main()
-{
-   int a;
-
-#ifndef SOMEDEF
-   int b;
-#endif /* SOMEDEF */
-
-   if (a)
-   {
-   }
-#ifndef SOMEDEF
-   else if (b)
-   {
-   }
-#endif /* SOMEDEF */
-
-/* same thing w/o preprocs for reference */
-   if (a)
-   {
-   }
-   else if (b)
-   {
-   }
-
-#ifdef FOO
-   do
-   {
-      Foo();
-   }
-#endif
-   while (Loop--);
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02301-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02301-preproc-if.c
deleted file mode 100644
index 0130e1f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02301-preproc-if.c
+++ /dev/null
@@ -1,36 +0,0 @@
-
-int main()
-{
-    int a;
-
-#ifndef SOMEDEF
-    int b;
-#endif /* SOMEDEF */
-
-    if (a)
-    {
-    }
-#ifndef SOMEDEF
-    else if (b)
-    {
-    }
-#endif /* SOMEDEF */
-
-/* same thing w/o preprocs for reference */
-    if (a)
-    {
-    }
-    else if (b)
-    {
-    }
-
-#ifdef FOO
-    do
-    {
-        Foo();
-    }
-#endif
-    while (Loop--);
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02302-nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02302-nl-cont.c
deleted file mode 100644
index dfbb0c2d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02302-nl-cont.c
+++ /dev/null
@@ -1,23 +0,0 @@
-

-#define FOO(bar) create_a_really_long_identifier name(some_function( \

-                                                          bar1 + bar2), bar3, \

-                                                      bar4);

-

-#define VNV_RECORD_CYCLES(m) do { \

-        uint16_t cyc_out = ((uint16_t )TMR4) - cyc_in; \

-        if (cyc_out < vnv_ticks[m].min) vnv_ticks[m].min = cyc_out; \

-        if (cyc_out > vnv_ticks[m].max) vnv_ticks[m].max = cyc_out; \

-} while (0)

-

-#define multilinemacro do { (x+5); } while (0); \

-    printf("a multilinemacro"); \

-    printf("a multilinemacro2");

-

-int main(int argc, char *argv[])

-{

-    int a, b;

-    a = 1; /* stupid comment \\ */

-    b = 2;

-

-    return(a+b);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02303-nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02303-nl-cont2.c
deleted file mode 100644
index a0129423..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02303-nl-cont2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-

-#define FOO(bar) create_a_really_long_identifier name(some_function( \

-                                                          bar1 + bar2), bar3, \

-                                                      bar4);

-

-#define multilinemacro do { (x+5); } while (0); \

-    printf("a multilinemacro"); \

-    printf("a multilinemacro2");

-

-int main(int argc, char *argv[])

-{

-    int a, b;

-    a = 1; /* stupid comment \

-            * b = 2; */

-

-    return(a+b);

-}

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02310-empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02310-empty-for.c
deleted file mode 100644
index 4bd43b09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02310-empty-for.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void foo(void)
-{
-   for ( ; x < 2; x++)
-   {
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02311-pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02311-pragma.c
deleted file mode 100644
index ec944697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02311-pragma.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#pragma do not change anything in this pragma!
-
-// This next bit should parse as '#', pragma, preproc-body, nl-cont,
-//   preproc-body, nl-cont, preproc-body
-#pragma multi \
-   line       \
-   pragma
-
-#pragma mark -------- Protected Member Functions ----------------
-
-#pragma some comment follows    // comment
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02315-pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02315-pp_ret.c
deleted file mode 100644
index 18a3d5cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02315-pp_ret.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#if 0
-int
-#else
-unsigned
-#endif
-f()
-{
-    return 0;
-}
-
-#ifdef FOO
-#define BAR .
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02320-nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02320-nl_create_one_liner.c
deleted file mode 100644
index 55974c3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02320-nl_create_one_liner.c
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo()
-{
-   if (a) b++;
-   if (a) {
-      b++;
-   }
-   if (a)
-      if (b) c++;
-
-   for (i=0; i<5; i++) bar(i);
-   while (i>0) bar(--i);
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02325-sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02325-sort_include.c
deleted file mode 100644
index 4f2b20bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02325-sort_include.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// should be ddd, eee, fff
-#include "ddd"
-#include "eee"
-#include "fff"
-
-// should be aaa, ccc
-#include "aaa"
-#include "ccc"
-// should be just bbb
-#include "bbb"
-
-// should be a, aa
-#include "a"
-#include "aa"
-
-// should be a, aa
-#include <a>
-#include <aa>
-
-// should be b, a
-#include "b"
-#include <a>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02330-one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02330-one_liners.c
deleted file mode 100644
index 57d8ba44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02330-one_liners.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int baz() { return 0; }
-
-int main()
-{
-	int a, b;
-	int f[2] = { 1, 2 };
-	enum foo { BAR = 15 };
-	if (1) { a++; b++; }
-	while (0) { a++; b++; }
-	do { a++; b++; } while (0);
-	for (;;) { a++; b++; };
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02410-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02410-ifdef-indent.c
deleted file mode 100644
index e71d8cf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02410-ifdef-indent.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifdef foo
- #include <foo1.h>
-#else
- #include <foo2.h>
-#endif
-
-#ifdef foo
-/* Commentary for func1() */
-void func1();
-
-/* Commentary for func2() */
-void func2();
-#endif
-
-int
-show_interrupts(struct seq_file *p, void *v)
-{
-    #ifndef CONFIG_SMP
-    a++;
-    #else
-    for (b = 0; b < 9; b++)
-	if (b & 1)
-	    k++;
-    #endif
-
-    if (v)
-    {
-	bar(v);
-	#if DEBUG == 1
-	printf("yup\n");
-	#endif
-    }
-}
-
-void foo()
-{
-    int i=0;
-    #if DEBUG == 1
-    i--;
-    #endif
-    i++;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02411-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02411-ifdef-indent.c
deleted file mode 100644
index bf39a98c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02411-ifdef-indent.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifdef foo
- #include <foo1.h>
-#else
- #include <foo2.h>
-#endif
-
-#ifdef foo
-/* Commentary for func1() */
-    void func1();
-
-/* Commentary for func2() */
-    void func2();
-#endif
-
-int
-show_interrupts(struct seq_file *p, void *v)
-{
-    #ifndef CONFIG_SMP
-	a++;
-    #else
-	for (b = 0; b < 9; b++)
-	    if (b & 1)
-		k++;
-    #endif
-
-    if (v)
-    {
-	bar(v);
-	#if DEBUG == 1
-	    printf("yup\n");
-	#endif
-    }
-}
-
-void foo()
-{
-    int i=0;
-    #if DEBUG == 1
-	i--;
-    #endif
-    i++;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02412-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02412-ifdef-indent.c
deleted file mode 100644
index 23b4dd37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02412-ifdef-indent.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifdef foo
- #include <foo1.h>
-#else
- #include <foo2.h>
-#endif
-
-#ifdef foo
-/* Commentary for func1() */
-void func1();
-
-/* Commentary for func2() */
-void func2();
-#endif
-
-int
-show_interrupts(struct seq_file *p, void *v)
-{
-#ifndef CONFIG_SMP
-    a++;
-#else
-    for (b = 0; b < 9; b++)
-	if (b & 1)
-	    k++;
-#endif
-
-    if (v)
-    {
-	bar(v);
-    #if DEBUG == 1
-	printf("yup\n");
-    #endif
-    }
-}
-
-void foo()
-{
-    int i=0;
-#if DEBUG == 1
-    i--;
-#endif
-    i++;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02413-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02413-ifdef-indent.c
deleted file mode 100644
index 8738bbf7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02413-ifdef-indent.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifdef foo
- #include <foo1.h>
-#else
- #include <foo2.h>
-#endif
-
-#ifdef foo
-    /* Commentary for func1() */
-    void func1();
-
-    /* Commentary for func2() */
-    void func2();
-#endif
-
-int
-show_interrupts(struct seq_file *p, void *v)
-{
-#ifndef CONFIG_SMP
-	a++;
-#else
-	for (b = 0; b < 9; b++)
-	    if (b & 1)
-		k++;
-#endif
-
-    if (v)
-    {
-	bar(v);
-#if DEBUG == 1
-	    printf("yup\n");
-#endif
-    }
-}
-
-void foo()
-{
-    int i=0;
-#if DEBUG == 1
-	i--;
-#endif
-    i++;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02414-whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02414-whole_file_ifdef.c
deleted file mode 100644
index c767bbf7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02414-whole_file_ifdef.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Header */
-
-
-#ifdef WHOLE_FILE
-
-
-void foo();
-
-
-#endif /* WHOLE_FILE */
-
-
-/* Footer */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02415-endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02415-endif.c
deleted file mode 100644
index c8b99a6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02415-endif.c
+++ /dev/null
@@ -1,29 +0,0 @@
-int do_this

-(

-   int x,

-   int y

-)

-{

-

-   x++;

-   #ifdef ABC

-      #ifdef DEF

-         x += y;

-      #endif

-   #endif

-   a++;

-   #ifdef ABC

-      b++;

-      #ifdef DEF

-         c++;

-         #ifdef HIJ

-            d++;

-         #endif

-         e++;

-      #endif

-      f++;

-   #endif

-   g++;

-

-   return (x)

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02416-cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02416-cmt_nl_end.c
deleted file mode 100644
index 56de21ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02416-cmt_nl_end.c
+++ /dev/null
@@ -1,13 +0,0 @@
-int do_this

-(

-   int x,

-   int y

-)

-{

-   x += y;              // x = x + y

-

-   if(x == 3)

-      x++;      // x plus 1

-

-   return (x)

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02421-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02421-cmt_multi.c
deleted file mode 100644
index 61faac36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02421-cmt_multi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/************************************************

- * This is a multiline comment.

- * The first and last lines are the same length

- ************************************************/

-

-/****************************************************************************

-    A multi-line comment that is broken in two parts.

- *//**

-    Second part

- ****************************************************************************/

-

-/****************************************************************************

-    A multi-line comment that is broken in two parts.

- */         /**

-    Second part

- ****************************************************************************/

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02422-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02422-cmt_multi.c
deleted file mode 100644
index bbdd79cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02422-cmt_multi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/************************************************

-* This is a multiline comment.

-* The first and last lines are the same length

-************************************************/

-

-/****************************************************************************

-    A multi-line comment that is broken in two parts.

-*//**

-    Second part

-****************************************************************************/

-

-/****************************************************************************

-    A multi-line comment that is broken in two parts.

-*/         /**

-    Second part

-****************************************************************************/

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02423-cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02423-cmt_multi_utf8.c
deleted file mode 100644
index 05b01f84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02423-cmt_multi_utf8.c
+++ /dev/null
@@ -1,2 +0,0 @@
-/* This is a multiline comment with a UTF8 character: á
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02431-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02431-cmt_right_align.c
deleted file mode 100644
index 315e5010..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02431-cmt_right_align.c
+++ /dev/null
@@ -1,47 +0,0 @@
-

-int foo1(int bar)

-{

-   if(bar)

-   {

-      if(b)

-      {

-         if(a)

-         {

-            if(r)

-            {

-               return(r);       /* cool */

-            }

-            else /* if (r) */

-            {

-               return(bar);     /* uncool */

-            } /* if (r) */

-         } /* if (a) */

-      } /* if (b) */

-   } /* if (bar) */

-

-   return(-1);

-} /* foo */

-

-int foo2(int bar)

-{

-   if(bar)

-   {

-      if(b)

-      {

-         if(a)

-         {

-            if(r)

-            {

-               return(r);

-            }

-            else

-            {

-               return(bar);

-            } /* if (r) */

-         }    /* if (a) */

-      }       /* if (b) */

-   }          /* if (bar) */

-

-   return(-1);

-}             /* foo */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02432-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02432-cmt_right_align.c
deleted file mode 100644
index eef43777..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02432-cmt_right_align.c
+++ /dev/null
@@ -1,47 +0,0 @@
-

-int foo1(int bar)

-{

-   if(bar)

-   {

-      if(b)

-      {

-         if(a)

-         {

-            if(r)

-            {

-               return(r);       /* cool */

-            }

-            else /* if (r) */

-            {

-               return(bar);     /* uncool */

-            } /* if (r) */

-         } /* if (a) */

-      } /* if (b) */

-   } /* if (bar) */

-

-   return(-1);

-} /* foo */

-

-int foo2(int bar)

-{

-   if(bar)

-   {

-      if(b)

-      {

-         if(a)

-         {

-            if(r)

-            {

-               return(r);

-            }

-            else

-            {

-               return(bar);

-            } /* if (r) */

-         } /* if (a) */

-      } /* if (b) */

-   } /* if (bar) */

-

-   return(-1);

-} /* foo */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02440-string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02440-string_utf8.c
deleted file mode 100644
index a473e1bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02440-string_utf8.c
+++ /dev/null
@@ -1 +0,0 @@
-char* x = "中国語 (�体)";
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02441-utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02441-utf8-identifiers.c
deleted file mode 100644
index 1dc39e9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02441-utf8-identifiers.c
+++ /dev/null
@@ -1,14 +0,0 @@
-void FooUtf8Сhar(void) // C is encoded in UTF-8
-{
-}
-
-struct テスト         // Japanese 'test'
-{
-	void トスト() {
-	}          // Japanese 'toast'
-};
-
-int main() {
-	テスト パン;    // Japanese パン 'bread'
-	パン.トスト();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02451-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02451-nl_return_expr.c
deleted file mode 100644
index bf8621d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02451-nl_return_expr.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-int foo1(void)
-{
-    bar();
-    return(NewClass(1));
-}
-
-int foo2(void)
-{
-    return(NewClass(2));
-}
-
-int foo3(void)
-{
-    bar(none);
-    // comment
-    return(3);
-}
-
-int foo4(void)
-{
-    return(4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02452-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02452-nl_return_expr.c
deleted file mode 100644
index 4dc23adf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02452-nl_return_expr.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-int foo1(void)
-{
-    bar();
-    return NewClass(1);
-}
-
-int foo2(void)
-{
-    return NewClass(2);
-}
-
-int foo3(void)
-{
-    bar(none);
-    // comment
-    return 3;
-}
-
-int foo4(void)
-{
-    return 4;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02453-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02453-nl_return_expr.c
deleted file mode 100644
index c917fb17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02453-nl_return_expr.c
+++ /dev/null
@@ -1,28 +0,0 @@
-
-int foo1(void)
-{
-    bar();
-    return
-        NewClass(1);
-}
-
-int foo2(void)
-{
-    return
-        NewClass(2);
-}
-
-int foo3(void)
-{
-    bar(none);
-    // comment
-    return
-        3;
-}
-
-int foo4(void)
-{
-    return
-        4;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02454-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02454-nl_return_expr.c
deleted file mode 100644
index 2e33d2b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02454-nl_return_expr.c
+++ /dev/null
@@ -1,30 +0,0 @@
-
-int foo1(void)
-{
-    bar();
-
-    return
-        (NewClass(1));
-}
-
-int foo2(void)
-{
-    return
-        (NewClass(2));
-}
-
-int foo3(void)
-{
-    bar(none);
-
-    // comment
-    return
-        (3);
-}
-
-int foo4(void)
-{
-    return
-        (4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02455-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02455-macro-returns.c
deleted file mode 100644
index dba84c56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02455-macro-returns.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#define foo1 return(x + \
-	            y)
-
-#define foo2 return (x + \
-	             y)
-
-#define foo3 return \
-	        (0)
-
-#define foo4 return \
-	        (0)
-
-#define foo5 return /* empty */
-
-#define foo6 return \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02456-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02456-macro-returns.c
deleted file mode 100644
index 7cd29044..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02456-macro-returns.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#define foo1 return x + \
-	       y
-
-#define foo2 return x + \
-	       y
-
-#define foo3 return \
-	        0
-
-#define foo4 return \
-	        0
-
-#define foo5 return /* empty */
-
-#define foo6 return \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02457-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02457-nl_before_return.c
deleted file mode 100644
index a396202f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02457-nl_before_return.c
+++ /dev/null
@@ -1,186 +0,0 @@
-int foo1(int arg)
-{
-	if (arg == 0) return 1;
-	if (arg == 1) /* comment */ return 2;
-	if (arg == 2)
-		/* C-style comment */
-		return 3;
-	if (arg == 3) /* trailing comment */
-		return 4;
-	if (arg == 4) /* trailing comment */
-		/* C-style comment */
-		return 5;
-	if (arg == 5)
-		// C++-style comment
-		return 6;
-	if (arg == 6)
-		// Multi-line
-		// C++-style comment
-		return 7;
-	if (arg == 7) // trailing comment
-		// Multi-line
-		// C++-style comment
-		return 8;
-	if (arg == 8)
-		/*
-		 * Multi-line C-style comment
-		 */
-		return 9;
-	if (arg == 9)
-		/*--------------------*/
-		/* Multi-part comment */
-		/*--------------------*/
-		return 10;
-	if (arg == 10)
-		//-----------------------
-		/*
-		 * Mixed-style comment
-		 */
-		//-----------------------
-		return 11;
-	if (arg == 11)
-		/* comment */ return 12;
-	if (arg == 12)
-
-		// C++-style comment
-		return 13;
-
-	return arg + 1;
-}
-
-int foo2(int arg)
-{
-	if (arg == 0) { return 1; }
-	if (arg == 1) { /* comment */ return 2; }
-	if (arg == 2) {
-		/* C-style comment */
-		return 3;
-	}
-	if (arg == 3) { /* trailing comment */
-		return 4;
-	}
-	if (arg == 4) { /* trailing comment */
-		/* C-style comment */
-		return 5;
-	}
-	if (arg == 5) {
-		// C++-style comment
-		return 6;
-	}
-	if (arg == 6) {
-		// Multi-line
-		// C++-style comment
-		return 7;
-	}
-	if (arg == 7) { // trailing comment
-		// Multi-line
-		// C++-style comment
-		return 8;
-	}
-	if (arg == 8) {
-		/*
-		 * Multi-line C-style comment
-		 */
-		return 9;
-	}
-	if (arg == 9)
-	{
-		/*--------------------*/
-		/* Multi-part comment */
-		/*--------------------*/
-		return 10;
-	}
-	if (arg == 10)
-	{
-		//-----------------------
-		/* Mixed-style comment */
-		//-----------------------
-		return 11;
-	}
-	if (arg == 11)
-	{
-		/* comment */ return 12;
-	}
-	if (arg == 12) {
-
-		/* C-style comment */
-		return 13;
-	}
-
-	return arg + 1;
-}
-
-int foo2(int arg)
-{
-	if (arg == 0) { int a = 1; return a; }
-	if (arg == 1) { int a = 2; /* comment */ return a; }
-	if (arg == 2) {
-		int a = 3;
-
-		/* C-style comment */
-		return a;
-	}
-	if (arg == 3) {
-		int a = 4; /* trailing comment */
-
-		return a;
-	}
-	if (arg == 4) {
-		int a = 5; /* trailing comment */
-
-		/* C-style comment */
-		return a;
-	}
-	if (arg == 5) {
-		int a = 6;
-
-		// C++-style comment
-		return a;
-	}
-	if (arg == 6) {
-		int a = 7;
-
-		// Multi-line
-		// C++-style comment
-		return a;
-	}
-	if (arg == 7) {
-		int a = 8; // trailing comment
-
-		// Multi-line
-		// C++-style comment
-		return a;
-	}
-	if (arg == 8) {
-		int a = 9;
-
-		/*--------------------*/
-		/* Multi-part comment */
-		/*--------------------*/
-		return a;
-	}
-	if (arg == 9) {
-		int a = 10;
-
-		/*---------------------*/
-		// Mixed-style comment
-		/*---------------------*/
-		return a;
-	}
-	if (arg == 11)
-	{
-		int a = 12;
-
-		/* comment */ return a;
-	}
-	if (arg == 12) {
-		int a = 13;
-
-		/*
-		 * Multi-line C-style comment
-		 */
-		return a;
-	}
-
-	return arg + 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02460-freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02460-freebsd.c
deleted file mode 100644
index 804c5ec7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02460-freebsd.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Make the structure name match the typedef. */
-typedef struct bar {
-	int level;
-} BAR;
-typedef int          foo;       /* This is foo. */
-typedef const long   baz;       /* This is baz. */
-
-
-static char *function(int _arg, const char *_arg2, struct foo *_arg3,
-    struct bar *_arg4);
-static void usage(void);
-
-/*
- * All major routines should have a comment briefly describing what
- * they do.  The comment before the "main" routine should describe
- * what the program does.
- */
-int
-main(int argc, char *argv[])
-{
-	char *ep;
-	long num;
-	int  ch;
-
-	while ((ch = getopt(argc, argv, "abNn:")) != -1)
-	{
-		switch (ch)             /* Indent the switch. */
-		{
-		case 'a':               /* Don't indent the case. */
-			aflag = 1;      /* Indent case body one tab. */
-
-		/* FALLTHROUGH */
-		case 'b':
-			bflag = 1;
-			break;
-
-		case 'N':
-			Nflag = 1;
-			break;
-
-		case 'n':
-			num = strtol(optarg, &ep, 10);
-			if ((num <= 0) || (*ep != '\0')) {
-				warnx("illegal number, -n argument -- %s",
-				    optarg);
-				usage();
-			}
-			break;
-
-		case '?':
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	for (p = buf; *p != '\0'; ++p)
-	{
-		/* nothing */
-	}
-	for ( ; ; )
-	{
-		stmt;
-	}
-	for ( ; ; )
-	{
-		zed = a + really + long + statement + that + needs +
-		    two + lines + gets + indented + four + spaces +
-		    on + the + second + and + subsequent + lines;
-	}
-	for ( ; ; )
-	{
-		if (cond) {
-			stmt;
-		}
-	}
-	if (val != NULL) {
-		val = realloc(val, newsize);
-	}
-
-	fcn_call(with, a, really, long, list, of, parameters,
-	    that, spans, two, lines);
-
-	for ( ; cnt < 15; cnt++)
-	{
-		stmt1;
-		stmt2;
-	}
-
-	almod = (chunk_is_single_line_comment(pc) &&
-	    cpd.settings[UO_indent_relative_single_line_comments].b) ?
-	    ALMODE_KEEP_REL : ALMODE_KEEP_ABS;
-
-	/* Indentation is an 8 character tab.  Second level indents are four spaces.
-	 * If you have to wrap a long statement, put the operator at the end of the
-	 * line.
-	 */
-
-	while (cnt < 20 && this_variable_name_is_too_long &&
-	    ep != NULL)
-	{
-		zappy = a + really + long + statement + that + needs +
-		    two + lines + gets + indented + four + spaces +
-		    on + the + second + and + subsequent + lines;
-	}
-
-	// Do not add whitespace at the end of a line, and only use tabs followed by
-	// spaces to form the indentation.  Do not use more spaces than a tab will
-	// produce and do not use spaces in front of tabs.
-	//
-	// Closing and opening braces go on the same line as the else.  Braces that
-	// are not necessary may be left out.
-
-	if (test) {
-		stmt;
-	} else if (bar) {
-		stmt;
-		stmt;
-	} else{
-		stmt;
-	}
-
-	// No spaces after function names.  Commas have a space after them.  No spa-
-	// ces after `(' or `[' or preceding `]' or `)' characters.
-
-	error = function(a1, a2);
-	if (error != 0) {
-		exit(error);
-	}
-
-	// Unary operators do not require spaces, binary operators do.  Do not use
-	// parentheses unless they are required for precedence or unless the state-
-	// ment is confusing without them.  Remember that other people may confuse
-	// easier than you.  Do YOU understand the following?
-
-	a = b->c[0] + ~d == (e || f) || g && h ? i : j >> 1;
-	k = !(l & FLAGS);
-
-
-	// Exits should be 0 on success, or 1 on failure.
-
-	exit(0);           /*
-	                    * Avoid obvious comments such as
-	                    * "Exit 0 on success."
-	                    */
-}
-
-
-static char *
-function(a1, a2, fl, a4)
-int a1, a2;                  /* Declare ints, too, don't default them. */
-
-float fl;                    /* Beware double vs. float prototype differences. */
-int   a4;                    /* List in order declared. */
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02486-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02486-doxy-comment.c
deleted file mode 100644
index e2a6c2c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02486-doxy-comment.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-int             a;                                              // a
-int             a;                                              ///a
-int             a;                                              ///<a
-int             a;                                              // !a
-int             a;                                              // !<a
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02487-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02487-doxy-comment.c
deleted file mode 100644
index 4abad3c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02487-doxy-comment.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-int             a;                                              // a
-int             a;                                              /// a
-int             a;                                              ///< a
-int             a;                                              //! a
-int             a;                                              //!< a
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02501-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02501-custom_types_ssl.c
deleted file mode 100644
index 3e28d2e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02501-custom_types_ssl.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef  HEADER_CONF_H
-#define HEADER_CONF_H
-
-#ifdef  __cplusplus
-extern "C"
-#endif /* ifdef  __cplusplus */
-{
-	typedef struct
-	{
-		char *section;
-		char *name;
-		char *value;
-	} CONF_VALUE;
-
-	DECLARE_STACK_OF(CONF_VALUE);
-	DECLARE_LHASH_OF(CONF_VALUE);
-
-	struct conf_st;
-	struct conf_method_st;
-	typedef struct conf_method_st CONF_METHOD;
-
-	int CONF_set_default_method(CONF_METHOD *meth);
-	void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
-	LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-			long *eline);
-#ifndef OPENSSL_NO_FP_API
-	LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-			long *eline);
-#endif /* ifndef OPENSSL_NO_FP_API */
-	LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline);
-	STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-			const char *section);
-	char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-			const char *name);
-	long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
-			const char *name);
-	void CONF_free(LHASH_OF(CONF_VALUE) *conf);
-	int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
-	int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
-}
-
-
-void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash)
-{
-	if (default_CONF_method == NULL)
-		default_CONF_method = NCONF_default();
-
-	default_CONF_method->init(conf);
-	conf->data = hash;
-}
-
-LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-		long *eline)
-{
-	LHASH_OF(CONF_VALUE) *ltmp;
-	BIO *in = NULL;
-
-#ifdef OPENSSL_SYS_VMS
-	in = BIO_new_file(file, "r");
-#else  /* ifdef OPENSSL_SYS_VMS */
-	in = BIO_new_file(file, "rb");
-#endif /* ifdef OPENSSL_SYS_VMS */
-	if (in == NULL)
-	{
-		CONFerr(CONF_F_CONF_LOAD, ERR_R_SYS_LIB);
-		return NULL;
-	}
-
-	return ltmp;
-}
-
-#ifndef OPENSSL_NO_FP_API
-LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-		long *eline)
-{
-	BIO *btmp;
-	LHASH_OF(CONF_VALUE) *ltmp;
-
-	if (!(btmp = BIO_new_fp(fp, BIO_NOCLOSE)))
-	{
-		CONFerr(CONF_F_CONF_LOAD_FP, ERR_R_BUF_LIB);
-		return NULL;
-	}
-	ltmp = CONF_load_bio(conf, btmp, eline);
-	BIO_free(btmp);
-	return ltmp;
-}
-
-#endif /* ifndef OPENSSL_NO_FP_API */
-
-LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-		long *eline)
-{
-	CONF ctmp;
-	int  ret;
-
-	CONF_set_nconf(&ctmp, conf);
-
-	ret = NCONF_load_bio(&ctmp, bp, eline);
-	if (ret)
-		return ctmp.data;
-
-	return NULL;
-}
-
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-		const char *section)
-{
-	if (conf == NULL)
-	{
-		return NULL;
-	}
-	else
-	{
-		CONF ctmp;
-		CONF_set_nconf(&ctmp, conf);
-		return NCONF_get_section(&ctmp, section);
-	}
-}
-
-char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-		const char *name)
-{
-	if (conf == NULL)
-	{
-		return NCONF_get_string(NULL, group, name);
-	}
-	else
-	{
-		return NCONF_get_string(&ctmp, group, name);
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02502-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02502-custom_types_ssl.c
deleted file mode 100644
index 0df5ddad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02502-custom_types_ssl.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef  HEADER_CONF_H
-#define HEADER_CONF_H
-
-#ifdef  __cplusplus
-extern "C"
-#endif
-{
-
-	typedef struct
-	{
-		char *section;
-		char *name;
-		char *value;
-	} CONF_VALUE;
-
-	DECLARE_STACK_OF( CONF_VALUE );
-	DECLARE_LHASH_OF( CONF_VALUE );
-
-	struct conf_st;
-	struct conf_method_st;
-	typedef struct conf_method_st CONF_METHOD;
-
-	int CONF_set_default_method ( CONF_METHOD *meth );
-	void CONF_set_nconf ( CONF *conf,LHASH_OF(CONF_VALUE) *hash );
-	LHASH_OF(CONF_VALUE) *CONF_load ( LHASH_OF(CONF_VALUE) *conf,const char *file,
-		long *eline );
-#ifndef OPENSSL_NO_FP_API
-	LHASH_OF(CONF_VALUE) *CONF_load_fp ( LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-		long *eline );
-#endif
-	LHASH_OF(CONF_VALUE) *CONF_load_bio ( LHASH_OF(CONF_VALUE) *conf, BIO *bp,long *eline );
-	STACK_OF(CONF_VALUE) *CONF_get_section ( LHASH_OF(CONF_VALUE) *conf,
-		const char *                                               section );
-	char *CONF_get_string ( LHASH_OF(CONF_VALUE) *conf,const char *group,
-		const char *name );
-	long CONF_get_number ( LHASH_OF(CONF_VALUE) *conf,const char *group,
-		const char *name );
-	void CONF_free ( LHASH_OF(CONF_VALUE) *conf );
-	int CONF_dump_fp ( LHASH_OF(CONF_VALUE) *conf, FILE *out );
-	int CONF_dump_bio ( LHASH_OF(CONF_VALUE) *conf, BIO *out );
-
-
-}
-
-
-void CONF_set_nconf ( CONF *conf, LHASH_OF(CONF_VALUE) *hash )
-{
-	if (default_CONF_method == NULL)
-		default_CONF_method = NCONF_default();
-
-	default_CONF_method->init( conf );
-	conf->data = hash;
-}
-
-
-LHASH_OF(CONF_VALUE) *CONF_load ( LHASH_OF(CONF_VALUE) *conf, const char *file,
-	long *eline )
-{
-	LHASH_OF(CONF_VALUE) *ltmp;
-	BIO *in = NULL;
-
-#ifdef OPENSSL_SYS_VMS
-	in = BIO_new_file( file, "r" );
-#else
-	in = BIO_new_file( file, "rb" );
-#endif
-	if (in == NULL)
-	{
-		CONFerr( CONF_F_CONF_LOAD,ERR_R_SYS_LIB );
-		return NULL;
-	}
-
-	return ltmp;
-}
-
-#ifndef OPENSSL_NO_FP_API
-LHASH_OF(CONF_VALUE) *CONF_load_fp ( LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-	long *eline )
-{
-	BIO *btmp;
-	LHASH_OF(CONF_VALUE) *ltmp;
-	if(!(btmp = BIO_new_fp( fp, BIO_NOCLOSE ))) {
-		CONFerr( CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB );
-		return NULL;
-	}
-	ltmp = CONF_load_bio( conf, btmp, eline );
-	BIO_free( btmp );
-	return ltmp;
-}
-#endif
-
-LHASH_OF(CONF_VALUE) *CONF_load_bio ( LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-	long *eline )
-{
-	CONF ctmp;
-	int ret;
-
-	CONF_set_nconf( &ctmp, conf );
-
-	ret = NCONF_load_bio( &ctmp, bp, eline );
-	if (ret)
-		return ctmp.data;
-	return NULL;
-}
-
-STACK_OF(CONF_VALUE) *CONF_get_section ( LHASH_OF(CONF_VALUE) *conf,
-	const char *                                               section )
-{
-	if (conf == NULL)
-	{
-		return NULL;
-	}
-	else
-	{
-		CONF ctmp;
-		CONF_set_nconf( &ctmp, conf );
-		return NCONF_get_section( &ctmp, section );
-	}
-}
-
-char *CONF_get_string ( LHASH_OF(CONF_VALUE) *conf,const char *group,
-	const char *name )
-{
-	if (conf == NULL)
-	{
-		return NCONF_get_string( NULL, group, name );
-	}
-	else
-	{
-		return NCONF_get_string( &ctmp, group, name );
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02503-pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02503-pp_concat_asn1.h
deleted file mode 100644
index babfa69d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02503-pp_concat_asn1.h
+++ /dev/null
@@ -1,298 +0,0 @@
-#ifndef HEADER_ASN1_H
-#define HEADER_ASN1_H
-
-#define V_ASN1_UNIVERSAL                0x00
-#define V_ASN1_APPLICATION              0x40
-#define V_ASN1_CONTEXT_SPECIFIC         0x80
-#define V_ASN1_PRIVATE                  0xc0
-
-#define V_ASN1_CONSTRUCTED              0x20
-#define V_ASN1_PRIMITIVE_TAG            0x1f
-#define V_ASN1_PRIMATIVE_TAG            0x1f
-
-#define V_ASN1_APP_CHOOSE               -2    /* let the recipient choose */
-#define V_ASN1_OTHER                    -3    /* used in ASN1_TYPE */
-#define V_ASN1_ANY                      -4    /* used in ASN1 template code */
-
-#define V_ASN1_NEG                      0x100 /* negative flag */
-
-#define V_ASN1_UNDEF                    -1
-#define V_ASN1_EOC                      0
-#define V_ASN1_BOOLEAN                  1 /**/
-#define V_ASN1_INTEGER                  2
-#define V_ASN1_NEG_INTEGER              (2 | V_ASN1_NEG)
-#define V_ASN1_BIT_STRING               3
-#define V_ASN1_OCTET_STRING             4
-#define V_ASN1_NULL                     5
-#define V_ASN1_OBJECT                   6 /* object identifier */
-#define V_ASN1_OBJECT_DESCRIPTOR        7
-#define V_ASN1_EXTERNAL                 8 /* external / instance of */
-#define V_ASN1_REAL                     9
-#define V_ASN1_ENUMERATED               10
-#define V_ASN1_NEG_ENUMERATED           (10 | V_ASN1_NEG)
-#define V_ASN1_EMBEDDED_PDV             11
-#define V_ASN1_UTF8STRING               12
-#define V_ASN1_SEQUENCE                 16
-#define V_ASN1_SET                      17
-#define V_ASN1_NUMERICSTRING            18 /**/
-#define V_ASN1_PRINTABLESTRING          19
-#define V_ASN1_T61STRING                20
-#define V_ASN1_TELETEXSTRING            20 /* alias */
-#define V_ASN1_VIDEOTEXSTRING           21 /**/
-#define V_ASN1_IA5STRING                22
-#define V_ASN1_UTCTIME                  23
-#define V_ASN1_GENERALIZEDTIME          24 /**/
-#define V_ASN1_GRAPHICSTRING            25 /**/
-#define V_ASN1_ISO64STRING              26 /**/
-#define V_ASN1_VISIBLESTRING            26 /* alias */
-#define V_ASN1_GENERALSTRING            27 /**/
-#define V_ASN1_UNIVERSALSTRING          28 /**/
-#define V_ASN1_BMPSTRING                30
-
-/* For use with d2i_ASN1_type_bytes() */
-#define B_ASN1_NUMERICSTRING    0x0001
-#define B_ASN1_PRINTABLESTRING  0x0002
-#define B_ASN1_T61STRING        0x0004
-#define B_ASN1_TELETEXSTRING    0x0004
-#define B_ASN1_VIDEOTEXSTRING   0x0008
-#define B_ASN1_IA5STRING        0x0010
-#define B_ASN1_GRAPHICSTRING    0x0020
-#define B_ASN1_ISO64STRING      0x0040
-#define B_ASN1_VISIBLESTRING    0x0040
-#define B_ASN1_GENERALSTRING    0x0080
-#define B_ASN1_UNIVERSALSTRING  0x0100
-#define B_ASN1_OCTET_STRING     0x0200
-#define B_ASN1_BIT_STRING       0x0400
-#define B_ASN1_BMPSTRING        0x0800
-#define B_ASN1_UNKNOWN          0x1000
-#define B_ASN1_UTF8STRING       0x2000
-#define B_ASN1_UTCTIME          0x4000
-#define B_ASN1_GENERALIZEDTIME  0x8000
-#define B_ASN1_SEQUENCE         0x10000
-
-/* For use with ASN1_mbstring_copy() */
-#define MBSTRING_FLAG           0x1000
-#define MBSTRING_UTF8           (MBSTRING_FLAG)
-#define MBSTRING_ASC            (MBSTRING_FLAG | 1)
-#define MBSTRING_BMP            (MBSTRING_FLAG | 2)
-#define MBSTRING_UNIV           (MBSTRING_FLAG | 4)
-
-#define SMIME_OLDMIME           0x400
-#define SMIME_CRLFEOL           0x800
-#define SMIME_STREAM            0x1000
-
-struct X509_algor_st;
-DECLARE_STACK_OF(X509_ALGOR);
-
-#define DECLARE_ASN1_SET_OF(type)   /* filled in by mkstack.pl */
-#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */
-
-/* We MUST make sure that, except for constness, asn1_ctx_st and
- * asn1_const_ctx are exactly the same.  Fortunately, as soon as
- * the old ASN1 parsing macros are gone, we can throw this away
- * as well... */
-typedef struct asn1_ctx_st
-{
-	unsigned char *p;    /* work char pointer */
-	int    eos;          /* end of sequence read for indefinite encoding */
-	int    error;        /* error code to use when returning an error */
-	int    inf;          /* constructed if 0x20, indefinite is 0x21 */
-	int    tag;          /* tag from last 'get object' */
-	int    xclass;       /* class from last 'get object' */
-	size_t slen;         /* length of last 'get object' */
-	unsigned char * max; /* largest value of p allowed */
-	unsigned char * q;   /* temporary variable */
-	unsigned char **pp;  /* variable */
-	int line;            /* used in error processing */
-} ASN1_CTX;
-
-typedef struct asn1_const_ctx_st
-{
-	const unsigned char *p;    /* work char pointer */
-	int    eos;                /* end of sequence read for indefinite encoding */
-	int    error;              /* error code to use when returning an error */
-	int    inf;                /* constructed if 0x20, indefinite is 0x21 */
-	int    tag;                /* tag from last 'get object' */
-	int    xclass;             /* class from last 'get object' */
-	size_t slen;               /* length of last 'get object' */
-	const unsigned char * max; /* largest value of p allowed */
-	const unsigned char * q;   /* temporary variable */
-	const unsigned char **pp;  /* variable */
-	int line;                  /* used in error processing */
-} ASN1_const_CTX;
-
-/* These are used internally in the ASN1_OBJECT to keep track of
- * whether the names and data need to be free()ed */
-#define ASN1_OBJECT_FLAG_DYNAMIC         0x01 /* internal use */
-#define ASN1_OBJECT_FLAG_CRITICAL        0x02 /* critical x509v3 object id */
-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04 /* internal use */
-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08 /* internal use */
-typedef struct asn1_object_st
-{
-	const char *sn, *ln;
-	int nid;
-	size_t      length;
-	const unsigned char *data;          /* data remains const after init */
-	int flags;                          /* Should we free this one */
-} ASN1_OBJECT;
-
-#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
-/* This indicates that the ASN1_STRING is not a real value but just a place
- * holder for the location where indefinite length constructed data should
- * be inserted in the memory buffer
- */
-#define ASN1_STRING_FLAG_NDEF 0x010
-
-/* This flag is used by the CMS code to indicate that a string is not
- * complete and is a place holder for content when it had all been
- * accessed. The flag will be reset when content has been written to it.
- */
-
-#define ASN1_STRING_FLAG_CONT 0x020
-
-/* This is the base type that holds just about everything :-) */
-typedef struct asn1_string_st
-{
-	size_t length;
-	int type;
-	unsigned char *data;
-
-	/* The value of the following field depends on the type being
-	 * held.  It is mostly being used for BIT_STRING so if the
-	 * input data has a non-zero 'unused bits' value, it will be
-	 * handled correctly */
-	long flags;
-} ASN1_STRING;
-
-/* ASN1_ENCODING structure: this is used to save the received
- * encoding of an ASN1 type. This is useful to get round
- * problems with invalid encodings which can break signatures.
- */
-
-typedef struct ASN1_ENCODING_st
-{
-	unsigned char *enc; /* DER encoding */
-	size_t len;         /* Length of encoding */
-	int    modified;    /* set to 1 if 'enc' is invalid */
-} ASN1_ENCODING;
-
-/* Used with ASN1 LONG type: if a long is set to this it is omitted */
-#define ASN1_LONG_UNDEF 0x7fffffffL
-
-#define STABLE_FLAGS_MALLOC     0x01
-#define STABLE_NO_MASK          0x02
-#define DIRSTRING_TYPE  \
-	(B_ASN1_PRINTABLESTRING | B_ASN1_T61STRING | B_ASN1_BMPSTRING | B_ASN1_UTF8STRING)
-#define PKCS9STRING_TYPE (DIRSTRING_TYPE | B_ASN1_IA5STRING)
-
-/* Declarations for template structures: for full definitions
- * see asn1t.h
- */
-typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
-typedef struct ASN1_ITEM_st ASN1_ITEM;
-typedef struct ASN1_TLC_st ASN1_TLC;
-/* This is just an opaque pointer */
-typedef struct ASN1_VALUE_st ASN1_VALUE;
-
-/* Declare ASN1 functions: the implement macro in in asn1t.h */
-
-#define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
-
-#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)
-
-#define DECLARE_ASN1_FUNCTIONS_name(type, name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name); \
-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)
-
-#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name); \
-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
-
-#define DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
-	type *d2i_##name(type **a, const unsigned char **in, size_t len); \
-	int i2d_##name(const type *a, unsigned char **out); \
-	DECLARE_ASN1_ITEM(itname)
-
-#define DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
-	type *d2i_##name(type **a, const unsigned char **in, size_t len); \
-	int i2d_##name(const type *a, unsigned char **out); \
-	DECLARE_ASN1_ITEM(name)
-
-#define DECLARE_ASN1_NDEF_FUNCTION(name) \
-	int i2d_##name##_NDEF(const name * a, unsigned char **out)
-
-#define DECLARE_ASN1_FUNCTIONS_const(name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS(name); \
-	DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)
-
-#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-	type *name##_new(void); \
-	void name##_free(type *a)
-
-#define DECLARE_ASN1_PRINT_FUNCTION(stname) \
-	DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)
-
-#define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
-	int fname##_print_ctx(BIO *out, const stname *x, int indent, \
-		const ASN1_PCTX * pctx)
-
-
-/*
- * WARNING WARNING WARNING
- *
- * uncrustify still introduces whitespace in here at some spots, but then
- * one might ask how crazy we want to go regarding ## encumbered parsing?
- * There's always the copout of INDENT-OFF markers for files like these,
- * once you've got them 95% right through uncrustify and that extra 5%
- * by hand ;-)
- */
-#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type (type **, const unsigned char **, size_t)
-#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type (type *, unsigned char **)
-#define TYPEDEF_I2D_OF_CONST(type) typedef int i2d_of_const_##type (const type *, unsigned char **)   /* [i_a] */
-#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type); TYPEDEF_I2D_OF_CONST(type) /* [i_a] */
-
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#define ASN1_ITEM_ref(iptr) (&(iptr##_it))
-
-#define ASN1_ITEM_rptr(ref) (&(ref##_it))
-
-#define DECLARE_ASN1_ITEM(name) \
-	extern const ASN1_ITEM name##_it;
-
-
-#define ASN1_STRFLGS_RFC2253 \
-	(ASN1_STRFLGS_ESC_2253 | \
-	 ASN1_STRFLGS_ESC_CTRL | \
-	 ASN1_STRFLGS_ESC_MSB | \
-	 ASN1_STRFLGS_UTF8_CONVERT | \
-	 ASN1_STRFLGS_DUMP_UNKNOWN | \
-	 ASN1_STRFLGS_DUMP_DER)
-
-DECLARE_STACK_OF(ASN1_INTEGER);
-DECLARE_ASN1_SET_OF(ASN1_INTEGER);
-
-DECLARE_STACK_OF(ASN1_GENERALSTRING);
-
-typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY);
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY);
-
-
-#define B_ASN1_DIRECTORYSTRING \
-	B_ASN1_PRINTABLESTRING | \
-	B_ASN1_TELETEXSTRING | \
-	B_ASN1_BMPSTRING | \
-	B_ASN1_UNIVERSALSTRING | \
-	B_ASN1_UTF8STRING
-
-#define B_ASN1_DISPLAYTEXT \
-	B_ASN1_IA5STRING | \
-	B_ASN1_VISIBLESTRING | \
-	B_ASN1_BMPSTRING | \
-	B_ASN1_UTF8STRING
-
-#endif // ifndef HEADER_ASN1_H
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02504-align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02504-align_keep_extra.c
deleted file mode 100644
index 985f428c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02504-align_keep_extra.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void f()
-{
-	int    x     = 3;
-	int    b     = 4;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02510-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02510-asm.c
deleted file mode 100644
index 6609bf9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02510-asm.c
+++ /dev/null
@@ -1,9 +0,0 @@
-void foo(void)
-{
-   asm __volatile__ (
-      "subl %2,%0\n\t"
-      "sbbl %3,%1"
-      : "=a" (l), "=d" (h)
-      : "g" (sl), "g" (sh),
-        "0" (l), "1" (h));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/07630-indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/07630-indent-vbrace.c
deleted file mode 100644
index a1344348..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/07630-indent-vbrace.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-void x( void )
-{
- if ( a>b )
-        b = a;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/08399-gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/08399-gh399.c
deleted file mode 100644
index 780234ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/08399-gh399.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-void foo()
-{
-   for (i = 0; i * i < n; i++)
-   {
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09588-sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09588-sf588.c
deleted file mode 100644
index d1c5f1cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09588-sf588.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define APPEND_TO_STREAM(VAR0) << #VAR0
-#define APPEND_TO_STREAM(VAR0, VAR1) << #VAR0 << ", " << #VAR1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09594-sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09594-sf594.c
deleted file mode 100644
index 94a1973c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09594-sf594.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void foo()
-{
-   if (x < d >> 1)
-   {
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09601-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09601-sp_after_sparen.c
deleted file mode 100644
index 93cbfea2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09601-sp_after_sparen.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// test for bug # 637
-void foo(void)
-{
-        while (1) ;
-        while (1) ;
-        while (1) ;
-        while (1) ;
-        while (1) ;
-        if (n) {
-                while (1) ;
-                while (1) ;
-                while (1) ;
-                while (1) ;
-                while (1) ;
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09602-bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09602-bug_671.c
deleted file mode 100644
index a9d54ee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09602-bug_671.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#define FOO_MAX 10
-
-bool foo[ FOO_MAX ];
-
-void
-foo_bar( int  a,
-         int* b,
-         bool foo[ FOO_MAX ] );
-
-void
-A()
-{
-    int  a;
-    int* b;
-    foo_bar( a, b, foo );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09603-indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09603-indent_ternary-1.c
deleted file mode 100644
index f9200886..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09603-indent_ternary-1.c
+++ /dev/null
@@ -1,34 +0,0 @@
-void foo(void)
-{
-	int a = x ? y :
-	            z,
-	    b = x ? (y) :
-	            (z),
-	    c = x ? *y :
-	            *z,
-	    d = x ? &y :
-	            &z;
-
-
-	if (x ? y :
-	        z)
-	{
-		baz;
-	}
-	if (x ? (y) :
-	        (z))
-	{
-		baz;
-	}
-	if (x ? *y :
-	        *z)
-	{
-		baz;
-	}
-	if (x ? &y :
-	        &z)
-	{
-		baz;
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09604-indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09604-indent_ternary-2.c
deleted file mode 100644
index e6d3576c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09604-indent_ternary-2.c
+++ /dev/null
@@ -1,34 +0,0 @@
-void foo(void)
-{
-	int a = x ? y
-	          : z,
-	    b = x ? (y)
-	          : (z),
-	    c = x ? *y
-	          : *z,
-	    d = x ? &y
-	          : &z;
-
-
-	if (x ? y
-	      : z)
-	{
-		baz;
-	}
-	if (x ? (y)
-	      : (z))
-	{
-		baz;
-	}
-	if (x ? *y
-	      : *z)
-	{
-		baz;
-	}
-	if (x ? &y
-	      : &z)
-	{
-		baz;
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09605-negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09605-negative_value.c
deleted file mode 100644
index 6399fbef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09605-negative_value.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-int main(void) {
-	int i = -1;
-	int j = 30 * -1;
-
-	int frames = 127;
-	frames = ((frames + 15) & -16);
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09606-extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09606-extern.c
deleted file mode 100644
index d43131fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09606-extern.c
+++ /dev/null
@@ -1,4 +0,0 @@
-extern "C" int *i;
-extern "C" {  int *i; }
-extern "C" FooString *i;
-extern "C" {  FooString *i; }
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09607-attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09607-attribute.c
deleted file mode 100644
index 19e3a057..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09607-attribute.c
+++ /dev/null
@@ -1,4 +0,0 @@
-__attribute__((visibility("default"))) int *i;
-__attribute__((visibility("default"))) FooString *i;
-
-#define DEFINE_NOTIFICATION(name) extern "C" __attribute__((visibility ("default"))) FooString *const name = #name;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09608-func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09608-func_call_user2.c
deleted file mode 100644
index ee4e24d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09608-func_call_user2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-#define CMD_CHECK(expr) do { { expr; } CMDAssert(); } while (0)
-#define INTERNAL(expr)  do { internalUse = 1; { expr; } internalUse = 0; } while (0)
-
-int func(n) {
-    CMD_CHECK( fflush(stdout); );
-    CMD_CHECK( fflush(stdout) );
-    CMD_CHECK( fflush(stdout) );
-    CMD_CHECK( fflush(stdout) );
-    CMD_CHECK( fflush(stdout) );
-    CMD_CHECK( fflush(stdout); );
-    CMD_CHECK( fflush(stdout); );
-    CMD_CHECK( INTERNAL( fflush(stdout) ) );
-    CMD_CHECK( INTERNAL( fflush(stdout) ); );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09609-Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09609-Issue_2279.c
deleted file mode 100644
index 88c0ae84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09609-Issue_2279.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/*| AG_DECLARE() |*/
-/* *INDENT-OFF* */
-static int x;
-/* *INDENT-ON* */
-/*| END |*/
-
-static FILE     *ramfp    = NULL;
-static FILE     *dbgfp    = NULL;
-static xxxXXXXX *pLockXXX = NULL;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09610-bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09610-bug_i_876.c
deleted file mode 100644
index e1afece6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09610-bug_i_876.c
+++ /dev/null
@@ -1 +0,0 @@
-#define	A 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09611-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09611-bug_i_222.c
deleted file mode 100644
index 4f0ded31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09611-bug_i_222.c
+++ /dev/null
@@ -1,6 +0,0 @@
-whatever *find_node_for_address(whatever2 *foo,
-                                thingy *bar,
-                                whatever3 *(func_ptr)(
-                                    whatever4 *foo2,
-                                    thingy2 *bar2));
-//3456789=123456789=123456789=123456789=123456789=12
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09612-bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09612-bug_1041.c
deleted file mode 100644
index 7c07615b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09612-bug_1041.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void (*g_func_table[32])(void) = {
-	[0 ... 31] = func_dummy,
-	[0] = func_0,
-	[1] = func_1,
-	[2] = func_2,
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09613-i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09613-i1413.c
deleted file mode 100644
index 4287ca86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09613-i1413.c
+++ /dev/null
@@ -1 +0,0 @@
-#
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09614-string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09614-string_prefixes.c
deleted file mode 100644
index e901c9ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09614-string_prefixes.c
+++ /dev/null
@@ -1,23 +0,0 @@
-void foo()
-{
-	BSTR test = L"SID";
-	CHAR s[]  = "This is a \"test\"";
-	CHAR ch   = 'a';
-}
-
-/* The 'u8', 'u', and 'U' prefixes */
-const char     *s1 = u8"I'm a UTF-8 string.";
-const char16_t *s2 = u"This is a UTF-16 string.";
-const char32_t *s3 = U"This is a UTF-32 string.";
-
-const char c1 = u8'1';
-const char16_t c2 = u'2';
-const char32_t c3 = U'4';
-const wchar_t c4 = L'w';
-const char16_t u = u'\u007f';
-
-OutputType some_variable = "1234"_Suffix;      //Calls the const char * version
-OutputType some_variable = u8"1234"_Suffix;    //Calls the const char * version
-OutputType some_variable = L"1234"_Suffix;     //Calls the const wchar_t * version
-OutputType some_variable = u"1234"_Suffix;     //Calls the const char16_t * version
-OutputType some_variable = U"1234"_Suffix;     //Calls the const char32_t * version
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09615-i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09615-i1564.c
deleted file mode 100644
index 2b37b25c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09615-i1564.c
+++ /dev/null
@@ -1,13 +0,0 @@
-void f(){
-	return f(p0
-	         ,p1);
-}
-
-typedef enum
-{
-	xxx = 0x00,  /* comment */
-	yyy = 0x01,  /* comment */
-	zzz = 0x02,  /* comment */
-	ttt = 0x03,  /* comment */
-	rrr = 0x04   /* comment */
-}some_label;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09616-enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09616-enum_comma_ifdef.c
deleted file mode 100644
index 95637aae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09616-enum_comma_ifdef.c
+++ /dev/null
@@ -1,7 +0,0 @@
-enum A {
-	a,
-	b,
-#ifdef __clang__
-	c,
-#endif
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09617-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09617-Issue_2360.c
deleted file mode 100644
index 0489b0f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09617-Issue_2360.c
+++ /dev/null
@@ -1,44 +0,0 @@
-int short_function();
-int some_very_very_very_very_very_very_very_very_long_function();
-int main() {
-	// short condition, no existing newlines
-	if (short_function()) {}
-
-	// short condition, existing newlines
-	if (
-		short_function()
-		) {}
-
-	// long condition, no newlines
-	if (
-		some_very_very_very_very_very_very_very_very_long_function() &&
-		some_very_very_very_very_very_very_very_very_long_function()
-		) {}
-
-	// long condition, newlines
-	else if (
-		some_very_very_very_very_very_very_very_very_long_function() &&
-		some_very_very_very_very_very_very_very_very_long_function()
-		) {}
-
-	// switch condition
-	switch (
-		some_very_very_very_very_very_very_very_very_long_function() &&
-		some_very_very_very_very_very_very_very_very_long_function()
-		) {
-	case default: break;
-	}
-
-	// while condition, line comments
-	while (
-		// comment 1
-		short_function()
-		// comment 2
-		) {}
-
-	// for condition, inline comments
-	for (
-		/* a */ int i=0; some_very_very_very_very_very_very_very_very_long_function()
-		&& some_very_very_very_very_very_very_very_very_long_function() && i < 10; i++ // trailing comment
-		) {}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09618-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09618-Issue_2360.c
deleted file mode 100644
index 898c64e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09618-Issue_2360.c
+++ /dev/null
@@ -1,38 +0,0 @@
-int short_function();
-int some_very_very_very_very_very_very_very_very_long_function();
-int main() {
-	// short condition, no existing newlines
-	if (short_function()
-	    ) {}
-
-	// short condition, existing newlines
-	if (
-		short_function()
-		) {}
-
-	// long condition, no newlines
-	if (some_very_very_very_very_very_very_very_very_long_function() &&
-	    some_very_very_very_very_very_very_very_very_long_function()) {}
-
-	// long condition, newlines
-	else if (some_very_very_very_very_very_very_very_very_long_function() &&
-	         some_very_very_very_very_very_very_very_very_long_function()) {}
-
-	// switch condition
-	switch (some_very_very_very_very_very_very_very_very_long_function() &&
-	        some_very_very_very_very_very_very_very_very_long_function()) {
-	case default: break;
-	}
-
-	// while condition, line comments
-	while (
-		// comment 1
-		short_function()
-		// comment 2
-		) {}
-
-	// for condition, inline comments
-	for ( /* a */ int i=0; some_very_very_very_very_very_very_very_very_long_function()
-	      && some_very_very_very_very_very_very_very_very_long_function() && i < 10; i++ // trailing comment
-	      ) {}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09619-Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09619-Issue_2411.c
deleted file mode 100644
index 40244488..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09619-Issue_2411.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo() {
-	/*
-		hello world
-	*/
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09620-Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09620-Issue_2640.c
deleted file mode 100644
index ba25bcbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09620-Issue_2640.c
+++ /dev/null
@@ -1,12 +0,0 @@
-struct Struct
-{
-	void test1(int* x)
-	{
-		*x = 1;
-	}
-};
-
-void test2(int* x)
-{
-	*x = 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09621-pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09621-pp-before-func-def.c
deleted file mode 100644
index 948ce135..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09621-pp-before-func-def.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#define m_new(type, num) ((type *)(m_malloc(sizeof(type) * (num))))
-void *m_malloc(size_t num_bytes);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10003-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10003-bug_i_222.c
deleted file mode 100644
index 4f0ded31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10003-bug_i_222.c
+++ /dev/null
@@ -1,6 +0,0 @@
-whatever *find_node_for_address(whatever2 *foo,
-                                thingy *bar,
-                                whatever3 *(func_ptr)(
-                                    whatever4 *foo2,
-                                    thingy2 *bar2));
-//3456789=123456789=123456789=123456789=123456789=12
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10004-pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10004-pragma_asm.c
deleted file mode 100644
index 0e6b48d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10004-pragma_asm.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-   int a         = 1;
-   int very_long = 2;
-
-   printf("Hello, World!\n");
-   printf("a is %d and very_long is %d\n", a, very_long);
-   return(0);
-}
-
-#pragma asm
-    XREF     _my_var
-
-    PUSH     #LOW(my_func)
-    PUSH     #HIGH(my_func)
-
-#pragma dummyendasm
-
-    PUSH     _my_var+2
-    PUSH     _my_var+1
-    PUSH     _my_var+0
-    RETF
-    App_CallEnd:
-#pragma endasm
-
-int main2(int argc, char *argv[])
-{
-   int a         = 1;
-   int very_long = 2;
-
-   printf("Hello, World!\n");
-   printf("a is %d and very_long is %d\n", a, very_long);
-   return(0);
-}
-
-#pragma asm
-    XREF     _my_var
-
-    PUSH     #LOW(my_func)
-    PUSH     #HIGH(my_func)
-
-#pragma dummyendasm
-
-    PUSH     _my_var+2
-    PUSH     _my_var+1
-    PUSH     _my_var+0
-    RETF
-    App_CallEnd:
-#pragma endasm
-
-int main3(int argc, char *argv[])
-{
-   int a         = 1;
-   int very_long = 2;
-
-   printf("Hello, World!\n");
-   printf("a is %d and very_long is %d\n", a, very_long);
-   return(0);
-}
-
-#pragma asm
-    XREF     _my_var
-
-    PUSH     #LOW(my_func)
-    PUSH     #HIGH(my_func)
-
-#pragma dummyendasm
-
-    PUSH     _my_var+2
-    PUSH     _my_var+1
-    PUSH     _my_var+0
-    RETF
-    App_CallEnd:
-#pragma endasm
-
-int main3(int argc, char *argv[])
-{
-   int a         = 1;
-   int very_long = 2;
-
-   printf("Hello, World!\n");
-   printf("a is %d and very_long is %d\n", a, very_long);
-   return(0);
-}
-
-#asm
-    sll     a           ; 3
-    jrc     sub_1f      ; 3 subtract $1f if A.x has a degree 8
-    ret
-sub_1f:
-    xor     a,#$1f      ; 2
-#endasm
-
-int main3(int argc, char *argv[])
-{
-   int a         = 1;
-   int very_long = 2;
-
-   printf("Hello, World!\n");
-   printf("a is %d and very_long is %d\n", a, very_long);
-   return(0);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10005-i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10005-i1270.c
deleted file mode 100644
index 4831a47a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10005-i1270.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifdef asm
-#endif
-/* comment should stay */
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10006-bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10006-bug_2331.c
deleted file mode 100644
index 67088d94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10006-bug_2331.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#define SET_STACK(stack)            \
-	do {                            \
-		__asm__ __volatile__ (      \
-			"mov S, %[oper]"        \
-			:                       \
-			: [oper] "r" (stack)    \
-			: "S"                   \
-			);                      \
-	} while (0)
-
-int somearray[10];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10007-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10007-indent-macro-brace.c
deleted file mode 100644
index 192a399f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10007-indent-macro-brace.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#define X do { \
-		a; \
-		b; \
-} while (0)
-
-#define X \
-	y; \
-	z
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10008-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10008-indent-macro-brace.c
deleted file mode 100644
index a54cd504..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10008-indent-macro-brace.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#define X do { \
-	a; \
-	b; \
-} while (0)
-
-#define X \
-	y; \
-	z
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10009-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10009-return-compound-literal.c
deleted file mode 100644
index fad9a3f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10009-return-compound-literal.c
+++ /dev/null
@@ -1,5 +0,0 @@
-struct f z(void) {
-	return (struct f){
-		       .z = 1,
-	};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10010-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10010-return-compound-literal.c
deleted file mode 100644
index da33e2fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10010-return-compound-literal.c
+++ /dev/null
@@ -1,5 +0,0 @@
-struct f z(void) {
-	return (struct f){
-	        .z = 1,
-	};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10011-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10011-return-compound-literal.c
deleted file mode 100644
index fad9a3f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10011-return-compound-literal.c
+++ /dev/null
@@ -1,5 +0,0 @@
-struct f z(void) {
-	return (struct f){
-		       .z = 1,
-	};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10012-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10012-sparen-indent.c
deleted file mode 100644
index d9ddbe06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10012-sparen-indent.c
+++ /dev/null
@@ -1,19 +0,0 @@
-void f(void) {
-
-	if (a
-	                && b) {
-		h();
-	}
-
-	for (a = b;
-	                c;
-	                d++) {
-		h();
-	}
-
-	while (z
-	                && w) {
-		h();
-	}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10013-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10013-sparen-indent.c
deleted file mode 100644
index b09a3102..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10013-sparen-indent.c
+++ /dev/null
@@ -1,19 +0,0 @@
-void f(void) {
-
-	if (a
-	    && b) {
-		h();
-	}
-
-	for (a = b;
-	     c;
-	     d++) {
-		h();
-	}
-
-	while (z
-	       && w) {
-		h();
-	}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10014-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10014-sparen-indent.c
deleted file mode 100644
index bf0ba8cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10014-sparen-indent.c
+++ /dev/null
@@ -1,19 +0,0 @@
-void f(void) {
-
-	if (a
-	        && b) {
-		h();
-	}
-
-	for (a = b;
-	        c;
-	        d++) {
-		h();
-	}
-
-	while (z
-	        && w) {
-		h();
-	}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10015-Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10015-Issue_2845.h
deleted file mode 100644
index 9f34b1dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10015-Issue_2845.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef   __PACKED_STRUCT
-  #define __PACKED_STRUCT                        __packed struct
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/0044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/0044-i2116.cpp
deleted file mode 100644
index af664cd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/0044-i2116.cpp
+++ /dev/null
@@ -1 +0,0 @@
-void f(){}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02102-indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02102-indent-c.cpp
deleted file mode 100644
index 70648397..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02102-indent-c.cpp
+++ /dev/null
@@ -1,1024 +0,0 @@
-/**
- * @file indent.cpp
- * Does all the indenting stuff.
- *
- * $Id: indent.cpp 548 2006-10-21 02:31:55Z bengardner $
- */
-#include "uncrustify_types.h"
-#include "chunk_list.h"
-#include "prototypes.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cerrno>
-#include <cctype>
-
-
-/**
- * General indenting approach:
- * Indenting levels are put into a stack.
- *
- * The stack entries contain:
- *  - opening type
- *  - brace column
- *  - continuation column
- *
- * Items that start a new stack item:
- *  - preprocessor (new parse frame)
- *  - Brace Open (Virtual brace also)
- *  - Paren, Square, Angle open
- *  - Assignments
- *  - C++ '<<' operator (ie, cout << "blah")
- *  - case
- *  - class colon
- *  - return
- *  - types
- *  - any other continued statement
- *
- * Note that the column of items marked 'PCF_WAS_ALIGNED' is not changed.
- *
- * For an open brace:
- *  - indent increases by indent_columns
- *  - if part of if/else/do/while/switch/etc, an extra indent may be applied
- *  - if in a paren, then cont-col is set to column + 1, ie "({ some code })"
- *
- * Open paren/square/angle:
- * cont-col is set to the column of the item after the open paren, unless
- * followed by a newline, then it is set to (brace-col + indent_columns).
- * Examples:
- *    a_really_long_funcion_name(
- *       param1, param2);
- *    a_really_long_funcion_name(param1,
- *                               param2);
- *
- * Assignments:
- * Assignments are continued aligned with the first item after the assignment,
- * unless the assign is followed by a newline.
- * Examples:
- *    some.variable = asdf + asdf +
- *                    asdf;
- *    some.variable =
- *       asdf + asdf + asdf;
- *
- * C++ << operator:
- * Handled the same as assignment.
- * Examples:
- *    cout << "this is test number: "
- *         << test_number;
- *
- * case:
- * Started with case or default.
- * Terminated with close brace at level or another case or default.
- * Special indenting according to various rules.
- *  - indent of case label
- *  - indent of case body
- *  - how to handle optional braces
- * Examples:
- * {
- * case x: {
- *    a++;
- *    break;
- *    }
- * case y:
- *    b--;
- *    break;
- * default:
- *    c++;
- *    break;
- * }
- *
- * Class colon:
- * Indent continuation by indent_columns:
- * class my_class :
- *    baseclass1,
- *    baseclass2
- * {
- *
- * Return: same as assignemts
- * If the return statement is not fully paren'd, then the indent continues at
- * the column of the item after the return. If it is paren'd, then the paren
- * rules apply.
- * return somevalue +
- *        othervalue;
- *
- * Type: pretty much the same as assignments
- * Examples:
- * int foo,
- *     bar,
- *     baz;
- *
- * Any other continued item:
- * There shouldn't be anything not covered by the above cases, but any other
- * continued item is indented by indent_columns:
- * Example:
- * somereallycrazylongname.with[lotsoflongstuff].
- *    thatreallyannoysme.whenIhavetomaintain[thecode] = 3;
- */
-
-static void indent_comment(chunk_t *pc, int col);
-
-
-void indent_to_column(chunk_t *pc, int column)
-  {
-  if (column < pc->column)
-    column = pc->column;
-
-  reindent_line(pc, column);
-  }
-
-/**
- * Changes the initial indent for a line to the given column
- *
- * @param pc      The chunk at the start of the line
- * @param column  The desired column
- */
-void reindent_line(chunk_t *pc, int column)
-  {
-  int col_delta;
-  int min_col;
-
-  LOG_FMT(LINDLINE, "%s: %d] col %d on %.*s [%s] => %d\n",
-          __func__, pc->orig_line, pc->column, pc->len, pc->str,
-          get_token_name(pc->type), column);
-
-  if (column == pc->column)
-    return;
-
-  col_delta  = column - pc->column;
-  pc->column = column;
-  min_col    = pc->column;
-
-  do
-    {
-    min_col += pc->len;
-    pc       = chunk_get_next(pc);
-
-    if (pc != NULL)
-      {
-      if (chunk_is_comment(pc))
-        {
-        pc->column = pc->orig_col;
-
-        if (pc->column < min_col)
-          pc->column = min_col + 1;
-
-        LOG_FMT(LINDLINE, "%s: set comment on line %d to col %d (orig %d)\n",
-                __func__, pc->orig_line, pc->column, pc->orig_col);
-        }
-      else
-        {
-        pc->column += col_delta;
-
-        if (pc->column < min_col)
-          pc->column = min_col;
-        }
-      }
-    }
-  while ((pc != NULL) && (pc->nl_count == 0));
-  }
-
-/**
- * Starts a new entry
- *
- * @param frm  The parse frame
- * @param pc   The chunk causing the push
- */
-static void indent_pse_push(struct parse_frame& frm, chunk_t *pc)
-  {
-  static int ref = 0;
-
-    /* check the stack depth */
-  if (frm.pse_tos < (int)ARRAY_SIZE(frm.pse))
-    {
-      /* Bump up the index and initialize it */
-    frm.pse_tos++;
-    memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos]));
-
-    LOG_FMT(LINDPSE, "%4d] OPEN  [%d,%s] level=%d\n",
-            pc->orig_line, frm.pse_tos, get_token_name(pc->type), pc->level);
-
-    frm.pse[frm.pse_tos].type       = pc->type;
-    frm.pse[frm.pse_tos].level      = pc->level;
-    frm.pse[frm.pse_tos].open_line  = pc->orig_line;
-    frm.pse[frm.pse_tos].ref        = ++ref;
-    frm.pse[frm.pse_tos].in_preproc = (pc->flags & PCF_IN_PREPROC) != 0;
-    }
-  }
-
-/**
- * Removes the top entry
- *
- * @param frm  The parse frame
- * @param pc   The chunk causing the push
- */
-static void indent_pse_pop(struct parse_frame& frm, chunk_t *pc)
-  {
-    /* Bump up the index and initialize it */
-  if (frm.pse_tos > 0)
-    {
-    if (pc != NULL)
-      {
-      LOG_FMT(LINDPSE, "%4d] CLOSE [%d,%s] on %s, started on line %d, level=%d/%d\n",
-              pc->orig_line, frm.pse_tos,
-              get_token_name(frm.pse[frm.pse_tos].type),
-              get_token_name(pc->type),
-              frm.pse[frm.pse_tos].open_line,
-              frm.pse[frm.pse_tos].level,
-              pc->level);
-      }
-    else
-      {
-      LOG_FMT(LINDPSE, " EOF] CLOSE [%d,%s], started on line %d\n",
-              frm.pse_tos, get_token_name(frm.pse[frm.pse_tos].type),
-              frm.pse[frm.pse_tos].open_line);
-      }
-
-    frm.pse_tos--;
-    }
-  }
-
-static int token_indent(c_token_t type)
-  {
-  switch (type)
-    {
-    case CT_IF:
-    case CT_DO:
-      return 3;
-
-    case CT_FOR:
-    case CT_ELSE: // wacky, but that's what is wanted
-      return 4;
-
-    case CT_WHILE:
-      return 6;
-
-    case CT_SWITCH:
-      return 7;
-
-    case CT_ELSEIF:
-      return 8;
-
-    default:
-      return 0; //cpd.settings[UO_indent_braces].n;
-    }
-  }
-
-/**
- * Change the top-level indentation only by changing the column member in
- * the chunk structures.
- * The level indicator must already be set.
- */
-void indent_text(void)
-  {
-  chunk_t            *pc;
-  chunk_t            *next;
-  chunk_t            *prev       = NULL;
-  bool did_newline = true;
-  int idx;
-  int vardefcol   = 0;
-  int indent_size = cpd.settings[UO_indent_columns].n;
-  int tmp;
-  struct parse_frame frm;
-  bool in_preproc = false, was_preproc = false;
-  int indent_column;
-  int cout_col            = 0;                 // for aligning << stuff
-  int cout_level          = 0;                 // for aligning << stuff
-  int parent_token_indent = 0;
-
-  memset(&frm, 0, sizeof(frm));
-
-    /* dummy top-level entry */
-  frm.pse[0].indent     = 1;
-  frm.pse[0].indent_tmp = 1;
-  frm.pse[0].type       = CT_EOF;
-
-  pc = chunk_get_head();
-
-  while (pc != NULL)
-    {
-      /* Handle proprocessor transitions */
-    was_preproc = in_preproc;
-    in_preproc  = (pc->flags & PCF_IN_PREPROC) != 0;
-
-    if (cpd.settings[UO_indent_brace_parent].b)
-      parent_token_indent = token_indent(pc->parent_type);
-
-      /* Clean up after a #define */
-    if (!in_preproc)
-      while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
-        indent_pse_pop(frm, pc);
-
-    else
-      {
-      pf_check(&frm, pc);
-
-      if (!was_preproc)
-        {
-          /* Transition into a preproc by creating a dummy indent */
-        frm.level++;
-        indent_pse_push(frm, pc);
-
-        frm.pse[frm.pse_tos].indent     = 1 + indent_size;
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-        }
-      }
-
-    if ((cout_col > 0) &&
-        (chunk_is_semicolon(pc) ||
-         (pc->level < cout_level)))
-      {
-      cout_col   = 0;
-      cout_level = 0;
-      }
-
-    /**
-     * Handle non-brace closures
-     */
-
-    int old_pse_tos;
-
-    do
-      {
-      old_pse_tos = frm.pse_tos;
-
-      /* End anything that drops a level
-       * REVISIT: not sure about the preproc check
-       */
-      if (!chunk_is_newline(pc) &&
-          !chunk_is_comment(pc) &&
-          ((pc->flags & PCF_IN_PREPROC) == 0) &&
-          (frm.pse[frm.pse_tos].level > pc->level))
-        indent_pse_pop(frm, pc);
-
-      if (frm.pse[frm.pse_tos].level == pc->level)
-        {
-          /* process virtual braces closes (no text output) */
-        if ((pc->type == CT_VBRACE_CLOSE) &&
-            (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN))
-          {
-          indent_pse_pop(frm, pc);
-          frm.level--;
-          pc = chunk_get_next(pc);
-          }
-
-          /* End any assign operations with a semicolon on the same level */
-        if ((frm.pse[frm.pse_tos].type == CT_ASSIGN) &&
-            (chunk_is_semicolon(pc) ||
-             (pc->type == CT_COMMA) ||
-             (pc->type == CT_BRACE_OPEN)))
-          indent_pse_pop(frm, pc);
-
-          /* End any CPP class colon crap */
-        if ((frm.pse[frm.pse_tos].type == CT_CLASS_COLON) &&
-            ((pc->type == CT_BRACE_OPEN) ||
-             chunk_is_semicolon(pc)))
-          indent_pse_pop(frm, pc);
-
-          /* a case is ended with another case or a close brace */
-        if ((frm.pse[frm.pse_tos].type == CT_CASE) &&
-            ((pc->type == CT_BRACE_CLOSE) ||
-             (pc->type == CT_CASE)))
-          indent_pse_pop(frm, pc);
-
-          /* a return is ended with a semicolon */
-        if ((frm.pse[frm.pse_tos].type == CT_RETURN) &&
-            chunk_is_semicolon(pc))
-          indent_pse_pop(frm, pc);
-
-          /* Close out parens and squares */
-        if ((frm.pse[frm.pse_tos].type == (pc->type - 1)) &&
-            ((pc->type == CT_PAREN_CLOSE) ||
-             (pc->type == CT_SPAREN_CLOSE) ||
-             (pc->type == CT_FPAREN_CLOSE) ||
-             (pc->type == CT_SQUARE_CLOSE) ||
-             (pc->type == CT_ANGLE_CLOSE)))
-          {
-          indent_pse_pop(frm, pc);
-          frm.paren_count--;
-          }
-        }
-      }
-    while (old_pse_tos > frm.pse_tos);
-
-      /* Grab a copy of the current indent */
-    indent_column = frm.pse[frm.pse_tos].indent_tmp;
-
-    if (!chunk_is_newline(pc) && !chunk_is_comment(pc))
-      {
-      LOG_FMT(LINDPC, " -=[ %.*s ]=- top=%d %s %d/%d\n",
-              pc->len, pc->str,
-              frm.pse_tos,
-              get_token_name(frm.pse[frm.pse_tos].type),
-              frm.pse[frm.pse_tos].indent_tmp,
-              frm.pse[frm.pse_tos].indent);
-      }
-
-    /**
-     * Handle stuff that can affect the current indent:
-     *  - brace close
-     *  - vbrace open
-     *  - brace open
-     *  - case         (immediate)
-     *  - labels       (immediate)
-     *  - class colons (immediate)
-     *
-     * And some stuff that can't
-     *  - open paren
-     *  - open square
-     *  - assignment
-     *  - return
-     */
-
-    if (pc->type == CT_BRACE_CLOSE)
-      {
-      if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN)
-        {
-        indent_pse_pop(frm, pc);
-        frm.level--;
-
-          /* Update the indent_column if needed */
-        if (!cpd.settings[UO_indent_braces].b &&
-            (parent_token_indent == 0))
-          indent_column = frm.pse[frm.pse_tos].indent_tmp;
-
-        if ((pc->parent_type == CT_IF) ||
-            (pc->parent_type == CT_ELSE) ||
-            (pc->parent_type == CT_ELSEIF) ||
-            (pc->parent_type == CT_DO) ||
-            (pc->parent_type == CT_WHILE) ||
-            (pc->parent_type == CT_SWITCH) ||
-            (pc->parent_type == CT_FOR))
-          indent_column += cpd.settings[UO_indent_brace].n;
-        }
-      }
-    else if (pc->type == CT_VBRACE_OPEN)
-      {
-      frm.level++;
-      indent_pse_push(frm, pc);
-
-      frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + indent_size;
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-
-        /* Always indent on virtual braces */
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
-      }
-    else if (pc->type == CT_BRACE_OPEN)
-      {
-      frm.level++;
-      indent_pse_push(frm, pc);
-
-      if (frm.paren_count != 0)
-          /* We are inside ({ ... }) -- indent one tab from the paren */
-        frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-      else
-        {
-          /* Use the prev indent level + indent_size. */
-        frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
-
-          /* If this brace is part of a statement, bump it out by indent_brace */
-        if ((pc->parent_type == CT_IF) ||
-            (pc->parent_type == CT_ELSE) ||
-            (pc->parent_type == CT_ELSEIF) ||
-            (pc->parent_type == CT_DO) ||
-            (pc->parent_type == CT_WHILE) ||
-            (pc->parent_type == CT_SWITCH) ||
-            (pc->parent_type == CT_FOR))
-          {
-          if (parent_token_indent != 0)
-            frm.pse[frm.pse_tos].indent += parent_token_indent - indent_size;
-          else
-            {
-            frm.pse[frm.pse_tos].indent += cpd.settings[UO_indent_brace].n;
-            indent_column += cpd.settings[UO_indent_brace].n;
-            }
-          }
-        else if (pc->parent_type == CT_CASE)
-          {
-            /* The indent_case_brace setting affects the parent CT_CASE */
-          frm.pse[frm.pse_tos].indent_tmp += cpd.settings[UO_indent_case_brace].n;
-          frm.pse[frm.pse_tos].indent     += cpd.settings[UO_indent_case_brace].n;
-          }
-        else if ((pc->parent_type == CT_CLASS) && !cpd.settings[UO_indent_class].b)
-          frm.pse[frm.pse_tos].indent -= indent_size;
-        else if ((pc->parent_type == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
-          frm.pse[frm.pse_tos].indent -= indent_size;
-        }
-
-      if ((pc->flags & PCF_DONT_INDENT) != 0)
-        {
-        frm.pse[frm.pse_tos].indent = pc->column;
-        indent_column = pc->column;
-        }
-      else
-        {
-        /**
-         * If there isn't a newline between the open brace and the next
-         * item, just indent to wherever the next token is.
-         * This covers this sort of stuff:
-         * { a++;
-         *   b--; };
-         */
-        next = chunk_get_next_ncnnl(pc);
-
-        if (!chunk_is_newline_between(pc, next))
-          frm.pse[frm.pse_tos].indent = next->column;
-
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-        frm.pse[frm.pse_tos].open_line  = pc->orig_line;
-
-          /* Update the indent_column if needed */
-        if (cpd.settings[UO_indent_braces].n ||
-            (parent_token_indent != 0))
-          indent_column = frm.pse[frm.pse_tos].indent_tmp;
-        }
-      }
-    else if (pc->type == CT_CASE)
-      {
-        /* Start a case - indent UO_indent_switch_case from the switch level */
-      tmp = frm.pse[frm.pse_tos].indent + cpd.settings[UO_indent_switch_case].n;
-
-      indent_pse_push(frm, pc);
-
-      frm.pse[frm.pse_tos].indent     = tmp;
-      frm.pse[frm.pse_tos].indent_tmp = tmp - indent_size;
-
-        /* Always set on case statements */
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
-      }
-    else if (pc->type == CT_LABEL)
-      {
-        /* Labels get sent to the left or backed up */
-      if (cpd.settings[UO_indent_label].n > 0)
-        indent_column = cpd.settings[UO_indent_label].n;
-      else
-        indent_column = frm.pse[frm.pse_tos].indent +
-                        cpd.settings[UO_indent_label].n;
-      }
-    else if (pc->type == CT_CLASS_COLON)
-      {
-        /* just indent one level */
-      indent_pse_push(frm, pc);
-      frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
-
-      if (cpd.settings[UO_indent_class_colon].b)
-        {
-        prev = chunk_get_prev(pc);
-
-        if (chunk_is_newline(prev))
-          {
-          frm.pse[frm.pse_tos].indent += 2;
-          /* don't change indent of current line */
-          }
-        }
-      }
-    else if ((pc->type == CT_PAREN_OPEN) ||
-             (pc->type == CT_SPAREN_OPEN) ||
-             (pc->type == CT_FPAREN_OPEN) ||
-             (pc->type == CT_SQUARE_OPEN) ||
-             (pc->type == CT_ANGLE_OPEN))
-      {
-        /* Open parens and squares - never update indent_column */
-      indent_pse_push(frm, pc);
-      frm.pse[frm.pse_tos].indent = pc->column + pc->len;
-
-      if (cpd.settings[UO_indent_func_call_param].b &&
-          (pc->type == CT_FPAREN_OPEN) &&
-          (pc->parent_type == CT_FUNC_CALL))
-        frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
-
-      if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) ||
-          (chunk_is_str(pc, "[", 1) && !cpd.settings[UO_indent_square_nl].b))
-        {
-        next = chunk_get_next_nc(pc);
-
-        if (chunk_is_newline(next))
-          {
-          int sub = 1;
-
-          if (frm.pse[frm.pse_tos - 1].type == CT_ASSIGN)
-            sub = 2;
-
-          frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - sub].indent + indent_size;
-          }
-        }
-
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-      frm.paren_count++;
-      }
-    else if (pc->type == CT_ASSIGN)
-      {
-      /**
-       * if there is a newline after the '=', just indent one level,
-       * otherwise align on the '='.
-       * Never update indent_column.
-       */
-      next = chunk_get_next(pc);
-
-      if (next != NULL)
-        {
-        indent_pse_push(frm, pc);
-
-        if (chunk_is_newline(next))
-          frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-        else
-          frm.pse[frm.pse_tos].indent = pc->column + pc->len + 1;
-
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-        }
-      }
-    else if (pc->type == CT_RETURN)
-      {
-        /* don't count returns inside a () or [] */
-      if (pc->level == pc->brace_level)
-        {
-        indent_pse_push(frm, pc);
-        frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + pc->len + 1;
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos - 1].indent;
-        }
-      }
-    else if (chunk_is_str(pc, "<<", 2))
-      {
-      if (cout_col == 0)
-        {
-        cout_col   = pc->column;
-        cout_level = pc->level;
-        }
-      }
-    else
-      {
-      /* anything else? */
-      }
-
-    /**
-     * Indent the line if needed
-     */
-    if (did_newline && !chunk_is_newline(pc) && (pc->len != 0))
-      {
-      /**
-       * Check for special continuations.
-       * Note that some of these could be done as a stack item like
-       * everything else
-       */
-
-      prev = chunk_get_prev_ncnnl(pc);
-
-      if ((pc->type == CT_MEMBER) ||
-          (pc->type == CT_DC_MEMBER) ||
-          ((prev != NULL) &&
-           ((prev->type == CT_MEMBER) ||
-            (prev->type == CT_DC_MEMBER))))
-        {
-        tmp = cpd.settings[UO_indent_member].n + indent_column;
-        LOG_FMT(LINDENT, "%s: %d] member => %d\n",
-                __func__, pc->orig_line, tmp);
-        reindent_line(pc, tmp);
-        }
-      else if (chunk_is_str(pc, "<<", 2) && (cout_col > 0))
-        {
-        LOG_FMT(LINDENT, "%s: %d] cout_col => %d\n",
-                __func__, pc->orig_line, cout_col);
-        reindent_line(pc, cout_col);
-        }
-      else if ((vardefcol > 0) &&
-               (pc->type == CT_WORD) &&
-               ((pc->flags & PCF_VAR_DEF) != 0) &&
-               (prev != NULL) && (prev->type == CT_COMMA))
-        {
-        LOG_FMT(LINDENT, "%s: %d] Vardefcol => %d\n",
-                __func__, pc->orig_line, vardefcol);
-        reindent_line(pc, vardefcol);
-        }
-      else if ((pc->type == CT_STRING) && (prev->type == CT_STRING) &&
-               cpd.settings[UO_indent_align_string].b)
-        {
-        LOG_FMT(LINDENT, "%s: %d] String => %d\n",
-                __func__, pc->orig_line, prev->column);
-        reindent_line(pc, prev->column);
-        }
-      else if (chunk_is_comment(pc))
-        {
-        LOG_FMT(LINDENT, "%s: %d] comment => %d\n",
-                __func__, pc->orig_line, frm.pse[frm.pse_tos].indent_tmp);
-        indent_comment(pc, frm.pse[frm.pse_tos].indent_tmp);
-        }
-      else if (pc->type == CT_PREPROC)
-        {
-          /* Preprocs are always in column 1. See indent_preproc() */
-        if (pc->column != 1)
-          reindent_line(pc, 1);
-        }
-      else
-        {
-        if (pc->column != indent_column)
-          {
-          LOG_FMT(LINDENT, "%s: %d] indent => %d [%.*s]\n",
-                  __func__, pc->orig_line, indent_column, pc->len, pc->str);
-          reindent_line(pc, indent_column);
-          }
-        }
-
-      did_newline = false;
-      }
-
-    /**
-     * Handle variable definition continuation indenting
-     */
-    if ((pc->type == CT_WORD) &&
-        ((pc->flags & PCF_IN_FCN_DEF) == 0) &&
-        ((pc->flags & PCF_VAR_1ST_DEF) == PCF_VAR_1ST_DEF))
-      vardefcol = pc->column;
-
-    if (chunk_is_semicolon(pc) ||
-        ((pc->type == CT_BRACE_OPEN) && (pc->parent_type == CT_FUNCTION)))
-      vardefcol = 0;
-
-      /* if we hit a newline, reset indent_tmp */
-    if (chunk_is_newline(pc) ||
-        (pc->type == CT_COMMENT_MULTI) ||
-        (pc->type == CT_COMMENT_CPP))
-      {
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-
-      /**
-       * Handle the case of a multi-line #define w/o anything on the
-       * first line (indent_tmp will be 1 or 0)
-       */
-      if ((pc->type == CT_NL_CONT) &&
-          (frm.pse[frm.pse_tos].indent_tmp <= indent_size))
-        frm.pse[frm.pse_tos].indent_tmp = indent_size + 1;
-
-        /* Get ready to indent the next item */
-      did_newline = true;
-      }
-
-    if (!chunk_is_comment(pc) && !chunk_is_newline(pc))
-      prev = pc;
-
-    pc = chunk_get_next(pc);
-    }
-
-    /* Throw out any stuff inside a preprocessor - no need to warn */
-  while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
-    indent_pse_pop(frm, pc);
-
-  for (idx = 1; idx <= frm.pse_tos; idx++)
-    {
-    LOG_FMT(LWARN, "%s:%d Unmatched %s\n",
-            cpd.filename, frm.pse[idx].open_line,
-            get_token_name(frm.pse[idx].type));
-    cpd.error_count++;
-    }
-  }
-
-/**
- * returns true if forward scan reveals only single newlines or comments
- * stops when hits code
- * false if next thing hit is a closing brace, also if 2 newlines in a row
- */
-
-
-static bool single_line_comment_indent_rule_applies(chunk_t *start)
-  {
-  chunk_t *pc      = start;
-  int nl_count = 0;
-
-  if (!chunk_is_single_line_comment(pc))
-    return false;
-
-    /* scan forward, if only single newlines and comments before next line of code, we want to apply */
-  while ((pc = chunk_get_next(pc)) != NULL)
-    {
-    if (chunk_is_newline(pc))
-      {
-      if (nl_count > 0 || pc->nl_count > 1)
-        return false;
-
-      nl_count++;
-      }
-    else
-      {
-      nl_count = 0;
-
-      if (!chunk_is_single_line_comment(pc))
-        {
-          /* here we check for things to run into that we wouldn't want to indent the comment for */
-          /* for example, non-single line comment, closing brace */
-        if (chunk_is_comment(pc) || chunk_is_closing_brace(pc))
-          return false;
-
-        return true;
-        }
-      }
-    }
-
-  return false;
-  }
-
-/**
- * REVISIT: This needs to be re-checked, maybe cleaned up
- *
- * Indents comments in a (hopefully) smart manner.
- *
- * There are two type of comments that get indented:
- *  - stand alone (ie, no tokens on the line before the comment)
- *  - trailing comments (last token on the line apart from a linefeed)
- *    + note that a stand-alone comment is a special case of a trailing
- *
- * The stand alone comments will get indented in one of three ways:
- *  - column 1:
- *    + There is an empty line before the comment AND the indent level is 0
- *    + The comment was originally in column 1
- *
- *  - Same column as trailing comment on previous line (ie, aligned)
- *    + if originally within TBD (3) columns of the previous comment
- *
- *  - syntax indent level
- *    + doesn't fit in the previous categories
- *
- * Options modify this behavior:
- *  - keep original column (don't move the comment, if possible)
- *  - keep relative column (move out the same amount as first item on line)
- *  - fix trailing comment in column TBD
- *
- * @param pc   The comment, which is the first item on a line
- * @param col  The column if this is to be put at indent level
- */
-static void indent_comment(chunk_t *pc, int col)
-  {
-  chunk_t *nl;
-  chunk_t *prev;
-
-  LOG_FMT(LCMTIND, "%s: line %d, col %d, level %d: ", __func__,
-          pc->orig_line, pc->orig_col, pc->level);
-
-    /* force column 1 comment to column 1 if not changing them */
-  if ((pc->orig_col == 1) && !cpd.settings[UO_indent_col1_comment].b)
-    {
-    LOG_FMT(LCMTIND, "rule 1 - keep in col 1\n");
-    pc->column = 1;
-    return;
-    }
-
-  nl = chunk_get_prev(pc);
-
-    /* outside of any expression or statement? */
-  if (pc->level == 0)
-    {
-    if ((nl != NULL) && (nl->nl_count > 1))
-      {
-      LOG_FMT(LCMTIND, "rule 2 - level 0, nl before\n");
-      pc->column = 1;
-      return;
-      }
-    }
-
-  prev = chunk_get_prev(nl);
-
-  if (chunk_is_comment(prev) && (nl->nl_count == 1))
-    {
-    int coldiff = prev->orig_col - pc->orig_col;
-
-    if ((coldiff <= 3) && (coldiff >= -3))
-      {
-      pc->column = prev->column;
-      LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %d\n",
-              coldiff, pc->column);
-      return;
-      }
-    }
-
-    /* check if special single line comment rule applies */
-  if (cpd.settings[UO_indent_sing_line_comments].n > 0 && single_line_comment_indent_rule_applies(pc))
-    {
-    pc->column = col + cpd.settings[UO_indent_sing_line_comments].n;
-    LOG_FMT(LCMTIND, "rule 4 - single line comment indent, now in %d\n", pc->column);
-    return;
-    }
-
-  LOG_FMT(LCMTIND, "rule 5 - fall-through, stay in %d\n", col);
-
-  pc->column = col;
-  }
-
-/**
- * Put spaces on either side of the preproc (#) symbol.
- * This is done by pointing pc->str into pp_str and adjusting the
- * length.
- */
-void indent_preproc(void)
-  {
-  chunk_t *pc;
-  chunk_t *next;
-  int pp_level;
-  int pp_level_sub = 0;
-  int tmp;
-
-    /* Define a string of 16 spaces + # + 16 spaces */
-  static const char *pp_str  = "                #                ";
-  static const char *alt_str = "                %:                ";
-
-    /* Scan to see if the whole file is covered by one #ifdef */
-  int stage = 0;
-
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-    {
-    if (chunk_is_comment(pc) || chunk_is_newline(pc))
-      continue;
-
-    if (stage == 0)
-      {
-        /* Check the first PP, make sure it is an #if type */
-      if (pc->type != CT_PREPROC)
-        break;
-
-      next = chunk_get_next(pc);
-
-      if ((next == NULL) || (next->type != CT_PP_IF))
-        break;
-
-      stage = 1;
-      }
-    else if (stage == 1)
-      {
-        /* Scan until a PP at level 0 is found - the close to the #if */
-      if ((pc->type == CT_PREPROC) &&
-          (pc->pp_level == 0))
-        stage = 2;
-
-      continue;
-      }
-    else if (stage == 2)
-      {
-        /* We should only see the rest of the preprocessor */
-      if ((pc->type == CT_PREPROC) ||
-          ((pc->flags & PCF_IN_PREPROC) == 0))
-        {
-        stage = 0;
-        break;
-        }
-      }
-    }
-
-  if (stage == 2)
-    {
-    LOG_FMT(LINFO, "The whole file is covered by a #IF\n");
-    pp_level_sub = 1;
-    }
-
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-    {
-    if (pc->type != CT_PREPROC)
-      continue;
-
-    if (pc->column != 1)
-      {
-        /* Don't handle preprocessors that aren't in column 1 */
-      LOG_FMT(LINFO, "%s: Line %d doesn't start in column 1 (%d)\n",
-              __func__, pc->orig_line, pc->column);
-      continue;
-      }
-
-      /* point into pp_str */
-    if (pc->len == 2)
-        /* alternate token crap */
-      pc->str = &alt_str[16];
-    else
-      pc->str = &pp_str[16];
-
-    pp_level = pc->pp_level - pp_level_sub;
-
-    if (pp_level < 0)
-      pp_level = 0;
-    else if (pp_level > 16)
-      pp_level = 16;
-
-      /* Note that the indent is removed by default */
-    if ((cpd.settings[UO_pp_indent].a & AV_ADD) != 0)
-      {
-        /* Need to add some spaces */
-      pc->str -= pp_level;
-      pc->len += pp_level;
-      }
-    else if (cpd.settings[UO_pp_indent].a == AV_IGNORE)
-      {
-      tmp      = (pc->orig_col <= 16) ? pc->orig_col - 1 : 16;
-      pc->str -= tmp;
-      pc->len += tmp;
-      }
-
-      /* Add spacing by adjusting the length */
-    if ((cpd.settings[UO_pp_space].a & AV_ADD) != 0)
-      pc->len += pp_level;
-
-    next = chunk_get_next(pc);
-
-    if (next != NULL)
-      reindent_line(next, pc->len + 1);
-
-    LOG_FMT(LPPIS, "%s: Indent line %d to %d (len %d, next->col %d)\n",
-            __func__, pc->orig_line, pp_level, pc->len, next->column);
-    }
-  }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02103-output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02103-output.cpp
deleted file mode 100644
index ca003784..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02103-output.cpp
+++ /dev/null
@@ -1,624 +0,0 @@
-/**
- * @file output.cpp
- * Does all the output & comment formatting.
- *
- * $Id: output.cpp 510 2006-09-20 01:14:56Z bengardner $
- */
-
-#include "uncrustify_types.h"
-#include "prototypes.h"
-#include "chunk_list.h"
-#include <cstring>
-#include <cstdlib>
-
-
-
-void add_char(char ch)
-  {
-    /* convert a newline into the LF/CRLF/CR sequence */
-  if (ch == '\n')
-    {
-    fputs(cpd.newline, cpd.fout);
-    cpd.column      = 1;
-    cpd.did_newline = 1;
-    }
-  else
-    {
-    fputc(ch, cpd.fout);
-
-    if (ch == '\t')
-      cpd.column = next_tab_column(cpd.column);
-    else
-      cpd.column++;
-    }
-  }
-
-void add_text(const char *text)
-  {
-  char ch;
-
-  while ((ch = *text) != 0)
-    {
-    text++;
-    add_char(ch);
-    }
-  }
-
-void add_text_len(const char *text, int len)
-  {
-  while (len-- > 0)
-    {
-    add_char(*text);
-    text++;
-    }
-  }
-
-/**
- * Advance to a specific column
- * cpd.column is the current column
- *
- * @param column  The column to advance to
- */
-void output_to_column(int column, bool allow_tabs)
-  {
-  int nc;
-
-  cpd.did_newline = 0;
-
-  if (allow_tabs)
-    {
-      /* tab out as far as possible and then use spaces */
-    while ((nc = next_tab_column(cpd.column)) <= column)
-      add_text("\t");
-    }
-
-    /* space out the final bit */
-  while (cpd.column < column)
-    add_text(" ");
-  }
-
-void output_indent(int column, int brace_col)
-  {
-  if ((cpd.column == 1) && (cpd.settings[UO_indent_with_tabs].n != 0))
-    {
-    if (cpd.settings[UO_indent_with_tabs].n == 2)
-      brace_col = column;
-
-      /* tab out as far as possible and then use spaces */
-    int nc;
-
-    while ((nc = next_tab_column(cpd.column)) <= brace_col)
-      add_text("\t");
-    }
-
-    /* space out the rest */
-  while (cpd.column < column)
-    add_text(" ");
-  }
-
-void output_parsed(FILE *pfile)
-  {
-  chunk_t *pc;
-  int cnt;
-
-  output_options(pfile);
-  output_defines(pfile);
-  output_types(pfile);
-
-  fprintf(pfile, "-=====-\n");
-  fprintf(pfile, "Line      Tag          Parent     Columns  Br/Lvl/pp Flg Nl  Text");
-
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-    {
-    fprintf(pfile, "\n%3d> %13.13s[%13.13s][%2d/%2d/%2d][%d/%d/%d][%6x][%d-%d]",
-            pc->orig_line, get_token_name(pc->type),
-            get_token_name(pc->parent_type),
-            pc->column, pc->orig_col, pc->orig_col_end,
-            pc->brace_level, pc->level, pc->pp_level,
-            pc->flags, pc->nl_count, pc->after_tab);
-
-    if ((pc->type != CT_NEWLINE) && (pc->len != 0))
-      {
-      for (cnt = 0; cnt < pc->column; cnt++)
-        fprintf(pfile, " ");
-
-      fprintf(pfile, "%.*s", pc->len, pc->str);
-      }
-    }
-
-  fprintf(pfile, "\n-=====-\n");
-  fflush(pfile);
-  }
-
-void output_options(FILE *pfile)
-  {
-  int idx;
-  const option_map_value *ptr;
-
-  fprintf(pfile, "-== Options ==-\n");
-
-  for (idx = 0; idx < UO_option_count; idx++)
-    {
-    ptr = get_option_name(idx);
-
-    if (ptr != NULL)
-      {
-      if (ptr->type == AT_BOOL)
-        {
-        fprintf(pfile, "%3d) %32s = %s\n",
-                ptr->id, ptr->name,
-                cpd.settings[ptr->id].b ? "True" : "False");
-        }
-      else if (ptr->type == AT_IARF)
-        {
-        fprintf(pfile, "%3d) %32s = %s\n",
-                ptr->id, ptr->name,
-                (cpd.settings[ptr->id].a == AV_ADD) ? "Add" :
-                (cpd.settings[ptr->id].a == AV_REMOVE) ? "Remove" :
-                (cpd.settings[ptr->id].a == AV_FORCE) ? "Force" : "Ignore");
-        }
-      else if (ptr->type == AT_LINE)
-        {
-        fprintf(pfile, "%3d) %32s = %s\n",
-                ptr->id, ptr->name,
-                (cpd.settings[ptr->id].le == LE_AUTO) ? "Auto" :
-                (cpd.settings[ptr->id].le == LE_LF) ? "LF" :
-                (cpd.settings[ptr->id].le == LE_CRLF) ? "CRLF" :
-                (cpd.settings[ptr->id].le == LE_CR) ? "CR" : "???");
-        }
-      else     /* AT_NUM */
-        fprintf(pfile, "%3d) %32s = %d\n",
-                ptr->id, ptr->name, cpd.settings[ptr->id].n);
-      }
-    }
-  }
-
-/**
- * This renders the chunk list to a file.
- */
-void output_text(FILE *pfile)
-  {
-  chunk_t *pc;
-  chunk_t *prev;
-  int cnt;
-  int lvlcol;
-  bool allow_tabs;
-
-  cpd.fout = pfile;
-
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-    {
-    if (pc->type == CT_NEWLINE)
-      {
-      for (cnt = 0; cnt < pc->nl_count; cnt++)
-        add_char('\n');
-
-      cpd.did_newline = 1;
-      cpd.column      = 1;
-      LOG_FMT(LOUTIND, " xx\n");
-      }
-    else if (pc->type == CT_COMMENT_MULTI)
-      output_comment_multi(pc);
-    else if (pc->type == CT_COMMENT_CPP)
-      pc = output_comment_cpp(pc);
-    else if (pc->len == 0)
-        /* don't do anything for non-visible stuff */
-      LOG_FMT(LOUTIND, " <%d> -", pc->column);
-    else
-      {
-        /* indent to the 'level' first */
-      if (cpd.did_newline)
-        {
-        if (cpd.settings[UO_indent_with_tabs].n == 1)
-          {
-          lvlcol = 1 + (pc->brace_level * cpd.settings[UO_indent_columns].n);
-
-          if ((pc->column >= lvlcol) && (lvlcol > 1))
-            output_to_column(lvlcol, true);
-          }
-
-        allow_tabs = (cpd.settings[UO_indent_with_tabs].n == 2) ||
-                     (chunk_is_comment(pc) &&
-                      (cpd.settings[UO_indent_with_tabs].n != 0));
-
-        LOG_FMT(LOUTIND, "  %d> col %d/%d - ", pc->orig_line, pc->column, cpd.column);
-        }
-      else
-        {
-          /* not the first item on a line */
-        if (cpd.settings[UO_align_keep_tabs].b)
-          allow_tabs = pc->after_tab;
-        else
-          {
-          prev       = chunk_get_prev(pc);
-          allow_tabs = (cpd.settings[UO_align_with_tabs].b &&
-                        ((pc->flags & PCF_WAS_ALIGNED) != 0) &&
-                        (((pc->column - 1) % cpd.settings[UO_output_tab_size].n) == 0) &&
-                        ((prev->column + prev->len + 1) != pc->column));
-          }
-
-        LOG_FMT(LOUTIND, " %d -", pc->column);
-        }
-
-      output_to_column(pc->column, allow_tabs);
-      add_text_len(pc->str, pc->len);
-      cpd.did_newline = chunk_is_newline(pc);
-      }
-    }
-  }
-
-/**
- * Given a multi-line comemnt block that starts in column X, figure out how
- * much subsequent lines should be indented.
- *
- * The answer is either 0 or 1.
- *
- * The decision is based on:
- *  - the first line length
- *  - the second line leader length
- *  - the last line length
- *
- * If the first and last line are the same length and don't contain any alnum
- * chars and (the first line len > 2 or the second leader is the same as the
- * first line length), then the indent is 0.
- *
- * If the leader on the second line is 1 wide or missing, then the indent is 1.
- *
- * Otherwise, the indent is 0.
- *
- * @param str       The comment string
- * @param len       Length of the comment
- * @param start_col Starting column
- * @return 0 or 1
- */
-static int calculate_comment_body_indent(const char *str, int len, int start_col)
-  {
-  int idx       = 0;
-  int first_len = 0;
-  int last_len  = 0;
-  int width     = 0;
-
-    /* find the last line length */
-  for (idx = len - 1; idx > 0; idx--)
-    {
-    if ((str[idx] == '\n') || (str[idx] == '\r'))
-      {
-      idx++;
-
-      while ((idx < len) && ((str[idx] == ' ') || (str[idx] == '\t')))
-        idx++;
-
-      last_len = len - idx;
-      break;
-      }
-    }
-
-    /* find the first line length */
-  for (idx = 0; idx < len; idx++)
-    {
-    if ((str[idx] == '\n') || (str[idx] == '\r'))
-      {
-      first_len = idx;
-
-      while ((str[first_len - 1] == ' ') || (str[first_len - 1] == '\t'))
-        first_len--;
-
-        /* handle DOS endings */
-      if ((str[idx] == '\r') && (str[idx + 1] == '\n'))
-        idx++;
-
-      idx++;
-      break;
-      }
-    }
-
-    /* Scan the second line */
-  width = 0;
-
-  for (/* nada */; idx < len; idx++)
-    {
-    if ((str[idx] == ' ') || (str[idx] == '\t'))
-      {
-      if (width > 0)
-        break;
-
-      continue;
-      }
-
-    if ((str[idx] == '\n') || (str[idx] == '\r'))
-        /* Done with second line */
-      break;
-
-      /* Count the leading chars */
-    if ((str[idx] == '*') ||
-        (str[idx] == '|') ||
-        (str[idx] == '\\') ||
-        (str[idx] == '#') ||
-        (str[idx] == '+'))
-      width++;
-    else
-      break;
-    }
-
-  //LOG_FMT(LSYS, "%s: first=%d last=%d width=%d\n", __func__, first_len, last_len, width);
-
-    /*TODO: make the first_len minimum (4) configurable? */
-  if ((first_len == last_len) && ((first_len > 4) || first_len == width))
-    return 0;
-
-  return (width == 2) ? 0 : 1;
-  }
-
-/**
- * Outputs the CPP comment at pc.
- * CPP comment combining is done here
- *
- * @return the last chunk output'd
- */
-chunk_t *output_comment_cpp(chunk_t *first)
-  {
-  int col    = first->column;
-  int col_br = 1 + (first->brace_level * cpd.settings[UO_indent_columns].n);
-
-    /* Make sure we have at least one space past the last token */
-  if (first->parent_type == CT_COMMENT_END)
-    {
-    chunk_t *prev = chunk_get_prev(first);
-
-    if (prev != NULL)
-      {
-      int col_min = prev->column + prev->len + 1;
-
-      if (col < col_min)
-        col = col_min;
-      }
-    }
-
-    /* Bump out to the column */
-  output_indent(col, col_br);
-
-  if (!cpd.settings[UO_cmt_cpp_to_c].b)
-    {
-    add_text_len(first->str, first->len);
-    return first;
-    }
-
-    /* If we are grouping, see if there is something to group */
-  bool combined = false;
-
-  if (cpd.settings[UO_cmt_cpp_group].b)
-    {
-      /* next is a newline by definition */
-    chunk_t *next = chunk_get_next(first);
-
-    if ((next != NULL) && (next->nl_count == 1))
-      {
-      next = chunk_get_next(next);
-
-      /**
-       * Only combine the next comment if they are both at indent level or
-       * the second one is NOT at indent or less
-       *
-       * A trailing comment cannot be combined with a comment at indent
-       * level or less
-       */
-      if ((next != NULL) &&
-          (next->type == CT_COMMENT_CPP) &&
-          (((next->column == 1) && (first->column == 1)) ||
-           ((next->column == col_br) && (first->column == col_br)) ||
-           ((next->column > col_br) && (first->parent_type == CT_COMMENT_END))))
-        combined = true;
-      }
-    }
-
-  if (!combined)
-    {
-      /* nothing to group: just output a single line */
-    add_text_len("/*", 2);
-
-    if ((first->str[2] != ' ') && (first->str[2] != '\t'))
-      add_char(' ');
-
-    add_text_len(&first->str[2], first->len - 2);
-    add_text_len(" */", 3);
-    return first;
-    }
-
-  chunk_t *pc   = first;
-  chunk_t *last = first;
-
-    /* Output the first line */
-  add_text_len("/*", 2);
-
-  if (combined && cpd.settings[UO_cmt_cpp_nl_start].b)
-    /* I suppose someone more clever could do this without a goto or
-     * repeating too much code...
-     */
-    goto cpp_newline;
-
-  goto cpp_addline;
-
-    /* Output combined lines */
-  while ((pc = chunk_get_next(pc)) != NULL)
-    {
-    if ((pc->type == CT_NEWLINE) && (pc->nl_count == 1))
-      continue;
-
-    if (pc->type != CT_COMMENT_CPP)
-      break;
-
-    if (((pc->column == 1) && (first->column == 1)) ||
-        ((pc->column == col_br) && (first->column == col_br)) ||
-        ((pc->column > col_br) && (first->parent_type == CT_COMMENT_END)))
-      {
-      last = pc;
-cpp_newline:
-      add_char('\n');
-      output_indent(col, col_br);
-      add_char(' ');
-      add_char(cpd.settings[UO_cmt_star_cont].b ? '*' : ' ');
-cpp_addline:
-
-      if ((pc->str[2] != ' ') && (pc->str[2] != '\t'))
-        add_char(' ');
-
-      add_text_len(&pc->str[2], pc->len - 2);
-      }
-    }
-
-  if (cpd.settings[UO_cmt_cpp_nl_end].b)
-    {
-    add_char('\n');
-    output_indent(col, col_br);
-    }
-
-  add_text_len(" */", 3);
-  return last;
-  }
-
-void output_comment_multi(chunk_t *pc)
-  {
-  int cmt_col = pc->column;
-  const char *cmt_str;
-  int remaining;
-  char ch;
-  chunk_t    *prev;
-  char line[1024];
-  int line_len;
-  int line_count = 0;
-  int ccol;
-  int col_diff = 0;
-  int xtra     = 1;
-
-  prev = chunk_get_prev(pc);
-
-  if ((prev != NULL) && (prev->type != CT_NEWLINE))
-    cmt_col = pc->orig_col;
-  else
-    col_diff = pc->orig_col - pc->column;
-
-  //   fprintf(stderr, "Indenting1 line %d to col %d (orig=%d) col_diff=%d\n",
-  //           pc->orig_line, cmt_col, pc->orig_col, col_diff);
-
-  xtra = calculate_comment_body_indent(pc->str, pc->len, pc->column);
-
-  ccol      = 1;
-  remaining = pc->len;
-  cmt_str   = pc->str;
-  line_len  = 0;
-
-  while (remaining > 0)
-    {
-    ch = *cmt_str;
-    cmt_str++;
-    remaining--;
-
-      /* handle the CRLF and CR endings. convert both to LF */
-    if (ch == '\r')
-      {
-      ch = '\n';
-
-      if (*cmt_str == '\n')
-        {
-        cmt_str++;
-        remaining--;
-        }
-      }
-
-      /* Find the start column */
-    if (line_len == 0)
-      {
-      if (ch == ' ')
-        {
-        ccol++;
-        continue;
-        }
-      else if (ch == '\t')
-        {
-        ccol = calc_next_tab_column(ccol, cpd.settings[UO_input_tab_size].n);
-        continue;
-        }
-      else
-        {
-        //fprintf(stderr, "%d] Text starts in col %d\n", line_count, ccol);
-        }
-      }
-
-    line[line_len++] = ch;
-
-      /* If we just hit an end of line OR we just hit end-of-comment... */
-    if ((ch == '\n') || (remaining == 0))
-      {
-      line_count++;
-
-        /* strip trailing tabs and spaces before the newline */
-      if (ch == '\n')
-        {
-        line_len--;
-
-        while ((line_len > 0) &&
-               ((line[line_len - 1] == ' ') ||
-                (line[line_len - 1] == '\t')))
-          line_len--;
-
-        line[line_len++] = ch;
-        }
-
-      line[line_len] = 0;
-
-      if (line_count == 1)
-        {
-        /* this is the first line - add unchanged */
-
-          /*TODO: need to support indent_with_tabs mode 1 */
-        output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b);
-        add_text_len(line, line_len);
-        }
-      else
-        {
-        /* This is not the first line, so we need to indent to the
-         * correct column.
-         */
-        ccol -= col_diff;
-
-        if (ccol < cmt_col)
-          ccol = cmt_col;
-
-        if (line[0] == '\n')
-          {
-            /* Emtpy line - just a '\n' */
-          if (cpd.settings[UO_cmt_star_cont].b)
-            {
-            output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b);
-            add_text((xtra == 1) ? " *" : "*");
-            }
-
-          add_char('\n');
-          }
-        else
-          {
-            /* If this doesn't start with a '*' or '|' */
-          if ((line[0] != '*') && (line[0] != '|') && (line[0] != '#') &&
-              (line[0] != '\\') && (line[0] != '+'))
-            {
-            output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b);
-
-            if (cpd.settings[UO_cmt_star_cont].b)
-              add_text((xtra == 1) ? " * " : "*  ");
-            else
-              add_text("   ");
-
-            output_to_column(ccol, cpd.settings[UO_indent_with_tabs].b);
-            }
-          else
-            output_to_column(cmt_col + xtra, cpd.settings[UO_indent_with_tabs].b);
-
-          add_text_len(line, line_len);
-          }
-        }
-
-      line_len = 0;
-      ccol     = 1;
-      }
-    }
-  }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10000-621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10000-621_this-spacing.cpp
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10000-621_this-spacing.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-result = (Foo)this;

-result = (Foo)foo;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
deleted file mode 100644
index c466b45c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-f()

-{

-	{

-		{

-			{

-#                               if 1

-				return 0;

-#                               endif

-

-				#if 1

-				return 0;

-				#endif

-			}

-		}

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10002-623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10002-623_caret-spacing.cpp
deleted file mode 100644
index 5058ea4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10002-623_caret-spacing.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Foo^ foo = dynamic_cast<Bar^>(bar);

-Foo* foo = dynamic_cast<Bar*>(bar);

-x = a ^ b;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
deleted file mode 100644
index 4160ecca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-typedef void (*func)();
-typedef void (__stdcall *func)();
-
-typedef std::vector<string *> *(*Finder )(std::string *);
-typedef vector<std::string *> *(*Handler )(std::map< std::string *, vector *> *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
deleted file mode 100644
index bb6b14fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-extern "C" int* i;

-extern "C" { int* i; }

-int* i;

-extern "C" NSString* i;

-extern "C" { NSString* i; }

-NSString* i;

-

-__attribute__((visibility ("default"))) int* i;

-__attribute__((visibility ("default"))) NSString* i;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10005-define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10005-define-indentation.cpp
deleted file mode 100644
index 24370df9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10005-define-indentation.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-        #define EXTRACTX360ACHIEVEMENT  X360Achievement_INTERNAL& mapping = ExtractMonoObjectData<X360Achievement_INTERNAL>(self); /*huh?*/ \

-                                        const XACHIEVEMENT_DETAILS* achievement = xenon::Achievements::GetDetails(mapping.m_index);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10006-dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10006-dont-detab-strings.cpp
deleted file mode 100644
index 11352d82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10006-dont-detab-strings.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void f() {

-	auto x = "\ttest\t \t \t \t\t...   ???";

-// *INDENT-OFF*

-	 			auto x = "	test\t 	 	 		...   ???";

-// *INDENT-ON*

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10007-dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10007-dont-process-defines.cpp
deleted file mode 100644
index 56f6852e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10007-dont-process-defines.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define inline_2 __forceinline

-#define inline(i) inline_##i

-#define foo(x) inline(2) x()

-#define PLD(reg,offset)    pld    [reg, offset] \

-    pld    [reg, offset] \

-    pld     [reg, offset]

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
deleted file mode 100644
index dfd33ac7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// test \

-// blah()

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
deleted file mode 100644
index ea1c724e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#define inline_2 __forceinline

-#define inline(i) inline_##i

-inline(2) f()

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10020-macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10020-macro_spaces.cpp
deleted file mode 100644
index 55a50766..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10020-macro_spaces.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#if (WINVER < 0x0601)

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10021-braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10021-braces_align.cpp
deleted file mode 100644
index 40d966f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10021-braces_align.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-char *array_assign[2][4] =

-{

-    {

-        // foo

-        {"foo"},

-        {"foo@1"}, {"foo@2"}, {"foo@3"}

-    },

-    {

-        // bar

-        {"bar"},

-        {"bar@1"}, {"bar@2"}, {"bar@3"}

-    }

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10022-foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10022-foreach.cpp
deleted file mode 100644
index 2862e6ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10022-foreach.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void foo()

-{

-    for_each(it.begin(), it.end(), func);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10023-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10023-for_auto.cpp
deleted file mode 100644
index 775031a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10023-for_auto.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-void foo()
-{
-    for (auto const& item : list)
-        bar(item);
-    for (const auto& item : list)
-        bar(item);
-    for (auto& item : list)
-        bar(item);
-
-    auto* var = bar();
-    auto& var = bar();
-    auto var = bar();
-    auto const* var = bar();
-    auto const& var = bar();
-    auto const var = bar();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10024-ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10024-ifcomment.cpp
deleted file mode 100644
index b41c5c6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10024-ifcomment.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-if (true)               // indent_relative_single_line_comments = false

-    return;

-if (foo)     // true

-{

-    bar(1);  // action 1

-}

-else         // false

-{

-    bar(2);  // action 2

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10025-qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10025-qtargs.cpp
deleted file mode 100644
index 01d94543..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10025-qtargs.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo()

-{

-    QObject::connect(m_NetworkReply,

-        SIGNAL(error(QNetworkReply::NetworkError)),

-        this,

-        SLOT(NetworkReplyError(QNetworkReply::NetworkError)));

-    QObject::connect(m_NetworkReply,

-        SIGNAL(uploadProgress(qint64, qint64)),

-        this,

-        SLOT(NetworkReplyUploadProgress(qint64, qint64)));

-    connect(&m_SendReportThread, SIGNAL(ProgressChanged(size_t, size_t)),

-        SLOT(OnReportProgressChanged(size_t, size_t)));

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
deleted file mode 100644
index b188c210..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void f(int i)
-{
-	switch(i)
-	{
-	case 1 ... 2:
-	{
-		break;
-	}
-	case 3 ... 5:
-		break;
-
-	default:
-		break
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10027-Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10027-Issue_3058.cpp
deleted file mode 100644
index 09e1dc92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10027-Issue_3058.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-KJS::Value KJS::KateJSViewProtoFunc::call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args)
-{
-  switch (id)
-  {
-    case KateJSView::SetCursorPositionReal:
-    {
-      return KJS::Boolean( view->setCursorPositionReal( args[0].toUInt32(exec), args[1].toUInt32(exec) ) );
-    }
-
-    // SelectionInterface goes in the view, in anticipation of the future
-    case KateJSView::Selection:
-    {
-      return KJS::String( view->selection() );
-    }
-  }
-
-  return KJS::Undefined();
-}
-
-void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
-                                 uint &attrCol, bool &unclosedTag)
-{
-  for(pos = 0; pos < len; ++pos) {
-    int ch = text.at(pos).unicode();
-    switch(ch) {
-      case '<':
-      {
-        ++numTags;
-        break;
-      }
-
-      // don't indent because of DOCTYPE, comment, CDATA, etc.
-      case '!':
-      {
-        if(lastCh == '<') --numTags;
-        break;
-      }
-
-      // don't indent because of xml decl or PI
-      case '?':
-      {
-        if(lastCh == '<') --numTags;
-        break;
-      }
-    }
-  }
-}
-
-static YYSIZE_T yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-  {
-    for (;;)
-      switch (*++yyp)
-      {
-        case '\\':
-        {
-          if (*++yyp != '\\')
-            yyres[yyn] = *yyp;
-        }
-        /* Fall through.  */
-        default:
-        {
-          if (yyres)
-            yyres[yyn] = *yyp;
-          yyn++;
-          break;
-        }
-      }
-  }
-  return yystpcpy (yyres, yystr) - yyres;
-}
-
-Value RegExpProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args)
-{
-  if (!thisObj.inherits(&RegExpImp::info)) {
-    if (thisObj.inherits(&RegExpPrototypeImp::info)) {
-      switch (id) {
-        case ToString:
-        { return String("//");              // FireFox returns /(?:)/
-        }
-      }
-    }
-    return err;
-  }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10047-UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10047-UNI-1334.cpp
deleted file mode 100644
index 9a856f91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10047-UNI-1334.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// This should not be screwing with the trailing backslash and indentation of contents!

-// unless it's on the first line where it's controlled by sp_before_nl_cont which we have set on add.

-// Devs should expect misalignment of the nl_cont tokens because we're not messing with the nl_cont from the define body.

-

-#define MY_DEFINE(param1, param2) \

-    my_long_foo_function(param1);\

-    bar(param2);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10048-UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10048-UNI-1335.cpp
deleted file mode 100644
index 891b945a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10048-UNI-1335.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Change in Configuration\UnityConfigure.h:

-

-    #define FOO_MACRO 0 /////@TODO: COMMENT?????

-// ^^^ space removed after 0

-

-// Foo\Bar\Baz\Fizz\Test.cpp

-

-    #define BAR_MACRO   FOO_BAR_MACRO //FOO_BAR_BAZ_NONE

-// ^^^ space removed after _MACRO

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10050-UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10050-UNI-1337.cpp
deleted file mode 100644
index 59635c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10050-UNI-1337.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Runtime\Allocator\BucketAllocator.cpp

-

-void foo()

-{

-    void* p1 = new(ptr) Block(bucketsSize);

-    // becomes...

-    void* p1 = new(ptr)Block(bucketsSize);

-    // missing space after ')'

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10052-UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10052-UNI-1339.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10052-UNI-1339.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-auto c = a < b >> 1;

-auto c = a < b;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10053-UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10053-UNI-1340.cpp
deleted file mode 100644
index 2a96aa31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10053-UNI-1340.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace dudeNamespace { class ForwardFooClass; }

-

-namespace dudeNamespace { class ForwardFooClass; }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10054-UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10054-UNI-1344.cpp
deleted file mode 100644
index 43c4429e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10054-UNI-1344.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Asm blocks have their own special indentation where lables must remain at indent 0 relative to __asm__ block.

-// They few ways of being opened and closed depending on the compiler.

-// For now, we can at least detect and ignore the contents, including alignment.

-

-// Workaround: can always fall back on disable/enable_processing_cmt.

-

-void foo()

-{

-    int head, bar;

-    __asm__ __volatile__

-    (

-        "movq %0,%%xmm0\n\t"    /* asm template */

-    "0:\n\t"

-        "bar	%0, [%4]\n\t"   // in template

-    "1:\n\t"

-        : "=a", (bar)

-        : "=&b", (&head), "+m", (bar)

-        : "cc"

-    );

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10056-UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10056-UNI-1346.cpp
deleted file mode 100644
index af875c3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10056-UNI-1346.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Fix doxygen support to include member groups

-

-// See http://www.stack.nl/~dimitri/doxygen/manual/grouping.html#memgroup

-

-// Note that the spec says three slashes, but their example has only two slashes.

-

-// Once this is done, we can try turning on sp_cmt_cpp_start in Uncrustify.Common-CStyle.cfg.

-

-/// Bucket allocator is used for allocations up to 64 bytes of memory.

-/// It is represented by 4 blocks of a fixed-size "buckets" (for allocations of 16/32/48/64 bytes of memory).

-/// Allocation is lockless, blocks are only growable.

-class Class

-{

-public:

-    ///@{ Doxygen group 1

-    virtual void*  Foo();

-    virtual void*  Bar();

-    ///@}

-

-    //@{ Doxygen group 2

-    virtual void*  Foo();

-    virtual void*  Bar();

-    //@}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10057-UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10057-UNI-1347.cpp
deleted file mode 100644
index ec8f350b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10057-UNI-1347.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Extern "C" blocks need an alignment option somehow. I can do a "set NAMESPACE extern" in the cfg but that will probably screw other stuff up.

-

-// See External\Audio\NativePluginDemo\NativeCode\TeleportLib.h for an example. Yeah it's in external (so have to force-format it) but it's a good case.

-

-// (Actually it's in https://bitbucket.org/Unity-Technologies/nativeaudioplugins, but just published here to external)

-

-extern "C"

-{

-	typedef EXPORT_API int (*Foo)(int arg);

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10060-UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10060-UNI-1350.cpp
deleted file mode 100644
index 7353e915..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10060-UNI-1350.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Can't set sp_inside_braces_struct=add otherwise Uncrustify starts applying it to initializers combined with old-C-style struct usage.

-

-struct in_addr addr = {0};

-// ... --> ...

-struct in_addr addr = { 0 };

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10062-UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10062-UNI-1356.cpp
deleted file mode 100644
index c70ca61d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10062-UNI-1356.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Hi,

-// When using "space only" and "indent continue", I notice a wrong indentation in C language (at least)

-// function call when the retrun value is assigned to a variable and the call is split in two or more line.

-// In that case the indent is twice the indent set in "indent_continue"

-// This only appears when "indent_with_tabs" is set to 0 "space only" and 1

-// "indent with tabs to brace level, align with spaces"

-// Version tested:

-// 0.59: good indentation

-// 0.60: wrong indentation

-// master (sha1 fc5228e): wrong indentation

-// Here are some details about thats issue:

-// orignal code

-// The long line are manually split and not indented to test uncrustify indent

-

-int main (int argc, char *argv[])

-{

-  double a_very_long_variable = test (foobar1, foobar2, foobar3, foobar4,

-      foobar5, foobar6);

-

-  double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +

-      asdfasdfasdf - asdfasdf + 56598;

-

-  testadsfa (dfasdf, fdssaf, dsfasdf, sadfa, sadfas, fsadfa,

-      aaafsdfa, afsd, asfdas, asdfa, asfasdfa, afsda, asfdasfds, asdfasf);

-

-  return 0;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10063-UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10063-UNI-1358.cpp
deleted file mode 100644
index 120aa9c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10063-UNI-1358.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// MIDL_INTERFACE includes 'class' in its definition but is not tokenised as such

-// A pretty common pattern would be nice to have proper formatting.

-

-EXTERN_C const IID IID_IFileDialogEvents;

-

-MIDL_INTERFACE("973510db-7d7f-452b-8975-74a85828d354")

-IFileDialogEvents : public IUnknown

-{

-public:

-    virtual HRESULT STDMETHODCALLTYPE OnStuff(

-        /* [in] */ __RPC__in_opt IFileDialog *pfd,

-        /* [in] */ __RPC__in_opt IShellItem *psi,

-        /* [out] */ __RPC__out FDE_SHAREVIOLATION_RESPONSE *pGoodResponse,

-        /* [out] */ __RPC__out FDE_OVERWRITE_RESPONSE *pBadResponse) = 0;

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10069-UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10069-UNI-1980.cpp
deleted file mode 100644
index 97940716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10069-UNI-1980.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// First: scan more FAKE_FUNCTION diffs and see how common this problem is.

-

-// The & should be attached to RefType because it's in a function prototype. Most likely being detected as ARITH.

-

-// We need to figure out how to support this with some setting in our cpp cfg for uncrustify.

-

-FAKE_FUNCTION(Boo, RefType& (void));

-FAKE_FUNCTION(Foo, (MyAwesomeType* (void)));

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10070-UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10070-UNI-1981.cpp
deleted file mode 100644
index d4f74dc3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10070-UNI-1981.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#if DOXYGEN

-class Class

-#else

-struct Struct

-#endif

-{

-    UInt32  m_myAwesomeMember1          : kEnumValue

-    UInt32  m_myAwesomeMember11         : kEnumValue

-    UInt32  m_myAwesomeMember111        : 1;

-    UInt32  m_myAwesomeMember1111       : 1;

-    UInt32  m_myAwesomeMember11111      : 1;

-    UInt32  m_myAwesomeMember111111     : 1;

-    UInt32  m_myAwesomeMember1111111    : 1;

-    UInt32  m_myAwesomeMember11111111   : kEnumValue

-    UInt32  m_myAwesomeMember11111111   : kEnumValue

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10071-UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10071-UNI-1983.cpp
deleted file mode 100644
index e7d9de6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10071-UNI-1983.cpp
+++ /dev/null
@@ -1 +0,0 @@
-typedef HRESULT (WINAPI *Foo)(const void* pData, SIZE_T size, UINT flags, const char* szStr, D3D10BlobHack** ppBlob);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10079-UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10079-UNI-9650.cpp
deleted file mode 100644
index 0d6cdb46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10079-UNI-9650.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// make sure that we ignore sp_inside_angle=remove if it will cause a digraph to be created

-

-ops.pProgressCallback = reinterpret_cast<      ::ProgressCallback*>(progressCallback);

-ops.pProgressCallback = reinterpret_cast< ::ProgressCallback*>(progressCallback);

-ops.pProgressCallback = reinterpret_cast<::ProgressCallback*>(progressCallback);

-ops.pProgressCallback = reinterpret_cast<ProgressCallback*>(progressCallback);

-ops.pProgressCallback = reinterpret_cast<ProgressCallback*>(progressCallback);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10080-UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10080-UNI-10496.cpp
deleted file mode 100644
index 81122be8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10080-UNI-10496.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-friend class ::GameObject;

-void GameObject::Foo();

-

-auto x = ::GlobalFunc();

-

-friend void ::testing::PrintDebugInformationForFakesInUse();

-

-template<class TransferFunction>

-void ::DateTime::Transfer(TransferFunction & transfer)

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10100-issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10100-issue_564.cpp
deleted file mode 100644
index ac5fbef3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10100-issue_564.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-CGPathMoveToPoint   (bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale -3, aPoint.y - aLength+1 +4);

-CGPathAddLineToPoint(bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale,    aPoint.y - aLength+1   );

-CGPathAddLineToPoint(bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale +3, aPoint.y - aLength+1 +4);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp
deleted file mode 100644
index 6621d455..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class A

-{

-// crash (two parameter, 2nd string parameter has space)

-    void check(const QObject *object, const QStringList &strList=QStringList(QString(QLatin1String("one two"))));

-// no crash (two parameter, 2nd string parameter has no space)

-    void check(const QObject *object, const QStringList &strList= QStringList(QString(QLatin1String("one"))));

-// no crash (removed QLatin1String)

-    void check(const QObject *object, const QStringList &strList =QStringList(QString(("one two"))));

-// no crash (removed QString(QLatin1String))

-    void check(const QObject *object, const QStringList &strList = QStringList());

-// no crash (removed 1st parameter only)

-    void check(const QStringList &strList = QStringList(QString(QLatin1String("one two"))));

-};

-int A=5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp-a b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp-a
deleted file mode 100644
index a1065b4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp-a
+++ /dev/null
@@ -1,13 +0,0 @@
-class A
-{
-// crash (two parameter, 2nd string parameter has space)
-    void check(const QObject *object, const QStringList &strList = QStringList(QString(QLatin1String("one two"))));
-// no crash (two parameter, 2nd string parameter has no space)
-    void check(const QObject *object, const QStringList &strList = QStringList(QString(QLatin1String("one"))));
-// no crash (removed QLatin1String)
-    void check(const QObject *object, const QStringList &strList = QStringList(QString(("one two"))));
-// no crash (removed QString(QLatin1String))
-    void check(const QObject *object, const QStringList &strList = QStringList());
-// no crash (removed 1st parameter only)
-    void check(const QStringList &strList = QStringList(QString(QLatin1String("one two"))));
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10102-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10102-issue_574.cpp
deleted file mode 100644
index 0f3b7da3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10102-issue_574.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class A

-{

-// crash (two parameter, 2nd string parameter has space)

-    void check(const QObject *object, const QStringList &strList =QStringList(QString(QLatin1String("one two"))));

-// no crash (two parameter, 2nd string parameter has no space)

-    void check(const QObject *object, const QStringList &strList =QStringList(QString(QLatin1String("one"))));

-// no crash (removed QLatin1String)

-    void check(const QObject *object, const QStringList &strList =QStringList(QString(("one two"))));

-// no crash (removed QString(QLatin1String))

-    void check(const QObject *object, const QStringList &strList =QStringList());

-// no crash (removed 1st parameter only)

-    void check(const QStringList &strList =QStringList(QString(QLatin1String("one two"))));

-};

-int A =5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10103-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10103-issue_574.cpp
deleted file mode 100644
index b87e76fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10103-issue_574.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class A

-{

-// crash (two parameter, 2nd string parameter has space)

-    void check(const QObject *object, const QStringList &strList= QStringList(QString(QLatin1String("one two"))));

-// no crash (two parameter, 2nd string parameter has no space)

-    void check(const QObject *object, const QStringList &strList= QStringList(QString(QLatin1String("one"))));

-// no crash (removed QLatin1String)

-    void check(const QObject *object, const QStringList &strList= QStringList(QString(("one two"))));

-// no crash (removed QString(QLatin1String))

-    void check(const QObject *object, const QStringList &strList= QStringList());

-// no crash (removed 1st parameter only)

-    void check(const QStringList &strList= QStringList(QString(QLatin1String("one two"))));

-};

-int A= 5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10566-issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10566-issue_1752.cpp
deleted file mode 100644
index 8e16cfa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10566-issue_1752.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#define WARN_IF(EXP) \
-	do { if (EXP) \
-	     fprintf (stderr, "Warning: " #EXP "\n"); } \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/11000-UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/11000-UNI-12046.cpp
deleted file mode 100644
index 5ffc0da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/11000-UNI-12046.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-//The space shouldn't be removed. This is a STRUCT
-struct ALIGN_TYPE(16) StructName;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20002-UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20002-UNI-32657.cpp
deleted file mode 100644
index eb7655da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20002-UNI-32657.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void UNITY_INTERFACE_API XREnvironment::DepthSetNumberOfPointsImpl(

-    IUnityXRDepthDataAllocator* allocator,

-    size_t numPoints)

-{

-}

-

-UnityXRRaycastHit* (UNITY_INTERFACE_API* Raycast_SetNumberOfHits)(

-    IUnityXRRaycastAllocator* allocator,

-    size_t numHits);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20011-UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20011-UNI-38381.cpp
deleted file mode 100644
index 701b55b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20011-UNI-38381.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#if UNITY_DEFER_GRAPHICS_JOBS_SCHEDULE
-void GfxDevice::ScheduleAsyncJob(AsyncCommandJobFunc* jobFunc, GfxDeviceAsyncCommand* cmd, const JobFence& depends, JobBatchDispatcher& dispatcher)
-#else
-JobFence& GfxDevice::ScheduleAsyncJob(AsyncCommandJobFunc* jobFunc, GfxDeviceAsyncCommand* cmd, const JobFence& depends, JobBatchDispatcher& dispatcher)
-#endif // #if UNITY_DEFER_GRAPHICS_JOBS_SCHEDULE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30000-cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30000-cout.cpp
deleted file mode 100644
index f099751f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30000-cout.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void foo()
-{
-   cout.setf(ios::showpoint);
-   cout.setf(ios::floatfield, ios::fixed);
-
-   what.the.hell.cout << "hello"
-                      << "world!"
-                      << "This"
-                      << "is a"
-                      << "test!";
-
-   *aaaaaa = (bbbbb(cccccPtr->ddd) & YYYYYYYYYYYYYYYYYYYYYYYY) |
-             ((bbbbb(cccccPtr->nnnnnnnn) << ZZZZZZZZZZZZZZZZZZZZZZZZZZZ)
-              & WWWWWWWWWWWWWWWWWWWWWWWWWW) | ((bbbbb(cccccPtr->hhhhhhhhhhhhhh)
-                                                << FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-                                               & EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30001-alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30001-alt_tokens.cpp
deleted file mode 100644
index 02083b88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30001-alt_tokens.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// how to use digraps:
-// https://en.wikipedia.org/wiki/Digraphs_and_trigraphs
-
-int main(int argc, char *argv[]) <% // {
-int array<: 10 :>;                    // int array[10];
-%>                                  // }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30002-constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30002-constructor.cpp
deleted file mode 100644
index f7cbb30d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30002-constructor.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-IMPLEMENT_DYNAMIC(CPropertiesDlg, CDialog)
-CPropertiesDlg::CPropertiesDlg(CPtcMsgSimControlModule *pcmPtcMsg,
-                               CWnd                    *pParent /*=NULL*/) :
-   CDialog(CPropertiesDlg::IDD, pParent),
-   m_pspRouter(pcmPtcMsg),
-   m_pspScm(pcmPtcMsg)
-{
-   m_pcmPtcMsg = pcmPtcMsg;
-}
-
-CPropertiesDlg::~CPropertiesDlg()
-{
-}
-
-void CPropertiesDlg::DoDataExchange(CDataExchange *pDX)
-{
-   CDialog::DoDataExchange(pDX);
-}
-
-CFooBar::CFooBar(CWnd *pParent /*=NULL*/)
-   : CDialog(CFooBar::IDD, pParent),
-   m_parent(pParent)
-{
-   //{{AFX_DATA_INIT(CRouterBrowser)
-   //}}AFX_DATA_INIT
-
-   m_nFoo = 0;
-   m_nBar = 0;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30003-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30003-strings.cpp
deleted file mode 100644
index acef8744..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30003-strings.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-void foo()
-{
-   BSTR test = L"SID";
-   CHAR s[]  = "This is a \"test\"";
-   CHAR ch   = 'a';
-}
-
-
-/* The 'u8', 'u', and 'U' prefixes */
-const char     *s1 = u8"I'm a UTF-8 string.";
-const char16_t *s2 = u"This is a UTF-16 string.";
-const char32_t *s3 = U"This is a UTF-32 string.";
-
-const char     c1 = u8'1';
-const char16_t c2 = u'2';
-const char32_t c3 = U'4';
-const wchar_t  c4 = L'w';
-const char16_t u  = u'\u007f';
-
-/* The 'R' and 'R"delim(' prefixes */
-const char *r1 = R"(Xhe String Data \ Stuff " )";
-const char *r2 = R"delimiter(The String Data \ Stuff ")delimiter";
-
-/* Multiline string */
-auto foo = R"FOO"(
- some
- text
- and
- more
- text
-)FOO"";
-
-/* Combo */
-const char     *c1 = u8R"XXX(I'm a "raw UTF-8" string.)XXX";
-const char16_t *c2 = uR"*(This is a "raw UTF-16" string.)*";
-const char32_t *c3 = UR"(This is a "raw UTF-32" string.)";
-
-/* user-defined */
-OutputType operator "" _Suffix(unsigned long long);
-OutputType operator "" _Suffix(long double);
-
-OutputType some_variable    = 1234_Suffix;   // uses the first function
-OutputType another_variable = 3.1416_Suffix; // uses the second function
-
-OutputType operator "" _Suffix(const char *string_values, size_t num_chars);
-OutputType operator "" _Suffix(const wchar_t *string_values, size_t num_chars);
-OutputType operator "" _Suffix(const char16_t *string_values, size_t num_chars);
-OutputType operator "" _Suffix(const char32_t *string_values, size_t num_chars);
-
-OutputType some_variable = "1234"_Suffix;      //Calls the const char * version
-OutputType some_variable = u8"1234"_Suffix;    //Calls the const char * version
-OutputType some_variable = L"1234"_Suffix;     //Calls the const wchar_t * version
-OutputType some_variable = u"1234"_Suffix;     //Calls the const char16_t * version
-OutputType some_variable = U"1234"_Suffix;     //Calls the const char32_t * version
-
-/* Some stuff that should NOT be detected as a C++0x  user-defined literal */
-sscanf(text, "%" SCNx64, &val);
-printf("Val=%" PRIx64 "\n", val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30010-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30010-class.h
deleted file mode 100644
index 2293d9c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30010-class.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _FOO_BAR_H_INCLUDED_
-#define _FOO_BAR_H_INCLUDED_
-
-class CFooBarDlg : public CDialog
-{
-// Construction
- public:
-   CFooBarDlg(CFooBar *pDataMan,
-              CWnd    *pParent=NULL);
-   virtual ~CFooBarDlg();
-
-   void Initialize(BYTE nDelay=100);
-
-   UINT GetCount() { return(m_nCount); }
-
-   void SetCount(int count=1)
-   {
-      if ((count > 0) && (count < MAX_COUNT))
-      {
-         m_nCount = count;
-      }
-   }
-
-   // Dialog Data
-   //{{AFX_DATA(CATCSMgrDlg)
-   enum { IDD = IDD_ATCS_MGR_DLG };
-   //}}AFX_DATA
-
- protected:
-   int m_nCount;
-
-// Overrides
-// ClassWizard generated virtual function overrides
-//{{AFX_VIRTUAL(CATCSMgrDlg)
- protected:
-   virtual void DoDataExchange(CDataExchange *pDX);    // DDX/DDV support
-   //}}AFX_VIRTUAL
-
-// Implementation
-
-   // Generated message map functions
-   //{{AFX_MSG(CATCSMgrDlg)
-   virtual BOOL OnInitDialog();
-   afx_msg void OnTimer(UINT nIDEvent);
-   afx_msg void OnBtnSendFooBar();
-   afx_msg void OnSelchangeFooBarCombo();
-   //}}AFX_MSG
-   DECLARE_MESSAGE_MAP()
-};
-
-#endif   /* _FOO_BAR_H_INCLUDED_ */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30011-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30011-misc.cpp
deleted file mode 100644
index 9e3b8c5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30011-misc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/* Not detected as a prototype? Spacing wrong. */
-static struct my_entry *get_first_entry(const CHAR *blah);
-static CFooo::entry *get_next_entry(const CHAR *blah);
-static struct my_entry *get_next_entry(const CHAR *blah);
-
-/* Not handling prototype params: */
-typedef void (*function_name)(my_t *p_my, int foo);
-typedef void (*function_name)(my_t *, int);
-
-typedef enum
-{
-   one                               = 1,
-   three                             = 3,
-   five_hundred                      = 5,
-   a_really_really_big_number        = 6,
-   two                               = 7,
-   a_really_really_really_big_number = 8,
-} yuck_t;
-
-const char *names[] =
-{
-   one                               = "one",
-   three                             = "three",
-   five_hundred                      = "five_hundred",
-   a_really_really_big_number        = "a_really_really_big_number",
-   two                               = "two",
-   a_really_really_really_big_number = "a_really_really_really_big_number",
-};
-
-bool foo(char c)
-{
-   xWindow *pWindow = ::RelatedWindow();
-
-   /* space between ] and ( */
-   function_list[idx](param);
-
-   /* Indenting with multiple members: */
-   sass.asdfvas->asdfasd[asdfasdf].
-      asdfasdf = 5;
-
-   ::asdasda::adasd::
-      asdfasdf = 5;
-
-   dookie::wookie << "asd"
-                  << "bag"
-                  << "sag";
-
-   sp_sign = 4 - -5;
-   sp_sign = -sp_sign;
-   sp_sign = 4 + +7;
-   sp_sign = +sp_sign;
-   sp_sign = 4 + +sp_sign;
-}
-
-#ifndef abc
-
-#define abc    123 /* some comment */
-
-#endif /* another comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30012-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30012-misc2.cpp
deleted file mode 100644
index c5febbac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30012-misc2.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-   I tried to modify the spaces when using casts like static_cast etc. by
-   using sp_before_angle, sp_after_angle and sp_inside_angle. Even setting
-   all of those options to remove results in the following:
- */
-
-myvar = dynamic_cast<MyClass<T>*>(other);
-// expected:
-//myvar = dynamic_cast<MyClass<T>*>(other);
-
-/*
-   Sometime pointers and references are still not detected correctly in
-   special cases - i guess.
- */
-//When using "sp_before_ptr_star = remove" the result is:
-typedef std::list<StreamedData*>::iterator iterator;
-//typedef std::list<StreamedData *>::iterator iterator;
-//------------------------------^ This space show not be there
-
-typedef void (T::*Routine)(void);
-
-//Similar with "sp_before_byref = remove":
-unsigned long allocate(unsigned long size, void*& p);
-
-//unsigned long allocate(unsigned long size, void* & p);
-//------------------------------------------------^ The same here
-
-void foo(void)
-{
-  List<byte> bob = new List<byte>();
-
-  /* Align assignments */
-  align_assign(chunk_get_head(),
-               cpd.settings [UO_align_assign_span].n,
-               cpd.settings [UO_align_assign_thresh].n);
-}
-
-Args::Args(int argc, char**argv)
-{
-  m_count = argc;
-  m_values = argv;
-  int len = (argc >> 3) + 1;
-  m_used = new UINT8 [len];
-  if (m_used != NULL) {
-    memset(m_used, 0, len);
-  }
-}
-
-void Args(int argc, char**argv)
-{
-  m_count = argc;
-  m_values = argv;
-  int len = (argc >> 3) + 1;
-  m_used = new UINT8 [len];
-  if (m_used != NULL) {
-    memset(m_used, 0, len);
-  }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30013-sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30013-sim.h
deleted file mode 100644
index 835ae666..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30013-sim.h
+++ /dev/null
@@ -1,48 +0,0 @@
-namespace ns {
-template<typename T, template<typename>class TOtherClass>
-class Example
-{
-  int foo;
-}
-
-}
-
-template<class T>
-class Example
-{
-  T getValue() const;
-
-  /** A pointer to a T returning function in the software environment */
-  T (FunctionProvider::* pF)();
-
-};
-
-
-#if !defined(EVERYTHING_OK)
-#error Define EVERYTHING_OK if you would like to compile your code \
-  or not if you would like to stop!
-#endif
-
-
-template<class V>
-class Example
-{
-  Vector2<V>() :
-    x(1),
-    y(1)
-  {}
-
-  Vector2<double>() :
-    x(1.0),
-    y(1.0)
-  {}
-
-  Vector2<float>() :
-    x(1.0f),
-    y(1.0f)
-  {}
-
-  V x;
-  V y;
-
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30014-ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30014-ctor-var.cpp
deleted file mode 100644
index 2551d8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30014-ctor-var.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-int foo()
-{
-   TextBody textbody(GetBody().GetText());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30015-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30015-exception.cpp
deleted file mode 100644
index 75a4f97e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30015-exception.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <iostream>
-
-
-void foo()
-{
-   char *buf;
-
-   try
-   {
-      buf = new unsigned char[1024];
-      if (buf == 0)
-      {
-         throw "Out of memory";
-      }
-   }
-   catch (char *str)
-   {
-      cout << "Exception: " << str << '\n';
-   }
-}
-
-void bar()
-{
-   char *buf;
-
-   try
-   {
-      buf = new unsigned char[1024];
-      if (buf == 0)
-      {
-         throw "Out of memory";
-      }
-   }
-   catch (char *str)
-   {
-      cout << "Exception: " << str << '\n';
-   }
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30016-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30016-custom-open.cpp
deleted file mode 100644
index 234f5591..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30016-custom-open.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-void className::set(const objectName& obj)
-{
-	statement1();
-	MACRO_BEGIN_STUFF(param)
-		DOSTUFF(params)
-	MACRO_ELSE_STUFF()
-		DOMORESTUFF(moreparams)
-		junk = 1;
-		MACRO2_BEGIN_STUFF
-			junk += 3;
-		MACRO2_ELSE_STUFF
-			junk += 4;
-		MACRO2_END_STUFF
-		DOLASTSTUFF(lastparams)
-	MACRO_END_STUFF()
-	statement2();
-}
-
-
-MACRO2_BEGIN_STUFF
-	// comment
-MACRO2_ELSE_STUFF
-	/* Comment */
-MACRO2_END_STUFF
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30017-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30017-custom-open.cpp
deleted file mode 100644
index 6acd92e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30017-custom-open.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-void className::set(const objectName& obj)
-{
-    statement1();
-    MACRO_BEGIN_STUFF(param)
-        DOSTUFF(params)
-    MACRO_ELSE_STUFF()
-        DOMORESTUFF(moreparams)
-        junk = 1;
-        MACRO2_BEGIN_STUFF
-            junk += 3;
-        MACRO2_ELSE_STUFF
-            junk += 4;
-        MACRO2_END_STUFF
-        DOLASTSTUFF(lastparams)
-    MACRO_END_STUFF()
-    statement2();
-}
-
-
-MACRO2_BEGIN_STUFF
-    // comment
-MACRO2_ELSE_STUFF
-    /* Comment */
-MACRO2_END_STUFF
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30018-class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30018-class-addr.h
deleted file mode 100644
index 042579dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30018-class-addr.h
+++ /dev/null
@@ -1,11 +0,0 @@
-class C
-{
- public:
-   A         *B;
-   C&        D;
-   const C&  D;
-   static C& D;
-   public C& D;
-   E = c & D;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30019-wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30019-wacky-template.cpp
deleted file mode 100644
index cf6e5c87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30019-wacky-template.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-template<typename flt_t>
-template<typename gamma_t, typename gamma2_t, typename alpha_t, typename
-         beta_t, typename tail_extrinsic_t, typename rec_tail_t>
-
-void turbo_dec_1_15<flt_t>::compute_tail(gamma_t const&    gamma,
-                                         gamma2_t const&   gamma2,
-                                         alpha_t const&    alpha,
-                                         beta_t const&     beta,
-                                         tail_extrinsic_t& tail_extrinsic,
-                                         rec_tail_t const& rec_tail)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30020-bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30020-bool.cpp
deleted file mode 100644
index 9f9e55b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30020-bool.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-bool foo(char c)
-{
-   if (c == 'a')
-   {
-      return(true);
-   }
-   else
-   {
-      return(false);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30021-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30021-byref.cpp
deleted file mode 100644
index 87f6c44a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30021-byref.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-bool foo(int& idx)
-{
-   if (idx < m_count)
-   {
-      idx++;
-      return(m_bool[idx - 1]);
-   }
-   return(false);
-}
-
-class Foo {
- public:
-   Foo();
-   Foo(const Foo& f);
-};
-
-class NS::Foo {
- public:
-   Foo(Bar& b);
-};
-
-template<class T> class ListManager
-{
- protected:
-   T head;
-
- public:
-   ListManager()
-   {
-      head.next = head.prev = &head;
-   }
-
-   ListManager(const ListManager& ref)
-   {
-      head.next = head.prev = &head;
-   }
-}
-
-const Foo& Foo::operator ==(Foo& me)
-{
-   ::sockaddr *ptr = (::sockaddr *)&host;
-
-   return(me);
-}
-
-MyType& MyClass::myMethode()
-{
-   const MyType& t = getSomewhere();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30022-extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30022-extern_c.h
deleted file mode 100644
index a97d93b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30022-extern_c.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef cRecordMarking_HEADER
-#define cRecordMarking_HEADER
-
-#include "DIS/cPduSnapshot.h"
-
-typedef void *disConnectionH;
-
-#ifdef __cplusplus
-extern "C"
-#endif
-{
-   disConnectionH createDisConnection();
-
-   void           setAddressAndPort_DisConnect(disConnectionH record, const char *addr);
-
-   /* Open network connection */
-   int open_DisConnect(disConnectionH record);
-
-   /* Close network connection */
-   void close_DisConnect(disConnectionH record);
-
-   /* Send one pdu */
-   int sendPdu_DisConnect(disConnectionH record, pduSnapshotH pdu);
-
-   /* Receive one pdu */
-   int  recvPdu_DisConnect(disConnectionH record, pduSnapshotH pdu);
-
-   void FreeDisConnection(disConnectionH connection);
-}
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30023-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30023-templates.cpp
deleted file mode 100644
index 239d6865..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30023-templates.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-#include <list>
-#include <map>
-#include <vector>
-
-#define MACRO(T)    f<T>()
-
-class MyClass
-{
- public:
-   std::map<int, bool>             someData;
-   std::map<int, std::list<bool> > otherData;
-};
-
-void foo()
-{
-   List<byte> bob = new List<byte>();
-}
-
-A<B>     foo;
-A<B, C>  bar;
-A<B *>   baz;
-A<B<C> > bay;
-
-void asd(void)
-{
-   A<B>     foo;
-   A<B, C>  bar;
-   A<B *>   baz;
-   A<B<C> > bay;
-
-   if (a < b && b > c)
-   {
-      a = b < c > 0;
-   }
-   if (a<bar()> c)
-   {
-   }
-   a < up_lim() ? do_hi() : do_low;
-   a[a<b> c] = d;
-}
-
-template<typename T> class MyClass
-{
-}
-
-template<typename T>
-class MyClass
-{
-}
-
-template<typename A, typename B, typename C> class MyClass : myvar(0),
-   myvar2(0)
-{
-}
-
-template<typename A, typename B, typename C> class MyClass
-   : myvar(0),
-   myvar2(0)
-{
-}
-
-
-static int max_value()
-{
-   return((std::numeric_limits<int>::max)());
-}
-
-template<class Config_>
-priority_queue<Config_>::~priority_queue ()
-{
-}
-
-template<class T>
-T test(T a)
-{
-   return(a);
-}
-
-int main()
-{
-   int k, j;
-   h   g<int>;
-
-   k = test<int>(j);
-   return(0);
-}
-
-template<typename T, template<typename, unsigned int, unsigned int> class ConcreteStorageClass>
-class RotationMatrix
-   : public StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>
-{
- public:
-   RotationMatrix()
-      : StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>()
-   {
-      // do some initialization
-   }
-
-   void assign(const OtherClass<T, 3, 3>& other)
-   {
-      // do something
-   }
-};
-
-int main()
-{
-   MyClass<double, 3, 3, MyStorage> foo;
-}
-
-template<typename CharT, int N, typename Traits>
-inline std::basic_ostream<CharT, Traits>& FWStreamOut(std::basic_ostream<CharT, Traits>&os,
-                                                      const W::S<CharT, N, Traits>&s)
-{
-   return(operator<<<CharT, N, Traits, char, std::char_traits<char> >(os, s));
-}
-
-struct foo
-{
-   type1<int&> bar;
-};
-struct foo
-{
-   type1<int const> bar;
-};
-
-
-template<int i> void f();
-template<int i> void g()
-{
-   f<i - 1>();
-   f<i>();
-   f<i + 1>();
-   f<bar()>();
-}
-void h()
-{
-   g<42>();
-}
-
-#include <vector>
-std::vector<int> A(2);
-std::vector<int> B;
-std::vector<int> C(2);
-std::vector<int> D;
-
-template<class T> struct X
-{
-   template<class U> void operator()(U);
-};
-
-template<class T> class Y {
-   template<class V> void f(V);
-};
-
-void                        (*foobar)(void) = NULL;
-std::vector<void (*)(void)> functions;
-
-#define MACRO(a)    a
-template<typename = int> class X;
-MACRO(void f(X<>& x));
-void g(X<>& x);
-
-#include <vector>
-typedef std::vector<std::vector<int> >    Table; // OK
-typedef std::vector<std::vector<bool> >   Flags; // Error
-
-void func(List<B>        =default_val1);
-void func(List<List<B> > =default_val2);
-
-BLAH<(3.14 >= 42)> blah;
-bool               X = j<3> > 1;
-
-void foo()
-{
-   A<(X > Y)> a;
-
-   a = static_cast<List<B> >(ld);
-}
-
-template<int i> class X {   /* ... */
-};
-X < 1 > 2 > x1;             // Syntax error.
-X<(1 > 2)> x2;              // Okay.
-
-template<class T> class Y { /* ... */
-};
-Y<X<1> >        x3;         // Okay, same as "Y<X<1> > x3;".
-Y<X<(6 >> 1)> > x4;
-
-
-template<typename T>
-int
-myFunc1(typename T::Subtype val);
-
-int
-myFunc2(T::Subtype val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30024-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30024-class-init.cpp
deleted file mode 100644
index 884d5c71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30024-class-init.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-
-class Foo :
-   public Bar
-{
-
-};
-
-#define CTOR(i, _) : \
-   T(X()), \
-   y() \
-{ }
-
-class Foo2 :
-   public Bar
-{
-
-};
-
-class GLOX_API ClientBase :
-   public Class,
-   public OtherClass,
-   public ThridClass,
-   public ForthClass
-{
-public:
-ClientBase(const ClientBase & f)
-{
-   // do something
-}
-};
-
-ClientBase::ClientBase (const std::string& ns,
-                        const std::string& ns1,
-                        const std::string& ns2)
-{
-
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30025-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30025-class-init.cpp
deleted file mode 100644
index 703686ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30025-class-init.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-
-class Foo :
-   public Bar
-{
-
-};
-
-#define CTOR(i, _) : \
-   T(X()), \
-   y() \
-{ }
-
-class Foo2 :
-   public Bar
-{
-
-};
-
-class GLOX_API ClientBase :
-   public Class,
-   public OtherClass,
-   public ThridClass,
-   public ForthClass
-{
-public:
-ClientBase(const ClientBase & f) {
-   // do something
-}
-};
-
-ClientBase::ClientBase (const std::string& ns,
-                        const std::string& ns1,
-                        const std::string& ns2) {
-
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0) {
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0) {
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0) {
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0) {
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0) {
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30026-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30026-byref.cpp
deleted file mode 100644
index 2534aa05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30026-byref.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-bool foo(int &idx)
-{
-   if (idx < m_count)
-   {
-      idx++;
-      return m_bool[idx-1];
-   }
-   return false;
-}
-
-class Foo {
-public:
-   Foo();
-   Foo(const Foo &f);
-};
-
-class NS::Foo {
-public:
-   Foo(Bar &b);
-};
-
-template<  class T >  class ListManager
-{
-protected:
-   T head;
-
-public:
-   ListManager()
-   {
-      head.next = head.prev = &head;
-   }
-
-   ListManager(const ListManager &ref)
-   {
-      head.next = head.prev = &head;
-   }
-}
-
-const Foo &Foo::operator ==(Foo &me){
-   ::sockaddr* ptr = (::sockaddr*)&host;
-   return me;
-}
-
-MyType &MyClass::myMethode() {
-   const MyType &t = getSomewhere();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30027-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30027-byref.cpp
deleted file mode 100644
index d0598697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30027-byref.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-bool foo(int& idx)
-{
-   if (idx < m_count)
-   {
-      idx++;
-      return m_bool[idx-1];
-   }
-   return false;
-}
-
-class Foo {
-public:
-   Foo();
-   Foo(const Foo& f);
-};
-
-class NS::Foo {
-public:
-   Foo(Bar& b);
-};
-
-template<  class T >  class ListManager
-{
-protected:
-   T head;
-
-public:
-   ListManager()
-   {
-      head.next = head.prev = &head;
-   }
-
-   ListManager(const ListManager& ref)
-   {
-      head.next = head.prev = &head;
-   }
-}
-
-const Foo& Foo::operator ==(Foo& me){
-   ::sockaddr* ptr = (::sockaddr*)&host;
-   return me;
-}
-
-MyType& MyClass::myMethode() {
-   const MyType& t = getSomewhere();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30028-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30028-byref.cpp
deleted file mode 100644
index 7a97856d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30028-byref.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-bool foo(int & idx)
-{
-   if (idx < m_count)
-   {
-      idx++;
-      return m_bool[idx-1];
-   }
-   return false;
-}
-
-class Foo {
-public:
-   Foo();
-   Foo(const Foo & f);
-};
-
-class NS::Foo {
-public:
-   Foo(Bar & b);
-};
-
-template<  class T >  class ListManager
-{
-protected:
-   T head;
-
-public:
-   ListManager()
-   {
-      head.next = head.prev = &head;
-   }
-
-   ListManager(const ListManager & ref)
-   {
-      head.next = head.prev = &head;
-   }
-}
-
-const Foo & Foo::operator ==(Foo & me){
-   ::sockaddr* ptr = (::sockaddr*)&host;
-   return me;
-}
-
-MyType & MyClass::myMethode() {
-   const MyType & t = getSomewhere();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30029-init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30029-init_align.h
deleted file mode 100644
index 085f838b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30029-init_align.h
+++ /dev/null
@@ -1,22 +0,0 @@
-struct file_lang languages[] =
-{
-   { ".c",    "C",    LANG_C    },
-   { ".cpp",  "CPP",  LANG_CPP  },
-   { ".d",    "D",    LANG_D    },
-   { ".cs",   "CS",   LANG_CS   },
-   { ".vala", "VALA", LANG_VALA },
-   { ".java", "JAVA", LANG_JAVA },
-   { ".pawn", "PAWN", LANG_PAWN },
-   { ".p",    "",     LANG_PAWN },
-   { ".sma",  "",     LANG_PAWN },
-   { ".inl",  "",     LANG_PAWN },
-   { ".h",    "",     LANG_CPP  },
-   { ".cxx",  "",     LANG_CPP  },
-   { ".hpp",  "",     LANG_CPP  },
-   { ".hxx",  "",     LANG_CPP  },
-   { ".cc",   "",     LANG_CPP  },
-   { ".di",   "",     LANG_D    },
-   { ".m",    "OC",   LANG_OC   },
-   { ".sqc",  "",     LANG_C    }, // embedded SQL
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30030-Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30030-Timestamp.h
deleted file mode 100644
index 998b7d6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30030-Timestamp.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**

- * @file Timestamp.h

- * Definition of class example::Timestamp.

- */

-

-#ifndef __Timestamp_h_

-#define __Timestamp_h_

-

-#include <string>

-

-namespace example {

-class IStreamable;

-class InStream;

-class OutStream;

-

-/**

- * Timestamp is a timestamp with nanosecond resolution.

- */

-class Timestamp

-  : public IStreamable

-{

-public:

-

-/**

- * Default constructor.

- */

-Timestamp();

-

-/**

- * Constructor.

- *

- * @param sec   The seconds

- * @param nsec  The nanoseconds

- */

-Timestamp(long sec, unsigned long nsec);

-

-/**

- * Destructor.

- */

-virtual ~Timestamp();

-

-/**

- * Adds two timestamps.

- *

- * @param rhs The other timestamp

- * @return The resulting timestamp

- */

-Timestamp operator+(const Timestamp& rhs) const;

-

-/**

- * Substracts two timestamps.

- *

- * @param rhs The other timestamp

- * @return The resulting timestamp

- */

-Timestamp operator-(const Timestamp& rhs) const;

-

-/**

- * Compares two timestamps.

- *

- * @param rhs The other timestamp

- * @return true if timestamp is smaller than the given timestamp

- */

-bool operator<(const Timestamp& rhs) const;

-

-/**

- * Compares two timestamps.

- *

- * @param rhs The other timestamp

- * @return true if timestamp is greater than the given timestamp

- */

-bool operator>(const Timestamp& rhs) const;

-

-/**

- * Compares two timestamps.

- *

- * @param rhs The other timestamp

- * @return true if timestamp is equal to the given timestamp

- */

-bool operator==(const Timestamp& rhs) const;

-

-/**

- * Compares two timestamps.

- *

- * @param rhs The other timestamp

- * @return true if timestamp is not equal to the given timestamp

- */

-bool operator!=(const Timestamp& rhs) const;

-

-/**

- * Adds an other timestamp.

- *

- * @param rhs The other timestamp

- */

-void operator+=(const Timestamp& rhs);

-

-/**

- * Adds milliseconds.

- *

- * @param ms The milliseconds

- * @return The resulting timestamp

- */

-Timestamp addMilliseconds(unsigned long ms) const;

-

-/**

- * Adds nanoseconds.

- *

- * @param ns The nanoseconds

- * @return The resulting timestamp

- */

-Timestamp addNanoseconds(unsigned long ns) const;

-

-/**

- * Checks if this timestamp is zero.

- *

- * @return true if timestamp is zero

- */

-bool isZero() const;

-

-/**

- * Gets the milliseconds.

- * @attention Negativ timestamp return zero

- *

- * @return The milliseconds

- */

-unsigned long getMilliseconds() const;

-

-/**

- * Divide timestamps by two.

- *

- * @return The resulting timestamp

- */

-Timestamp divideByTwo();

-

-/**

- * Gets the string-representation.

- *

- * @return The string representation

- */

-std::string getString() const;

-

-/**

- * Gets the string-representation in milliseconds.

- *

- * @return The string representation

- */

-std::string getStringMilliseconds() const;

-

-/**

- * Resets the timestamp.

- */

-void reset();

-

-/** The seconds */

-long sec;

-

-/** The nanoseconds */

-unsigned long nsec;

-

-InStream& operator <<(InStream& in);

-

-OutStream& operator >>(OutStream& out) const;

-};

-} // namespace

-

-#endif // __Timestamp_h_

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30031-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30031-operator.cpp
deleted file mode 100644
index f17b865d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30031-operator.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-struct bar;
-struct foo {
-  operator bar*();
-  auto operator <=>(const foo& rhs) const = default;
-};
-
-class Foo {
-Foo operator+(const Foo& rhs) const;
-
-const Foo& operator ==(Foo& me);
-
-bool operator>(const Foo& rhs) const;
-
-InStream& operator <<(InStream& in);
-}
-
-const Foo& Foo::operator ==(Foo& me)
-{
-}
-
-Foo Foo::operator+(const Foo& rhs) const
-{
-}
-
-bool Foo::operator>(const Foo& rhs) const
-{
-}
-
-class Example
-{
-char m_array [256];
-
-Example& operator=(const Example&rhs);
-Example& operator+=(const Example&rhs);
-const Example operator+(const Example&other) const;
-bool operator==(const Example&other) const;
-bool operator!=(const Example&other) const;
-Example operator+(const Example& x, const Example& y);
-Example operator*(const Example& x, const Example& y);
-
-double& operator()(int row, int col);
-double operator()(int row, int col) const;
-void operator++();
-int& operator*();
-Example& operator++();        // prefix ++
-Example operator++(int);      // postfix ++
-
-bool operator <(const Example& lhs, const Example& rhs) const;
-
-int operator()(int index)
-{
-  i = ~~3;
-  return index + 1;
-}
-
-char& operator[](unsigned i)
-{
-  return m_array [i & 0xff];
-}
-}
-bool Example::operator==(const Example&other) const
-{
-  /*TODO: compare something? */
-  return false;
-}
-
-bool Example::operator!=(const Example&other) const
-{
-  return !operator ==(other);
-}
-
-void a()
-{
-  Op op = &X::operator==;
-  if (!A) {
-    if (op != &X::operator==) {
-      A(1) = a;
-    }
-  }
-  if (!A) {
-    if (op != &X::operator==) {
-      A(1) = a;
-    }
-  }
-}
-
-void *operator new(std::size_t) throw(std::bad_alloc);
-void *operator new[](std::size_t) throw(std::bad_alloc);
-void operator delete(void *) throw();
-void operator delete[](void *) throw();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30032-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30032-operator.cpp
deleted file mode 100644
index cfa98ca1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30032-operator.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-
-struct bar;
-struct foo
-{
-   operator bar* ();
-   auto operator <=> (const foo& rhs) const = default;
-};
-
-class Foo {
-   Foo operator + (const Foo& rhs) const;
-
-   const Foo& operator == (Foo& me);
-
-   bool operator > (const Foo& rhs) const;
-
-   InStream& operator << (InStream& in);
-}
-
-const Foo& Foo::operator == (Foo& me)
-{
-}
-
-Foo Foo::operator + (const Foo& rhs) const
-{
-}
-
-bool Foo::operator > (const Foo& rhs) const
-{
-}
-
-class Example
-{
-   char m_array[256];
-
-   Example& operator = (const Example& rhs);
-   Example& operator += (const Example& rhs);
-   const Example operator + (const Example& other) const;
-   bool operator == (const Example& other) const;
-   bool operator != (const Example& other) const;
-   Example operator + (const Example& x, const Example& y);
-   Example operator * (const Example& x, const Example& y);
-
-   double& operator () (int row, int col);
-   double operator () (int row, int col) const;
-   void operator ++ ();
-   int& operator * ();
-   Example& operator ++ ();   // prefix ++
-   Example operator ++ (int); // postfix ++
-
-   bool operator < (const Example& lhs, const Example& rhs) const;
-
-   int operator () (int index)
-   {
-      i = ~~3;
-      return index + 1;
-   }
-
-   char& operator [] (unsigned i)
-   {
-      return m_array[i & 0xff];
-   }
-}
-bool Example::operator == (const Example& other) const
-{
-   /*TODO: compare something? */
-   return false;
-}
-bool Example::operator != (const Example& other) const
-{
-   return !operator == (other);
-}
-
-
-void a() {
-   Op op = &X::operator ==;
-   if (!A)
-      if (op != &X::operator ==)
-	 A(1) = a;
-   if (!A) {
-      if (op != &X::operator ==)
-	 A(1) = a;
-   }
-}
-
-void *operator new (std::size_t) throw(std::bad_alloc);
-void *operator new[] (std::size_t) throw(std::bad_alloc);
-void operator delete (void *) throw();
-void operator delete[] (void *) throw();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30033-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30033-operator.cpp
deleted file mode 100644
index 976d919f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30033-operator.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-
-struct bar;
-struct foo
-{
-   operator bar*();
-   auto operator<=>(const foo& rhs) const = default;
-};
-
-class Foo {
-   Foo operator+(const Foo& rhs) const;
-
-   const Foo& operator==(Foo& me);
-
-   bool operator>(const Foo& rhs) const;
-
-   InStream& operator<<(InStream& in);
-}
-
-const Foo& Foo::operator==(Foo& me)
-{
-}
-
-Foo Foo::operator+(const Foo& rhs) const
-{
-}
-
-bool Foo::operator>(const Foo& rhs) const
-{
-}
-
-class Example
-{
-   char m_array[256];
-
-   Example& operator=(const Example& rhs);
-   Example& operator+=(const Example& rhs);
-   const Example operator+(const Example& other) const;
-   bool operator==(const Example& other) const;
-   bool operator!=(const Example& other) const;
-   Example operator+(const Example& x, const Example& y);
-   Example operator*(const Example& x, const Example& y);
-
-   double& operator()(int row, int col);
-   double operator()(int row, int col) const;
-   void operator++();
-   int& operator*();
-   Example& operator++();     // prefix ++
-   Example operator++(int);   // postfix ++
-
-   bool operator<(const Example& lhs, const Example& rhs) const;
-
-   int operator()(int index)
-   {
-      i = ~~3;
-      return index + 1;
-   }
-
-   char& operator[](unsigned i)
-   {
-      return m_array[i & 0xff];
-   }
-}
-bool Example::operator==(const Example& other) const
-{
-   /*TODO: compare something? */
-   return false;
-}
-bool Example::operator!=(const Example& other) const
-{
-   return !operator==(other);
-}
-
-
-void a() {
-   Op op = &X::operator==;
-   if (!A)
-      if (op != &X::operator==)
-	 A(1) = a;
-   if (!A) {
-      if (op != &X::operator==)
-	 A(1) = a;
-   }
-}
-
-void *operator new(std::size_t) throw(std::bad_alloc);
-void *operator new[](std::size_t) throw(std::bad_alloc);
-void operator delete(void *) throw();
-void operator delete[](void *) throw();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30034-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30034-operator_proto.cpp
deleted file mode 100644
index 3e5af195..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30034-operator_proto.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* A collection of all the different known operator prototypes in C++ */
-
-// arithmetic operators
-Type1 operator + (const Type1& a);                         // +a
-Type1 operator + (const Type1& a, const Type2& b);         // a + b
-Type1& operator ++ (Type1& a);                             // ++a
-Type1 operator ++ (Type1& a, int);                         // a++
-Type1& operator += (Type1& a, const Type1& b);             // a += b
-Type1 operator - (const Type1& a);                         // -a
-Type1& operator -- (Type1& a);                             // --a
-Type1 operator -- (Type1& a, int);                         // a--
-Type1& operator -= (Type1& a, const Type1& b);             // a -= b
-Type1 operator * (const Type1& a, const Type1& b);         // a * b
-Type1& operator *= (Type1& a, const Type1& b);             // a *= b
-Type1 operator / (const Type1& a, const Type1& b);         // a / b
-Type1& operator /= (Type1& a, const Type1& b);             // a /= b
-Type1 operator % (const Type1& a, const Type1& b);         // a % b
-Type1& operator %= (Type1& a, const Type1& b);             // a %= b
-
-// comparison operators
-bool operator < (const Type1& a, const Type1& b);          // a < b
-bool operator <= (const Type1& a, const Type1& b);         // a <= b
-bool operator > (const Type1& a, const Type1& b);          // a > b
-bool operator >= (const Type1& a, const Type1& b);         // a >= b
-bool operator != (const Type1& a, const Type1& b);         // a != b
-bool operator == (const Type1& a, const Type1& b);         // a == b
-bool operator <=> (const Type1& a, const Type1& b);        // a <=> b
-
-// logical operators
-bool operator ! (const Type1& a);                          // !a
-bool operator && (const Type1& a, const Type1& b);         // a && b
-bool operator || (const Type1& a, const Type1& b);         // a || b
-
-// bitwise operators
-Type1 operator << (const Type1& a, const Type1& b);        // a << b
-Type1& operator <<= (Type1& a, const Type1& b);            // a <<= b
-Type1 operator >> (const Type1& a, const Type1& b);        // a >> b
-Type1& operator >>= (Type1& a, const Type1& b);            // a >>= b
-Type1 operator ~ (const Type1& a);                         // ~a
-Type1 operator & (const Type1& a, const Type1& b);         // a & b
-Type1& operator &= (Type1& a, const Type1& b);             // a &= b
-Type1 operator | (const Type1& a, const Type1& b);         // a | b
-Type1& operator |= (Type1& a, const Type1& b);             // a |= b
-Type1 operator ^ (const Type1& a, const Type1& b);         // a ^ b
-Type1& operator ^= (Type1& a, const Type1& b);             // a ^= b
-
-// other operators
-Type1& Type1::operator = (const Type1& b);                 // a = b
-void operator () (Type1& a);                               // a()
-const Type2& operator [] (const Type1& a, const Type1& b); // a[b]
-Type2& operator * (const Type1& a);                        // *a
-Type2* operator & (const Type1& a);                        // &a
-Type2* Type1::operator -> ();                              // a->b
-Type1::operator type ();                                   // (type)a
-Type2& operator , (const Type1& a, Type2& b);              // a, b
-void *Type1::operator new (size_t x);                      // new Type1
-void *Type1::operator new[] (size_t x);                    // new Type1[n]
-void *Type1::operator delete (size_t x);                   // delete a
-void *Type1::operator delete[] (size_t x);                 // delete [] a
-
-// Misc examples
-int& operator * ();
-Foo::operator const char * ();
-Foo::operator const Bar& ();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30035-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30035-operator_proto.cpp
deleted file mode 100644
index 3824798c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30035-operator_proto.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* A collection of all the different known operator prototypes in C++ */
-
-// arithmetic operators
-Type1 operator+(const Type1& a);                           // +a
-Type1 operator+(const Type1& a, const Type2& b);           // a + b
-Type1& operator++(Type1& a);                               // ++a
-Type1 operator++(Type1& a, int);                           // a++
-Type1& operator+=(Type1& a, const Type1& b);               // a += b
-Type1 operator-(const Type1& a);                           // -a
-Type1& operator--(Type1& a);                               // --a
-Type1 operator--(Type1& a, int);                           // a--
-Type1& operator-=(Type1& a, const Type1& b);               // a -= b
-Type1 operator*(const Type1& a, const Type1& b);           // a * b
-Type1& operator*=(Type1& a, const Type1& b);               // a *= b
-Type1 operator/(const Type1& a, const Type1& b);           // a / b
-Type1& operator/=(Type1& a, const Type1& b);               // a /= b
-Type1 operator%(const Type1& a, const Type1& b);           // a % b
-Type1& operator%=(Type1& a, const Type1& b);               // a %= b
-
-// comparison operators
-bool operator<(const Type1& a, const Type1& b);            // a < b
-bool operator<=(const Type1& a, const Type1& b);           // a <= b
-bool operator>(const Type1& a, const Type1& b);            // a > b
-bool operator>=(const Type1& a, const Type1& b);           // a >= b
-bool operator!=(const Type1& a, const Type1& b);           // a != b
-bool operator==(const Type1& a, const Type1& b);           // a == b
-bool operator<=>(const Type1& a, const Type1& b);          // a <=> b
-
-// logical operators
-bool operator!(const Type1& a);                            // !a
-bool operator&&(const Type1& a, const Type1& b);           // a && b
-bool operator||(const Type1& a, const Type1& b);           // a || b
-
-// bitwise operators
-Type1 operator<<(const Type1& a, const Type1& b);          // a << b
-Type1& operator<<=(Type1& a, const Type1& b);              // a <<= b
-Type1 operator>>(const Type1& a, const Type1& b);          // a >> b
-Type1& operator>>=(Type1& a, const Type1& b);              // a >>= b
-Type1 operator~(const Type1& a);                           // ~a
-Type1 operator&(const Type1& a, const Type1& b);           // a & b
-Type1& operator&=(Type1& a, const Type1& b);               // a &= b
-Type1 operator|(const Type1& a, const Type1& b);           // a | b
-Type1& operator|=(Type1& a, const Type1& b);               // a |= b
-Type1 operator^(const Type1& a, const Type1& b);           // a ^ b
-Type1& operator^=(Type1& a, const Type1& b);               // a ^= b
-
-// other operators
-Type1& Type1::operator=(const Type1& b);                   // a = b
-void operator()(Type1& a);                                 // a()
-const Type2& operator[](const Type1& a, const Type1& b);   // a[b]
-Type2& operator*(const Type1& a);                          // *a
-Type2* operator&(const Type1& a);                          // &a
-Type2* Type1::operator->();                                // a->b
-Type1::operator type();                                    // (type)a
-Type2& operator,(const Type1& a, Type2& b);                // a, b
-void *Type1::operator new(size_t x);                       // new Type1
-void *Type1::operator new[](size_t x);                     // new Type1[n]
-void *Type1::operator delete(size_t x);                    // delete a
-void *Type1::operator delete[](size_t x);                  // delete [] a
-
-// Misc examples
-int& operator*();
-Foo::operator const char *();
-Foo::operator const Bar&();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30036-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30036-operator.cpp
deleted file mode 100644
index b1468795..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30036-operator.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-
-struct bar;
-struct foo
-{
-   operator bar*();
-   auto operator<=>(const foo& rhs) const = default;
-};
-
-class Foo {
-   Foo operator       +(const Foo& rhs) const;
-
-   const Foo& operator==(Foo& me);
-
-   bool operator      >(const Foo& rhs) const;
-
-   InStream& operator <<(InStream& in);
-}
-
-const Foo& Foo::operator==(Foo& me)
-{
-}
-
-Foo Foo::operator+(const Foo& rhs) const
-{
-}
-
-bool Foo::operator>(const Foo& rhs) const
-{
-}
-
-class Example
-{
-   char                  m_array[256];
-
-   Example& operator     =(const Example& rhs);
-   Example& operator     +=(const Example& rhs);
-   const Example operator+(const Example& other) const;
-   bool operator         ==(const Example& other) const;
-   bool operator         !=(const Example& other) const;
-   Example operator      +(const Example& x, const Example& y);
-   Example operator      *(const Example& x, const Example& y);
-
-   double& operator      ()(int row, int col);
-   double operator       ()(int row, int col) const;
-   void operator         ++();
-   int& operator         *();
-   Example& operator     ++();    // prefix ++
-   Example operator      ++(int); // postfix ++
-
-   bool operator         <(const Example& lhs, const Example& rhs) const;
-
-   int operator()(int index)
-   {
-      i = ~~3;
-      return index + 1;
-   }
-
-   char& operator[](unsigned i)
-   {
-      return m_array[i & 0xff];
-   }
-}
-bool Example::operator==(const Example& other) const
-{
-   /*TODO: compare something? */
-   return false;
-}
-bool Example::operator!=(const Example& other) const
-{
-   return !operator==(other);
-}
-
-
-void a() {
-   Op op = &X::operator==;
-   if (!A)
-      if (op != &X::operator==)
-	 A(1) = a;
-   if (!A) {
-      if (op != &X::operator==)
-	 A(1) = a;
-   }
-}
-
-void *operator new(std::size_t) throw(std::bad_alloc);
-void *operator new[](std::size_t) throw(std::bad_alloc);
-void operator  delete(void *) throw();
-void operator  delete[](void *) throw();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30037-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30037-operator_proto.cpp
deleted file mode 100644
index d5c7e8fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30037-operator_proto.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* A collection of all the different known operator prototypes in C++ */
-
-// arithmetic operators
-Type1 operator +(const Type1& a);                          // +a
-Type1 operator +(const Type1& a, const Type2& b);          // a + b
-Type1& operator++(Type1& a);                               // ++a
-Type1 operator ++(Type1& a, int);                          // a++
-Type1& operator+=(Type1& a, const Type1& b);               // a += b
-Type1 operator -(const Type1& a);                          // -a
-Type1& operator--(Type1& a);                               // --a
-Type1 operator --(Type1& a, int);                          // a--
-Type1& operator-=(Type1& a, const Type1& b);               // a -= b
-Type1 operator *(const Type1& a, const Type1& b);          // a * b
-Type1& operator*=(Type1& a, const Type1& b);               // a *= b
-Type1 operator /(const Type1& a, const Type1& b);          // a / b
-Type1& operator/=(Type1& a, const Type1& b);               // a /= b
-Type1 operator %(const Type1& a, const Type1& b);          // a % b
-Type1& operator%=(Type1& a, const Type1& b);               // a %= b
-
-// comparison operators
-bool operator<(const Type1& a, const Type1& b);            // a < b
-bool operator<=(const Type1& a, const Type1& b);           // a <= b
-bool operator>(const Type1& a, const Type1& b);            // a > b
-bool operator>=(const Type1& a, const Type1& b);           // a >= b
-bool operator!=(const Type1& a, const Type1& b);           // a != b
-bool operator==(const Type1& a, const Type1& b);           // a == b
-bool operator<=>(const Type1& a, const Type1& b);          // a <=> b
-
-// logical operators
-bool operator!(const Type1& a);                            // !a
-bool operator&&(const Type1& a, const Type1& b);           // a && b
-bool operator||(const Type1& a, const Type1& b);           // a || b
-
-// bitwise operators
-Type1 operator <<(const Type1& a, const Type1& b);         // a << b
-Type1& operator<<=(Type1& a, const Type1& b);              // a <<= b
-Type1 operator >>(const Type1& a, const Type1& b);         // a >> b
-Type1& operator>>=(Type1& a, const Type1& b);              // a >>= b
-Type1 operator ~(const Type1& a);                          // ~a
-Type1 operator &(const Type1& a, const Type1& b);          // a & b
-Type1& operator&=(Type1& a, const Type1& b);               // a &= b
-Type1 operator |(const Type1& a, const Type1& b);          // a | b
-Type1& operator|=(Type1& a, const Type1& b);               // a |= b
-Type1 operator ^(const Type1& a, const Type1& b);          // a ^ b
-Type1& operator^=(Type1& a, const Type1& b);               // a ^= b
-
-// other operators
-Type1& Type1::operator=(const Type1& b);                   // a = b
-void operator         ()(Type1& a);                        // a()
-const Type2& operator [](const Type1& a, const Type1& b);  // a[b]
-Type2& operator       *(const Type1& a);                   // *a
-Type2* operator       &(const Type1& a);                   // &a
-Type2* Type1::operator->();                                // a->b
-Type1::operator       type();                              // (type)a
-Type2& operator       ,(const Type1& a, Type2& b);         // a, b
-void *Type1::operator new(size_t x);                       // new Type1
-void *Type1::operator new[](size_t x);                     // new Type1[n]
-void *Type1::operator delete(size_t x);                    // delete a
-void *Type1::operator delete[](size_t x);                  // delete [] a
-
-// Misc examples
-int& operator *();
-Foo::operator const char *();
-Foo::operator const Bar&();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30038-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30038-operator.cpp
deleted file mode 100644
index a1bfafe3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30038-operator.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-
-struct bar;
-struct foo
-{
-   operator bar*();
-   auto operator<=>(const foo& rhs) const = default;
-};
-
-class Foo {
-   Foo        operator+(const Foo& rhs) const;
-
-   const Foo& operator==(Foo& me);
-
-   bool       operator>(const Foo& rhs) const;
-
-   InStream&  operator<<(InStream& in);
-}
-
-const Foo& Foo::operator==(Foo& me)
-{
-}
-
-Foo Foo::operator+(const Foo& rhs) const
-{
-}
-
-bool Foo::operator>(const Foo& rhs) const
-{
-}
-
-class Example
-{
-   char          m_array[256];
-
-   Example&      operator=(const Example& rhs);
-   Example&      operator+=(const Example& rhs);
-   const Example operator+(const Example& other) const;
-   bool          operator==(const Example& other) const;
-   bool          operator!=(const Example& other) const;
-   Example       operator+(const Example& x, const Example& y);
-   Example       operator*(const Example& x, const Example& y);
-
-   double&       operator()(int row, int col);
-   double        operator()(int row, int col) const;
-   void          operator++();
-   int&          operator*();
-   Example&      operator++();    // prefix ++
-   Example       operator++(int); // postfix ++
-
-   bool          operator<(const Example& lhs, const Example& rhs) const;
-
-   int operator()(int index)
-   {
-      i = ~~3;
-      return index + 1;
-   }
-
-   char& operator[](unsigned i)
-   {
-      return m_array[i & 0xff];
-   }
-}
-bool Example::operator==(const Example& other) const
-{
-   /*TODO: compare something? */
-   return false;
-}
-bool Example::operator!=(const Example& other) const
-{
-   return !operator==(other);
-}
-
-
-void a() {
-   Op op = &X::operator==;
-   if (!A)
-      if (op != &X::operator==)
-	 A(1) = a;
-   if (!A) {
-      if (op != &X::operator==)
-	 A(1) = a;
-   }
-}
-
-void *operator new(std::size_t) throw(std::bad_alloc);
-void *operator new[](std::size_t) throw(std::bad_alloc);
-void  operator delete(void *) throw();
-void  operator delete[](void *) throw();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30039-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30039-operator_proto.cpp
deleted file mode 100644
index 4ec0acf1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30039-operator_proto.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* A collection of all the different known operator prototypes in C++ */
-
-// arithmetic operators
-Type1  operator+(const Type1& a);                          // +a
-Type1  operator+(const Type1& a, const Type2& b);          // a + b
-Type1& operator++(Type1& a);                               // ++a
-Type1  operator++(Type1& a, int);                          // a++
-Type1& operator+=(Type1& a, const Type1& b);               // a += b
-Type1  operator-(const Type1& a);                          // -a
-Type1& operator--(Type1& a);                               // --a
-Type1  operator--(Type1& a, int);                          // a--
-Type1& operator-=(Type1& a, const Type1& b);               // a -= b
-Type1  operator*(const Type1& a, const Type1& b);          // a * b
-Type1& operator*=(Type1& a, const Type1& b);               // a *= b
-Type1  operator/(const Type1& a, const Type1& b);          // a / b
-Type1& operator/=(Type1& a, const Type1& b);               // a /= b
-Type1  operator%(const Type1& a, const Type1& b);          // a % b
-Type1& operator%=(Type1& a, const Type1& b);               // a %= b
-
-// comparison operators
-bool operator<(const Type1& a, const Type1& b);            // a < b
-bool operator<=(const Type1& a, const Type1& b);           // a <= b
-bool operator>(const Type1& a, const Type1& b);            // a > b
-bool operator>=(const Type1& a, const Type1& b);           // a >= b
-bool operator!=(const Type1& a, const Type1& b);           // a != b
-bool operator==(const Type1& a, const Type1& b);           // a == b
-bool operator<=>(const Type1& a, const Type1& b);          // a <=> b
-
-// logical operators
-bool operator!(const Type1& a);                            // !a
-bool operator&&(const Type1& a, const Type1& b);           // a && b
-bool operator||(const Type1& a, const Type1& b);           // a || b
-
-// bitwise operators
-Type1  operator<<(const Type1& a, const Type1& b);         // a << b
-Type1& operator<<=(Type1& a, const Type1& b);              // a <<= b
-Type1  operator>>(const Type1& a, const Type1& b);         // a >> b
-Type1& operator>>=(Type1& a, const Type1& b);              // a >>= b
-Type1  operator~(const Type1& a);                          // ~a
-Type1  operator&(const Type1& a, const Type1& b);          // a & b
-Type1& operator&=(Type1& a, const Type1& b);               // a &= b
-Type1  operator|(const Type1& a, const Type1& b);          // a | b
-Type1& operator|=(Type1& a, const Type1& b);               // a |= b
-Type1  operator^(const Type1& a, const Type1& b);          // a ^ b
-Type1& operator^=(Type1& a, const Type1& b);               // a ^= b
-
-// other operators
-Type1&       Type1::operator=(const Type1& b);             // a = b
-void         operator()(Type1& a);                         // a()
-const Type2& operator[](const Type1& a, const Type1& b);   // a[b]
-Type2&       operator*(const Type1& a);                    // *a
-Type2*       operator&(const Type1& a);                    // &a
-Type2*       Type1::operator->();                          // a->b
-             Type1::operator type();                       // (type)a
-Type2&       operator,(const Type1& a, Type2& b);          // a, b
-void *       Type1::operator new(size_t x);                // new Type1
-void *       Type1::operator new[](size_t x);              // new Type1[n]
-void *       Type1::operator delete(size_t x);             // delete a
-void *       Type1::operator delete[](size_t x);           // delete [] a
-
-// Misc examples
-int& operator*();
-     Foo::operator const char *();
-     Foo::operator const Bar&();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30040-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30040-nl-class.h
deleted file mode 100644
index 9ccbcf75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30040-nl-class.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef NL_CLASS_H_INCLUDED
-#define NL_CLASS_H_INCLUDED
-
-#include <string>
-
-namespace example {
-
-	class IStreamable;
-	class InStream;
-	class OutStream;
-
-/**
- * Timestamp is a timestamp with nanosecond resolution.
- */
-	class Inher
-		: public IStreamable {
-
-public:
-		Inher();
-		virtual ~Inher();
-
-	};
-
-/**
- * Timestamp is a timestamp with nanosecond resolution.
- */
-	class Inher2
-		: public IStreamable {
-
-public:
-
-		Inher2();
-		Inher2(long sec, unsigned long nsec);
-
-	};
-
-	class Simple {
-
-public:
-
-		Simple();
-		virtual ~Simple();
-
-	};
-
-	class Simple2 {
-
-public:
-
-		Simple2();
-		virtual ~Simple2();
-
-	};
-
-} // namespace
-
-#endif   // NL_CLASS_H_INCLUDED
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30041-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30041-nl-class.h
deleted file mode 100644
index 57e47625..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30041-nl-class.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef NL_CLASS_H_INCLUDED
-#define NL_CLASS_H_INCLUDED
-
-#include <string>
-
-namespace example {
-
-	class IStreamable;
-	class InStream;
-	class OutStream;
-
-/**
- * Timestamp is a timestamp with nanosecond resolution.
- */
-	class Inher
-		: public IStreamable
-	{
-
-public:
-		Inher();
-		virtual ~Inher();
-
-	};
-
-/**
- * Timestamp is a timestamp with nanosecond resolution.
- */
-	class Inher2
-		: public IStreamable
-	{
-
-public:
-
-		Inher2();
-		Inher2(long sec, unsigned long nsec);
-
-	};
-
-	class Simple
-	{
-
-public:
-
-		Simple();
-		virtual ~Simple();
-
-	};
-
-	class Simple2
-	{
-
-public:
-
-		Simple2();
-		virtual ~Simple2();
-
-	};
-
-} // namespace
-
-#endif   // NL_CLASS_H_INCLUDED
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30042-Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30042-Issue_2020.cpp
deleted file mode 100644
index d618f922..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30042-Issue_2020.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-class X21
-{
-public:
-void f(int p1, int p2);
-};
-
-void
-X21::f(int p1, int p2)
-{
-}
-
-void
-n1()
-{
-	X21 x21;
-	x21.f(111, 122);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30043-nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
deleted file mode 100644
index fbf89d16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-SomeFunction

-        ();
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
deleted file mode 100644
index 4495d667..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-SomeFunction(

-	);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30045-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30045-nl_func_decl.cpp
deleted file mode 100644
index 81d0a00e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30045-nl_func_decl.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-
-void bla ( );
-void ble( int a, char b );
-void ble2 ( int a, char b );
-
-
-void bla
-(
-)
-{}
-
-void bla2
-(
-)
-{}
-
-void ble
-(
-	int a,
-	char b
-)
-{}
-
-void ble2
-(
-	int a,
-	char b
-)
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30046-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30046-nl_func_decl.cpp
deleted file mode 100644
index 17aa59f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30046-nl_func_decl.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-
-void bla
-(
-);
-void ble
-(
-	int  a,
-	char b
-);
-void ble2
-(
-	int  a,
-	char b
-);
-
-
-void bla()
-{
-
-
-}
-
-void bla2()
-{
-
-
-}
-
-void ble( int a, char b )
-{
-
-
-}
-
-void ble2( int  a,
-           char b )
-{
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
deleted file mode 100644
index e8a947c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-int Function(

-	);

-

-int Function(

-	);

-

-int Function();
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
deleted file mode 100644
index 22f3c700..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-void LocalClass::LocalClass()

-{

-	int Function(

-		)

-	{

-		return 0;

-	}

-

-	int Function(

-		)

-	{

-		return 0;

-	}

-

-	int Function()

-	{

-		return 0;

-	}

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30049-nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
deleted file mode 100644
index 847b7037..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-SomeFunction

-(

-	someVar,

-	someOtherVar,

-);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30050-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30050-nl-namespace.h
deleted file mode 100644
index e515b479..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30050-nl-namespace.h
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace ns1 {
-
-	void *foo(void);
-	void bar(void);
-
-}
-
-namespace ns2 {
-
-	void *foo(void);
-	void bar(void);
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30051-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30051-nl-namespace.h
deleted file mode 100644
index c51d75be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30051-nl-namespace.h
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace ns1
-{
-
-	void *foo(void);
-	void bar(void);
-
-}
-
-namespace ns2
-{
-
-	void *foo(void);
-	void bar(void);
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30052-try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30052-try-catch-nl.cpp
deleted file mode 100644
index 410a735e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30052-try-catch-nl.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-int foo()
-{
-	try
-	{
-		foo(bar);
-	}
-	catch (int *e)
-	{
-		return 0;
-	}
-
-	if (false)
-		try
-		{
-			throw int();
-		}
-		catch(...)
-		{
-		}
-
-	if (a) { return 1; } else { return 0; }
-	return 1;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30053-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30053-exception.cpp
deleted file mode 100644
index 2c41efbf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30053-exception.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
- #include <iostream>
-
-
-void foo()
-{
-	char *buf;
-	try {
-		buf = new unsigned char[1024];
-		if( buf == 0 )
-			throw "Out of memory";
-	}
-	catch( char * str ) {
-		cout << "Exception: " << str << '\n';
-	}
-}
-
-void bar()
-{
-	char *buf;
-
-	try
-	{
-		buf = new unsigned char[1024];
-		if( buf == 0 )
-			throw "Out of memory";
-	}
-	catch( char * str )
-	{
-		cout << "Exception: " << str << '\n';
-	}
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30054-Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30054-Issue_2091.cpp
deleted file mode 100644
index 6e32d683..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30054-Issue_2091.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <AClass.h>
-#include <SomeClass.h>
-#include <TheClass.h>
-#include <iostream>
-#include <vector>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30055-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30055-nl_func.cpp
deleted file mode 100644
index 142e6895..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30055-nl_func.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-class BSRRE1D_file : PhysicalFile
-{
-	int getFoo() {
-		return(m_foo);
-	}
-
-
-
-	void setFoo(int foo) {
-		m_foo = foo;
-	}
-
-
-
-	public BSRRE1D_file() {
-		this.addFormatName("BSRRE1DF");
-	}
-
-
-
-	private int m_foo;
-	public void xxx() {
-		ahoj();
-	} // comment
-
-
-
-	public void yyy() {
-		ahoj();
-	}
-
-
-
-	/* comment 2 */
-	public void xxx() {
-		ahoj();
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30056-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30056-nl_func.cpp
deleted file mode 100644
index f930b703..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30056-nl_func.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-class BSRRE1D_file : PhysicalFile
-{
-	int getFoo() { return(m_foo); }
-
-	void setFoo(int foo) { m_foo = foo; }
-
-	public BSRRE1D_file() {
-		this.addFormatName("BSRRE1DF");
-	}
-
-
-
-	private int m_foo;
-	public void xxx() {
-		ahoj();
-	} // comment
-
-
-
-	public void yyy() {
-		ahoj();
-	}
-
-
-
-	/* comment 2 */
-	public void xxx() {
-		ahoj();
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30057-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
deleted file mode 100644
index 01486ebe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace cats
-{ // rule
-
-int count;
-void meow();
-
-}
-
-namespace dogs { // drool
-
-int count;
-void bark();
-
-}
-
-namespace pigs {
-
-int count;
-void oink();
-
-}
-
-namespace owls
-{
-
-int count;
-void hoot();
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30058-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
deleted file mode 100644
index 01486ebe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace cats
-{ // rule
-
-int count;
-void meow();
-
-}
-
-namespace dogs { // drool
-
-int count;
-void bark();
-
-}
-
-namespace pigs {
-
-int count;
-void oink();
-
-}
-
-namespace owls
-{
-
-int count;
-void hoot();
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30059-Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30059-Issue_2186.cpp
deleted file mode 100644
index 2c3081ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30059-Issue_2186.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-using namespace std;
-
-namespace ui      { class CClass; }              // Expected to stay as-is
-namespace ui::dlg { class CClassDlg; }           // Expected to stay as-is (new in C++17)
-
-namespace ui                // Brace should be on the next line
-{
-	class CClass1;      // Should be indented
-	class CClass2;
-	class CClass3;
-	class CClass4;
-	class CClass5;
-	class CClass6;
-	class CClass7;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30060-Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30060-Issue_1734.cpp
deleted file mode 100644
index 31d08c29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30060-Issue_1734.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class X16
-{
-public:
-X16();
-};
-
-// https://en.cppreference.com/w/cpp/language/function-try-block
-X16::X16()
-try
-{
-}
-catch (...)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30061-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30061-class-init.cpp
deleted file mode 100644
index 7ce41d09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30061-class-init.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-
-class Foo : public Bar
-{
-
-};
-
-#define CTOR(i, _) : T(X()), \
-                     y() \
-{ }
-
-class Foo2 :
-   public Bar
-{
-
-};
-
-class GLOX_API ClientBase : public Class, public OtherClass,
-                            public ThridClass, public ForthClass
-{
-public:
-ClientBase(const ClientBase & f){
-   // do something
-}
-};
-
-ClientBase::ClientBase (const std::string& ns,
-                        const std::string& ns1,
-                        const std::string& ns2)
-{
-
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar),
-                    othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30062-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30062-class-init.cpp
deleted file mode 100644
index 53ce4a31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30062-class-init.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-
-class Foo : public Bar
-{
-
-};
-
-#define CTOR(i, _) : T(X()), \
-                     y() \
-{ }
-
-class Foo2
-   : public Bar
-{
-
-};
-
-class GLOX_API ClientBase : public Class, public OtherClass,
-                            public ThridClass, public ForthClass
-{
-public:
-ClientBase(const ClientBase & f){
-   // do something
-}
-};
-
-ClientBase::ClientBase (const std::string& ns,
-                        const std::string& ns1,
-                        const std::string& ns2)
-{
-
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar),
-                    othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-   : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-   : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-   : someVar(bar),
-     othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-   : someVar(bar),
-     othervar(0)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30063-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30063-class-init.cpp
deleted file mode 100644
index ad278c90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30063-class-init.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-
-class Foo :
-   public Bar
-{
-
-};
-
-#define CTOR(i, _) : \
-   T(X()), \
-   y() \
-{ }
-
-class Foo2 :
-   public Bar
-{
-
-};
-
-class GLOX_API ClientBase :
-   public Class,
-   public OtherClass,
-   public ThridClass,
-   public ForthClass
-{
-public:
-ClientBase(const ClientBase & f){
-   // do something
-}
-};
-
-ClientBase::ClientBase (const std::string& ns,
-                        const std::string& ns1,
-                        const std::string& ns2)
-{
-
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-   someVar(bar),
-   othervar(0)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30064-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30064-class-init.cpp
deleted file mode 100644
index c44bdfd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30064-class-init.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-
-class Foo
-   : public Bar
-{
-
-};
-
-#define CTOR( i, _ ) \
-      : T( X() ), \
-        y() \
-   { }
-
-class Foo2
-   : public Bar
-{
-
-};
-
-class GLOX_API ClientBase
-   : public Class,
-     public OtherClass,
-     public ThridClass,
-     public ForthClass
-{
-public:
-ClientBase( const ClientBase & f ){
-   // do something
-}
-};
-
-ClientBase::ClientBase ( const std::string& ns,
-                         const std::string& ns1,
-                         const std::string& ns2 )
-{
-
-}
-
-Foo::Foo( int bar )
-   : someVar( bar ),
-     othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar ),
-     othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar ),
-     othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar ),
-     othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar ),
-     othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar ),
-     othervar( 0 )
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30065-Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30065-Example.h
deleted file mode 100644
index 1a868d10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30065-Example.h
+++ /dev/null
@@ -1,11 +0,0 @@
-class Example

-{

-

-Example()

-   : member(0)

-{

-}

-

-int member;

-

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30066-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30066-class-init.cpp
deleted file mode 100644
index 1fc8bb57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30066-class-init.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-
-class Foo : public Bar
-{
-
-};
-
-#define CTOR( i, _ ) : T( X() ) \
-                     , y() \
-{ }
-
-class Foo2 : public Bar
-{
-
-};
-
-class GLOX_API ClientBase : public Class
-                          , public OtherClass
-                          , public ThridClass
-                          , public ForthClass
-{
-public:
-ClientBase( const ClientBase & f ){
-   // do something
-}
-};
-
-ClientBase::ClientBase ( const std::string& ns,
-                         const std::string& ns1,
-                         const std::string& ns2 )
-{
-
-}
-
-Foo::Foo( int bar )
-   : someVar( bar )
-   , othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar )
-   , othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar )
-   , othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar )
-   , othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar )
-   , othervar( 0 )
-{
-}
-
-Foo::Foo( int bar )
-   : someVar( bar )
-   , othervar( 0 )
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30067-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30067-nl_func_type_name.cpp
deleted file mode 100644
index a30a08e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30067-nl_func_type_name.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-
-//zero
-// one
-//  two
-//   three
-void foo(void);
-
-struct A
-{
-public:
-	long_complicated_type f();
-	A& operator+(const A& other);
-};
-
-A& A::operator+(const A& other)
-{
-}
-
-B
-operator+(const B& other)
-{
-}
-
-B foo(const B& other)
-{
-}
-
-class A
-{
-public:
-explicit A(int);
-int aFunct() {
-	return a;
-}
-int bFunc();
-};
-
-// Another file
-int
-A
-::bFunc()
-{
-// some code
-}
-
-template<typename T>
-typename Foo<T>::Type Foo<T>
-::Func()
-{
-}
-
-void Foo
-::bar() {
-}
-
-namespace foo {
-Foo
-::Foo() {
-}
-}
-
-Foo::~Foo() {
-}
-
-class Object
-{
-~Object(void);
-};
-
-template <class T>
-void SampleClassTemplate<T>
-::connect()
-{
-}
-
-template <>
-inline void bar<MyType>(MyType r)
-{
-	foo(r);
-}
-
-template <T>
-inline void baz<>(T r)
-{
-	foo(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30068-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
deleted file mode 100644
index 1e4caa86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void A
-::f()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30069-class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30069-class-implementation.cpp
deleted file mode 100644
index 18481338..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30069-class-implementation.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-template<class T>
-class TestTemp
-{
-public:
-TestTemp();
-void SetValue( T obj_i );
-T Getalue();
-private:
-T m_Obj;
-};
-
-template <class T>
-TestTemp<T>
-::TestTemp()
-{
-}
-template <class T>
-void TestTemp<T>
-::SetValue( T obj_i )
-{
-}
-
-template <class T>
-T TestTemp<T>
-::Getalue()
-{
-	return m_Obj;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30070-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
deleted file mode 100644
index c14a06ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void A::
-f()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30071-lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
deleted file mode 100644
index 20fa083a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int main ()

-{

-   a    = 5;

-   bbbb = 6.0;

-   int a      = 5;

-   float bbbb = 6.0;

-

-   bbbb = 1.0

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30072-lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30072-lineEndings-Win.cpp
deleted file mode 100644
index cdbf7653..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30072-lineEndings-Win.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int main ()
-{
-   a    = 5;
-   bbbb = 6.0;
-   int a      = 5;
-   float bbbb = 6.0;
-
-   bbbb = 1.0
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30073-lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
deleted file mode 100644
index 608952c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int main ()
{
   a    = 5;
   bbbb = 6.0;
   int a      = 5;
   float bbbb = 6.0;

   bbbb = 1.0
}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30074-bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30074-bom.cpp
deleted file mode 100644
index 7ee7e7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30074-bom.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// the file is UTF-8 Unicode (with BOM)
-// Euro character
-€;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30075-goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30075-goto.cpp
deleted file mode 100644
index 4cccfe2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30075-goto.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define x struct z

-#define max(a, b) ((a) > (b) ? (a) : (b))

-

-void f()

-{

-	goto p;

-p:

-	goto q;

-q:

-	goto p;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30076-Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30076-Issue_2594.cpp
deleted file mode 100644
index 240e19db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30076-Issue_2594.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-int GPUReconstructionOCL2Backend::GetOCLPrograms()
-{
-
-#ifdef OPENCL2_ENABLED_SPIRV // clang-format off
-	if (ver >= 2.2)
-	{
-		mInternals->program = clCreateProgramWithIL(mInternals->context, _makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_spirv, _makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_spirv_size, &ocl_error);
-	} else
-	{
-		size_t program_sizes[1] = {_makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_src_size};
-		char* programs_sources[1] = {_makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_src};
-		mInternals->program = clCreateProgramWithSource(mInternals->context, (cl_uint) 1, (const char**) &programs_sources, program_sizes, &ocl_error);
-	}
-#endif // clang-format on
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30077-Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30077-Issue_2596.cpp
deleted file mode 100644
index d2517e8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30077-Issue_2596.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void function(void) {
-        int a = 0;
-        int b = (a==1)?1:2;
-        int c = (a==1)     ?     1     :     2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30078-Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30078-Issue_2672-a.cpp
deleted file mode 100644
index d29d2c47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30078-Issue_2672-a.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-struct Point2D
-{
-	float x;
-	float y;
-};
-
-struct : Point2D
-{
-	float z;
-} point;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30079-Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30079-Issue_2672-b.cpp
deleted file mode 100644
index f484d4ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30079-Issue_2672-b.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-struct BaseStruct {};
-struct : BaseStruct {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30080-nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30080-nl_brace_brace.cpp
deleted file mode 100644
index a9783697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30080-nl_brace_brace.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-
-SHOW_VAR status_vars[]= {
-	{ "Aborted_clients", (char *)&aborted_threads,
-	  SHOW_LONGLONG, }
-};
-
-SHOW_VAR status_vars[]=
-{
-	{ "Aborted_clients", (char *)&aborted_threads,
-	  SHOW_LONGLONG, }
-};
-
-SHOW_VAR status_vars[]=
-{
-	{
-		"Aborted_clients", (char *)&aborted_threads,
-		SHOW_LONGLONG,
-	}
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30081-Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30081-Issue_2383.cpp
deleted file mode 100644
index 356fd9af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30081-Issue_2383.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Smooth
-// Copyright (C) 2017 Per
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30082-Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30082-Issue_931.cpp
deleted file mode 100644
index 76a6b856..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30082-Issue_931.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-//we manually indented continuation here to prevent 'reallyLongArgumentName' from crossing
-//our line length limit
-void ReallyLongClassName::ReallyLongMethondName(int arg1,
-        int reallyLongArgumentName)
-
-void LongClassName::LongMethondName(int arg1,
-                                    int reallyLongArgumentName)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30083-Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30083-Issue_995-do.cpp
deleted file mode 100644
index 2e84d7ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30083-Issue_995-do.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-do {
-        xxx = _error;
-} while (0)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30084-Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30084-Issue_1184.cpp
deleted file mode 100644
index 848b1e03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30084-Issue_1184.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-char buf [2000];
-
-buf[0] = 5;
-buf[1] = 6;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30085-align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30085-align_class.cpp
deleted file mode 100644
index 552d6947..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30085-align_class.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//---------------------------------------------------------------------------

-//    Statics                                                               |

-//---------------------------------------------------------------------------

-void      CTdrFile::SetDistanceMode( TDistMode dm )   {   CTdrFile::ms_DistMode = dm;         }

-TDistMode CTdrFile::GetDistanceMode( void )           {   return CTdrFile::ms_DistMode;      }

-String    CTdrFile::GetDistanceModeUnits( void )      {   return ( CTdrFile::GetDistanceMode() == dmKM ) ? "km" : "Miles";   }

-void      CTdrFile::SetBSTCompensation( bool bUseBST ){   ms_bCompBST = bUseBST;              }

-void      CTdrFile::SetFactoryMode( bool bFactory )   {   ms_bFactory = bFactory;             }

-bool      CTdrFile::GetFactoryMode( void )            {   return ms_bFactory;                 }

-

-unsigned int      CAgentCharacter::iReferenceCount = 0;

-IAgentEx*         CAgentCharacter::pAgentEx        = NULL;

-CAgentNotifySink* CAgentCharacter::pSink           = NULL;

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30086-align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30086-align_class-constr.cpp
deleted file mode 100644
index f6082028..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30086-align_class-constr.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class foo : public my_Class
-{
-    void bar_c(int tttt, int uu, int abc, int defxx)
-        : tttt   (4444)
-        , uu     (22)
-        , abc    (333)
-        , defxx  (55555)
-    {
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30087-Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30087-Issue_1511.cpp
deleted file mode 100644
index 2583c0e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30087-Issue_1511.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int getFoo() { return foo; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30088-Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30088-Issue_2561.cpp
deleted file mode 100644
index aa566966..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30088-Issue_2561.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-
-int getFoo () { return foo; }
-
-int
-main (int argc, char *argv[])
-{
-   printf("hello world!\n");
-
-   return 0;
-} // main
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30089-Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30089-Issue_2281.cpp
deleted file mode 100644
index e0d8727d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30089-Issue_2281.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-int foo(int op)
-{
-        switch (op)
-        {
-        case 1:
-                do_something();
-        break;
-        case 2:
-                do_something_else();
-        case 3:
-                if (do_something_different())
-                {
-                        do_this();
-                        break; // this should be indented like the surrounding code
-                }
-                do_something_more();
-        break;
-        }
-        return -1;
-        for (;;)
-        {
-                break;
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30090-bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30090-bug_488.cpp
deleted file mode 100644
index 268d5ba4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30090-bug_488.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void baz()
-{
-        foobar= bar[a + b + (c
-            + d)];
-
-        foobar = bar(a + b + (c +
-            +d));
-
-        foo = bar[a] + b + qux(c +
-            +d);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30091-bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30091-bug_472.cpp
deleted file mode 100644
index e48251fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30091-bug_472.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// comment
-void func( dbgTrace, (void) );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30092-bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30092-bug_481.cpp
deleted file mode 100644
index 99d8c390..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30092-bug_481.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-//comment
-void argvInter(int argc, char *argv[], Config *config);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30093-bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30093-bug_484.cpp
deleted file mode 100644
index 875ff3d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30093-bug_484.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-TestId::TestId(char *name) :
-   n_((char *) name)
-{
-   n_((char *) name);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30094-bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30094-bug_495.cpp
deleted file mode 100644
index d7db1238..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30094-bug_495.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void f()
-{
-   toto
-      foo1(int);
-   toto
-      foo2(bar);
-   int
-      foo3;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30095-bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30095-bug_485.cpp
deleted file mode 100644
index b5e7842c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30095-bug_485.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-void Tst::test(Msg *message_p)
-{
-   switch (message_p)
-   {
-   case A:
-   {
-      const table *entry2 = findMsg(message_p);
-      table       *entry3 = findMsg(message_p);
-   }
-   break;
-
-   case B:
-      const table *entry2 = findMsg(message_p);
-      table       *entry3 = findMsg(message_p);
-      break;
-
-   default:
-      break;
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30096-bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30096-bug_1854.cpp
deleted file mode 100644
index 29cc2774..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30096-bug_1854.cpp
+++ /dev/null
@@ -1 +0,0 @@
-while (*p++ = ' ') ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30097-issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30097-issue_1946.cpp
deleted file mode 100644
index 9682da68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30097-issue_1946.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace foo
-{
-long_type_name_t &foo1();
-foo_t &foo2();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30098-Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30098-Issue_2692.cpp
deleted file mode 100644
index c54e5461..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30098-Issue_2692.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class Class
-{
-
-std::mutex* a;
-int* b;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30099-bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30099-bug_1127.cpp
deleted file mode 100644
index 0109baaf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30099-bug_1127.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <iostream>
-
-template<size_t T>
-class MyFoo
-{
-public:
-MyFoo()
-{
-	std::cout << T << std::endl;
-}
-};
-
-int main()
-{
-	const size_t mySize = INT8_MAX * 2;
-	MyFoo<mySize * 2> foo1;
-	MyFoo<mySize / 2> foo2;
-	MyFoo<2 * mySize> foo1;
-	MyFoo<2 / mySize> foo2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30100-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30100-templates.cpp
deleted file mode 100644
index 6874e3dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30100-templates.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-#include <list>
-#include <map>
-#include <vector>
-
-#define MACRO(T) f<T>()
-
-class MyClass
-{
-public:
-   std::map < int, bool > someData;
-   std::map < int, std::list < bool > > otherData;
-};
-
-void foo()
-{
-   List < byte > bob = new List<byte>();
-
-}
-
-A<B> foo;
-A<B,C> bar;
-A<B*> baz;
-A<B<C> > bay;
-
-void asd(void)
-{
-   A<B> foo;
-   A<B,C> bar;
-   A<B*> baz;
-   A<B<C> > bay;
-   if (a < b && b > c)
-   {
-      a = b < c > 0;
-   }
-   if (a < bar() > c)
-   {
-   }
-   a < up_lim() ? do_hi() : do_low;
-   a[ a<b> c] = d;
-}
-
-template<typename T>
-class MyClass
-{
-
-}
-
-template<typename T>
-class MyClass
-{
-}
-
-template<typename A, typename B, typename C>
-class MyClass : myvar(0),
-   myvar2(0)
-{
-
-}
-
-template<typename A, typename B, typename C>
-class MyClass
-   : myvar(0),
-   myvar2(0)
-{
-
-}
-
-
-static int max_value()
-{
-   return (std :: numeric_limits  <int >:: max )();
-}
-
-template < class Config_    >
-priority_queue < Config_ >   ::   ~priority_queue ()  {
-
-}
-
-template<class T>
-T test(T a) {
-   return a;
-}
-
-int main() {
-   int k,j;
-   h g<int>;
-   k=test<int>(j);
-   return 0;
-}
-
-template<typename T, template<typename, unsigned int, unsigned int> class ConcreteStorageClass>
-class RotationMatrix
-   : public StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>
-{
-
-public:
-
-   RotationMatrix()
-      : StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>()
-   {
-      // do some initialization
-   }
-
-   void assign(const OtherClass<T, 3, 3 >& other)
-   {
-      // do something
-   }
-
-};
-
-int main()
-{
-   MyClass<double, 3, 3, MyStorage> foo;
-}
-
-template< typename CharT, int N, typename Traits >
-inline std::basic_ostream<CharT,Traits>& FWStreamOut(std::basic_ostream<CharT,Traits>& os,
-                                                     const W::S<CharT,N,Traits>& s)
-{
-   return operator << <CharT, N, Traits, char, std::char_traits<char> >( os, s );
-}
-
-struct foo {
-   type1 < int& > bar;
-};
-struct foo {
-   type1 < int const > bar;
-};
-
-
-template <int i>
-void f();
-template <int i>
-void g() {
-   f<i - 1>();
-   f< i >();
-   f<i + 1>();
-   f<bar()>();
-}
-void h() {
-   g<42>();
-}
-
-#include <vector>
-std::vector<int> A(2);
-std::vector<int> B;
-std::vector<int> C(2);
-std::vector<int> D;
-
-template<class T>
-struct X { template<class U>
-           void operator ()(U); };
-
-template<class T>
-class Y { template<class V>
-          void f(V); };
-
-void (* foobar)(void) = NULL;
-std::vector<void (*)(void)> functions;
-
-#define MACRO( a ) a
-template < typename = int >
-class X;
-MACRO ( void f( X < >& x ) );
-void g( X < >& x );
-
-#include <vector>
-typedef std::vector<std::vector<int> > Table;  // OK
-typedef std::vector<std::vector<bool> > Flags;  // Error
-
-void func(List<B> = default_val1);
-void func(List<List<B> > = default_val2);
-
-BLAH<(3.14 >= 42)> blah;
-bool X = j<3> > 1;
-
-void foo()
-{
-   A<(X > Y)> a;
-   a = static_cast<List<B> >(ld);
-}
-
-template<int i>
-class X { /* ... */ };
-X < 1 > 2 > x1;    // Syntax error.
-X<(1 > 2)> x2;    // Okay.
-
-template<class T>
-class Y { /* ... */ };
-Y<X<1> > x3;     // Okay, same as "Y<X<1> > x3;".
-Y<X<(6 >> 1)> > x4;
-
-
-template <typename T>
-int
-myFunc1(typename T::Subtype val);
-
-int
-myFunc2(T::Subtype val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30101-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30101-templates.cpp
deleted file mode 100644
index 1de728b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30101-templates.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-#include <list>
-#include <map>
-#include <vector>
-
-#define MACRO(T) f<T>()
-
-class MyClass
-{
-public:
-   std::map < int, bool > someData;
-   std::map < int, std::list < bool > > otherData;
-};
-
-void foo()
-{
-   List < byte > bob = new List<byte>();
-
-}
-
-A<B> foo;
-A<B,C> bar;
-A<B*> baz;
-A<B<C> > bay;
-
-void asd(void)
-{
-   A<B> foo;
-   A<B,C> bar;
-   A<B*> baz;
-   A<B<C> > bay;
-   if (a < b && b > c)
-   {
-      a = b < c > 0;
-   }
-   if (a < bar() > c)
-   {
-   }
-   a < up_lim() ? do_hi() : do_low;
-   a[ a<b> c] = d;
-}
-
-template<typename T> class MyClass
-{
-
-}
-
-template<typename T> class MyClass
-{
-}
-
-template<typename A, typename B, typename C> class MyClass : myvar(0),
-   myvar2(0)
-{
-
-}
-
-template<typename A, typename B, typename C> class MyClass
-   : myvar(0),
-   myvar2(0)
-{
-
-}
-
-
-static int max_value()
-{
-   return (std :: numeric_limits  <int >:: max )();
-}
-
-template < class Config_    > priority_queue < Config_ >   ::   ~priority_queue ()  {
-
-}
-
-template<class T> T test(T a) {
-   return a;
-}
-
-int main() {
-   int k,j;
-   h g<int>;
-   k=test<int>(j);
-   return 0;
-}
-
-template<typename T, template<typename, unsigned int, unsigned int> class ConcreteStorageClass> class RotationMatrix
-   : public StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>
-{
-
-public:
-
-   RotationMatrix()
-      : StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>()
-   {
-      // do some initialization
-   }
-
-   void assign(const OtherClass<T, 3, 3 >& other)
-   {
-      // do something
-   }
-
-};
-
-int main()
-{
-   MyClass<double, 3, 3, MyStorage> foo;
-}
-
-template< typename CharT, int N, typename Traits > inline std::basic_ostream<CharT,Traits>& FWStreamOut(std::basic_ostream<CharT,Traits>& os,
-                                                                                                        const W::S<CharT,N,Traits>& s)
-{
-   return operator << <CharT, N, Traits, char, std::char_traits<char> >( os, s );
-}
-
-struct foo {
-   type1 < int& > bar;
-};
-struct foo {
-   type1 < int const > bar;
-};
-
-
-template <int i> void f();
-template <int i> void g() {
-   f<i - 1>();
-   f< i >();
-   f<i + 1>();
-   f<bar()>();
-}
-void h() {
-   g<42>();
-}
-
-#include <vector>
-std::vector<int> A(2);
-std::vector<int> B;
-std::vector<int> C(2);
-std::vector<int> D;
-
-template<class T> struct X { template<class U> void operator ()(U); };
-
-template<class T> class Y { template<class V> void f(V); };
-
-void (* foobar)(void) = NULL;
-std::vector<void (*)(void)> functions;
-
-#define MACRO( a ) a
-template < typename = int > class X;
-MACRO ( void f( X < >& x ) );
-void g( X < >& x );
-
-#include <vector>
-typedef std::vector<std::vector<int> > Table;  // OK
-typedef std::vector<std::vector<bool> > Flags;  // Error
-
-void func(List<B> = default_val1);
-void func(List<List<B> > = default_val2);
-
-BLAH<(3.14 >= 42)> blah;
-bool X = j<3> > 1;
-
-void foo()
-{
-   A<(X > Y)> a;
-   a = static_cast<List<B> >(ld);
-}
-
-template<int i> class X { /* ... */ };
-X < 1 > 2 > x1;    // Syntax error.
-X<(1 > 2)> x2;    // Okay.
-
-template<class T> class Y { /* ... */ };
-Y<X<1> > x3;     // Okay, same as "Y<X<1> > x3;".
-Y<X<(6 >> 1)> > x4;
-
-
-template <typename T> int
-myFunc1(typename T::Subtype val);
-
-int
-myFunc2(T::Subtype val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30102-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30102-templates.cpp
deleted file mode 100644
index 54b403fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30102-templates.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-#include <list>
-#include <map>
-#include <vector>
-
-#define MACRO(T) f < T > ()
-
-class MyClass
-{
-public:
-   std::map < int, bool > someData;
-   std::map < int, std::list < bool > > otherData;
-};
-
-void foo()
-{
-   List < byte > bob = new List < byte > ();
-
-}
-
-A < B > foo;
-A < B,C > bar;
-A < B* > baz;
-A < B < C > > bay;
-
-void asd(void)
-{
-   A < B > foo;
-   A < B,C > bar;
-   A < B* > baz;
-   A < B < C > > bay;
-   if (a<b && b>c)
-   {
-      a = b<c>0;
-   }
-   if (a < bar() > c)
-   {
-   }
-   a<up_lim() ? do_hi() : do_low;
-   a[ a < b > c] = d;
-}
-
-template< typename T > class MyClass
-{
-
-}
-
-template< typename T >
-class MyClass
-{
-}
-
-template< typename A, typename B, typename C > class MyClass : myvar(0),
-   myvar2(0)
-{
-
-}
-
-template< typename A, typename B, typename C > class MyClass
-   : myvar(0),
-   myvar2(0)
-{
-
-}
-
-
-static int max_value()
-{
-   return (std :: numeric_limits < int >:: max )();
-}
-
-template< class Config_ >
-priority_queue < Config_ >   ::   ~priority_queue ()  {
-
-}
-
-template< class T >
-T test(T a) {
-   return a;
-}
-
-int main() {
-   int k,j;
-   h g < int >;
-   k=test < int > (j);
-   return 0;
-}
-
-template< typename T, template< typename, unsigned int, unsigned int > class ConcreteStorageClass >
-class RotationMatrix
-   : public StaticBaseMatrix < T, 3, 3, ConcreteStorageClass >
-{
-
-public:
-
-   RotationMatrix()
-      : StaticBaseMatrix < T, 3, 3, ConcreteStorageClass > ()
-   {
-      // do some initialization
-   }
-
-   void assign(const OtherClass < T, 3, 3 >& other)
-   {
-      // do something
-   }
-
-};
-
-int main()
-{
-   MyClass < double, 3, 3, MyStorage > foo;
-}
-
-template< typename CharT, int N, typename Traits >
-inline std::basic_ostream < CharT,Traits >& FWStreamOut(std::basic_ostream < CharT,Traits >& os,
-                                                        const W::S < CharT,N,Traits >& s)
-{
-   return operator << < CharT, N, Traits, char, std::char_traits < char > > ( os, s );
-}
-
-struct foo {
-   type1 < int& > bar;
-};
-struct foo {
-   type1 < int const > bar;
-};
-
-
-template< int i > void f();
-template< int i > void g() {
-   f < i - 1 > ();
-   f < i > ();
-   f < i + 1 > ();
-   f < bar() > ();
-}
-void h() {
-   g < 42 > ();
-}
-
-#include <vector>
-std::vector < int > A(2);
-std::vector < int > B;
-std::vector < int > C(2);
-std::vector < int > D;
-
-template< class T > struct X { template< class U > void operator ()(U); };
-
-template< class T > class Y { template< class V > void f(V); };
-
-void (* foobar)(void) = NULL;
-std::vector < void (*)(void) > functions;
-
-#define MACRO( a ) a
-template< typename = int > class X;
-MACRO ( void f( X < >& x ) );
-void g( X < >& x );
-
-#include <vector>
-typedef std::vector < std::vector < int > > Table;  // OK
-typedef std::vector < std::vector < bool > > Flags;  // Error
-
-void func(List < B > = default_val1);
-void func(List < List < B > > = default_val2);
-
-BLAH < (3.14>=42) > blah;
-bool X = j < 3 > >1;
-
-void foo()
-{
-   A < (X>Y) > a;
-   a = static_cast < List < B > > (ld);
-}
-
-template< int i > class X { /* ... */ };
-X<1>2>x1;       // Syntax error.
-X < (1>2) > x2;    // Okay.
-
-template< class T > class Y { /* ... */ };
-Y < X < 1 > > x3;     // Okay, same as "Y<X<1> > x3;".
-Y < X < (6 >> 1) > > x4;
-
-
-template< typename T >
-int
-myFunc1(typename T::Subtype val);
-
-int
-myFunc2(T::Subtype val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30103-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30103-templates.cpp
deleted file mode 100644
index 19d12ef7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30103-templates.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-#include <list>
-#include <map>
-#include <vector>
-
-#define MACRO(T) f<T>()
-
-class MyClass
-{
-public:
-   std::map<int, bool>someData;
-   std::map<int, std::list<bool> >otherData;
-};
-
-void foo()
-{
-   List<byte>bob = new List<byte>();
-
-}
-
-A<B>foo;
-A<B,C>bar;
-A<B*>baz;
-A<B<C> >bay;
-
-void asd(void)
-{
-   A<B>foo;
-   A<B,C>bar;
-   A<B*>baz;
-   A<B<C> >bay;
-   if (a < b && b > c)
-   {
-      a = b < c > 0;
-   }
-   if (a<bar()>c)
-   {
-   }
-   a < up_lim() ? do_hi() : do_low;
-   a[ a<b>c] = d;
-}
-
-template<typename T>class MyClass
-{
-
-}
-
-template<typename T>
-class MyClass
-{
-}
-
-template<typename A, typename B, typename C>class MyClass : myvar(0),
-   myvar2(0)
-{
-
-}
-
-template<typename A, typename B, typename C>class MyClass
-   : myvar(0),
-   myvar2(0)
-{
-
-}
-
-
-static int max_value()
-{
-   return (std :: numeric_limits<int>:: max )();
-}
-
-template<class Config_>
-priority_queue<Config_>   ::   ~priority_queue ()  {
-
-}
-
-template<class T>
-T test(T a) {
-   return a;
-}
-
-int main() {
-   int k,j;
-   h g<int>;
-   k=test<int>(j);
-   return 0;
-}
-
-template<typename T, template<typename, unsigned int, unsigned int>class ConcreteStorageClass>
-class RotationMatrix
-   : public StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>
-{
-
-public:
-
-   RotationMatrix()
-      : StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>()
-   {
-      // do some initialization
-   }
-
-   void assign(const OtherClass<T, 3, 3>& other)
-   {
-      // do something
-   }
-
-};
-
-int main()
-{
-   MyClass<double, 3, 3, MyStorage>foo;
-}
-
-template<typename CharT, int N, typename Traits>
-inline std::basic_ostream<CharT,Traits>& FWStreamOut(std::basic_ostream<CharT,Traits>& os,
-                                                     const W::S<CharT,N,Traits>& s)
-{
-   return operator<<<CharT, N, Traits, char, std::char_traits<char> >( os, s );
-}
-
-struct foo {
-   type1<int&>bar;
-};
-struct foo {
-   type1<int const>bar;
-};
-
-
-template<int i>void f();
-template<int i>void g() {
-   f<i - 1>();
-   f<i>();
-   f<i + 1>();
-   f<bar()>();
-}
-void h() {
-   g<42>();
-}
-
-#include <vector>
-std::vector<int>A(2);
-std::vector<int>B;
-std::vector<int>C(2);
-std::vector<int>D;
-
-template<class T>struct X { template<class U>void operator()(U); };
-
-template<class T>class Y { template<class V>void f(V); };
-
-void (* foobar)(void) = NULL;
-std::vector<void (*)(void)>functions;
-
-#define MACRO( a ) a
-template<typename = int>class X;
-MACRO( void f( X<>& x ) );
-void g( X<>& x );
-
-#include <vector>
-typedef std::vector<std::vector<int> >Table;   // OK
-typedef std::vector<std::vector<bool> >Flags;  // Error
-
-void func(List<B> = default_val1);
-void func(List<List<B> > = default_val2);
-
-BLAH<(3.14 >= 42)>blah;
-bool X = j<3> > 1;
-
-void foo()
-{
-   A<(X > Y)>a;
-   a = static_cast<List<B> >(ld);
-}
-
-template<int i>class X { /* ... */ };
-X < 1 > 2 > x1;    // Syntax error.
-X<(1 > 2)>x2;    // Okay.
-
-template<class T>class Y { /* ... */ };
-Y<X<1> >x3;     // Okay, same as "Y<X<1> > x3;".
-Y<X<(6 >> 1)> >x4;
-
-
-template<typename T>
-int
-myFunc1(typename T::Subtype val);
-
-int
-myFunc2(T::Subtype val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30104-templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30104-templ_class.h
deleted file mode 100644
index 802f7e27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30104-templ_class.h
+++ /dev/null
@@ -1,15 +0,0 @@
-template<typename T, template<typename> class SpecialClass>
-class Example
-{
-  // Copy constructor with other variants of Example
-  template<template<typename> class OtherSpecialClass>
-  Example(const Example<T, OtherSpecialClass>& other)
-  {
-    // do something useful here
-  }
-
-  /** The normal member var based on the template arguments */
-  SpecialClass<T> memberVar;
-
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30105-av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30105-av.h
deleted file mode 100644
index 6efe8e9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30105-av.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-   2) There seems to be a problem handling .h-files compared to .cpp-files.
-   The following problem only occurs in header-files, in source-files the
-   output is as desired.
- */
-
-static inline void foo()
-{
-//BEFORE:
-  if (cond) {
-    callFunc();
-  }
-// DESIRED:
-  if (cond) {
-    callFunc();
-  }
-// AFTER:
-  if (cond) {
-    callFunc();
-  }
-
-
-/*
-   3) The spacing around pointer stars is not always maintained as desired.
- */
-//BEFORE:
-  Buffer<T>* buffer;
-//AFTER:
-  Buffer<T>* buffer;
-
-
-/*
-   4) Inside of casts the types are not formatted as outside.
- */
-//BEFORE:
-  T* t = dynamic_cast<T*>(obj);
-//AFTER:
-  T* t = dynamic_cast<T*>(obj);
-
-/*
-   5) Inside some template-stuff the spacing goes weird. Multiple spaces
-   are inserted, although the configuration (should) say otherwise.
- */
-//BEFORE:
-  for (std::map<Key, Value*>::iterator it = map.begin(); it != map.end(); it++) {
-    bar(it);
-  }
-//AFTER:
-  for (std::map<Key, Value*>::iterator it = map.begin(); it != map.end(); it++) {
-    bar(it);
-  }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30106-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30106-templates2.cpp
deleted file mode 100644
index 48f56d99..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30106-templates2.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-void f()
-{
-   call_a_function(42,
-                   double(-1),
-                   "charray");
-   call_a_function(42,
-                   double(-1),
-                   "charray"
-                   );
-   call_a_function(
-      42,
-      double(-1),
-      "charray"
-      );
-   call_a_template_function<int,
-                            int,
-                            int>
-      (42);
-   call_a_template_function<int,
-                            int,
-                            int
-                            >
-      (42);
-   call_a_template_function<int,
-                            int,
-                            int>(42);
-   call_a_template_function<int,
-                            int,
-                            int>(
-      42
-      );
-   call_a_template_function<
-      int,
-      int,
-      int
-      >
-      (42);
-}
-template<class T,
-         class U>
-class W;
-template<class T,
-         class U
-         >
-class X;
-template<
-   class T,
-   class U>
-class Y;
-template<
-   class T,
-   class U
-   >
-class Z;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30107-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30107-templates2.cpp
deleted file mode 100644
index a49d4381..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30107-templates2.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-void f()
-{
-   call_a_function(42,
-                   double(-1),
-                   "charray");
-   call_a_function(42,
-                   double(-1),
-                   "charray"
-                   );
-   call_a_function(
-      42,
-      double(-1),
-      "charray"
-      );
-   call_a_template_function<int,
-                            int,
-                            int>
-      (42);
-   call_a_template_function<int,
-                            int,
-                            int
-                            >
-      (42);
-   call_a_template_function<int,
-                            int,
-                            int>(42);
-   call_a_template_function<int,
-                            int,
-                            int>(
-      42
-      );
-   call_a_template_function<
-      int,
-      int,
-      int
-      >
-      (42);
-}
-template<class T,
-         class U> class W;
-template<class T,
-         class U
-         > class X;
-template<
-   class T,
-   class U> class Y;
-template<
-   class T,
-   class U
-   > class Z;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30108-templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30108-templates3.cpp
deleted file mode 100644
index a0e20d19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30108-templates3.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-template <bool a> struct T {
-   typedef int result;
-};
-template <bool a, bool b> struct X {
-   typedef typename T<a || b>::result result;
-};
-
-template <class T> class new_alloc {
-public:
-   void deallocate(int* p, int /*num*/)
-   {
-      T::operator delete((void*) p);
-   }
-};
-
-void test(void)
-{
-   return x != 0
-          && x >= 1
-          && x < 2
-          && y >= 3
-          && y < 4;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30109-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30109-templates4.cpp
deleted file mode 100644
index 781822e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30109-templates4.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#define FOO(X) \
-	template <unsigned _blk_sz, typename _run_type, class __pos_type> \
-	inline X<_blk_sz, _run_type, __pos_type> operator - ( \
-		const X<_blk_sz, _run_type, __pos_type> & a, \
-		typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \
-	{ \
-		return X<_blk_sz, _run_type, __pos_type>(a.array, a.pos - off); \
-	} \
-	template <unsigned _blk_sz, typename _run_type, class __pos_type> \
-	inline X<_blk_sz, _run_type, __pos_type> & operator -= ( \
-		X < _blk_sz, _run_type, __pos_type > & a, \
-		typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \
-	{ \
-		a.pos -= off; \
-		return a; \
-	}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30110-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30110-class-init.cpp
deleted file mode 100644
index e1b1949c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30110-class-init.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-
-class Foo :
-   public Bar
-{
-};
-
-#define CTOR(i, _)    : \
-   T(X()),              \
-   y()                  \
-{ }
-
-class Foo2 :
-   public Bar
-{
-};
-
-class GLOX_API ClientBase :
-   public Class,
-   public OtherClass,
-   public ThridClass,
-   public ForthClass
-{
- public:
-   ClientBase(const ClientBase& f)
-   {
-      // do something
-   }
-};
-
-ClientBase::ClientBase (const std::string& ns,
-                        const std::string& ns1,
-                        const std::string& ns2)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30111-bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30111-bug_1346.h
deleted file mode 100644
index 2ca31e50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30111-bug_1346.h
+++ /dev/null
@@ -1,10 +0,0 @@
-typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type dummy(const std::function<T*(const S&)>& pFunc, const QVector<S>& pItems)
-{
-    return QVector<T>();
-}
-
-
-typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type filter(const std::function<bool(const T&)>& pFunc, const QVector<T>& pItems)
-{
-    return QVector<T>();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30112-bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30112-bug_1432.cpp
deleted file mode 100644
index 575a21c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30112-bug_1432.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void set();
-vector<int> get();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30113-bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30113-bug_1452.cpp
deleted file mode 100644
index 59a3babd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30113-bug_1452.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-struct foobar {
-	char *
-	foobarz() { return "foobar"; }
-	char *
-	foo_bar() { return "foo_bar"; }
-
-	int foo;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30114-bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30114-bug_1462.cpp
deleted file mode 100644
index b6a33ceb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30114-bug_1462.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <type_traits>
-
-template<
-   typename ... Args,
-   typename E = typename std::enable_if<(sizeof...(Args) >= 1), bool>::type
-   >
-void fun1(Args&& ... args)
-{
-}
-
-template<
-   typename ... Args,
-   typename E = typename std::enable_if<(sizeof...(Args) > 1), bool>::type
-   >
-void fun2(Args&& ... args)
-{
-}
-
-template<
-   typename ... Args,
-   typename E = typename std::enable_if<(sizeof...(Args) < 3), bool>::type
-   >
-void fun3(Args&& ... args)
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30115-Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30115-Issue_1704.cpp
deleted file mode 100644
index 90cb2049..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30115-Issue_1704.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#define INC_REF_COUNT(ref_count) ++ref_count
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30116-Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30116-Issue_1052.cpp
deleted file mode 100644
index 0e21f136..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30116-Issue_1052.cpp
+++ /dev/null
@@ -1 +0,0 @@
-ut8 u32s[sizeof (ut32)] = {0};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30117-Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30117-Issue_2343.cpp
deleted file mode 100644
index a82e1172..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30117-Issue_2343.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-class Capteur {
-public:
-    Capteur ();
-public:
-    float  val_num;
-    float  val_num_prec;    // La valeur précédente pour la comparaison
-    String tendance;        // La variable text récupérée du flux Internet
-    String val_texte;       // La variable text récupérée du flux Internet
-};
-
-class Capteur_CO2
-    : public Capteur {
-public:
-    Capteur_CO2() :
-                  un_membre_en_plus ( 0 ) {}
-public:
-    int un_membre_en_plus;
-};
-
-
-class Salon {
-public:
-    Capteur     temperature;
-    Capteur     humidite;
-    Capteur     pression;
-    Capteur_CO2 CO2;
-};
-
-
-typedef struct Exterieur Exterieur;
-struct Exterieur {  // Structure qui regroupe toutes les variables de la station météo
-    float  temp_num;
-    float  temp_num_prec;   // La valeur précédente pour la comparaison
-    int    humidite;
-    int    humidite_prec;   // La valeur précédente pour la comparaison
-    String temp_tendance;   // La variable text récupérée du flux Internet
-    String temp_texte;      // La variable text récupérée du flux Internet
-    String humidite_texte;  // La variable text récupérée du flux Internet
-    Exterieur () :
-                 temp_num ( -99.9 ),
-                 temp_num_prec ( -99.9 ),
-                 humidite ( 0 ),
-                 humidite_prec ( 0 ),
-                 temp_tendance ( "up" ),
-                 temp_texte ( "" ),
-                 humidite_texte ( "" ) {}
-};
-
-
-
-for ( int i = 3; i < 42; i++ ) {
-    Serial.print ( "TEXTE(AC" );
-    Serial.print ( i );
-    Serial.print ( ";\"0\");\",\";" );
-}
-#define OLIVE     0x7BE0
-#define LIGHTGREY 0xC618
-#ifndef _NETATMO_FONCTIONS_WIFI_h
-    #define _NETATMO_FONCTIONS_WIFI_h
-    #if defined ( ARDUINO ) && ARDUINO >= 100
-        #include "arduino.h"
-        #if defined ( RORO )
-            #define qsijnqsijdn 1323
-            // asbdsqhbdsqibd
-        #endif
-        #define qsijnqsijdn 1323
-
-    #else
-        #define qsijnqsijdn 1323
-
-        #include "WProgram.h"
-    #endif  // if defined ( ARDUINO ) && ARDUINO >= 100
-    #define qsijnqsijdn 1323
-
-#endif  // ifndef _NETATMO_FONCTIONS_WIFI_h
-
-// Essaie de signe=se+szde/szz-sszzd%zdzd
-zzez  = { 1, 2, 3 };
-toto += 1 + 2 / 9 - 3 / 2;
-
-int fonction ( ( int *zeze ), ( ss ) ) { ksjbshjdbshjdb = 1;}
-fonction ( ( &zeze ), ( ss ) );
-fonction ();
-// Définition des structures de données
-typedef struct Exterieur Exterieur;
-struct Exterieur {      // Structure qui regroupe toutes les variables de la station météo
-    float  temp_num;
-    float  temp_num_prec;   // La valeur précédente pour la comparaison
-    int    humidite;
-    int    humidite_prec;   // La valeur précédente pour la comparaison
-    String temp_tendance;   // La variable text récupérée du flux Internet
-};
-Exterieur tototot = { -99, -99, -99, -99, 99 };
-
-// Température Extérieure
-float _Temp_Ext = -99.9;
-float _Temp_Ext_Precedente = -99.9;     // La valeur précédente pour la comparaison
-String _Temp_Ext_Tendance  = "up";
-
-UTFT myGLCD ( SSD1963_800 = 1, 38, 39, 40, 41 );    // (byte model, int RS, int WR, int CS, int RST, int SER)
-UTFT_Geometry geo_myGLCD ( &myGLCD );
-
-const char *jour_semaine[[1], [2]] = {
-    "\0",
-    "Vendredi\0",
-    "Dimanche\0"
-};
-
-void Centrer_Nombre_Int_dans_Zone ( int _nbr, int Y, int X1, int X2, int COULEUR );
-void Centrer_Nombre_Float_dans_Zone ( float _nbr, int Y, int X1, int X2, int COULEUR );
-
-void Centrer_Nombre_Int_dans_Zone ( int _nbr, int Y, int X1, int X2, int COULEUR ) {
-    toto = 1 + 2 / 9 - 3 / 2;
-    String _texte = String ( _nbr, 1 );
-    if ( X2 > X1 ) {
-        X = X1 + ( X2 - X1 + 1 - _texte.length () * myGLCD.getFontXsize () ) / 2;
-    }
-    else {
-        X = X2 + ( X1 - X2 - myGLCD.getFontXsize () ) / 2;
-    }
-    if ( X <= 0 ) {
-        Serial.print ( F ( "-- Erreur dans le fonction Centrer_Nombre_Int_dans_Zone : la valeur calculée de X est négative ou nulle, elle vaut :" ) );
-        Serial.println ( X );
-        Serial.print ( F ( "Le texte qui génère cette erreur est : " ) );
-        Serial.println ( _texte );
-    }
-    else {
-        myGLCD.setColor ( COULEUR );
-        myGLCD.printNumI ( _nbr, X, Y );
-    }
-}
-
-void Texte_Bonjour () {
-    myGLCD.setColor ( VGA_AQUA );
-    myGLCD.setBackColor ( VGA_TRANSPARENT );
-
-
-
-    myGLCD.setFont ( Grotesk32x64 );
-    myGLCD.print ( F ( "BONJOUR" ), CENTER, 20 );
-    myGLCD.setFont ( BigFont );
-    myGLCD.print ( F ( "*** NETATMO AFFICHAGE DEPORTE ***" ), CENTER, 100 );
-    myGLCD.print ( F ( "Debut : Mai 2019 / MAJ : Juillet 2019" ), CENTER, 120 );
-}
-
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30118-Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30118-Issue_2758.cpp
deleted file mode 100644
index 576b1bef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30118-Issue_2758.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// a function call:
-int a = b(
-	5
-	);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30119-Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30119-Issue_2879.cpp
deleted file mode 100644
index fbc323ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30119-Issue_2879.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class CObject
-{
-void f()
-{
-	CObject obj( b1 && c1, b2 && c2 );
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30120-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30120-sp_after_angle.cpp
deleted file mode 100644
index 04af5289..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30120-sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template< typename T >
-struct foo {};
-
-Q_DECLARE_METATYPE(foo < int > )
-
-int bar(foo < int > );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30121-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30121-sp_after_angle.cpp
deleted file mode 100644
index 8764578e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30121-sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template<typename T>
-struct foo {};
-
-Q_DECLARE_METATYPE(foo<int>)
-
-int bar(foo<int>);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30122-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30122-sp_after_angle.cpp
deleted file mode 100644
index 8514bccb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30122-sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template <typename T>
-struct foo {};
-
-Q_DECLARE_METATYPE( foo<int> )
-
-int bar( foo<int> );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30123-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30123-sp_after_angle.cpp
deleted file mode 100644
index 2da08a67..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30123-sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template <typename T>
-struct foo {};
-
-Q_DECLARE_METATYPE(foo<int>)
-
-int bar(foo<int>);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30124-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30124-sp_after_angle.cpp
deleted file mode 100644
index 88e659cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30124-sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template <typename T>
-struct foo {};
-
-Q_DECLARE_METATYPE(foo<int> )
-
-int bar(foo<int> );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30125-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30125-sp_after_angle.cpp
deleted file mode 100644
index 2da08a67..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30125-sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template <typename T>
-struct foo {};
-
-Q_DECLARE_METATYPE(foo<int>)
-
-int bar(foo<int>);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30126-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30126-sp_after_angle.cpp
deleted file mode 100644
index 7710171e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30126-sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template <typename T>
-struct foo {};
-
-Q_DECLARE_METATYPE(foo<int>  )
-
-int bar(foo<int>  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30127-Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30127-Issue_2565.cpp
deleted file mode 100644
index 721d4d78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30127-Issue_2565.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-template
-<bool = (sizeof(unsigned long) >= sizeof(size_t))>
-struct LongFitsIntoSizeTMinusOne { ... }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30128-Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30128-Issue_2873.cpp
deleted file mode 100644
index 6803fd9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30128-Issue_2873.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-class Capteur_CO2
-    : public Capteur, aabc, def
-{
-public:
-    Capteur_CO2()
-        : un ( 1 ), deux(2) {
-    }
-};
-class Capteur_CO3
-    : public Capteur,aabc,def
-{
-public:
-    Capteur_CO3()
-        : un ( 1 ),deux(2) {
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30129-Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30129-Issue_2890.cpp
deleted file mode 100644
index d03e4f62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30129-Issue_2890.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <iostream>
-#include <sstream>
-#include <string>
-
-struct StringBuilder
-{
-        template <typename T>
-        StringBuilder& append(const T& thing)
-        {
-                ss << thing;
-                return *this;
-        }
-        std::string build()
-        {
-                return ss
-                        .str();
-        }
-        std::stringstream ss;
-};
-
-int main()
-{
-        std::string my_____String = StringBuilder()
-                .append(7)
-                .append(" + ")
-                .append(21)
-                .append(" = ")
-                .append(7 + 21)
-                .build();
-        std::string my_____String = StringBuilder()
-                .append(7)
-                .append(" + ")
-                .append(21)
-                .append(" = ")
-                .append(7 + 21)
-                .build();
-
-        std::cout << my___String << std::endl;
-}
-
-void function()
-{
-        auto response = ResponseBuilder_1(1)
-                .setStatus_1(status)
-                .finish_1();
-
-        ResponseBuilder_2(request)
-                .setStatus_2(status)
-                .finish_2();
-
-        return ResponseBuilder_3(request)
-                .setStatus_3(status)
-                .finish_3();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30130-if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30130-if-constexpr.cpp
deleted file mode 100644
index 483317be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30130-if-constexpr.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int foo()
-{
-        if constexpr (a == 0)
-        {
-                return 1;
-        }
-        return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30131-Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30131-Issue_3010.cpp
deleted file mode 100644
index 93fd70db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30131-Issue_3010.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace SomeLongNamespaceName {
-class Foo { };
-}
-
-class Bar : SomeLongNamespaceName::Foo {
-public:
-Bar()
-        : SomeLongNamespaceName::Foo(),
-        myNumber(3),      // <-- this line
-        myOtherNumber(5)
-{
-}
-private:
-int myNumber;
-int myOtherNumber;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30132-sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30132-sp_brace_catch.cpp
deleted file mode 100644
index 04c1b9c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30132-sp_brace_catch.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int foo()
-{
-	try { foo(bar); }catch (int *e) { return 0; }
-
-	if (false) try { throw int(); }catch(...) {}
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30200-bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30200-bug_1862.cpp
deleted file mode 100644
index c5357c86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30200-bug_1862.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#if _MSC_VER < 1300
-#define __func__    "???"
-#else/* comment 1 */
-#define __func__    __FUNCTION__
-#endif/* comment 2 */
-
-#if _MSC_VER < 1300
-#define __func__    "???"
-#else// comment 1
-#define __func__    __FUNCTION__
-#endif// comment 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30201-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30201-cmt_indent.cpp
deleted file mode 100644
index ed27ffca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30201-cmt_indent.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace {
-
-  /* If we're in the middle of the original line, copy the string
-     only up to the cursor position into buf, so tab completion
-     will result in buf's containing only the tab-completed
-     path/filename. */
-
-  class Test {
-
-    Test() {}
-    ~Test() {}
-
-    /** Call this method to
-            run the test
-
-        \param n test number
-        \returns the test result
-     */
-    bool Run(int n);
-
-    /** Call this method to
-        stop the test
-
-       \param n test number
-       \returns the test result
-     */
-    bool Run(int n);
-
-  };
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30202-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30202-cmt_indent.cpp
deleted file mode 100644
index 95c47d6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30202-cmt_indent.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace {
-
-  /* If we're in the middle of the original line, copy the string
-  only up to the cursor position into buf, so tab completion
-  will result in buf's containing only the tab-completed
-  path/filename. */
-
-  class Test {
-
-    Test() {}
-    ~Test() {}
-
-    /** Call this method to
-            run the test
-
-        \param n test number
-        \returns the test result
-    */
-    bool Run(int n);
-
-    /** Call this method to
-        stop the test
-
-    \param n test number
-    \returns the test result
-    */
-    bool Run(int n);
-
-  };
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30203-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30203-cmt_indent.cpp
deleted file mode 100644
index 05cc2df3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30203-cmt_indent.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace {
-
-  /* If we're in the middle of the original line, copy the string
-   * only up to the cursor position into buf, so tab completion
-   * will result in buf's containing only the tab-completed
-   * path/filename. */
-
-  class Test {
-
-    Test() {}
-    ~Test() {}
-
-    /** Call this method to
-     *      run the test
-     *
-     *  \param n test number
-     *  \returns the test result
-     */
-    bool Run(int n);
-
-    /** Call this method to
-     *  stop the test
-     *
-     * \param n test number
-     * \returns the test result
-     */
-    bool Run(int n);
-
-  };
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30204-comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30204-comment-align.cpp
deleted file mode 100644
index afaaafef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30204-comment-align.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-template <class T>
-inline void
-x3(T & a, T & b, T & c)
-{
-    T temp;
-    if (b < a)
-    {
-	if (c < a)
-	{                       // b , c < a
-	    if (b < c)
-	    {                   // b < c < a
-		temp = a;
-		a = b;
-		b = c;
-		c = temp;
-	    }
-	    else
-	    {                   // c <=b < a
-		std::swap(c, a);
-	    }
-	}
-	else
-	{                       // b < a <=c
-	                        // second line of comment
-	    std::swap(a, b);
-	}
-    }
-    0;
-    0;
-    0;
-    if (1)                      // always
-	do_something();
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30205-cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30205-cmt_right.cpp
deleted file mode 100644
index bcca4e2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30205-cmt_right.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-class X
-{
-struct Zone
-{
-    //    int a;
-    //    int b;
-    int c;
-    int d;
-    double e;
-    inline Zone(int _c) : c(_c)
-    {
-    }                                           // constructor for zone search
-
-    inline Zone(
-	//int _a,
-	//int _b,
-	int _c,
-	int _d, double _e) :
-	//a(_a),
-	//b(_b),
-	c(_c),
-	d(_d),
-	e(_e)
-    {
-    }
-};
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
deleted file mode 100644
index d020e171..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-foo();
-// test \
-// blah();
-bar();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30207-cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30207-cmt_indent_pp.h
deleted file mode 100644
index 50e35c8d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30207-cmt_indent_pp.h
+++ /dev/null
@@ -1,8 +0,0 @@
-class MyClass : public BaseClass
-{
-    //@{ BaseClass interface
-#if VERY_LONG_AND_COMPLICATED_DEFINE
-    void foo();
-#endif // VERY_LONG_AND_COMPLICATED_DEFINE
-    //@}
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30208-bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30208-bug_1108.cpp
deleted file mode 100644
index 573a9810..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30208-bug_1108.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int foo()
-   {
-   const std::map<std::string, int> bar =
-      {
-         { "abcXYZ", -13 },
-      };
-   return 5;
-   }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30209-bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30209-bug_1134.cpp
deleted file mode 100644
index 369b70f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30209-bug_1134.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ABC 123 // Start trailing comment..
-                // ..end with aligned comment.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30210-bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30210-bug_1338.cpp
deleted file mode 100644
index 04b4cd8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30210-bug_1338.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-/* *INDENT-OFF* */
-printf("Hello World!\n"); 
-
-
-//test
-/* *INDENT-ON* */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
deleted file mode 100644
index bc25f6b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// First comment
-// Second comment
-
-// First comment
-// Second comment
-
-// Issue #1134
-class MyClass : public BaseClass
-{
-    //@{ BaseClass interface
-#if VERY_LONG_AND_COMPLICATED_DEFINE
-    void foo();
-#endif // VERY_LONG_AND_COMPLICATED_DEFINE
-    //@}
-};
-
-// Issue #1287
-void foo()
-{
-#if defined(SUPPORT_FEATURE)
-    bar();
-#endif // SUPPORT_FEATURE
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#if defined(SUPPORT_FEATURE)
-    bar();
-#endif // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#   if defined(SUPPORT_FEATURE)
-    bar();
-#   endif // SUPPORT_FEATURE
-          // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#   if defined(SUPPORT_FEATURE)
-    bar();
-#   endif // SUPPORT_FEATURE
-          // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-    #if defined(SUPPORT_FEATURE)
-    bar();
-    #endif /* SUPPORT_FEATURE
-              SUPPORT_FEATURE */
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-}
-
-// ----- Some namespace scope --------------------------------------------------
-// ----- FooNamespace scope ----------------------------------------------------
-namespace FooNamespace
-{
-// ----- Some classes scope ----------------------------------------------------
-// ----- FooClass scope --------------------------------------------------------
-class FooClass
-{
-    using FooUsing = FooTemplate<
-        param1,
-        param2
-        >; // FooTemplate
-    // Foo description
-    void foo()
-    {
-        if (a == b)
-        {
-// Col1 comment
-// Col1 comment
-// Col1 comment
-            // Baz description
-            baz(); // Baz trailing comment begin
-                   // Baz trailing comment ...
-                   // Baz trailing comment end
-        } // if (a == b)
-        // Bar description begin
-        // Bar description ...
-        // Bar description end
-        bar(
-            a,
-            b
-            ); // bar trailing comment begin
-               // bar trailing comment ...
-               // Baz trailing comment end
-        /*! Baz description begin
-         * Baz description ...
-         * Baz description end */
-        baz(a,
-            b); /* Baz trailing comment begin
-                   Baz trailing comment ...
-                   Baz trailing comment end */
-        // Bar description
-        bar(); // bar trailing comment begin
-               // bar trailing comment ...
-               // Baz trailing comment end
-
-        // Baz description
-        baz();
-    }
-    void bar();
-    // Many methods
-    void baz();
-}; // FooClass
-// ----- FooClass scope --------------------------------------------------------
-
-// Many classes
-// Many classes
-// Many classes
-
-class BazClass
-{
-    void foo();
-
-// Many methods
-// Many methods
-// Many methods
-
-// Overrides
-// Overrides
-//Overrides
-protected:
-    // Bar description
-    void baz();
-    //Overrides
-}; // BazClass trailing comment begin
-   // BazClass trailing comment ...
-   // BazClass trailing comment end
-// ----- Some classes scope ----------------------------------------------------
-} // FooNamespace trailing comment begin
-  // FooNamespace trailing comment end
-// ----- FooNamespace scope ----------------------------------------------------
-// BarNamespace description
-namespace BarNamespace
-{
-} // namespace BarNamespace
-// ----- Some namespace scope --------------------------------------------------
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
deleted file mode 100644
index abddd42e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// First comment
-// Second comment
-
-// First comment
-// Second comment
-
-// Issue #1134
-class MyClass : public BaseClass
-{
-    //@{ BaseClass interface
-#if VERY_LONG_AND_COMPLICATED_DEFINE
-    void foo();
-#endif // VERY_LONG_AND_COMPLICATED_DEFINE
-    //@}
-};
-
-// Issue #1287
-void foo()
-{
-#if defined(SUPPORT_FEATURE)
-    bar();
-#endif // SUPPORT_FEATURE
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#if defined(SUPPORT_FEATURE)
-    bar();
-#endif // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#   if defined(SUPPORT_FEATURE)
-    bar();
-#   endif // SUPPORT_FEATURE
-          // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#   if defined(SUPPORT_FEATURE)
-    bar();
-#   endif // SUPPORT_FEATURE
-          // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-    #if defined(SUPPORT_FEATURE)
-    bar();
-    #endif /* SUPPORT_FEATURE
-              SUPPORT_FEATURE */
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-}
-
-// ----- Some namespace scope --------------------------------------------------
-// ----- FooNamespace scope ----------------------------------------------------
-namespace FooNamespace
-{
-// ----- Some classes scope ----------------------------------------------------
-// ----- FooClass scope --------------------------------------------------------
-class FooClass
-{
-    using FooUsing = FooTemplate<
-        param1,
-        param2
-        >; // FooTemplate
-    // Foo description
-    void foo()
-    {
-        if (a == b)
-        {
-            // Col1 comment
-            // Col1 comment
-            // Col1 comment
-            // Baz description
-            baz(); // Baz trailing comment begin
-                   // Baz trailing comment ...
-                   // Baz trailing comment end
-        } // if (a == b)
-        // Bar description begin
-        // Bar description ...
-        // Bar description end
-        bar(
-            a,
-            b
-            ); // bar trailing comment begin
-               // bar trailing comment ...
-               // Baz trailing comment end
-        /*! Baz description begin
-         * Baz description ...
-         * Baz description end */
-        baz(a,
-            b); /* Baz trailing comment begin
-                   Baz trailing comment ...
-                   Baz trailing comment end */
-        // Bar description
-        bar(); // bar trailing comment begin
-               // bar trailing comment ...
-               // Baz trailing comment end
-
-        // Baz description
-        baz();
-    }
-    void bar();
-    // Many methods
-    void baz();
-}; // FooClass
-// ----- FooClass scope --------------------------------------------------------
-
-// Many classes
-// Many classes
-// Many classes
-
-class BazClass
-{
-    void foo();
-
-    // Many methods
-    // Many methods
-    // Many methods
-
-    // Overrides
-    // Overrides
-    //Overrides
-protected:
-    // Bar description
-    void baz();
-    //Overrides
-}; // BazClass trailing comment begin
-   // BazClass trailing comment ...
-   // BazClass trailing comment end
-// ----- Some classes scope ----------------------------------------------------
-} // FooNamespace trailing comment begin
-  // FooNamespace trailing comment end
-// ----- FooNamespace scope ----------------------------------------------------
-// BarNamespace description
-namespace BarNamespace
-{
-} // namespace BarNamespace
-// ----- Some namespace scope --------------------------------------------------
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30213-align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30213-align_right_comment.cpp
deleted file mode 100644
index 43a2a70f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30213-align_right_comment.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace A
-{
-namespace B
-{
-namespace C
-{
-
-
-struct D
-{
-	int a; // a.
-	int b;
-	int c;
-}; // struct D
-
-
-} // namespace C
-
-
-struct E {};
-
-
-} // namespace B
-
-
-struct F {};
-
-
-} // namespace C
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30214-align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30214-align_across_braces.cpp
deleted file mode 100644
index 199ede8d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30214-align_across_braces.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-enum foo // comment
-{
-        long_enum_value, // these comments should be aligned
-        another_value,   // with each other, but not
-        shorter,         // with the first line
-};          // this comment should start a new group
-void bar(); // this one should align with the previous line
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30215-Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30215-Issue_2099.cpp
deleted file mode 100644
index 4726f44b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30215-Issue_2099.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void GoAbsolutePosition( /* [in1] */ double arg1_,
-                         /* [in2] */ double arg2_ );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30216-Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30216-Issue_2302.cpp
deleted file mode 100644
index e2684ae6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30216-Issue_2302.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-template<class T>
-class Foo<T>::Baz {
-Baz() noexcept
-	: i(0)
-{
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30217-2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30217-2138.cpp
deleted file mode 100644
index 8d1d7462..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30217-2138.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int i = 0; /* a b *//* a b */ int b = 0;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30218-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30218-trailing_return.cpp
deleted file mode 100644
index be70a23b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30218-trailing_return.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-auto f0(int a, int b) -> int;
-
-struct Foo
-{
-	auto f01() -> bool;
-	auto f02() noexcept -> bool;
-	auto f03() noexcept(true) -> bool;
-	auto f04() noexcept(false) -> bool;
-	auto f05() noexcept -> bool = delete;
-	auto f06() noexcept(true) -> bool = delete;
-	auto f07() noexcept(false) -> bool = delete;
-
-	auto f11() const -> bool;
-	auto f12() const noexcept -> bool;
-	auto f13() const noexcept(true) -> bool;
-	auto f14() const noexcept(false) -> bool;
-	auto f15() const noexcept -> bool = delete;
-	auto f16() const noexcept(true) -> bool = delete;
-	auto f17() const noexcept(false) -> bool = delete;
-
-	auto f21() throw() -> bool;
-	auto f22() throw() -> bool = delete;
-	auto f23() const throw() -> bool;
-	auto f24() const throw() -> bool = delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*) -> result_t {
-		return magic;
-	}) {}
-};
-
-void foo()
-{
-	auto l = [](int n) -> x_t {
-			 return n + 5;
-		 };
-	x([](int n) -> x_t {
-		return n + 5;
-	});
-}
-
-static auto f25() -> bool {
-	return true;
-}
-
-static auto f26() const noexcept(true) -> bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30219-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30219-trailing_return.cpp
deleted file mode 100644
index e250cbd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30219-trailing_return.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-auto f0(int a, int b)->int;
-
-struct Foo
-{
-	auto f01()->bool;
-	auto f02() noexcept->bool;
-	auto f03() noexcept(true)->bool;
-	auto f04() noexcept(false)->bool;
-	auto f05() noexcept->bool = delete;
-	auto f06() noexcept(true)->bool = delete;
-	auto f07() noexcept(false)->bool = delete;
-
-	auto f11() const->bool;
-	auto f12() const noexcept->bool;
-	auto f13() const noexcept(true)->bool;
-	auto f14() const noexcept(false)->bool;
-	auto f15() const noexcept->bool = delete;
-	auto f16() const noexcept(true)->bool = delete;
-	auto f17() const noexcept(false)->bool = delete;
-
-	auto f21() throw()->bool;
-	auto f22() throw()->bool = delete;
-	auto f23() const throw()->bool;
-	auto f24() const throw()->bool = delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*)->result_t {
-		return magic;
-	}) {}
-};
-
-void foo()
-{
-	auto l = [](int n)->x_t {
-			 return n + 5;
-		 };
-	x([](int n)->x_t {
-		return n + 5;
-	});
-}
-
-static auto f25()->bool {
-	return true;
-}
-
-static auto f26() const noexcept(true)->bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30220-bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30220-bug_1340.cpp
deleted file mode 100644
index f64bc6a0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30220-bug_1340.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-double t    = 111;
-double t1   = 222;
-double t123 = 333;
-
-
-auto f = [](double x) -> double
-         {
-             double t    = 1111;
-             double t1   = 1222;
-             double t123 = 1333;
-         };
-
-
-std::transform(v1.begin(), v1.end(), v2.begin(),
-               [](double x) -> double
-               {
-                   double t    = 2111;
-                   double t1   = 2222;
-                   double t123 = 2333;
-               }; );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30221-Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30221-Issue_2914.cpp
deleted file mode 100644
index c2cd8b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30221-Issue_2914.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void f()
-{
-    CallFunction( //-V556: Warning disabled because blablabla
-        param1,
-        param2 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30222-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30222-trailing_return.cpp
deleted file mode 100644
index 9c076282..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30222-trailing_return.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-auto f0(int a, int b)  ->  int;
-
-struct Foo
-{
-	auto f01()  ->  bool;
-	auto f02() noexcept  ->  bool;
-	auto f03() noexcept(true)  ->  bool;
-	auto f04() noexcept(false)  ->  bool;
-	auto f05() noexcept  ->  bool=delete;
-	auto f06() noexcept(true)  ->  bool=delete;
-	auto f07() noexcept(false)  ->  bool=delete;
-
-	auto f11() const  ->  bool;
-	auto f12() const noexcept  ->  bool;
-	auto f13() const noexcept(true)  ->  bool;
-	auto f14() const noexcept(false)  ->  bool;
-	auto f15() const noexcept  ->  bool=delete;
-	auto f16() const noexcept(true)  ->  bool=delete;
-	auto f17() const noexcept(false)  ->  bool=delete;
-
-	auto f21() throw()  ->  bool;
-	auto f22() throw()  ->  bool=delete;
-	auto f23() const throw()  ->  bool;
-	auto f24() const throw()  ->  bool=delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*)  ->  result_t {
-		return magic;
-	}) {}
-};
-
-void foo()
-{
-	auto l = [](int n)  ->  x_t {
-			 return n + 5;
-		 };
-	x([](int n)  ->  x_t {
-		return n + 5;
-	});
-}
-
-static auto f25()  ->  bool {
-	return true;
-}
-
-static auto f26() const noexcept(true)  ->  bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30223-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30223-sp_enum_colon.cpp
deleted file mode 100644
index 11d7320b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30223-sp_enum_colon.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-enum Enum1 : int {
-	E31=0,
-	E32=1,
-	E33=2
-};
-enum Enum2 : int {
-	E31=0,
-	E32=1,
-	E33=2
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30224-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30224-sp_enum_colon.cpp
deleted file mode 100644
index 804fe1ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30224-sp_enum_colon.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-enum Enum1:int {
-	E31=0,
-	E32=1,
-	E33=2
-};
-enum Enum2:int {
-	E31=0,
-	E32=1,
-	E33=2
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30230-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30230-sp_type_func.cpp
deleted file mode 100644
index 0d17364f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30230-sp_type_func.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-int foo1()
-{
-}
-
-int*foo2()
-{
-}
-
-int&foo3()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30231-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30231-sp_type_func.cpp
deleted file mode 100644
index d7d69cc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30231-sp_type_func.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-int foo1()
-{
-}
-
-int* foo2()
-{
-}
-
-int& foo3()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30232-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30232-sp_type_func.cpp
deleted file mode 100644
index fe2a3348..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30232-sp_type_func.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-int foo1()
-{
-}
-
-int*  foo2()
-{
-}
-
-int&  foo3()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30233-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30233-sp_type_func.cpp
deleted file mode 100644
index fe2a3348..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30233-sp_type_func.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-int foo1()
-{
-}
-
-int*  foo2()
-{
-}
-
-int&  foo3()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30234-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30234-functype_param.cpp
deleted file mode 100644
index 32419616..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30234-functype_param.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void foo(int  *(*f)(int));
-void foo(int  &(*f)(int));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30235-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30235-functype_param.cpp
deleted file mode 100644
index 9e9f5ecc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30235-functype_param.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void foo(int  * (*f)(int));
-void foo(int  & (*f)(int));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30240-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30240-align_func_params.cpp
deleted file mode 100644
index 923d274b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30240-align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-public:
-// Short parameters
-TYPE_EXPORT method1(int   a,
-                    float b);
-
-TYPE_EXPORT method2(int&  d,
-                    float e);
-
-TYPE_EXPORT method3(int*  f,
-                    float g);
-
-// Parameters with '&' and '*'
-TYPE_EXPORT method4(int a);
-TYPE_EXPORT method5(int & a);
-TYPE_EXPORT method6(int * a);
-
-TYPE_EXPORT method7(float a);
-TYPE_EXPORT method8(float & a);
-TYPE_EXPORT method9(float * a);
-
-// Single short and long parameters
-void method10(int a);
-void method11(float & a);
-void method12(SomeLongNamespace::SomeLongType long_parameter_name);
-void method13(double * a);
-void method14(SomeLongType long_parameter_name);
-
-// Long parameters
-void method20(int *                           int_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              float &                         float_param);
-
-// Possible bug: different aligning in method21 and method22
-// align_func_params_span = 1, align_func_params_thresh = 8
-void method21(SomeLoooooooooooooongType long_param_1,
-              const string&             string_param_1,
-              const TimePoint&          time_param,
-              double                    double_param_1,
-              double                    double_param_2,
-              const string&             string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-void method22(SomeLoooooooooooooongType long_param_1,
-              const string&             string_param_1,
-              double                    double_param_1,
-              double                    double_param_2,
-              const TimePoint&          time_param,
-              const string&             string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-
-void method23(int                                                 int_param,
-              int *                                               int_ptr_param,
-              float                                               float_param,
-              float &                                             float_ref_param,
-              SomeLongNamespace::SomeLongType                     long_parameter_name,
-              int *                                               other_int_param,
-              SomeLooooongType                                    long_parameter_name,
-              SomeLoooooooooongType                               looong_parameter_name,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name,
-              int *                                               int_ptr_param,
-              float                                               float_param,
-              float &                                             float_ref_param,
-              double &                                            double_param,
-              SomeLongNamespace::SomeLongType                     long_parameter_name,
-              int *                                               other_int_param);
-
-// Don't align several parameters in one line
-void method30(int* f, char foo,
-              float g);
-
-// Short parameters in method definition
-void method40(int   a,
-              float b)
-{
-	int c;
-
-	if ( true ) callProc;
-	// do stuff.
-}
-
-// Long parameters in method definition
-void method50(int                                                 int_param,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-              float                                               float_param,
-              double                                              double_param,
-              const string &                                      string_param)
-{
-	doSomething();
-}
-
-void method51(
-	int                                                 int_param,
-	SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-	float                                               float_param,
-	double                                              double_param,
-	const string &                                      string_param)
-{
-	doSomething();
-}
-void increasing_length(
-	int              int_param,
-	float            float_param,
-	double           double_param,
-	ah_long_t &      string_param,
-	very_long_type   t_param,
-	even_longer_type l_param)
-{
-	doSomething();
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30241-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30241-align_func_params.cpp
deleted file mode 100644
index 923d274b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30241-align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-public:
-// Short parameters
-TYPE_EXPORT method1(int   a,
-                    float b);
-
-TYPE_EXPORT method2(int&  d,
-                    float e);
-
-TYPE_EXPORT method3(int*  f,
-                    float g);
-
-// Parameters with '&' and '*'
-TYPE_EXPORT method4(int a);
-TYPE_EXPORT method5(int & a);
-TYPE_EXPORT method6(int * a);
-
-TYPE_EXPORT method7(float a);
-TYPE_EXPORT method8(float & a);
-TYPE_EXPORT method9(float * a);
-
-// Single short and long parameters
-void method10(int a);
-void method11(float & a);
-void method12(SomeLongNamespace::SomeLongType long_parameter_name);
-void method13(double * a);
-void method14(SomeLongType long_parameter_name);
-
-// Long parameters
-void method20(int *                           int_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              float &                         float_param);
-
-// Possible bug: different aligning in method21 and method22
-// align_func_params_span = 1, align_func_params_thresh = 8
-void method21(SomeLoooooooooooooongType long_param_1,
-              const string&             string_param_1,
-              const TimePoint&          time_param,
-              double                    double_param_1,
-              double                    double_param_2,
-              const string&             string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-void method22(SomeLoooooooooooooongType long_param_1,
-              const string&             string_param_1,
-              double                    double_param_1,
-              double                    double_param_2,
-              const TimePoint&          time_param,
-              const string&             string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-
-void method23(int                                                 int_param,
-              int *                                               int_ptr_param,
-              float                                               float_param,
-              float &                                             float_ref_param,
-              SomeLongNamespace::SomeLongType                     long_parameter_name,
-              int *                                               other_int_param,
-              SomeLooooongType                                    long_parameter_name,
-              SomeLoooooooooongType                               looong_parameter_name,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name,
-              int *                                               int_ptr_param,
-              float                                               float_param,
-              float &                                             float_ref_param,
-              double &                                            double_param,
-              SomeLongNamespace::SomeLongType                     long_parameter_name,
-              int *                                               other_int_param);
-
-// Don't align several parameters in one line
-void method30(int* f, char foo,
-              float g);
-
-// Short parameters in method definition
-void method40(int   a,
-              float b)
-{
-	int c;
-
-	if ( true ) callProc;
-	// do stuff.
-}
-
-// Long parameters in method definition
-void method50(int                                                 int_param,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-              float                                               float_param,
-              double                                              double_param,
-              const string &                                      string_param)
-{
-	doSomething();
-}
-
-void method51(
-	int                                                 int_param,
-	SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-	float                                               float_param,
-	double                                              double_param,
-	const string &                                      string_param)
-{
-	doSomething();
-}
-void increasing_length(
-	int              int_param,
-	float            float_param,
-	double           double_param,
-	ah_long_t &      string_param,
-	very_long_type   t_param,
-	even_longer_type l_param)
-{
-	doSomething();
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30242-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30242-align_func_params.cpp
deleted file mode 100644
index 512233cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30242-align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-public:
-// Short parameters
-TYPE_EXPORT method1(int     a,
-                    float   b);
-
-TYPE_EXPORT method2(int&    d,
-                    float   e);
-
-TYPE_EXPORT method3(int*    f,
-                    float   g);
-
-// Parameters with '&' and '*'
-TYPE_EXPORT method4(int   a);
-TYPE_EXPORT method5(int & a);
-TYPE_EXPORT method6(int * a);
-
-TYPE_EXPORT method7(float   a);
-TYPE_EXPORT method8(float & a);
-TYPE_EXPORT method9(float * a);
-
-// Single short and long parameters
-void method10(int   a);
-void method11(float & a);
-void method12(SomeLongNamespace::SomeLongType   long_parameter_name);
-void method13(double * a);
-void method14(SomeLongType   long_parameter_name);
-
-// Long parameters
-void method20(int *                             int_param,
-              SomeLongNamespace::SomeLongType   long_parameter_name,
-              float &                           float_param);
-
-// Possible bug: different aligning in method21 and method22
-// align_func_params_span = 1, align_func_params_thresh = 8
-void method21(SomeLoooooooooooooongType   long_param_1,
-              const string&               string_param_1,
-              const TimePoint&            time_param,
-              double                      double_param_1,
-              double                      double_param_2,
-              const string&               string_param_2,
-              SomeLoooooooooooooongType   long_param_2 );
-void method22(SomeLoooooooooooooongType   long_param_1,
-              const string&               string_param_1,
-              double                      double_param_1,
-              double                      double_param_2,
-              const TimePoint&            time_param,
-              const string&               string_param_2,
-              SomeLoooooooooooooongType   long_param_2 );
-
-void method23(int                                                   int_param,
-              int *                                                 int_ptr_param,
-              float                                                 float_param,
-              float &                                               float_ref_param,
-              SomeLongNamespace::SomeLongType                       long_parameter_name,
-              int *                                                 other_int_param,
-              SomeLooooongType                                      long_parameter_name,
-              SomeLoooooooooongType                                 looong_parameter_name,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType   very_long_parameter_name,
-              int *                                                 int_ptr_param,
-              float                                                 float_param,
-              float &                                               float_ref_param,
-              double &                                              double_param,
-              SomeLongNamespace::SomeLongType                       long_parameter_name,
-              int *                                                 other_int_param);
-
-// Don't align several parameters in one line
-void method30(int* f, char foo,
-              float g);
-
-// Short parameters in method definition
-void method40(int     a,
-              float   b)
-{
-	int c;
-
-	if ( true ) callProc;
-	// do stuff.
-}
-
-// Long parameters in method definition
-void method50(int                                                   int_param,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType   long_parameter_name,
-              float                                                 float_param,
-              double                                                double_param,
-              const string &                                        string_param)
-{
-	doSomething();
-}
-
-void method51(
-	int                                                   int_param,
-	SomeLongNamespace::OtherLongNamespace::SomeLongType   long_parameter_name,
-	float                                                 float_param,
-	double                                                double_param,
-	const string &                                        string_param)
-{
-	doSomething();
-}
-void increasing_length(
-	int                int_param,
-	float              float_param,
-	double             double_param,
-	ah_long_t &        string_param,
-	very_long_type     t_param,
-	even_longer_type   l_param)
-{
-	doSomething();
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30243-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30243-align_func_params.cpp
deleted file mode 100644
index 82434066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30243-align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-public:
-// Short parameters
-TYPE_EXPORT method1(int   a,
-                    float b);
-
-TYPE_EXPORT method2(int&  d,
-                    float e);
-
-TYPE_EXPORT method3(int*  f,
-                    float g);
-
-// Parameters with '&' and '*'
-TYPE_EXPORT method4(int a);
-TYPE_EXPORT method5(int & a);
-TYPE_EXPORT method6(int * a);
-
-TYPE_EXPORT method7(float a);
-TYPE_EXPORT method8(float & a);
-TYPE_EXPORT method9(float * a);
-
-// Single short and long parameters
-void method10(int a);
-void method11(float & a);
-void method12(SomeLongNamespace::SomeLongType long_parameter_name);
-void method13(double * a);
-void method14(SomeLongType long_parameter_name);
-
-// Long parameters
-void method20(int * int_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              float & float_param);
-
-// Possible bug: different aligning in method21 and method22
-// align_func_params_span = 1, align_func_params_thresh = 8
-void method21(SomeLoooooooooooooongType long_param_1,
-              const string&    string_param_1,
-              const TimePoint& time_param,
-              double double_param_1,
-              double double_param_2,
-              const string& string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-void method22(SomeLoooooooooooooongType long_param_1,
-              const string& string_param_1,
-              double double_param_1,
-              double double_param_2,
-              const TimePoint& time_param,
-              const string&    string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-
-void method23(int     int_param,
-              int *   int_ptr_param,
-              float   float_param,
-              float & float_ref_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int * other_int_param,
-              SomeLooooongType long_parameter_name,
-              SomeLoooooooooongType looong_parameter_name,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name,
-              int *    int_ptr_param,
-              float    float_param,
-              float &  float_ref_param,
-              double & double_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int * other_int_param);
-
-// Don't align several parameters in one line
-void method30(int* f, char foo,
-              float g);
-
-// Short parameters in method definition
-void method40(int   a,
-              float b)
-{
-	int c;
-
-	if ( true ) callProc;
-	// do stuff.
-}
-
-// Long parameters in method definition
-void method50(int int_param,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-              float  float_param,
-              double double_param,
-              const string & string_param)
-{
-	doSomething();
-}
-
-void method51(
-	int int_param,
-	SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-	float  float_param,
-	double double_param,
-	const string & string_param)
-{
-	doSomething();
-}
-void increasing_length(
-	int    int_param,
-	float  float_param,
-	double double_param,
-	ah_long_t &      string_param,
-	very_long_type   t_param,
-	even_longer_type l_param)
-{
-	doSomething();
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30244-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30244-align_func_params.cpp
deleted file mode 100644
index 5efed666..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30244-align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-public:
-// Short parameters
-TYPE_EXPORT method1(int   a,
-                    float b);
-
-TYPE_EXPORT method2(int&  d,
-                    float e);
-
-TYPE_EXPORT method3(int*  f,
-                    float g);
-
-// Parameters with '&' and '*'
-TYPE_EXPORT method4(int a);
-TYPE_EXPORT method5(int & a);
-TYPE_EXPORT method6(int * a);
-
-TYPE_EXPORT method7(float a);
-TYPE_EXPORT method8(float & a);
-TYPE_EXPORT method9(float * a);
-
-// Single short and long parameters
-void method10(int a);
-void method11(float & a);
-void method12(SomeLongNamespace::SomeLongType long_parameter_name);
-void method13(double * a);
-void method14(SomeLongType long_parameter_name);
-
-// Long parameters
-void method20(int * int_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              float & float_param);
-
-// Possible bug: different aligning in method21 and method22
-// align_func_params_span = 1, align_func_params_thresh = 8
-void method21(SomeLoooooooooooooongType long_param_1,
-              const string&    string_param_1,
-              const TimePoint& time_param,
-              double        double_param_1,
-              double        double_param_2,
-              const string& string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-void method22(SomeLoooooooooooooongType long_param_1,
-              const string&    string_param_1,
-              double           double_param_1,
-              double           double_param_2,
-              const TimePoint& time_param,
-              const string&    string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-
-void method23(int     int_param,
-              int *   int_ptr_param,
-              float   float_param,
-              float & float_ref_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int * other_int_param,
-              SomeLooooongType      long_parameter_name,
-              SomeLoooooooooongType looong_parameter_name,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name,
-              int *    int_ptr_param,
-              float    float_param,
-              float &  float_ref_param,
-              double & double_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int * other_int_param);
-
-// Don't align several parameters in one line
-void method30(int* f, char foo,
-              float g);
-
-// Short parameters in method definition
-void method40(int   a,
-              float b)
-{
-	int c;
-
-	if ( true ) callProc;
-	// do stuff.
-}
-
-// Long parameters in method definition
-void method50(int int_param,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-              float          float_param,
-              double         double_param,
-              const string & string_param)
-{
-	doSomething();
-}
-
-void method51(
-	int int_param,
-	SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-	float          float_param,
-	double         double_param,
-	const string & string_param)
-{
-	doSomething();
-}
-void increasing_length(
-	int              int_param,
-	float            float_param,
-	double           double_param,
-	ah_long_t &      string_param,
-	very_long_type   t_param,
-	even_longer_type l_param)
-{
-	doSomething();
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30245-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30245-align_func_params.cpp
deleted file mode 100644
index a44170a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30245-align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-public:
-// Short parameters
-TYPE_EXPORT method1(int   a,
-                    float b);
-
-TYPE_EXPORT method2(int&  d,
-                    float e);
-
-TYPE_EXPORT method3(int*  f,
-                    float g);
-
-// Parameters with '&' and '*'
-TYPE_EXPORT method4(int a);
-TYPE_EXPORT method5(int & a);
-TYPE_EXPORT method6(int * a);
-
-TYPE_EXPORT method7(float a);
-TYPE_EXPORT method8(float & a);
-TYPE_EXPORT method9(float * a);
-
-// Single short and long parameters
-void method10(int a);
-void method11(float & a);
-void method12(SomeLongNamespace::SomeLongType long_parameter_name);
-void method13(double * a);
-void method14(SomeLongType long_parameter_name);
-
-// Long parameters
-void method20(int *   int_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              float & float_param);
-
-// Possible bug: different aligning in method21 and method22
-// align_func_params_span = 1, align_func_params_thresh = 8
-void method21(SomeLoooooooooooooongType long_param_1,
-              const string&    string_param_1,
-              const TimePoint& time_param,
-              double double_param_1,
-              double double_param_2,
-              const string& string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-void method22(SomeLoooooooooooooongType long_param_1,
-              const string& string_param_1,
-              double double_param_1,
-              double double_param_2,
-              const TimePoint& time_param,
-              const string&    string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-
-void method23(int     int_param,
-              int *   int_ptr_param,
-              float   float_param,
-              float & float_ref_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int *   other_int_param,
-              SomeLooooongType long_parameter_name,
-              SomeLoooooooooongType looong_parameter_name,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name,
-              int *    int_ptr_param,
-              float    float_param,
-              float &  float_ref_param,
-              double & double_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int *    other_int_param);
-
-// Don't align several parameters in one line
-void method30(int* f, char foo,
-              float g);
-
-// Short parameters in method definition
-void method40(int   a,
-              float b)
-{
-	int c;
-
-	if ( true ) callProc;
-	// do stuff.
-}
-
-// Long parameters in method definition
-void method50(int    int_param,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-              float  float_param,
-              double double_param,
-              const string & string_param)
-{
-	doSomething();
-}
-
-void method51(
-	int    int_param,
-	SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-	float  float_param,
-	double double_param,
-	const string & string_param)
-{
-	doSomething();
-}
-void increasing_length(
-	int    int_param,
-	float  float_param,
-	double double_param,
-	ah_long_t &      string_param,
-	very_long_type   t_param,
-	even_longer_type l_param)
-{
-	doSomething();
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30246-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30246-align_func_params.cpp
deleted file mode 100644
index 9def11e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30246-align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-public:
-// Short parameters
-TYPE_EXPORT method1(int   a,
-                    float b);
-
-TYPE_EXPORT method2(int&  d,
-                    float e);
-
-TYPE_EXPORT method3(int*  f,
-                    float g);
-
-// Parameters with '&' and '*'
-TYPE_EXPORT method4(int a);
-TYPE_EXPORT method5(int & a);
-TYPE_EXPORT method6(int * a);
-
-TYPE_EXPORT method7(float a);
-TYPE_EXPORT method8(float & a);
-TYPE_EXPORT method9(float * a);
-
-// Single short and long parameters
-void method10(int a);
-void method11(float & a);
-void method12(SomeLongNamespace::SomeLongType long_parameter_name);
-void method13(double * a);
-void method14(SomeLongType long_parameter_name);
-
-// Long parameters
-void method20(int *   int_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              float & float_param);
-
-// Possible bug: different aligning in method21 and method22
-// align_func_params_span = 1, align_func_params_thresh = 8
-void method21(SomeLoooooooooooooongType long_param_1,
-              const string&    string_param_1,
-              const TimePoint& time_param,
-              double        double_param_1,
-              double        double_param_2,
-              const string& string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-void method22(SomeLoooooooooooooongType long_param_1,
-              const string&    string_param_1,
-              double           double_param_1,
-              double           double_param_2,
-              const TimePoint& time_param,
-              const string&    string_param_2,
-              SomeLoooooooooooooongType long_param_2 );
-
-void method23(int     int_param,
-              int *   int_ptr_param,
-              float   float_param,
-              float & float_ref_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int *   other_int_param,
-              SomeLooooongType      long_parameter_name,
-              SomeLoooooooooongType looong_parameter_name,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name,
-              int *    int_ptr_param,
-              float    float_param,
-              float &  float_ref_param,
-              double & double_param,
-              SomeLongNamespace::SomeLongType long_parameter_name,
-              int *    other_int_param);
-
-// Don't align several parameters in one line
-void method30(int* f, char foo,
-              float g);
-
-// Short parameters in method definition
-void method40(int   a,
-              float b)
-{
-	int c;
-
-	if ( true ) callProc;
-	// do stuff.
-}
-
-// Long parameters in method definition
-void method50(int            int_param,
-              SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-              float          float_param,
-              double         double_param,
-              const string & string_param)
-{
-	doSomething();
-}
-
-void method51(
-	int            int_param,
-	SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name,
-	float          float_param,
-	double         double_param,
-	const string & string_param)
-{
-	doSomething();
-}
-void increasing_length(
-	int              int_param,
-	float            float_param,
-	double           double_param,
-	ah_long_t &      string_param,
-	very_long_type   t_param,
-	even_longer_type l_param)
-{
-	doSomething();
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30247-Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30247-Issue_2332.cpp
deleted file mode 100644
index 0bc9cf8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30247-Issue_2332.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-CPoint GetPoint()
-{
-	return { obj_.GetCoordinateXFromObject(),
-	         obj_.GetCoordinateYFromObject(),
-	         obj_.GetCoordinateZFromObject() };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30248-Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30248-Issue_2831.cpp
deleted file mode 100644
index c099567a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30248-Issue_2831.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class Test {
-public:
-void funca()
-{
-	static_cast<A>(funcb(static_cast<B>(
-				     info)));
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30249-align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30249-align-330.cpp
deleted file mode 100644
index a92e1545..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30249-align-330.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-                        \
-   #define CTOR(i, _) : \
-      T(X()),           \
-      y()               \
-   {
-   }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30250-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30250-align_fcall.cpp
deleted file mode 100644
index 055f0029..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30250-align_fcall.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void foo()
-{
-	abc(1,   2,   3);
-	abc(10,  20,  30);
-	abc(100, 200, 300);
-	cab(3, 2, 1, 0);
-	brat("foo",      2000, 3000);
-	brat("question", 2,    -42);
-	brat("a",        -22,  1);
-	while (1)
-	{
-		brat("foo",      2000, 3000);
-		brat("question", 2,    -42);
-		brat("a",        -22,  1);
-	}
-	brat("foo", 2000, 3000);
-	brat("a",   -22,  1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30251-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30251-align_fcall.cpp
deleted file mode 100644
index 055f0029..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30251-align_fcall.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void foo()
-{
-	abc(1,   2,   3);
-	abc(10,  20,  30);
-	abc(100, 200, 300);
-	cab(3, 2, 1, 0);
-	brat("foo",      2000, 3000);
-	brat("question", 2,    -42);
-	brat("a",        -22,  1);
-	while (1)
-	{
-		brat("foo",      2000, 3000);
-		brat("question", 2,    -42);
-		brat("a",        -22,  1);
-	}
-	brat("foo", 2000, 3000);
-	brat("a",   -22,  1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30253-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30253-align_left_shift.cpp
deleted file mode 100644
index 7c98226d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30253-align_left_shift.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <iostream>
-#define MACRO(x) x
-int main()
-{
-	int X[1];
-	MACRO(std::cout << X
-	                << X[0]);
-	std::cout << X
-	          << X;
-	std::cout2 << X
-	           << X;
-	std::cout << X
-	          << X[0];
-	std::cout <<
-	        X <<
-	        Y;
-	std::cout
-	        << X
-	        << Y;
-	std::cout
-	        <<
-	        X
-	        <<
-	        Y;
-}
-
-#define A_LONG_MACRO_NAME(x) x
-
-void f() {
-	std::cout << "Hello, "
-	          << "World!"
-	          << std::endl;
-	A_LONG_MACRO_NAME(std::cout << "Hello, "
-	                            << "World!"
-	                            << std::endl);
-	A_LONG_MACRO_NAME(
-		std::cout << "Hello, "
-		          << "World!"
-		          << std::endl);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30254-align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30254-align_left_shift2.cpp
deleted file mode 100644
index bfea744c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30254-align_left_shift2.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-void g()
-{
-	RLOGD(m_log)
-	        << "str1"
-	        << var;
-
-	if (something)
-		cout << "blah";
-
-}
-
-void f()
-{
-	cout << something(
-		arg);
-	cout
-	        << "something";
-	cout <<
-	        "something";
-
-	RLOGD(m_log)
-	        << "WriteReqSize()";
-
-	RLOGD(m_log) <<
-	        base::sprintfT(
-		"something %u ",
-		m_pendingAccepts);
-
-	RLOGDD(m_log) << sprintfT(
-		"something id=%u",
-		newSocket->GetId());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30255-align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30255-align_constr.cpp
deleted file mode 100644
index 380f0c8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30255-align_constr.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-struct TelegramIndex
-{
-   TelegramIndex(const char *pN, unsigned long nI) :
-      pTelName(pN),
-      nTelIndex(n)
-   {
-   }
-
-   ~TelegramIndex()
-   {
-   }
-
-   const char *const pTelName;
-   unsigned long     nTelIndex;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30256-func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30256-func_call.cpp
deleted file mode 100644
index e3eff88c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30256-func_call.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-void f()
-{
-	auto x = func1(
-		arg,
-		arg);
-}
-
-void f()
-{
-	return func2(
-		arg,
-		arg);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30257-func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30257-func_call_chain.cpp
deleted file mode 100644
index 7e2f3931..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30257-func_call_chain.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void f()
-{
-    m_complete.back().m_replicas.clear();
-
-    m_complete.back().m_replicas.push_back(serverId);
-    m_pending.front().m_replicas.erase(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30258-casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30258-casts.cpp
deleted file mode 100644
index d8a496fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30258-casts.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void f()
-{
-   uint32 x = (uint8)b;
-   uint32 x = (uint16)f(a, b);
-   uint32 x = (uint32)std::distance(a, b);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
deleted file mode 100644
index 7b63b639..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-struct MyClass : public Foo {
-  MyClass(int a,
-          int b,
-          int c)
-      :m_a(a), m_b(b), m_c(c) {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30260-var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30260-var_def_gap.cpp
deleted file mode 100644
index 7333d292..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30260-var_def_gap.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#define A                   -3
-#define B            163
-#define C     2
-
-void foo()
-{
-	const std::string   & targetName1      = pEntry->getTargetName();
-	const Point3d_t       currentPosition1 = pSatOrbit->GetPositionAtTime(jdNow);
-}
-
-void foo2()
-{
-	const std::string   **targetName2      = pEntry->getTargetName();
-	const Point3d_t       currentPosition2 = pSatOrbit->GetPositionAtTime(jdNow);
-}
-
-void foo2()
-{
-	const std::string   **targetName3      = pEntry->getTargetName();
-	const Point3d_t       currentPosition3 = pSatOrbit->GetPositionAtTime(jdNow);
-}
-
-typedef int  MY_INT;
-typedef int *MY_INTP;
-typedef int (*foo_t)(void *bar);
-typedef int (*somefunc_t)(void *barstool);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30261-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
deleted file mode 100644
index 8512377e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-void testShortTypes()
-{
-// No stars
-	float  a;
-	double b;
-
-// All stars
-	float&  a;
-	double& b;
-
-	float *  a;
-	double * b;
-
-	float & a;
-	double &b;
-
-// One star before
-	double& a;
-	float   b;
-
-	double & a;
-	float    b;
-
-	double &a;
-	float   b;
-
-// One star after
-	float   b;
-	double& a;
-
-	float    b;
-	double & a;
-
-	float   b;
-	double &a;
-}
-
-void testLongTypes()
-{
-	int       int_var;
-	int *     int_ptr_var;
-	int *     int_ptr_var;
-	float     float_var;
-	float &   float_ref_var;
-	float &   float_ref_var;
-	double &  double_var;
-	long_type little_long_var;
-	SomeLongNamespace::SomeLongType long_var;
-	int * other_int_var;
-	SomeLooooongType long_var;
-	SomeLoooooooooongType looong_var;
-	int int_var;
-	SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_var;
-	int *    int_ptr_var;
-	float    float_var;
-	float &  float_ref_var;
-	double & double_var;
-	SomeLongNamespace::SomeLongType long_var;
-	float float_var;
-	int * other_int_var;
-	int   other_int_var;
-	int * other_int_var;
-	int&  other_int_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30262-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
deleted file mode 100644
index 4996a3d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-void testShortTypes()
-{
-// No stars
-	float  a;
-	double b;
-
-// All stars
-	float & a;
-	double& b;
-
-	float  * a;
-	double * b;
-
-	float  &a;
-	double &b;
-
-// One star before
-	double& a;
-	float b;
-
-	double & a;
-	float  b;
-
-	double &a;
-	float  b;
-
-// One star after
-	float b;
-	double& a;
-
-	float  b;
-	double & a;
-
-	float  b;
-	double &a;
-}
-
-void testLongTypes()
-{
-	int       int_var;
-	int       * int_ptr_var;
-	int       *int_ptr_var;
-	float     float_var;
-	float     &float_ref_var;
-	float     & float_ref_var;
-	double    & double_var;
-	long_type little_long_var;
-	SomeLongNamespace::SomeLongType long_var;
-	int * other_int_var;
-	SomeLooooongType long_var;
-	SomeLoooooooooongType looong_var;
-	int int_var;
-	SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_var;
-	int    * int_ptr_var;
-	float  float_var;
-	float  & float_ref_var;
-	double & double_var;
-	SomeLongNamespace::SomeLongType long_var;
-	float float_var;
-	int   * other_int_var;
-	int   other_int_var;
-	int   *other_int_var;
-	int   & other_int_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30263-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
deleted file mode 100644
index 1e10f370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-void testShortTypes()
-{
-// No stars
-	float  a;
-	double b;
-
-// All stars
-	float & a;
-	double& b;
-
-	float  * a;
-	double * b;
-
-	float  &a;
-	double &b;
-
-// One star before
-	double& a;
-	float   b;
-
-	double & a;
-	float    b;
-
-	double &a;
-	float   b;
-
-// One star after
-	float   b;
-	double& a;
-
-	float    b;
-	double & a;
-
-	float   b;
-	double &a;
-}
-
-void testLongTypes()
-{
-	int       int_var;
-	int     * int_ptr_var;
-	int      *int_ptr_var;
-	float     float_var;
-	float    &float_ref_var;
-	float   & float_ref_var;
-	double  & double_var;
-	long_type little_long_var;
-	SomeLongNamespace::SomeLongType long_var;
-	int * other_int_var;
-	SomeLooooongType long_var;
-	SomeLoooooooooongType looong_var;
-	int int_var;
-	SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_var;
-	int    * int_ptr_var;
-	float    float_var;
-	float  & float_ref_var;
-	double & double_var;
-	SomeLongNamespace::SomeLongType long_var;
-	float float_var;
-	int * other_int_var;
-	int   other_int_var;
-	int  *other_int_var;
-	int & other_int_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30264-Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30264-Issue_2668.cpp
deleted file mode 100644
index da8e118f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30264-Issue_2668.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class SubClass2 : public SuperClass
-{
-bool variable;
-int abcde;
-
-SubClass2()
-	: SuperClass()
-{
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30265-long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30265-long_br_cmt.cpp
deleted file mode 100644
index 8ebdcec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30265-long_br_cmt.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-
-namespace a::b
-{
-   void foo::bar(int xx)
-   {
-      switch (xx)
-      {
-      case 1:
-         // filler
-         while (true)
-         {
-            if (something)
-            {
-               do_something();
-            }
-            else if (something_else)
-            {
-               do_something_else();
-            }
-            else
-            {
-               dont_do_anything();
-               break;
-            }
-         }
-         break;
-
-      case 2:
-         handle_two();
-
-      default:
-         handle_the_rest();
-         break;
-      } // switch
-   } // foo::bar
-
-   class long_class
-   {
- private:
-      int m_a;
-      int m_name;
-
- public:
-      long_class(int a) {}
-
-      void f1() {}
-
-      void f2() {}
-
-      void f3() {}
-   }; // class long_class
-} // namespace a::b
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30266-Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30266-Issue_2921.cpp
deleted file mode 100644
index 53e3c495..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30266-Issue_2921.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace Namespace1
-{
-namespace Namespace2
-{
-namespace Namespace3
-{
-namespace Namespace4
-{
-namespace Namespace5
-{
-namespace Namespace6
-{
-namespace Namespace7
-{
-namespace Namespace8
-{
-class ClassName
-{
-public:
-ClassName(int a,
-          int b);
-
-private:
-int a;
-int b;
-};
-}
-}
-}
-}
-}
-}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30267-Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30267-Issue_2930.cpp
deleted file mode 100644
index 00cff53b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30267-Issue_2930.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int
-main (
-    int     argc,
-    char    ** argv
-)
-{
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30268-Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30268-Issue_3018.cpp
deleted file mode 100644
index ddbb473e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30268-Issue_3018.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class Class
-{
-int fa();
-int* fpa();
-int fb();
-int& frb();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30270-const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30270-const_throw.cpp
deleted file mode 100644
index 44f0ca68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30270-const_throw.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void GetFoo(void)
-                                                                     const
-{
-	return (m_Foo);
-}
-
-int GetFoo(void)
-                                        throw (std::bad_alloc)
-{
-	return (m_Foo);
-}
-
-class foo {
-	void bar(void)
-	                                                                     const;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30271-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30271-sp_throw_paren.cpp
deleted file mode 100644
index 21ce9291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30271-sp_throw_paren.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-void foo()
-{
-	throw(x);
-	throw(y);
-	throw(z);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30272-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30272-sp_throw_paren.cpp
deleted file mode 100644
index ea851aff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30272-sp_throw_paren.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-void foo()
-{
-	throw (x);
-	throw (y);
-	throw (z);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
deleted file mode 100644
index ee0d705b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class STDMETHOD
-{
-        STDMETHOD(GetValues) (BSTR bsName, REFDATA** pData);
-        STDMETHOD(GetValues) (BSTR bsName, REFDATA** pData);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
deleted file mode 100644
index 93cc7f86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class STDMETHOD
-{
-        STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
-        STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30275-bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30275-bug_1321.cpp
deleted file mode 100644
index 5e708c11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30275-bug_1321.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <utility>
-
-template <typename Fun, typename ... Args>
-inline decltype(auto) Invoke(Fun&& f, Args&&... args)
-noexcept(noexcept(std::forward<Fun>(f)(std::forward<Args>(args) ...)))
-{ return std::forward<Fun>(f)(std::forward<Args>(args) ...); }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30278-bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30278-bug_1439.cpp
deleted file mode 100644
index d560522b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30278-bug_1439.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-struct A;
-struct B;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
deleted file mode 100644
index c8b92481..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-(tmp
-	? chunk_is_newline(tmp)
-		? "newline"
-		: chunk_is_comment(tmp)
-			? "comment"
-			: "other"
-	: chunk_is_newline(tmp)
-		? "newline"
-		: chunk_is_comment(tmp)
-			? "comment"
-			: "other");
-
-a
-? b
-	+ c
-: d
-	+ e;
-
-return
-        outerFlag
-	? RadioButton
-	: innerFlag
-		? Badge
-		: nil;
-
-x = outerFlag
-    ? RadioButton(
-		    arg1
-		    )
-    : Checkbutton
-	    .arg2;
-
-Builder
-.child(
-	outerFlag
-	? RadioButton(
-			buttonArg
-			)
-	: innerFlag
-		? Badge
-			.component(
-				LabelText)
-		: nil
-	);
-
-
-accessoryType
-? ConKSC1{}
-: flag == false
-	? ConKSC2{}
-		.build()
-	: flag == true
-		? ConKSC3{}
-			.build()
-		: ConKSC4{}
-			.build();
-
-options.meta == nil
-? metaCmpnt
-:  CBuilder()
-	.spacing(4)
-	.subCmpnt(
-		CBuilder()
-		.build());
-
-options.meta == nil
-? CBuilder()
-	.spacing(4)
-	.subCmpnt(
-		CBuilder()
-		.build()
-		)
-: Builder
-	.spacing;
-
-options == nil ? CBuilder()
-	.spacing(6)
-: Builder
-	.spacing;
-
-options == nil ? CBuilder()
-	.spacing(6) : Builder
-	.spacing;
-
-flag
-? isChild
-	? TypeBack
-	: TypeCancel
-: nil;
-
-
-func something() {
-	if (flag) {
-		x == flag
-		? Builder
-			.spacing
-		: Builder
-			.spacing;
-	}
-}
-
-
-flag1
-?   ( flag2
-		? ( flag3
-				?   result1
-				:  result2 )
-		:   ( result3  )
-		)
-:  (  flag5
-		? ( flag
-				? result4
-				: result5)
-		:   (  flag6
-				? result6
-				: ( result7   )
-				)
-		);
-
-
-flag1
-?   result1
-:  (
-		flag5
-		);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30280-sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30280-sf557.cpp
deleted file mode 100644
index 287bc9c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30280-sf557.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//test.cpp
-void test_fun(std::size_t a,
-              std::size_t /* b */);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30281-Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30281-Issue_2478.cpp
deleted file mode 100644
index 40674590..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30281-Issue_2478.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//example file
-typedef int X35GlobalT1;
-typedef int X35T2;
-
-void fooX35a()
-{
-	::X35GlobalT1 a1;
-	X35T2         a2;
-
-	::X35GlobalT1 a3 = 1;
-	X35T2         a4 = 1;
-}
-
-void fooX35b()
-{
-	X35GlobalT1 a1;
-	X35T2       a2;
-
-	X35GlobalT1 a3 = 1;
-	X35T2       a4 = 1;
-}
-
-class X35_1a
-{
-private:
-::X35GlobalT1 a1;
-X35T2         a2;
-
-::X35GlobalT1 a3 = 1;
-X35T2         a4 = 1;
-};
-
-class X35_1b
-{
-private:
-X35GlobalT1 a1;
-X35T2       a2;
-
-X35GlobalT1 a3 = 1;
-X35T2       a4 = 1;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30282-Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30282-Issue_2703.cpp
deleted file mode 100644
index ec4554e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30282-Issue_2703.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#define DEFINE_OPERATORS(classT, flagsT)          \
-    inline classT::flagsT                         \
-    operator&(const classT::flagsT&          lh1, \
-              const classT::flagsT::EnumType rh1) \
-    {                                             \
-        return classT::flagsT(lhs) &= rhs;        \
-    }                                             \
-                                                  \
-    inline classT::flagsT                         \
-    operator&(const classT::flagsT::EnumType lh2, \
-              const classT::flagsT&          rh2) \
-    {                                             \
-        return classT::flagsT(lhs) &= rhs;        \
-    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30290-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30290-align_left_shift.cpp
deleted file mode 100644
index 8591a642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30290-align_left_shift.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <iostream>
-#define MACRO(x) x
-int main()
-{
-    int X[1];
-    MACRO(std::cout << X
-            << X[0]);
-    std::cout << X
-        << X;
-    std::cout2 << X
-        << X;
-    std::cout << X
-        << X[0];
-    std::cout <<
-        X <<
-        Y;
-    std::cout
-        << X
-        << Y;
-    std::cout
-        <<
-        X
-        <<
-        Y;
-}
-
-#define A_LONG_MACRO_NAME(x) x
-
-void f() {
-    std::cout << "Hello, "
-        << "World!"
-        << std::endl;
-    A_LONG_MACRO_NAME(std::cout << "Hello, "
-            << "World!"
-            << std::endl);
-    A_LONG_MACRO_NAME(
-	    std::cout << "Hello, "
-	    << "World!"
-	    << std::endl);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30291-indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30291-indent_shift.cpp
deleted file mode 100644
index bc1ae2e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30291-indent_shift.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// We want simple 4-space indentation for each nesting "level".
-
-// cannot find a way to tell uncrustify to indent the line with parenthesis
-int case2() {
-
-    if (condition) {
-	// some code here
-    }
-
-    std::out <<
-        "hello " << "world " <<
-        (who ? "and " : "or ") <<
-        "all " <<
-        "others" << ";" << std::endl;
-
-    // and
-
-    if (condition) {
-	// some code here
-    }
-
-    std::out <<
-        "hello " << "world " <<
-        ("and ") <<
-        "all " <<
-        "others" << ";" << std::endl;
-
-    if (cond)
-	std::out << "hi";
-
-    if (cond)
-	std::out
-	    << "hi"
-	    << "and"
-	    << "more"
-	    ;
-
-    switch (var) {
-    case 0:
-	log() << 5
-	    << 5;
-	break;
-    }
-
-#if 0
-    out
-        << 5;
-#endif
-
-    return log
-        >> var
-        >> second
-        ;
-}
-
-
-// uncrustify aligns (with the << on the first line) instead of indenting
-void case3()
-{
-
-    if (condition1) {
-
-	if (condition2) {
-
-	    std::out << "hello "
-	        << "world "
-	        << (who ? "and " : "or ")
-	        << "all "
-	        << "others" << ";" << std::endl;
-
-	}
-    }
-
-    // this often works better, but has problems with parentheses:
-
-    if (condition1) {
-	if (condition2) {
-	    std::out << "hello " <<
-	        "world " <<
-	        (who ? "and " : "or ") <<
-	        "all " <<
-	        "others" << ";" << std::endl;
-	}
-    }
-}
-
-// uncrustify does not indent >> at all!
-void case4()
-{
-    if (condition) {
-	// some code here
-    }
-
-    std::in >> a
-        >> b
-        >> (who ? c : d) >>
-        >> e;
-
-    // and
-
-    if (condition1) {
-
-	if (condition2) {
-	    std::in >> a >>
-	        b >>
-	        (who ? c : d) >>
-	        e;
-	}
-    }
-}
-
-void foo() {
-
-    if (head())
-	os << "HEAD,";
-    else
-    if (tail())
-	os << "TAIL,";
-
-    if (a >= 0 &&
-        b <= 0)
-	cerr << "it is";
-}
-
-int list[] = {
-    1,
-    2,
-    1 << 5,
-    1 << 6
-};
-
-void check() {
-    ostream &os = Comment(1) << "error: " << workerName <<
-        " terminated by signal " << WTERMSIG(exitStatus);
-
-    return theAddr.addrN().family() == AF_INET6 ?
-        (theAddr.octet(idx * 2) << 8) + theAddr.octet(idx * 2 + 1) :
-        theAddr.octet(idx);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30292-eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30292-eigen.cpp
deleted file mode 100644
index aa43434a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30292-eigen.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void foo()
-{
-    transform << 0, 1, 0, 0,
-                 1, 0, 0, 0,
-                 0, 0, 1, 0,
-                 0, 0, 0, 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30293-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30293-pos_shift.cpp
deleted file mode 100644
index d4a8f1ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30293-pos_shift.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-void foo()
-{
-	// Ensure non-shift operators aren't changed
-	x = 1 +
-	    2;
-	x = 1
-	    + 2;
-	x = 1 + 2;
-
-	// Test position of shift operator
-	cout << x
-	     << y;
-	cout << x
-	     << y;
-	cout << x << y;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30294-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30294-pos_shift.cpp
deleted file mode 100644
index badc9798..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30294-pos_shift.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-void foo()
-{
-	// Ensure non-shift operators aren't changed
-	x = 1 +
-	    2;
-	x = 1
-	    + 2;
-	x = 1 + 2;
-
-	// Test position of shift operator
-	cout << x <<
-	        y;
-	cout << x <<
-	        y;
-	cout << x << y;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30295-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30295-pos_shift.cpp
deleted file mode 100644
index efb19263..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30295-pos_shift.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo()
-{
-	// Ensure non-shift operators aren't changed
-	x = 1 +
-	    2;
-	x = 1
-	    + 2;
-	x = 1 + 2;
-
-	// Test position of shift operator
-	cout << x << y;
-	cout << x << y;
-	cout << x << y;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30300-enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30300-enum_shr.cpp
deleted file mode 100644
index 26e0d08e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30300-enum_shr.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-enum MyEnum
-{
-   kOne   = 0,
-   kTwo   = 1 << 0,
-   kThree = 1 << 1,
-   kFour  = 1 << 2
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30301-enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30301-enum_class.h
deleted file mode 100644
index 7ad5e9ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30301-enum_class.h
+++ /dev/null
@@ -1,24 +0,0 @@
-enum class A
-{
-    a,
-    b
-
-}
-
-enum struct D
-{
-    a,
-    b
-
-}
-
-class B {
-private:
-int x;
-}
-enum C
-{
-    a,
-    b
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30302-bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30302-bug_1315.cpp
deleted file mode 100644
index 584f9a00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30302-bug_1315.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-dookie::wookie << "asd"
-               << "bag"
-               << "sag";
-
-typedef enum
-{
-        A= 0,
-        B= 1 << 0,
-        C= 1 << 1
-};
-
-enum
-{
-        A= 0,
-        B= 1 << 0,
-        C= 1 << 1
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30303-Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30303-Issue_2902.cpp
deleted file mode 100644
index ae10d5a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30303-Issue_2902.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum empty {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30310-braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30310-braced_init_list.cpp
deleted file mode 100644
index 116462c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30310-braced_init_list.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-#include <vector>
-#include <algorithm>
-
-using some_type = int;
-namespace Ns{
-using some_type = int;
-}
-
-class BracedInitListBase {
-public:
-BracedInitListBase()
-        : a{int{1}},
-        b(int(some_type(1))),
-        c(int{some_type(1)}),
-        d{int(some_type(1))},
-        e{some_type{some_type{a}}}
-{
-}
-
-virtual int getA() const {
-        return a;
-}
-private:
-int a {};
-int b {1};
-int c = {1};
-int d = int{1};
-some_type e {1};
-some_type f = {1};
-some_type g = some_type {1};
-std::vector<some_type> h {some_type {4}, 5};
-::std::vector<some_type> i = ::std::vector<some_type>{4, some_type {5}};
-some_type j = ::std::vector<some_type>{4, some_type {5}}[1];
-some_type k[2] {1, 2};
-some_type l[2] = {1, 2};
-
-union SomeUnion {
-        int a;
-        some_type b {};
-};
-};
-
-class BracedInitListDerived : public BracedInitListBase {
-public:
-int getA() const override {
-        return BracedInitListBase::getA();
-}
-};
-
-some_type inc(some_type a)
-{
-        return some_type {++a};
-}
-
-some_type sum(some_type a, some_type b = some_type{1})
-{
-        return a + inc(some_type{b - some_type{1}});
-}
-
-void braced_init_list_int()
-{
-        {
-                int a {};
-                int b = {};
-                int c = int{};
-                int d = int{int{}};
-                int{};
-                int{int{}};
-        }
-        {
-                int a {1};
-                int b = {1};
-                int c = int{1};
-                int d = int{int{1}};
-                int{1};
-                int{int{1}};
-        }
-}
-
-void braced_init_list_some_type()
-{
-        {
-                some_type a {};
-                some_type b = {};
-                some_type c = some_type {};
-                some_type d = some_type {some_type {}};
-                some_type{};
-                some_type{some_type {}};
-        }
-        {
-                some_type a {1};
-                some_type b = {1};
-                some_type c = some_type {1};
-                some_type d = some_type {some_type {1}};
-                some_type{1};
-                some_type{some_type {1}};
-        }
-        {
-                ::some_type a {1};
-                ::some_type b = {1};
-                ::some_type c = ::some_type {1};
-                ::some_type d = ::some_type {::some_type {1}};
-                ::some_type {1};
-                ::some_type {::some_type {1}};
-        }
-        {
-                Ns::some_type a {1};
-                Ns::some_type b = {1};
-                Ns::some_type c = Ns::some_type {1};
-                Ns::some_type d = Ns::some_type {Ns::some_type {1}};
-                Ns::some_type {1};
-                Ns::some_type {Ns::some_type {1}};
-        }
-        {
-                ::Ns::some_type a {1};
-                ::Ns::some_type b = {1};
-                ::Ns::some_type c = ::Ns::some_type {1};
-                ::Ns::some_type d = ::Ns::some_type {::Ns::some_type {1}};
-                ::Ns::some_type {1};
-                ::Ns::some_type {::Ns::some_type {1}};
-        }
-}
-
-void braced_init_list_some_type_auto()
-{
-        {
-                auto b = some_type {};
-                auto c = some_type {some_type {}};
-        }
-        {
-                auto a = {1};
-                auto b = some_type {1};
-                auto c = some_type {some_type {1}};
-        }
-        {
-                auto b = ::some_type {1};
-                auto c = ::some_type {::some_type {1}};
-        }
-        {
-                auto b = Ns::some_type {1};
-                auto c = Ns::some_type {Ns::some_type {1}};
-        }
-        {
-                auto b = ::Ns::some_type {1};
-                auto c = ::Ns::some_type {::Ns::some_type {1}};
-        }
-}
-
-void braced_init_list_function_call()
-{
-        {
-                some_type a {sum(some_type{}, some_type{})};
-                some_type b = sum(some_type{}, some_type{});
-                some_type c = some_type {sum(some_type{}, some_type{})};
-                some_type{sum(some_type{}, some_type{})};
-                some_type{some_type {sum(some_type{}, some_type{})}};
-        }
-        {
-                some_type a {sum(some_type{1}, some_type{1})};
-                some_type b = sum(some_type{1}, some_type{1});
-                some_type c = some_type {sum(some_type{1}, some_type{1})};
-                some_type{sum(some_type{a}, some_type{b})};
-                some_type{some_type {sum(some_type{a}, some_type{b})}};
-        }
-        {
-                ::some_type a {sum(::some_type{1}, ::some_type{1})};
-                ::some_type b = sum(::some_type{1}, ::some_type{1});
-                ::some_type c = ::some_type {sum(::some_type{1}, ::some_type{1})};
-                ::some_type {sum(::some_type{a}, ::some_type{b})};
-                ::some_type {::some_type {sum(::some_type{a}, ::some_type{b})}};
-        }
-        {
-                Ns::some_type a {sum(Ns::some_type{1}, Ns::some_type{1})};
-                Ns::some_type b = sum(Ns::some_type{1}, Ns::some_type{1});
-                Ns::some_type c = Ns::some_type {sum(Ns::some_type{1}, Ns::some_type{1})};
-                Ns::some_type {sum(Ns::some_type{a}, Ns::some_type{b})};
-                Ns::some_type {Ns::some_type {sum(Ns::some_type{a}, Ns::some_type{b})}};
-        }
-        {
-                ::Ns::some_type a {sum(::Ns::some_type{1}, ::Ns::some_type{1})};
-                ::Ns::some_type b = sum(::Ns::some_type{1}, ::Ns::some_type{1});
-                ::Ns::some_type c = ::Ns::some_type {sum(::Ns::some_type{1}, ::Ns::some_type{1})};
-                ::Ns::some_type {sum(::Ns::some_type{a}, ::Ns::some_type{b})};
-                ::Ns::some_type {::Ns::some_type {sum(::Ns::some_type{a}, ::Ns::some_type{b})}};
-        }
-}
-
-void braced_init_list_function_call_newline()
-{
-        {
-                some_type a {
-                        sum(some_type{},
-                            some_type{}
-                            )
-                };
-                some_type b = sum(
-                        some_type{}, some_type{});
-                some_type c = some_type {
-                        sum(
-                                some_type{}, some_type{})};
-                some_type
-                {sum
-                         (some_type{},
-                         some_type{}
-                         )
-                };
-                some_type
-                {some_type {sum
-                                    (some_type{}, some_type{})}};
-        }
-}
-
-void braced_init_list_array()
-{
-        {
-                some_type a[] {};
-                some_type b[] = {};
-                some_type c[] = {{}, {}};
-        }
-        {
-                some_type a[] {1, 2};
-                some_type b[] = {1, 2};
-                some_type c[] = {some_type {1}, some_type {2}};
-        }
-}
-
-void braced_init_list_template()
-{
-        {
-                std::vector<some_type> a {};
-                std::vector<some_type> b = {};
-                std::vector<some_type> c = {{}, {}};
-                std::vector<some_type> d = std::vector<some_type>{};
-                std::vector<some_type> e = std::vector<some_type>{{}, {}};
-                std::vector<some_type> f = std::vector<some_type>{some_type {}, some_type {}};
-                std::vector<some_type>{};
-                std::vector<some_type>{{}, {}};
-                std::vector<some_type>{some_type {}, some_type {}};
-        }
-        {
-                std::vector<some_type> a {1, 2};
-                std::vector<some_type> b = {1, 2};
-                std::vector<some_type> c = std::vector<some_type>{1, 2};
-                std::vector<some_type> d = std::vector<some_type>{some_type {1}, some_type {2}};
-                std::vector<some_type>{1, 2};
-                std::vector<some_type>{some_type {1}, some_type {2}};
-        }
-}
-
-void braced_init_list_lambda()
-{
-        std::vector<some_type> a {1, 2};
-        some_type b {2};
-
-        auto c = []{
-                         return true;
-                 };
-        auto d = [](){
-                         return true;
-                 };
-
-        std::find_if(a.begin(), a.end(), [&b](const some_type &v){
-                return v == b;
-        });
-        std::find_if(a.begin(), a.end(), [](const some_type &v){
-                some_type b{2}; return v == b;
-        });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30311-uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30311-uniform_initialization.cpp
deleted file mode 100644
index 64da585d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30311-uniform_initialization.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void whatever() {
-        SomeStruct a = SomeStruct{1, 2, 3};
-
-        someFuncCall(SomeStruct{4, 5, 6});
-}
-
-namespace foo {
-int bar();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30312-return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30312-return_init_list.cpp
deleted file mode 100644
index ef91c528..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30312-return_init_list.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-inline static std::tuple<bool, std::string> foo(void) {
-// should remain a one liner
-	return{ true, ""s };
-}
-inline static std::tuple<bool, std::string, std::string> foo(void) {
-	if (condition) {
-// should remain a one liner
-		return{ true, ""s, ""s };
-	}
-// should remain a one liner
-	return{ false, ""s, ""s };
-}
-inline static std::tuple<bool, std::string> foo(void) {
-// should indent one level
-	return{
-	        true, ""s
-	};
-}
-inline static std::tuple<bool, std::string> foo(void) {
-// should indent one level on new line
-	return
-	        { true, ""s };
-}
-inline static std::tuple<bool, std::string> foo(void) {
-// should indent one level for braces and another level for values
-	return
-	        {
-	                true, ""s
-		};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30313-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30313-sp_brace_brace.cpp
deleted file mode 100644
index 2ae91737..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30313-sp_brace_brace.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-template<std::size_t _N, typename _Type, _Type... _Nums>
-std::array<uint8_t, _N - 1> constexpr crypt_helper(uint8_t const inSeed, char const (&inString)[_N], std::integer_sequence<_Type, _Nums...>) {
-	return {{crypt(_Nums, inSeed, static_cast<uint8_t>(inString[_Nums]))...}};
-}
-static std::array<double_t, Homology::kNumberOfStats> const m{{
-	0.3,
-	0.6,
-	1.0
-}};
-static std::array<double_t, Homology::kNumberOfStats> const m = {
-	0.3,
-	0.6,
-	1.0
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30314-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30314-sp_brace_brace.cpp
deleted file mode 100644
index b7ca9839..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30314-sp_brace_brace.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-template<std::size_t _N, typename _Type, _Type... _Nums>
-std::array<uint8_t, _N - 1> constexpr crypt_helper(uint8_t const inSeed, char const (&inString)[_N], std::integer_sequence<_Type, _Nums...>) {
-	return { {crypt(_Nums, inSeed, static_cast<uint8_t>(inString[_Nums]))...} };
-}
-static std::array<double_t, Homology::kNumberOfStats> const m{ {
-	0.3,
-	0.6,
-	1.0
-} };
-static std::array<double_t, Homology::kNumberOfStats> const m = {
-	0.3,
-	0.6,
-	1.0
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30315-return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30315-return_braced_init.cpp
deleted file mode 100644
index cf86baeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30315-return_braced_init.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-int foo1()
-{
-	// should not have newline before '.'
-	return std::pair<int, int>{1, 2}.first;
-}
-
-int foo2()
-{
-	// should be ARITH, not ADDR
-	return int{3} & 2;
-}
-
-int foo3()
-{
-	// should be ARITH, not ADDR
-	constexpr static int x = 3;
-	return decltype(x){x} & 2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30316-Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30316-Issue_2428.cpp
deleted file mode 100644
index b2a0a139..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30316-Issue_2428.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void test()
-{
-        int{ 0 };
-        int abcdef{ 0 };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
deleted file mode 100644
index 3c22d790..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <algorithm>
-#include <type_traits>
-
-template<typename Arg,
-         typename ... Args,
-         typename std::enable_if <!std::is_same<Arg,
-                                                decltype (std::make_index_sequence<5> { })>::value,
-                                  int>::type = 0>
-void foo(Arg &&arg,
-         Args && ... args)
-{
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30318-Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30318-Issue_2949.cpp
deleted file mode 100644
index d37d7ac3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30318-Issue_2949.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-int index = -1;
-
-int main(void)
-{
-    const int x = 2;
-    int y = index < -x ? 1 : index > x ? 2 : 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30319-Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30319-Issue_2886.cpp
deleted file mode 100644
index 0474c710..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30319-Issue_2886.cpp
+++ /dev/null
@@ -1 +0,0 @@
-ValuePrimaryKey<int64_t, Schema, ColumnId1{0}> id = { kTableName, kColumnNameId };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30320-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30320-returns.cpp
deleted file mode 100644
index 1999355b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30320-returns.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define foo1(x) { return x; }
-#define foo2(x) { return(x); }
-#define foo3(x) { return(x); }
-#define foo4(x) { return{x}; }
-#define foo5(x) { return  {x}; }
-
-#define case1(x) return x
-#define case2(x) return(x)
-#define case3(x) return(x)
-#define case4(x) return{x}
-#define case5(x) return  {x}
-
-void foo(int x)
-{
-	switch (x)
-	{
-	case 1:
-		return 1;
-	case 2:
-		return(2);
-	case 3:
-		return(3);
-	case 4:
-		return{4};
-	case 5:
-		return  {5};
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30321-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30321-returns.cpp
deleted file mode 100644
index 5dcdfafd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30321-returns.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define foo1(x) { return x; }
-#define foo2(x) { return (x); }
-#define foo3(x) { return (x); }
-#define foo4(x) { return{x}; }
-#define foo5(x) { return  {x}; }
-
-#define case1(x) return x
-#define case2(x) return (x)
-#define case3(x) return (x)
-#define case4(x) return{x}
-#define case5(x) return  {x}
-
-void foo(int x)
-{
-	switch (x)
-	{
-	case 1:
-		return 1;
-	case 2:
-		return (2);
-	case 3:
-		return (3);
-	case 4:
-		return{4};
-	case 5:
-		return  {5};
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30322-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30322-returns.cpp
deleted file mode 100644
index 68218f60..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30322-returns.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define foo1(x) { return x; }
-#define foo2(x) { return(x); }
-#define foo3(x) { return  (x); }
-#define foo4(x) { return{x}; }
-#define foo5(x) { return{x}; }
-
-#define case1(x) return x
-#define case2(x) return(x)
-#define case3(x) return  (x)
-#define case4(x) return{x}
-#define case5(x) return{x}
-
-void foo(int x)
-{
-	switch (x)
-	{
-	case 1:
-		return 1;
-	case 2:
-		return(2);
-	case 3:
-		return  (3);
-	case 4:
-		return{4};
-	case 5:
-		return{5};
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30323-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30323-returns.cpp
deleted file mode 100644
index 3360b493..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30323-returns.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define foo1(x) { return x; }
-#define foo2(x) { return(x); }
-#define foo3(x) { return  (x); }
-#define foo4(x) { return {x}; }
-#define foo5(x) { return {x}; }
-
-#define case1(x) return x
-#define case2(x) return(x)
-#define case3(x) return  (x)
-#define case4(x) return {x}
-#define case5(x) return {x}
-
-void foo(int x)
-{
-	switch (x)
-	{
-	case 1:
-		return 1;
-	case 2:
-		return(2);
-	case 3:
-		return  (3);
-	case 4:
-		return {4};
-	case 5:
-		return {5};
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30324-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30324-returns.cpp
deleted file mode 100644
index d1fa77be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30324-returns.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define foo1(x) { return (x); }
-#define foo2(x) { return(x); }
-#define foo3(x) { return  (x); }
-#define foo4(x) { return{x}; }
-#define foo5(x) { return  {x}; }
-
-#define case1(x) return (x)
-#define case2(x) return(x)
-#define case3(x) return  (x)
-#define case4(x) return{x}
-#define case5(x) return  {x}
-
-void foo(int x)
-{
-	switch (x)
-	{
-	case 1:
-		return (1);
-	case 2:
-		return(2);
-	case 3:
-		return  (3);
-	case 4:
-		return{4};
-	case 5:
-		return  {5};
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30325-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30325-returns.cpp
deleted file mode 100644
index 95e4f22c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30325-returns.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define foo1(x) { return x; }
-#define foo2(x) { return x; }
-#define foo3(x) { return x; }
-#define foo4(x) { return{x}; }
-#define foo5(x) { return  {x}; }
-
-#define case1(x) return x
-#define case2(x) return x
-#define case3(x) return x
-#define case4(x) return{x}
-#define case5(x) return  {x}
-
-void foo(int x)
-{
-	switch (x)
-	{
-	case 1:
-		return 1;
-	case 2:
-		return 2;
-	case 3:
-		return 3;
-	case 4:
-		return{4};
-	case 5:
-		return  {5};
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30326-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30326-indent_off_after_return.cpp
deleted file mode 100644
index 6cd6d8e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30326-indent_off_after_return.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-int foo1()
-{
-	return std::pair<int, int>{
-		1, 2
-	}.first;
-}
-
-int foo2()
-{
-	return
-	int{3} & 2;
-}
-
-int foo3()
-{
-	constexpr static int x = 3;
-	return
-	decltype(x) {x} & 2;
-}
-
-int foo4()
-{
-	return
-	new Type();
-}
-
-int foo5()
-{
-	return
-	veryLongMethodCall(
-		arg1,
-		longMethodCall(
-			methodCall(
-				arg2, arg3
-				), arg4
-			)
-		);
-}
-
-int foo6()
-{
-	auto my_lambda = [] ()
-			 {
-				 return 1 +
-				 2 +
-				 3;
-
-			 };
-}
-
-template<typename U>
-U *
-find(const std::string &name = "") const
-{
-	return find<U>([&name] (auto *pComposite)
-	{
-		return name.empty() ||
-		pComposite->getName() == name;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30327-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30327-indent_off_after_return.cpp
deleted file mode 100644
index 6cd6d8e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30327-indent_off_after_return.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-int foo1()
-{
-	return std::pair<int, int>{
-		1, 2
-	}.first;
-}
-
-int foo2()
-{
-	return
-	int{3} & 2;
-}
-
-int foo3()
-{
-	constexpr static int x = 3;
-	return
-	decltype(x) {x} & 2;
-}
-
-int foo4()
-{
-	return
-	new Type();
-}
-
-int foo5()
-{
-	return
-	veryLongMethodCall(
-		arg1,
-		longMethodCall(
-			methodCall(
-				arg2, arg3
-				), arg4
-			)
-		);
-}
-
-int foo6()
-{
-	auto my_lambda = [] ()
-			 {
-				 return 1 +
-				 2 +
-				 3;
-
-			 };
-}
-
-template<typename U>
-U *
-find(const std::string &name = "") const
-{
-	return find<U>([&name] (auto *pComposite)
-	{
-		return name.empty() ||
-		pComposite->getName() == name;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30328-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
deleted file mode 100644
index b75c35b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-void bar()
-{
-	foo(42, {1, 2, 3, 4});
-	foo(42,
-	    {1, 2, 3, 4});
-
-	foo(42, vector
-	    {1, 2, 3, 4});
-	foo(42,
-	    vector
-	    {1, 2, 3, 4});
-	foo(42, vector
-	    {1, 2, 3, 4});
-
-	foo(42, vector<int>
-	    {1, 2, 3, 4});
-	foo(42,
-	    vector<int>
-	    {1, 2, 3, 4});
-	foo(42, vector<int>
-	    {1, 2, 3, 4});
-	foo(42, vector
-	    <int>
-	    {1, 2, 3, 4});
-
-	foo(42, decltype(something)
-	    {1, 2, 3, 4});
-	foo(42,
-	    decltype(something)
-	    {1, 2, 3, 4});
-	foo(42, decltype(something)
-	    {1, 2, 3, 4});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30329-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
deleted file mode 100644
index 83837910..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-void bar()
-{
-	foo(42, {1, 2, 3, 4});
-	foo(42,
-	    {1, 2, 3, 4});
-
-	foo(42, vector{1, 2, 3, 4});
-	foo(42,
-	    vector{1, 2, 3, 4});
-	foo(42, vector{1, 2, 3, 4});
-
-	foo(42, vector<int>{1, 2, 3, 4});
-	foo(42,
-	    vector<int>{1, 2, 3, 4});
-	foo(42, vector<int>{1, 2, 3, 4});
-	foo(42, vector
-	    <int>{1, 2, 3, 4});
-
-	foo(42, decltype(something) {1, 2, 3, 4});
-	foo(42,
-	    decltype(something) {1, 2, 3, 4});
-	foo(42, decltype(something) {1, 2, 3, 4});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30330-Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30330-Issue_3080.cpp
deleted file mode 100644
index 75c6072b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30330-Issue_3080.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-auto j = int{0};
-auto j = decltype(int){0};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
deleted file mode 100644
index 15cc6e3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-void asd(void)
-{
-	a < up_lim() ? do_hi() : do_low;
-	a[ a<b>c] = d;
-}
-
-[[nodiscard]] inline static CFErrorRef _Nullable CreateErrorIfError(CFStringRef const inDomain, CFIndex const inCode, CFDictionaryRef const inInformation) {
-	[[maybe_unused]] auto const [iterator, inserted]{ super_type::insert(ioFileReference) };
-	if (inCode == 0) {
-		return nullptr;
-	}
-	return ::CFErrorCreate(kCFAllocatorDefault, inDomain, inCode, inInformation);
-}
-
-[[gnu::always_inline]] [[gnu::hot]] [[gnu::const]] [[nodiscard]]
-inline int f();
-[[gnu::always_inline, gnu::const, gnu::hot, nodiscard]]
-int f();
-[[using gnu : const, always_inline, hot]] [[nodiscard]]
-int f [[gnu::always_inline]]();
-
-int f(int i) [[expects: i > 0]] [[ensures audit x: x < 1]];
-
-void f() {
-	int i [[cats::meow([[]])]];
-	int x [[unused]] = f();
-}
-
-int f(int i) [[deprecated]] {
-	switch(i) {
-	case 1: [[fallthrough]];
-		[[likely]] case 2: return 1;
-	}
-	return 2;
-}
-
-[[
-unused, deprecated("keeping for reference only")
-]]
-void f()
-{
-}
-
-[[noreturn]] void f() [[deprecated("because")]] {
-	throw "error";
-}
-
-void print2(int * [[carries_dependency]] val)
-{
-	std::cout<<*p<<std::endl;
-}
-
-class X {
-public:
-int v() const {
-	return x;
-}
-int g() [[expects: v() > 0]];
-private:
-int k() [[expects: x > 0]];
-int x;
-};
-
-class [[foo, bar("baz")]] /**/ Y : private Foo, Bar {
-public:
-int v(int &x) {
-	return x;
-}
-};
-
-class
-	[[foo]]
-	[[bar("baz")]]
-	Z : Foo, public Bar {
-public:
-int v(int * x) {
-	return *x;
-}
-};
-
-int g(int* p) [[ensures: p != nullptr]]
-{
-	*p = 42;
-}
-
-bool meow(const int&) {
-	return true;
-}
-void i(int& x) [[ensures: meow(x)]]
-{
-	++x;
-}
-
-enum Enum {
-	a, b
-};
-enum class [[foo]] Enum {
-	a, b
-};
-enum struct [[foo]] /**/ [[bar("baz")]] Enum {
-	a, b
-};
-enum [[foo]]
-Enum {
-	a, b
-};
-enum class [[foo]] //
-[[bar("baz")]] Enum {
-	a, b
-};
-enum struct //
-[[bar("baz")]] Enum {
-	a, b
-};
-enum
-[[foo]] [[bar("baz")]] /**/ Enum {
-	a, b
-};
-enum class /**/ [[foo]] [[bar("baz")]]
-Enum {
-	a, b
-};
-enum //
-struct
-[[foo]]
-[[bar("baz")]]
-Enum {
-	a, b
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30401-Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30401-Issue_2570.cpp
deleted file mode 100644
index 44373e77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30401-Issue_2570.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-class [[nodiscard]] CClass final
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30701-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30701-function-def.cpp
deleted file mode 100644
index 89261c8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30701-function-def.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-int &
-Function()
-{
-   static int x;
-   return (x);
-}
-
-void
-foo1(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-void
-foo2(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-void
-foo3(
-   int param1,
-   int param2,                                               // comment
-   char *param2
-   );
-
-struct whoopee *
-foo4(
-   int param1,
-   int param2,
-   char *param2                                              /* comment */
-   );
-
-const struct snickers *
-foo5(
-   int param1,
-   int param2,
-   char *param2
-   );
-
-
-void
-foo(
-   int param1,
-   int param2,
-   char *param2
-   )
-{
-   printf("boo!\n");
-}
-
-int
-classname::method();
-
-int
-classname::method()
-{
-   foo();
-}
-
-int
-classname::method2();
-
-int
-classname::method2()
-{
-   foo2();
-}
-
-const int&
-className::method1(
-   void
-   ) const
-{
-   // stuff
-}
-
-const longtypename&
-className::method2(
-   void
-   ) const
-{
-   // stuff
-}
-
-int &
-foo();
-
-int &
-foo()
-{
-   list_for_each(a,b) {
-      bar(a);
-   }
-   return nuts;
-}
-
-void
-Foo::bar() {
-}
-
-Foo::Foo() {
-}
-
-Foo::~Foo() {
-}
-
-void
-func(
-   void
-   )
-{
-   Directory dir("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30702-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30702-function-def.cpp
deleted file mode 100644
index c1fb4ed4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30702-function-def.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-int &
-Function()
-{
-   static int x;
-   return (x);
-}
-
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int param1,
-          int param2,
-          char *param2);
-
-void foo3(int param1,
-          int param2,                                        // comment
-          char *param2);
-
-struct whoopee *foo4(int param1, int param2, char *param2 /* comment */);
-
-const struct snickers *foo5(int param1, int param2, char *param2);
-
-
-void
-foo(int param1, int param2, char *param2)
-{
-   printf("boo!\n");
-}
-
-int classname::method();
-
-int
-classname::method()
-{
-   foo();
-}
-
-int classname::method2();
-
-int
-classname::method2()
-{
-   foo2();
-}
-
-const int&
-className::method1(void) const
-{
-   // stuff
-}
-
-const longtypename&
-className::method2(void) const
-{
-   // stuff
-}
-
-int &foo();
-
-int &
-foo()
-{
-   list_for_each(a,b) {
-      bar(a);
-   }
-   return nuts;
-}
-
-void
-Foo::bar() {
-}
-
-Foo::Foo() {
-}
-
-Foo::~Foo() {
-}
-
-void
-func(void)
-{
-   Directory dir("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30703-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30703-function-def.cpp
deleted file mode 100644
index c604152d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30703-function-def.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-int &Function()
-{
-   static int x;
-   return (x);
-}
-
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int param1,int param2,char *param2);
-
-void foo3(int param1,int param2,                                        // comment
-          char *param2);
-
-struct whoopee *foo4(int param1, int param2, char *param2 /* comment */);
-
-const struct snickers *foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf("boo!\n");
-}
-
-int classname::method();
-
-int classname::method()
-{
-   foo();
-}
-
-int classname::method2();
-
-int classname::method2()
-{
-   foo2();
-}
-
-const int& className::method1(void) const
-{
-   // stuff
-}
-
-const longtypename& className::method2(void) const
-{
-   // stuff
-}
-
-int &foo();
-
-int &foo()
-{
-   list_for_each(a,b) {
-      bar(a);
-   }
-   return nuts;
-}
-
-void Foo::bar() {
-}
-
-Foo::Foo() {
-}
-
-Foo::~Foo() {
-}
-
-void func(void)
-{
-   Directory dir("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30705-func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30705-func_param.cpp
deleted file mode 100644
index 8bdb0ce8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30705-func_param.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-typedef short (*hello1)(char coolParam,
-                        ushort *,
-                        unsigned int anotherone);
-
-short (*hello2)(char coolParam,
-                ulong *,
-                uchar,
-                unsigned int anotherone);
-
-short hello3(char coolParam,
-             ushort *,
-             unsigned int anotherone);
-
-void x(custom_t *e, void (*funcptr));
-void x(custom_t *e, void (*funcptr)[]);
-void x(custom_t *e, void (*funcptr)(int, int));
-void x(custom_t *e, void (*funcptr)(int, int)[]);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30706-bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30706-bug_1020.cpp
deleted file mode 100644
index f0e9e60d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30706-bug_1020.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void HouseNumberData(Translation const & trans  = Translation { },
-                     Orientation const & orient = Orientation { },
-                     CategoryIds const & cats   = CategoryIds(),
-                     std::string const & txt    = std::string { },
-                     bool active = false);
-
-void HouseNumberData(Translation const & trans______________,
-                     Orientation const & orient______________________,
-                     CategoryIds const & cats_____________________,
-                     std::string const & txt___________________,
-                     bool active_________);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30711-semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30711-semicolons.cpp
deleted file mode 100644
index de28deef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30711-semicolons.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-static int foo(int bar);
-
-static int foo(int bar)
-{
-	for (;;)
-	{
-		break;
-	}
-	if (a)
-	{
-		foo();
-	}
-
-	if (b)
-		if (c)
-			bar();
-		else
-			;
-
-	else
-	{
-		foo();
-	}
-	switch (a)
-	{
-	case 1: break;
-	case 2: break;
-	default: break;
-	}
-	while (b-->0)
-	{
-		bar();
-	}
-	do
-	{
-		bar();
-	} while (b-->0  );
-}
-
-enum FPP {
-	FPP_ONE = 1,
-	FPP_TWO = 2,
-};
-
-struct narg {
-	int abc;
-	char def;
-	const char *ghi;
-};
-
-class CFooRun {
-long stick();
-int bar() {
-	m_ick++;
-}
-
-CFooRun();
-~CFooRun() {
-}
-};
-
-void f()
-{
-	if (tmp[0] == "disk")
-	{
-		tmp = split (tmp[1], ",");
-		DiskEntry entry = { tmp[0], tmp[2],
-			            stxxl::int64 (str2int (tmp[1])) *
-			            stxxl::int64 (1024 * 1024) };
-		disks_props.push_back (entry);
-	}
-}
-
-template < class > struct type;
-
-template < class T >
-class X {
-typedef type < T > base;
-void f () {
-	( base :: operator * () );
-}
-};
-
-namespace N
-{
-class C
-{
-#define NOP(x) { \
-}
-};
-}
-
-namespace N
-{
-class C
-{
-};
-}
-
-void deallocate2(S **s_ptr)
-{
-	{
-		void *stopper_for_apply = (int[]){0};
-		void **list_for_apply = (void *[]){(*s_ptr)->arr, *s_ptr, stopper_for_apply};
-		for (int i = 0;list_for_apply[i] != stopper_for_apply;i++) {
-			saferFree((void *) &(list_for_apply[i]));
-		}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30712-bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30712-bug_1158.cpp
deleted file mode 100644
index 2a9ba76d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30712-bug_1158.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void Class1::Func(void)
-{
-	while (Next());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
deleted file mode 100644
index 890f2eba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()
-{
-	while (a < b && c > d)
-		i++;
-
-	for  (  ; a < b && c > d; )
-		i++;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30714-Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30714-Issue_1733.cpp
deleted file mode 100644
index 10be5586..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30714-Issue_1733.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class X15
-{
-enum Enum
-{
-	e1
-};
-
-operator Enum();
-};
-
-::X15::operator ::X15::Enum()
-{
-	return e1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30715-Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30715-Issue_2942.cpp
deleted file mode 100644
index dbecc7f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30715-Issue_2942.cpp
+++ /dev/null
@@ -1 +0,0 @@
-if (p == b) ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30720-custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30720-custom-open-2.cpp
deleted file mode 100644
index 4d05944a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30720-custom-open-2.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-
-BEGIN_MESSAGE_MAP(CUSB2_camera_developementDlg, CDialog)
-    ON_COMMAND(IDC_ESCAPE, On_Escape)
-    ON_COMMAND(IDC_8_BIT, On_8_Bit)
-    ON_COMMAND(IDC_14_BIT, On_14_Bit)
-    ON_COMMAND(IDC_ACQUIRE, On_Acquire)
-    ON_COMMAND(IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages)
-    ON_COMMAND(IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages)
-    ON_WM_PAINT()
-    ON_WM_QUERYDRAGICON()
-    ON_WM_CTLCOLOR()
-END_MESSAGE_MAP()
-
-namespace one
-{
-    namespace two
-    {
-        int Func(int a,
-                 int b)
-        {
-            return a + b;
-        }
-    }
-}
-
-using namespace one::two;
-
-void Func2(int c,
-           int d)
-{
-}
-
-int main()
-{
-    int a;
-
-    switch (a)
-    {
-        case 0:
-            Func2(1, Func(1, 2));
-            Func2(1, one::two::Func(1, 2));
-            break;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30721-Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30721-Issue_2386.cpp
deleted file mode 100644
index ac0b1dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30721-Issue_2386.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// A
-
-
-std::string getText()
-{
-	return "Hello World";
-}
-
-int main(int argc, char *argv[])
-{
-	std::cout << getText() << std::endl;
-	return 0;
-}
-// This is Hello World with a function call and
-
-// form feed characters in it for emacs page-break-lines extension
-// which draws a horizontal line for each FF char it finds.
-//
-// this file contains two single h. lines and two consecutive h. lines
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30730-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30730-qt-1.cpp
deleted file mode 100644
index 5d0273e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30730-qt-1.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-class Foo : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void mySlot( ) {
-    }
-
-public slots:
-    void publicSlot( );
-
-signals:
-    void somesignal( );
-
-};
-
-class foo
-{
-    bool b;
-
-public:
-    int i;
-};
-class bar : public
-    foo
-{
-    void *p;
-
-protected:
-    double d;
-    enum e {A,B};
-
-private:
-};
-
-class Foo1 : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void mySlot( );
-
-public Q_SLOTS:
-    void publicSlot( );
-
-Q_SIGNALS:
-    void somesignal( );
-};
-
-class foo1
-{
-    bool b;
-
-public:
-    int i;
-};
-class bar : public
-    foo1
-{
-    void *p;
-
-protected:
-    double d;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30731-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30731-qt-1.cpp
deleted file mode 100644
index 55b2459b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30731-qt-1.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-class Foo : public QObject
-{
-	Q_OBJECT
-
-
- private slots:
-
-	void mySlot() {
-	}
-
-
- public slots:
-
-	void publicSlot();
-
-
- signals:
-
-	void somesignal();
-
-};
-
-class foo
-{
-	bool b;
-
-
- public:
-
-	int i;
-};
-class bar : public
-	foo
-{
-	void*p;
-
-
- protected:
-
-	double d;
-	enum e {A,B};
-
-
- private:
-};
-
-class Foo1 : public QObject
-{
-	Q_OBJECT
-
-
- private Q_SLOTS:
-
-	void mySlot();
-
-
- public Q_SLOTS:
-
-	void publicSlot();
-
-
- Q_SIGNALS:
-
-	void somesignal();
-};
-
-class foo1
-{
-	bool b;
-
-
- public:
-
-	int i;
-};
-class bar : public
-	foo1
-{
-	void*p;
-
-
- protected:
-
-	double d;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30732-Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30732-Issue_2734.cpp
deleted file mode 100644
index 27dfdc70..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30732-Issue_2734.cpp
+++ /dev/null
@@ -1 +0,0 @@
-connect( server, SIGNAL(newConnection()), this, SLOT(ok()));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30740-sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30740-sef.cpp
deleted file mode 100644
index 8730ba15..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30740-sef.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-CFoo::CFoo(const DWORD something,

-		const RECT& positionRect,

-		const UINT aNumber,

-		bool thisIsReadOnly,

-		const CString& windowTitle,

-		CInfo* pStructInfo,

-		int widthOfSomething)

-	: CSuperFoo(something, positionRect, aNumber,

-			thisIsReadOnly, windowTitle),

-	m_pInfo(pInfo),

-	m_width(widthOfSomething)

-{

-}

-

-

-// this_comment_has_a_first_word_that_is_too_long_to_fit_into_a_line_without_wrapping

-// and should not start with a blank comment line.

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30741-al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30741-al.cpp
deleted file mode 100644
index 1c911bf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30741-al.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ctest4 */
-fm_status fm2000EventHandlingInitialize(fm_int sw);
-fm_status fm2000MacTableOverflowStart(fm_int sw);
-fm_bool   fm2000ProcessMATableEntry(fm_mac_table_work_list *pWork,
-                                    fm_int                  sw,
-                                    fm_int                  index,
-                                    fm_thread *             event_handler,
-                                    fm_uint32 *             numUpdates,
-                                    fm_event **             event);
-
-
-void foo()
-{
-    Logger log = new Logger();
-    Logger log = new Logger();
-
-    log.foo.bar    = 5;
-    log.narf.sweat = "cat";
-
-    for (i = 0 ; i < 5 ; i++)
-    {
-        bar(i);
-    }
-} /* foo */
-
-
-
-
-int this_works(int x);
-int bug(int); /* BUG: left-aligned */
-
-
-typedef int fooman;
-enum FLAGS
-{
-    FLAGS_decimal  = 1,    /* decimal */
-    FLAGS_unsigned = 2,    /* u or U suffix */
-    FLAGS_long     = 4,    /* l or L suffix */
-
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30742-delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30742-delete.cpp
deleted file mode 100644
index c33aa682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30742-delete.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-
-void x(int **d) {
-  delete *d;
-}
-
-void x(int& d) {
-  delete &d;
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30744-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30744-Issue_2170.cpp
deleted file mode 100644
index f1edafd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30744-Issue_2170.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class Foo
-{
-public:
-Foo( int bar = 1 );
-Foo( const Foo & )             = delete;
-Foo &operator= ( const Foo & ) = delete;
-~Foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30745-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30745-Issue_2170.cpp
deleted file mode 100644
index f1edafd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30745-Issue_2170.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class Foo
-{
-public:
-Foo( int bar = 1 );
-Foo( const Foo & )             = delete;
-Foo &operator= ( const Foo & ) = delete;
-~Foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30746-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
deleted file mode 100644
index 7dff7dd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-class Foo
-{
-public:
-Foo( int bar)                  = 0;
-Foo( int bar                   = 777 );
-Foo( const Foo & )             = delete;
-Foo( int boo )                 = default;
-Foo( unsigned int )            = default;
-Foo( unsigned int boo          =999 );
-Foo &operator= ( const Foo & ) = delete;
-~Foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30747-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
deleted file mode 100644
index 30d315a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-class Foo
-{
-public:
-Foo( int bar)                  = 0;
-Foo( int bar         = 777 );
-Foo( const Foo & )             = delete;
-Foo( int boo )                 = default;
-Foo( unsigned int )            = default;
-Foo( unsigned int boo=999 );
-Foo &operator= ( const Foo & ) = delete;
-~Foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30748-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
deleted file mode 100644
index 9b55a964..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-class Foo
-{
-public:
-Foo( int bar) = 0;
-Foo( int bar = 777 );
-Foo( const Foo & ) = delete;
-Foo( int boo ) = default;
-Foo( unsigned int ) = default;
-Foo( unsigned int boo=999 );
-Foo &operator= ( const Foo & ) = delete;
-~Foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30750-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30750-lambda.cpp
deleted file mode 100644
index 84bafe26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30750-lambda.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-void f1()
-{
-   auto a =
-      [ = ](int *a, Something& b)
-      {
-         std::cout << "blah: " << *a;
-      };
-}
-
-void f1a()
-{
-   std::for_each(a, b,
-                 [](Something& b)
-   {
-      std::cout << "blah: " << *a;
-   });
-}
-
-void f1b()
-{
-   std::for_each(a, b,
-                 [](int& b) -> foo
-   {
-      b += 3;
-      return(b);
-   });
-}
-
-void f2()
-{
-   Invoke(a, b,
-          [&one, two](int *a, Something& b)
-   {
-      std::cout << "blah: " << *a;
-   });
-}
-
-void f3a()
-{
-   auto a = []  {
-            };
-   auto b = []{
-               return(true);
-            };
-}
-
-void f3b()
-{
-   Invoke(a, b,
-          [&one, two]
-   {
-      std::cout << "blah: " << one << two;
-   });
-}
-
-void f3c()
-{
-   int a[]{};
-}
-
-void g1()
-{
-   auto a = [ = ](int *a, Something&b)  {
-               std::cout << "blah: " << *a;
-            };
-}
-
-void g1a()
-{
-   std::for_each(a, b, [](Something& b){
-      std::cout << "blah: " << *a;
-   });
-}
-
-void g1b()
-{
-   std::for_each(a, b, []  (int& b)->foo {
-      b += 3;
-      return(b);
-   });
-}
-
-void g2()
-{
-   Invoke(a, b,
-          [&one, two]  (int *a, Something&b){
-      std::cout << "blah: " << *a;
-   });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30751-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30751-lambda.cpp
deleted file mode 100644
index be202237..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30751-lambda.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-void f1()
-{
-   auto a =
-      [=] (int *a, Something& b){
-         std::cout << "blah: " << *a;
-      };
-}
-
-void f1a()
-{
-   std::for_each(a, b,
-                 [] (Something& b){
-      std::cout << "blah: " << *a;
-   });
-}
-
-void f1b()
-{
-   std::for_each(a, b,
-                 [] (int& b) -> foo {
-      b += 3;
-      return(b);
-   });
-}
-
-void f2()
-{
-   Invoke(a, b,
-          [&one, two] (int *a, Something& b){
-      std::cout << "blah: " << *a;
-   });
-}
-
-void f3a()
-{
-   auto a = []  {};
-   auto b = []{ return(true); };
-}
-
-void f3b()
-{
-   Invoke(a, b,
-          [&one, two]{
-      std::cout << "blah: " << one << two;
-   });
-}
-
-void f3c()
-{
-   int a[]{};
-}
-
-void g1()
-{
-   auto a = [=] (int *a, Something&b)  { std::cout << "blah: " << *a; };
-}
-
-void g1a()
-{
-   std::for_each(a, b, [] (Something& b){ std::cout << "blah: " << *a; });
-}
-
-void g1b()
-{
-   std::for_each(a, b, [] (int& b)->foo { b += 3; return(b); });
-}
-
-void g2()
-{
-   Invoke(a, b,
-          [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30752-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30752-lambda.cpp
deleted file mode 100644
index 84ca8b21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30752-lambda.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-void f1()
-{
-   auto a =
-      [=] (int *a, Something& b)
-      {
-         std::cout << "blah: " << *a;
-      };
-}
-
-void f1a()
-{
-   std::for_each(a, b,
-                 [] (Something& b)
-   {
-      std::cout << "blah: " << *a;
-   }
-                 );
-}
-
-void f1b()
-{
-   std::for_each(a, b,
-                 [] (int& b) -> foo
-   {
-      b += 3;
-      return(b);
-   }
-                 );
-}
-
-void f2()
-{
-   Invoke(a, b,
-          [&one, two] (int *a, Something& b)
-   {
-      std::cout << "blah: " << *a;
-   }
-          );
-}
-
-void f3a()
-{
-   auto a = []
-            {
-            };
-   auto b = []
-            {
-               return(true);
-            };
-}
-
-void f3b()
-{
-   Invoke(a, b,
-          [&one, two]
-   {
-      std::cout << "blah: " << one << two;
-   }
-          );
-}
-
-void f3c()
-{
-   int a[]{};
-}
-
-void g1()
-{
-   auto a = [=] (int *a, Something&b)
-            {
-               std::cout << "blah: " << *a;
-            };
-}
-
-void g1a()
-{
-   std::for_each(a, b, [] (Something& b)
-   {
-      std::cout << "blah: " << *a;
-   }
-                 );
-}
-
-void g1b()
-{
-   std::for_each(a, b, [] (int& b)->foo
-   {
-      b += 3;
-      return(b);
-   }
-                 );
-}
-
-void g2()
-{
-   Invoke(a, b,
-          [&one, two] (int *a, Something&b)
-   {
-      std::cout << "blah: " << *a;
-   }
-          );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30753-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30753-lambda2.cpp
deleted file mode 100644
index 2bcfff9f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30753-lambda2.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-void f1()
-{
-   auto a =
-      [=] (int *a, Something& b){
-         std::cout << "blah: " << *a;
-      };
-}
-
-void f1a()
-{
-   std::for_each(a, b,
-                 [] (Something& b){
-                    std::cout << "blah: " << *a;
-                 }
-                 );
-}
-
-void f1b()
-{
-   std::for_each(a, b,
-                 [] (int& b) -> foo {
-                    b += 3;
-                    return(b);
-                 }
-                 );
-}
-
-void f2()
-{
-   Invoke(a, b,
-          [&one, two] (int *a, Something& b){
-             std::cout << "blah: " << *a;
-          }
-          );
-}
-
-void f3a()
-{
-   auto a = [] {};
-   auto b = []{ return(true); };
-}
-
-void f3b()
-{
-   Invoke(a, b,
-          [&one, two]{
-             std::cout << "blah: " << one << two;
-          }
-          );
-}
-
-void f3c()
-{
-   int a[]{};
-}
-
-void g1()
-{
-   auto a = [=] (int *a, Something&b) { std::cout << "blah: " << *a; };
-}
-
-void g1a()
-{
-   std::for_each(a, b, [] (Something& b){ std::cout << "blah: " << *a; });
-}
-
-void g1b()
-{
-   std::for_each(a, b, [] (int& b)->foo { b += 3; return(b); });
-}
-
-void g2()
-{
-   Invoke(a, b,
-          [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30754-bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30754-bug_i_682.h
deleted file mode 100644
index 51c58e23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30754-bug_i_682.h
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()

-{

-        return [=](T* t) {

-        };

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30755-bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30755-bug_i_938.h
deleted file mode 100644
index b13997a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30755-bug_i_938.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-void function(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30756-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30756-bug_1296.cpp
deleted file mode 100644
index 482045df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30756-bug_1296.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-int main()
-{
-        auto lambda2 = [&]()
-        {
-                code();
-        };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30757-Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30757-Issue_3054.cpp
deleted file mode 100644
index 53edc388..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30757-Issue_3054.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void func()
-{
-  parallel_for(0, 100, [&](const int i){
-    const std::vector<int> values = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
-    return values[i];
-  });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30758-Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30758-Issue_3054-2.cpp
deleted file mode 100644
index e4c1c8da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30758-Issue_3054-2.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void func()
-{
-  parallel_for(0, 100,
-               [&](int aaaaaa, int bbbbbbb, int ccccccc, int ddddddd,
-                   const int eee){
-    // do something
-    return a;
-  });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30761-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30761-out-668.cpp
deleted file mode 100644
index 8829c0ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30761-out-668.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-int b()
-{
-   int abcde=           13;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30762-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30762-out-668.cpp
deleted file mode 100644
index 0dac74c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30762-out-668.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-int b()
-{
-   int abcde=		13;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30763-Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30763-Issue_2166.cpp
deleted file mode 100644
index d9ac55c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30763-Issue_2166.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void f1()
-{
-   int a;
-   int b;
-   auto lambda1 = [ &a ](){ return true; };
-   auto lambda2 = [ &a = b ](){ return true; };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30764-Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30764-Issue_2591.cpp
deleted file mode 100644
index 01ed232e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30764-Issue_2591.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-const auto lambda = [this](int arg) {
-  doSomething();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30770-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30770-lambda.cpp
deleted file mode 100644
index 44f277c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30770-lambda.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-void f1()
-{
-	auto a =
-		[=](int *a, Something & b)
-		{
-			std::cout << "blah: " << *a;
-		};
-}
-
-void f1a()
-{
-	std::for_each(a, b,
-	              [](Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f1b()
-{
-	std::for_each(a, b,
-	              [](int & b) -> foo
-	{
-		b += 3;
-		return b;
-	});
-}
-
-void f2()
-{
-	Invoke(a, b,
-	       [&one, two](int *a, Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f3a()
-{
-	auto a = []  {
-		 };
-	auto b = []{
-			 return true;
-		 };
-}
-
-void f3b()
-{
-	Invoke(a, b,
-	       [&one, two]
-	{
-		std::cout << "blah: " << one << two;
-	});
-}
-
-void f3c()
-{
-	int a[]{};
-}
-
-void g1()
-{
-	auto a = [ = ](int* a, Something &b)  {
-			 std::cout << "blah: " << *a;
-		 };
-}
-
-void g1a()
-{
-	std::for_each(a, b, [](Something& b){
-		std::cout<<"blah: "<<*a;
-	});
-}
-
-void g1b()
-{
-	std::for_each(a, b, [](int& b)->foo {
-		b+=3; return(b);
-	});
-}
-
-void g2()
-{
-	Invoke(a, b,
-	       [&one, two](int *a, Something&b){
-		std::cout << "blah: " << *a;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30771-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30771-lambda.cpp
deleted file mode 100644
index 49c4d96f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30771-lambda.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-void f1()
-{
-	auto a =
-		[=] (int *a, Something & b)
-		{
-			std::cout << "blah: " << *a;
-		};
-}
-
-void f1a()
-{
-	std::for_each(a, b,
-	              [] (Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f1b()
-{
-	std::for_each(a, b,
-	              [] (int & b) -> foo
-	{
-		b += 3;
-		return b;
-	});
-}
-
-void f2()
-{
-	Invoke(a, b,
-	       [&one, two] (int *a, Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f3a()
-{
-	auto a = []  {
-		 };
-	auto b = []{
-			 return true;
-		 };
-}
-
-void f3b()
-{
-	Invoke(a, b,
-	       [&one, two]
-	{
-		std::cout << "blah: " << one << two;
-	});
-}
-
-void f3c()
-{
-	int a[]{};
-}
-
-void g1()
-{
-	auto a = [ = ] (int* a, Something &b)  {
-			 std::cout << "blah: " << *a;
-		 };
-}
-
-void g1a()
-{
-	std::for_each(a, b, [] (Something& b){
-		std::cout<<"blah: "<<*a;
-	});
-}
-
-void g1b()
-{
-	std::for_each(a, b, [] (int& b)->foo {
-		b+=3; return(b);
-	});
-}
-
-void g2()
-{
-	Invoke(a, b,
-	       [&one, two] (int *a, Something&b){
-		std::cout << "blah: " << *a;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30772-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30772-lambda.cpp
deleted file mode 100644
index 0c834f22..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30772-lambda.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-void f1()
-{
-	auto a =
-		[=](int *a, Something & b)
-		{
-			std::cout << "blah: " << *a;
-		};
-}
-
-void f1a()
-{
-	std::for_each(a, b,
-	              [](Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f1b()
-{
-	std::for_each(a, b,
-	              [](int & b) -> foo
-	{
-		b += 3;
-		return b;
-	});
-}
-
-void f2()
-{
-	Invoke(a, b,
-	       [&one, two](int *a, Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f3a()
-{
-	auto a = []{
-		 };
-	auto b = []{
-			 return true;
-		 };
-}
-
-void f3b()
-{
-	Invoke(a, b,
-	       [&one, two]
-	{
-		std::cout << "blah: " << one << two;
-	});
-}
-
-void f3c()
-{
-	int a[]{};
-}
-
-void g1()
-{
-	auto a = [ = ](int* a, Something &b)  {
-			 std::cout << "blah: " << *a;
-		 };
-}
-
-void g1a()
-{
-	std::for_each(a, b, [](Something& b){
-		std::cout<<"blah: "<<*a;
-	});
-}
-
-void g1b()
-{
-	std::for_each(a, b, []  (int& b)->foo {
-		b+=3; return(b);
-	});
-}
-
-void g2()
-{
-	Invoke(a, b,
-	       [&one, two]  (int *a, Something&b){
-		std::cout << "blah: " << *a;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30773-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30773-lambda.cpp
deleted file mode 100644
index 5389b7ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30773-lambda.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-void f1()
-{
-	auto a =
-		[=](int *a, Something & b)
-		{
-			std::cout << "blah: " << *a;
-		};
-}
-
-void f1a()
-{
-	std::for_each(a, b,
-	              [](Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f1b()
-{
-	std::for_each(a, b,
-	              [](int & b) -> foo
-	{
-		b += 3;
-		return b;
-	});
-}
-
-void f2()
-{
-	Invoke(a, b,
-	       [&one, two](int *a, Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f3a()
-{
-	auto a = [] {
-		 };
-	auto b = [] {
-			 return true;
-		 };
-}
-
-void f3b()
-{
-	Invoke(a, b,
-	       [&one, two]
-	{
-		std::cout << "blah: " << one << two;
-	});
-}
-
-void f3c()
-{
-	int a[]{};
-}
-
-void g1()
-{
-	auto a = [ = ](int* a, Something &b)  {
-			 std::cout << "blah: " << *a;
-		 };
-}
-
-void g1a()
-{
-	std::for_each(a, b, [](Something& b){
-		std::cout<<"blah: "<<*a;
-	});
-}
-
-void g1b()
-{
-	std::for_each(a, b, []  (int& b)->foo {
-		b+=3; return(b);
-	});
-}
-
-void g2()
-{
-	Invoke(a, b,
-	       [&one, two]  (int *a, Something&b){
-		std::cout << "blah: " << *a;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30774-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30774-lambda.cpp
deleted file mode 100644
index f91770c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30774-lambda.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-void f1()
-{
-	auto a =
-		[=](int *a, Something & b)
-		{
-			std::cout << "blah: " << *a;
-		};
-}
-
-void f1a()
-{
-	std::for_each(a, b,
-	              [](Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f1b()
-{
-	std::for_each(a, b,
-	              [](int & b) -> foo
-	{
-		b += 3;
-		return b;
-	});
-}
-
-void f2()
-{
-	Invoke(a, b,
-	       [&one, two](int *a, Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f3a()
-{
-	auto a = []  {
-		 };
-	auto b = []{
-			 return true;
-		 };
-}
-
-void f3b()
-{
-	Invoke(a, b,
-	       [&one, two]
-	{
-		std::cout << "blah: " << one << two;
-	});
-}
-
-void f3c()
-{
-	int a[]{};
-}
-
-void g1()
-{
-	auto a = [ = ](int* a, Something &b){
-			 std::cout << "blah: " << *a;
-		 };
-}
-
-void g1a()
-{
-	std::for_each(a, b, [](Something& b){
-		std::cout<<"blah: "<<*a;
-	});
-}
-
-void g1b()
-{
-	std::for_each(a, b, []  (int& b)->foo {
-		b+=3; return(b);
-	});
-}
-
-void g2()
-{
-	Invoke(a, b,
-	       [&one, two]  (int *a, Something&b){
-		std::cout << "blah: " << *a;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30775-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30775-lambda.cpp
deleted file mode 100644
index 9847c201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30775-lambda.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-void f1()
-{
-	auto a =
-		[=](int *a, Something & b)
-		{
-			std::cout << "blah: " << *a;
-		};
-}
-
-void f1a()
-{
-	std::for_each(a, b,
-	              [](Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f1b()
-{
-	std::for_each(a, b,
-	              [](int & b) -> foo
-	{
-		b += 3;
-		return b;
-	});
-}
-
-void f2()
-{
-	Invoke(a, b,
-	       [&one, two](int *a, Something & b)
-	{
-		std::cout << "blah: " << *a;
-	});
-}
-
-void f3a()
-{
-	auto a = []  {
-		 };
-	auto b = []{
-			 return true;
-		 };
-}
-
-void f3b()
-{
-	Invoke(a, b,
-	       [&one, two]
-	{
-		std::cout << "blah: " << one << two;
-	});
-}
-
-void f3c()
-{
-	int a[]{};
-}
-
-void g1()
-{
-	auto a = [ = ](int* a, Something &b) {
-			 std::cout << "blah: " << *a;
-		 };
-}
-
-void g1a()
-{
-	std::for_each(a, b, [](Something& b) {
-		std::cout<<"blah: "<<*a;
-	});
-}
-
-void g1b()
-{
-	std::for_each(a, b, []  (int& b)->foo {
-		b+=3; return(b);
-	});
-}
-
-void g2()
-{
-	Invoke(a, b,
-	       [&one, two]  (int *a, Something&b) {
-		std::cout << "blah: " << *a;
-	});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
deleted file mode 100644
index e0c1985d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-void test()
-{
-	[]{}();
-	[]{ foo(); }();
-	[x]{ foo(x); }();
-	[](int x){ foo(x); }(42);
-	[y](int x){ foo(x, y); }(42);
-	bar([]{ return 1; }());
-	bar([]{ return foo(); }());
-	bar([x]{ return foo(x); }(42));
-	bar([](int x){ return foo(x); }(42));
-	bar([y](int x){ return foo(x, y); }(42));
-
-	[]{}();
-	[]{ foo(); }();
-	[x]{ foo(x); }();
-	[](int x){ foo(x); }(42);
-	[y](int x){ foo(x, y); }(42);
-	bar([]{ return 1; }());
-	bar([]{ return foo(); }());
-	bar([x]{ return foo(x); }(42));
-	bar([](int x){ return foo(x); }(42));
-	bar([y](int x){ return foo(x, y); }(42));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
deleted file mode 100644
index f882a211..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-void test()
-{
-	[] {} ();
-	[] { foo(); } ();
-	[x] { foo(x); } ();
-	[] (int x){ foo(x); } (42);
-	[y] (int x){ foo(x, y); } (42);
-	bar([] { return 1; } ());
-	bar([] { return foo(); } ());
-	bar([x] { return foo(x); } (42));
-	bar([] (int x){ return foo(x); } (42));
-	bar([y] (int x){ return foo(x, y); } (42));
-
-	[] {} ();
-	[] { foo(); } ();
-	[x] { foo(x); } ();
-	[] (int x){ foo(x); } (42);
-	[y] (int x){ foo(x, y); } (42);
-	bar([] { return 1; } ());
-	bar([] { return foo(); } ());
-	bar([x] { return foo(x); } (42));
-	bar([] (int x){ return foo(x); } (42));
-	bar([y] (int x){ return foo(x, y); } (42));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
deleted file mode 100644
index c740c4bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void bar();
-
-struct foo
-{
-	foo() { []{ bar(); }(); }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30781-lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30781-lambda_brace_list.cpp
deleted file mode 100644
index 8626f5af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30781-lambda_brace_list.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-template<typename T, typename U>
-auto add(T t, U u) -> decltype(t + u) { return t + u; }
-
-int main()
-{
-	auto f1 = [&]() { return 1; };
-	auto f2 = [&]() -> decltype(auto) { return 2; };
-	string s1{'a', 'b'};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30790-Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30790-Issue_2795.cpp
deleted file mode 100644
index 6cb7e112..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30790-Issue_2795.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void SnRequestTracefork::onCurlTestError(QProcess::ProcessError _error) {
-    myerror(QString("Curl process failed with error %1").arg(_error));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30800-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
deleted file mode 100644
index dc988ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/** First, the typedefs */
-typedef int          MY_INT;
-typedef int*         MY_INTP;
-typedef int&         MY_INTR;
-typedef CFoo&        foo_ref_t;
-typedef int          (* foo_t)(void* bar);
-typedef const char*  (* somefunc_t)(void* barstool);
-
-/* Now, the types */
-struct foo1 {
-   unsigned int   d_ino;
-   const char*    d_reclen;
-   unsigned short d_namlen;
-   char           d_name[1];
-   CFoo&          fref;
-};
-
-struct foo { int a; char* b };
-
-static int           idx;
-static const char**  tmp;
-CFoo&                fref;
-
-static char          buf[64];
-static unsigned long how_long;
-// comment
-static int**         tmp;
-static char          buf[64];
-
-
-void bar(int someval,
-         void* puser,
-         const char* filename,
-         struct willy* the_list,
-         int list_len)
-{
-   int           idx;
-   const char**  tmp;
-   char          buf[64];
-   CFoo&         fref;
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30801-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
deleted file mode 100644
index c23b0d4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/** First, the typedefs */
-typedef int    MY_INT;
-typedef int    *MY_INTP;
-typedef int    &MY_INTR;
-typedef CFoo   &foo_ref_t;
-typedef int (*foo_t)(void *bar);
-typedef const char *(*somefunc_t)(void *barstool);
-
-/* Now, the types */
-struct foo1 {
-   unsigned int   d_ino;
-   const char     *d_reclen;
-   unsigned short d_namlen;
-   char           d_name[1];
-   CFoo           &fref;
-};
-
-struct foo { int a; char *b };
-
-static int           idx;
-static const char    **tmp;
-CFoo                 &fref;
-
-static char          buf[64];
-static unsigned long how_long;
-// comment
-static int           **tmp;
-static char          buf[64];
-
-
-void bar(int someval,
-         void *puser,
-         const char *filename,
-         struct willy *the_list,
-         int list_len)
-{
-   int           idx;
-   const char    **tmp;
-   char          buf[64];
-   CFoo          &fref;
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30802-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
deleted file mode 100644
index cf2bff2d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/** First, the typedefs */
-typedef int    MY_INT;
-typedef int   *MY_INTP;
-typedef int   &MY_INTR;
-typedef CFoo  &foo_ref_t;
-typedef int (*foo_t)(void *bar);
-typedef const char *(*somefunc_t)(void *barstool);
-
-/* Now, the types */
-struct foo1 {
-   unsigned int   d_ino;
-   const char    *d_reclen;
-   unsigned short d_namlen;
-   char           d_name[1];
-   CFoo          &fref;
-};
-
-struct foo { int a; char *b };
-
-static int           idx;
-static const char  **tmp;
-CFoo                &fref;
-
-static char          buf[64];
-static unsigned long how_long;
-// comment
-static int         **tmp;
-static char          buf[64];
-
-
-void bar(int someval,
-         void *puser,
-         const char *filename,
-         struct willy *the_list,
-         int list_len)
-{
-   int           idx;
-   const char  **tmp;
-   char          buf[64];
-   CFoo         &fref;
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30803-bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30803-bug_1403.cpp
deleted file mode 100644
index 209c0173..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30803-bug_1403.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int main()
-{
-	float x;
-	float y;
-	float result(1 + x * y);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30804-block_pointer.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30804-block_pointer.cpp
deleted file mode 100644
index fc44e403..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30804-block_pointer.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-__block __weak void (^weak_recurseTreeNodes)(int a);
-void (^strong_recurseTreeNodes)(int a) = ^(int a) {
-};
-
-the result file:
-Foo^ foo = dynamic_cast<Bar^>(bar);
-Foo* foo = dynamic_cast<Bar*>(bar);
-x = a ^ b;
-int main(Platform::Array<Platform::String^>^ /*args*/)
-{
-}
-
-void (*fun_ptr)(int) = &fun;
-
-typedef void (*foo)(void);
-void (*foo)(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30805-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30805-ptr-star.cpp
deleted file mode 100644
index fcefa84f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30805-ptr-star.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-int dx = m_ClipBox.GetWidth() * GetZoom();
-
-m_ClipBox.m_Pos.y = PaintClipBox.y * GetZoom();
-
-int* i;
-char* i;
-
-int MyFunc(std::string& s, char*) {
-	char* c = const_cast<char*>(s.c_str());
-}
-
-int YerFunc(std::string& s, char**) {
-	char** c;
-	int a = b[0] * c;
-}
-
-int* X(int* i, int*);
-
-int* i = &a;
-int* i = *b;
-int* i = &*c;
-
-int* Aclass::X(int* i, int*);
-
-class Aclass {
-int* X(int* i, int*);
-}
-extern "C" {
-int foo1(int* a);
-int foo2(sometype* a);
-}
-int bar1(int* a);
-int bar2(sometype* a);
-
-struct X
-{
-	int* a; // 3:5
-
-	int f()
-	{
-		return *b; // 7:8
-	}
-	int g()
-	{
-		return *c; // 11:8
-	}
-};
-
-int* const i;
-int* static i;
-
-static auto Func1(Model* model) -> Color*;
-static auto Func1(Model* model) -> Color* {
-	return nullptr;
-}
-
-auto Func2(Model* model) -> Color* const;
-auto Func2(Model* model) -> Color* const {
-	return nullptr;
-}
-
-auto Func3(Model* model) -> Color**;
-auto Func3(Model* model) -> Color** {
-	return nullptr;
-}
-
-auto Func4(Model* model) -> Color** const;
-auto Func4(Model* model) -> Color** const {
-	return nullptr;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30806-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30806-ptr-star.cpp
deleted file mode 100644
index 1a7586cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30806-ptr-star.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-int dx = m_ClipBox.GetWidth() * GetZoom();
-
-m_ClipBox.m_Pos.y = PaintClipBox.y * GetZoom();
-
-int *i;
-char *i;
-
-int MyFunc(std::string &s, char *) {
-	char *c = const_cast<char *>(s.c_str());
-}
-
-int YerFunc(std::string &s, char **) {
-	char **c;
-	int a = b[0] * c;
-}
-
-int *X(int *i, int *);
-
-int *i = &a;
-int *i = *b;
-int *i = &*c;
-
-int *Aclass::X(int *i, int *);
-
-class Aclass {
-int *X(int *i, int *);
-}
-extern "C" {
-int foo1(int *a);
-int foo2(sometype *a);
-}
-int bar1(int *a);
-int bar2(sometype *a);
-
-struct X
-{
-	int *a; // 3:5
-
-	int f()
-	{
-		return *b; // 7:8
-	}
-	int g()
-	{
-		return *c; // 11:8
-	}
-};
-
-int *const i;
-int *static i;
-
-static auto Func1(Model *model) -> Color *;
-static auto Func1(Model *model) -> Color * {
-	return nullptr;
-}
-
-auto Func2(Model *model) -> Color *const;
-auto Func2(Model *model) -> Color *const {
-	return nullptr;
-}
-
-auto Func3(Model *model) -> Color **;
-auto Func3(Model *model) -> Color ** {
-	return nullptr;
-}
-
-auto Func4(Model *model) -> Color**const;
-auto Func4(Model *model) -> Color **const {
-	return nullptr;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30807-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30807-ptr-star.cpp
deleted file mode 100644
index f7ee88f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30807-ptr-star.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-int dx = m_ClipBox.GetWidth() * GetZoom();
-
-m_ClipBox.m_Pos.y = PaintClipBox.y * GetZoom();
-
-int *i;
-char *i;
-
-int MyFunc(std::string& s, char*) {
-	char *c = const_cast<char*>(s.c_str());
-}
-
-int YerFunc(std::string& s, char**) {
-	char **c;
-	int a = b[0] * c;
-}
-
-int* X(int *i, int*);
-
-int *i = &a;
-int *i = *b;
-int *i = &*c;
-
-int* Aclass::X(int *i, int*);
-
-class Aclass {
-int* X(int *i, int*);
-}
-extern "C" {
-int foo1(int *a);
-int foo2(sometype *a);
-}
-int bar1(int *a);
-int bar2(sometype *a);
-
-struct X
-{
-	int *a; // 3:5
-
-	int f()
-	{
-		return *b; // 7:8
-	}
-	int g()
-	{
-		return *c; // 11:8
-	}
-};
-
-int*const i;
-int*static i;
-
-static auto Func1(Model *model) -> Color*;
-static auto Func1(Model *model) -> Color* {
-	return nullptr;
-}
-
-auto Func2(Model *model) -> Color*const;
-auto Func2(Model *model) -> Color* const {
-	return nullptr;
-}
-
-auto Func3(Model *model) -> Color**;
-auto Func3(Model *model) -> Color** {
-	return nullptr;
-}
-
-auto Func4(Model *model) -> Color**const;
-auto Func4(Model *model) -> Color** const {
-	return nullptr;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30808-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30808-ptr-star.cpp
deleted file mode 100644
index 68cb8151..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30808-ptr-star.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-int dx = m_ClipBox.GetWidth() * GetZoom();
-
-m_ClipBox.m_Pos.y = PaintClipBox.y * GetZoom();
-
-int* i;
-char*i;
-
-int MyFunc(std::string& s, char*) {
-	char *c = const_cast<char*>(s.c_str());
-}
-
-int YerFunc(std::string& s, char**) {
-	char **c;
-	int a = b[0] * c;
-}
-
-int*X(int *i, int*);
-
-int *i = &a;
-int *i = *b;
-int *i = &*c;
-
-int *Aclass::X(int* i, int *);
-
-class Aclass {
-int *X(int* i, int *);
-}
-extern "C" {
-int foo1(int *a);
-int foo2(sometype *a);
-}
-int bar1(int *a);
-int bar2(sometype *a);
-
-struct X
-{
-	int   *  a;// 3:5
-
-	int f()
-	{
-		return *b; // 7:8
-	}
-	int g()
-	{
-		return *c; // 11:8
-	}
-};
-
-int * const i;
-int * static i;
-
-static auto Func1(Model *model) -> Color*;
-static auto Func1(Model *model) -> Color* {
-	return nullptr;
-}
-
-auto Func2(Model *model) -> Color* const;
-auto Func2(Model *model) -> Color* const {
-	return nullptr;
-}
-
-auto Func3(Model *model) -> Color**;
-auto Func3(Model *model) -> Color** {
-	return nullptr;
-}
-
-auto Func4(Model *model) -> Color** const;
-auto Func4(Model *model) -> Color** const {
-	return nullptr;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30809-bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30809-bug_1289.cpp
deleted file mode 100644
index 42663477..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30809-bug_1289.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-extern "C" void __declspec(dllexport) GetAccountNameAndDomain(HWND /*hwndParent*/, int string_size, TCHAR * variables, stack_t** stacktop, extra_parameters* /*extra*/)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30810-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30810-ptr-star.cpp
deleted file mode 100644
index 1309beec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30810-ptr-star.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-int dx = m_ClipBox.GetWidth() * GetZoom();
-
-m_ClipBox.m_Pos.y = PaintClipBox.y * GetZoom();
-
-int  *i;
-char *i;
-
-int MyFunc(std::string& s, char *)
-{
-   char *c = const_cast<char *>(s.c_str());
-}
-
-int YerFunc(std::string& s, char **)
-{
-   char **c;
-   int  a = b[0] * c;
-}
-
-int *X(int *i, int *);
-
-int *i = &a;
-int *i = *b;
-int *i = &*c;
-
-int *Aclass::X(int *i, int *);
-
-class Aclass {
-   int *X(int *i, int *);
-}
-extern "C" {
-int foo1(int *a);
-int foo2(sometype *a);
-}
-int bar1(int *a);
-int bar2(sometype *a);
-
-struct X
-{
-   int *a;  // 3:5
-
-   int f()
-   {
-      return (*b); // 7:8
-   }
-   int g()
-   {
-      return (*c); // 11:8
-   }
-};
-
-int *const  i;
-int *static i;
-
-static auto Func1(Model *model) -> Color *;
-static auto Func1(Model *model) -> Color *
-{
-   return(nullptr);
-}
-
-auto Func2(Model *model) -> Color *const;
-auto Func2(Model *model) -> Color *const
-{
-   return(nullptr);
-}
-
-auto Func3(Model *model) -> Color **;
-auto Func3(Model *model) -> Color **
-{
-   return(nullptr);
-}
-
-auto Func4(Model *model) -> Color**const;
-auto Func4(Model *model) -> Color **const
-{
-   return(nullptr);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30811-misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30811-misc3.cpp
deleted file mode 100644
index 68375327..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30811-misc3.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// When constructing an object there should not be any space between the & and the variable name:
-
-MyClass my1(foo, &bar);
-MyClass my2(foo, bar);
-MyClass my3(foo, bar + 3);
-MyClass my4(42);
-MyClass my5(foo(), bar);
-MyClass my6(int foo, int& bar);
-MyClass my7(const int foo, int& bar);
-
-
-//When using references inside of casts there is also an additional space after the &:
-
-MyClass& myInst = static_cast<MyClass&>(otherInst);
-
-
-// When using the qt-specific signals and slots the pointer star is separated from the type with a space:
-
-connect(&mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onSomeEvent(QWidget*)));
-
-extern int select(int __nfds, fd_set* __restrict __readfds, fd_set* __restrict __writefds, fd_set* __restrict __exceptfds, struct  timeval* __restrict __timeout);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30812-misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30812-misc4.cpp
deleted file mode 100644
index 5ddaffb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30812-misc4.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-struct X
-{
-   void operator deleteme(void *);
-   void deallocate(int *p)
-   {
-      operator delete((void *)p);
-      delete((void *)q);
-   }
-};
-
-int f(bool b)
-{
-   typedef int mytype;
-   if (b)
-   {
-      return(int(42.0));
-   }
-   else
-   {
-      return(mytype(42.0));
-   }
-}
-
-struct X
-{
-   double f(int n)
-   {
-      return(double(n));
-   }
-};
-
-inline value_type operator ()() const
-{
-   return(double(rnd32()) * (0.5 / 0x80000000));
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30813-misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30813-misc5.cpp
deleted file mode 100644
index e8ffaf27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30813-misc5.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-typedef std::list<StreamedData *>::iterator iterator;
-double foo()
-{
-   if (a<bar()> c)
-   {
-      throw int();
-      return(double());
-   }
-   call_a_function(42,
-                   double(-1),
-                   "charray");
-   return(foo(n));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30814-misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30814-misc6.cpp
deleted file mode 100644
index 95cc0383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30814-misc6.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <vector>
-void f(std::vector<int> * vip, std::vector<int> & vir);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30815-cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30815-cmt-reflow.cpp
deleted file mode 100644
index 8bd50283..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30815-cmt-reflow.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-
-typedef enum stuff
-{
-    Value1 = 0x00000400, /* Just a comment for the value */
-    Value2 = 0x00000800, /* A much longer comment that needs
-                          * to be truncated to fit within a
-                          * set character width. In this
-                          * case, its 80 characters so two
-                          * truncates are required. */
-} JustAnEnum;
-
-/* this is another comment that is meant to exceed the code
- * width so that it can be wrapped
- * and combined to see how that works. */
-
-/* this is another comment that is meant to exceed the code
- * width so that it can be wrapped
- * and combined to see how that works. */
-
-/* Line A */
-
-/* Line 1
- * line 2
- * line 3
- * line 4
- */
-
-int cnt;    /* This is a counter variable with a long
-             * comment. this should cause the comment to be
-             * wrapped. */
-
-/**
- * Multi-line comment
- */
-void foo(void)
-{
-/**
- * Multi-line comment
- */
-    int idx;
-    /**
-     * Multi-line comment
-     */
-}
-
-/* Start Change #95
- * INITIALIZE Variable(contExtnElgInd); /# Change #61 #/
- * /# Start Change #35 #/
- */
-
-/**
- * OneBigWordThatCannotBeSplitYetExceedsTheCommentWidthSettingSoThatWrappingShouldBeAttempted.
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30816-for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30816-for_long.cpp
deleted file mode 100644
index 5483d4c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30816-for_long.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void
-foo()
-{
-  for (std::map<std::string, std::string>::iterator it =
-         m_stat_http_conn_total.m_stat_response_codes.begin();
-       it != m_stat_http_conn_total.m_stat_response_codes.end();
-       ++i)
-  {
-    bar(it);
-  }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
deleted file mode 100644
index 9acbac58..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "foo.h"
-
-//
-// plshade z xmin xmax ymin ymax \
-// sh_min sh_max sh_cmap sh_color sh_width \
-// min_col min_wid max_col max_wid \
-// rect [[pltr x y] | NULL ] [wrap]
-//--------------------------------------------------------------------------
-
-void foo()
-{
-   // plshade z xmin xmax ymin ymax \
-   // sh_min sh_max sh_cmap sh_color sh_width \
-   // min_col min_wid max_col max_wid \
-   //       rect [[pltr x y] | NULL ] [wrap]
-   //--------------------------------------------------------------------------
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30818-bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30818-bug_1169.cpp
deleted file mode 100644
index b1138a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30818-bug_1169.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-class MyClass
-{
-public:
-   virtual void f1ooooooooooooooo(const int bar);
-   virtual void f2oooooooooooooooo(const int bar);
-   virtual void f3ooooooooooooooooo(
-      const int bar);
-   virtual void f4oooooooooooooooooo(
-      const int bar);
-   virtual void f5ooooooooooooooooooo(
-      const int bar);
-};
-
-virtual void f1oooooooooooooooooo(const int bar);
-virtual void f2ooooooooooooooooooo(const int bar);
-virtual void f3oooooooooooooooooooo(
-   const int bar);
-virtual void f4ooooooooooooooooooooo(
-   const int bar);
-virtual void f5oooooooooooooooooooooo(
-   const int bar);
-
-void foo()
-{
-   std::string s1 = "f1oooooooooooooooooooooooo";
-   std::string s2 = "f2ooooooooooooooooooooooooo";
-   std::string s3 =
-         "f3oooooooooooooooooooooooooo";
-   std::string s4 =
-         "f4ooooooooooooooooooooooooooo";
-   std::string s5 =
-         "f5oooooooooooooooooooooooooooo";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30819-bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30819-bug_1170.cpp
deleted file mode 100644
index 18e029cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30819-bug_1170.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-template<class CLASS_PARAMETER_0, class CLASS_PARAMETER_1, class CLASS_PARAMETER_2, class CLASS_PARAMETER_3, class CLASS_PARAMETER_4,
-      class CLASS_PARAMETER_5>
-class MyTemplateClass
-{
-public:
-   MyTemplateClass<my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type,
-         my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type> foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30820-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30820-pp-define-indent.cpp
deleted file mode 100644
index 0d7892a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30820-pp-define-indent.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#define outpsize
-#define some(f) \
-    foo(f)
-
-class CRC
-{
-public:
-    int foo;
-// Initial CRC Start Value
-    #define 24BITCRC ((ULONG) 0x00864CFB) // This line is not aligned with the other lines
-    char ch;
-    #define MULTI LINE DEFINE \
-        in column 0 \
-        that spans
-//// Operations ////
-public:
-    ...
-}
-
-{
-#if defined(WIN32)
-    SYSTEMTIME st;
-    DWORD ThreadId;
-#else
-    struct timeval mytv;
-    struct tm *mytm;
-    pid_t ProcessId;
-#endif
-
-#if SOME COND
-    (void)loop;
-#endif
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30821-pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30821-pp_indent_case.cpp
deleted file mode 100644
index 70b1b9c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30821-pp_indent_case.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Example for case in a preprocesser statement

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_case	  = false	  to override preprocessor indent for case blocks

-switch(...)

-{

-case 1:

-case 2:

-{

-	int v;

-	...

-}

-break;

-

-#if (USE_FIVE)

-case 3:

-	doFive();

-	break;

-#endif

-

-default:

-	break;

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30822-pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30822-pp_indent_brace.cpp
deleted file mode 100644
index 4900fa34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30822-pp_indent_brace.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Example for preprocessor statement in a function definition

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_brace	  = false	  to override preprocessor indent for braces

-MyClass::MyClass()

-{

-	if(isSomething)

-	{

-		DoSomething();

-	}

-

-#if (USE_FIVE)

-	{

-		DoSomethingAlso();

-	}

-#endif

-

-#if (USE_SIX)

-	{

-		Six mySix;

-		DoSomethingWithSix(mySix);

-	}

-#endif

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30823-pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
deleted file mode 100644
index b01c6bbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// Example of function definitions inside of preprocessor statements

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_func_def = false	  to override preprocessor indent for function definitions

-int x = 1;

-#if (USE_AWESOME_FUNCTIONS)

-void MyClass::SomeAwesomeFunction()

-{

-	DoSomethingInAFunction();

-}

-#endif
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30824-pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30824-pp_indent_extern.cpp
deleted file mode 100644
index 995db611..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30824-pp_indent_extern.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Example for extern "C" blocks inside preprocessor statements

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_extern	  = false	  to override preprocessor indent for braces

-int x = 1;

-#ifdef __cplusplus

-extern "C" {

-

-void some_c_function

-(

-	void

-);

-}

-#endif
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30825-Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30825-Issue_1966.cpp
deleted file mode 100644
index 12a8084b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30825-Issue_1966.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define FLAG1               0x101  /* struct foo should not be used.
-	                              The struct is unsafe */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30826-Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30826-Issue_2319.cpp
deleted file mode 100644
index 8c0ae3e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30826-Issue_2319.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-using AbstractLinkPtr = AbstractLink*;
-using AbstractLinkPtrPtr = AbstractLink**;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30827-Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30827-Issue_1167.cpp
deleted file mode 100644
index 6410326c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30827-Issue_1167.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-typedef ::foo::moon::extra::common::super::VeryLongClassName <
-		::foo::moon::extra::common::super::ISuperNice,
-		::foo::moon::extra::common::super::NiceStoryAboutTheSea,
-		::foo::moon::extra::common::super::TheVeryLastParameter> AVeryLongNameForDemonstration;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30828-bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30828-bug_1691.cpp
deleted file mode 100644
index e93f7f74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30828-bug_1691.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <string>
-
-std::string foo()
-{
-	return std::string{"abc"};
-}
-int main()
-{
-	const std::string&& name1 = foo();
-	std::string&&       name2 = foo();
-
-	const auto&& name3 = foo();
-	auto&&       name4 = foo();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30829-Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30829-Issue_2726.cpp
deleted file mode 100644
index bb7f1d4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30829-Issue_2726.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-VIEW_CONTROLLER_MACRO(ThreadButton)
-UIViewController *MSGCreate(MBAMailbox *mailbox, NSNumber *threadKey);
-
-
-NS_SWIFT_NAME(Create(String))
-Controller *create(NSString *str);
-
-
-MACRO_FUNCTION
-Object *create( NSString *str, NSDictionary<NSString *, NSArray *> *data, string **str)
-{
-	return nullptr;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30830-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30830-kw_subst.cpp
deleted file mode 100644
index 47084a7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30830-kw_subst.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @file kw_subst.cpp
- * Description
- *
- * $Id$
- */
-#include <string>
-
-/**
- * CLASS:  CFoo
- * TODO: DESCRIPTION
- */
-class CFoo
-{
-int foo1(int arg);
-int foo2();
-/**
- * CLASS:  CFoo
- * METHOD: foo3
- * TODO: DESCRIPTION
- * @param ch TODO
- * @param xx TODO
- * @return TODO
- */
-int foo3(char ch, int xx)
-{
-}
-};
-
-/**
- * CLASS:  CFoo
- * METHOD: foo1
- * TODO: DESCRIPTION
- * @param arg TODO
- * @param arg2 TODO
- * @return TODO
- */
-int CFoo::foo1(int arg, int arg2)
-{
-}
-
-/**
- * CLASS:  CFoo
- * METHOD: foo2
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::foo2()
-{
-}
-
-/**
- * CLASS:  CFoo
- * METHOD: operator +
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::operator +()
-{
-}
-
-/**
- * CLASS:  $(fclass)
- * METHOD: func
- * TODO: DESCRIPTION
- * @return TODO
- */
-map<string, int> func()
-{
-	// some codes
-}
-
-/**
- * CLASS:  $(fclass)
- * METHOD: some_func
- * TODO: DESCRIPTION
- * @return TODO
- */
-int some_func(void)
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30831-kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30831-kw_subst2.cpp
deleted file mode 100644
index b5e58eac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30831-kw_subst2.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @file kw_subst2.cpp
- * Description
- *
- * $Id$
- */
-#include <string>
-
-namespace bar
-{
-
-	/**
-	 * CLASS:  CFoo
-	 * TODO: DESCRIPTION
-	 */
-	class CFoo
-	{
-	int foo1(int arg);
-private:
-	/**
-	 * foo2
-	 * TODO: DESCRIPTION
-	 * @return TODO
-	 */
-	int foo2()
-	{
-	}
-	};
-
-	/**
-	 * foo1
-	 * TODO: DESCRIPTION
-	 * @param arg TODO
-	 * @param arg2 TODO
-	 * @return TODO
-	 */
-	int CFoo::foo1(int arg, char arg2)
-	{
-	}
-
-	/**
-	 * foo2
-	 * TODO: DESCRIPTION
-	 * @return TODO
-	 */
-	int CFoo::foo2()
-	{
-	}
-
-	/**
-	 * operator +
-	 * TODO: DESCRIPTION
-	 * @return TODO
-	 */
-	int CFoo::operator +()
-	{
-	}
-
-	/**
-	 * func
-	 * TODO: DESCRIPTION
-	 * @return TODO
-	 */
-	map<string, int> func()
-	{
-		// some codes
-	}
-
-	/**
-	 * some_func
-	 * TODO: DESCRIPTION
-	 * @return TODO
-	 */
-	int some_func(void)
-	{
-	}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30832-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30832-kw_subst.cpp
deleted file mode 100644
index 47084a7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30832-kw_subst.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @file kw_subst.cpp
- * Description
- *
- * $Id$
- */
-#include <string>
-
-/**
- * CLASS:  CFoo
- * TODO: DESCRIPTION
- */
-class CFoo
-{
-int foo1(int arg);
-int foo2();
-/**
- * CLASS:  CFoo
- * METHOD: foo3
- * TODO: DESCRIPTION
- * @param ch TODO
- * @param xx TODO
- * @return TODO
- */
-int foo3(char ch, int xx)
-{
-}
-};
-
-/**
- * CLASS:  CFoo
- * METHOD: foo1
- * TODO: DESCRIPTION
- * @param arg TODO
- * @param arg2 TODO
- * @return TODO
- */
-int CFoo::foo1(int arg, int arg2)
-{
-}
-
-/**
- * CLASS:  CFoo
- * METHOD: foo2
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::foo2()
-{
-}
-
-/**
- * CLASS:  CFoo
- * METHOD: operator +
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::operator +()
-{
-}
-
-/**
- * CLASS:  $(fclass)
- * METHOD: func
- * TODO: DESCRIPTION
- * @return TODO
- */
-map<string, int> func()
-{
-	// some codes
-}
-
-/**
- * CLASS:  $(fclass)
- * METHOD: some_func
- * TODO: DESCRIPTION
- * @return TODO
- */
-int some_func(void)
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30840-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30840-nl_func_type_name.cpp
deleted file mode 100644
index a4302001..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30840-nl_func_type_name.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// zero
-// one
-//  two
-//   three
-void foo(void);
-
-struct A
-{
-public:
-	long_complicated_type f();
-	A&                    operator+(const A& other);
-};
-
-A& A::operator+(const A& other)
-{
-}
-
-B operator+(const B& other)
-{
-}
-
-B foo(const B& other)
-{
-}
-
-class A
-{
-public:
-explicit A(int);
-int aFunct() {
-	return a;
-}
-int bFunc();
-};
-
-// Another file
-int A::bFunc()
-{
-// some code
-}
-
-template<typename T>
-typename Foo<T>::Type Foo<T>::Func()
-{
-}
-
-void Foo::bar() {
-}
-
-namespace foo {
-Foo::Foo() {
-}
-}
-
-Foo::~Foo() {
-}
-
-class Object
-{
-~Object(void);
-};
-
-template <class T>
-void SampleClassTemplate<T>::connect()
-{
-}
-
-template <>
-inline void bar<MyType>(MyType r)
-{
-	foo(r);
-}
-
-template <T>
-inline void baz<>(T r)
-{
-	foo(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30841-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30841-nl_func_type_name.cpp
deleted file mode 100644
index 5997a5c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30841-nl_func_type_name.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// zero
-// one
-//  two
-//   three
-void
-foo(void);
-
-struct A
-{
-public:
-	long_complicated_type
-	f();
-	A&
-	operator+(const A& other);
-};
-
-A&
-A::operator+(const A& other)
-{
-}
-
-B
-operator+(const B& other)
-{
-}
-
-B
-foo(const B& other)
-{
-}
-
-class A
-{
-public:
-explicit
-A(int);
-int
-aFunct() {
-	return a;
-}
-int
-bFunc();
-};
-
-// Another file
-int
-A::bFunc()
-{
-// some code
-}
-
-template<typename T>
-typename Foo<T>::Type
-Foo<T>::Func()
-{
-}
-
-void
-Foo::bar() {
-}
-
-namespace foo {
-Foo::Foo() {
-}
-}
-
-Foo::~Foo() {
-}
-
-class Object
-{
-~Object(void);
-};
-
-template <class T>
-void
-SampleClassTemplate<T>::connect()
-{
-}
-
-template <>
-inline void
-bar<MyType>(MyType r)
-{
-	foo(r);
-}
-
-template <T>
-inline void
-baz<>(T r)
-{
-	foo(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30842-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30842-nl_func_type_name.cpp
deleted file mode 100644
index a826af48..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30842-nl_func_type_name.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// zero
-// one
-//  two
-//   three
-void
-foo(void);
-
-struct A
-{
-public:
-	long_complicated_type f();
-	A&                    operator+(const A& other);
-};
-
-A&
-A::operator+(const A& other)
-{
-}
-
-B
-operator+(const B& other)
-{
-}
-
-B
-foo(const B& other)
-{
-}
-
-class A
-{
-public:
-explicit A(int);
-int aFunct() {
-	return a;
-}
-int bFunc();
-};
-
-// Another file
-int
-A::bFunc()
-{
-// some code
-}
-
-template<typename T>
-typename Foo<T>::Type
-Foo<T>::Func()
-{
-}
-
-void
-Foo::bar() {
-}
-
-namespace foo {
-Foo::Foo() {
-}
-}
-
-Foo::~Foo() {
-}
-
-class Object
-{
-~Object(void);
-};
-
-template <class T>
-void
-SampleClassTemplate<T>::connect()
-{
-}
-
-template <>
-inline void
-bar<MyType>(MyType r)
-{
-	foo(r);
-}
-
-template <T>
-inline void
-baz<>(T r)
-{
-	foo(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30843-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30843-nl_func_type_name.cpp
deleted file mode 100644
index b1ead857..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30843-nl_func_type_name.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// zero
-// one
-//  two
-//   three
-void foo(void);
-
-struct A
-{
-public:
-	long_complicated_type f();
-	A&                    operator+(const A& other);
-};
-
-A&
-A::operator+(const A& other)
-{
-}
-
-B
-operator+(const B& other)
-{
-}
-
-B
-foo(const B& other)
-{
-}
-
-class A
-{
-public:
-explicit A(int);
-int
-aFunct() {
-	return a;
-}
-int bFunc();
-};
-
-// Another file
-int
-A::bFunc()
-{
-// some code
-}
-
-template<typename T>
-typename Foo<T>::Type
-Foo<T>::Func()
-{
-}
-
-void
-Foo::bar() {
-}
-
-namespace foo {
-Foo::Foo() {
-}
-}
-
-Foo::~Foo() {
-}
-
-class Object
-{
-~Object(void);
-};
-
-template <class T>
-void
-SampleClassTemplate<T>::connect()
-{
-}
-
-template <>
-inline void
-bar<MyType>(MyType r)
-{
-	foo(r);
-}
-
-template <T>
-inline void
-baz<>(T r)
-{
-	foo(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30844-Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30844-Issue_2771.cpp
deleted file mode 100644
index ab7c285f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30844-Issue_2771.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-class CDiagnostic
-{
-        CDiagnostic& operator<<( int value_ ) { return ns::operator<<( *this, value_ ); }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30845-deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30845-deref.cpp
deleted file mode 100644
index 9705b51f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30845-deref.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-myNewValue = something[arrayNumber] * someOtherValue;
-myNewValue = multidimentional[arrayNumber][anotherNumber] * someOtherValue;
-myNewValue = noArrayVariableWorksFine * someOtherValue;
-
-
-int func(int          *thingy,
-         volatile int *arrayThingy[NUMBER]);
-
-int func(int          *thingy,
-         volatile int *arrayThingy[NUMBER][anotherNumber]);
-
-int func(int          *thingy,
-         volatile int *noArrayThingyWorksFine);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
deleted file mode 100644
index 9cc04a18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-int main() {
-	return 0; // Just return from
-	          // the function.
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30852-Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30852-Issue_2138.cpp
deleted file mode 100644
index 3a8fa83c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30852-Issue_2138.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void funcName() const;
-void ncName() override;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30853-noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30853-noexcept.cpp
deleted file mode 100644
index 60f2edd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30853-noexcept.cpp
+++ /dev/null
@@ -1 +0,0 @@
-foo() noexcept;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30854-Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30854-Issue_1703.cpp
deleted file mode 100644
index af32d661..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30854-Issue_1703.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#define NUM_LPM_TESTS ( sizeof(tests) / sizeof(tests[0]) )
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30855-cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30855-cpp_move.cpp
deleted file mode 100644
index cec9beb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30855-cpp_move.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-void Test(X&& val1, Y* val2);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
deleted file mode 100644
index dc9e4160..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// BEGIN real region
-
-int foo()
-{
-	int x = 0; //BEGIN not-region
-	return x; //END not-region
-}
-
-// END real region
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
deleted file mode 100644
index 29f75936..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//BEGIN real region
-
-int foo()
-{
-	int x = 0; // BEGIN not-region
-	return x; // END not-region
-}
-
-//END real region
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30860-sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30860-sf574.cpp
deleted file mode 100644
index 58810404..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30860-sf574.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-class A : public B
-{
-    A& operator=(const A& other)
-    {
-        if (this == &other) return *this;
-        B::operator=(other);
-        if (this == &other) return *this;
-        B::opera(other);
-        copy(other);
-        return *this;
-    }
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30870-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30870-cmt_insert.cpp
deleted file mode 100644
index cf5ac204..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30870-cmt_insert.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @file cmt_insert.cpp
- * Description
- *
- * $Id$
- */
-#include <string>
-
-/**
- * CLASS:  CFoo
- * TODO: DESCRIPTION
- */
-class CFoo
-{
-CFoo(int arg);
-CFoo(char arg) {
-}
-~CFoo();
-int foo1(int arg);
-int foo2();
-int foo3(char ch, int xx)
-{
-}
-};
-
-CFoo::CFoo(int arg) {
-}
-
-CFoo::~CFoo() {
-}
-
-/**
- * foo1
- * TODO: DESCRIPTION
- * @param arg TODO
- * @param arg2 TODO
- * @return TODO
- */
-int CFoo::foo1(int arg, int arg2)
-{
-}
-
-/**
- * foo2
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::foo2()
-{
-}
-
-/**
- * operator +
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::operator +()
-{
-}
-
-/**
- * func
- * TODO: DESCRIPTION
- * @return TODO
- */
-map<string, int> func()
-{
-	// some codes
-}
-
-/**
- * some_func
- * TODO: DESCRIPTION
- * @return TODO
- */
-int some_func(void)
-{
-}
-
-class some_class_declaration;
-
-int some_func_declaration();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30871-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30871-cmt_insert.cpp
deleted file mode 100644
index a169795a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30871-cmt_insert.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file cmt_insert.cpp
- * Description
- *
- * $Id$
- */
-#include <string>
-
-/**
- * CLASS:  CFoo
- * TODO: DESCRIPTION
- */
-class CFoo
-{
-CFoo(int arg);
-/**
- * CFoo
- * TODO: DESCRIPTION
- * @param arg TODO
- * @return TODO
- */
-CFoo(char arg) {
-}
-~CFoo();
-int foo1(int arg);
-int foo2();
-/**
- * foo3
- * TODO: DESCRIPTION
- * @param ch TODO
- * @param xx TODO
- * @return TODO
- */
-int foo3(char ch, int xx)
-{
-}
-};
-
-/**
- * CFoo
- * TODO: DESCRIPTION
- * @param arg TODO
- * @return TODO
- */
-CFoo::CFoo(int arg) {
-}
-
-/**
- * ~CFoo
- * TODO: DESCRIPTION
- * @return TODO
- */
-CFoo::~CFoo() {
-}
-
-/**
- * foo1
- * TODO: DESCRIPTION
- * @param arg TODO
- * @param arg2 TODO
- * @return TODO
- */
-int CFoo::foo1(int arg, int arg2)
-{
-}
-
-/**
- * foo2
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::foo2()
-{
-}
-
-/**
- * operator +
- * TODO: DESCRIPTION
- * @return TODO
- */
-int CFoo::operator +()
-{
-}
-
-/**
- * func
- * TODO: DESCRIPTION
- * @return TODO
- */
-map<string, int> func()
-{
-	// some codes
-}
-
-/**
- * some_func
- * TODO: DESCRIPTION
- * @return TODO
- */
-int some_func(void)
-{
-}
-
-class some_class_declaration;
-
-int some_func_declaration();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30872-Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30872-Issue_2752.cpp
deleted file mode 100644
index b305b50f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30872-Issue_2752.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-int main() {
-}
-// @filename Issue_2752.cpp as input file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30880-bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30880-bug_1758.cpp
deleted file mode 100644
index b0f35107..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30880-bug_1758.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-for(int f=0; f<(Element::nf)*2; f++)
-{
-	if (f%2==1) p = p-1;
-	{
-		this->pInterpolation[i]=p;
-		this->cInterpolation[i]=0.;
-		this->dofInterpolation[i]=e+f;
-		this->coefInterpolation[i]=1.;
-		i++;
-		p++;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30881-bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30881-bug_1758-f.cpp
deleted file mode 100644
index 24bb563b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30881-bug_1758-f.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int main()
-{
-
-	for(int f=0; f < 1; f++)
-		auto a = int{1};
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30900-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30900-region.cpp
deleted file mode 100644
index 27823ca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30900-region.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
-    #pragma region something
-    int foo2 = 2;
-    #pragma endregion
-    int foo()
-    {
-
-	#pragma region something else
-	int foo3 = 3;
-	#pragma region nested
-	int foo4 = 0;
-	#pragma endregion
-	int foo5 = 0;
-	#pragma endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30901-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30901-region.cpp
deleted file mode 100644
index b7bebae8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30901-region.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
-    #pragma region something
-	int foo2 = 2;
-    #pragma endregion
-    int foo()
-    {
-
-	#pragma region something else
-	    int foo3 = 3;
-	    #pragma region nested
-		int foo4 = 0;
-	    #pragma endregion
-	    int foo5 = 0;
-	#pragma endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30902-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30902-region.cpp
deleted file mode 100644
index 39b20ea6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30902-region.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
-#pragma region something
-    int foo2 = 2;
-#pragma endregion
-    int foo()
-    {
-
-    #pragma region something else
-	int foo3 = 3;
-    #pragma region nested
-	int foo4 = 0;
-    #pragma endregion
-	int foo5 = 0;
-    #pragma endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30903-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30903-region.cpp
deleted file mode 100644
index d6e3403a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30903-region.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
- #pragma region something
-    int foo2 = 2;
- #pragma endregion
-    int foo()
-    {
-
- #pragma region something else
-	int foo3 = 3;
- #pragma region nested
-	int foo4 = 0;
- #pragma endregion
-	int foo5 = 0;
- #pragma endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30907-Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30907-Issue_1813.cpp
deleted file mode 100644
index d5a3cc71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30907-Issue_1813.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace ns1
-{
-namespace ns2
-{
-   void func0()
-   {
-      functionThatTakesALambda( [&] () -> void
-      {
-         lambdaBody;
-      });
-      functionThatTakesALambda( [&] __device__ () -> void
-      {
-         lambdaBody;
-      });
-      functionThatTakesALambda( [&] __host__ __device__ () -> void
-      {
-         lambdaBody;
-      });
-      functionThatTakesALambda( [&] DEVICE_LAMBDA_CONTEXT () -> void
-      {
-         lambdaBody;
-      });
-      functionThatTakesALambda( [&] HOST_DEVICE_LAMBDA_CONTEXT () -> void
-      {
-         lambdaBody;
-      });
-   }
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30908-Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30908-Issue_1813-2.cpp
deleted file mode 100644
index 310de82f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30908-Issue_1813-2.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace n1 {
-namespace n2 {
-
-   void func() {
-      another_func([]() {
-         return 42;
-      });
-   }
-
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30909-Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30909-Issue_1813-3.cpp
deleted file mode 100644
index 08c8405d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30909-Issue_1813-3.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace n1 {
-namespace n2 {
-namespace n3 {
-
-   void func() {
-      another_func([]() {
-         return 42;
-      });
-   }
-
-}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30910-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30910-indent_namespace.h
deleted file mode 100644
index d569a3ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30910-indent_namespace.h
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace ns1 {
-
-	void bar1(void);
-
-	class foo1
-	{
-		int i1;
-	};
-}
-
-namespace ns2
-{
-
-	void bar2(void);
-
-	class foo2
-	{
-		int i2;
-	};
-}
-
-namespace
-{
-
-	void bar3(void);
-	class foo3
-	{
-		int i3;
-	};
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30911-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30911-indent_namespace.h
deleted file mode 100644
index 6f80dc3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30911-indent_namespace.h
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace ns1 {
-
-void bar1(void);
-
-class foo1
-{
-	int i1;
-};
-}
-
-namespace ns2
-{
-
-void bar2(void);
-
-class foo2
-{
-	int i2;
-};
-}
-
-namespace
-{
-
-void bar3(void);
-class foo3
-{
-	int i3;
-};
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30912-long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30912-long_namespace.cpp
deleted file mode 100644
index 80af6e83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30912-long_namespace.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace boo3 {

-	int Fun1()

-	{

-		return 42;

-	}

-}

-

-namespace boo4 {

-	int Fun2()

-	{

-		int a = 7;

-		int b = 8;

-		return a+b;

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30913-indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30913-indent_namespace2.h
deleted file mode 100644
index 196b2322..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30913-indent_namespace2.h
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace ns1 {
-namespace ns2 {
-namespace ns3 {
-
-	using namespace foo::os;
-
-	class foo2
-	{
-		int i2;
-	};
-}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30914-indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
deleted file mode 100644
index 24a9b935..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
+++ /dev/null
@@ -1,100 +0,0 @@
-namespace ns1 {
-namespace ns2 {
-namespace ns3 {
-	void a();
-}
-}
-}
-
-extern "C" {
-	namespace ns1 {
-	namespace ns2 {
-	namespace ns3 {
-		void b();
-	}
-	}
-	}
-}
-
-namespace ns1 {
-	extern "C" {
-		namespace ns2 {
-		namespace ns3 {
-			void c();
-		}
-		}
-	}
-}
-
-namespace ns1 {
-namespace ns2 {
-	extern "C" {
-		namespace ns3 {
-			void d();
-		}
-	}
-}
-}
-
-namespace ns1 {
-namespace ns2 {
-namespace ns3 {
-	extern "C" {
-		void e();
-	}
-}
-}
-}
-
-#define M1(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-	namespace ns2 { \
-	namespace ns3 { \
-		void f(); \
-	} \
-	} \
-	}
-
-#define M2(ns1, ns2, ns3, f) \
-	extern "C" { \
-		namespace ns1 { \
-		namespace ns2 { \
-		namespace ns3 { \
-			void b(); \
-		} \
-		} \
-		} \
-	}
-
-#define M3(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-		extern "C" { \
-			namespace ns2 { \
-			namespace ns3 { \
-				void c(); \
-			} \
-			} \
-		} \
-	}
-
-#define M4(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-	namespace ns2 { \
-		extern "C" { \
-			namespace ns3 { \
-				void d(); \
-			} \
-		} \
-	} \
-	}
-
-#define M5(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-	namespace ns2 { \
-	namespace ns3 { \
-		extern "C" { \
-			void e(); \
-		} \
-	} \
-	} \
-	}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30915-bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30915-bug_1235.cpp
deleted file mode 100644
index b9ff78a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30915-bug_1235.cpp
+++ /dev/null
@@ -1 +0,0 @@
-namespace dudeNamespace { class ForwardFooClass; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30916-Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30916-Issue_1737.cpp
deleted file mode 100644
index 06b0866b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30916-Issue_1737.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-template<class T>
-class foo
-{
-public:
-T x;
-foo<T>(int a) : x(a)
-{
-	int y = a;
-	int z = 13;
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30917-Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30917-Issue_2345-3.cpp
deleted file mode 100644
index 787ce29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30917-Issue_2345-3.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace fooD {
-	void a();
-	void b();
-	void c();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30918-Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30918-Issue_2345-4.cpp
deleted file mode 100644
index f82d757d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30918-Issue_2345-4.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace fooD {
-void a();
-void b();
-void c();
-void d();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30919-Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30919-Issue_2387.cpp
deleted file mode 100644
index 526278d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30919-Issue_2387.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace bar
-{
-void none();
-};
-
-void foo()
-{
-	namespace // does not
-	x         // start a
-	        = // namespace
-	          bar;
-
-	x::none();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30920-indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30920-indent-off.cpp
deleted file mode 100644
index f9eccdb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30920-indent-off.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-struct X
-{
-   void operator-(int);
-   void operator+(int);
-   void operator()();
-};
-/* *INDENT-OFF* */
-  struct Y {
-    void operator-(int){}
-
-
-   void operator+(int){}  \
-    void operator()(){}
-
-     void func() {
-	 			auto x = "	test\t 	 	 		...   ???";}
-  };
-/* *INDENT-ON* */
-struct Y
-{
-   void operator-(int){}
-   void operator+(int){}
-   void operator()(){}
-   void func()
-   {
-      auto x = "	test\t 	 	 		...   ???";
-   }
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30921-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30921-variadic-template.h
deleted file mode 100644
index f159e700..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30921-variadic-template.h
+++ /dev/null
@@ -1,10 +0,0 @@
-template<int __i, int... _Indexes, typename _IdxHolder, typename...
-         _Elements>
-struct __index_holder_impl<__i, __index_holder<_Indexes...>,
-                           _IdxHolder, _Elements...>
-{
-   typedef typename __index_holder_impl<__i + 1,
-                                        __index_holder<_Indexes...,
-                                                       __i>,
-                                        _Elements...>::type type;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30922-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30922-variadic-template.h
deleted file mode 100644
index cf213653..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30922-variadic-template.h
+++ /dev/null
@@ -1,10 +0,0 @@
-template<int __i, int... _Indexes, typename _IdxHolder, typename ...
-         _Elements>
-struct __index_holder_impl<__i, __index_holder<_Indexes...>,
-                           _IdxHolder, _Elements...>
-{
-	typedef typename __index_holder_impl<__i + 1,
-	                                     __index_holder<_Indexes...,
-	                                                    __i>,
-	                                     _Elements...>::type type;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30923-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30923-sf.2886991.cpp
deleted file mode 100644
index 61dc7c21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30923-sf.2886991.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-void log_fmt(log_sev_t sev, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
-
-#define LOG_FMT(sev, args ...)                           \
-	do { if (log_sev_on(sev)) { log_fmt(sev, ## args); } } while (0)
-
-void foo()
-{
-	try {}
-	catch (...) // <== HERE
-	{}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30924-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30924-sf.2886991.cpp
deleted file mode 100644
index ce5e0b93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30924-sf.2886991.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-void log_fmt( log_sev_t sev, const char *fmt, ... ) __attribute__( ( format( printf, 2, 3 ) ) );
-
-#define LOG_FMT( sev, args... )                           \
-	do { if ( log_sev_on( sev ) ) { log_fmt( sev, ## args ); } } while ( 0 )
-
-void foo()
-{
-	try {}
-	catch ( ... ) // <== HERE
-	{}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30925-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30925-function-def.cpp
deleted file mode 100644
index 2d6df544..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30925-function-def.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-int&Function()
-{
-   static int x;
-
-   return(x);
-}
-
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int  param1,
-          int  param2,
-          char *param2);
-
-void foo3(int  param1,
-          int  param2,                                       // comment
-          char *param2
-          );
-
-struct whoopee *foo4(int param1, int param2, char *param2 /* comment */);
-
-const struct snickers *
-foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf ("boo!\n");
-}
-
-int classname::method();
-
-int classname::method()
-{
-   foo();
-}
-
-int
-classname::method2();
-
-int
-classname::method2()
-{
-   foo2();
-}
-
-const int& className::method1(void) const
-{
-   // stuff
-}
-
-const longtypename& className::method2(void) const
-{
-   // stuff
-}
-
-int&foo();
-
-int&foo()
-{
-   list_for_each (a, b)
-   {
-      bar (a);
-   }
-   return(nuts);
-}
-
-void Foo::bar()
-{
-}
-
-Foo::Foo()
-{
-}
-
-Foo::~Foo()
-{
-}
-
-void func(void)
-{
-   Directory dir ("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30926-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30926-function-def.cpp
deleted file mode 100644
index 78b23a14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30926-function-def.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-int&Function()
-{
-   static int x;
-
-   return(x);
-}
-
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int  param1,
-          int  param2,
-          char *param2);
-
-void foo3(int  param1,
-          int  param2,                                       // comment
-          char *param2
-          );
-
-struct whoopee *foo4(int param1, int param2, char *param2 /* comment */);
-
-const struct snickers *
-foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf ("boo!\n");
-}
-
-int classname::method();
-
-int classname::method()
-{
-   foo();
-}
-
-int
-classname::method2();
-
-int
-classname::method2()
-{
-   foo2();
-}
-
-const int& className::method1(void) const
-{
-   // stuff
-}
-
-const longtypename& className::method2(void) const
-{
-   // stuff
-}
-
-int&foo();
-
-int&foo()
-{
-   list_for_each (a, b)
-   {
-      bar (a);
-   }
-   return(nuts);
-}
-
-void Foo::bar()
-{
-}
-
-Foo::Foo ()
-{
-}
-
-Foo::~Foo ()
-{
-}
-
-void func(void)
-{
-   Directory dir ("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30927-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30927-function-def.cpp
deleted file mode 100644
index bceb00f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30927-function-def.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-int&Function ()
-{
-   static int x;
-
-   return(x);
-}
-
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int  param1,
-          int  param2,
-          char *param2);
-
-void foo3(int  param1,
-          int  param2,                                       // comment
-          char *param2
-          );
-
-struct whoopee *foo4(int param1, int param2, char *param2 /* comment */);
-
-const struct snickers *
-foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf ("boo!\n");
-}
-
-int classname::method();
-
-int classname::method ()
-{
-   foo();
-}
-
-int
-classname::method2();
-
-int
-classname::method2 ()
-{
-   foo2();
-}
-
-const int& className::method1(void) const
-{
-   // stuff
-}
-
-const longtypename& className::method2(void) const
-{
-   // stuff
-}
-
-int&foo();
-
-int&foo ()
-{
-   list_for_each (a, b)
-   {
-      bar (a);
-   }
-   return(nuts);
-}
-
-void Foo::bar ()
-{
-}
-
-Foo::Foo()
-{
-}
-
-Foo::~Foo()
-{
-}
-
-void func(void)
-{
-   Directory dir ("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30928-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30928-function-def.cpp
deleted file mode 100644
index b14ecb11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30928-function-def.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-int&Function()
-{
-   static int x;
-
-   return(x);
-}
-
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int  param1,
-          int  param2,
-          char *param2);
-
-void foo3(int  param1,
-          int  param2,                                       // comment
-          char *param2
-          );
-
-struct whoopee *foo4(int param1, int param2, char *param2 /* comment */);
-
-const struct snickers *
-foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf ("boo!\n");
-}
-
-int classname::method ();
-
-int classname::method()
-{
-   foo();
-}
-
-int
-classname::method2 ();
-
-int
-classname::method2()
-{
-   foo2();
-}
-
-const int& className::method1(void) const
-{
-   // stuff
-}
-
-const longtypename& className::method2(void) const
-{
-   // stuff
-}
-
-int&foo ();
-
-int&foo()
-{
-   list_for_each (a, b)
-   {
-      bar (a);
-   }
-   return(nuts);
-}
-
-void Foo::bar()
-{
-}
-
-Foo::Foo()
-{
-}
-
-Foo::~Foo()
-{
-}
-
-void func(void)
-{
-   Directory dir ("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30929-bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30929-bug_1324.cpp
deleted file mode 100644
index 1aca5762..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30929-bug_1324.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-        for (i = 0;i < 10;i++)
-        {
-                b = i + 1;
-        }
-        for (;; )
-        {
-                b = b + 1;
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30930-indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30930-indent_var_def.cpp
deleted file mode 100644
index 5b3ee4e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30930-indent_var_def.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void function()
-{
-int   n;
-float f;
-
-   anotherFunction();
-   char foo;
-
-   somethingelse();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30931-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
deleted file mode 100644
index c505389f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-int
-        a, b, c;
-
-int d,
-        e, f;
-
-void bar(void)
-{
-	struct foobar
-	        a = { 'x', 0 };
-	struct foobar
-	        b = { 'y', 2 },
-	        c = { 'z', 4 };
-	struct foobar d = { 'y', 2 },
-	        e = { 'z', 4 };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30932-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
deleted file mode 100644
index 70b7304e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-int
-        a, b, c;
-
-int d,
-    e, f;
-
-void bar(void)
-{
-	struct foobar
-	        a = { 'x', 0 };
-	struct foobar
-	        b = { 'y', 2 },
-	        c = { 'z', 4 };
-	struct foobar d = { 'y', 2 },
-	              e = { 'z', 4 };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
deleted file mode 100644
index 8a775135..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-class SomeClass

-{

-public:

-void SomeFunction

-        (

-        int const aTest,

-        int const aResult

-        )

-{

-	DoSomeStuff();

-}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
deleted file mode 100644
index 6af21978..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class SomeClass {

-public:

-void SomeFunction

-        (

-        int const aTest,

-        int const aResult

-        );

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30935-indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30935-indent-misc.cpp
deleted file mode 100644
index ad8de7b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30935-indent-misc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-struct S
-{
-   int one, two;
-   S(int i=1)
-   {
-      one = i;
-      two = i + i;
-   }
-   bool check() const
-   {
-      return(one == 1);
-   }
-};
-
-struct S
-{
-   enum
-   {
-      twentythree   = 23,
-      fortytwoseven = 427
-   };
-   int one, two;
-   S(int i=1)
-   {
-      one = i;
-      two = i + i;
-   }
-   bool check() const
-   {
-      return(one == 1);
-   }
-};
-
-static uint jhash(K x)
-{
-   ubyte *k;
-   uint  a,
-         b,
-         c;
-
-   uint
-      a,
-      b,
-      c;
-
-   len = x.length;
-}
-
-const char *token_names[] =
-{
-   [CT_POUND]   = "POUND",
-   [CT_PREPROC] = "PREPROC",
-};
-
-struct whoopee *
-foo4(
-   int  param1,
-   int  param2,
-   char *param2
-   );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30936-indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30936-indent_braces_no.h
deleted file mode 100644
index 725b0402..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30936-indent_braces_no.h
+++ /dev/null
@@ -1,22 +0,0 @@
-class MyClass
-{
-public:
-
-  struct something
-  {
-    int one;
-    int two;
-  }
-
-  MyClass()
-  {
-  }
-
-  void oneFunction()
-  {
-    if (1 == 0)
-      {
-      instructions;
-      }
-  }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30937-indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30937-indent_param.cpp
deleted file mode 100644
index 31569ec1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30937-indent_param.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-extern int select(int __nfds, fd_set * __restrict __readfds,
-   fd_set  *  __restrict __writefds,
-   fd_set *  __restrict __exceptfds,
-   struct  timeval * __restrict __timeout);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30938-indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30938-indent_switch_pp.cpp
deleted file mode 100644
index dd910c56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30938-indent_switch_pp.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Example for not indenting preprocesser statements inside switch statements

-switch(...)

-{

-case 1:

-case 2:

-{

-	int v;

-	...

-}

-break;

-

-#if (USE_FIVE)

-case 3:

-	doFive();

-	break;

-#endif

-

-default:

-	break;

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
deleted file mode 100644
index a1453862..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-SomeClass::SomeClass()

-{

-	SomeFunction

-	        (

-	        aTest,

-	        aResult

-	        );

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30940-case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30940-case-brace-remove.cpp
deleted file mode 100644
index cd163570..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30940-case-brace-remove.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-int SomeClass::method()
-{
-   switch (1)
-   {
-   case 0:
-      {
-         double v;
-         break;
-      }
-
-   case 1:
-      {
-         double v;
-         v = this->mat.operator()(0, 0);
-         break;
-      }
-
-   case 2:
-      foo();
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30941-Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30941-Issue_2150.cpp
deleted file mode 100644
index 1e4d6bf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30941-Issue_2150.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-int f( int a )
-{
-        switch ( a )
-        {
-        case 1:
-        {
-                return a;
-        }
-        case 2:
-#if 1
-        case 3:
-#endif
-        {
-                return a;
-        }
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30942-Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30942-Issue_1692.cpp
deleted file mode 100644
index 89de1d6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30942-Issue_1692.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-switch (a)
-{
-  case 0:
-    // code
-  break;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30943-Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30943-Issue_2735.cpp
deleted file mode 100644
index 3e292425..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30943-Issue_2735.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-void func(int a){
-    switch (a)
-    {
-        case 1:
-            ;
-        break;
-
-        case 2:
-            ;
-        break;
-
-        case 3:
-        {
-            int b = 3;
-        }
-        break;
-
-        case 4:
-        {
-            float f = 4.0;
-        }
-        break;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30944-sp_paren_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30944-sp_paren_comma.cpp
deleted file mode 100644
index 0cec2022..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30944-sp_paren_comma.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-a(, 1);
-typedef SLIST_HEAD(, foo) foo_list_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30945-sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30945-sf.3266678.cpp
deleted file mode 100644
index 810b5105..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30945-sf.3266678.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void CMyClass::myFunction()
-{
-	CMyReferencePointer& tmpPointer = (CMyReferencePointer& )getMyValue();
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30946-sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30946-sf.3315874.h
deleted file mode 100644
index 05161496..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30946-sf.3315874.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#undef dot
-#undef cross
-
-extern "C" {
-#include "data_types.h"
-}
-vec_       operator+( const vec_ &, const vec_ & );       /* v = v1 + v2   */
-vec_       operator-( const vec_ &, const vec_ & );       /* v = v1 - v2    */
-mat_       operator+( const mat_ &, const mat_ & );       /* m = m1 + m2    */
-mat_       operator-( const mat_ &, const mat_ & );       /* m = m1 - m2    */
-vec_       &operator+=( vec_ &, const vec_ & );           /* v += v2    */
-mat_       &operator+=( mat_ &, const mat_ & );           /* m += m2    */
-vec_       &operator-=( vec_ &, const vec_ & );           /* v -= v2    */
-mat_       &operator-=( mat_ &, const mat_ & );           /* m -= m2    */
-vec_       operator*( double, const vec_ & );             /* v = a * v1     */
-mat_       operator*( double, const mat_ & );             /* m = a * m1     */
-vec_       operator*( const vec_ &, double );             /* v = v1 * a    */
-mat_       operator*( const mat_ &, double );             /* m = m1 * a    */
-vec_       operator/( const vec_ &, double );             /* v = v1 / a    */
-mat_       operator/( const mat_ &, double );             /* m = m1 / a  */
-vec_       operator*=( vec_ &, const double a );          /* v *= a     */
-vec_       operator/=( vec_ &, const double a );          /* v /= a       */
-vec_       operator*( const mat_ &, const vec_ & );       /* v = m1 * v1  */
-mat_       operator*( const mat_ &, const mat_ & );       /* m = m1 * m2  */
-quat_      operator*( const quat_ &, const quat_ & );     /* q = q1 * q2  */
-quat_      operator*( double, const quat_ & );            /* q = a * q1  */
-quat_      operator*( const quat_ &, double );            /* q = q1 * a  */
-quat_      operator/( const quat_ &, double );            /* q = q1 / a  */
-vec_       operator-( const vec_ & );                     /* v = - v1    */
-vec_       operator+( const vec_ & );                     /* v = + v1    */
-mat_       operator-( const mat_ & );                     /* m = - m1    */
-mat_       operator+( const mat_ & );                     /* m = + m1    */
-quat_      operator+( const quat_ & );                    /* q = + q    */
-quat_      operator-( const quat_ & );                    /* q = - q    */
-quat_      &operator*=( quat_ &, const quat_ & );         /* q1 *= q2;  */
-quat_      &operator+=( quat_ &, const quat_ & );         /* q1 += q2;  */
-quat_      &operator*=( quat_ &, const double a );        /* q1 *= a;   */
-quat_      operator+( const quat_ &q1, const quat_ &q2 ); /* q3  = q1 + q2  */
-vec_       unit ( const vec_ & );                         /* unitize vec    */
-quat_      unit ( const quat_ & );                        /* unitize quat   */
-mat_       trans ( const mat_ & );                        /* transpose matrix  */
-quat_      trans ( const quat_ & );                       /* transpose quat   */
-double     dot ( const vec_, const vec_ );                /* vector dot product  */
-vec_       cross ( const vec_, const vec_ );              /* vector cross product  */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30947-bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30947-bug_1689.cpp
deleted file mode 100644
index 40d34d61..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30947-bug_1689.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-using value_type = int;
-using reference = value_type&;
-using const_reference = const value_type&;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30948-sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
deleted file mode 100644
index 4abfe954..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-const Foo& Foo::operator ==(Foo& me){
-   ::sockaddr* ptr = (::sockaddr*)&host;
-   return me;
-}
-
-MyType& MyClass::myMethode() {
-   const MyType& t = getSomewhere();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30949-Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30949-Issue_2757.cpp
deleted file mode 100644
index ba83c29e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30949-Issue_2757.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void
-foo(map< int, int >& aaa,
-    int              bbb)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
deleted file mode 100644
index 943d303b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/* leading cmt */ int w;
-int y;  /* embedded cmt */ int z;
-// whole cpp cmt
-int x;  // trailing cpp cmt
-/* whole c cmt */
-int x;  /* trailing c cmt */
-struct foo {  // trailing cmt
-  int x;  // trailing cmt
-  // whole cmt
-  int a;  /* emb cmt */ int b;  // trailing cmt
-};  // trailing cmt
-int a;  /* emb cmt */ int b;  // trailing cmt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
deleted file mode 100644
index c7e25f1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/* leading cmt */ int w;
-int y;  /* embedded cmt */ int z;
-// whole cpp cmt
-int x;  // trailing cpp cmt
-/* whole c cmt */
-int x;  /* trailing c cmt */
-struct foo {  // trailing cmt
-  int x;  // trailing cmt
-  // whole cmt
-  int a;     /* emb cmt */ int b;    // trailing cmt
-};  // trailing cmt
-int a;  /* emb cmt */ int b;  // trailing cmt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
deleted file mode 100644
index ad0e38d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-struct MyClass : public Foo {
-  MyClass(int a, int b, int c):
-      m_a(a), m_b(b), m_c(c) {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30953-constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30953-constr_colon.cpp
deleted file mode 100644
index 6c0706e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30953-constr_colon.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class foo
-{
-   void bar_c(int t, int u)
-      : t(222)
-      , u(88)
-   {
-      // code
-   }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30954-Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30954-Issue_2305.cpp
deleted file mode 100644
index 7458b913..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30954-Issue_2305.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-template<class T>
-class Foo<T>::Bar
-{
-    void
-    Bar(int iii)
-        : iii(0)
-    {
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30955-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30955-indent_ctor_init.cpp
deleted file mode 100644
index 55982328..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30955-indent_ctor_init.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-struct MyClass : public Foo,
-                 private Bar {
-  MyClass(
-      int a,
-      int b,
-      int c)
-      : m_a(a),
-        m_b(b),
-        m_c(c) {}
-
- private:
-  int m_a, m_b, m_c;
-};
-
-struct TheirClass
-      : public Foo,
-        private Bar {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30956-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30956-indent_ctor_init.cpp
deleted file mode 100644
index 29a146a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30956-indent_ctor_init.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-struct MyClass
-: public Foo,
-  private Bar {
-  MyClass(
-      int a,
-      int b,
-      int c)
-      : m_a(a),
-           m_b(b),
-           m_c(c) {}
-
- private:
-  int m_a, m_b, m_c;
-};
-
-struct TheirClass
-: public Foo,
-  private Bar {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30957-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30957-class-init.cpp
deleted file mode 100644
index faa28873..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30957-class-init.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-
-class Foo : public Bar
-{
-
-};
-
-#define CTOR(i, _) : T(X()), \
-                     y() \
-{ }
-
-class Foo2 : public Bar
-{
-
-};
-
-class GLOX_API ClientBase : public Class,
-                            public OtherClass,
-                            public ThridClass,
-                            public ForthClass
-{
-  public:
-    ClientBase(const ClientBase & f){
-        // do something
-    }
-};
-
-ClientBase :: ClientBase (const std::string& ns,
-    const std::string& ns1,
-    const std::string& ns2)
-{
-
-}
-
-Foo::Foo(int bar)
-  : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-  : someVar(bar),
-    othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-  : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-  : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-  : someVar(bar),
-    othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-  : someVar(bar),
-    othervar(0)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
deleted file mode 100644
index 8ff2405f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-for (int i = 0; i < 10; ++i)

-	i++;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
deleted file mode 100644
index 382d2815..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
+++ /dev/null
@@ -1 +0,0 @@
-for (int i = 0; i < 10; ++i) i++;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30960-Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30960-Issue_2151.cpp
deleted file mode 100644
index d0ee05d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30960-Issue_2151.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void f( int a )
-{
-	namespace C { enum { Value }; }
-	const bool ok = ( a & C::Value ) && true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30961-Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30961-Issue_2232.cpp
deleted file mode 100644
index 7867820b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30961-Issue_2232.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void main()
-{
-	if (true) return;
-
-	mInitialized = true;
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
deleted file mode 100644
index cf3325f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int q[] = { 3, 4 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30963-Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30963-Issue_2907.cpp
deleted file mode 100644
index c0192c4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30963-Issue_2907.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-template< typename Enum > class Flags
-{
-public:
-constexpr Flags() : value{ 0 } {}
-constexpr Flags( Enum f ) : value( static_cast< value_t >( f ) ) {}
-constexpr Flags( Flags const& ) = default;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30964-Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30964-Issue_2823.cpp
deleted file mode 100644
index c633398f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30964-Issue_2823.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace farm::animal::chicken::leg
-{
-} // namespace farm::animal::chicken::leg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30970-Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30970-Issue_2219.cpp
deleted file mode 100644
index e08cb889..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30970-Issue_2219.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()
-{
-	for(int i = 0; i < 1; i++) return (false);
-	float g = 0.13;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30971-Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30971-Issue_2224.cpp
deleted file mode 100644
index 0c454905..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30971-Issue_2224.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-static void GPUFailedMsgA(const long long int error, const char* file, int line)
-{
-	if (GPUFailedMsgAI(error, file, line)) throw std::runtime_error("Failure");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30972-Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30972-Issue_2229.cpp
deleted file mode 100644
index 0c44ed6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30972-Issue_2229.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int foo()
-{
-	if (false) return 1;
-	if (true) return 2;
-	float a = 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30973-Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30973-Issue_2236.cpp
deleted file mode 100644
index 7f7f01f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30973-Issue_2236.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class A
-{
-public:
-    virtual void f11111111( int a, int b, int c ) = 0;
-    virtual void f2( int* ptr2    = nullptr )     = 0;
-    virtual void f2333( int* ptr3 = 3 )           = delete;
-    void f244444( int* ptr4       = 4 )           = default;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30974-using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30974-using-alias-in-define.cpp
deleted file mode 100644
index 1b4153d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30974-using-alias-in-define.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define UNC_DECLARE_FLAGS(flag_type, enum_type) \
-	using flag_type = flags<enum_type>
-
-#define UNC_DECLARE_OPERATORS_FOR_FLAGS(flag_type)                        \
-	inline flag_type operator&(flag_type::enum_t f1, flag_type::enum_t f2) \
-	{ return(flag_type { f1 } & f2); }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31000-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31000-digraph.cpp
deleted file mode 100644
index e985dae6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31000-digraph.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-x = reinterpret_cast< ::Symbol*>();

-

-int b() {

-	char f <: 32 :> = <% 0 %>;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31001-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31001-digraph.cpp
deleted file mode 100644
index 641390a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31001-digraph.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-x = reinterpret_cast< ::Symbol *>();

-

-int b()

-{

-   char f<: 32 :> = < % 0 % >;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31562-sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31562-sf562.cpp
deleted file mode 100644
index 15ee8e79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31562-sf562.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "bar.h"
-
-class Foo : public Bar {
-    int foo(int bar) const {
-        while (true) {
-            baz(&operator[](bar));
-        }
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31567-sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31567-sf567.cpp
deleted file mode 100644
index 6d96731d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31567-sf567.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.temp.test;
-
-public class Database
-{
-private Database(String fileName)
-{
-	readConfig(fileName, "asdfasdf", 1);
-	readConfig(ame,      "aasdf",    1);
-
-	Database::readConfig(fileName, "asdfasdf", 1);
-	Database::readConfig(ame,      "aasdf",    1);
-
-	::readConfig(fileName, "asdfasdf", 1);
-	::readConfig(ame,      "aasdf",    1);
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31568-Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31568-Issue_2368.cpp
deleted file mode 100644
index 82b8c59c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31568-Issue_2368.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void Func1()
-{
-	OtherFunc( 5, b );
-}
-
-void Func2()
-{
-	Func3( p1,   p2,   p3 );
-	Func3( p111, p222, p333 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31583-sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31583-sf583.cpp
deleted file mode 100644
index 34fc0c21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31583-sf583.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <utility>
-
-std::pair<int, int> make_pair(int first, int second)
-{
-	return {first, second};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31593-sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31593-sf593.cpp
deleted file mode 100644
index 2d4499e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31593-sf593.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-typedef boost::shared_ptr < RatherLongClassName > sp_RatherLongClassName_t;
-int main()
-{
-	int argument = 1;
-	sp_RatherLongClassName_t ratherLongVariableName1(new RatherLongClassName(argument,
-	        argument, argument));
-
-	int the_result = a_very_long_function_name_taking_most_of_the_line(argument,
-	                argument, argument);
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31594-issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31594-issue_672.cpp
deleted file mode 100644
index 499f3168..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31594-issue_672.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class
-		MyClass
-{
-public:
-    void f123(MyType1 AAAAAAAAAAAAAA, MyType2 BBBBBBBBBBBB,
-                    int XXXXXXXXXXXXXXX);
-    void foo(::some::very::looong::_and::complicated::name::MyType& a,
-                    ::some::very::looong::_and::complicated::name::MyType& b,
-                    some::very::looong::_and::complicated::name::MyType& c);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31595-issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31595-issue_1778.cpp
deleted file mode 100644
index 4eea46e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31595-issue_1778.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-using x = Foo::foo_t;
-
-using a1 = decltype( &Foo::operator() );
-using a2 = Bar<decltype( &Foo::operator() )>;
-
-using b1 = decltype( *Foo::y );
-using b2 = Bar<decltype( *Foo::y )>;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31596-issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31596-issue_1782.cpp
deleted file mode 100644
index 664ead7f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31596-issue_1782.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-using a1 = decltype( bar() );
-using b1 = decltype( bar< int >() );
-using c1 = decltype( foo::bar< int >() );
-using d1 = decltype( *( bar< int >() ) );
-using e1 = decltype( *( foo::bar< int >() ) );
-
-using a2 = decltype( bar() );
-using b2 = decltype( bar< int >() );
-using c2 = decltype( foo::bar< int >() );
-using d2 = decltype( *( bar< int >() ) );
-using e2 = decltype( *( foo::bar< int >() ) );
-
-using a3 = decltype( bar(0) );
-using b3 = decltype( bar< int >(0) );
-using c3 = decltype( foo::bar< int >(0) );
-using d3 = decltype( *( bar< int >(0) ) );
-using e3 = decltype( *( foo::bar< int >(0) ) );
-
-using x1 = decltype( ( 0 ) );
-using x2 = decltype( ( 0 ) );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31597-issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31597-issue_1804.cpp
deleted file mode 100644
index c98ecdef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31597-issue_1804.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void foo1( int ( & x ) [ 2 ] );
-void foo2( int ( & x ) [ 2 ] );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31598-Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31598-Issue_1753.cpp
deleted file mode 100644
index 9f7da399..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31598-Issue_1753.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void x()
-{
-	a = c0 * d0();
-	a = b ? c + d : e;
-	a = b ? c * d : e;
-	a = b ? c + d() : e;
-	a = b1 ? c1 * d1() : e1;
-	a = b2 ? c2() * d2 : e2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31600-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31600-parameter-packs.cpp
deleted file mode 100644
index 73940d29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31600-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A)+B) ...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X) ...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename  ... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof  ...  (  A  )  +  B  ) ...  >
-{
-	foo2() {
-		int x = sizeof  ...  (  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof  ...  (  X  );
-	chomp(  X  ) ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31601-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31601-parameter-packs.cpp
deleted file mode 100644
index 6153026f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31601-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename  ... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof  ...  (  A  )  +  B  )...  >
-{
-	foo2() {
-		int x = sizeof  ...  (  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof  ...  (  X  );
-	chomp(  X  )...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31602-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31602-parameter-packs.cpp
deleted file mode 100644
index 4fceb423..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31602-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof ...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof ...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof ...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename  ... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof ...  (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof ...  (  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof ...  (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31603-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31603-parameter-packs.cpp
deleted file mode 100644
index 8de4cbfe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31603-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename  ... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof...  (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof...  (  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof...  (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31604-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31604-parameter-packs.cpp
deleted file mode 100644
index a55fb45a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31604-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename ... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof  ...  (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof  ...  (  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof  ...  (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename ... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename ... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename ... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31605-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31605-parameter-packs.cpp
deleted file mode 100644
index 544d9aa6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31605-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof  ...  (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof  ...  (  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof  ...  (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31606-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31606-parameter-packs.cpp
deleted file mode 100644
index ae0537ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31606-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int ... B>
-struct foo1 : foo1<A ..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int ... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args ...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args* ...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&& ...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args ...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args* ...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&& ...)>
-{
-};
-
-template  <  typename  ... A, int ... B  >
-struct foo2 :  foo2  <  A ..., (  sizeof  ...  (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof  ...  (  A  );
-	}
-};
-
-template  <  int ... X  > int bar2()
-{
-	auto s = sizeof  ...  (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  * ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  && ...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  * ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  && ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31607-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31607-parameter-packs.cpp
deleted file mode 100644
index ce549a69..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31607-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename  ... A, int... B  >
-struct foo2 :  foo2  <  A..., (  sizeof  ...  (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof  ...  (  A  );
-	}
-};
-
-template  <  int... X  > int bar2()
-{
-	auto s = sizeof  ...  (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  *...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  &&...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31608-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31608-parameter-packs.cpp
deleted file mode 100644
index 0f55018c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31608-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof... (A)+B)...>
-{
-	foo1() {
-		int x = sizeof... (A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof... (X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename  ... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof  ... (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof  ... (  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof  ... (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31609-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31609-parameter-packs.cpp
deleted file mode 100644
index cd8a5614..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31609-parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename ... A, int... B>
-struct foo1 : foo1<A..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int... X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename ... Args>
-void call1v(R (*fp)(Args...));
-
-template<class R, typename ... Args>
-void call1p(R (*fp)(Args*...));
-
-template<class R, typename ... Args>
-void call1r(R (*fp)(Args&&...));
-
-template<class R, typename ... Args>
-struct invoke1v : invoke<R (*)(Args...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1p : invoke<R (*)(Args*...)>
-{
-};
-
-template<class R, typename ... Args>
-struct invoke1r : invoke<R (*)(Args&&...)>
-{
-};
-
-template  <  typename  ... A, int  ... B  >
-struct foo2 :  foo2  <  A  ..., (  sizeof  ...(  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof  ...(  A  );
-	}
-};
-
-template  <  int  ... X  > int bar2()
-{
-	auto s = sizeof  ...(  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R, typename  ... Args  >
-void call2v(  R (  *fp  )(  Args  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2p(  R (  *fp  )(  Args  *  ...  )  );
-
-template  <  class R, typename  ... Args  >
-void call2r(  R (  *fp  )(  Args  &&  ...  )  );
-
-template  <  class R, typename  ... Args  >
-struct invoke2v :  invoke  <  R (  *  )(  Args  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2p :  invoke  <  R (  *  )(  Args  *  ...  )  >
-{
-};
-
-template  <  class R, typename  ... Args  >
-struct invoke2r :  invoke  <  R (  *  )(  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31610-Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31610-Issue_2085.cpp
deleted file mode 100644
index 581f4db4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31610-Issue_2085.cpp
+++ /dev/null
@@ -1 +0,0 @@
-typedef std::function<size_t (int arg)> Fail;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31620-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31620-sp_after_type.cpp
deleted file mode 100644
index 460c0dc2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31620-sp_after_type.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-static int x1;
-unsigned long int y1 = (unsigned short)0;
-const int foo1(int x);
-
-foo((const int*)0);
-static_cast<long long>(0);
-
-static int x2;
-unsigned long int y2  =  (  unsigned short  )  0;
-const int  foo2  (  int x  );
-
-foo  (  (  const int  *  )  0  );
-static_cast  <  long long  >  (  0  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31621-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31621-sp_after_type.cpp
deleted file mode 100644
index b1ffd02b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31621-sp_after_type.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-static int x1;
-unsigned long int y1 = (unsigned short)0;
-const int foo1(int x);
-
-foo((const int*)0);
-static_cast<long long>(0);
-
-static  int  x2;
-unsigned  long  int  y2  =  (  unsigned  short  )  0;
-const  int  foo2  (  int  x  );
-
-foo  (  (  const  int  *  )  0  );
-static_cast  <  long  long  >  (  0  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31622-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31622-sp_after_type.cpp
deleted file mode 100644
index a924423a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31622-sp_after_type.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-static int x1;
-unsigned long int y1 = (unsigned short) 0;
-const int foo1(int x);
-
-foo((const int*) 0);
-static_cast<long long>(0);
-
-static int x2;
-unsigned long int y2  =  (  unsigned short  ) 0;
-const int  foo2  (  int x  );
-
-foo  (  (  const int  *  ) 0  );
-static_cast  <  long long  >  (  0  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31623-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31623-sp_after_type.cpp
deleted file mode 100644
index 5d923c27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31623-sp_after_type.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-static int x1;
-unsigned long int y1 = (unsigned short)0;
-const int foo1(int x);
-
-foo((const int*)0);
-static_cast<long long>(0);
-
-static int x2;
-unsigned long int y2  =  (  unsigned short  )0;
-const int  foo2  (  int x  );
-
-foo  (  (  const int  *  )0  );
-static_cast  <  long long  >  (  0  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31624-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31624-sp_after_type.cpp
deleted file mode 100644
index b66aba0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31624-sp_after_type.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-static int x1;
-unsigned long int y1 = (unsigned short)0;
-const int foo1(int x);
-
-foo((const int *)0);
-static_cast<long long>(0);
-
-static int x2;
-unsigned long int y2  =  (  unsigned short  )  0;
-const int  foo2  (  int x  );
-
-foo  (  (  const int *  )  0  );
-static_cast  <  long long  >  (  0  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31625-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31625-sp_after_type.cpp
deleted file mode 100644
index add7b57e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31625-sp_after_type.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-static int x1;
-unsigned long int y1 = (unsigned short)0;
-const int foo1(int x);
-
-foo((const int*)0);
-static_cast<long long>(0);
-
-static int x2;
-unsigned long int y2  =  (  unsigned short  )  0;
-const int  foo2  (  int x  );
-
-foo  (  (  const int*  )  0  );
-static_cast  <  long long  >  (  0  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31626-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31626-issue_1916.cpp
deleted file mode 100644
index 56ce6f4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31626-issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype (x)  y;
-decltype (x)  z = 5;
-
-decltype (char{5})  a = 'a';
-
-using x_t = decltype (x);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31627-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31627-issue_1916.cpp
deleted file mode 100644
index f84334a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31627-issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype(x)  y;
-decltype(x)  z = 5;
-
-decltype(char{5})  a = 'a';
-
-using x_t = decltype(x);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31628-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31628-issue_1916.cpp
deleted file mode 100644
index df2af994..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31628-issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype  (x) y;
-decltype  (x) z = 5;
-
-decltype  (char{5}) a = 'a';
-
-using x_t = decltype  (x);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31629-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31629-issue_1916.cpp
deleted file mode 100644
index 913f1e28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31629-issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype  (x)y;
-decltype  (x)z = 5;
-
-decltype  (char{5})a = 'a';
-
-using x_t = decltype  (x);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31630-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31630-issue_1916.cpp
deleted file mode 100644
index df2af994..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31630-issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype  (x) y;
-decltype  (x) z = 5;
-
-decltype  (char{5}) a = 'a';
-
-using x_t = decltype  (x);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31631-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31631-issue_1916.cpp
deleted file mode 100644
index 913f1e28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31631-issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype  (x)y;
-decltype  (x)z = 5;
-
-decltype  (char{5})a = 'a';
-
-using x_t = decltype  (x);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31632-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31632-issue_1916.cpp
deleted file mode 100644
index 292b6837..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31632-issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype  (x)  y;
-decltype  (x)  z = 5;
-
-decltype  (char{5})  a = 'a';
-
-using x_t = decltype  (x);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31633-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31633-sp_after_decltype.cpp
deleted file mode 100644
index 6a62e6f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31633-sp_after_decltype.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-char y;
-auto x1 = decltype(x) {0};
-auto y1 = decltype(y) {'a'};
-
-unsigned rows;
-for (auto row = decltype(rows) {0}; row < rows; ++row) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31634-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31634-sp_after_decltype.cpp
deleted file mode 100644
index c48543be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31634-sp_after_decltype.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-char y;
-auto x1 = decltype(x){0};
-auto y1 = decltype(y){'a'};
-
-unsigned rows;
-for (auto row = decltype(rows){0}; row < rows; ++row) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31635-sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31635-sp_decltype.cpp
deleted file mode 100644
index 84b157f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31635-sp_decltype.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define foo(expr) (expr)
-using x = decltype foo(int);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31636-Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31636-Issue_1923.cpp
deleted file mode 100644
index 8c3ebe66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31636-Issue_1923.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-int          x1      = 0;
-foobar       long_x2 = 0;
-foo<int>     x3      = 0;
-int          x4[]    = {1, 2, 3};
-decltype(x1) x5      = 0;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31660-issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31660-issue_1919.cpp
deleted file mode 100644
index 187065d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31660-issue_1919.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void foo()
-{
-	int a;
-	vector<unsigned> b;
-	long c;
-	decltype(a) d;
-}
-
-void bar()
-{
-	int a;
-	std::vector<unsigned> b;
-	long c;
-	decltype(a) d;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31661-Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31661-Issue_3097.cpp
deleted file mode 100644
index 336f8eaf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31661-Issue_3097.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void foo()
-{
-	for( unsigned p = 0; p < np;
-	     ++p )
-	{
-
-		double* o = bar[p];
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
deleted file mode 100644
index 03615082..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-void func() {
-}
-
-// **ABC**
-void func() { }
-// *INDENT-ON*
-
-void func() {
-}
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the following form:
- * \verbatim
-
-   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
-
-   where a, b, c, d, and e are real coefficients
-
- * \endverbatim
- *
- * This object's tolerance defines a threshold for root solutions above which iterative methods will be employed to achieve the desired accuracy
- *
- * \verbatim - this should cause the following line to not wrap due to cmt_width
- * Upon success, the roots array contains the solution to the polynomial p(x) = 0
- * \endverbatim
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-int solve(double a,
-          double b,
-          double c,
-          double d,
-          double e,
-          std::complex<double> roots[4]);
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the following form:
- *
-
-   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
-   where a, b, c, d, and e are real coefficients
- *
- * Upon success, root1, root2, root3, and root4 contain the solution to the polynomial p(x) = 0
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-/* **ABC** */
-              int solve(double a,
-    double b,
-                  double c,
-            double d,
-            double e,
-                     std::complex<double> &root1,
-                  std::complex<double> &root2,
-            std::complex<double> &root3,
-        std::complex<double> &root4);
-/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
deleted file mode 100644
index f67cb76b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void func() {
-}
-
-// *INDENT-OFF*
-void func() { }
-// ??DEF??
-
-void func() {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
deleted file mode 100644
index adf1b8be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-void func() {
-}
-
-// **ABC**
-void func() { }
-// *INDENT-ON*
-
-void func() {
-}
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the
- * following form:
- * \verbatim
-
-   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
-
-   where a, b, c, d, and e are real coefficients
-
- * \endverbatim
- *
- * This object's tolerance defines a threshold for root solutions
- * above which iterative methods will be employed to achieve the
- * desired accuracy
- *
- * \verbatim - this should cause the following line to not wrap due to cmt_width
- * Upon success, the roots array contains the solution to the polynomial p(x) = 0
- * \endverbatim
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-int solve(double a,
-          double b,
-          double c,
-          double d,
-          double e,
-          std::complex<double> roots[4]);
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the
- * following form:
- *
- *
- *  p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e, where a, b, c, d,
- * and e are real coefficients
- *
- * Upon success, root1, root2, root3, and root4 contain the solution
- * to the polynomial p(x) = 0
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-/* **ABC** */
-              int solve(double a,
-    double b,
-                  double c,
-            double d,
-            double e,
-                     std::complex<double> &root1,
-                  std::complex<double> &root2,
-            std::complex<double> &root3,
-        std::complex<double> &root4);
-/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
deleted file mode 100644
index e806e89e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-void func() {
-}
-
-// **ABC**
-void func() { }
-// *INDENT-ON*
-
-void func() {
-}
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the
- * following form:
- * \verbatim
-
-   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
-
-   where a, b, c, d, and e are real coefficients
-
- * \endverbatim
- *
- * This object's tolerance defines a threshold for root solutions
- * above which iterative methods will be employed to achieve the
- * desired accuracy
- *
- * \verbatim - this should cause the following line to not wrap due to cmt_width
- * Upon success, the roots array contains the solution to the polynomial p(x) = 0
- * \endverbatim
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-int solve(double a,
-          double b,
-          double c,
-          double d,
-          double e,
-          std::complex<double> roots[4]);
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the
- * following form:
- *
-
-   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
-   where a, b, c, d, and e are real coefficients
- *
- * Upon success, root1, root2, root3, and root4 contain the solution
- * to the polynomial p(x) = 0
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-/* **ABC** */
-              int solve(double a,
-    double b,
-                  double c,
-            double d,
-            double e,
-                     std::complex<double> &root1,
-                  std::complex<double> &root2,
-            std::complex<double> &root3,
-        std::complex<double> &root4);
-/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
deleted file mode 100644
index 8350740b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void f() {
-	auto x = "	test\t 	 	 		...   ???";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
deleted file mode 100644
index 56f16799..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void f() {
-	auto x = "\ttest\t \t \t \t\t...   ???";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31720-bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31720-bit-colon.cpp
deleted file mode 100644
index b8e7c4db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31720-bit-colon.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-class C
-{
- public:
-   size_t f1 : 1;
-   size_t f1 : 1;
-   size_t f2 : sizeof(size_t) - 1;
-
- Q_SIGNALS:
-   void somesignal();
-};
-
-struct S
-{
- private:
-   size_t f1 : 1;
-   size_t f1 : 1;
-   size_t f2 : sizeof(size_t) - 1;
-
- Q_SIGNALS:
-   void somesignal();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31721-Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31721-Issue_2689.cpp
deleted file mode 100644
index e2b43674..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31721-Issue_2689.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class C
-{
- public:
-   size_t f4 : 8 * sizeof(size_t) - 2; // <-- this star is treated a pointer token
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31730-ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31730-ms-style-ref.cpp
deleted file mode 100644
index 826d4e90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31730-ms-style-ref.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-Foo^ foo = dynamic_cast<Bar^>(bar);
-Foo* foo = dynamic_cast<Bar*>(bar);
-x = a ^ b;
-
-int main(Platform::Array<Platform::String^>^ /*args*/)
-{
-}
-
-Platform::Array<unsigned char>^ a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31740-I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31740-I2102.cpp
deleted file mode 100644
index d8cf883a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31740-I2102.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-unsigned __int32 b = 1ui32;
-unsigned __int64 b = 1ui64;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
deleted file mode 100644
index 99d403ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void foo()

-{

-    if (data)   go = new ClassA();

-    else        go = new ClassB();

-

-    if (evt.alt)        modifiers += "Alt+";

-    if (evt.command)    modifiers += "Cmd+";

-    if (evt.control)    modifiers += "Ctrl+";

-    if (evt.shift)      modifiers += "Shift+";

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32001-issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32001-issue_547_for_each.cpp
deleted file mode 100644
index cfbe7963..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32001-issue_547_for_each.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void foo()

-{

-	for_each(it.begin(), it.end(), func);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32002-proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32002-proto-wrap.cpp
deleted file mode 100644
index 35e8bea3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32002-proto-wrap.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-WRAP_FUNCTION(Foo, Bar& (void));
-WRAP_FUNCTION(Foo, Bar* (void));
-WRAP_FUNCTION(Foo, (Bar& (void)));
-WRAP_FUNCTION(Foo, (Bar* (void)));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32003-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32003-issue_633_typename.cpp
deleted file mode 100644
index 33b947f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32003-issue_633_typename.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-template < typename TImage >
-class MorphologicalContourInterpolator :
-	public ImageToImageFilter< TImage, TImage >
-{
-template < typename T >
-friend class MorphologicalContourInterpolatorParallelInvoker;
-friend class ::MultiLabelMeshPipeline;
-
-public:
-/** Standard class typedefs. */
-typedef MorphologicalContourInterpolator Self;
-
-protected:
-MorphologicalContourInterpolator();
-~MorphologicalContourInterpolator() {
-}
-typename TImage::PixelType m_Label;
-int                        m_Axis;
-bool                       m_HeuristicAlignment;
-
-private:
-MorphologicalContourInterpolator( const Self& ) ITK_DELETE_FUNCTION;
-void
-operator=( const Self& ) ITK_DELETE_FUNCTION;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32004-issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32004-issue_624_angle.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32004-issue_624_angle.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-auto c = a < b >> 1;

-auto c = a < b;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32005-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32005-issue_633_typename.cpp
deleted file mode 100644
index 33b947f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32005-issue_633_typename.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-template < typename TImage >
-class MorphologicalContourInterpolator :
-	public ImageToImageFilter< TImage, TImage >
-{
-template < typename T >
-friend class MorphologicalContourInterpolatorParallelInvoker;
-friend class ::MultiLabelMeshPipeline;
-
-public:
-/** Standard class typedefs. */
-typedef MorphologicalContourInterpolator Self;
-
-protected:
-MorphologicalContourInterpolator();
-~MorphologicalContourInterpolator() {
-}
-typename TImage::PixelType m_Label;
-int                        m_Axis;
-bool                       m_HeuristicAlignment;
-
-private:
-MorphologicalContourInterpolator( const Self& ) ITK_DELETE_FUNCTION;
-void
-operator=( const Self& ) ITK_DELETE_FUNCTION;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32006-bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32006-bug_i_687.cpp
deleted file mode 100644
index 387eaa06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32006-bug_i_687.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-struct S { static if (false) void bar() {
-               }; }
-
-struct S { static if (false) { void bar() {
-                               }; } }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32007-Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32007-Issue_3052.cpp
deleted file mode 100644
index cb468be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32007-Issue_3052.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define VTABLE_DECLARE                                            \
-	extern struct vtable_struct_name_macro vtable_base_macro; \
-	struct vtable_struct_name_macro
-
-#define VTABLE_METHOD(retvalue, method, args ...) \
-	retvalue(*method)(args)
-
-VTABLE_DECLARE {
-	VTABLE_METHOD(int, get, const char *name);
-	VTABLE_METHOD(int, set, const char *name, int value);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32008-Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32008-Issue_3034.cpp
deleted file mode 100644
index 1a110ee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32008-Issue_3034.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void main()
-{
-	while (*stringcur)
-	{
-#ifdef NO8BIT
-		if (((*bufcur++ ^ *stringcur) & 0x7F) != 0)
-#else /* NO8BIT */
-		if (*bufcur++ != *stringcur)
-#endif /* NO8BIT */ /* Issue #3034 */
-		{
-			break;
-		}
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32100-cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32100-cpp17.cpp
deleted file mode 100644
index cfccba03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32100-cpp17.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-bool CompareGenomeByFeatureResults::clickOnLink(std::string const& inLink) {
-	auto const [sequence, type, firstPosition, lastPosition] = parseLink(inLink);
-	if (sequence.empty()) {
-		return true;
-	}
-	return showFeature(statistics.nameDocumentA, type, firstPosition, lastPosition);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32105-I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32105-I2103.cpp
deleted file mode 100644
index ba6386dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32105-I2103.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-int i1 = EEnumType::a & EEnumType::b;
-int i2 = a & b;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32115-2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32115-2185.cpp
deleted file mode 100644
index 6f874926..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32115-2185.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-typedef enum {
-  HAL_USART_ENABLED = 64,                   ///< Requested task impossible while
-                                            ///< peripheral in question is
-                                            ///< enabled
-  HAL_USART_DISABLED,                       ///< Requested task impossible while
-                                            ///< peripheral in question is
-                                            ///< disabled
-  HAL_USART_GPIO_ERROR,                     ///< GPIO tied with USART peripheral
-                                            ///< returned error state
-  HAL_USART_BUFFER_DEPLETED,                ///< Not enough data to be read
-  HAL_USART_BUFFER_FULL                     ///< Data requested to be written
-                                            ///< didn't fit into buffer
-} hal_usart_errors_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33000-tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33000-tab-0.cpp
deleted file mode 100644
index d9ff0418..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33000-tab-0.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-/* test of
- * indent_with_tabs = 0
- * indent_columns   = 11
- * the source has many <TAB>
- */
-{
-           int a;
-           int b;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33001-tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33001-tab-1.cpp
deleted file mode 100644
index 85d8abe2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33001-tab-1.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-/* test of
- * indent_with_tabs = 1
- * indent_columns   = 11
- * the source has NO <TAB>
- */
-{
-	   int x;
-	   int y;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
deleted file mode 100644
index 32ff32d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void f() {
-	/* Comment with <TAB>	here
-	 * and	here again
-	 */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
deleted file mode 100644
index db09e6fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void f() {
-        /* Comment with <TAB>   here
-         * and  here again
-         */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33004-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33004-DoxygenComments.cpp
deleted file mode 100644
index df0b9680..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33004-DoxygenComments.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// a cpp comment
-///<a Doygen comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33005-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33005-DoxygenComments.cpp
deleted file mode 100644
index 533214f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33005-DoxygenComments.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// a cpp comment
-///< a Doygen comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
deleted file mode 100644
index 8350740b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void f() {
-	auto x = "	test\t 	 	 		...   ???";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33007-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33007-NewLine.cpp
deleted file mode 100644
index 9c7f1ee9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33007-NewLine.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-{
-	/*
-	 * test for new lines, everywhere
-	 */
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33008-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33008-NewLine.cpp
deleted file mode 100644
index b3cc1bed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33008-NewLine.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	/*
-	 * test for new lines, everywhere
-	 */
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33009-NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33009-NewLine0.cpp
deleted file mode 100644
index b5a714fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33009-NewLine0.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-{
-	/*
-	 * test for new lines, everywhere
-	 */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33010-Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33010-Q_EMIT.cpp
deleted file mode 100644
index d3ef9396..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33010-Q_EMIT.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-bool Handler::failureResponse(const QByteArray &failureMessage)
-{
-    response.setString(failureMessage);
-    Q_EMIT responseAvailable(response);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33011-static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33011-static.h
deleted file mode 100644
index 8121fef1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33011-static.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef AKONADISERVER_H
-#define AKONADISERVER_H
-
-#include <QtCore/QPointer>
-#include <QtCore/QVector>
-
-#include <QtNetwork/QLocalServer>
-
-class QProcess;
-
-namespace Akonadi {
-namespace Server {
-
-class AkonadiServer : public QLocalServer
-{
-    Q_OBJECT
-
-public:
-    ~AkonadiServer();
-    static AkonadiServer *instance();
-};
-
-} // namespace Server
-} // namespace Akonadi
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
deleted file mode 100644
index faf00903..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-bool AkonadiServer::init()
-{
-    connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-            this, SLOT(serviceOwnerChanged(QString,QString,QString)));
-    return true;
-}
-
-connect(&mapper, SIGNAL(mapped(Q1&)), this, SLOT(onSomeEvent(const Q2&)));
-
-connect(&mapper,
-        SIGNAL(mapped(Q1&)),
-        this,
-        SLOT(onSomeEvent(const Q2&)));
-
-connect(&mapper,
-        SIGNAL(emitted(Q1*)),
-        this,
-        SLOT(accept(const Q2*)));
-
-connect(&mapper,
-        SIGNAL(emitted(X<int>)),
-        this,
-        SLOT(accept(X<int>)));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33013-Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33013-Q_2.cpp
deleted file mode 100644
index 7d0bb88a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33013-Q_2.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-bool AkonadiServer::quit()
-{
-    QTimer::singleShot(0, this, SLOT(doQuit()));
-}
-
-void AkonadiServer::incomingConnection(quintptr socketDescriptor)
-{
-    QPointer<ConnectionThread> thread = new ConnectionThread(socketDescriptor, this);
-    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33014-DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33014-DB.cpp
deleted file mode 100644
index 1b8f4bc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33014-DB.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void AkonadiServer::createDatabase()
-{
-    DbConfig::configuredDatabase()->apply(db);
-    db.setDatabaseName(DbConfig::configuredDatabase()->databaseName());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33015-Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33015-Q_FOREACH.cpp
deleted file mode 100644
index 02fd849d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33015-Q_FOREACH.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void Cache::collection()
-{
-    Q_FOREACH (QString partName, lParts) {
-        a = 5;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33016-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33016-indent.cpp
deleted file mode 100644
index 22d04a78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33016-indent.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-int a ()
-{
-  double a_very_long_variable = test (foobar1,
-       foobar5);
-//3456789=123456789=123456789=123456789=
-
-  double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-       asdfasdfasdf - asdfasdf + 56598;
-//3456789=123456789=123456789=123456789=
-
-  a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-       asdfasdfasdf - asdfasdf + 56598;
-//3456789=123456789=123456789=123456789=
-
-  testadsfa (dfasdf,
-       aaafsdfa);
-//3456789=123456789=123456789=123456789=
-
-  return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33017-bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33017-bug_1160.cpp
deleted file mode 100644
index 8dc7a9d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33017-bug_1160.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-template<typename T1>
-class Class1
-{
-public:
-    status.time_count = duration_cast<::milliseconds>
-        (steady_clock::now().time_since_epoch()).count();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33018-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33018-byref-2.cpp
deleted file mode 100644
index 665cc749..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33018-byref-2.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int & aa(int & x,int & b);   // Sp Before Byref Func, Sp After Byref Func, Sp Before Byref, Sp After Byref
-int aa(int & x,int &)     // Sp Before Byref, Sp Before Unnamed Byref, Sp After Byref
-{
-	b = aa(x,b);
-	c = aa(& y,& d);     // Sp Addr
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33019-bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33019-bug_657.cpp
deleted file mode 100644
index 3b5bb42a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33019-bug_657.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-class NewClass : public OldClass/*somecomment*/
-                 , public SomeClass;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33020-bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33020-bug_662.cpp
deleted file mode 100644
index 48b612ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33020-bug_662.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/// foo
-///< foo
-//! foo
-//!< foo
-
-//@{
-//@}
-
-///@{
-///@}
-
-//!@{
-//!@}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33021-bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33021-bug_633.cpp
deleted file mode 100644
index 5b672b47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33021-bug_633.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-typedef void (*func)();
-typedef void (__stdcall *func)();
-
-class CDataObject : public IDataObject
-{
-public:
-    // IUnknown members
-    HRESULT __stdcall QueryInterface(REFIID iid, void ** ppvObject);
-    ULONG __stdcall AddRef(void);
-    ULONG __stdcall Release(void);
-
-    // IDataObject members
-    HRESULT __stdcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __stdcall GetDataHere(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __stdcall QueryGetData(FORMATETC *pFormatEtc);
-    HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC *pFormatEct,  FORMATETC *pFormatEtcOut);
-    HRESULT __stdcall SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease);
-    HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc);
-    HRESULT __stdcall DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *, DWORD *);
-    HRESULT __stdcall DUnadvise(DWORD dwConnection);
-    HRESULT __stdcall EnumDAdvise(IEnumSTATDATA **ppEnumAdvise);
-
-    // exercise others
-    HRESULT __cdecl GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __clrcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __fastcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __thiscall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __vectorcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33022-bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33022-bug_634.cpp
deleted file mode 100644
index febbf7b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33022-bug_634.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-__attribute__((visibility ("default"))) NSString* i;
-extern "C" NSString* i;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33023-bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33023-bug_651.cpp
deleted file mode 100644
index f0236016..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33023-bug_651.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-int a ()
-{
-  double a_very_long_variable = test (foobar1,
-       foobar5);
-
-  double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-       asdfasdfasdf - asdfasdf + 56598;
-
-  a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-       asdfasdfasdf - asdfasdf + 56598;
-
-  testadsfa (dfasdf,
-       aaafsdfa);
-
-  return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33024-bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33024-bug_653.cpp
deleted file mode 100644
index 1bf853d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33024-bug_653.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- *
- **Some comment
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33025-bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33025-bug_654.cpp
deleted file mode 100644
index 497e3372..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33025-bug_654.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-A( b, c, d);
-connect(&mapper, SIGNAL(mapped(Q1&)), this, SLOT(onSomeEvent(const Q2&)));
-connect(&mapper,
-        SIGNAL(mapped(Q1&)),
-        this,
-        SLOT(onSomeEvent(const Q2&)));
-A( b, c, d);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33026-bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33026-bug_631.cpp
deleted file mode 100644
index e110d383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33026-bug_631.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-static inline auto myFunc(MyType const& myValue)
-->std::string
-
-static inline std::string myFunc(MyType const& myValue)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33027-bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33027-bug_664.cpp
deleted file mode 100644
index 6fa5beea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33027-bug_664.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-bool dllInit =
-    [ ]()
-//34567890
-    {
-    }();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33028-braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33028-braces_empty.cpp
deleted file mode 100644
index 8e46ab7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33028-braces_empty.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class Parser::ParserPrivate {};
-
-template <typename T> class to {};
-
-my $all = {};
-
-enum FocusEffect {};
-
-struct error {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33029-cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33029-cast.cpp
deleted file mode 100644
index 179c98c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33029-cast.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	a = ( int ) 5.6;
-	b = int( 5.6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33030-Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33030-Q_FOREVER.cpp
deleted file mode 100644
index 5dad4fa9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33030-Q_FOREVER.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void Cache::collection()
-{
-    Q_FOREVER {
-        a = 5;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33031-bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33031-bug_612.cpp
deleted file mode 100644
index 4388ac75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33031-bug_612.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-void foo(void)
-{
-	int a = 0, b = 0;
-	char chvar = 0, var = 0;
-
-	a     = 0;
-	b     = 0;
-	chvar = 0;
-	var   = 0;
-}
-
-void bar(void)
-{
-	int a      = 0;
-	int b      = 0;
-	char chvar = 0;
-	char var   = 0;
-
-	a     = 0;
-	b     = 0;
-	chvar = 0;
-	var   = 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33032-bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33032-bug_670.cpp
deleted file mode 100644
index 0ede02f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33032-bug_670.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// 3456789=123456789=123456789=123456789=123456789=123456789=12
-std::map<int, std::string>
-FOO::foo(
-        int         key,
-        std::string value )
-{
-    return std::map<int, std::string>( key, value );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33033-bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33033-bug_670.h
deleted file mode 100644
index cc6d46e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33033-bug_670.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// 3456789=123456789=123456789=123456789=123456789=123456789=12
-std::map<int, std::string>
-FOO::foo(
-        int         key,
-        std::string value );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33034-bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33034-bug_671.h
deleted file mode 100644
index 5ef3b5d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33034-bug_671.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define FOO_MAX 10
-
-bool foo[ FOO_MAX ];
-
-void
-foo_bar( int  a,
-         int* b,
-         bool foo[ FOO_MAX ] );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33035-patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33035-patch_32.cpp
deleted file mode 100644
index 8b414f00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33035-patch_32.cpp
+++ /dev/null
@@ -1 +0,0 @@
-/*! test */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33036-bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33036-bug_663.cpp
deleted file mode 100644
index 7583d548..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33036-bug_663.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define SOME_MACRO TemplateClass<T>
-int i;
-#if defined(_MSC_VER)
-    #if _MSC_VER < 1300
-	#define __func__ "unknown function"
-    #else
-	#define __func__ __FUNCTION__
-    #endif /* _MSC_VER < 1300 */
-#endif /* defined(_MSC_VER) */
-
-#define bug_demo        (1 > 2) ? (1 : 2)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33037-func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33037-func_class.cpp
deleted file mode 100644
index ea271c11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33037-func_class.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Reverse the bytes in 32-bit chunks.
- */
-void MD5::reverse_u32(UINT8 *buf, int n_u32)
-{
-	UINT8 tmp;
-}
-
-
-MD5::MD5()
-{
-	m_buf[0] = 0x01020304;
-}
-
-class AlignStack
-{
-public:
-	bool m_skip_first;
-
-
-	AlignStack()
-	{
-	}
-
-
-	~AlignStack()
-	{
-	}
-
-
-	void End()
-	{
-	}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33038-func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33038-func_class.h
deleted file mode 100644
index 8b3ca218..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33038-func_class.h
+++ /dev/null
@@ -1,11 +0,0 @@
-void MD5::reverse_u32(UINT8 *buf, int n_u32);
-MD5::MD5();
-
-class AlignStack
-{
-public:
-	bool m_skip_first;
-	AlignStack();
-	~AlignStack();
-	void End();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
deleted file mode 100644
index 707c1c38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void a()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33040-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33040-bug_i_411.cpp
deleted file mode 100644
index 5a3f09aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33040-bug_i_411.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-class settings final
-{
-public:
-settings();
-~settings(  );
-settings(const settings&);
-settings & operator=(const settings&);
-void set_something(const std::string& p_settings_name);
-void set_another_setting(const std::string& p_settings_name);
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33041-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33041-bug_i_411.cpp
deleted file mode 100644
index 4e89d68d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33041-bug_i_411.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-class settings final
-{
-public:
-settings();
-~settings(  );
-settings(const settings&);
-settings & operator=(const settings&);
-
-
-void set_something(const std::string& p_settings_name);
-
-
-void set_another_setting(const std::string& p_settings_name);
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33042-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33042-bug_i_411.cpp
deleted file mode 100644
index 574f12ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33042-bug_i_411.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-class settings final
-{
-public:
-settings();
-
-
-~settings(  );
-
-
-settings(const settings&);
-
-
-settings & operator=(const settings&);
-void set_something(const std::string& p_settings_name);
-void set_another_setting(const std::string& p_settings_name);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33043-bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33043-bug_i_478.cpp
deleted file mode 100644
index 0f96e53c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33043-bug_i_478.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-        QString fileName = QFileDialog::getOpenFileName(this,
-             tr("Choose Configuration File"), ui->leStrategyFile->text(),
-             tr("Configuration Files (*.cfg);; All Files (*.*)"), 0);
-
-        pSettings = new QSettings(QCoreApplication::applicationDirPath() + "/" +
-             QCoreApplication::applicationName() + ".ini",
-             QSettings::IniFormat);
-}
-int a ()
-{
-        double a_very_long_variable = test (foobar1,
-             foobar5);
-
-        double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-             asdfasdfasdf - asdfasdf + 56598;
-
-        a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-             asdfasdfasdf - asdfasdf + 56598;
-
-        testadsfa (dfasdf,
-             aaafsdfa);
-        return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33044-bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33044-bug_i_481.cpp
deleted file mode 100644
index e8470648..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33044-bug_i_481.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	connect( timer , SIGNAL(timeout()) , this , SLOT(timeoutImage()) );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33045-bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33045-bug_i_width.cpp
deleted file mode 100644
index 08f7888e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33045-bug_i_width.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    // test if no split is possible
-    aaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccddddddddddddd;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33046-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33046-bug_i_409.cpp
deleted file mode 100644
index 6946a562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33046-bug_i_409.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-if(X == Y)
-    X = Z;
-if(Y == Z)
-    Y = X;
-
-for (i=0; i<5; i++)
-    foo(i);
-for (i=0; i<5; i++)
-    foo(i);
-
-while (i<5)
-    foo(i++);
-while (i<5)
-    foo(i++);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33047-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33047-bug_i_409.cpp
deleted file mode 100644
index 7bfdfd83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33047-bug_i_409.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-if(X == Y) X = Z;
-if(Y == Z) Y = X;
-
-for (i=0; i<5; i++) foo(i);
-for (i=0; i<5; i++) foo(i);
-
-while (i<5) foo(i++);
-while (i<5) foo(i++);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33048-bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33048-bug_i_405.cpp
deleted file mode 100644
index eda9b0dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33048-bug_i_405.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace shark {
-    template<class Closure>
-    struct indexed_iterator {
-        typedef typename boost::mpl::if_<
-                boost::is_const<
-                    Closure
-                >,
-                typename Closure::const_reference,
-                typename Closure::reference
-        >::type reference;
-    };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33049-pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33049-pp-pragma.cpp
deleted file mode 100644
index 2c013b08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33049-pp-pragma.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-int main(int argc, char** argv)
-{
-	#ifdef DEBUG
-		#define FORMAT "argc=%d\n"
-		std::printf(FORMAT,argc);
-		#undef FORMAT
-	#endif DEBUG
-	#ifdef _OPENMP
-		#pragma omp parallel
-		{
-			printf("Hello from thread!\n");
-		}
-	#endif
-
-	#pragma CoverageScanner(cov-off)
-	__pragma( CoverageScanner(cov-off) )
-	_Pragma( CoverageScanner(cov-off) )
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33050-issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33050-issue_523.cpp
deleted file mode 100644
index d203e398..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33050-issue_523.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#define MACRO(templ_type) template <typename T> class Abc<templ_type<T> > { }
-
-template<typename T> class Foo<Bar<T> > { };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33051-bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33051-bug_i_503.cpp
deleted file mode 100644
index 31ca41a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33051-bug_i_503.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-0B8h
-__asm
-{
-	mov al, 0B8h
-	mov al, 2
-	mov dx, 0xD007
-	out dx, al
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33052-bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33052-bug_i_512.cpp
deleted file mode 100644
index 9b93cdf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33052-bug_i_512.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-template<typename TType>
-class TTypeSpecialization1<TType>
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33053-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33053-for_auto.cpp
deleted file mode 100644
index 073556c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33053-for_auto.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-void foo()
-{
-    for (auto const& item : list)
-        bar(item);
-    for (const auto& item : list)
-        bar(item);
-    for (auto& item : list)
-        bar(item);
-
-    auto* var = bar();
-    auto& var = bar();
-    auto var = bar();
-    auto const* var = bar();
-    auto const& var = bar();
-    auto const var = bar();
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33054-bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33054-bug_i_825.cpp
deleted file mode 100644
index 242c4811..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33054-bug_i_825.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void a()
-{
-   int i = 0;
-   int h = 0h;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33056-bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33056-bug_33056.cpp
deleted file mode 100644
index 1339ede1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33056-bug_33056.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-inline T* * someFunc(foo** p, bar&& q)
-{
-}
-
-inline T && someFunc(foo * *p, bar && q)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33057-bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33057-bug_1349.cpp
deleted file mode 100644
index fcc2e567..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33057-bug_1349.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-uint8_t a[][8]=
-{   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t b[][8]=
-{   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t c[][8]=
-{   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t d[][8]=
-{   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t e[][8]=
-{   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t f[][8]=
-{   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33058-stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33058-stdcall.cpp
deleted file mode 100644
index a2353599..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33058-stdcall.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// test for bug # 633
-typedef void (*func)();
-typedef void (__stdcall *func)();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
deleted file mode 100644
index eb949c45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ComponentSpec {
-void build(Context c)
-{
-	if (index == NSNotFound) {
-		return;
-	}
-
-	invokeUpdateInvitees(c, invitees);
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33060-if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33060-if_constexpr.cpp
deleted file mode 100644
index 032f74ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33060-if_constexpr.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-static constexpr int test{
-	if constexpr (condition_1)
-		return 1;
-	else if constexpr (condition_2)
-		return 2;
-	else
-		return 3;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33061-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33061-if_chain_braces.cpp
deleted file mode 100644
index b544f2bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33061-if_chain_braces.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-int foo() {
-	if ( a )
-		return 1;
-	else if ( b )
-		return 2;
-
-	if ( a )
-		return 3;
-	else if ( b )
-		return 4;
-	else {
-		a = 5;
-		return 5;
-	}
-
-	if ( a )
-		return 6;
-	else
-		return 7;
-
-	if ( a )
-		return 8;
-
-	if ( b ) {
-		return 9;
-	}
-
-	if ( b ) {
-		{ b = 5; }
-		return 9;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33062-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33062-if_chain_braces.cpp
deleted file mode 100644
index 1973042c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33062-if_chain_braces.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-
-int foo() {
-	if ( a )
-		return 1;
-	else if ( b )
-		return 2;
-
-	if ( a ) {
-		return 3;
-	}
-	else if ( b ) {
-		return 4;
-	}
-	else {
-		a = 5;
-		return 5;
-	}
-
-	if ( a )
-		return 6;
-	else
-		return 7;
-
-	if ( a )
-		return 8;
-
-	if ( b )
-		return 9;
-
-	if ( b ) {
-		{ b = 5; }
-		return 9;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33063-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33063-if_chain_braces.cpp
deleted file mode 100644
index 7a66eeec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33063-if_chain_braces.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-
-int foo() {
-	if ( a ) {
-		return 1;
-	}
-	else if ( b ) {
-		return 2;
-	}
-
-	if ( a ) {
-		return 3;
-	}
-	else if ( b ) {
-		return 4;
-	}
-	else {
-		a = 5;
-		return 5;
-	}
-
-	if ( a ) {
-		return 6;
-	}
-	else{
-		return 7;
-	}
-
-	if ( a )
-		return 8;
-
-	if ( b ) {
-		return 9;
-	}
-
-	if ( b ) {
-		{ b = 5; }
-		return 9;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33064-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33064-if_chain_braces.cpp
deleted file mode 100644
index 2781fb26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33064-if_chain_braces.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-int foo() {
-	if ( a ) {
-		return 1;
-	}
-	else if ( b ) {
-		return 2;
-	}
-
-	if ( a ) {
-		return 3;
-	}
-	else if ( b ) {
-		return 4;
-	}
-	else {
-		a = 5;
-		return 5;
-	}
-
-	if ( a ) {
-		return 6;
-	}
-	else{
-		return 7;
-	}
-
-	if ( a )
-		return 8;
-
-	if ( b )
-		return 9;
-
-	if ( b ) {
-		{ b = 5; }
-		return 9;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33069-Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33069-Issue_2195.cpp
deleted file mode 100644
index fe3ec459..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33069-Issue_2195.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-void Launcher::signal(int code)
-{
-    /*
-    1 HUP      2 INT      3 QUIT     4 ILL      5 TRAP     6 ABRT     7 BUS
-    8 FPE      9 KILL    10 USR1    11 SEGV    12 USR2    13 PIPE    14 ALRM
-    15 TERM    16 STKFLT  17 CHLD    18 CONT    19 STOP    20 TSTP    21 TTIN
-    22 TTOU    23 URG     24 XCPU    25 XFSZ    26 VTALRM  27 PROF    28 WINCH
-    29 POLL    30 PWR     31 SYS
-
-
-        Operation          WinCode     NixCode
-        Status             128          1 (HUP)
-        Terminate          N/A          2 (INT) Linux or macOS uses this for CTRL-C.
-                        129          3
-                        130          4
-                        131          5
-                        132          6
-                        133          7
-                                        8
-                                        9
-                                    10
-                                    11
-                                    12
-                                    13
-                                    14
-        Terminate          N/A         15 (TERM) Linux or macOS uses this for CTRL-C.
-                                    16
-                       N/A         17 (CHILD) Child process exited.
-                        N/A         28 WINCH, window changed size.
-        */
-
-    // Convert to lower range
-    if (code >= 128)
-    {
-        code -= 127;
-    }
-
-    event_queue.push(code);
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33070-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33070-multi_line.cpp
deleted file mode 100644
index dcea4c00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33070-multi_line.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33071-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33071-multi_line.cpp
deleted file mode 100644
index 0f8503fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33071-multi_line.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b (
-	int a,
-	string b, char c );
-
-void func_c (
-	int a, string b, char c
-	);
-
-void func_d (
-	int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-	char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33072-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33072-multi_line.cpp
deleted file mode 100644
index add93503..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33072-multi_line.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b (
-	int a,
-	string b, char c )
-{
-	return;
-}
-
-void func_c (
-	int a, string b, char c
-	)
-{
-	return;
-}
-
-void func_d (
-	int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-	char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33073-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33073-multi_line.cpp
deleted file mode 100644
index c0016ff6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33073-multi_line.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c
-              );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc
-              );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33074-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33074-multi_line.cpp
deleted file mode 100644
index c8f32960..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33074-multi_line.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c
-              )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc
-              )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33075-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33075-multi_line.cpp
deleted file mode 100644
index 66963f4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33075-multi_line.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b,
-              char c );
-
-void func_c ( int a,
-              string b,
-              char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa,
-              string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33076-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33076-multi_line.cpp
deleted file mode 100644
index 9d105267..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33076-multi_line.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b,
-              char c )
-{
-	return;
-}
-
-void func_c ( int a,
-              string b,
-              char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa,
-              string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33077-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33077-multi_line.cpp
deleted file mode 100644
index d7cbafc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33077-multi_line.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b (
-	int a,
-	string b,
-	char c
-	);
-
-void func_c (
-	int a,
-	string b,
-	char c
-	);
-
-void func_d (
-	int aaaaaaaaaaaaaa,
-	string bbbbbbbbbbbbbb,
-	char cccccccccccccccccc
-	);
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b (
-	int a,
-	string b,
-	char c
-	)
-{
-	return;
-}
-
-void func_c (
-	int a,
-	string b,
-	char c
-	)
-{
-	return;
-}
-
-void func_d (
-	int aaaaaaaaaaaaaa,
-	string bbbbbbbbbbbbbb,
-	char cccccccccccccccccc
-	)
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6 );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33078-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33078-multi_line.cpp
deleted file mode 100644
index 01fe4d10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33078-multi_line.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b (
-		4,
-		5, 6 );
-	func_c (
-		7, 8, 9
-		);
-
-	func_d (
-		"aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-		"cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33079-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33079-multi_line.cpp
deleted file mode 100644
index 6a6490ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33079-multi_line.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5,
-	         6 );
-	func_c ( 7,
-	         8,
-	         9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa",
-	         "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33080-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33080-multi_line.cpp
deleted file mode 100644
index 8f44ce91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33080-multi_line.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb,
-              char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-	func_a ( 1, 2, 3);
-	func_b ( 4,
-	         5, 6
-	         );
-	func_c ( 7, 8, 9
-	         );
-
-	func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb",
-	         "cccccccccccccccccccccc"
-	         );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-bug_i_552.cpp
deleted file mode 100644
index 5a0704de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-bug_i_552.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-char *array_assign[2][4]=
-{
-    {
-        // foo
-        {"foo"},
-        {"foo@1"},{"foo@2"},{"foo@3"}
-    },
-    {
-        // bar
-        {"bar"},
-        {"bar@1"},{"bar@2"},{"bar@3"}
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-namespace_namespace.cpp
deleted file mode 100644
index cf6f921e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-namespace_namespace.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace hw { namespace stm32 {
-
-class RTC {
-};
-
-}} // namespace hw::stm32
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33082-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33082-namespace_namespace.cpp
deleted file mode 100644
index cf6f921e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33082-namespace_namespace.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace hw { namespace stm32 {
-
-class RTC {
-};
-
-}} // namespace hw::stm32
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33083-bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33083-bug_i_359.cpp
deleted file mode 100644
index 8081c1f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33083-bug_i_359.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int main()
-{
-    int foo = 42;
-    switch (foo) {
-    case 1:
-        std::cout << "1" << std::endl;
-        break;
-    case 2:
-        std::cout << "2" << std::endl;
-        break;
-    default:
-        std::cout << "Neither 1 nor 2." << std::endl;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33084-op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33084-op_sym_empty.cpp
deleted file mode 100644
index 3557e513..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33084-op_sym_empty.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class Foo
-{
-bool operator== ( const Foo & other ) const;
-Bar & operator*() const;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33085-bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33085-bug_i_323.cpp
deleted file mode 100644
index 6f622f6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33085-bug_i_323.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-class ATL_NO_VTABLE CProxy :
-        public ATL::CComCoClass<CProxy, &CLSID_Proxy>
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33086-bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33086-bug_i_568.cpp
deleted file mode 100644
index 2e1a00d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33086-bug_i_568.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-enum { // Keep this line as it is. It's a regression test for checking pc->prev->prev-> on CT_BRACE_OPEN.
-	kEnumValue =5,
-};
-
-struct foo
-{
-	int bar : kEnumValue;
-	int pad : 3;
-};
-
-class cls
-{
-	int bar : kEnumValue;
-	int pad : 3;
-
-	void func()
-	{
-		goto end;
-		bar = 1;
-end:
-		pad = 2;
-	}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33087-bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33087-bug_i_596.cpp
deleted file mode 100644
index db3644a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33087-bug_i_596.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "child.h"
-int main(int argc, char*argv[]) {
-    (void)argc;
-    (void)argv;
-    Child child;
-    for (auto &attribute : *child.GetAttributes()) {
-        std::cout << attribute << std::endl;
-    }
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33088-bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33088-bug_i_197.cpp
deleted file mode 100644
index e86698fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33088-bug_i_197.cpp
+++ /dev/null
@@ -1 +0,0 @@
-struct A {int a;};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33089-bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33089-bug_643.cpp
deleted file mode 100644
index 55e3e309..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33089-bug_643.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class test_Dummy
-    : public QObject
-{
-    Q_OBJECT
-    test_Dummy* settings = nullptr;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33090-gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33090-gh555.cpp
deleted file mode 100644
index 32147190..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33090-gh555.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class \u005FClass // underscore character
-{
-};
-
-int main()
-{
-	string IdentifierContainingTwoUCNCharacters\u1234\U00001234 = "\u005FClass";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33091-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
deleted file mode 100644
index 7311c71e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-
-#if defined(A)
-
-// Comment
-extern int ax;
-void fa();
-
-#elif defined(B)
-
-extern int bx;
-void fb();
-
-#else
-
-extern int cx;
-void fc();
-
-#endif
-
-int foo()
-{
-#if defined(A)
-
-	int a = ax;
-
-#elif defined(B)
-
-	// Comment
-	int b = bx;
-
-#else
-
-	int c = cx;
-
-#endif
-#if defined(A)
-
-	return a;
-
-#elif defined(B)
-
-	return b;
-
-#else
-
-	// Comment
-	return c;
-
-#endif
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33092-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
deleted file mode 100644
index 94b20d2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#if defined(A)
-
-// Comment
-extern int ax;
-void fa();
-
-#elif defined(B)
-
-extern int bx;
-void fb();
-
-#else
-
-extern int cx;
-void fc();
-
-#endif
-
-int foo()
-{
-#if defined(A)
-	int a = ax;
-#elif defined(B)
-	// Comment
-	int b = bx;
-#else
-	int c = cx;
-#endif
-#if defined(A)
-	return a;
-#elif defined(B)
-	return b;
-#else
-	// Comment
-	return c;
-#endif
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-bug_i_322.cpp
deleted file mode 100644
index 773f909e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-bug_i_322.cpp
+++ /dev/null
@@ -1 +0,0 @@
-STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-sp_angle_paren.cpp
deleted file mode 100644
index 7ed4f34e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-sp_angle_paren.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()
-{
-	bar<T> ();
-	bar<T> (a);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33094-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33094-sp_angle_paren.cpp
deleted file mode 100644
index c20305c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33094-sp_angle_paren.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()
-{
-	bar<T>();
-	bar<T> (a);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33095-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33095-bug_i_322.cpp
deleted file mode 100644
index 3904ec27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33095-bug_i_322.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-class STDMETHOD
-{
-	STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33096-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
deleted file mode 100644
index df3d90ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#if defined(A)
-// Comment
-extern int ax;
-void fa();
-#elif defined(B)
-extern int bx;
-void fb();
-#else
-extern int cx;
-void fc();
-#endif
-
-int foo()
-{
-#if defined(A)
-	int a = ax;
-#elif defined(B)
-	// Comment
-	int b = bx;
-#else
-	int c = cx;
-#endif
-#if defined(A)
-	return a;
-#elif defined(B)
-	return b;
-#else
-	// Comment
-	return c;
-#endif
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33097-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33097-enum_comma.h
deleted file mode 100644
index bb93f4a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33097-enum_comma.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-void function(int a, int b, int c);
-
-enum Test {
-	A,
-	B,
-	C,
-	D,
-	E
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33098-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33098-enum_comma.h
deleted file mode 100644
index 3ec29719..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33098-enum_comma.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-void function(int a
-              , int b
-              , int c);
-
-enum Test {
-	A,   B,
-	C,
-	D, E
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33099-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33099-enum_comma.h
deleted file mode 100644
index 01a89059..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33099-enum_comma.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-void function(int a
-              , int b
-              , int c);
-
-enum Test {
-	A,
-	B,
-	C,
-	D,
-	E
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33100-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33100-enum_comma.h
deleted file mode 100644
index 903a6849..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33100-enum_comma.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-void function(int a,
-              int b,
-              int c);
-
-enum Test {
-	A,   B
-	, C
-	,D, E
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33101-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33101-enum_comma.h
deleted file mode 100644
index 53c1a99e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33101-enum_comma.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-void function(int a,
-              int b,
-              int c);
-
-enum Test {
-	A,   B,
-	C,
-	D, E
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33102-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33102-enum_comma.h
deleted file mode 100644
index 6c11f2b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33102-enum_comma.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-void function(int a,
-              int b,
-              int c);
-
-enum Test {
-	A
-	, B
-	, C
-	, D
-	, E
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33103-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33103-bug_858.cpp
deleted file mode 100644
index 1085f7db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33103-bug_858.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-enum
-{
-   item1 = 123,
-   item2, // comment 2
-}
-
-enum
-{
-   item3,
-   item4,  // comment 4
-}
-enum { x, y,};
-enum { x, y = 0,};
-enum { x, y = 0,/*comment*/ };
-enum { x, y,};
-enum { x, y = 0,};
-enum { x, y = 0,/*comment*/ };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33104-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33104-bug_858.cpp
deleted file mode 100644
index c5ac560e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33104-bug_858.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-enum
-{
-   item1 = 123,
-   item2  // comment 2
-}
-
-enum
-{
-   item3,
-   item4   // comment 4
-}
-enum { x, y };
-enum { x, y = 0 };
-enum { x, y = 0 /*comment*/ };
-enum { x, y };
-enum { x, y = 0 };
-enum { x, y = 0 /*comment*/ };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33105-bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33105-bug_1001.cpp
deleted file mode 100644
index d6104cd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33105-bug_1001.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-template< >
-struct Bar< false >: Foo
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33106-pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33106-pos_bool_in_template.h
deleted file mode 100644
index f5fdb04e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33106-pos_bool_in_template.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <type_traits>

-

-template<typename U,

-         typename V,

-         typename = std::enable_if_t<!std::is_convertible<U,

-                                                          V>::value &&

-                                     !std::is_same<U,

-                                                   V>::value> >

-void foo(U &&u,

-         V &&v)

-{

-

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33107-Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33107-Issue_2688.cpp
deleted file mode 100644
index ac97ff3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33107-Issue_2688.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  std::vector<Object> someVector = {
-    flag && (hasFeedback != nil)
-  ? objectA
-  : objectB,
-  };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33108-Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33108-Issue_2045.cpp
deleted file mode 100644
index a1670ffc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33108-Issue_2045.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void wpa_smk_send_error(struct wpa_authenticator *wpa_auth,
-        struct wpa_state_machine *sm, const u8 *peer,
-        u16 mui, u16 error_type)
-{
-    u8 kde[2 + RSN_SELECTOR_LEN + ETH_ALEN +
-            2 + RSN_SELECTOR_LEN + sizeof(struct rsn_error_kde)];
-    u8 *pos;
-    struct rsn_error_kde error;
-
-    wpa_auth_logger(wpa_auth, sm->addr, LOGGER_DEBUG,
-            "Sending SMK Error");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33110-enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33110-enum.cpp
deleted file mode 100644
index 3872557e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33110-enum.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-enum class angle_state_e : unsigned int
-{
-   NONE  = 0,
-   OPEN  = 1,         //'<' found
-   CLOSE = 2,         //'>' found
-};
-
-// align.cpp
-enum class comment_align_e : unsigned int
-{
-   REGULAR,
-   BRACE,
-   ENDIF,
-};
-
-// chunk_list.h
-enum class scope_e : unsigned int
-{
-   ALL,      /**< search in all kind of chunks */
-   PREPROC,  /**< search only in preprocessor chunks */
-};
-
-// chunk_list.cpp
-enum class direction_e : unsigned int
-{
-   FORWARD,
-   BACKWARD
-};
-
-// combine.cpp
-{
-   enum class angle_state_e : unsigned int
-   {
-      NONE  = 0,
-      OPEN  = 1, // '<' found
-      CLOSE = 2, // '>' found
-   };
-}
-
-// indent.cpp
-enum class align_mode_e : unsigned int
-{
-   SHIFT,     /* shift relative to the current column */
-   KEEP_ABS,  /* try to keep the original absolute column */
-   KEEP_REL,  /* try to keep the original gap */
-};
-
-// align_stack.h
-{
-   enum StarStyle
-   {
-      SS_IGNORE,  // don't look for prev stars
-      SS_INCLUDE, // include prev * before add
-      SS_DANGLE   // include prev * after add
-   };
-}
-
-// log_levels.h
-enum log_sev_t
-{
-   LSYS      = 0,
-   LERR      = 1,
-   LWARN     = 2,
-   LNOTE     = 3,
-   LINFO     = 4,
-   LDATA     = 5,
-
-   LFILELIST = 8,  /* Files in the file list file */
-   LLINEENDS = 9,  /* Show which line endings are used */
-   LCASTS    = 10, /* align casts */
-   LALBR     = 11, /* align braces */
-   LALTD     = 12, /* Align Typedef */
-   LALPP     = 13, /* align #define */
-   LALPROTO  = 14, /* align prototype */
-   LALNLC    = 15, /* align backslash-newline */
-   LALTC     = 16, /* align trailing comments */
-   LALADD    = 17, /* align add */
-   LALASS    = 18, /* align assign */
-   LFVD      = 19, /* fix_var_def */
-   LFVD2     = 20, /* fix_var_def-2 */
-   LINDENT   = 21, /* indent_text */
-   LINDENT2  = 22, /* indent_text tab level */
-   LINDPSE   = 23, /* indent_text stack */
-   LINDPC    = 24, /* indent play-by-play */
-   LNEWLINE  = 25, /* newlines */
-   LPF       = 26, /* Parse Frame */
-   LSTMT     = 27, /* Marking statements/expressions */
-   LTOK      = 28, /* Tokenize */
-   LALRC     = 29, /* align right comment */
-   LCMTIND   = 30, /* Comment Indent */
-   LINDLINE  = 31, /* indent line */
-   LSIB      = 32, /* Scan IB */
-   LRETURN   = 33, /* add/remove parens for return */
-   LBRDEL    = 34, /* brace removal */
-   LFCN      = 35, /* function detection */
-   LFCNP     = 36, /* function parameters */
-   LPCU      = 37, /* parse cleanup */
-   LDYNKW    = 38, /* dynamic keywords */
-   LOUTIND   = 39, /* output indent */
-   LBCSAFTER = 40, /* Brace cleanup stack - after each token */
-   LBCSPOP   = 41, /* Brace cleanup stack - log pops */
-   LBCSPUSH  = 42, /* Brace cleanup stack - log push */
-   LBCSSWAP  = 43, /* Brace cleanup stack - log swaps */
-   LFTOR     = 44, /* Class Ctor or Dtor */
-   LAS       = 45, /* align_stack */
-   LPPIS     = 46, /* Preprocessor Indent and Space */
-   LTYPEDEF  = 47, /* Typedef and function types */
-   LVARDEF   = 48, /* Variable def marking */
-   LDEFVAL   = 49, /* define values */
-   LPVSEMI   = 50, /* Pawn: virtual semicolons */
-   LPFUNC    = 51, /* Pawn: function recognition */
-   LSPLIT    = 52, /* Line splitting */
-   LFTYPE    = 53, /* Function type detection */
-   LTEMPL    = 54, /* Template detection */
-   LPARADD   = 55, /* adding parens in if/while */
-   LPARADD2  = 56, /* adding parens in if/while - details */
-   LBLANKD   = 57, /* blank line details */
-   LTEMPFUNC = 58, /* Template function detection */
-   LSCANSEMI = 59, /* scan semi colon removal */
-   LDELSEMI  = 60, /* Removing semicolons */
-   LFPARAM   = 61, /* Testing for a full parameter */
-   LNL1LINE  = 62, /* NL check for 1 liners */
-   LPFCHK    = 63, /* Parse Frame check fcn call */
-   LAVDB     = 64, /* align var def braces */
-   LSORT     = 65, /* Sorting */
-   LSPACE    = 66, /* Space */
-   LALIGN    = 67, /* align */
-   LALAGAIN  = 68, /* align again */
-   LOPERATOR = 69, /* operator */
-   LASFCP    = 70, /* Align Same Function Call Params */
-   LINDLINED = 71, /* indent line details */
-   LBCTRL    = 72, /* beautifier control */
-   LRMRETURN = 73, /* remove 'return;' */
-   LPPIF     = 74, /* #if/#else/#endif pair processing */
-   LMCB      = 75, /* mod_case_brace */
-   LBRCH     = 76, /* if brace chain */
-   LFCNR     = 77, /* function return type */
-   LOCCLASS  = 78, /* OC Class stuff */
-   LOCMSG    = 79, /* OC Message stuff */
-   LBLANK    = 80, /* Blank Lines */
-   LOBJCWORD = 81, /* Convert keyword to CT_WORD in certain circumstances */
-   LCHANGE   = 82, /* something changed */
-   LCONTTEXT = 83, /* comment cont_text set */
-   LANNOT    = 84, /* Java annotation */
-   LOCBLK    = 85, /* OC Block stuff */
-   LFLPAREN  = 86, /* Flag paren */
-   LOCMSGD   = 87, /* OC Message declaration */
-   LINDENTAG = 88, /* indent again */
-   LNFD      = 89, /* newline-function-def */
-   LJDBI     = 90, /* Java Double Brace Init */
-   LSETPAR   = 91, /* set_chunk_parent() */
-   LSETTYP   = 92, /* set_chunk_type() */
-   LSETFLG   = 93, /* set_chunk_flags() */
-   LNLFUNCT  = 94, /* newlines before function */
-   LCHUNK    = 95, /* Add or del chunk */
-   LGUY98    = 98, /* for guy-test */
-   LGUY      = 99, /* for guy-test */
-};
-
-// options.h
-enum argtype_e
-{
-   AT_BOOL,    /**< true / false */
-   AT_IARF,    /**< Ignore / Add / Remove / Force */
-   AT_NUM,     /**< Number */
-   AT_LINE,    /**< Line Endings */
-   AT_POS,     /**< start/end or Trail/Lead */
-   AT_STRING,  /**< string value */
-   AT_UNUM,    /**< unsigned Number */
-};
-
-enum argval_t
-{
-   AV_IGNORE      = 0,
-   AV_ADD         = 1,
-   AV_REMOVE      = 2,
-   AV_FORCE       = 3, /**< remove + add */
-   AV_NOT_DEFINED = 4  /* to be used with QT, SIGNAL SLOT macros */
-};
-
-enum lineends_e
-{
-   LE_LF,      /* "\n"   */
-   LE_CRLF,    /* "\r\n" */
-   LE_CR,      /* "\r"   */
-
-   LE_AUTO,    /* keep last */
-};
-
-enum tokenpos_e
-{
-   TP_IGNORE      = 0,     /* don't change it */
-   TP_BREAK       = 1,     /* add a newline before or after the if not present */
-   TP_FORCE       = 2,     /* force a newline on one side and not the other */
-   TP_LEAD        = 4,     /* at the start of a line or leading if wrapped line */
-   TP_LEAD_BREAK  = (TP_LEAD | TP_BREAK),
-   TP_LEAD_FORCE  = (TP_LEAD | TP_FORCE),
-   TP_TRAIL       = 8,     /* at the end of a line or trailing if wrapped line */
-   TP_TRAIL_BREAK = (TP_TRAIL | TP_BREAK),
-   TP_TRAIL_FORCE = (TP_TRAIL | TP_FORCE),
-   TP_JOIN        = 16,    /* remove newlines on both sides */
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33120-Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33120-Issue_2149.cpp
deleted file mode 100644
index 1266bd7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33120-Issue_2149.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace
-{
-	enum EnumValue
-	{
-		EnumValue1 = 1 << 1
-	};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33150-bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33150-bug_i_753.cpp
deleted file mode 100644
index 9aa764a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33150-bug_i_753.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void Test::init()
-{
-    connect( m_ppcCom,
-             SIGNAL(sigReceivedBundle(QString)),
-             SLOT(doProcessBundle(QString)) );
-    connect( m_ppcCom,
-             SIGNAL(sigReceivedBundle),
-             SLOT(doProcessBundle));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33151-bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33151-bug_i_752.cpp
deleted file mode 100644
index da8fe9f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33151-bug_i_752.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int a()
-{
-    for(QStringList::const_iterator codesIt = _codes.constBegin(); codesIt != _codes.constEnd(); ++codesIt) {
-        if(    // Current codes enough to compare:
-            ( ( *codesIt ).size() <= strId ) ||
-            // Character on this slot was not readable:
-            ( ( *codesIt ).at( strId ) == m_wildcard ) ||
-            // This character is matching:
-            ( code.at( strId ) == ( *codesIt ).at( strId ) ) ) {
-            // Ignore this slot:
-            continue;
-        }
-    }
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33152-bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33152-bug_1004.cpp
deleted file mode 100644
index f072a583..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33152-bug_1004.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int main()
-{
-	int  b = 3;
-	int* p = &b;
-
-	// Should stay as b * *p
-	int a = b * *p;
-
-	// Correctly formats as a * b;
-	int c = b * a;
-
-	// Correctly formats as d = *p;
-	int d = *p;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33160-bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33160-bug_1112.cpp
deleted file mode 100644
index da95fcb6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33160-bug_1112.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-::std::vector<int>& foo();
-std::vector<int>& bar();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33161-byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33161-byref-3.cpp
deleted file mode 100644
index 8c51bf46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33161-byref-3.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-void test(void) {
-	auto const ic = 1;
-	auto iv = 1;
-	auto const& ric = ic;
-	auto& riv = iv;
-	const auto& ric2 = ic;
-	if (auto const& r(ric); r > 0) {
-	}
-	if (auto& r(riv); r > 0) {
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33180-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33180-pp_multi_comment.cpp
deleted file mode 100644
index bfe1e1d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33180-pp_multi_comment.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define CTOR(i, _)    : \
-   T(X()),              \
-/*
- * multi
- */    \
-       \
-   y() \
-{ }
-main()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33181-Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33181-Issue_2759.cpp
deleted file mode 100644
index cbe9c4a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33181-Issue_2759.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-Foo::Foo(int a,
-         int b)
-    : a_(a),  // the comment should stay here
-      b_(b)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33182-Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33182-Issue_2794.cpp
deleted file mode 100644
index 16de515b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33182-Issue_2794.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-int
-main()
-{
-        int i, j, k, l, m, q;
-
-        i = rand();
-        k = rand();
-        l = rand();
-        m = rand();
-        j = rand();
-        q = i * j + (2 * l) /m - ( 100 * k ) + k * k - i * i + 3000 * j + 1000; /*
-                                                                                 * this
-                                                                                 * is
-                                                                                 * a
-                                                                                 * very
-                                                                                 * long
-                                                                                 * trailing
-                                                                                 * c
-                                                                                 * comment
-                                                                                 */
-
-// the trailing * */ above should be */
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33200-first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33200-first_len_minimum.cpp
deleted file mode 100644
index c33d9e03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33200-first_len_minimum.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
-   a
-   b
-*/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
deleted file mode 100644
index 3b1bea1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-Foo::Foo() :
-        Base(12),
-        mValue(24) {
-    func();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33202-initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
deleted file mode 100644
index a3bc4a2a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-MyClass::MyClass(Type *var1, Type *var2) :
-    BaseClass(parent),
-    mVar1(var1),
-    mVar2(var2) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-Issue_2574.cpp
deleted file mode 100644
index bd88347d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-Issue_2574.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <pybind11/pybind11.h>
-namespace py = pybind11;
-PYBIND11_MODULE(example, m)
-{
-	py::class_<Pet>(m, "Pet")
-		.def(py::init<const std::string&>())
-		.def("setName_T", &Pet::setName)
-		.def("getName", &Pet::getName);
-} auto three()->int {
-	return 3;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-bug_1288.cpp
deleted file mode 100644
index 94444cf9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-bug_1288.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend std::ostream& operator<<(std::ostream& os, const ScriptingObjectPtr& o);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33204-Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33204-Issue_2582.cpp
deleted file mode 100644
index adf9bfe9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33204-Issue_2582.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-int fail = doSomething(
-  argument
-).doNotIndentMe();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33210-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33210-templates4.cpp
deleted file mode 100644
index 10b96e4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33210-templates4.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#define FOO(X) \
-template <unsigned _blk_sz, typename _run_type, class __pos_type> \
-inline X<_blk_sz, _run_type, __pos_type> operator - ( \
-const X<_blk_sz, _run_type, __pos_type> & a, \
-typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \
-{ \
-return X<_blk_sz, _run_type, __pos_type>(a.array, a.pos - off); \
-} \
-template <unsigned _blk_sz, typename _run_type, class __pos_type> \
-inline X<_blk_sz, _run_type, __pos_type> & operator -= ( \
-X < _blk_sz, _run_type, __pos_type > & a, \
-typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \
-{ \
-a.pos -= off; \
-return a; \
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33211-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33211-pp_multi_comment.cpp
deleted file mode 100644
index 5690e3a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33211-pp_multi_comment.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define CTOR(i, _) : \
- T(X()), \
-/*
- * multi
- */ \
-\
-    y() \
-{ }
-main()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33212-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33212-pp-define-indent.cpp
deleted file mode 100644
index 78dc4c98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33212-pp-define-indent.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#define outpsize
-#define some(f)\
-foo(f)
-
-class CRC
-{
-public:
-	int foo;
-// Initial CRC Start Value
- #define 24BITCRC ((ULONG) 0x00864CFB) // This line is not aligned with the other lines
-	char ch;
-#define MULTI LINE DEFINE \
- in column 0 \
-that spans
-//// Operations ////
-public:
-	...
-}
-
-{
-#if defined(WIN32)
-	SYSTEMTIME st;
-	DWORD ThreadId;
-#else
-	struct timeval mytv;
-	struct tm *mytm;
-	pid_t ProcessId;
-#endif
-
-#if SOME COND
-	(void)loop;
-#endif
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33213-disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33213-disable_macro.cpp
deleted file mode 100644
index 7e64f416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33213-disable_macro.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <stdio.h>
-
-// this macro should NOT be modified ...
-#define CHK(...)   \
-  do               \
-  {                \
-      a+=1;        \
-        a=b=0;     \
-          c<<1;    \
-  } while (0+0)
-
-
-// ... whereas this should be indented and formatted
-int main()
-{
-	int a,b,c = 0;
-	if (a < c)
-	{
-		c += 1;
-	}
-	a = b = 0;
-	c << 1;
-	CHK;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33214-Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33214-Issue_2742.cpp
deleted file mode 100644
index 66d12fec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33214-Issue_2742.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#define FOO \
-\
-	int    my_type; \
-	int    a; \
-	float  b; \
-	double c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33215-Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33215-Issue_3055.cpp
deleted file mode 100644
index d23a0d56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33215-Issue_3055.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef ABC
-#define ABC
-
-#ifdef XYZ1
-extern "C" {
-#endif
-
-#ifdef XYZ2
-}
-#endif
-
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33216-Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33216-Issue_3055-a.cpp
deleted file mode 100644
index 21a5c35c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33216-Issue_3055-a.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ABC
-#  define ABC
-
-#  ifdef XYZ1
-extern "C" {
-#  endif
-
-#  ifdef XYZ2
-}
-#  endif
-
-#endif
-int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33217-Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33217-Issue_3113.cpp
deleted file mode 100644
index 63090f4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33217-Issue_3113.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#define CONTINUE_IF(expr) { if ((expr)) continue; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34001-nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34001-nl_before_after.h
deleted file mode 100644
index 8cdc7273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34001-nl_before_after.h
+++ /dev/null
@@ -1,118 +0,0 @@
-namespace A {
-
-namespace S {
-
-class C
-{
-public:
-    virtual ~C()
-    {
-    }
-
-    virtual void addSearch(const int &col) = 0;
-
-    virtual void removeSearch(int id) = 0;
-};
-
-} // namespace S
-
-} // namespace A
-
-namespace B {
-
-// This is a comment!
-class D
-{
-public:
-    D();
-};
-
-} // namespace B
-
-// This is also a comment!
-class E
-{
-public:
-    E();
-};
-
-namespace F {
-}
-
-void foo();
-
-class G
-{
-};
-
-void bar();
-
-void foo2();
-
-namespace E
-{
-}
-
-void bar2();
-
-void foo3();
-
-namespace F
-{
-}
-
-void bar3();
-
-void foo4();
-
-class I
-{
-};
-
-using namespace F;
-
-namespace M
-{
-void bar4();
-
-/* multiline test comment
-   before class */
-template<typename ... Args>
-// test comment between template specification and associated class
-class H
-{
-    // nested class
-    template<typename ...>
-    friend class I;
-    friend class J;
-
-    // nested class K
-    template<typename T>
-    class K
-    {
-
-	// double-nested class L
-	class L { };
-
-    };
-
-};
-
-}
-
-class AA;
-class AB;
-
-namespace BA
-{
-class BB;
-class BC;
-
-class BD
-{
-public:
-    friend class BE;
-    BD();
-};
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34002-bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34002-bug_i_793.cpp
deleted file mode 100644
index b6b6a7ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34002-bug_i_793.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-static void h()
-{
-   typedef int IntGroup;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
deleted file mode 100644
index cd1083ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//regular function
-void func0()
-{
-	return;
-}
-// ========================================================================
-//member function
-void cls::func1()
-{
-	return;
-}
-// ========================================================================
-//lambda function
-const auto l = [](){
-		       return 1;
-	       };
-// ========================================================================
-//regular function in class
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-	return;
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class
-
-// ========================================================================
-//lambda function in class
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-		       return 1;
-	       };
-
-
-
-
-}
-// ========================================================================
-//regular function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-	return;
-}
-
-
-
-
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class in namespace
-
-// ========================================================================
-//lambda function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-		       return 1;
-	       };
-
-
-
-
-}
-
-
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
deleted file mode 100644
index c2f8dc36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-//regular function
-void func0()
-{
-
-
-
-	return;
-}
-// ========================================================================
-//member function
-void cls::func1()
-{
-
-
-
-	return;
-}
-// ========================================================================
-//lambda function
-const auto l = [](){
-
-
-
-		       return 1;
-	       };
-// ========================================================================
-//regular function in class
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-
-
-
-	return;
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class
-
-// ========================================================================
-//lambda function in class
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-
-
-
-		       return 1;
-	       };
-
-
-
-
-}
-// ========================================================================
-//regular function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-
-
-
-	return;
-}
-
-
-
-
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class in namespace
-
-// ========================================================================
-//lambda function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-
-
-
-		       return 1;
-	       };
-
-
-
-
-}
-
-
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
deleted file mode 100644
index 738f3bf6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//regular function
-void func0()
-{
-
-
-
-
-	return;
-}
-// ========================================================================
-//member function
-void cls::func1()
-{
-
-
-
-
-	return;
-}
-// ========================================================================
-//lambda function
-const auto l = [](){
-
-
-
-
-		       return 1;
-	       };
-// ========================================================================
-//regular function in class
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-
-
-
-
-	return;
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class
-
-// ========================================================================
-//lambda function in class
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-
-
-
-
-		       return 1;
-	       };
-
-
-
-
-}
-// ========================================================================
-//regular function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-
-
-
-
-	return;
-}
-
-
-
-
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class in namespace
-
-// ========================================================================
-//lambda function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-
-
-
-
-		       return 1;
-	       };
-
-
-
-
-}
-
-
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34006-bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34006-bug_i_575.cpp
deleted file mode 100644
index 4c25fb75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34006-bug_i_575.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void Foo::doo()
-{
-	m_stackCache[m_currentStackNr]->operator [](0) = new QStandardItem(QString::number(m_currentStackNr));
-	m_stackCache[m_currentStackNr]->operator [](1) = new QStandardItem(tr("OK"));
-	m_stackCache[m_currentStackNr]->operator [](2) = new QStandardItem("0");
-	m_stackCache[m_currentStackNr]->operator [](3) = new QStandardItem("0");
-	m_stackCache[m_currentStackNr]->operator [](4) = new QStandardItem();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34007-bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34007-bug_i_928.cpp
deleted file mode 100644
index 78b214bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34007-bug_i_928.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Test1 { namespace Test {
-
-CodeConstructor::CodeConstructor()
-{
-}
-
-CodeConstructor::getSomething()
-{
-        return 0;
-}
-
-}}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34100-bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34100-bug_i_525.cpp
deleted file mode 100644
index b810afe0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34100-bug_i_525.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-EXEC SQL BEGIN DECLARE SECTION;
-static char    *tbuf;
-EXEC SQL END DECLARE SECTION;
-
-void myfunc1()
-{
-	exec sql execute immediate :tbuf;
-}
-
-void myfunc2()
-{
-	EXEC SQL EXECUTE IMMEDIATE :tbuf;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34101-bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34101-bug_i_646.cpp
deleted file mode 100644
index f89b6416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34101-bug_i_646.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend class ::MultiLabelMeshPipeline;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34105-bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34105-bug_i_663.cpp
deleted file mode 100644
index 2a473bc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34105-bug_i_663.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-void test()
-{
-    switch ( n )
-    {
-        case 1:
-            std::cout << "1";
-            break;
-
-        case 2:
-            {
-                std::cout << "2";
-            }
-            break;
-
-        case 3:
-            { std::cout << "3"; }
-            break;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34108-bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34108-bug_i_666.cpp
deleted file mode 100644
index 212a8656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34108-bug_i_666.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-bool test()
-{
-	if ( true )
-	{
-		i = 10;
-	}
-	else
-		if ( true )
-		{
-			i = 10;
-		}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34112-bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34112-bug_i_889.cpp
deleted file mode 100644
index 5b803a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34112-bug_i_889.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-a::b c()
-{
-	mapped_file_source abc((int)CW1A(sTemp));
-	mapped_file_source abc((int)::CW2A(sTemp));
-	mapped_file_source abc((int)A::CW3A(sTemp));
-}
-
-boost::iostreams::mapped_file_source pdf((LPSTR)ATL::CW2A(sTemp));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34113-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34113-bug_902.cpp
deleted file mode 100644
index ada480c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34113-bug_902.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// unc_add_option("sp_cond_colon", UO_sp_cond_colon, AT_IARF,
-//                "Add or remove space around the ':' in 'b ? t : f'");
-// unc_add_option("sp_cond_question", UO_sp_cond_question, AT_IARF,
-//                "Add or remove space around the '?' in 'b ? t : f'");
-void detect_options(void)
-{
-	detect_space_options();
-}
-
-int i = 0;
-//a
-void a(){
-	return 0;
-}
-//0
-/*b*/
-void b(){
-	return 0;
-}
-/*0*/
-//c
-void c(){
-	return 0;
-}
-//d
-//d
-//d
-void d(){
-	return 0;
-}
-//0
-//h
-//h
-void h(){
-	return 0;
-}
-/*0*/
-/*e*/
-void e(){
-	return 0;
-}
-void f(){
-	return 0;
-}
-
-int i = 0;
-void g(){
-	return 0;
-}
-void i(){
-	return 0;
-}
-void j(){
-	return 0;
-}
-void k(){
-	return 0;
-}
-//0
-void l(){
-	return 0;
-}
-/*
- * 0
- */
-void m(){
-	return 0;
-}
-/*
- * n
- * n
- * n
- */
-void n(){
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34114-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34114-bug_902.cpp
deleted file mode 100644
index af6bdb44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34114-bug_902.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// unc_add_option("sp_cond_colon", UO_sp_cond_colon, AT_IARF,
-//                "Add or remove space around the ':' in 'b ? t : f'");
-// unc_add_option("sp_cond_question", UO_sp_cond_question, AT_IARF,
-//                "Add or remove space around the '?' in 'b ? t : f'");
-
-void detect_options(void)
-{
-	detect_space_options();
-}
-
-int i = 0;
-
-//a
-void a(){
-	return 0;
-}
-
-//0
-
-/*b*/
-void b(){
-	return 0;
-}
-
-/*0*/
-
-//c
-void c(){
-	return 0;
-}
-
-//d
-//d
-//d
-void d(){
-	return 0;
-}
-
-//0
-
-//h
-//h
-void h(){
-	return 0;
-}
-
-/*0*/
-
-/*e*/
-void e(){
-	return 0;
-}
-
-void f(){
-	return 0;
-}
-
-int i = 0;
-
-void g(){
-	return 0;
-}
-
-void i(){
-	return 0;
-}
-
-void j(){
-	return 0;
-}
-
-void k(){
-	return 0;
-}
-
-//0
-
-void l(){
-	return 0;
-}
-
-/*
- * 0
- */
-
-void m(){
-	return 0;
-}
-
-/*
- * n
- * n
- * n
- */
-void n(){
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
deleted file mode 100644
index ff76cb2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-lass A
-{
-	void f0(void);
-
-	template<typename T, typename U>
-	void g(T s, U t)
-	{
-		return;
-	}
-	void f1(void);
-
-	template
-	<typename T,
-	 typename U>
-	void h(T s, U t)
-	{
-		return;
-	}
-	void f2(void);
-
-	template
-	<typename T,
-	 typename U>
-	void
-	i(T s, U t)
-	{
-		return;
-	}
-	void f3(void);
-
-	template
-	<typename T,
-	 typename U>
-	void
-	j
-	        (T s, U t)
-	{
-		return;
-	}
-	void f4(void);
-
-	template
-	<typename T,
-	 typename U>
-	void
-	k
-	(
-		T s, U t)
-	{
-		return;
-	}
-	void f5(void);
-
-	template
-	<typename T,
-	 typename U>
-	void
-	l
-	(
-		T s,
-		U t
-	)
-	{
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34116-issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34116-issue_2000.cpp
deleted file mode 100644
index f4f2c2bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34116-issue_2000.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-int bar;
-
-// blank line should be inserted before this comment
-vector<int> foo()
-{
-	return {};
-}
-
-// blank line should be inserted before this comment, not after
-template<>
-volatile
-int x::
-foo()
-{
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34117-extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34117-extern_func.cpp
deleted file mode 100644
index 4de29e3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34117-extern_func.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo();
-
-// hello
-extern "C"
-BAR_EXPORT
-void bar()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34118-Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34118-Issue_2163.cpp
deleted file mode 100644
index afd04eb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34118-Issue_2163.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * m
- */
-void
-m(){
-	return 0;
-}
-
-/*
- * n
- */
-void
-n(){
-	return 0;
-}
-
-/*
- * n
- */
-int&
-n( int& x ){
-	return x;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34120-bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34120-bug_i_999.cpp
deleted file mode 100644
index 2a5d64a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34120-bug_i_999.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-template< class T, unsigned N = 0 >
-constexpr unsigned long extent_v = extent< T, N >::value;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34121-bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34121-bug_1717.cpp
deleted file mode 100644
index 4116871f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34121-bug_1717.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class X14
-{
-public:
-X14();
-~X14()                         = default;
-X14(const X14& rhs)            = default;
-X14& operator=(const X14& rhs) = default;
-X14(X14&& rhs)                 = delete;
-X14& operator=(X14&& rhs)      = delete;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34122-Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34122-Issue_2440.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34122-Issue_2440.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma region
-#pragma endregion
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34123-Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma region
-#pragma endregion
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34130-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34130-bug_i_1000.cpp
deleted file mode 100644
index 6e1e7a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34130-bug_i_1000.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int main()
-{
-	// Newline inserted between '}' and ')'
-	v.push_back({ 2, 3.0 }
-	            );
-	v.push_back({ 2, 3.0 }
-	            );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34131-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34131-bug_i_1000.cpp
deleted file mode 100644
index 149353e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34131-bug_i_1000.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int main()
-{
-	// Newline inserted between '}' and ')'
-	v.push_back({ 2, 3.0 });
-	v.push_back({ 2, 3.0 });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34132-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34132-new_op.cpp
deleted file mode 100644
index 15386247..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34132-new_op.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-Foo* foo = new Foo(a,v);
-
-Foo* foo = new ( ptr,std::nothrow ) Foo[];
-Foo* foo = new ( ptr ) Foo();
-Foo* foo = new ( FOO(ptr)) Foo();
-
-Foo* foo = new  (  ptr,std::nothrow  )  Foo[];
-Foo* foo = new  (  ptr  )  Foo();
-Foo* foo = new  (  FOO(ptr))  Foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34133-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34133-new_op.cpp
deleted file mode 100644
index ce690c94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34133-new_op.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-Foo* foo = new Foo(a,v);
-
-Foo* foo = new ( ptr,std::nothrow ) Foo[];
-Foo* foo = new ( ptr ) Foo();
-Foo* foo = new ( FOO(ptr) ) Foo();
-
-Foo* foo = new ( ptr,std::nothrow ) Foo[];
-Foo* foo = new ( ptr ) Foo();
-Foo* foo = new ( FOO(ptr) ) Foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34134-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34134-new_op.cpp
deleted file mode 100644
index 67dfa187..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34134-new_op.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-Foo* foo = new Foo(a,v);
-
-Foo* foo = new(ptr,std::nothrow)Foo[];
-Foo* foo = new(ptr)Foo();
-Foo* foo = new(FOO(ptr) )Foo();
-
-Foo* foo = new(ptr,std::nothrow)Foo[];
-Foo* foo = new(ptr)Foo();
-Foo* foo = new(FOO(ptr) )Foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34135-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34135-new_op.cpp
deleted file mode 100644
index 044cd859..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34135-new_op.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-Foo* foo = new Foo(a,v);
-
-Foo* foo = new( ptr,std::nothrow)Foo[];
-Foo* foo = new( ptr)Foo();
-Foo* foo = new( FOO(ptr) )Foo();
-
-Foo* foo = new  ( ptr,std::nothrow)  Foo[];
-Foo* foo = new  ( ptr)  Foo();
-Foo* foo = new  ( FOO(ptr) )  Foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
deleted file mode 100644
index 0a6635d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void MainWindow::createView()
-{
-        a = B( (c) + (d) );
-        a = B( (c) + (d) );
-        a = B( (c) + (d) );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34140-bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34140-bug_1027.cpp
deleted file mode 100644
index 5ccafd2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34140-bug_1027.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-int * fn1();
-mytype * fn2();
-myttype<float> * fn3();
-myttype<float> * myclass::fn4();
-myttype * myclass::fn5();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34141-bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34141-bug_1005.cpp
deleted file mode 100644
index 01a457d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34141-bug_1005.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend void ::test::swap< >(future< T >&, future< T >&);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34142-I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34142-I1112-1.cpp
deleted file mode 100644
index df27d1d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34142-I1112-1.cpp
+++ /dev/null
@@ -1 +0,0 @@
-::some::very::looong::_and::complicated::name::MyType& a;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34143-I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34143-I1112-2.cpp
deleted file mode 100644
index 28a4489d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34143-I1112-2.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class MyClass
-{
-public:
-	void foo(::some::very::looong::_and::complicated::name::MyType& a,
-	        ::some::very::looong::_and::complicated::name::MyType& b,
-	        some::very::looong::_and::complicated::name::MyType& c);
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34144-I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34144-I1112-3.cpp
deleted file mode 100644
index c95a6c40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34144-I1112-3.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class MyClass
-{
-public:
-::some::name* foo;
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34145-i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34145-i683.cpp
deleted file mode 100644
index 255c6336..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34145-i683.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#define concat0(a0,a1) a0 ??=??= a1 // trigraph ##
-#define concat1(a0,a1) a0 %:%: a1   // digraph ##
-
-
-#define STRINGIFY0(s) ??= s   // trigraph #
-#define STRINGIFY1(s) %: s    // digraph #
-
-#define msg0(x) printf("%c: %d\n", ??=@ x, x)  // trigraph #@
-#define msg1(x) printf("%c: %d\n", %:@ x, x)   // digraph #@
-
-// trigraph {
-void x()
-??<
-
-	// trigraph []
-	char a ??(??) = "a";
-	// diigraph []
-	char b <::> = "b";
-
-	bool f, g, h;
-	f = g = h = true;
-
-	// trigraph ||
-	f = g ??!??! h;
-	// trigraph |=
-	f ??!= g;
-	// trigraph |
-	f = g ??! h;
-	// trigraph ^=
-	f ??'= g;
-	// trigraph ^
-	f = g ??' h;
-
-	// trigraph [, ]
-	int m ??( 5 ??);
-	// digraph [, ]
-	int n <: 5 :>;
-
-// trigraph }
-	return;
-??>
-
-// digraph {, }
-int y()
-<%
-	return 1;
-%>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34146-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34146-bug_1002.cpp
deleted file mode 100644
index 0d72c80a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34146-bug_1002.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-template< class B1 = void, class B2 = void >
-struct conjunction : bool_constant<B1::value1 && B2::value2>
-{
-};
-template< class B1 = void, class B2 = void >
-struct conjunction : bool_constant<B1::value1 && B2::value2>
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34147-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34147-bug_1002.cpp
deleted file mode 100644
index 02b85396..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34147-bug_1002.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-template< class B1 = void, class B2 = void >
-struct conjunction : bool_constant<B1::value1&&B2::value2>
-{
-};
-template< class B1 = void, class B2 = void >
-struct conjunction : bool_constant<B1::value1&&B2::value2>
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34148-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34148-bug_1139.cpp
deleted file mode 100644
index d6d8a484..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34148-bug_1139.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-void a()
-{
-	if((tmp == nullptr) ||
-	   ((tmp->type != CT_NUMBER) &&
-	    (tmp->type != CT_SIZEOF) &&
-	    !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	   (tmp->type == CT_NEWLINE)
-	   )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-	else if ((tmp == nullptr) ||
-	         ((tmp->type != CT_NUMBER) &&
-	          (tmp->type != CT_SIZEOF) &&
-	          !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	         (tmp->type == CT_NEWLINE)
-	         )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE)
-	                    )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE)
-	                    )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34149-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34149-bug_1139.cpp
deleted file mode 100644
index dd0a10dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34149-bug_1139.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-void a()
-{
-	if((tmp == nullptr) ||
-	   ((tmp->type != CT_NUMBER) &&
-	    (tmp->type != CT_SIZEOF) &&
-	    !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	   (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-	else if ((tmp == nullptr) ||
-	         ((tmp->type != CT_NUMBER) &&
-	          (tmp->type != CT_SIZEOF) &&
-	          !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	         (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34150-bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34150-bug_1032.cpp
deleted file mode 100644
index 80078efe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34150-bug_1032.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int variable1 = items_array[index<int>()];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34151-bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34151-bug_666.cpp
deleted file mode 100644
index 212a8656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34151-bug_666.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-bool test()
-{
-	if ( true )
-	{
-		i = 10;
-	}
-	else
-		if ( true )
-		{
-			i = 10;
-		}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34152-bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34152-bug_1068.cpp
deleted file mode 100644
index 74fbc8e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34152-bug_1068.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// No extra line added
-void test1()
-{
-	if ( i == 10 )
-		i++;
-}
-
-// No extra line added
-void test2()
-{
-	if ( i == 10 )
-	{
-		i++;
-	}
-}
-
-// No extra line added
-void test3()
-{
-	if ( i == 10 )
-	{
-		if ( j == 10 )
-		{
-			i++;
-		}
-	}
-}
-
-// No extra line added
-void test4()
-{
-	if ( i == 10 )
-	{
-		if ( j == 10 )
-			i++;
-	}
-}
-
-// Extra line added (after Uncrustify)
-void test5()
-{
-	if ( i == 10 )
-		if ( j == 10 )
-		{
-			i++;
-		}
-}
-
-// Extra line added (after Uncrustify)
-void test6()
-{
-	if ( i == 10 )
-		if ( j == 10 )
-			i++;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34153-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
deleted file mode 100644
index 356a7713..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int
-	{  1  };
-	auto b0 = unknown_kw
-	{  2  };
-	auto c0 = ::unknown_kw
-	{  3  };
-	auto d0 = (int) unknown_kw
-	{  4  };
-	auto e0 = (int) ::unknown_kw
-	{  5  };
-	auto f0 = static_cast<int>(unknown_kw
-	                           {  6  });
-	auto g0 = static_cast<int>(::unknown_kw
-	                           {  7  });
-
-	auto a1 = int
-	{1};
-	auto b1 = unknown_kw
-	{2};
-	auto c1 = ::unknown_kw
-	{3};
-	auto d1 = (int) unknown_kw
-	{4};
-	auto e1 = (int) ::unknown_kw
-	{5};
-	auto f1 = static_cast<int>(unknown_kw
-	                           {6});
-	auto g1 = static_cast<int>(::unknown_kw
-	                           {7});
-
-
-
-	auto a2 = int
-	{1};
-	auto b2 = unknown_kw
-	{2};
-	auto c2 = ::unknown_kw
-	{3};
-	auto d2 = (int) unknown_kw
-	{4};
-	auto e2 = (int) ::unknown_kw
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-	                           {7});
-
-
-
-	auto a1 = int
-	{
-
-		1
-
-	};
-	auto b1 = unknown_kw
-	{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw
-	{
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw
-	{
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw
-	{
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw
-	{
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw
-	{
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34154-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
deleted file mode 100644
index adc09173..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {  1  };
-	auto b0 = unknown_kw  {  2  };
-	auto c0 = ::unknown_kw  {  3  };
-	auto d0 = (int) unknown_kw  {  4  };
-	auto e0 = (int) ::unknown_kw  {  5  };
-	auto f0 = static_cast<int>(unknown_kw  {  6  });
-	auto g0 = static_cast<int>(::unknown_kw  {  7  });
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int{1};
-	auto b2 = unknown_kw{2};
-	auto c2 = ::unknown_kw{3};
-	auto d2 = (int) unknown_kw{4};
-	auto e2 = (int) ::unknown_kw{5};
-	auto f2 = static_cast<int>(unknown_kw{6});
-	auto g2 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34155-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
deleted file mode 100644
index 7d62eafb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {
-		1
-	};
-	auto b0 = unknown_kw  {
-		2
-	};
-	auto c0 = ::unknown_kw  {
-		3
-	};
-	auto d0 = (int) unknown_kw  {
-		4
-	};
-	auto e0 = (int) ::unknown_kw  {
-		5
-	};
-	auto f0 = static_cast<int>(unknown_kw  {
-		6
-	});
-	auto g0 = static_cast<int>(::unknown_kw  {
-		7
-	});
-
-	auto a1 = int{
-		1
-	};
-	auto b1 = unknown_kw{
-		2
-	};
-	auto c1 = ::unknown_kw{
-		3
-	};
-	auto d1 = (int) unknown_kw{
-		4
-	};
-	auto e1 = (int) ::unknown_kw{
-		5
-	};
-	auto f1 = static_cast<int>(unknown_kw{
-		6
-	});
-	auto g1 = static_cast<int>(::unknown_kw{
-		7
-	});
-
-
-
-	auto a2 = int
-
-	{
-		1
-	};
-	auto b2 = unknown_kw
-
-	{
-		2
-	};
-	auto c2 = ::unknown_kw
-
-	{
-		3
-	};
-	auto d2 = (int) unknown_kw
-
-	{
-		4
-	};
-	auto e2 = (int) ::unknown_kw
-
-	{
-		5
-	};
-	auto f2 = static_cast<int>(unknown_kw
-
-	{
-		6
-	});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	{
-		7
-	});
-
-
-
-	auto a1 = int{
-		1
-
-	};
-	auto b1 = unknown_kw{
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34156-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
deleted file mode 100644
index 6519b4b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {  1  };
-	auto b0 = unknown_kw  {  2  };
-	auto c0 = ::unknown_kw  {  3  };
-	auto d0 = (int) unknown_kw  {  4  };
-	auto e0 = (int) ::unknown_kw  {  5  };
-	auto f0 = static_cast<int>(unknown_kw  {  6  });
-	auto g0 = static_cast<int>(::unknown_kw  {  7  });
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw {3};
-	auto d1 = (int) unknown_kw {4};
-	auto e1 = (int) ::unknown_kw {5};
-	auto f1 = static_cast<int>(unknown_kw {6});
-	auto g1 = static_cast<int>(::unknown_kw {7});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34157-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
deleted file mode 100644
index 6751c0fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {  1
-	};
-	auto b0 = unknown_kw  {  2
-	};
-	auto c0 = ::unknown_kw  {  3
-	};
-	auto d0 = (int) unknown_kw  {  4
-	};
-	auto e0 = (int) ::unknown_kw  {  5
-	};
-	auto f0 = static_cast<int>(unknown_kw  {  6
-				   });
-	auto g0 = static_cast<int>(::unknown_kw  {  7
-				   });
-
-	auto a1 = int{1
-	};
-	auto b1 = unknown_kw{2
-	};
-	auto c1 = ::unknown_kw{3
-	};
-	auto d1 = (int) unknown_kw{4
-	};
-	auto e1 = (int) ::unknown_kw{5
-	};
-	auto f1 = static_cast<int>(unknown_kw{6
-				   });
-	auto g1 = static_cast<int>(::unknown_kw{7
-				   });
-
-
-
-	auto a2 = int
-
-	{1
-	};
-	auto b2 = unknown_kw
-
-	{2
-	};
-	auto c2 = ::unknown_kw
-
-	{3
-	};
-	auto d2 = (int) unknown_kw
-
-	{4
-	};
-	auto e2 = (int) ::unknown_kw
-
-	{5
-	};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6
-				   });
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7
-				   });
-
-
-
-	auto a1 = int{
-
-		1
-	};
-	auto b1 = unknown_kw{
-
-		2
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34158-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
deleted file mode 100644
index d5dcfdeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {  1  };
-	auto b0 = unknown_kw  {  2  };
-	auto c0 = ::unknown_kw  {  3  };
-	auto d0 = (int) unknown_kw  {  4  };
-	auto e0 = (int) ::unknown_kw  {  5  };
-	auto f0 = static_cast<int>(unknown_kw  {  6  });
-	auto g0 = static_cast<int>(::unknown_kw  {  7  });
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int{
-
-		1};
-	auto b1 = unknown_kw{
-
-		2};
-	auto c1 = ::unknown_kw {
-
-		3};
-	auto d1 = (int) unknown_kw {
-
-		4};
-	auto e1 = (int) ::unknown_kw {
-
-		5};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34159-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
deleted file mode 100644
index 0b9bf31c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int {  1  };
-	auto b0 = unknown_kw {  2  };
-	auto c0 = ::unknown_kw {  3  };
-	auto d0 = (int) unknown_kw {  4  };
-	auto e0 = (int) ::unknown_kw {  5  };
-	auto f0 = static_cast<int>(unknown_kw {  6  });
-	auto g0 = static_cast<int>(::unknown_kw {  7  });
-
-	auto a1 = int {1};
-	auto b1 = unknown_kw {2};
-	auto c1 = ::unknown_kw {3};
-	auto d1 = (int) unknown_kw {4};
-	auto e1 = (int) ::unknown_kw {5};
-	auto f1 = static_cast<int>(unknown_kw {6});
-	auto g1 = static_cast<int>(::unknown_kw {7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int {
-
-		1
-
-	};
-	auto b1 = unknown_kw {
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34160-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
deleted file mode 100644
index 01c89132..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int{  1  };
-	auto b0 = unknown_kw{  2  };
-	auto c0 = ::unknown_kw{  3  };
-	auto d0 = (int) unknown_kw{  4  };
-	auto e0 = (int) ::unknown_kw{  5  };
-	auto f0 = static_cast<int>(unknown_kw{  6  });
-	auto g0 = static_cast<int>(::unknown_kw{  7  });
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw{
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw{
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw{
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw{
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw{
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34161-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
deleted file mode 100644
index cc79678f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  { 1 };
-	auto b0 = unknown_kw  { 2 };
-	auto c0 = ::unknown_kw  { 3 };
-	auto d0 = (int) unknown_kw  { 4 };
-	auto e0 = (int) ::unknown_kw  { 5 };
-	auto f0 = static_cast<int>(unknown_kw  { 6 });
-	auto g0 = static_cast<int>(::unknown_kw  { 7 });
-
-	auto a1 = int{ 1 };
-	auto b1 = unknown_kw{ 2 };
-	auto c1 = ::unknown_kw{ 3 };
-	auto d1 = (int) unknown_kw{ 4 };
-	auto e1 = (int) ::unknown_kw{ 5 };
-	auto f1 = static_cast<int>(unknown_kw{ 6 });
-	auto g1 = static_cast<int>(::unknown_kw{ 7 });
-
-
-
-	auto a2 = int
-
-	{ 1 };
-	auto b2 = unknown_kw
-
-	{ 2 };
-	auto c2 = ::unknown_kw
-
-	{ 3 };
-	auto d2 = (int) unknown_kw
-
-	{ 4 };
-	auto e2 = (int) ::unknown_kw
-
-	{ 5 };
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           { 6 });
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           { 7 });
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34162-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
deleted file mode 100644
index 2d5dc62c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {1};
-	auto b0 = unknown_kw  {2};
-	auto c0 = ::unknown_kw  {3};
-	auto d0 = (int) unknown_kw  {4};
-	auto e0 = (int) ::unknown_kw  {5};
-	auto f0 = static_cast<int>(unknown_kw  {6});
-	auto g0 = static_cast<int>(::unknown_kw  {7});
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34163-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
deleted file mode 100644
index 9be7507a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  { 1  };
-	auto b0 = unknown_kw  { 2  };
-	auto c0 = ::unknown_kw  { 3  };
-	auto d0 = (int) unknown_kw  { 4  };
-	auto e0 = (int) ::unknown_kw  { 5  };
-	auto f0 = static_cast<int>(unknown_kw  { 6  });
-	auto g0 = static_cast<int>(::unknown_kw  { 7  });
-
-	auto a1 = int{ 1};
-	auto b1 = unknown_kw{ 2};
-	auto c1 = ::unknown_kw{ 3};
-	auto d1 = (int) unknown_kw{ 4};
-	auto e1 = (int) ::unknown_kw{ 5};
-	auto f1 = static_cast<int>(unknown_kw{ 6});
-	auto g1 = static_cast<int>(::unknown_kw{ 7});
-
-
-
-	auto a2 = int
-
-	{ 1};
-	auto b2 = unknown_kw
-
-	{ 2};
-	auto c2 = ::unknown_kw
-
-	{ 3};
-	auto d2 = (int) unknown_kw
-
-	{ 4};
-	auto e2 = (int) ::unknown_kw
-
-	{ 5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           { 6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           { 7});
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34164-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
deleted file mode 100644
index 68565614..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {1  };
-	auto b0 = unknown_kw  {2  };
-	auto c0 = ::unknown_kw  {3  };
-	auto d0 = (int) unknown_kw  {4  };
-	auto e0 = (int) ::unknown_kw  {5  };
-	auto f0 = static_cast<int>(unknown_kw  {6  });
-	auto g0 = static_cast<int>(::unknown_kw  {7  });
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34165-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
deleted file mode 100644
index 92fc0b0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {  1 };
-	auto b0 = unknown_kw  {  2 };
-	auto c0 = ::unknown_kw  {  3 };
-	auto d0 = (int) unknown_kw  {  4 };
-	auto e0 = (int) ::unknown_kw  {  5 };
-	auto f0 = static_cast<int>(unknown_kw  {  6 });
-	auto g0 = static_cast<int>(::unknown_kw  {  7 });
-
-	auto a1 = int{1 };
-	auto b1 = unknown_kw{2 };
-	auto c1 = ::unknown_kw{3 };
-	auto d1 = (int) unknown_kw{4 };
-	auto e1 = (int) ::unknown_kw{5 };
-	auto f1 = static_cast<int>(unknown_kw{6 });
-	auto g1 = static_cast<int>(::unknown_kw{7 });
-
-
-
-	auto a2 = int
-
-	{1 };
-	auto b2 = unknown_kw
-
-	{2 };
-	auto c2 = ::unknown_kw
-
-	{3 };
-	auto d2 = (int) unknown_kw
-
-	{4 };
-	auto e2 = (int) ::unknown_kw
-
-	{5 };
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6 });
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7 });
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34166-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
deleted file mode 100644
index d7dfa908..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {  1};
-	auto b0 = unknown_kw  {  2};
-	auto c0 = ::unknown_kw  {  3};
-	auto d0 = (int) unknown_kw  {  4};
-	auto e0 = (int) ::unknown_kw  {  5};
-	auto f0 = static_cast<int>(unknown_kw  {  6});
-	auto g0 = static_cast<int>(::unknown_kw  {  7});
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34167-nl_func_call_args_multi_line_ignore_closures.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34167-nl_func_call_args_multi_line_ignore_closures.cpp
deleted file mode 100644
index 4363833f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34167-nl_func_call_args_multi_line_ignore_closures.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-methodCall([] {
-	Log();
-});
-
-funcCall(
-	match ( [ & ]( const ContentProps &props)  {
-	return PairingCmpnt()
-})
-	);
-
-match( [ & ]( const ContentProps &props)  {
-	return PairingCmpnt()
-});
-
-
-outerMethodCall(
-	methodCall(^{
-	// action
-}, x)
-	);
-
-outerMethodCall(
-	x,
-	methodCall(^{
-	// action
-}, y)
-	);
-
-options({
-	.cornerRadius = CGFLOAT_MAX,
-});
-
-mapToPtr([&](const LeftAddOn::Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr(x, [&](const Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr([&](const Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-});
-
-methodCall(
-	arg1,
-	arg2,
-	arg3
-	);
-
-methodCall(arg1, arg2, arg3);
-
-methodCall(
-	arg1, []{
-	variant.action.send(Cmpnt);
-}, arg3
-	);
-
-methodCall(
-	arg1, {
-	.x = 10,
-},
-	arg3
-	);
-
-methodCall({
-	.x = 10,
-},
-           arg3);
-
-methodCall(
-	arg1, {
-	.x = 10,
-}
-	);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34168-Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34168-Issue_2910.cpp
deleted file mode 100644
index 82c2bec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34168-Issue_2910.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-auto foo() -> decltype(0)
-{
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34169-init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34169-init-list-call.cpp
deleted file mode 100644
index 95449eb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34169-init-list-call.cpp
+++ /dev/null
@@ -1 +0,0 @@
-auto x = foo{0}( );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34170-i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34170-i1082.cpp
deleted file mode 100644
index 06680c0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34170-i1082.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// there should be no break ups caused by suffix or separator
-auto n2 = 1'000;
-auto m1 = 0b0010'1010LL;
-auto m2 = 0xfa'afUll;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34171-i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34171-i1181.cpp
deleted file mode 100644
index 1a959d34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34171-i1181.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int main()
-{
-	if(true) {return 1;}
-	else if(true) {return 1;}
-	else {return 1;}
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34172-i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34172-i1165.cpp
deleted file mode 100644
index c3123b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34172-i1165.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <functional>
-
-int main()
-{
-    typedef std::function<void ()> C;
-    C callback =
-        [] ()
-        {
-            C f([]()
-            {
-                int i;
-            });
-        };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34173-i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34173-i1464.cpp
deleted file mode 100644
index e4005841..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34173-i1464.cpp
+++ /dev/null
@@ -1 +0,0 @@
-auto p = std::make_pair(r * cos(a), r * sin(a));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34174-i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34174-i1466.cpp
deleted file mode 100644
index 912488b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34174-i1466.cpp
+++ /dev/null
@@ -1 +0,0 @@
-A a = {this->r * cos(b)};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34175-i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34175-i1509.cpp
deleted file mode 100644
index 419807fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34175-i1509.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void f()
-{
-	int i  = A::B::C::bar();
-	int ii = A::B::C::bar();
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
deleted file mode 100644
index b9a75cf6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-void f()
-{
-	int i  = A::B::C::bar();
-	int ii = A::B::C::bar();
-}
-
-int A::foo()
-{
-	return 1;
-}
-int A::B::foo()
-{
-	return A::foo();
-}
-int A::B::C::foo()
-{
-	return A::B::foo();
-}
-int A::B::C::D::foo()
-{
-	return A::B::C::foo();
-}
-int A::B::C::D::E::foo()
-{
-	return A::B::C::D::foo();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34177-sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
deleted file mode 100644
index 580e9bae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-BEGIN_MESSAGE_MAP (CUSB2_camera_developementDlg, CDialog)
-   ON_COMMAND (IDC_ESCAPE, On_Escape)
-   ON_COMMAND (IDC_8_BIT, On_8_Bit)
-   ON_COMMAND (IDC_14_BIT, On_14_Bit)
-   ON_COMMAND (IDC_ACQUIRE, On_Acquire)
-   ON_COMMAND (IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages)
-   ON_COMMAND (IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages)
-   ON_WM_PAINT ()
-   ON_WM_QUERYDRAGICON ()
-   ON_WM_CTLCOLOR ()
-END_MESSAGE_MAP ()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34180-bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34180-bug_1402.cpp
deleted file mode 100644
index 09714c41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34180-bug_1402.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Constants
-{
-double PI = 3.14;
-}
-int factor = 41;
-double result = Constants::PI * factor;
-
-return Constants::PI * factor;
-
-void func(int value) {
-	return SomeClass(value, Constants::PI * value);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34190-bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34190-bug_1003.cpp
deleted file mode 100644
index 7495b93d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34190-bug_1003.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-class Foo
-{
-public:
-	Foo(
-		int x_,
-		int y_
-	) : x(x_), y(y_)
-	{
-	}
-private:
-	int x;
-	int y;
-};
-
-class Bar
-{
-public:
-	// Splits 3,5 onto newlines
-	Bar() : Bar(3, 5)
-	{
-	}
-
-	// No split here
-	Bar(
-		int x,
-		int y
-	) : foo(x, y)
-	{
-	}
-
-	Foo foo;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34191-comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34191-comment-align-multiline.cpp
deleted file mode 100644
index db501481..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34191-comment-align-multiline.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-
-void function()
-{
-	printf( "Hello World\n" );
-	/*
-	   output_comment_multi_simple to test replacement of \r\n to \n keep the
-	   following \r:
-	   //test
-	   /// Another comment
-	   //end test
-	 */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34192-i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34192-i1207.cpp
deleted file mode 100644
index e02da8c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34192-i1207.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <vector>
-std::vector<int> f()
-{
-	return std::vector<int>{1};
-}
-
-int main()
-{
-	return f()[0];
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34193-i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34193-i1218.cpp
deleted file mode 100644
index d4d05106..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34193-i1218.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Do not add a new line because of the vbrace close that is above col 25
-// after return 1;
-int main()
-{
-	if(1)
-		return 1;
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34194-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34194-sp_arith_additive.cpp
deleted file mode 100644
index 5ecb2ec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34194-sp_arith_additive.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-int i = 0 + 3 - 4*3%3;
-int ii = 0 + 3 - 4*3%3;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34195-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34195-sp_arith_additive.cpp
deleted file mode 100644
index f419a3ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34195-sp_arith_additive.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-int i = 0+3-4 * 3 % 3;
-int ii = 0+3-4 * 3 % 3;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34196-Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34196-Issue_1460.h
deleted file mode 100644
index 63787999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34196-Issue_1460.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define MGT_TYPE_WINDOW (mgt_window_get_type ())
-
-G_DECLARE_FINAL_TYPE (MgtWindow, mgt_window, MGT, WINDOW, GtkApplicationWindow)
-
-MgtWindow *mgt_window_new (MgtApplication *app);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34197-bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34197-bug_1161.cpp
deleted file mode 100644
index 34740f5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34197-bug_1161.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// Use case from issue #1161
-class test
-{
-	// comment 1 (gets methods)
-	public:
-		// get 1
-		int get1();
-		// get 2
-		int get2();
-
-
-
-
-	// comment 2 (sets methods)
-	public:
-		// set 1
-		int set1();
-		// set2
-		int set2();
-
-};
-
-// Use cases from issue #2704
-class Foo
-{
-	public:
-		/// @name Constructors
-		/// @{
-
-		Foo(int value) : value_(value)
-		{
-		}
-
-		/// @}
-
-	private:
-		int value_;
-};
-
-class Bar
-{
-	public:
-		/*!
-		 * @name Constructors
-		 * @{
-		 */
-
-		Bar(int value) : value_(value)
-		{
-		}
-
-		/*! @} */
-
-	private:
-		int value_;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34198-bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34198-bug_1249.cpp
deleted file mode 100644
index 65637efe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34198-bug_1249.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-friend class ::GameObject;
-void GameObject::Foo();
-
-auto x = ::GlobalFunc();
-
-friend void ::testing::PrintDebugInformationForFakesInUse();
-
-template<class TransferFunction>
-void ::DateTime::Transfer(TransferFunction & transfer)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34199-not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34199-not_lambda.cpp
deleted file mode 100644
index a9c65439..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34199-not_lambda.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int ff()
-{
-	// not a lambda fcn so don't surround "->" by spaces
-	f()[0]->size();
-	if(true) {
-		return 1;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34200-i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34200-i1536.cpp
deleted file mode 100644
index 0eb7fc69..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34200-i1536.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// FuncA
-void FuncA(void)
-{
-}
-
-// FuncB
-void FuncB(void)
-{
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34201-i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34201-i1565.cpp
deleted file mode 100644
index d0bef508..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34201-i1565.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace ns1 {
-namespace ns2 {
-
-  #define SOME_MACRO() \
-	if(true) { \
-	}
-
-} // namespace ns2
-} // namespace ns1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34202-i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34202-i1617.cpp
deleted file mode 100644
index 98ede13b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34202-i1617.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace
-{
-void f(){
-};
-} // namespace
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34203-i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34203-i1516.cpp
deleted file mode 100644
index d415b945..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34203-i1516.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-void myClass::foo() {
-
-	int bar;
-	std::string str;
-
-
-	DbConfig::configuredDatabase()->apply(db);
-
-	std::string str2;
-
-	std::string str2;
-
-
-	f();
-	DbConfig::configuredDatabase()->apply(db);
-
-	int bar;
-	std::string str;
-
-	std::string str2;
-
-
-	f();
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
deleted file mode 100644
index e8790dbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-uint32_t foo ( uint8_t             param1
-               , some_datatype     param2
-               , datatype          param3
-               , another_datatype *param4
-               , uint16_t          param5
-               , uint32_t *        param6
-               );
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34205-bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34205-bug_1395.cpp
deleted file mode 100644
index 16e2fbba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34205-bug_1395.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-Type tmp = call_function(getObj().x,
-                         getObj().y,
-                         getObj().z,
-                         getObj().w);
-getObj().result = tmp;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34206-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34206-for_loop_head.cpp
deleted file mode 100644
index 6cea550d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34206-for_loop_head.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-for(int i = 1,
-    j = 2,
-    k = 3,
-   ; (i != 1
-      && j != 2
-      && k != 2)
-   ; i++, j++, k++ )
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34207-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34207-for_loop_head.cpp
deleted file mode 100644
index 2aa9bdc0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34207-for_loop_head.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-for( int i = 1,
-     j = 2,
-     k = 3,
-   ; (i != 1
-      && j != 2
-      && k != 2)
-   ; i++, j++, k++ )
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34208-conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34208-conversion_operator.cpp
deleted file mode 100644
index 27b52dac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34208-conversion_operator.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-template< class T >
-operator T*() const
-{
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34209-lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
deleted file mode 100644
index e37674a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void f(){
-	int i = 0;
-	const auto j = [](int k){
-			       return k+2;
-		       }       (i);
-
-	const auto l = ([](int k){
-		return k+2;
-	})(i);
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34210-override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34210-override_virtual.cpp
deleted file mode 100644
index 537454b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34210-override_virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-struct A
-{
-	virtual void foo();
-	virtual void bar() = 0;
-	virtual void baz() const {
-	}
-};
-
-struct B : public A
-{
-	virtual void foo() override;
-	void bar() override {
-	}
-	void baz() const override {
-	}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34211-anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34211-anonymous_enum.cpp
deleted file mode 100644
index ef237a6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34211-anonymous_enum.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-enum {
-  E11 = 0,
-  E12 = 1,
-  E13 = 2
-};
-
-enum Enum1 {
-  E21 = 0,
-  E22 = 1,
-  E23 = 2
-};
-
-enum Enum2 : int {
-  E31 = 0,
-  E32 = 1,
-  E33 = 2
-};
-
-enum Enum3
-: int {
-  E41 = 0,
-  E42 = 1,
-  E43 = 2
-};
-
-enum : int {
-  E51 = 0,
-  E52 = 1,
-  E53 = 2
-};
-
-enum
-: int {
-  E61 = 0,
-  E62 = 1,
-  E63 = 2
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34250-bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34250-bug_1607.cpp
deleted file mode 100644
index 9e4e47d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34250-bug_1607.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-decltype(i * d) prod = i * d;
-decltype(i + d) sum;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34251-bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34251-bug_1649.cpp
deleted file mode 100644
index 4b352c79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34251-bug_1649.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Foo()
-noexcept()
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34252-issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34252-issue_2001.cpp
deleted file mode 100644
index 39b9446d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34252-issue_2001.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-extern int foo();
-extern int foo(size_t);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34253-friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34253-friends.cpp
deleted file mode 100644
index 58fd649a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34253-friends.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class foo
-{
-friend void bar();
-friend void none();
-template <typename T> friend vector<T> vec();
-
-
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34254-issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34254-issue_1985.cpp
deleted file mode 100644
index ef9fc90a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34254-issue_1985.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// Don't break a prototype followed by a one-liner
-class foo1
-{
-foo1();
-foo1(int) {}
-
-
-int bar();
-int bar(int) { return 0; }
-
-
-foo1(long);
-foo1(short) {}
-
-
-int x;
-};
-
-// Don't break a one-liner followed by a prototype
-class foo2
-{
-foo2(int) {}
-foo2();
-
-
-int bar(int) { return 0; }
-int bar();
-
-
-foo2(short) {}
-foo2(long);
-
-
-int x;
-};
-
-// Do break a prototype followed by a multi-line definition
-class foo3
-{
-foo3();
-
-
-foo3(int)
-{
-	x = 0;
-}
-int bar();
-
-
-int bar(int)
-{
-	return 0;
-}
-foo3(long);
-
-
-foo3(short)
-{
-	x = 0;
-}
-int x;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
deleted file mode 100644
index 7005d86c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-class A

-{

-    void

-    func1()

-    {

-        // comment

-    }

-

-    void

-    func2()

-    {

-        auto result = 1 + 2 +

-                      3 + 4;

-    }

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34256-Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34256-Issue_2836.cpp
deleted file mode 100644
index 4d2a648f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34256-Issue_2836.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-module x;
-static if (1) {{
-		       int x;
-	       }}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34280-UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34280-UNI-29935.cpp
deleted file mode 100644
index 8b13bd9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34280-UNI-29935.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void Foo1(BarType& x, void BarFunc());
-
-void Bar()
-{
-    void BarFunc2(BarType& x);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
deleted file mode 100644
index 272865bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int main()
-{
-	int a0[][] = {{  1  }};
-	unknown_type b0 = {{  2  }};
-	auto c0 = unknown_type {{  3  }};
-	auto d0 = func( {{  3  }}  );
-	auto e0 = func( unknown_type {{  3  }}  );
-
-	int a1[][] = {  {1}  };
-	unknown_type b1 = {  {2}  };
-	auto c1 = unknown_type {  {3}  };
-	auto d1 = func({  {3}  });
-	auto e1 = func(unknown_type {  {3}  });
-
-	int a2[][] = {{1}};
-	unknown_type b2 = {{2}};
-	auto c2 = unknown_type {{3}};
-	auto d2 = func({{3}});
-	auto e2 = func(unknown_type {{3}});
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
deleted file mode 100644
index 395906c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int main()
-{
-	int a0[][] = {{  1  }};
-	unknown_type b0 = {{  2  }};
-	auto c0 = unknown_type{{  3  }};
-	auto d0 = func( {{  3  }}  );
-	auto e0 = func( unknown_type{{  3  }}  );
-
-	int a1[][] = {  {1}  };
-	unknown_type b1 = {  {2}  };
-	auto c1 = unknown_type{  {3}  };
-	auto d1 = func({  {3}  });
-	auto e1 = func(unknown_type{  {3}  });
-
-	int a2[][] = {{1}};
-	unknown_type b2 = {{2}};
-	auto c2 = unknown_type{{3}};
-	auto d2 = func({{3}});
-	auto e2 = func(unknown_type{{3}});
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
deleted file mode 100644
index cc0ac847..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int main()
-{
-	int a0[][] = { { 1 } };
-	unknown_type b0 = { { 2 } };
-	auto c0 = unknown_type  { { 3 } };
-	auto d0 = func( { { 3 } }  );
-	auto e0 = func( unknown_type  { { 3 } }  );
-
-	int a1[][] = { { 1 } };
-	unknown_type b1 = { { 2 } };
-	auto c1 = unknown_type{ { 3 } };
-	auto d1 = func({ { 3 } });
-	auto e1 = func(unknown_type{ { 3 } });
-
-	int a2[][] = { { 1 } };
-	unknown_type b2 = { { 2 } };
-	auto c2 = unknown_type{ { 3 } };
-	auto d2 = func({ { 3 } });
-	auto e2 = func(unknown_type{ { 3 } });
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
deleted file mode 100644
index c47119ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int main()
-{
-	int a0[][] = {{1}};
-	unknown_type b0 = {{2}};
-	auto c0 = unknown_type  {{3}};
-	auto d0 = func( {{3}}  );
-	auto e0 = func( unknown_type  {{3}}  );
-
-	int a1[][] = {{1}};
-	unknown_type b1 = {{2}};
-	auto c1 = unknown_type{{3}};
-	auto d1 = func({{3}});
-	auto e1 = func(unknown_type{{3}});
-
-	int a2[][] = {{1}};
-	unknown_type b2 = {{2}};
-	auto c2 = unknown_type{{3}};
-	auto d2 = func({{3}});
-	auto e2 = func(unknown_type{{3}});
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
deleted file mode 100644
index 7d3ae3a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int main()
-{
-	int a0[][] = { { 1  }};
-	unknown_type b0 = { { 2  }};
-	auto c0 = unknown_type  { { 3  }};
-	auto d0 = func( { { 3  }}  );
-	auto e0 = func( unknown_type  { { 3  }}  );
-
-	int a1[][] = { { 1}  };
-	unknown_type b1 = { { 2}  };
-	auto c1 = unknown_type{ { 3}  };
-	auto d1 = func({ { 3}  });
-	auto e1 = func(unknown_type{ { 3}  });
-
-	int a2[][] = { { 1}};
-	unknown_type b2 = { { 2}};
-	auto c2 = unknown_type{ { 3}};
-	auto d2 = func({ { 3}});
-	auto e2 = func(unknown_type{ { 3}});
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
deleted file mode 100644
index 92204813..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int main()
-{
-	int a0[][] = {{1  }};
-	unknown_type b0 = {{2  }};
-	auto c0 = unknown_type  {{3  }};
-	auto d0 = func( {{3  }}  );
-	auto e0 = func( unknown_type  {{3  }}  );
-
-	int a1[][] = {{1}  };
-	unknown_type b1 = {{2}  };
-	auto c1 = unknown_type{{3}  };
-	auto d1 = func({{3}  });
-	auto e1 = func(unknown_type{{3}  });
-
-	int a2[][] = {{1}};
-	unknown_type b2 = {{2}};
-	auto c2 = unknown_type{{3}};
-	auto d2 = func({{3}});
-	auto e2 = func(unknown_type{{3}});
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34296-i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34296-i1768.cpp
deleted file mode 100644
index 94327d9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34296-i1768.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void f(
-	int a, int b);
-
-void g()
-{
-	f(1, 2);
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34297-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34297-align-assign-mixed.cpp
deleted file mode 100644
index d8082600..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34297-align-assign-mixed.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class X16
-{
-X16()                        = delete;
-public:
-void z(int x                 = 0);
-virtual void f(int x, int y) = 0;
-int hhi = 9;
-void g(int x                 = 0);
-int i   = 9;
-void x(int ggs               = 0);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34298-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34298-align-assign-mixed.cpp
deleted file mode 100644
index 4f8dadde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34298-align-assign-mixed.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class X16
-{
-X16()                        = delete;
-public:
-void z(int x   = 0);
-virtual void f(int x, int y) = 0;
-int hhi = 9;
-void g(int x   = 0);
-int i   = 9;
-void x(int ggs = 0);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34299-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34299-align-assign-mixed.cpp
deleted file mode 100644
index ddae789b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34299-align-assign-mixed.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class X16
-{
-X16() = delete;
-public:
-void z(int x = 0);
-virtual void f(int x, int y) = 0;
-int hhi = 9;
-void g(int x = 0);
-int i   = 9;
-void x(int ggs = 0);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34300-bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34300-bug_1236.cpp
deleted file mode 100644
index 8acaaed2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34300-bug_1236.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo()
-{
-    int head, bar;
-    __asm__ __volatile__
-    (
-        "movq %0,%%xmm0\n\t"    /* asm template */
-    "0:\n\t"
-        "bar\t%0, [%4]\n\t" // in template
-    "1:\n\t"
-        : "=a", (bar)
-        : "=&b", (&head), "+m", (bar)
-        : "cc"
-    );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
deleted file mode 100644
index 05aaf7c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-void f()
-{
-}
-void f()
-{
-}
-
-void f()const
-{
-}
-void f()const
-{
-}
-
-void f()noexcept()
-{
-}
-void f()noexcept()
-{
-}
-
-void f()/**/
-{
-}
-void f()/**/
-{
-}
-void f()//
-{
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
deleted file mode 100644
index 8a35c775..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-void f(){
-}
-void f(){
-}
-
-void f()const {
-}
-void f()const {
-}
-
-void f()noexcept(){
-}
-void f()noexcept(){
-}
-
-void f() {/**/
-}
-void f(){/**/
-}
-void f(){//
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
deleted file mode 100644
index e498a669..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-void f(){
-}
-void f(){
-}
-
-void f()const
-{
-}
-void f()const
-{
-}
-
-void f()noexcept()
-{
-}
-void f()noexcept()
-{
-}
-
-void f() {/**/
-}
-void f(){/**/
-}
-void f(){//
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
deleted file mode 100644
index 078e070a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-void f()
-{
-}
-void f()
-{
-}
-
-void f()const {
-}
-void f()const {
-}
-
-void f()noexcept(){
-}
-void f()noexcept(){
-}
-
-void f()/**/
-{
-}
-void f()/**/
-{
-}
-void f()//
-{
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34305-issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34305-issue_2124-1.cpp
deleted file mode 100644
index bad0ea55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34305-issue_2124-1.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-if(x) [[likely]] {}
-if(x)
-[[unlikely]]
-{}
-
-g();
-
-if(x) [[likely]] l();
-if(x)
-[[unlikely]]
-	l();
-
-g();
-
-if(x)
-[[unlikely]]
-	l1();
-else
-	l2();
-
-g();
-
-if(x)
-#if __has_cpp_attribute(likely)
-[[likely]]
-#endif
-	return false;
-else
-	return true;
-
-g();
-
-while(true) [[likely]] {break;}
-while(true)
-[[unlikely]]
-{break;}
-
-g();
-
-if(x)
-[[likely]]
-{
-	if(y)
-	[[likely]]
-	{}
-}
-
-g();
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34306-issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34306-issue_2124-2.cpp
deleted file mode 100644
index bad0ea55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34306-issue_2124-2.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-if(x) [[likely]] {}
-if(x)
-[[unlikely]]
-{}
-
-g();
-
-if(x) [[likely]] l();
-if(x)
-[[unlikely]]
-	l();
-
-g();
-
-if(x)
-[[unlikely]]
-	l1();
-else
-	l2();
-
-g();
-
-if(x)
-#if __has_cpp_attribute(likely)
-[[likely]]
-#endif
-	return false;
-else
-	return true;
-
-g();
-
-while(true) [[likely]] {break;}
-while(true)
-[[unlikely]]
-{break;}
-
-g();
-
-if(x)
-[[likely]]
-{
-	if(y)
-	[[likely]]
-	{}
-}
-
-g();
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34307-2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34307-2203.cpp
deleted file mode 100644
index 70a1f31a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34307-2203.cpp
+++ /dev/null
@@ -1 +0,0 @@
-using Foo = std::function<void(const bool)>;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34308-enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
deleted file mode 100644
index 736e6718..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-enum class Eee
-{
-    Foo,
-    AnotherFoo, // comment
-    Bar,
-    DifferentBar
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34309-issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34309-issue_2209-1.cpp
deleted file mode 100644
index 82ff67c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34309-issue_2209-1.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace
-{
-
-void g(int a1234567890123456, int b1234567890123456,
-       int c1234567890123456)
-{
-}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34310-issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34310-issue_2209-2.cpp
deleted file mode 100644
index 26c579d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34310-issue_2209-2.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace
-{
-
-int f = 0;
-
-}
-
-void g(int a1234567890123456, int b1234567890123456,
-       int c1234567890123456)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34311-Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34311-Issue_2250.cpp
deleted file mode 100644
index 9268c2e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34311-Issue_2250.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-SettingsDelta::SettingsDelta(
-      const LastEffectiveContextData& lastEffCtxData)
-   : Member2(lastEffCtxData.member2())
-   , Member3(lastEffCtxData.member3().c_str())
-   , Functor([this](const int& num) { Callback(num); })
-   , Member4(lastEffCtxData.member4().c_str())
-   , Member5(lastEffCtxData.member5())
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34312-Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34312-Issue_2101.cpp
deleted file mode 100644
index 3e07c686..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34312-Issue_2101.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void Test()
-{
-    aaaaaa = condition ? FunctionWithVeryLongName( andWithVeryLongArgumentsToo1, andWithVeryLongArgumentsToo2 )
-                       : FunctionWithVeryLongName( andWithVeryLongArgumentsToo2, andWithVeryLongArgumentsToo1 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34313-Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34313-Issue_2437.cpp
deleted file mode 100644
index 77a273ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34313-Issue_2437.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void timer_cb1(struct timer_node *n);
-typedef void timer_cb (struct timer_node *n);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34314-Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34314-Issue_2604.cpp
deleted file mode 100644
index eb87fc8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34314-Issue_2604.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void funcPROTO( int parameter1, int parameter2, int parameter3, int parameter4, int parameter5, int parameter6, int parameter7);
-
-void funcDEF( int parameter1, int parameter2, int parameter3, int parameter4, int parameter5, int parameter6, int parameter7)
-{
-	funcCALL( parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
deleted file mode 100644
index c4f1a119..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-class AlignFuncProtoTest {
-public:
-void                                                test1();
-void                                                test2();
-SomeLongType                                        findSomeLongType();
-void*                                               test3();
-void test4(){
-	a=1;
-}
-double                                              test5();
-void                                                test6();
-SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType();
-void                                                test7();
-void                                                test8();
-void                                                test9();
-SomeLongNamespace::SomeLongType long_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
deleted file mode 100644
index 1bbde49b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-class AlignFuncProtoTest {
-public:
-void         test1();
-void         test2();
-SomeLongType findSomeLongType();
-void*        test3();
-void test4(){
-	a=1;
-}
-double       test5();
-void         test6();
-SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType();
-void         test7();
-void         test8();
-void         test9();
-SomeLongNamespace::SomeLongType long_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
deleted file mode 100644
index e0d3488a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-class AlignFuncProtoTest {
-public:
-void  test1();
-void  test2();
-SomeLongType findSomeLongType();
-void* test3();
-void test4(){
-	a=1;
-}
-double test5();
-void   test6();
-SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType();
-void   test7();
-void   test8();
-void   test9();
-SomeLongNamespace::SomeLongType long_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34318-align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
deleted file mode 100644
index 1c003058..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-const int *ptr const = 0;

-virtual void f1()       = 0;

-virtual void f2()       = 0;

-virtual void f3() const = 0;

-virtual void f4() const = 0;

-virtual void f5()       = 0;

-virtual void f6()       = 0;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
deleted file mode 100644
index 8a9df8b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-class AlignFuncProtoTest {
-public:
-virtual void                                                                             test1(std::wstring & name, std::pair<Space1::Space2::SomeType, Space1::Space2::otherType> param1) = 0;
-virtual SomeLongType                                                                     findSomeLongType()                                                                                = 0;
-virtual Some::Type                                                                       test2()                                                                                           = 0;
-virtual SomeNameSpace::TypeA                                                             test3()                                                                                           = 0;
-virtual SomeNameSpace::SubNameSpace1::TypeA                                              test4()                                                                                           = 0;
-virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::TypeB                               test5()                                                                                           = 0;
-virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::TypeC                test6()                                                                                           = 0;
-virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::TypeD test7()                                                                                           = 0;
-double test5();
-void   test6();
-SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType();
-void   test7();
-void   test8();
-void   test9();
-SomeLongNamespace::SomeLongType long_var;
-SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::SubNameSpace5::TypeE test7();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
deleted file mode 100644
index 432a9e3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-class AlignFuncProtoTest {
-public:
-virtual void         test1(std::wstring & name, std::pair<Space1::Space2::SomeType, Space1::Space2::otherType> param1) = 0;
-virtual SomeLongType findSomeLongType()                                                                                = 0;
-virtual Some::Type   test2()                                                                                           = 0;
-virtual SomeNameSpace::TypeA                test3()                                                                    = 0;
-virtual SomeNameSpace::SubNameSpace1::TypeA test4()                                                                    = 0;
-virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::TypeB                test5()                                      = 0;
-virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::TypeC test6()                                      = 0;
-virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::TypeD test7()                       = 0;
-double test5();
-void   test6();
-SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType();
-void   test7();
-void   test8();
-void   test9();
-SomeLongNamespace::SomeLongType long_var;
-SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::SubNameSpace5::TypeE test7();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34321-bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34321-bug_2285.cpp
deleted file mode 100644
index a456e9be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34321-bug_2285.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-class __attribute__ ((visibility ("default"))) Test
-{
-public:
-Test() :
-    member1(),
-    member2()
-{
-}
-
-private:
-int member1;
-int member2;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34322-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34322-issue_2623.cpp
deleted file mode 100644
index a9566447..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34322-issue_2623.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-void child() {
-	static_cast<id<Mountable>> ( object);
-}
-
-assert(x<0 && y>=3);
-assert(y <0&&z> 2);
-assert(a>>1);
-
-std::unique_ptr<Interface<T>> GetProjectionAdapter(const std::string& model_name);
-
-auto c = a< b>>c;
-auto c = a << b >>c;
-
-if (Something<a> == c) {
-}
-
-if (id<Something<a>> == c) {
-}
-
-const std::vector<Eigen::Matrix<T, A, B>> & P_c;
-
-const unsigned int wl = w>> lvl;
-
-using Poly = Model<P, Poly<Dx,Dy, Dz>>;
-
-void Compute(
-	Image<E::Matrix<SType, Dim,Int>> const& src,
-	Image<E::Matrix<TType,Dim, std::string>>& dst);
-
-Opt<std::vector <std::unordered_set<FrameId>>> partition;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34323-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34323-issue_2623.cpp
deleted file mode 100644
index 72fd90e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34323-issue_2623.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-void child() {
-	static_cast< id< Mountable > > ( object);
-}
-
-assert(x<0 && y>=3);
-assert(y <0&&z> 2);
-assert(a>>1);
-
-std::unique_ptr< Interface< T > > GetProjectionAdapter(const std::string& model_name);
-
-auto c = a< b>>c;
-auto c = a << b >>c;
-
-if (Something< a > == c) {
-}
-
-if (id< Something< a > > == c) {
-}
-
-const std::vector< Eigen::Matrix< T, A, B > > & P_c;
-
-const unsigned int wl = w>> lvl;
-
-using Poly = Model< P, Poly< Dx,Dy, Dz > >;
-
-void Compute(
-	Image< E::Matrix< SType, Dim,Int > > const& src,
-	Image< E::Matrix< TType,Dim, std::string > >& dst);
-
-Opt< std::vector < std::unordered_set< FrameId > > > partition;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34324-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34324-issue_2623.cpp
deleted file mode 100644
index 61961fa1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34324-issue_2623.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-void child() {
-	static_cast< id<Mountable >> ( object);
-}
-
-assert(x<0 && y>=3);
-assert(y <0&&z> 2);
-assert(a>>1);
-
-std::unique_ptr<Interface< T >> GetProjectionAdapter(const std::string& model_name);
-
-auto c = a< b>>c;
-auto c = a << b >>c;
-
-if (Something<a> == c) {
-}
-
-if (id< Something<a >> == c) {
-}
-
-const std::vector< Eigen::Matrix<T, A, B >> & P_c;
-
-const unsigned int wl = w>> lvl;
-
-using Poly = Model<P, Poly<Dx,Dy, Dz>>;
-
-void Compute(
-	Image<E::Matrix< SType, Dim,Int >> const& src,
-	Image< E::Matrix<  TType,Dim, std::string> >& dst);
-
-Opt<std::vector < std::unordered_set<FrameId> >> partition;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34325-Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34325-Issue_3025.cpp
deleted file mode 100644
index 9e64526e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34325-Issue_3025.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-int a;// Рука
-int d;/* Рука */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34326-Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34326-Issue_3040.cpp
deleted file mode 100644
index f9e69333..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34326-Issue_3040.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-int main()
-{
-  switch (opcode)
-  {
-    case 1:
-    {
-      return Number(localeCompare(s, a0.toString(exec)));
-    }
-
-#ifndef A
-    case 2:
-    {
-      result = String("<big>" + s + "</big>");
-      break;
-    }
-#endif
-  }
-
-  switch (ev->command)
-  {
-    case (3):
-    {
-      ev->note = *ptrdata; ptrdata++; currentpos++;
-      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-      if (ev->vel==0)
-	note[ev->chn][ev->note]=FALSE;
-      else
-	note[ev->chn][ev->note]=TRUE;
-
-#ifdef B
-      if (ev->chn==6) {
-	if (ev->vel==0) printfdebug("Note Onf\n");
-	else printfdebug("Note On\n");
-      };
-#endif
-      break;
-    }
-
-    case (4):
-    {
-#ifdef C
-      if (ev->chn==6) printfdebug("Note Off\n");
-#endif
-      ev->note = *ptrdata; ptrdata++; currentpos++;
-      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-      note[ev->chn][ev->note]=FALSE;
-
-      break;
-    }
-
-    case (5):
-    {
-#ifdef D
-      if (ev->chn==6) printfdebug ("Key press\n");
-#endif
-      ev->note = *ptrdata; ptrdata++; currentpos++;
-      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-      break;
-    }
-
-#ifndef E
-    case 6:
-    {
-      result = String("<big>" + s + "</big>");
-      break;
-    }
-#endif
-  }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34327-Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34327-Issue_3044.cpp
deleted file mode 100644
index 799fd0a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34327-Issue_3044.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-int main()
-{
-	int af;
-	int A;
-	int B;
-	switch (af)
-	{
-		case 1:
-		{
-			B = 2;
-		}
-
-		case 2:
-		{
-			return 1;
-		}
-
-		case 3:
-		{
-			A = 1;
-			break;
-		}
-
-#ifdef ALL_THE_CASE
-		case 4:
-		{
-			return 2;
-		}
-
-#endif
-#ifdef ALL_THE_CASE
-		case 5:
-		{
-			B = 2;
-		}
-
-#endif
-		case (6):
-		{
-			B=13;
-#ifdef PART_OF_THE_CASE_UNDER
-			A=1;
-#endif
-			break;
-		}
-
-		case (7):
-		{
-#ifdef PART_OF_THE_CASE_ABOVE
-			A=5;
-#endif
-			B=7;
-			break;
-		}
-
-		default:
-		{
-			B= 50;
-		}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34328-Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34328-Issue_3048.cpp
deleted file mode 100644
index fb6b0d38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34328-Issue_3048.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-int main()
-{
-	int sa_family;
-	int d;
-	int scopeid;
-	switch (sa_family)
-	{
-		case 1:
-		{
-#ifdef AF_INET6
-			if (d == 1)
-			{
-				scopeid = 1;
-			}
-			else
-			{
-				scopeid = 2;
-			}
-			return 5;
-#else
-			return 6;
-#endif
-		}
-
-		case 2:
-		{
-#ifdef AF_INET6
-			TQString scopeid("%");
-			if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
-			{
-				scopeid += TQString::number(d->addr.in6->sin6_scope_id);
-			}
-			else
-			{
-				scopeid.truncate(0);
-			}
-			return d->ref.ipAddress().toString() + scopeid;
-#endif
-		}
-
-		case 3:
-		{
-#ifdef AF_INET6
-			TQString scopeid("%");
-			if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
-			{
-				scopeid += TQString::number(d->addr.in6->sin6_scope_id);
-			}
-			else
-			{
-				scopeid.truncate(0);
-			}
-			return d->ref.ipAddress().toString() + scopeid;
-#endif
-		}
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
deleted file mode 100644
index d46f2655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
deleted file mode 100644
index d46f2655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
deleted file mode 100644
index d46f2655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
deleted file mode 100644
index ef73253e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
deleted file mode 100644
index ef73253e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
deleted file mode 100644
index ef73253e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
deleted file mode 100644
index c228ce46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
deleted file mode 100644
index c228ce46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
deleted file mode 100644
index c228ce46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
deleted file mode 100644
index 7188f0d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
deleted file mode 100644
index 7188f0d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
deleted file mode 100644
index 7188f0d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-DCOPClient::DCOPClient()
-{
-    TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
-        TQT_SLOT(
-            processPostedMessagesInternal()));
-    TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
-            eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
deleted file mode 100644
index 0e475aa4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <string>
-
-extern char* externBufferWithAVeryLongName;
-extern unsigned int externBufferSizeWithLongName;
-
-std::string foo{ externBufferWithAVeryLongName
-               , externBufferSizeWithLongName };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
deleted file mode 100644
index 59b5b996..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <string>
-
-extern char* externBufferWithAVeryLongName;
-extern unsigned int externBufferSizeWithLongName;
-
-std::string foo()
-{
-    return std::string{ externBufferWithAVeryLongName
-                      , externBufferSizeWithLongName };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39000-UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39000-UNI-64325.cpp
deleted file mode 100644
index c4005d7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39000-UNI-64325.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-class function_ref
-{
-public:
-    template<typename CallableT>
-    function_ref(CallableT &&t) noexcept
-        : m_Ptr((void *)std::addressof(t))
-        , m_ErasedFn([](void *ptr, Args... args) -> ReturnValue
-        {
-            // Type erasure lambda: cast ptr back to original type and dispatch the call
-            return (*reinterpret_cast<std::add_pointer_t<CallableT>>(ptr))(std::forward<Args>(args)...);
-        })
-    {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39001-GH-2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39001-GH-2091.cpp
deleted file mode 100644
index 6e32d683..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39001-GH-2091.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <AClass.h>
-#include <SomeClass.h>
-#include <TheClass.h>
-#include <iostream>
-#include <vector>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60001-UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60001-UNI-2650.cpp
deleted file mode 100644
index b9ced773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60001-UNI-2650.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-MergeJSFiles(new string[] {
-    GetDecompressor(),
-    Paths.Combine(buildToolsDir, "UnityConfig"),
-    Paths.Combine(args.stagingAreaData, kOutputFileLoaderFileName),
-}, unityLoader
-);
-
-
-throw new System.Exception(
-    "'Fast Rebuild' option requires prebuilt JavaScript version of Unity engine. The following files are missing: "
-    + (!File.Exists(UnityNativeJs) ? "\n" + UnityNativeJs : "")
-    + (!File.Exists(UnityNativeJs + ".mem") ? "\n" + UnityNativeJs + ".mem" : "")
-);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60002-UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60002-UNI-16283.cpp
deleted file mode 100644
index 7f042642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60002-UNI-16283.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// It is deleting the space after the pointer marker
-void foo()
-{
-    extern void BillboardRenderer_RenderMultiple(const RenderBatchedData& renderData, ShaderChannelMask channels);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60003-UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60003-UNI-1288.cpp
deleted file mode 100644
index aece270a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60003-UNI-1288.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-if (Application.platform == RuntimePlatform.LinuxEditor)
-{
-    return new ProcessStartInfo("smthg")
-    {
-        Arguments = string.Format("-9 --ss -S aa \"{0}\"", file),
-        WorkingDirectory = Directory.GetCurrentDirectory(),
-        UseShellExecute = false,
-        CreateNoWindow = true
-    };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60006-UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60006-UNI-2049.cpp
deleted file mode 100644
index 4609fbea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60006-UNI-2049.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Pointer mark should be formatted (WINAPI* SetXX)
-typedef DWORD (WINAPI* SetDllDirectory)(LPCSTR);
-// Pointer mark should be formatted (EXCEPTION_POINTERS* pExt)
-static LONG WINAPI CustomUnhandledExceptionFilter(EXCEPTION_POINTERS* pExInfo)
-{
-    if (EXCEPTION_BREAKPOINT == pExInfo->ExceptionRecord->ExceptionCode) // Breakpoint. Don't treat this as a normal crash.
-        return EXCEPTION_CONTINUE_SEARCH;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60017-UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60017-UNI-2683.cpp
deleted file mode 100644
index 734e3999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60017-UNI-2683.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// It shouldn't add a space after Unity::Type
-static Object* Produce(const Unity::Type* type, InstanceID instanceID = InstanceID_None, MemLabelId = kMemBaseObject, ObjectCreationMode mode = kCreateObjectDefault);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60022-UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60022-UNI-18439.cpp
deleted file mode 100644
index 8d467c67..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60022-UNI-18439.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-floatNx3 randomRotationMatrices[3];
-if (rotationRandomnessX > epsilon() || rotationRandomnessY > epsilon())
-{
-// Parameters are being double indented.
-    floatNx3 rotationEuler = floatNx3(
-        (GenerateRandom(randomSeed + intN(kParticleSystemExternalForcesRotationRandomnessXId)) * 2 - 1) * rotationRandomnessX,
-        (GenerateRandom(randomSeed + intN(kParticleSystemExternalForcesRotationRandomnessYId)) * 2 - 1) * rotationRandomnessY,
-        floatN(ZERO));
-    eulerToMatrix(rotationEuler, randomRotationMatrices);
-
-    toForce = mul(randomRotationMatrices, toForce);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60025-UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60025-UNI-19894.cpp
deleted file mode 100644
index 2d7e481e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60025-UNI-19894.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//It is applying double indentation
-m_ApplicationView = AppC::ApplicationView::GetForCurrentView();
-m_ViewConsolidateEvtToken = m_ApplicationView->Consolidated +=
-    ref new AppC::TypedEventHandler<AppC::ApplicationView^, AppC::ApplicationViewConsolidatedEventArgs^>(this, &FrameworkView::InternalOnViewConsolidated);
-
-m_WindowActivatedEvtToken = m_CoreWindow->Activated +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::WindowActivatedEventArgs^>(this, &FrameworkView::InternalOnWindowActivated);
-
-m_SizeChangedEvtToken = m_CoreWindow->SizeChanged +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::WindowSizeChangedEventArgs^>(this, &FrameworkView::InternalOnWindowSizeChanged);
-
-m_VisibilityChangedEvtToken = m_CoreWindow->VisibilityChanged +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::VisibilityChangedEventArgs^>(this, &FrameworkView::InternalOnWindowVisibilityChanged);
-
-m_WindowClosedEvtToken = m_CoreWindow->Closed +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::CoreWindowEventArgs^>(this, &FrameworkView::InternalOnWindowClosed);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60027-UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60027-UNI-21506.cpp
deleted file mode 100644
index a8c5f2df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60027-UNI-21506.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-struct bar

-{

-    void (Namespace::*method)(Class& param);

-};

-

-void Class::Foo(void (*callback)(const Class& entry))

-{

-}

-

-void foo()

-{

-    int a = 1;  // if you comment this out, the bug stops reproducing

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60028-UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60028-UNI-21509.cpp
deleted file mode 100644
index bde48ee7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60028-UNI-21509.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void (*foo)(int);

-static bar(void (*foo)(int))

-{

-}

-

-bool (*comp_func)(const TypeA*const a, const TypeB& value) = NULL;

-static foo(bool (*comp_func)(const TypeA*const a, const TypeB& value));

-static foo(bool (*comp_func)(const TypeA*const a, const TypeB& value) = NULL)

-{

-}

-

-void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const TypeA* lhs, const TypeB& rhs));

-void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const TypeA* lhs, const TypeB& rhs) = NULL)

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60029-UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60029-UNI-21510.cpp
deleted file mode 100644
index ea406fbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60029-UNI-21510.cpp
+++ /dev/null
@@ -1 +0,0 @@
-typedef std::pair<Type* const, TypeB> Object;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60030-UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60030-UNI-21727.cpp
deleted file mode 100644
index 991d2631..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60030-UNI-21727.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void foo()

-{

-    int error = 0;

-#if defined(SUPPORT_FEATURE)

-    error = feature_bar();

-#else // feature not supported

-    // we call bar otherwise

-    error = bar();

-#endif // SUPPORT_FEATURE

-    // continue with function logic

-    if (error != 0)

-    {

-#if 0 // TODO: this is disabled

-        // call final bar

-        error_bar(error);

-#endif

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60031-UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60031-UNI-21728.cpp
deleted file mode 100644
index 658fba68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60031-UNI-21728.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend std::ostream& operator<<(std::ostream& os, const ScriptingObjectPtr& o);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60032-UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60032-UNI-21729.cpp
deleted file mode 100644
index 4b8d1d59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60032-UNI-21729.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-extern "C" void __declspec(dllexport) GetAccountNameAndDomain(HWND /*hwndParent*/, int string_size, TCHAR * variables, stack_t** stacktop, extra_parameters* /*extra*/)

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60036-UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60036-UNI-2680.cpp
deleted file mode 100644
index b6aa5bd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60036-UNI-2680.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-A(B(C(
-    D(a |
-        b | c))));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60038-UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60038-UNI-30088.cpp
deleted file mode 100644
index 1fd5c1fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60038-UNI-30088.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void Foo(int value)

-{

-    m_Foo[0].prop

-        = m_Foo[1].prop

-            = m_Foo[2].prop

-                = m_Foo[3].prop

-                    = m_Foo[4].prop

-                        = m_Foo[5].prop = value;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60039-UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60039-UNI-30628.cpp
deleted file mode 100644
index ffa60026..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60039-UNI-30628.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Regression 1 FAKE_METHOD expands to a function prototype. Could possibly use PROTO_WRAP like for FAKE_FUNCTION

-class Foo

-{

-    FAKE_FUNCTION(Bar, GetBarInfo, const BarInfo &());

-    FAKE_METHOD(Bar, GetBarInfo, const BarInfo &());

-    FAKE_FUNCTION_WITH_LOCAL_NAME(FakeGetCommonScriptingClasses, GetCommonScriptingClasses, const CommonScriptingClasses &());

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60042-UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60042-UNI-18777.cpp
deleted file mode 100644
index 0f177fdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60042-UNI-18777.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// I want to keeep the function call indented
-Thingy
-    .Select()
-    .ToList();
-
-// it works with a var
-var x = Thingy
-    .Select()
-    .ToList();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60043-i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60043-i2033.cpp
deleted file mode 100644
index fd27cf6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60043-i2033.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-/* *INDENT-OFF* */
-enum E_SUNSENSOR {
-    EXAMPLE1,
-    EXAMPLE2,
-    SN005
-};
-/* *INDENT-ON* */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60044-i2116.cpp
deleted file mode 100644
index af664cd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60044-i2116.cpp
+++ /dev/null
@@ -1 +0,0 @@
-void f(){}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
deleted file mode 100644
index 364b2a6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define MEM_ASSERT1(x) if (!(x)) *(volatile int *)0 = 1
-#define MEM_ASSERT2(x) if (!(x)) *(volatile int *)0 = 1
-#define MEM_ASSERT3(x) if (!(x)) *(volatile int *)0 = 1;
-#define MEM_ASSERT4(x) if (!(x)) *(volatile int *)0 = 1;
-#define MEM_ASSERT5(x) if (!(x)) { *(volatile int *)0 = 1; }
-#define MEM_ASSERT6(x) if (!(x)) { *(volatile int *)0 = 1; }
-
-#define FOO1(x) while (!(x)) { *(volatile int *)0 = 1; }
-#define FOO2(x) while (!(x)) *(volatile int *)0 = 1;
-#define FOO3(x) { *(volatile int *)0 = 1; }
-#define FOO4(x) *(volatile int *)0 = 1;
-#define FOO5(x) for(;;) (!(x)) { *(volatile int *)0 = 1; }
-#define FOO6(x) for(;;) (!(x)) *(volatile int *)0 = 1;
-#define FOO7(x) do { *(volatile int *)0 = 1; } while (false);
-
-void foo1(int x) {
-    if (!(x)) *(volatile int *)0 = 1;
-}
-
-void foo2(int x) {
-    if (!(x)) *(volatile int *)0 = 1;
-}
-
-void foo3(int x) {
-    if (!(x)) { *(volatile int *)0 = 1; }
-}
-
-void foo4(int x) {
-    if (!(x)) { *(volatile int *)0 = 1; }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
deleted file mode 100644
index c0c066b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-std::string foo(struct tm* local) {
-    std::stringstream timestamp;
-    timestamp <<
-        (local->tm_year + 1900) << "." <<
-        (local->tm_mon + 1) << "." <<
-        local->tm_mday << "-" <<
-        local->tm_hour << "." <<
-        local->tm_min << "." <<
-        local->tm_sec;
-    return timestamp.str();
-}
-
-std::string foo2(struct tm* local) {
-    std::stringstream timestamp;
-    int year = local->tm_year + 1900;
-    int mon = local->tm_mon + 1;
-    timestamp <<
-        year << "." <<
-        mon << "." <<
-        local->tm_mday << "-" <<
-        local->tm_hour << "." <<
-        local->tm_min << "." <<
-        local->tm_sec;
-    return timestamp.str();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60047-align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60047-align_default_after_override.cpp
deleted file mode 100644
index 43db090f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60047-align_default_after_override.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-class B
-{
-public:
-B()          = default;
-virtual ~B() = default;
-};
-
-class D1 : public B
-{
-public:
-D1()                      = default;
-~D1()                     = default;
-D1(const D1&)             = delete;
-D1(D1&&)                  = delete;
-D1& operator=(const D1&)  = delete;
-D1& operator=(const D1&&) = delete;
-};
-
-class D2 : public B
-{
-public:
-D2()                     = default;
-~D2() override           = default;
-D2(const D2&)            = delete;
-D2(D2&&)                 = delete;
-D2& operator=(const D2&) = delete;
-D2& operator=(D2&&)      = delete;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60048-bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60048-bug_2322.cpp
deleted file mode 100644
index 50454903..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60048-bug_2322.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void main()
-{
-    if (foo()) bar();
-    else if (baz({ rick, morty })) anime();
-    else if (a) while (true) amime2();
-    else if (b) do amime3(); while (false);
-    else if (c) for(;;) amime5();
-    else if (d) while(true) {}
-    else if (e) do {} while (false);
-    else if (f) for(;;) {}
-    else amime6();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60049-bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60049-bug_2402.cpp
deleted file mode 100644
index e483fdc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60049-bug_2402.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void
-h1(const int a)
-{
-	switch (a)
-	{
-	case 1: {
-		callFunction(a); break;
-	}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp
deleted file mode 100644
index a344480b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-std::string StrGet()
-{
-	return IsConnected() ? "Connected" : {};
-}
-
-std::string StrGet2()
-{
-	return !IsConnected() ? {} : "Connected";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60051-bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60051-bug_2371.cpp
deleted file mode 100644
index f17cec62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60051-bug_2371.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-class CMyClass
-{
-	CMyClass( int a = 0, int b = 0 );
-};
-
-class CMyClass2
-{
-	CMyClass2( int a = 0, int b = 0 );
-	CMyClass2( int a = 0 );
-};
-
-class CMyClass3
-{
-	CMyClass3( int a, int b = 0 );
-	CMyClass3( int a        = 0 );
-};
-
-class CMyClass4
-{
-	CMyClass4( int a    = 0, int b    = 0 );
-	CMyClass4( short aa = 0, char * p = 0 );
-};
-
-class CMyClass5
-{
-	CMyClass5()         = default;
-	CMyClass5( int a    = 0, int b    = 0 );
-	CMyClass5( short aa = 0, char * p = 0 );
-};
-
-class CMyClass6
-{
-	CMyClass6( const CMyClass6& ) = default;
-	CMyClass6( int a              = 0, int b    = 0 );
-	CMyClass6( short aa           = 0, char * p = 0 );
-};
-
-class CMyClass7
-{
-	virtual void foo( const void* p = nullptr )   = 0;
-	CMyClass7( int a                = 0, int b    = 0 );
-	CMyClass7( short aa             = 0, char * p = 0 );
-};
-
-class CMyClass8
-{
-	CMyClass8( int a                = 0, int b    = 0 );
-	CMyClass8( short aa             = 0, char * p = 0 );
-	virtual void foo( const void* p = nullptr )   = 0;
-};
-
-class CMyClass9
-{
-	CMyClass9( int a              = 0, int b    = 0 );
-	CMyClass9( short aa           = 0, char * p = 0 );
-	virtual void foo( const void* = nullptr )   = 0;
-};
-
-class CMyClassA
-{
-	CMyClassA( int a                      = 0, int b    = 0 );
-	CMyClassA( short aa                   = 0, char * p = 0 );
-	virtual void foo( const void* /* p */ = nullptr )   = 0;
-};
-
-class CMyClassB
-{
-	CMyClassB( int a                      = 0, int b    = 0 );
-	CMyClassB( short aa                   = 0, char * p = 0 );
-	virtual void foo( const void* /* p */ = NULL )      = 0;
-};
-
-#define UNUSED(x)
-
-class CMyClassC
-{
-	CMyClassC( int a                        = 0, int b    = 0 );
-	CMyClassC( short aa                     = 0, char * p = 0 );
-	virtual void foo( const void* UNUSED(p) = NULL )      = 0;
-};
-
-class CMyClassD
-{
-	CMyClassD( int a                      = 0, int b    = 0 );
-	CMyClassD( short aa                   = 0, char * p = 0 );
-	virtual void foo( const std::string s = "" )        = 0;
-};
-
-class CMyClassE
-{
-	CMyClassE( int a                      = 0, int b        = 0 );
-	CMyClassE( short aa                   = 0, char * p     = 0 );
-	virtual void foo( const std::string s = std::string() ) = 0;
-};
-
-class CMyClassF
-{
-	CMyClassF( int a                   = 0, int b    = 0 );
-	CMyClassF( short aa                = 0, char * p = 0 );
-	virtual void foo( const CString& s = _T( "" ) )  = 0;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60052-bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60052-bug_2433_1.cpp
deleted file mode 100644
index d011d5a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60052-bug_2433_1.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace A {
-
-namespace S {
-
-class C
-{
-};
-
-}  // namespace S
-
-}  // namespace A
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60053-bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60053-bug_2433_2.cpp
deleted file mode 100644
index 600efc82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60053-bug_2433_2.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-void f();
-
-namespace A {
-
-void f2();
-
-namespace S {
-
-void f3();
-
-class C
-{
-};
-
-void f4();
-
-} // namespace S
-
-void f5();
-
-} // namespace A
-
-void f6();
-
-namespace E
-{
-
-void f7();
-
-class D
-{
-};
-
-;
-void f9();
-
-}
-
-;
-void f10();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
deleted file mode 100644
index ed92e698..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "sdkconfig.h"
-
-#include <fs/nvs_storage.hpp>
-#include <network/interface.hpp>
-
-extern "C" void app_main (void) {
-	fs::nvs_storage::initialize ();
-	network::interface::initialize ();
-}
-
-#include "sdkconfig.h"
-#include "esp_wifi.h"
-#include "network/interface.hpp"
-
-
-using namespace network;
-void interface::initialize () {
-	tcpip_adapter_init ();
-}
-
-// ----------------------------------------
-
-namespace A {
-class interface {
-public:
-interface() {
-}
-
-~interface() {
-}
-
-void foo() {
-}
-};
-}
-
-namespace B {
-class interface {
-public:
-interface();
-~interface();
-void foo();
-};
-
-inline interface::interface() {
-}
-inline interface::~interface() {
-}
-inline void interface::foo() {
-}
-}
-
-namespace C {
-class interface {
-public:
-interface();
-~interface();
-void foo();
-};
-
-interface::interface() {
-}
-interface::~interface() {
-}
-void interface::foo() {
-}
-}
-
-interface ::external_iterface;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60055-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60055-issue_3116.cpp
deleted file mode 100644
index 44ec3a5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60055-issue_3116.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// Singular with various newline formats
-auto f = [] -> void {
-    return;
-};
-
-auto f = [] -> void {
-    return;
-}();
-
-auto f = [] -> void
-{
-    return;
-}();
-
-auto f =
-    [] -> void {
-        return;
-    };
-
-auto f =
-    [] -> void
-    {
-        return;
-    };
-
-auto f
-    = [] -> void {
-        int i = 0;
-        return;
-    };
-
-auto f
-    = []
-    {
-        int i = 0;
-        return;
-    };
-
-// Nested lambda
-auto f = [] {
-    auto g = [] {
-        auto h = [] {
-            return;
-        };
-        return;
-    };
-    return;
-};
-
-auto f = [] {
-    auto g = []
-    {
-        auto h = [] {
-            return;
-        };
-        return;
-    };
-    return;
-};
-
-auto f = []
-{
-    auto g = [] {
-        auto h = []
-        {
-            return;
-        };
-        return;
-    };
-    return;
-};
-
-// Nested lambda within functions
-Func(
-    [] {
-        return;
-    },
-    [] {
-        return;
-    }
-);
-
-Func([] {
-        return;
-    },
-    [] {
-        return;
-    }
-);
-
-Func([] {
-        return;
-    },
-    [] {
-        return;
-    }
-)();
-
-Func([] {
-        return;
-    },
-    [] {
-        return;
-    })();
-
-Func([] {
-        return;
-    },
-    [] {
-        return;
-    });
-
-A(
-    B([] (const std::string &s) -> bool {
-        s = "hello";
-        return true;
-    }), 1
-);
-
-A(
-    B(
-        [] (const std::string &s) -> bool {
-            s = "hello";
-            return true;
-        }
-    ), 1
-);
-
-// Inside scope
-{
-    std::thread([](const char *c) {
-        std::cout << c << std::endl;
-    }).detach();
-
-    std::thread(
-        [](const char *c) {
-            std::cout << c << std::endl;
-        }
-    ).detach();
-
-    auto f = [&](int a) {
-        return b;
-    };
-
-    auto f = [&](int a)
-    {
-        return b;
-    };
-}
-
-Func(std::count_if(v.begin(), v.end(), [&](const auto &a) {
-    return a == 3;
-}));
-
-Func(
-    std::count_if(v.begin(), v.end(), [&](const auto &a)
-    {
-        return a == 3;
-    }));
-
-Func(
-    std::count_if(v.begin(), v.end(), [&](const auto &a) {
-        return a == 3;
-    }));
-
-Func(
-    std::count_if(v.begin(), v.end(), [&](const auto &a) {
-        return a == 3;
-    })
-);
-
-// Test case from issue #3116
-const auto compare = [] (const auto i, const auto j)
-{
-    return i >= j;
-};
-
-std::sort(
-    vector.begin(),
-    vector.end(),
-    [] (const auto i, const auto j)
-    {
-        return i >= j;
-    }
-);
-
-// Test case from issue #3116
-if(isWidgetOfCurrentRow)
-{
-    it = std::find_if(
-        reloaded.begin(),
-        reloaded.end(),
-        [&rowGuid](const auto& device)
-        {
-            return (device.thingGUID == rowGuid && !device.isWidget);
-        }
-    );
-}
-else
-{
-    it = std::find_if(
-        reloaded.begin(),
-        reloaded.end(),
-        [&rowGuid](const auto& device)
-        {
-            return device.thingGUID == rowGuid;
-        }
-    );
-}
-
-// Test case from issue 1296 and some variants
-obj->Func([&](int a)
-{
-    return b;
-});
-
-obj->Func([] -> int
-{
-    return b;
-});
-
-obj->Func([]
-    {
-        return b;
-    }
-);
-
-obj->Func(
-    Func([]
-    {
-        return b;
-    })
-);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60056-issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60056-issue_3116-2.cpp
deleted file mode 100644
index dded453c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60056-issue_3116-2.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-obj.AddObject(Object::UniqueName(), 10, [this] {
-    holder.Access([this](const auto &info) {
-        if (IsGood(info)) {
-            Add(info);
-        }
-    });
-});
-
-obj.AddObject(
-    Object::UniqueName(),
-    10,
-    [this] {
-        holder.Access([this](const auto &info) {
-            if (IsGood(info)) {
-                Add(info);
-            }
-        });
-    }
-);
-
-{
-    obj.AddObject(Object::UniqueName(), 10, [this] {
-        holder.Access([this](const auto &info) {
-            if (IsGood(info)) {
-                Add(info);
-            }
-        });
-    });
-
-    obj.AddObject(
-        Object::UniqueName(),
-        10,
-        [this] {
-            holder.Access([this](const auto &info) {
-                if (IsGood(info)) {
-                    Add(info);
-                }
-            });
-        }
-    );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/align-330.cpp
deleted file mode 100644
index 0ba91720..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/align-330.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-\
-#define CTOR(i, _) : \
- T(X()), \
-    y() \
-{ }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10000-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10000-simple.cs
deleted file mode 100644
index 36cedfa2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10000-simple.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-class X : Y {
-        bool Method (int argument_1, int argument_2)
-        {
-                #region something
-                int foo = 0;
-                #endregion
-
-                if (argument_1 == argument_2)
-                        throw new Exception (Locale.GetText ("They are equal!"));
-
-                if (argument_1 < argument_2) {
-                        if (argument_1 * 3 > 4)
-                                return true;
-                        else
-                                return false;
-                }
-
-//
-// This sample helps keep your sanity while using 8-spaces for tabs
-//
-                VeryLongIdentifierWhichTakesManyArguments (
-                        Argument1,
-                        Argument2, Argument3,
-                        NestedCallHere (
-                                MoreNested));
-        }
-
-        bool MyProperty {
-                get { return x; }
-
-                set { x = value; }
-        }
-
-        void AnotherMethod ()
-        {
-                Logger log = new Logger ();
-
-                log.foo.bar = 5;
-                log.narf.sweat = "cat";
-
-                if ((a + 5) != 4) {
-                }
-
-                while (blah) {
-                        if (a)
-                                continue;
-                        b++;
-                }
-        }
-}
-
-object lockA;
-object lockB;
-
-void Foo ()
-{
-        lock (lockA) {
-                lock (lockB) {
-                }
-        }
-}
-
-void Bar ()
-{
-        lock (lockB) {
-                lock (lockA) {
-                }
-        }
-}
-
-
-// class library
-class Blah {
-        Hashtable ht;
-        void Foo (int zzz, Entry blah)
-        {
-                lock (ht) {
-                        ht.Add (zzz, blah);
-                }
-        }
-
-        void Bar ()
-        {
-                lock (ht) {
-                        foreach (Entry e in ht)
-                                EachBar (e);
-                }
-        }
-
-        virtual void EachBar (Entry e)
-        {
-        }
-}
-
-// User
-class MyBlah {
-        byte[] box = new byte [6];
-
-        box [2] = 56;
-
-        void DoStuff ()
-        {
-                lock (this) {
-                        int i = GetNumber ();
-                        Entry e = GetEntry ();
-
-                        Foo (i, e);
-                }
-        }
-
-        override void EachBar (Entry e)
-        {
-                lock (this) {
-                        DoSomething (e);
-                }
-        }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10001-getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10001-getset.cs
deleted file mode 100644
index 756170b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10001-getset.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-public bool Enabled
-{
-        get
-        {
-                return enabled;
-        }
-}
-
-
-public bool Enabled
-{
-        get
-        {
-                return enabled;
-        }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10002-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10002-simple.cs
deleted file mode 100644
index f8344b26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10002-simple.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-class X : Y {
-   bool Method(int argument_1, int argument_2)
-   {
-      #region something
-      int foo = 0;
-      #endregion
-
-      if (argument_1 == argument_2)
-      {
-         throw new Exception(Locale.GetText("They are equal!"));
-      }
-
-      if (argument_1 < argument_2)
-      {
-         if (argument_1 * 3 > 4)
-         {
-            return(true);
-         }
-         else
-         {
-            return(false);
-         }
-      }
-
-//
-// This sample helps keep your sanity while using 8-spaces for tabs
-//
-      VeryLongIdentifierWhichTakesManyArguments(
-         Argument1,
-         Argument2, Argument3,
-         NestedCallHere(
-            MoreNested));
-   }
-
-   bool MyProperty {
-      get { return(x); }
-
-      set { x = value; }
-   }
-
-   void AnotherMethod()
-   {
-      Logger log = new Logger();
-
-      log.foo.bar    = 5;
-      log.narf.sweat = "cat";
-
-      if ((a + 5) != 4)
-      {
-      }
-
-      while (blah)
-      {
-         if (a)
-         {
-            continue;
-         }
-         b++;
-      }
-   }
-}
-
-object lockA;
-object lockB;
-
-void Foo()
-{
-   lock (lockA) {
-      lock (lockB) {
-      }
-   }
-}
-
-void Bar()
-{
-   lock (lockB) {
-      lock (lockA) {
-      }
-   }
-}
-
-
-// class library
-class Blah {
-   Hashtable ht;
-   void Foo(int zzz, Entry blah)
-   {
-      lock (ht) {
-         ht.Add(zzz, blah);
-      }
-   }
-
-   void Bar()
-   {
-      lock (ht) {
-         foreach (Entry e in ht)
-         {
-            EachBar(e);
-         }
-      }
-   }
-
-   virtual void EachBar(Entry e)
-   {
-   }
-}
-
-// User
-class MyBlah {
-   byte[] box = new byte[6];
-
-   box[2] = 56;
-
-   void DoStuff()
-   {
-      lock (this) {
-         int   i = GetNumber();
-         Entry e = GetEntry();
-
-         Foo(i, e);
-      }
-   }
-
-   override void EachBar(Entry e)
-   {
-      lock (this) {
-         DoSomething(e);
-      }
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10003-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10003-region.cs
deleted file mode 100644
index 2ada63e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10003-region.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-class X : Y {
-   int foo1;
-   #region something
-   int foo2 = 2;
-   #endregion
-   int foo()
-   {
-      #region something else
-      int foo3 = 3;
-      #region nested
-      int foo4 = 0;
-      #endregion
-      int foo5 = 0;
-      #endregion
-   }
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10010-var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10010-var-member.cs
deleted file mode 100644
index 0da0b9f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10010-var-member.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Foo.Man.Chu
-{
-/// <summary>
-/// Summary description for MainForm.
-/// </summary>
-public class MainForm : System.Windows.Forms.Form
-{
-   #region Initialize the private properties
-   private System.Windows.Forms.MenuItem    File;
-   private System.Windows.Forms.MenuItem    Exit;
-   private System.Windows.Forms.Label       label1;
-   private System.Windows.Forms.Label       label2;
-   private Properties                       Prop;
-   private About                            Abt;
-   public MainForm                          mainform;
-   private System.Windows.Forms.MenuItem    menuItem1;
-   private System.Windows.Forms.Timer       timer1;
-   private System.ComponentModel.IContainer components;
-   protected string                         strTitle;
-   #endregion
-}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10011-strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10011-strings.cs
deleted file mode 100644
index 6794e762..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10011-strings.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()
-{
-   string s1 = L"C:\\foo\\bar";
-   string s2 = S"C:\\foo\\bar";
-   string s3 = "This is a \"test\"";
-   string s4 = "C:\\";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10012-621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10012-621_this-spacing.cs
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10012-621_this-spacing.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-result = (Foo)this;

-result = (Foo)foo;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-620_getset-brace.cs
deleted file mode 100644
index d4652c5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-620_getset-brace.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-class C

-{

-	float V

-	{

-		get

-		{

-			return _v;

-		}

-		set { _v = value; } }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-625_where-constraints.cs
deleted file mode 100644
index 123109b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-625_where-constraints.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-interface D { } interface E { }

-

-class C<T1, T2, TX, T3, T4, T5>

-	: IDisposable, IEnumerable<T1>

-	where T1 : class, D, E, new()

-	where T2 : IDictionary<D, Dictionary<string, float>>

-	where TX : struct, IDisposable

-	where T3 : class

-	where T4 : D where T5 : E

-{

-	void F<T3, T4, T5, TX, T6>()  where T3 : D, new()

-	    where T4 : D

-	    where T5 : D

-	    where TX : new()

-	    where T6 : D

-	{

-	}

-

-	class C2<T1, T2, TX, T3, T4, T5>

-		: IDisposable, IEnumerable<T1>

-		where T1 : class, D, E, new()

-		where T2 : IDictionary<D, Dictionary<string, float>>

-		where TX : struct, IDisposable

-		where T3 : class

-		where T4 : D where T5 : E

-	{

-		void F2<T3, T4, T5, TX, T6>()

-		    where T3 : D, new()

-		    where T4 : D

-		    where T5 : D

-		    where TX : new()

-		    where T6 : D

-		{

-		}

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
deleted file mode 100644
index 2e6d5a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-var dude = "Dude";

-var dude2 = new { Name = "Dude", Age = 30, };

-var dude3 = new { Name = "Dude", Age = 30, Kids = new { Name = "LittleDude" } };

-var dude4 = new { Name = "Dude", Age = 30, Kids = new[] { "LittleDude" } };

-var dude5 = new { Name = "Dude", Age = 30, Kids = new[] { new { Name = "LittleDude" } } };

-Action y = () => { };

-Func<int, float, bool> z = (a, b) => { var z = new { a, b }; return z == null; };

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10015-misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10015-misc-failures.cs
deleted file mode 100644
index e7022083..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10015-misc-failures.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-void Func()
-{
-    OtherFunc(
-        @"multi
-line");
-}
-
-variablex = o.Func(
-    variabley);
-variablex = o.Func2(a, b,
-    variabley);
-o.Func(
-    variabley);
-o.Func2(a, b,
-    variabley);
-
-
-AnimatorStateMachine rootStateMachine = syncedIndex == -1
-                                                        ? animatorController.layers[selectedLayerIndex].stateMachine
-                                                        : animatorController.layers[syncedIndex].stateMachine;
-
-
-m_ActiveStateMachine = AnimatorControllerTool.tool ? m_Type == TransitionType.eAnyState ?
-    AnimatorControllerTool.tool.stateMachineGraph.rootStateMachine :
-    AnimatorControllerTool.tool.stateMachineGraph.activeStateMachine : null;
-
-public GUIStyle[] inSlots =
-{
-    FindStyle("flow shader in 0"), FindStyle("flow shader in 1"), FindStyle("flow shader in 2"), FindStyle("flow shader in 3"), FindStyle("flow shader in 4"), FindStyle("flow shader in 5"),
-};
-
-
-public GUIStyle[] inSlots = { 1, 2, 3 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10016-new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10016-new-constraint-paren-space.cs
deleted file mode 100644
index a337a447..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10016-new-constraint-paren-space.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-// same as 10130-sp_between_new_paren.cs

-T F<T>() where T : new()

-{

-	return new T();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10018-delete-space-oc.mm
deleted file mode 100644
index 59496772..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10018-delete-space-oc.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* EditorApplication */

-

-#include <string>

-

-#ifdef __OBJC__

-#import <Cocoa/Cocoa.h>

-

-class HierarchyState;

-@interface EditorApplication: NSObject

-{

-	IBOutlet id m_MainWindow;

-	IBOutlet id m_PaneController;

-	id m_RenderTimer;

-

-	IBOutlet id m_CutItem;

-	IBOutlet id m_CopyItem;

-	IBOutlet id m_PasteItem;

-

-	IBOutlet id m_DuplicateItem;

-	IBOutlet id m_DeleteItem;

-

-	IBOutlet id m_FrameSelectedItem;

-	IBOutlet id m_FindItem;

-	IBOutlet id m_SelectAllItem;

-}

-

--(IBAction)SaveAssets: (id)sender;

--(IBAction)CloseScene: (id)sender;

--(IBAction)NewProject: (id)sender;

--(IBAction)OpenProject: (id)sender;

-

--(IBAction)SaveAsSceneToDisk: (id)sender;

-

--(IBAction)EnterSerialNumber: (id)sender;

--(IBAction)ReturnLicense: (id)sender;

--(IBAction)CompileScene: (id)sender;

--(IBAction)CompileSceneAutomatic: (id)sender;

-

--(IBAction)saveDocument: (id)sender;

-

--(IBAction)LoadSceneFromDisk: (id)sender;

-

--(void)RemoveDisplayTimer;

--(void)RegisterUpdateTimer: (int)frequency;

-

--(void)refreshModifiedFile: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

--(void)closeFile: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

-

--(IBAction)ShowAboutDialog: (id)sender;

--(IBAction)ShowPreferences: (id)sender;

--(IBAction)ShowPackageManager: (id)sender;

-

--(IBAction) delete: (id)sender;

--(IBAction) copy: (id)action;

--(IBAction)paste: (id)action;

--(IBAction)duplicate: (id)action;

--(IBAction)cut: (id)action;

--(IBAction)selectAll: (id)action;

--(IBAction)find: (id)action;

--(IBAction)frameSelected: (id)action;

--(IBAction)frameSelectedWithLock: (id)action;

-

-// Assetstore protocol handler and registration

--(void)registerAssetStoreURLProtocol;

--(void)getUrl: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

-

-@end

-

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10019-func-param-wrap-oc.mm
deleted file mode 100644
index 6e192eec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10019-func-param-wrap-oc.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-if(progress <= 0)

-{

-	[[NSBezierPath bezierPathWithOvalInRect: NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,

-	                                                    NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10020-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10020-region.cs
deleted file mode 100644
index b2f57ece..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10020-region.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
-    #region something
-    int foo2 = 2;
-    #endregion
-    int foo()
-    {
-
-	#region something else
-	int foo3 = 3;
-	#region nested
-	int foo4 = 0;
-	#endregion
-	int foo5 = 0;
-	#endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10021-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10021-region.cs
deleted file mode 100644
index 926e467d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10021-region.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
-    #region something
-	int foo2 = 2;
-    #endregion
-    int foo()
-    {
-
-	#region something else
-	    int foo3 = 3;
-	    #region nested
-		int foo4 = 0;
-	    #endregion
-	    int foo5 = 0;
-	#endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10022-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10022-region.cs
deleted file mode 100644
index 9628d4fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10022-region.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
-#region something
-    int foo2 = 2;
-#endregion
-    int foo()
-    {
-
-    #region something else
-	int foo3 = 3;
-    #region nested
-	int foo4 = 0;
-    #endregion
-	int foo5 = 0;
-    #endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10023-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10023-region.cs
deleted file mode 100644
index e21c467c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10023-region.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-    int foo1;
- #region something
-    int foo2 = 2;
- #endregion
-    int foo()
-    {
-
- #region something else
-	int foo3 = 3;
- #region nested
-	int foo4 = 0;
- #endregion
-	int foo5 = 0;
- #endregion
-    }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10027-oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10027-oneline_property.cs
deleted file mode 100644
index e4470be2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10027-oneline_property.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-public class Class
-{
-    public float prop { get; set; }
-    public float prop { get { return m; } }
-    public float prop { set { m = value; } }
-    public float prop { get { return m; } set { m = value; } }
-    internal int prop { get { return m; } }
-};
-public class Container { public int prop { get; set; } };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10028-ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10028-ifcolalign.cs
deleted file mode 100644
index 13df0440..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10028-ifcolalign.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Unity

-{

-    internal class Class

-    {

-        public void Foo()

-        {

-            if (data)   go = new ClassA();

-            else        go = new ClassB();

-

-            if (evt.alt)        modifiers += "Alt+";

-            if (evt.command)    modifiers += "Cmd+";

-            if (evt.control)    modifiers += "Ctrl+";

-            if (evt.shift)      modifiers += "Shift+";

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10029-when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10029-when.cs
deleted file mode 100644
index 4480f618..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10029-when.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-private static string GenerateHash()

-{

-    try

-    {

-        int i = 0;

-    }

-    catch when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)

-    {

-        int j = -1;

-    }

-    try

-    {

-        int i = 0;

-    }

-    catch (Exception e) when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)

-    {

-        var when = DateTime.Now;

-        ulong kind = (ulong)(int)when.Kind;

-        return ((kind << 62) | (ulong)when.Ticks).ToString();

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10030-sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10030-sort_using.cs
deleted file mode 100644
index 99e802c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10030-sort_using.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// should be ddd, eee, fff
-using b.ddd;
-using b.eee;
-using b.fff;
-
-// should be aaa, ccc
-using aaa;
-using ccc;
-// should be just bbb
-using bbb;
-
-// should not change these, as it can't handle multi-line imports
-using mango.ccc;
-using mango.bbb,
-      mango.aaa;
-
-void foo();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10031-bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10031-bug_i_935.cs
deleted file mode 100644
index c45eb79d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10031-bug_i_935.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Syst;
-using System;
-using System.Collections.Generic;
-using System2;
-
-using b;
-using b.a;
-using b.A;
-using b.ddd;
-using b.ddd.A;
-using b.eee;
-using b.fff;
-
-void foo();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10032-sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10032-sort_using_categ.cs
deleted file mode 100644
index ec997fc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10032-sort_using_categ.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using Client.Common;
-using LeopotamGroup.Common;
-using LeopotamGroup.Serialization;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.EventSystems;
-
-using nameSpace;
-using Namespace;
-using NameSpace;
-using NameSpacEveryday;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10033-objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10033-objc.mm
deleted file mode 100644
index 07ede276..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10033-objc.mm
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()

-{

-    if (key)

-        ret.key = [NSString stringWithCharacters: &key length: 1];

-

-    [gUndoMenu->m_UndoItem setTitle: [NSString stringWithFormat: [NSString stringWithUTF8String: localizedUndo], undoName.c_str()]];

-    [gUndoMenu->m_RedoItem setTitle: [NSString stringWithFormat: [NSString stringWithUTF8String: localizedRedo], redoName.c_str()]];

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10034-asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10034-asm.h.mm
deleted file mode 100644
index 84a5efa8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10034-asm.h.mm
+++ /dev/null
@@ -1,21 +0,0 @@
-static inline void atomic_retain(volatile int *p)

-{

-#if defined(_MSC_VER)

-    _InterlockedIncrement((LONG volatile *)p);

-#else

-    __asm__(

-        "lock incl  %0\n\t"

-        : "+m" (*p)

-        :

-        : "cc", "memory"

-        );

-#endif

-}

-

-static inline void atomic_thread_fence(memory_order_release_t)

-{

-    __asm__ __volatile__

-    (

-        ASM_LWSYNC : : : "memory"

-    );

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10035-definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10035-definesalign.h.mm
deleted file mode 100644
index 9ad29954..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10035-definesalign.h.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-    #define SOUNDMANAGERWATCHDOG() \

-        SoundManagerWatchDog watchdog

-

-        #define CompileTimeAssert(expression, message) \

-            enum{ CT_ASSERT_HACK_JOIN(ct_assert_, __LINE__) = sizeof(CompileTimeAssertImpl<(expression)>) }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10036-inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10036-inttypes.h.mm
deleted file mode 100644
index 4ac13417..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10036-inttypes.h.mm
+++ /dev/null
@@ -1,3 +0,0 @@
-static int32_t level_and_name_to_system(SocketOptionLevel level, SocketOptionName name, int32_t *system_level, int32_t *system_name)

-

-WaitStatus SendTo(uint8_t address[ipv6AddressSize], uint32_t scope, uint16_t port, const uint8_t *data, int32_t count, os::SocketFlags flags, int32_t *len);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10039-615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10039-615_nested-usings.cs
deleted file mode 100644
index d46108bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10039-615_nested-usings.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using (var x = X())
-using (var y = Y())
-{
-}
-
-using (var x = X())
-using (var y = Y())
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10040-tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10040-tcf.cs
deleted file mode 100644
index 009f269e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10040-tcf.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-void foo()
-{
-	try
-	{
-		;
-	}
-	catch (Exception e)
-	{
-		;
-	}
-	finally
-	{
-		;
-	}
-
-
-	bar();
-
-	try
-	{
-		;
-	}
-	catch (Exception e)
-	{
-		;
-	}
-	catch (Exception e)
-	{
-		;
-	}
-	finally
-	{
-		;
-	}
-
-
-	bar();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10041-gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10041-gs.cs
deleted file mode 100644
index ba9f873e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10041-gs.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-private string s = "";
-
-public int Amount
-{
-	get
-	{
-		;
-	}
-
-	set
-	{
-		;
-	}
-}
-
-public EventHandler MyCustomEventHandler
-{
-	add
-	{
-		;
-	}
-
-	remove
-	{
-		;
-	}
-}
-
-public this[string index]
-{
-	get;
-
-	set;
-}
-
-private string s2 = "";
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10042-exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10042-exception-filters.cs
deleted file mode 100644
index d638d9a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10042-exception-filters.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-class Test
-{
-   void TestExceptionFilter()
-   {
-      var when = new Object();
-
-      try
-      {
-         int i = 0;
-      }
-      catch (Exception e)
-      {
-         int j = -1;
-      }
-      try
-      {
-         int i = 0;
-      }
-      catch
-      {
-         int j = -1;
-      }
-      try
-      {
-         int i = 0;
-      }
-      catch when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)
-      {
-         int j = -1;
-      }
-      try
-      {
-         int a = (int)when.foo();
-      }
-      catch (Exception e) when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)
-      {
-         string b = ((int)when.prop).ToString();
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10044-ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10044-ifcomment.cs
deleted file mode 100644
index 2c3ab0fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10044-ifcomment.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-#define RENDER_POINTS_USING_MESH
-
-namespace UnityEditor
-{
-    internal class CurveWrapper
-    {
-        private void DoIconAndName(Rect rect, AnimationWindowHierarchyNode node, bool selected, bool focused, float indent)
-        {
-            EditorGUIUtility.SetIconSize(new Vector2(13, 13));   // If not set we see icons scaling down if text is being cropped
-        }
-
-        public void foo()
-        {
-            if (this)
-            {
-                if (b)
-                {
-                    // Now draw
-                    for (int i = 0; i < ticks.Length; i++)
-                    {
-                        ticksPos[i] /= axisUiScalars.y;
-                        if (ticksPos[i] < vRangeMin || ticksPos[i] > vRangeMax)
-                            continue;
-
-                        Vector2 pos = DrawingToViewTransformPoint(new Vector2(0, ticksPos[i]));
-                        // Important to take floor of positions of GUI stuff to get pixel correct alignment of
-                        // stuff drawn with both GUI and Handles/GL. Otherwise things are off by one pixel half the time.
-                        pos = new Vector2(pos.x, Mathf.Floor(pos.y));
-
-                        float uiValue = ticks[i];
-                        Rect labelRect;
-                        if (settings.vTickStyle.centerLabel)
-                            labelRect = new Rect(0, pos.y - 8, leftmargin - 4, 16);  // text expands to the left starting from where grid starts (leftmargin size must ensure text is visible)
-                        else
-                            labelRect = new Rect(0, pos.y - 13, labelSize, 16);     // text expands to the right starting from left side of window
-
-                        GUI.Label(labelRect, uiValue.ToString(format) + settings.vTickStyle.unit, ms_Styles.labelTickMarksY);
-                    }
-                }
-            }
-            // Cleanup
-            GUI.color = tempCol;
-
-            GUI.EndClip();
-        }
-    }
-} // namespace
-
-namespace UnityEditor
-{
-    internal class TreeView
-    {
-        public System.Action<int[]> selectionChangedCallback { get; set; } // ids
-        public System.Action<int> itemDoubleClickedCallback { get; set; } // id
-        public System.Action<int[], bool> dragEndedCallback { get; set; } // dragged ids, if null then drag was not allowed, bool == true if dragging tree view items from own treeview, false if drag was started outside
-        public System.Action<int> contextClickItemCallback { get; set; } // clicked item id
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10045-UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10045-UNI-1288.cs
deleted file mode 100644
index 03d60f5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10045-UNI-1288.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-public class Class

-{

-    public Foo GetFoo()

-    {

-        return new Foo

-        {

-            enabled = false,

-        };

-    }

-

-    public override Bar GetBar()

-    {

-        return new Bar()

-        {

-            m_Name = TestPropertyName

-        };

-        return new

-        AA();

-        return new AA<Type>

-        {

-        };

-    }

-

-    //It appears uncrustify is adding double-indentation no matter what, to the initializer block.

-    // Both of the above examples start out at a different level of indentation, and both get double-indented past original.

-}

-

-// The following code consolidates examples from the topic.

-class ObjInitializers

-{

-    class Cat

-    {

-        // Auto-implemented properties.

-        public int Age { get; set; }

-        public string Name { get; set; }

-    }

-

-    static void Main()

-    {

-        Cat cat = new Cat { Age = 10, Name = "Fluffy" };

-

-        List<Cat> cats = new List<Cat>

-        {

-            new Cat() { Name = "Sylvester", Age = 8 },

-            new Cat() { Name = "Whiskers", Age = 2 },

-            new Cat() { Name = "Sasha", Age = 14 }

-        };

-

-        List<Cat> moreCats = new List<Cat>

-        {

-            new Cat() { Name = "Furrytail", Age = 5 },

-            new Cat() { Name = "Peaches", Age = 4 },

-            null

-        };

-

-        // Display results.

-        System.Console.WriteLine(cat.Name);

-

-        foreach (Cat c in cats)

-            System.Console.WriteLine(c.Name);

-

-        foreach (Cat c in moreCats)

-            if (c != null)

-                System.Console.WriteLine(c.Name);

-            else

-                System.Console.WriteLine("List element has null value.");

-    }

-

-    // Output:

-    //Fluffy

-    //Sylvester

-    //Whiskers

-    //Sasha

-    //Furrytail

-    //Peaches

-    //List element has null value.

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10046-UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10046-UNI-1333.mm
deleted file mode 100644
index de887ad0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10046-UNI-1333.mm
+++ /dev/null
@@ -1,15 +0,0 @@
-// Test if Uncrustify properly handles `@synchronized` keyword for ObjC

-

-// In keywords.cpp there is no @synchronized keyword listed and from what I've seen synchronized is only regarded as a keyword in other languages

-// { "synchronized", CT_QUALIFIER, LANG_D | LANG_JAVA | LANG_ECMA },

-

--(void) foo

-{

-    @synchronized(self)

-    {

-        if (bar)

-        {

-            bar = false;

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10050-generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10050-generics.cs
deleted file mode 100644
index 74e49ecd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10050-generics.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-int foo()
-{
-	a.b<c, d>();
-	a.b<c, e<d>>();
-	a.b<c, d>();
-	a.b<c, e<d>>();
-	a.b<c, e<d>>();
-
-	return default(T);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10051-UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10051-UNI-1338.cs
deleted file mode 100644
index 3f3d9d06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10051-UNI-1338.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// *Single line functions*

-

-public class Class

-{

-    public string foo { get; set; }

-    public string foo { get; set; }

-

-    bool HasBar() { return m_HasBar != 0; }

-    bool HasBar() { return m_HasBar != 0; }

-

-    public Bar prop { get { return m_bar; } set { m_bar = value; } }

-    public Bar prop { get { return m_bar; } set { m_bar = value; } }

-

-// This seems to happen with no spaces on the interior. Opening brace doesn't get one, closing brace does.

-

-// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {1}). May need special support, or perhaps there's a bug..

-

-// *Initializers*

-

-// Not sure if this is what we want..

-

-    public void foo()

-    {

-        sas.Foo("bar", new Dictionary<string, object>(){ { "k1", "v1" }, { "k2", "v2" } });

-        // ... --> ...

-        sas.Foo("bar", new Dictionary<string, object>() { { "k3", "v3" }, { "k4", "v4" } });

-    }

-

-// Second line adds a space before the initializer {. Is that what we want for C#?

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10055-UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10055-UNI-1345.cs
deleted file mode 100644
index 13f61127..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10055-UNI-1345.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-public class Class

-{

-    public void foo()

-    {

-        data.Sort(

-            delegate(InputData lhs, InputData rhs)

-            {

-                return lhs.m_Name.CompareTo(rhs.m_Name);

-            });

-    }

-}

-

-// Want the braces aligning with the delegate keyword.

-

-// Probably also an issue with lambda style delegates.

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10060-unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10060-unsafe.cs
deleted file mode 100644
index fdfdd67b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10060-unsafe.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Class1
-{
-   public unsafe bool GetValue()
-   {
-      return(true);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10065-UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10065-UNI-1975.cs
deleted file mode 100644
index 1d2f2659..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10065-UNI-1975.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// typeof(Dictionary<, >)

-

-// is getting changed to

-

-// typeof(Dictionary<, >)

-

-// (space added after comma)

-

-// Definitely not typical for C#. Needs special handling.

-

-public class Class

-{

-    public void foo(Type type)

-    {

-        if (type == typeof(List<>))

-        {

-        }

-        else if (type == typeof(Dictionary<,>))

-        {

-            var bar = typeof(Dictionary<,>).Bar();

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10066-UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10066-UNI-1977.cs
deleted file mode 100644
index 94b929c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10066-UNI-1977.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// We specifically avoid our own tab-space in GenericFormat because of the @"" issue.

-// So we must rely on Uncrustify getting it right, and it nearly does - except for the

-// "Layout has changed, bail out now" where it does not replace the tab preceding the comment.

-

-namespace Namespace

-{

-    class Class

-    {

-        public void Foo()

-        {

-            if (bar)

-            {

-                //  Layout has changed, bail out now.

-                bar = false;

-            }

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10067-UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10067-UNI-1978.cs
deleted file mode 100644
index 5f55cb2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10067-UNI-1978.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// `new[] {` on colors12345636 should have brace on following line

-

-namespace Namepsace

-{

-    internal static class Colors

-    {

-        static Color[] colors12345636 = new[]

-        {

-            new Color(123 / 123f, 123 / 123f,   0 / 123f),

-            new Color(123 / 123f, 123 / 123f,   4 / 123f),

-            new Color(123 / 123f,  75 / 123f,  36 / 123f),

-            new Color(123 / 123f,  97 / 123f, 136 / 123f),

-            new Color(123 / 123f, 123 / 123f, 136 / 123f),

-            new Color(13 / 123f, 123 / 123f, 136 / 123f),

-            new Color(0 / 123f, 123 / 123f, 136 / 123f),

-            new Color(123 / 123f, 123 / 123f,   1 / 123f)

-        };

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10070-utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10070-utf16le.cs
deleted file mode 100644
index c017f6c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10070-utf16le.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10071-utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10071-utf16be.cs
deleted file mode 100644
index d9f54e37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10071-utf16be.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10072-utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10072-utf16le_no_bom.cs
deleted file mode 100644
index c017f6c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10072-utf16le_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10073-utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10073-utf16be_no_bom.cs
deleted file mode 100644
index d9f54e37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10073-utf16be_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10074-UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10074-UNI-2020.cs
deleted file mode 100644
index 854a3655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10074-UNI-2020.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// As discussed with unity updating the test case

-

-{

-    var a = @"asdasda";

-

-    var d =

-        @"asdasda";

-

-    var d =

-        @"asdasda";

-

-    var b = @"

-line1

-line2";

-

-    var c = Very(Long(Nested(Function(

-                                 @"line1

-line2"))));

-

-    var c = Very(Long(Nested(Function(

-                                 @"line1

-line2"))));

-

-    var c = Function(

-        hey,

-        you,

-        @"line1

-line2", fubar,

-        hmm);

-

-    var c = Function(

-        hey,

-        you,

-        @"line1

-line2", fubar,

-        hmm);

-

-    var c = Function(

-        hey,

-        you,

-        @"line1

-line2",

-        fubar,

-        hmm);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10075-UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10075-UNI-2021.cs
deleted file mode 100644
index b0ec0414..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10075-UNI-2021.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// updating the testcase for 1247

-// concluded that we need to convert all the 4,3,2 liners to one liner based on the option

-int fun() {return 0;}

-

-int fun() {return 0; }

-

-int fun() {return 0;}

-

-int fun() {return 0; }

-

-int fun() {return 0; }

-

-int fun() { return 0;}

-

-int fun() {return 0; }

-

-int fun() {return 0;}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10076-UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10076-UNI-1343.cs
deleted file mode 100644
index 076e338d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10076-UNI-1343.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Need to...

-

-// * Deal with the newline-after-opening and brace arrangement thing (eat_blanks_after_open_brace etc - see note in Uncrustify.Cpp.cfg)

-// * Terminate with //namespace if greater than x lines (like with #ifdef)

-

-namespace Unity

-{

-    public static void foo1()

-    {

-    }

-

-    public static void foo2()

-    {

-    }

-

-    public static void foo3()

-    {

-    }

-} // namespace Unity

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10077-UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10077-UNI-1919.cs
deleted file mode 100644
index cc8e8420..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10077-UNI-1919.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// this

-

-Func(

-    "stuff",

-    foo =>

-    {

-        bar();

-    });

-

-// formats to this

-

-Func(

-    "stuff",

-    foo =>

-    {

-        bar();

-    });

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10078-UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10078-UNI-3484.cs
deleted file mode 100644
index d7e4f26a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10078-UNI-3484.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// various combos from unity

-

-contents.Append("#include \"{file.GetBoundPath ()}\"");

-contents.Append($"#include \"{file.GetBoundPath ()}\"");

-contents.Append($"#include \"{file.GetBoundPath ("abc def")}\"");

-

-contents.Append(

-    $"#include \"{file.GetBoundPath()}\"");

-

-contents.Append($@"#include

-""{file.GetBoundPath($@"abc 

- def")}""");

-

-contents.Append(

-    $@"#include

-""{file.GetBoundPath(@"abc

-   def ghi")}""");

-

-contents.Append(@"#include

-""{file.GetBoundPath ()}""");

-

-// fun with nesting

-

-$@"{$"\\\"abc{$@" \""def\"" {"{ghi}"} {jkl} {{mno}}"}\\\""

-}".Dump();

-

-$@"{$@"\""abc{$@" def {"{ghi}"}

-    {jkl} {{mno}}\"""}"

-}".Dump();

-

-// ensure we didn't break @for etc

-

-var @for = @base + @this - $@"{@while}";

-

-// from roslyn's InterpolationTests.cs

-

-Console.WriteLine($"{number}");

-

-Console.WriteLine($"{number}{number}");

-Console.WriteLine($"Jenny don\'t change your number { number :###-####} { number :###-####}.");

-Console.WriteLine($"jenny { ((Func<int>)(() => { return number; })).Invoke() :(408) ###-####}");

-Console.WriteLine($"{hello}, { world }.");

-

-Console.WriteLine($@"{

-                            hello

-                    },

-{

-                    world }.");

-

-System.Console.Write($"{{ x }}");

-var s = $@"{$@""{1}""}";

-

-Console.WriteLine($"{ await hello }, { await world }!");

-

-Console.WriteLine($"X = { 123 , -(3+4) }.");

-

-var s1 = $"X = { 1 } ";

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10080-property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10080-property.cs
deleted file mode 100644
index 98d3c21c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10080-property.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-#define X    1       // comment to check tokenizing of URL
-#property URL "http://www.google.com"
-#define Y    2       // comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10090-string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10090-string_multi.cs
deleted file mode 100644
index 7d006dce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10090-string_multi.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-public class C
-{
-   public void F()
-   {
-      var x = @"
-abc";
-      var y = @"
-abc" + "def";
-      var z = "" +
-              @"
-";
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10100-bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10100-bug_600.cs
deleted file mode 100644
index 54c24643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10100-bug_600.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-Vector2? a;
-Vector2 b;
-
-void G()
-{
-	int? x = true ? null : (int?)2;
-	var q = x == null ? y : z;
-	var q2 = x == q ? y : z;
-	var q3 = x == null ? (y = new Y()) : z;
-	var q4 = x == q ? (y = new Y()) : z;
-
-	var q5 = x == null ? y = new Y() : z;
-	var q6 = x == q ? y = new Y() : z;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10101-sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10101-sf607.cs
deleted file mode 100644
index 3207e6c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10101-sf607.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-int P

-{

-	get

-	{

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10102-pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10102-pp-ignore.mm
deleted file mode 100644
index f26232c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10102-pp-ignore.mm
+++ /dev/null
@@ -1,29 +0,0 @@
-#define a   z   \

-            x

-

-#define a(b)    z   \

-                x

-

-#define ab(b)   z   \

-                x

-

-#define abc(b)  z   \

-                x

-

-#define abcd(b) z   \

-                x

-

-

-#if FOO

-#   define D(a, ...) B(FOO(a, __LINE__, __VA_ARGS__))

-#   define C(msg)           \

-        PP_WRAP_CODE(       \

-            if (!msg)       \

-            {               \

-                BAR();      \

-                BARBAR();   \

-                BARBARBAR();\

-            })

-#else

-#   define C(msg, ...)      EMPTY

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10103-UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10103-UNI-2506.cs
deleted file mode 100644
index 8cd07962..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10103-UNI-2506.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-public class Class

-{

-    public int property

-    {

-        get

-        {

-            return !IsModeActive(Mode.None)

-                && !IsModeActive(Mode.Foo)

-                && !IsModeActive(Mode.Bar);

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10104-UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10104-UNI-2505.cs
deleted file mode 100644
index a17e6a5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10104-UNI-2505.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-public class Class : Base

-{}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10110-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10110-mdarray_space.cs
deleted file mode 100644
index 8c328f5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10110-mdarray_space.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-int[ , , ] x;

-var y = new int[2, 3];

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10111-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10111-mdarray_space.cs
deleted file mode 100644
index 56aa58ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10111-mdarray_space.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-int[,,] x;

-var y = new int[2, 3];

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10112-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10112-mdarray_space.cs
deleted file mode 100644
index ab877b8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10112-mdarray_space.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-int[, ,] x;

-var y = new int[2, 3];

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10119-preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10119-preserveTabs.cs
deleted file mode 100644
index c9583dcd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10119-preserveTabs.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-/// <summary>
-/// 	Event handler.
-/// </summary>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10120-cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10120-cmt_backslash_eol.cs
deleted file mode 100644
index e56aec25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10120-cmt_backslash_eol.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-foo();
-// test \
-blah();
-bar();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10130-sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10130-sp_between_new_paren.cs
deleted file mode 100644
index fd706ffa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10130-sp_between_new_paren.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-T F<T>() where T : new()

-{

-	return new T();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10140-remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10140-remove_semi.cs
deleted file mode 100644
index 3ee1926e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10140-remove_semi.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-var dude  = "Dude";

-var dude2 = new {

-   Name = "Dude", Age = 30,

-};

-var dude3 = new {

-   Name = "Dude", Age = 30, Kids = new {

-      Name = "LittleDude"

-   }

-};

-var dude4 = new {

-   Name = "Dude", Age = 30, Kids = new[] {

-      "LittleDude"

-   }

-};

-var dude5 = new {

-   Name = "Dude", Age = 30, Kids = new[] {

-      new {

-         Name = "LittleDude"

-      }

-   }

-};

-Action                 y = () => { };

-Func<int, float, bool> z = (a, b) => {

-   var z = new {

-      a, b

-   };

-   return(z == null);

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10150-operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10150-operator-null-conditional.cs
deleted file mode 100644
index 61ac6d74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10150-operator-null-conditional.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-public class test
-{
-   public static void TestOfNullConditionalOperator()
-   {
-      string s = "Test";
-
-      if (s ?. Length > 0)
-      {
-         s = "Test";
-      }
-      if (System . Reflection . Assembly . GetEntryAssembly() ?. GetName() != null)
-      {
-         s = "Test";
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
deleted file mode 100644
index 416e6afc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Program

-{

-public static void Main()

-{

-	var thing = new int?();

-	thing ??= new int?();

-}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10160-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10160-delegate.cs
deleted file mode 100644
index 6296ad80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10160-delegate.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-void foo()
-{
-	obj.cb += () => { };
-
-	funcwithverylongname(() =>
-	{
-		func();
-	});
-}
-
-Func(
-	"stuff",
-	foo =>
-{
-	bar();
-});
-
-Func(
-	"stuff",
-	foo =>
-{
-	bar();
-});
-
-data.Sort(
-	delegate(InputData lhs, InputData rhs)
-{
-	return lhs.m_Name.CompareTo(rhs.m_Name);
-});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10161-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10161-delegate.cs
deleted file mode 100644
index 152fba2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10161-delegate.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-void foo()
-{
-	obj.cb += () => { };
-
-	funcwithverylongname(() =>
-		{
-			func();
-		});
-}
-
-Func(
-	"stuff",
-	foo =>
-	{
-		bar();
-	});
-
-Func(
-	"stuff",
-	foo =>
-	{
-		bar();
-	});
-
-data.Sort(
-	delegate(InputData lhs, InputData rhs)
-	{
-		return lhs.m_Name.CompareTo(rhs.m_Name);
-	});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10200-logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10200-logger.cs
deleted file mode 100644
index defede8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10200-logger.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {1}). May need special support, or perhaps there's a bug..

-// long comment line(s), such as here, might be too long to produce a correct LOG-file such as

-// with the use of option -L A

-// in such a case, the output of the log will be cut.

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10300-1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10300-1822.cs
deleted file mode 100644
index 92b5fd5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10300-1822.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-foreach (Cat c in *cats)
-	System.Console.WriteLine(c.Name);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10628-sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10628-sf628.cs
deleted file mode 100644
index 54d3c52c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10628-sf628.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-void foo()

-{

-	obj.cb += () => { };

-	func();

-	obj.cb += (p0) => { };

-	func();

-	obj.cb += (p0, p1) => { };

-	func();

-	Action a = delegate { };

-	func();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11011-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11011-620_getset-brace.cs
deleted file mode 100644
index d4652c5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11011-620_getset-brace.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-class C

-{

-	float V

-	{

-		get

-		{

-			return _v;

-		}

-		set { _v = value; } }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11030-argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11030-argtypes.mm
deleted file mode 100644
index 1afeb694..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11030-argtypes.mm
+++ /dev/null
@@ -1,3 +0,0 @@
-static void WriteArrayToDrag(NSArray* array, NSPasteboard* pboard, NSString* pboardType);

-static OSStatus FindProcess(const FSRef* appRef, ProcessSerialNumber *pPSN, NSString* application, bool permissiveSearching);

-NSString* MakeNSString(const std::string& string);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11031-casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11031-casting.mm
deleted file mode 100644
index c73d6ef8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11031-casting.mm
+++ /dev/null
@@ -1 +0,0 @@
-videoViewController.videoGravity = (NSString*)videoGravity;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11032-newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11032-newlines.mm
deleted file mode 100644
index 49a15913..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11032-newlines.mm
+++ /dev/null
@@ -1,33 +0,0 @@
-NSString* GetXcodePath()

-{

-    return [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier: kXCodeBundleId];

-}

-

-extern "C" EXPORTDLL void LaunchXCode()

-{

-    NSString* curApp = GetXcodePath();

-    [[NSWorkspace sharedWorkspace] launchApplication: curApp];

-

-    NSArray *selectedApps =

-        [NSRunningApplication runningApplicationsWithBundleIdentifier: kXCodeBundleId];

-

-    for (int i = 0; i < [selectedApps count]; i++)

-    {

-        NSRunningApplication *app = [selectedApps objectAtIndex: i];

-        int count = 0;

-        NSLog(@"Checking %@\n", app);

-        while (![app isFinishedLaunching] && count++ < 300)

-            [[NSRunLoop currentRunLoop] runUntilDate: [NSDate dateWithTimeIntervalSinceNow: 1.0f]];

-    }

-}

-

-NSString* MakeNSString(const std::string& string)

-{

-    return MakeNSString(string.c_str());

-}

-

-NSString* MakeNSString(const char* string)

-{

-    NSString* ret = string? [NSString stringWithUTF8String:string] : nil;

-    return ret ? ret : @"";

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11072-UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11072-UNI-2007.cs
deleted file mode 100644
index 29e53f26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11072-UNI-2007.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-public class MyGenericClass<T> where T : IComparable {}
-
-class MyClass<T, U>
-    where T : class
-    where U : struct
-{}
-
-public class MyGenericClass<T> where T : IComparable, new()
-{
-    // The following line is not possible without new() constraint:
-    T item = new T();
-}
-
-interface IMyInterface
-{
-}
-
-class Dictionary<TKey, TVal>
-    where TKey : IComparable, IEnumerable
-    where TVal : IMyInterface
-{
-    public void Add(TKey key, TVal val)
-    {
-    }
-}
-
-class List<T>
-{
-    void Add<U>(List<U> items) where U : T { /*...*/ }
-    void Add<U>(List<U> items) where U : T { /*...*/ }
-}
-
-extern T GetNodeFromGuid<T>(Guid guid) where T : INode;
-extern T GetNodeFromGuid<T>(Guid guid) where T : INode;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11073-UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11073-UNI-2008.cs
deleted file mode 100644
index a4de3475..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11073-UNI-2008.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-Utils.Curve attribute = (Utils.Curve)base.attribute;

-Utils.Curve attribute = (Utils.Curve)base.attribute;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12001-bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12001-bug_620.cs
deleted file mode 100644
index 56e9b8bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12001-bug_620.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-class C

-{

-	float V

-	{

-		get

-		{

-			return _v;

-		}

-		set { _v = value; }

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12002-nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12002-nullable_prop.cs
deleted file mode 100644
index 21c4f7b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12002-nullable_prop.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-
-namespace Foo
-{
-
-public class Bar
-{
-public int? Val;
-
-public int? Prop
-{
-	get
-	{
-		return 1;
-	}
-}
-}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
deleted file mode 100644
index 3dab10f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-public class ClassName

-{

-   [Namespace.ClassName("Array")]

-   public int[] Array = { 10 };

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12004-verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12004-verbatim_strings.cs
deleted file mode 100644
index 73fa1bf0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12004-verbatim_strings.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-class Class
-{
-    public string s1 = "\t\tFoo";
-    public string s2 = @"
-		Foo
-";
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12005-bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12005-bug_1591.cs
deleted file mode 100644
index ac62df9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12005-bug_1591.cs
+++ /dev/null
@@ -1 +0,0 @@
-byte[] utf8Str = new byte[] { 197, 170, 110, 196, 173, 099, 197, 141, 100, 101, 204, 189 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12101-bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12101-bug_i_679.cs
deleted file mode 100644
index 199ad7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12101-bug_i_679.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using (var x = X())
-using (var y = Y())
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
deleted file mode 100644
index e6e0eede..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// mod_full_brace_nl_block_rem_mlcond should block brace removal here
-if( a == true
-    && b == false )
-{
-	return 1;
-}
-else if( a == true
-         && b == false)
-{
-	return 2;
-}
-// except here as there are no parenthesis
-else
-	return 3;
-
-
-if( a == true;
-    b == true;
-    c == true)
-{
-	return 1;
-}
-
-for( a = true;
-     a < 9;
-     a++)
-{
-	return 1;
-}
-
-while( a == true
-       && b == true
-       && c == true)
-{
-	return 1;
-}
-
-using (Foo bar =
-	       new Foo())
-{
-	return 1;
-}
-
-
-
-// mod_full_brace_nl_block_rem_mlcond should not block brace removal here
-if( a == true && b == false )
-	return 1;
-else if( a == true && b == false)
-	return 2;
-else
-	return 3;
-
-
-if( a == true; b == true; c == true)
-	return 1;
-
-for( a = true; a < 9; a++)
-	return 1;
-
-while( a == true && b == true && c == true)
-	return 1;
-
-using (Foo bar = new Foo())
-	return 1;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
deleted file mode 100644
index 8ecd4051..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// mod_full_brace_nl_block_rem_mlcond should block brace removal here
-if( a == true
-    && b == false )
-{
-	return 1;
-}
-else if( a == true
-         && b == false)
-{
-	return 2;
-}
-// except here as there are no parenthesis
-else
-	return 3;
-
-
-if( a == true;
-    b == true;
-    c == true)
-{
-	return 1;
-}
-
-for( a = true;
-     a < 9;
-     a++)
-{
-	return 1;
-}
-
-while( a == true
-       && b == true
-       && c == true)
-{
-	return 1;
-}
-
-using (Foo bar =
-	       new Foo())
-{
-	return 1;
-}
-
-
-
-// mod_full_brace_nl_block_rem_mlcond should not block brace removal here
-if( a == true && b == false )
-	return 1;
-else if( a == true && b == false)
-	return 2;
-else
-	return 3;
-
-
-if( a == true; b == true; c == true)
-	return 1;
-
-for( a = true; a < 9; a++)
-{
-	return 1;
-}
-
-while( a == true && b == true && c == true)
-{
-	return 1;
-}
-
-using (Foo bar = new Foo())
-{
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12104-bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12104-bug_1637.cs
deleted file mode 100644
index 9ffe19e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12104-bug_1637.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-//Test Case-001

-inline double GetAudioBitrateForQuality(double f) { return 56000 + 200000 * (f); }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12105-bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12105-bug_1650.cs
deleted file mode 100644
index 869a9d0f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12105-bug_1650.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-public string Foo =>

-    "bar";

-public string Foo

-    => "bar";

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker

-    => _this.WithLinkerSetting(l => l.Flags = l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker =>

-    _this.WithLinkerSetting(l => l.Flags = l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker

-    => _this.WithLinkerSetting(

-        l => l.Flags =

-            l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker => _this.WithLinkerSetting(

-    l => l.Flags =

-        l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker

-    => _this.WithLinkerSetting(l =>

-        l.Flags = l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker =>

-    _this.WithLinkerSetting(l

-        => l.Flags = l.Flags.Concat(flags));

-

-var islands = EditorCompilationInterface.GetAllMonoIslands().Select(i => new Island

-{

-    MonoIsland = i,

-    Name = Path.GetFileNameWithoutExtension(i._output),

-    References = i._references.ToList()

-}).ToList();

-

-var projectEntries = islands.Select(i => string.Format(

-    DefaultSynchronizationSettings.SolutionProjectEntryTemplate,

-    SolutionGuid(i), _projectName, Path.GetFileName(ProjectFile(i)), ProjectGuid(i._output)

-));

-

-

-Func<IEnumerable<IMemberDefinition>, IEnumerable<IMemberDefinition>> filterMembersWithObsoleteAttr = members => members.Where(m =>

-    !m.IsRuntimeSpecialName

-    && !m.IsSpecialName

-    && !blackList.Contains(m.FullName)

-    && CheckCustomAttributes(m));

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12106-UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12106-UNI-40685.cs
deleted file mode 100644
index 9b70920e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12106-UNI-40685.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace Namespace

-{

-    public static class Class

-    {

-        public static void Foo()

-        {

-            Tests = Bar(

-                A,

-                cp =>

-                    cp.Foo(new Bar

-                    {

-                        Identifier = "ID",

-                        PathToEmbed = "VAL"

-                    })

-                        .WithPrebuiltReference(Moq),

-                Core);

-

-            var Test = FooBar(

-                B,

-                cp => cp.WithB(Bar).WithSource("Path/File.ext"),

-                new[] {

-                    A,

-                    B,

-                    C

-                }

-            );

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
deleted file mode 100644
index 6bcd9201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-List<int> list = new List<int>();
-if (list.All(i0 => i1 > 5 && i2 < 9))
-{
-	return;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12108-Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12108-Issue_2705.cs
deleted file mode 100644
index 08619bb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12108-Issue_2705.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-//example file
-public class A
-{
-public void A(string a)
-{
-	if (a == null)
-	{
-		return;
-	}
-
-	fixed(char* ptr = a)
-	{
-		a = a + a;
-	}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/19000-UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/19000-UNI-58354.cs
deleted file mode 100644
index 6c77de40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/19000-UNI-58354.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-public static class Extensions
-{
-    public static FluentXboxOneSdk VS2017(this FluentPlatform<XboxOnePlatform> _) => new FluentXboxOneSdk {MsvcVersion = new Version(15, 0)};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20010-UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20010-UNI-32658.cs
deleted file mode 100644
index 145da65f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20010-UNI-32658.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//TestCase-001

-internal struct MyStruct<T>

-    where T : struct, IPrepareFrameJob

-{

-}

-

-//TestCase-002

-class MyClass<T, U>

-    where T : class

-    where U : struct

-{

-}

-

-//TestCase-003

-interface IMyInterface

-{

-}

-

-class Dictionary<TKey, TVal>

-    where TKey : IComparable, IEnumerable

-    where TVal : IMyInterface

-{

-    public void Add(TKey key, TVal val) {}

-}

-

-long DeviceCommand<TCommand>(int deviceId, ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo;

-

-public virtual long OnDeviceCommand<TCommand>(ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo;

-

-long DeviceCommand<TCommand>(int deviceId, ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo

-

-public virtual long OnDeviceCommand<TCommand>(ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20011-bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20011-bug_1620.cs
deleted file mode 100644
index 3b837292..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20011-bug_1620.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-new WaveformStreamer(s_sweepedClip, 0, s_sweepedClip.length, 1,

-    (streamer, floats, remaining) =>

-    {

-        return false;

-    }

-);

-

-using System.Collections.Generic;

-

-class C

-{

-    public void S()

-    {

-        Action localMethod = () => {

-            SomeClass.OtherMethod(new Dictionary<string, string>

-            {

-                {"a", "one"},

-                {"b", "two"},

-                {"c", "three"}

-            });

-        };

-        m_Mixers.Add(

-            new WeightInfo

-            {

-                parentMixer = parent,

-                mixer = node,

-                port = port,

-                modulate = (type == typeof(AnimationLayerMixerPlayable))

-            }

-        );

-    }

-}

-

-MergeJSFiles(new string[] {

-    GetDecompressor(),

-    Paths.Combine(buildToolsDir, "UnityConfig"),

-    Paths.Combine(args.stagingAreaData, kOutputFileLoaderFileName),

-}, unityLoader

-);

-

-public void GeneratesCorrectVisualStudioProjectFile()

-{

-    GenerateProjectsAndCompareWithTemplates(

-        runInJam: InJamCreateTestProject,

-        generatedPath: TestRoot.Combine("Solution"),

-        templatesPath: "Tools/Unity.BuildSystem/Unity.BuildSystem.VisualStudio.Tests/Templates",

-        templates: new[] {

-            "TestProjectGeneration_CApplication.sln",

-            "Projects/TestProjectGeneration_CApplication.vcxproj",

-            "Projects/TestProjectGeneration_CApplication.vcxproj.filters"

-        });

-}

-

-public void GeneratesCorrectVisualStudioProjectFile()

-{

-    GenerateProjectsAndCompareWithTemplates(

-        runInJam: InJamCreateTestProject,

-        generatedPath: TestRoot.Combine("Solution"),

-        templatesPath: "Tools/Unity.BuildSystem/Unity.BuildSystem.VisualStudio.Tests/Templates",

-        templates: new[]

-        {

-            "TestProjectGeneration_CApplication.sln",

-            "Projects/TestProjectGeneration_CApplication.vcxproj",

-            "Projects/TestProjectGeneration_CApplication.vcxproj.filters"

-        }

-    );

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60004-UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60004-UNI-2684.cs
deleted file mode 100644
index ff0b31f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60004-UNI-2684.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-EditorApplication.CallDelayed(() => {
-    foreach (CollabToolbarWindow window in Resources.FindObjectsOfTypeAll<CollabToolbarWindow>())
-        window.Close();
-}, 1f);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60005-UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60005-UNI-2685.cs
deleted file mode 100644
index ec671dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60005-UNI-2685.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-func(a, b, c, d,
-    (float a, int b, Foo bar) =>
-{
-    test();
-});
-(float a, int b, Foo bar) =>
-{
-    test();
-});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60007-UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60007-UNI-3083.cs
deleted file mode 100644
index 5209dc72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60007-UNI-3083.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-class ClassWithCtorICall
-{
-    public ClassWithCtorICall()
-    {
-        DoICall();
-    }
-
-    //It shouldn't add an extra space before 0x1000
-    [MethodImpl((MethodImplOptions)0x1000)]
-    static extern void DoICall();
-
-    //It shouldn't add an extra space before 1000
-    [MethodImpl((MethodImplOptions)1000)]
-    static extern void DoICall();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60008-UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60008-UNI-17253.cs
deleted file mode 100644
index 9021a372..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60008-UNI-17253.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Extra test cases for  # 1257
-switch (sometext)
-{
-    case "a":
-        return 0;
-    case "b":
-        Console.WrieLine("hello world\n");
-
-        return 0;
-    case "c":
-    {
-        Console.WrieLine("hello world\n");
-
-        return 0;
-    }
-    case "d":
-        Console.WrieLine("hello world\n");
-
-        if (hello)
-            return 0;
-        else
-            return 1;
-
-    case "e":
-        Console.WrieLine("hello world\n");
-
-        if (hello)
-        {
-            int a;
-            int b;
-
-            return 0;
-        }
-
-    case "f":
-    {
-        return 0;
-    }
-    case "g":
-
-        return 0;
-
-    case "h":
-        for (i = 0; i < 10 i++)
-        {
-            a += i;
-
-            return 0;
-        }
-    case "i":
-
-        if (hello)
-        {
-            int a;
-            int b;
-
-            return 0;
-        }
-
-        return 1;
-    default:
-        return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60009-UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60009-UNI-9917.cs
deleted file mode 100644
index 5e352d10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60009-UNI-9917.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// 1. Formatting the first produces the second.
-
-namespace Unity.IL2CPP.IntegrationTests.ILTests.Tests
-{
-    public class GlobalsWithBoxOptimizationAndBrTrueOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrTrueOpcodeTest() : base(OpCodes.Brtrue) {} }
-    public class GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest() : base(OpCodes.Brtrue_S) {} }
-    public class GlobalsWithBoxOptimizationAndBrFalseOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrFalseOpcodeTest() : base(OpCodes.Brfalse) {} }
-    public class GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest() : base(OpCodes.Brfalse_S) {} }
-}
-
-// 2. And formatting this produces the third.
-
-namespace Unity.IL2CPP.IntegrationTests.ILTests.Tests
-{
-    public class GlobalsWithBoxOptimizationAndBrTrueOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrTrueOpcodeTest() : base(OpCodes.Brtrue) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest() : base(OpCodes.Brtrue_S) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrFalseOpcodeTest() : base(OpCodes.Brfalse) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest() : base(OpCodes.Brfalse_S) {}
-    }
-}
-
-// 3. This doesn't changes when formatted.
-
-namespace Unity.IL2CPP.IntegrationTests.ILTests.Tests
-{
-    public class GlobalsWithBoxOptimizationAndBrTrueOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrTrueOpcodeTest() : base(OpCodes.Brtrue) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest() : base(OpCodes.Brtrue_S) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrFalseOpcodeTest() : base(OpCodes.Brfalse) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest : BoxTestsBase
-    {
-        public GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest() : base(OpCodes.Brfalse_S) {}
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60011-UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60011-UNI-11095.mm
deleted file mode 100644
index 4f88df51..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60011-UNI-11095.mm
+++ /dev/null
@@ -1,15 +0,0 @@
-// Create oneliners
-
-extern "C" NSBundle*            UnityGetMetalBundle()       { return _MetalBundle; }
-extern "C" MTLDeviceRef         UnityGetMetalDevice()       { return _MetalDevice; }
-extern "C" MTLCommandQueueRef   UnityGetMetalCommandQueue() { return ((UnityDisplaySurfaceMTL*)GetMainDisplaySurface())->commandQueue; }
-
-extern "C" EAGLContext*         UnityGetDataContextEAGL()   { return _GlesContext; }
-
-// Keep oneliners
-
-extern "C" NSBundle*            UnityGetMetalBundle()       { return _MetalBundle; }
-extern "C" MTLDeviceRef         UnityGetMetalDevice()       { return _MetalDevice; }
-extern "C" MTLCommandQueueRef   UnityGetMetalCommandQueue() { return ((UnityDisplaySurfaceMTL*)GetMainDisplaySurface())->commandQueue; }
-
-extern "C" EAGLContext*         UnityGetDataContextEAGL()   { return _GlesContext; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60012-UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60012-UNI-12303.cs
deleted file mode 100644
index 01be8291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60012-UNI-12303.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-//This gets a double indentation
-devicePositions[device] = rect = new Rect(
-    Vector2.Lerp(rect.position, target.position, 0.1f),
-    Vector2.Lerp(rect.size, target.size, 0.1f));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60013-UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60013-UNI-13955.cs
deleted file mode 100644
index 940aa89b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60013-UNI-13955.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-if (m_Preview.GetExpanded())
-{
-    m_EventSearchString = EditorGUI.TextField(searchRect, m_EventSearchString, Styles.toolbarSearchField);
-    if (GUILayout.Button(
-        GUIContent.none,
-        m_EventSearchString == string.Empty ? Styles.toolbarSearchFieldCancelEmpty : Styles.toolbarSearchFieldCancel))
-    {
-    }
-}
-
-// The closing parenthesis is being indented twice.
-bool success = GenerateSecondaryUVSet(
-    &mesh.vertices[0].x, mesh.vertices.size(),
-    &triUV[0].x, &triList[0], triSrcPoly.size() ? &triSrcPoly[0] : 0, triCount,
-    &outUV[0].x, param, errorBuffer, bufferSize
-);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60015-UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60015-UNI-14131.cs
deleted file mode 100644
index 9656bee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60015-UNI-14131.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-
-class C
-{
-    public void S()
-    {
-        Action localMethod = () => {
-                SomeClass.OtherMethod(new Dictionary<string, string>
-            {
-                {"a", "one"},
-                {"b", "two"},
-                {"c", "three"}
-            });
-            };
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60016-UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60016-UNI-11662.cs
deleted file mode 100644
index 9a49fdba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60016-UNI-11662.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Unity
-{
-    public class Class
-    {
-        // doesn't work because ; gets removed but
-        public static readonly Class A = new Class() { name = "A", id = 1 };
-        // works and ; doesn't get removed
-        public static readonly Class B = new Class { name = "B", id = 2 };
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60018-UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60018-UNI-18777.cs
deleted file mode 100644
index 198d5be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60018-UNI-18777.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// I want to keeep the function call indented
-Thingy
-    .Select(x => x > 2)
-    .ToList();
-
-// it works with a var
-var x = Thingy
-    .Select(x => x > 2)
-    .ToList();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60019-UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60019-UNI-18780.cs
deleted file mode 100644
index 0eea713e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60019-UNI-18780.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-// note that this only happens with positive int literals. if i use a float with a decimal, or 'c' or "abc" or whatever, or even `(-5)`, it's ok.
-5.Clamp(2, 10).ShouldBe(5);
-5.Clamp(-5, 10).ShouldBe(5);
-5.Clamp("a", 10).ShouldBe(5);
-
-"4".Clamp(2, 10).ShouldBe(5);
-(-5).Clamp(2, 10).ShouldBe(5);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60020-UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60020-UNI-18829.cs
deleted file mode 100644
index a72ca87b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60020-UNI-18829.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// It shouldn't detele the space after the tuple definition
-public static (bool updated, Warnings warnings) UpdateIncludesInFile(
-    string fileToUpdate, string oldIncludeFile, string newIncludeFile)
-{
-    // ...
-}
-
-// It shouldn't detele the space after the tuple definition
-public static (int, string) UpdateIncludesInFile(
-    string fileToUpdate, string oldIncludeFile, string newIncludeFile)
-{
-    // ...
-}
-
-// It shouldn't detele the space after the tuple definition and updated, warnings should be tokenized as types
-public static (updated, warnings) UpdateIncludesInFile(
-    string fileToUpdate, string oldIncludeFile, string newIncludeFile)
-{
-    // ...
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60023-UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60023-UNI-18437.cs
deleted file mode 100644
index d8178e73..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60023-UNI-18437.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-private static Type[] GetAllVisualElementTypes()
-{
-    return typeof(VisualElement).Assembly.GetTypes()
-        .Where(t => t != typeof(VisualElement) &&
-            t != typeof(Panel) &&
-            !t.IsAbstract &&
-            !typeof(IMElement).IsAssignableFrom(t) &&
-            !typeof(IMContainer).IsAssignableFrom(t) &&
-            typeof(VisualElement).IsAssignableFrom(t)).ToArray();
-}
-
-// to this
-private static Type[] GetAllVisualElementAssetTypes()
-{
-    return typeof(VisualElement).Assembly.GetTypes()
-        .Where(t => t != typeof(VisualElement) &&
-            t != typeof(Panel) &&
-            !t.IsAbstract &&
-            !typeof(IMElement).IsAssignableFrom(t) &&
-            !typeof(IMContainer).IsAssignableFrom(t) &&
-            typeof(VisualElement).IsAssignableFrom(t)).ToArray();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60024-UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60024-UNI-19644.cs
deleted file mode 100644
index eb0d4c9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60024-UNI-19644.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-//It deletes the space after {
-class Foo
-{
-    extern internal bool canAccess { [NativeMethod(Name = "CanAccessFromScript")] get; }
-
-    extern public int subMeshCount { get; [NativeMethod(Name = "CanAccessFromScript")] set; }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60026-UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60026-UNI-19895.cs
deleted file mode 100644
index 1fedd580..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60026-UNI-19895.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using UnityEngine;
-using UnityEngine.Serialization;
-namespace UnityEngine.Experimental.Input
-{
-    public class ActionMap : ScriptableObject, IControlDomainSource
-    {
-        public List<InputControl> BuildControlsList()
-        {
-            ControlSetup controlsSetup = new ControlSetup();
-            for (int i = 0; i < actions.Count; i++)
-            {
-                var action = actions[i];
-// This line is kept with 71 spaces.
-                SupportedControl supportedControl = (SupportedControl)(typeof(SupportedControl)
-                    .GetMethod("Get")
-                    .MakeGenericMethod(actions[i].controlType)
-                    .Invoke(null, new object[] { actions[i].name }));
-                action.controlIndex = controlsSetup.AddControl(supportedControl).index;
-            }
-            return controlsSetup.controls;
-        }
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60033-UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60033-UNI-21730.cs
deleted file mode 100644
index 6fcb8c16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60033-UNI-21730.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-private void Foo()

-{

-    Action<UnityPlayerBaseStartInfo, GraphicsTestRunConfiguration, Action<string, Bitmap, long>, RenderingBackend, DX11FeatureLevel? , string> playerRunnerImageCallback

-        = (playerStartInfo, description, incomingScreenshotCallback, configuration, dx11Featurelevel, graphicsDriverType) => incomingScreenshotCallback(filename, new Bitmap(1, 1), 42);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60036-UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60036-UNI-11993.cs
deleted file mode 100644
index bf703537..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60036-UNI-11993.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Namespace

-{

-    public class Class

-    {

-        #if DEBUG

-        public statc foo()

-        {

-        }

-

-        #endif

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60037-UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60037-UNI-29933.cs
deleted file mode 100644
index 943cbf35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60037-UNI-29933.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-void Foo1()

-{

-    switch (foo)

-    {

-        case 1:

-            _bar = new Bar(x, y,

-                z, a);

-            break;

-        case 2:

-            _bar = new Bar(x, y,

-                z, a);

-            break;

-        case 3:

-            _bar = foo.bar;

-            break;

-        case 4:

-            foo.bar = Bar.BarFunc(x, (x == y)

-                ? foo.x

-                : foo.y);

-            break;

-        case 5:

-            foo.bar = Bar.BarFunc(x, (x == y)

-            ? foo.x

-            : foo.y);

-            break;

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60040-UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60040-UNI-30498_2.cs
deleted file mode 100644
index 445a7c97..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60040-UNI-30498_2.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-class Foo

-{

-    public static IEnumerable<NPath> RuntimeIncludes { get; }

-        = new[]

-        {

-        new NPath("Projects/PrecompiledHeaders")

-        };

-

-    void Foo(string file)

-    {

-        var type = Path.GetFileNameWithoutExtension(file);

-        switch (Path.GetExtension(file))

-        {

-            case ".cs":

-                resource = new Bar(string.Format("test output",

-                    type));

-                break;

-            case ".baz":

-                resource = new Baz(type,

-                    string.Format(@"test output

-with multiple

-lines

-",

-                        type));

-                break;

-        }

-    }

-}

-

-public class Bar

-{

-    private static FooBar Baz { get; }

-        = new FooBar()

-            .WithPath("foo/bar/baz")

-            .WithSource("qux/quux/quuz")

-            .WithPrebuiltReference(FooBar.Baz)

-            .WithBaz("2")

-            .Complete();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
deleted file mode 100644
index 2fc371c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-bool success(GenerateSecondaryUVSet(test(

-    &mesh.vertices[0].x, mesh.vertices.size(),

-    &triUV[0].x, &triList[0], triSrcPoly.size() ? &triSrcPoly[0] : 0, triCount,

-    &outUV[0].x, param, errorBuffer, bufferSize

-)));

-

-int m = aaaaaaaaaaabaaaaaaaaaa(caaaaaaaaaa(

-    eaaaaaaaaaa(gaaaaaaaaaaa(haaaaaaaaaaaaa(

-        iaaaaaaaaaaaaaaaaaaaaaa(kaaaaaaaaaaaaaaaaaaaa)

-    )))

-));

-

-int m = aaaaaaaaaaabaaaaaaaaaa(caaaaaaaaaa(

-    eaaaaaaaaaa(gaaaaaaaaaaa(haaaaaaaaaaaaa(

-        iaaaaaaaaaaaaaaaaaaaaaa(kaaaaaaaaaaaaaaaaaaaa)

-    )))

-));

-

-int m = aaaaaaaaaaabaaaaaaaaaa(

-    caaaaaaaaaa(

-        eaaaaaaaaaa(

-            gaaaaaaaaaaa(

-                haaaaaaaaaaaaa(

-                    iaaaaaaaaaaaaaaaaaaaaaa(kaaaaaaaaaaaaaaaaaaaa)

-                )

-            )

-        )

-    )

-);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
deleted file mode 100644
index 4f66d541..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-//This
-var a = hello(
-	@"world"
-	);
-
-//should stay the same.
-//But this
-var a = hello(
-@"world
-");
-
-//should get formatted to this
-var a = hello(
-@"world
-");
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60043-UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60043-UNI-36862.cs
deleted file mode 100644
index cb3cb448..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60043-UNI-36862.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-public unsafe struct QueryKeyNameCommand : IInputDeviceCommandInfo

-{

-    public string ReadKeyName()

-    {

-        fixed(QueryKeyNameCommand* thisPtr = &this)

-        {

-            return StringHelpers.ReadStringFromBuffer(new IntPtr(thisPtr->nameBuffer), kMaxNameLength);

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60044-UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60044-UNI-37241.cs
deleted file mode 100644
index 57d4ffeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60044-UNI-37241.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-public double TotalPurchases { get; set; }

-protected IEnumerable<string> Defines { get; } =

-    TargetPlatformRules.Elements

-    .Append("LINUX")

-    .Append("_RAKNET_LIB");

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60045-add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60045-add-nl-before-namespace.cs
deleted file mode 100644
index d9840704..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60045-add-nl-before-namespace.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace MyNamespace
-{
-
-namespace MyNamespace2
-{
-
-class A
-{
-}
-
-}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40000-HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40000-HashMap.d
deleted file mode 100644
index 74d0614b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40000-HashMap.d
+++ /dev/null
@@ -1,1095 +0,0 @@
-/*******************************************************************************
-
-        @file HashMap.d
-
-        This software is provided 'as-is', without any express or implied
-        warranty. In no event will the authors be held liable for damages
-        of any kind arising from the use of this software.
-
-        Permission is hereby granted to anyone to use this software for any
-        purpose, including commercial applications, and to alter it and/or
-        redistribute it freely, subject to the following restrictions:
-
-        1. The origin of this software must not be misrepresented; you must
-           not claim that you wrote the original software. If you use this
-           software in a product, an acknowledgment within documentation of
-           said product would be appreciated but is not required.
-
-        2. Altered source versions must be plainly marked as such, and must
-           not be misrepresented as being the original software.
-
-        3. This notice may not be removed or altered from any distribution
-           of the source.
-
-        4. Derivative works are permitted, but they must carry this notice
-           in full and credit the original source.
-
-
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-        Written by Doug Lea with assistance from members of JCP JSR-166
-        Expert Group and released to the public domain, as explained at
-        http://creativecommons.org/licenses/publicdomain
-
-        @version        Initial version, July 2004
-        @author         Doug Lea; ported/modified by Kris
-
-*******************************************************************************/
-
-module mango.cache.HashMap;
-
-/******************************************************************************
-
-******************************************************************************/
-
-extern (C)
-{
-int memcmp(char *, char *, uint);
-}
-
-
-/**
- * A hash table supporting full concurrency of retrievals and
- * adjustable expected concurrency for updates. This class obeys the
- * same functional specification as {@link java.util.Hashtable}, and
- * includes versions of methods corresponding to each method of
- * <tt>Hashtable</tt>. However, even though all operations are
- * thread-safe, retrieval operations do <em>not</em> entail locking,
- * and there is <em>not</em> any support for locking the entire table
- * in a way that prevents all access.  This class is fully
- * interoperable with <tt>Hashtable</tt> in programs that rely on its
- * thread safety but not on its synchronization details.
- *
- * <p> Retrieval operations (including <tt>get</tt>) generally do not
- * block, so may overlap with update operations (including
- * <tt>put</tt> and <tt>remove</tt>). Retrievals reflect the results
- * of the most recently <em>completed</em> update operations holding
- * upon their onset.  For aggregate operations such as <tt>putAll</tt>
- * and <tt>clear</tt>, concurrent retrievals may reflect insertion or
- * removal of only some entries.  Similarly, Iterators and
- * Enumerations return elements reflecting the state of the hash table
- * at some point at or since the creation of the iterator/enumeration.
- * They do <em>not</em> throw
- * {@link ConcurrentModificationException}.  However, iterators are
- * designed to be used by only one thread at a time.
- *
- * <p> The allowed concurrency among update operations is guided by
- * the optional <tt>concurrencyLevel</tt> constructor argument
- * (default 16), which is used as a hint for internal sizing.  The
- * table is internally partitioned to try to permit the indicated
- * number of concurrent updates without contention. Because placement
- * in hash tables is essentially random, the actual concurrency will
- * vary.  Ideally, you should choose a value to accommodate as many
- * threads as will ever concurrently modify the table. Using a
- * significantly higher value than you need can waste space and time,
- * and a significantly lower value can lead to thread contention. But
- * overestimates and underestimates within an order of magnitude do
- * not usually have much noticeable impact. A value of one is
- * appropriate when it is known that only one thread will modify and
- * all others will only read. Also, resizing this or any other kind of
- * hash table is a relatively slow operation, so, when possible, it is
- * a good idea to provide estimates of expected table sizes in
- * constructors.
- *
- * <p>This class and its views and iterators implement all of the
- * <em>optional</em> methods of the {@link Map} and {@link Iterator}
- * interfaces.
- *
- * <p> Like {@link java.util.Hashtable} but unlike {@link
- * java.util.HashMap}, this class does NOT allow <tt>null</tt> to be
- * used as a key or value.
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../guide/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @since 1.5
- * @author Doug Lea
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- */
-
-class HashMap
-{
-    alias void[] K;
-    alias Object V;
-    alias jhash hash;           // jhash, fnv, or walter
-
-    /*
-     * The basic strategy is to subdivide the table among Segments,
-     * each of which itself is a concurrently readable hash table.
-     */
-
-    /* ---------------- Constants -------------- */
-
-    /**
-     * The default initial number of table slots for this table.
-     * Used when not otherwise specified in constructor.
-     */
-    private const uint DEFAULT_INITIAL_CAPACITY = 16;
-
-    /**
-     * The maximum capacity, used if a higher value is implicitly
-     * specified by either of the constructors with arguments.  MUST
-     * be a power of two <= 1<<30 to ensure that entries are indexible
-     * using ints.
-     */
-    private const uint MAXIMUM_CAPACITY = 1 << 30;
-
-    /**
-     * The default load factor for this table.  Used when not
-     * otherwise specified in constructor.
-     */
-    private const float DEFAULT_LOAD_FACTOR = 0.75f;
-
-    /**
-     * The default number of concurrency control segments.
-     **/
-    private const uint DEFAULT_SEGMENTS = 16;
-
-    /**
-     * The maximum number of segments to allow; used to bound
-     * constructor arguments.
-     */
-    private const uint MAX_SEGMENTS = 1 << 16; // slightly conservative
-
-
-    /* ---------------- Fields -------------- */
-
-    /**
-     * Mask value for indexing into segments. The upper bits of a
-     * key's hash code are used to choose the segment.
-     **/
-    private final int segmentMask;
-
-    /**
-     * Shift value for indexing within segments.
-     **/
-    private final int segmentShift;
-
-    /**
-     * The segments, each of which is a specialized hash table
-     */
-    private final Segment[] segments;
-
-
-    /* ---------------- Small Utilities -------------- */
-
-    /**
-     * Returns a hash code for non-null Object x.
-     * Uses the same hash code spreader as most other java.util hash tables.
-     * @param x the object serving as a key
-     * @return the hash code
-     */
-    private static final uint walter(K x)
-    {
-        uint h = typeid(char[]).getHash(&x);
-
-        h += ~(h << 9);
-        h ^= (h >>> 14);
-        h += (h << 4);
-        h ^= (h >>> 10);
-        return h;
-    }
-
-    /**
-     * Returns a hash code for non-null Object x.
-     * uses the FNV hash function
-     * @param x the object serving as a key
-     * @return the hash code
-     */
-    private static final uint fnv(K x)
-    {
-        uint hash = 2_166_136_261;
-
-        foreach (ubyte c; cast(ubyte[])x)
-        {
-            hash ^= c;
-            hash *= 16_777_619;
-        }
-        return hash;
-    }
-
-
-
-    /**
-     * hash() -- hash a variable-length key into a 32-bit value
-     *   k     : the key (the unaligned variable-length array of bytes)
-     *   len   : the length of the key, counting by bytes
-     *   level : can be any 4-byte value
-     * Returns a 32-bit value.  Every bit of the key affects every bit of
-     * the return value.  Every 1-bit and 2-bit delta achieves avalanche.
-     * About 36+6len instructions.
-     *
-     * The best hash table sizes are powers of 2.  There is no need to do
-     * mod a prime (mod is sooo slow!).  If you need less than 32 bits,
-     * use a bitmask.  For example, if you need only 10 bits, do
-     *   h = (h & hashmask(10));
-     * In which case, the hash table should have hashsize(10) elements.
-     *
-     * If you are hashing n strings (ub1 **)k, do it like this:
-     *   for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
-     *
-     * By Bob Jenkins, 1996.  bob_jenkins@burtleburtle.net.  You may use this
-     * code any way you wish, private, educational, or commercial.  It's free.
-     *
-     * See http://burlteburtle.net/bob/hash/evahash.html
-     * Use for hash table lookup, or anything where one collision in 2^32 is
-     * acceptable. Do NOT use for cryptographic purposes.
-     */
-
-    static final uint jhash(K x)
-    {
-        ubyte *k;
-        uint  a,
-              b,
-              c,
-              len;
-
-        len = x.length;
-        k   = cast(ubyte *)x;
-        a   = b = 0x9e3779b9;
-
-        // the previous hash value
-        c = 0;
-
-        // handle most of the key
-        while (len >= 12)
-        {
-            a += *cast(uint *)(k + 0);
-            b += *cast(uint *)(k + 4);
-            c += *cast(uint *)(k + 8);
-
-            a -= b; a -= c; a ^= (c >> 13);
-            b -= c; b -= a; b ^= (a << 8);
-            c -= a; c -= b; c ^= (b >> 13);
-            a -= b; a -= c; a ^= (c >> 12);
-            b -= c; b -= a; b ^= (a << 16);
-            c -= a; c -= b; c ^= (b >> 5);
-            a -= b; a -= c; a ^= (c >> 3);
-            b -= c; b -= a; b ^= (a << 10);
-            c -= a; c -= b; c ^= (b >> 15);
-            k += 12; len -= 12;
-        }
-
-        // handle the last 11 bytes
-        c += x.length;
-        switch (len)
-        {
-        case 11: c += (cast(uint)k[10] << 24);
-
-        case 10: c += (cast(uint)k[9] << 16);
-
-        case 9: c += (cast(uint)k[8] << 8);
-
-        case 8: b += (cast(uint)k[7] << 24);
-
-        case 7: b += (cast(uint)k[6] << 16);
-
-        case 6: b += (cast(uint)k[5] << 8);
-
-        case 5: b += k[4];
-
-        case 4: a += (cast(uint)k[3] << 24);
-
-        case 3: a += (cast(uint)k[2] << 16);
-
-        case 2: a += (cast(uint)k[1] << 8);
-
-        case 1: a += k[0];
-
-        default:
-        }
-
-        a -= b; a -= c; a ^= (c >> 13);
-        b -= c; b -= a; b ^= (a << 8);
-        c -= a; c -= b; c ^= (b >> 13);
-        a -= b; a -= c; a ^= (c >> 12);
-        b -= c; b -= a; b ^= (a << 16);
-        c -= a; c -= b; c ^= (b >> 5);
-        a -= b; a -= c; a ^= (c >> 3);
-        b -= c; b -= a; b ^= (a << 10);
-        c -= a; c -= b; c ^= (b >> 15);
-
-        return c;
-    }
-
-
-    /**
-     * Returns the segment that should be used for key with given hash
-     * @param hash the hash code for the key
-     * @return the segment
-     */
-    private final Segment segmentFor(uint hash)
-    {
-        return segments[(hash >>> segmentShift) & segmentMask];
-    }
-
-    /* ---------------- Inner Classes -------------- */
-
-    /**
-     * ConcurrentHashMap list entry. Note that this is never exported
-     * out as a user-visible Map.Entry.
-     *
-     * Because the value field is volatile, not final, it is legal wrt
-     * the Java Memory Model for an unsynchronized reader to see null
-     * instead of initial value when read via a data race.  Although a
-     * reordering leading to this is not likely to ever actually
-     * occur, the Segment.readValueUnderLock method is used as a
-     * backup in case a null (pre-initialized) value is ever seen in
-     * an unsynchronized access method.
-     */
-    private static class HashEntry
-    {
-        final K         key;
-        final uint      hash;
-        final V         value;
-        final HashEntry next;
-
-        this(K key, uint hash, HashEntry next, V value)
-        {
-            this.key   = key;
-            this.hash  = hash;
-            this.next  = next;
-            this.value = value;
-        }
-    }
-
-    /**
-     * Segments are specialized versions of hash tables.  This
-     * subclasses from ReentrantLock opportunistically, just to
-     * simplify some locking and avoid separate construction.
-     **/
-    static class Segment
-    {
-        /*
-         * Segments maintain a table of entry lists that are ALWAYS
-         * kept in a consistent state, so can be read without locking.
-         * Next fields of nodes are immutable (final).  All list
-         * additions are performed at the front of each bin. This
-         * makes it easy to check changes, and also fast to traverse.
-         * When nodes would otherwise be changed, new nodes are
-         * created to replace them. This works well for hash tables
-         * since the bin lists tend to be short. (The average length
-         * is less than two for the default load factor threshold.)
-         *
-         * Read operations can thus proceed without locking, but rely
-         * on selected uses of volatiles to ensure that completed
-         * write operations performed by other threads are
-         * noticed. For most purposes, the "count" field, tracking the
-         * number of elements, serves as that volatile variable
-         * ensuring visibility.  This is convenient because this field
-         * needs to be read in many read operations anyway:
-         *
-         *   - All (unsynchronized) read operations must first read the
-         *     "count" field, and should not look at table entries if
-         *     it is 0.
-         *
-         *   - All (synchronized) write operations should write to
-         *     the "count" field after structurally changing any bin.
-         *     The operations must not take any action that could even
-         *     momentarily cause a concurrent read operation to see
-         *     inconsistent data. This is made easier by the nature of
-         *     the read operations in Map. For example, no operation
-         *     can reveal that the table has grown but the threshold
-         *     has not yet been updated, so there are no atomicity
-         *     requirements for this with respect to reads.
-         *
-         * As a guide, all critical volatile reads and writes to the
-         * count field are marked in code comments.
-         */
-
-        /**
-         * The number of elements in this segment's region.
-         **/
-        int count;
-
-        /**
-         * The table is rehashed when its size exceeds this threshold.
-         * (The value of this field is always (int)(capacity *
-         * loadFactor).)
-         */
-        int threshold;
-
-        /**
-         * The per-segment table. Declared as a raw type, casted
-         * to HashEntry<K,V> on each use.
-         */
-        HashEntry[] table;
-
-        /**
-         * The load factor for the hash table.  Even though this value
-         * is same for all segments, it is replicated to avoid needing
-         * links to outer object.
-         * @serial
-         */
-        final float loadFactor;
-
-        this(int initialCapacity, float lf)
-        {
-            loadFactor = lf;
-            setTable(new HashEntry[initialCapacity]);
-        }
-
-        /**
-         * Set table to new HashEntry array.
-         * Call only while holding lock or in constructor.
-         **/
-        private final void setTable(HashEntry[] newTable)
-        {
-            threshold = cast(int)(newTable.length * loadFactor);
-            volatile table = newTable;
-        }
-
-        /**
-         * Return properly casted first entry of bin for given hash
-         */
-        private final HashEntry getFirst(uint hash)
-        {
-            HashEntry[] tab;
-
-            volatile tab = table;
-            return tab[hash & (tab.length - 1)];
-        }
-
-        /**
-         * Return true if the two keys match
-         */
-        private static final bool matchKey(K a, K b)
-        {
-            if (a.length == b.length)
-                return cast(bool)(memcmp(cast(char *)a, cast(char *)b, a.length) == 0);
-
-            return false;
-        }
-
-        /* Specialized implementations of map methods */
-
-        final V get(K key, uint hash)
-        {
-            int c;
-
-            // read-volatile
-            volatile c = count;
-            if (c)
-            {
-                HashEntry e = getFirst(hash);
-                while (e)
-                {
-                    if (hash == e.hash && matchKey(key, e.key))
-                    {
-                        V v;
-                        volatile v = e.value;
-                        if (v)
-                            return v;
-
-                        synchronized (this)
-                        return e.value;
-                    }
-                    e = e.next;
-                }
-            }
-            return null;
-        }
-
-
-        final bool containsKey(K key, uint hash)
-        {
-            int c;
-
-            // read-volatile
-            volatile c = count;
-            if (c)
-            {
-                HashEntry e = getFirst(hash);
-                while (e)
-                {
-                    if (e.hash == hash && matchKey(key, e.key))
-                        return true;
-
-                    e = e.next;
-                }
-            }
-            return false;
-        }
-
-
-
-        final synchronized V replace(K key, uint hash, V newValue)
-        {
-            HashEntry e = getFirst(hash);
-
-            while (e && (e.hash != hash || !matchKey(key, e.key)))
-                e = e.next;
-
-            V oldValue = null;
-
-            if (e)
-                volatile
-                {
-                    oldValue = e.value;
-                    e.value  = newValue;
-                }
-            return oldValue;
-        }
-
-
-        final synchronized V put(K key, uint hash, V value, bool onlyIfAbsent)
-        {
-            int c;
-
-            volatile c = count;
-            if (c++ > threshold)
-                rehash();
-
-            HashEntry[] tab;
-            volatile tab = table;
-            uint        index = hash & (tab.length - 1);
-            HashEntry   first = tab[index];
-            HashEntry   e     = first;
-
-            while (e && (e.hash != hash || !matchKey(key, e.key)))
-                e = e.next;
-
-            V oldValue;
-
-            if (e)
-            {
-                volatile oldValue = e.value;
-                if (!onlyIfAbsent)
-                    volatile e.value = value;
-            }
-            else
-            {
-                oldValue   = null;
-                tab[index] = new HashEntry(key, hash, first, value);
-
-                // write-volatile
-                volatile count = c;
-            }
-            return oldValue;
-        }
-
-
-        private final void rehash()
-        {
-            HashEntry[] oldTable;
-
-            volatile oldTable = table;
-            int oldCapacity = oldTable.length;
-
-            if (oldCapacity >= MAXIMUM_CAPACITY)
-                return;
-
-            /*
-             * Reclassify nodes in each list to new Map.  Because we are
-             * using power-of-two expansion, the elements from each bin
-             * must either stay at same index, or move with a power of two
-             * offset. We eliminate unnecessary node creation by catching
-             * cases where old nodes can be reused because their next
-             * fields won't change. Statistically, at the default
-             * threshold, only about one-sixth of them need cloning when
-             * a table doubles. The nodes they replace will be garbage
-             * collectable as soon as they are no longer referenced by any
-             * reader thread that may be in the midst of traversing table
-             * right now.
-             */
-
-            HashEntry[] newTable = new HashEntry[oldCapacity << 1];
-            threshold = cast(int)(newTable.length * loadFactor);
-            int         sizeMask = newTable.length - 1;
-
-            for (int i = 0; i < oldCapacity; ++i)
-            {
-                // We need to guarantee that any existing reads of old Map can
-                //  proceed. So we cannot yet null out each bin.
-                HashEntry e = oldTable[i];
-
-                if (e)
-                {
-                    HashEntry next = e.next;
-                    uint      idx  = e.hash & sizeMask;
-
-                    //  Single node on list
-                    if (next is null)
-                        newTable[idx] = e;
-                    else
-                    {
-                        // Reuse trailing consecutive sequence at same slot
-                        HashEntry lastRun = e;
-                        int       lastIdx = idx;
-                        for (HashEntry last = next; last; last = last.next)
-                        {
-                            uint k = last.hash & sizeMask;
-                            if (k != lastIdx)
-                            {
-                                lastIdx = k;
-                                lastRun = last;
-                            }
-                        }
-                        newTable[lastIdx] = lastRun;
-
-                        // Clone all remaining nodes
-                        for (HashEntry p = e; p !is lastRun; p = p.next)
-                        {
-                            uint      k = p.hash & sizeMask;
-                            HashEntry n = newTable[k];
-                            newTable[k] = new HashEntry(p.key, p.hash, n, p.value);
-                        }
-                    }
-                }
-            }
-            volatile table = newTable;
-        }
-
-        /**
-         * Remove; match on key only if value null, else match both.
-         */
-        final synchronized V remove(K key, uint hash, V value)
-        {
-            int         c;
-
-            HashEntry[] tab;
-
-            volatile c = count - 1;
-            volatile tab = table;
-
-            uint      index = hash & (tab.length - 1);
-            HashEntry first = tab[index];
-            HashEntry e     = first;
-
-            while (e && (e.hash != hash || !matchKey(key, e.key)))
-                e = e.next;
-
-            V oldValue = null;
-
-            if (e)
-            {
-                V v;
-                volatile v = e.value;
-                if (value is null || value == v)
-                {
-                    oldValue = v;
-
-                    // All entries following removed node can stay
-                    // in list, but all preceding ones need to be
-                    // cloned.
-                    HashEntry newFirst = e.next;
-                    for (HashEntry p = first; p !is e; p = p.next)
-                        newFirst = new HashEntry(p.key, p.hash, newFirst, p.value);
-                    tab[index] = newFirst;
-
-                    // write-volatile
-                    volatile count = c;
-                }
-            }
-            return oldValue;
-        }
-
-
-        final synchronized void clear()
-        {
-            if (count)
-            {
-                HashEntry[] tab;
-                volatile tab = table;
-
-                for (int i = 0; i < tab.length; i++)
-                    tab[i] = null;
-
-                // write-volatile
-                volatile count = 0;
-            }
-        }
-    }
-
-
-
-    /* ---------------- Public operations -------------- */
-
-    /**
-     * Creates a new, empty map with the specified initial
-     * capacity and the specified load factor.
-     *
-     * @param initialCapacity the initial capacity. The implementation
-     * performs internal sizing to accommodate this many elements.
-     * @param loadFactor  the load factor threshold, used to control resizing.
-     * @param concurrencyLevel the estimated number of concurrently
-     * updating threads. The implementation performs internal sizing
-     * to try to accommodate this many threads.
-     * @throws IllegalArgumentException if the initial capacity is
-     * negative or the load factor or concurrencyLevel are
-     * nonpositive.
-     */
-    public this(uint initialCapacity, float loadFactor, uint concurrencyLevel)
-    {
-        assert(loadFactor > 0);
-
-        if (concurrencyLevel > MAX_SEGMENTS)
-            concurrencyLevel = MAX_SEGMENTS;
-
-        // Find power-of-two sizes best matching arguments
-        int sshift = 0;
-        int ssize  = 1;
-        while (ssize < concurrencyLevel)
-        {
-            ++sshift;
-            ssize <<= 1;
-        }
-
-        segmentShift  = 32 - sshift;
-        segmentMask   = ssize - 1;
-        this.segments = new Segment[ssize];
-
-        if (initialCapacity > MAXIMUM_CAPACITY)
-            initialCapacity = MAXIMUM_CAPACITY;
-
-        int c = initialCapacity / ssize;
-        if (c * ssize < initialCapacity)
-            ++c;
-
-        int cap = 1;
-        while (cap < c)
-            cap <<= 1;
-
-        for (int i = 0; i < this.segments.length; ++i)
-            this.segments[i] = new Segment(cap, loadFactor);
-    }
-
-    /**
-     * Creates a new, empty map with the specified initial
-     * capacity,  and with default load factor and concurrencyLevel.
-     *
-     * @param initialCapacity The implementation performs internal
-     * sizing to accommodate this many elements.
-     * @throws IllegalArgumentException if the initial capacity of
-     * elements is negative.
-     */
-    public this(uint initialCapacity)
-    {
-        this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_SEGMENTS);
-    }
-
-    /**
-     * Creates a new, empty map with a default initial capacity,
-     * load factor, and concurrencyLevel.
-     */
-    public this()
-    {
-        this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_SEGMENTS);
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped in this table.
-     *
-     * @param   key   a key in the table.
-     * @return  the value to which the key is mapped in this table;
-     *          <tt>null</tt> if the key is not mapped to any value in
-     *          this table.
-     * @throws  NullPointerException  if the key is
-     *               <tt>null</tt>.
-     */
-    public V get(K key)
-    {
-        uint hash = hash(key); // throws NullPointerException if key null
-
-        return segmentFor(hash).get(key, hash);
-    }
-
-    /**
-     * Tests if the specified object is a key in this table.
-     *
-     * @param   key   possible key.
-     * @return  <tt>true</tt> if and only if the specified object
-     *          is a key in this table, as determined by the
-     *          <tt>equals</tt> method; <tt>false</tt> otherwise.
-     * @throws  NullPointerException  if the key is
-     *               <tt>null</tt>.
-     */
-    public bool containsKey(K key)
-    {
-        uint hash = hash(key); // throws NullPointerException if key null
-
-        return segmentFor(hash).containsKey(key, hash);
-    }
-
-    /**
-     * Maps the specified <tt>key</tt> to the specified
-     * <tt>value</tt> in this table. Neither the key nor the
-     * value can be <tt>null</tt>.
-     *
-     * <p> The value can be retrieved by calling the <tt>get</tt> method
-     * with a key that is equal to the original key.
-     *
-     * @param      key     the table key.
-     * @param      value   the value.
-     * @return     the previous value of the specified key in this table,
-     *             or <tt>null</tt> if it did not have one.
-     * @throws  NullPointerException  if the key or value is
-     *               <tt>null</tt>.
-     */
-    public V put(K key, V value)
-    {
-        assert(value);
-
-        uint hash = hash(key);
-
-        return segmentFor(hash).put(key, hash, value, false);
-    }
-
-    /**
-     * If the specified key is not already associated
-     * with a value, associate it with the given value.
-     * This is equivalent to
-     * <pre>
-     *   if (!map.containsKey(key))
-     *      return map.put(key, value);
-     *   else
-     *      return map.get(key);
-     * </pre>
-     * Except that the action is performed atomically.
-     * @param key key with which the specified value is to be associated.
-     * @param value value to be associated with the specified key.
-     * @return previous value associated with specified key, or <tt>null</tt>
-     *         if there was no mapping for key.
-     * @throws NullPointerException if the specified key or value is
-     *            <tt>null</tt>.
-     */
-    public V putIfAbsent(K key, V value)
-    {
-        assert(value);
-
-        uint hash = hash(key);
-
-        return segmentFor(hash).put(key, hash, value, true);
-    }
-
-
-    /**
-     * Removes the key (and its corresponding value) from this
-     * table. This method does nothing if the key is not in the table.
-     *
-     * @param   key   the key that needs to be removed.
-     * @return  the value to which the key had been mapped in this table,
-     *          or <tt>null</tt> if the key did not have a mapping.
-     * @throws  NullPointerException  if the key is
-     *               <tt>null</tt>.
-     */
-    public V remove(K key)
-    {
-        uint hash = hash(key);
-
-        return segmentFor(hash).remove(key, hash, null);
-    }
-
-    /**
-     * Remove entry for key only if currently mapped to given value.
-     * Acts as
-     * <pre>
-     *  if (map.get(key).equals(value)) {
-     *     map.remove(key);
-     *     return true;
-     * } else return false;
-     * </pre>
-     * except that the action is performed atomically.
-     * @param key key with which the specified value is associated.
-     * @param value value associated with the specified key.
-     * @return true if the value was removed
-     * @throws NullPointerException if the specified key is
-     *            <tt>null</tt>.
-     */
-    public bool remove(K key, V value)
-    {
-        uint hash = hash(key);
-
-        return cast(bool)(segmentFor(hash).remove(key, hash, value) !is null);
-    }
-
-
-    /**
-     * Replace entry for key only if currently mapped to some value.
-     * Acts as
-     * <pre>
-     *  if ((map.containsKey(key)) {
-     *     return map.put(key, value);
-     * } else return null;
-     * </pre>
-     * except that the action is performed atomically.
-     * @param key key with which the specified value is associated.
-     * @param value value to be associated with the specified key.
-     * @return previous value associated with specified key, or <tt>null</tt>
-     *         if there was no mapping for key.
-     * @throws NullPointerException if the specified key or value is
-     *            <tt>null</tt>.
-     */
-    public V replace(K key, V value)
-    {
-        assert(value);
-
-        uint hash = hash(key);
-
-        return segmentFor(hash).replace(key, hash, value);
-    }
-
-
-    /**
-     * Removes all mappings from this map.
-     */
-    public void clear()
-    {
-        for (int i = 0; i < segments.length; ++i)
-            segments[i].clear();
-    }
-
-
-    /**
-     * Returns an enumeration of the keys in this table.
-     *
-     * @return  an enumeration of the keys in this table.
-     * @see     #keySet
-     */
-    public KeyIterator keys()
-    {
-        return new KeyIterator(this);
-    }
-
-    /**
-     * Returns an enumeration of the values in this table.
-     *
-     * @return  an enumeration of the values in this table.
-     * @see     #values
-     */
-    public ValueIterator elements()
-    {
-        return new ValueIterator(this);
-    }
-
-    /**********************************************************************
-
-            Iterate over all keys in hashmap
-
-    **********************************************************************/
-
-    int opApply(int delegate(inout char[]) dg)
-    {
-        int         result   = 0;
-        KeyIterator iterator = keys();
-
-        while (iterator.hasNext)
-        {
-            char[] ca = cast(char[])iterator.next;
-            if ((result = dg(ca)) != 0)
-                break;
-        }
-        return result;
-    }
-
-    /**********************************************************************
-
-            Iterate over all keys in hashmap
-
-    **********************************************************************/
-
-    int opApply(int delegate(inout char[], inout Object) dg)
-    {
-        int         result   = 0;
-        KeyIterator iterator = keys();
-
-        while (iterator.hasNext)
-        {
-            HashEntry he = iterator.nextElement;
-            char[]    ca = cast(char[])he.key;
-            if ((result = dg(ca, he.value)) != 0)
-                break;
-        }
-        return result;
-    }
-
-
-    /* ---------------- Iterator Support -------------- */
-
-    abstract static class HashIterator
-    {
-        int         nextSegmentIndex;
-        int         nextTableIndex;
-        HashEntry[] currentTable;
-        HashEntry   nextEntry;
-        HashEntry   lastReturned;
-        HashMap     map;
-
-        this(HashMap map)
-        {
-            this.map         = map;
-            nextSegmentIndex = map.segments.length - 1;
-            nextTableIndex   = -1;
-            advance();
-        }
-
-        final void advance()
-        {
-            if (nextEntry !is null && (nextEntry = nextEntry.next) !is null)
-                return;
-
-            while (nextTableIndex >= 0)
-            {
-                if ((nextEntry = currentTable[nextTableIndex--]) !is null)
-                    return;
-            }
-
-            while (nextSegmentIndex >= 0)
-            {
-                Segment seg = map.segments[nextSegmentIndex--];
-                volatile if (seg.count)
-                    {
-                        currentTable = seg.table;
-                        for (int j = currentTable.length - 1; j >= 0; --j)
-                        {
-                            if ((nextEntry = currentTable[j]) !is null)
-                            {
-                                nextTableIndex = j - 1;
-                                return;
-                            }
-                        }
-                    }
-            }
-        }
-
-        public bool hasNext()
-        {
-            return cast(bool)(nextEntry !is null);
-        }
-
-        HashEntry nextElement()
-        {
-            if (nextEntry is null)
-                throw new Exception("no such element in HashMap");
-
-            lastReturned = nextEntry;
-            advance();
-            return lastReturned;
-        }
-    }
-
-    static class KeyIterator : HashIterator
-    {
-        this(HashMap map) {
-            super(map);
-        }
-        public K next()
-        {
-            return super.nextElement().key;
-        }
-    }
-
-    static class ValueIterator : HashIterator
-    {
-        this(HashMap map) {
-            super(map);
-        }
-        public V next()
-        {
-            volatile return super.nextElement().value;
-        }
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40001-imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40001-imports.d
deleted file mode 100644
index 9f12a88e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40001-imports.d
+++ /dev/null
@@ -1,8 +0,0 @@
-
-private import mango.cache.Payload;
-
-private import mango.io.Exception,
-               mango.io.PickleRegistry;
-
-public import mango.cluster.model.ICluster;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40002-volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40002-volatile.d
deleted file mode 100644
index 4dbd66dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40002-volatile.d
+++ /dev/null
@@ -1,27 +0,0 @@
-void foo(void)
-{
-    while (nextSegmentIndex >= 0)
-    {
-        Segment seg = map.segments[nextSegmentIndex--];
-        volatile if (seg.count)
-            {
-                currentTable = seg.table;
-                for (int j = currentTable.length - 1; j >= 0; --j)
-                {
-                    if ((nextEntry = currentTable[j]) !is null)
-                    {
-                        nextTableIndex = j - 1;
-                        return;
-                    }
-                }
-            }
-    }
-
-    if (e)
-        volatile
-        {
-            oldValue = e.value;
-            e.value  = newValue;
-        }
-    return oldValue;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40003-volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40003-volatile-1.d
deleted file mode 100644
index 2ef2634d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40003-volatile-1.d
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    while (a)
-    {
-        volatile if (b)
-            {
-                b--;
-                break;
-            }
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40004-volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40004-volatile-2.d
deleted file mode 100644
index bc5a0de4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40004-volatile-2.d
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    if (e)
-        volatile
-        {
-            a++;
-        }
-    return oldValue;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40005-volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40005-volatile-3.d
deleted file mode 100644
index 039f788a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40005-volatile-3.d
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    if (e)
-    {
-        if (!value)
-            volatile e.value = value;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40006-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40006-Lexer.d
deleted file mode 100644
index 86e1144a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40006-Lexer.d
+++ /dev/null
@@ -1,2472 +0,0 @@
-/+

-        Copyright (c) 1999-2006 by Digital Mars

-        All Rights Reserved

-        written by Walter Bright www.digitalmars.com

-        License for redistribution is by either the Artistic License in artistic.txt, or the GNU General Public License in gnu.txt.

-        See the included readme.txt for details.

-        D Language conversion by: J Duncan

- +/

-

-/**

-        d language lexer

- */

-

-module dparser.Lexer;

-

-import dparser.Root;

-

-import dparser.Tokens;

-import dparser.Token;

-import dparser.Keyword;

-

-import dparser.Types;

-

-import dparser.Module;

-import dparser.Identifier;

-import dparser.unialpha;

-

-import dparser.OutBuffer;

-

-//private import std.ctype;

-//private import std.string;

-//import dwf.core.debugapi;

-

-int errno = 0;

-

-//#if _WIN32 && __DMC__

-// from \dm\src\include\setlocal.h

-//extern "C" char * __cdecl __locale_decpoint;

-char *__locale_decpoint;

-//#endif

-//const uint LS = 0x2028;	// UTF line separator

-//const uint PS = 0x2029;	// UTF paragraph separator

-

-//extern int isUniAlpha(unsigned u);

-//extern int HtmlNamedEntity(unsigned char *p, int length);

-

-/**

-        Lexer object

- */

-

-class Lexer

-{

-    static           Identifier[char[]]       stringtable;

-    static OutBuffer stringbuffer;

-    static Token     *freelist;

-

-    Token            token;        // current token

-    Module           mod;          // current module

-    Loc              loc;          // for error messages

-    ubyte            *base;        // pointer to start of buffer

-    ubyte            *end;         // past end of buffer

-    ubyte            *p;           // current character

-    int              doDocComment; // collect doc comment information

-    int              anyToken;     // !=0 means seen at least one token

-    int              commentToken; // !=0 means comments are TOKcomment's

-

-

-    this(Module mod, ubyte *base, uint begoffset, uint endoffset, int doDocComment, int commentToken)

-    {

-        if (stringbuffer is null)

-            stringbuffer = new OutBuffer;

-        loc = Loc(mod, 1);

-

-        this.base         = base;

-        this.end          = base + endoffset;

-        this.p            = base + begoffset;

-        this.mod          = mod;

-        this.doDocComment = doDocComment;

-        this.commentToken = commentToken;

-

-        /*

-                If first line starts with '#!', ignore the line

-         */

-

-        if (p[0] == '#' && p[1] == '!')

-        {

-            p += 2;

-            while (true)

-            {

-                ubyte c = *p;

-                switch (c)

-                {

-                case '\n':

-                    p++;

-                    break;

-

-                case '\r':

-                    p++;

-                    if (*p == '\n')

-                        p++;

-                    break;

-

-                case 0:

-                case 0x1A:

-                    break;

-

-                default:

-                    if (c & 0x80)

-                    {

-                        uint u = decodeUTF();

-                        if (u == PS || u == LS)

-                            break;

-                    }

-                    p++;

-                    continue;

-                }

-                break;

-            }

-

-            loc.linnum = 2;

-        }

-    }

-

-

-

-    // generate a unique identifier for this string

-    static Identifier idPool(in char[] str)

-    {

-//	    StringValue sv;

-//	    uint len = s.length;

-//	    StringValue sv = stringtable.update(s, len);

-//	    Identifier* id = cast(Identifier*) sv.ptrvalue;

-//	    if( id is null )

-        if ((str in stringtable) == null)

-        {

-            stringtable[str] = new Identifier(str, TOK.TOKidentifier);

-        }

-        return stringtable[str];

-    }

-

-    static void initKeywords()

-    {

-        // build character map

-        cmtable_init();

-

-        // create keyword tokens & identifiers

-        dparser.Keyword.initKeywords();

-

-        // create standard lexer tokens

-        dparser.Token.createLexerTokens();

-    }

-

-    // Combine two document comments into one.

-    static char[] combineComments(char[] c1, char[] c2)

-    {

-        char[] c = c2;

-        if (c1.length)

-        {

-            c = c1;

-            if (c2.length)

-            {

-                c = c1 ~ "\n" ~ c2;

-            }

-        }

-        return c;

-    }

-

-    // Decode UTF character. Issue error messages for invalid sequences. Return decoded character, advance p to last character in UTF sequence.

-    //! fix

-    uint decodeUTF()

-    {

-        ubyte *s = p;

-        ubyte c  = *s;

-

-        assert(c & 0x80);

-        if (!(c & 0x80))

-            return c;

-

-        return cast(uint)'X';

-        /*

-            dchar u;

-            uint len;

-

-

-

-            // Check length of remaining string up to 6 UTF-8 characters

-            for( len = 1; len < 6 && s[len]; len++ )

-            {

-

-            }

-                        /+

-            uint idx = 0;

-            char* msg = utf_decodeChar( s, len, &idx, &u );

-            p += idx - 1;

-            if( msg )

-            {

-                        error(msg);

-            }

-           +/

-            return u;

-         */

-    }

-

-    void error(...)

-    {

-        if ((mod !is null) && !global.gag)

-        {

-            writefln(formatLoc(loc, _arguments, _argptr));

-            /*

-               char[] p = loc.toChars();

-               if( p.length )

-                writef( "%s: ", p );

-               writefx( stdout, _arguments, _argptr, 1 );

-             */

-            if (global.errors >= global.max_errors)                     // moderate blizzard of cascading messages

-                throw new Exception("too many errors");

-        }

-

-        global.errors++;

-    }

-

-    void errorLoc(Loc loc, ...)

-    {

-        if ((mod !is null) && !global.gag)

-        {

-            writefln(formatLoc(loc, _arguments, _argptr));

-            /*

-               char[] p = loc.toChars();

-               if( p.length )

-                writef("%s: ", p);

-               writefx(stdout, _arguments, _argptr, 1);

-             */

-            if (global.errors >= 20)                    // moderate blizzard of cascading messages

-                throw new Exception("too many errors");

-        }

-

-        global.errors++;

-    }

-

-

-    TOK nextToken()

-    {

-        if (token.next)

-        {

-            Token *t = token.next;

-            memcpy(&token, t, Token.sizeof);

-//			t.next = freelist;

-//			freelist = t;

-        }

-        else

-        {

-            scan(&token);

-        }

-//	    token.print();

-        return token.value;

-    }

-

-    Token *peek(inout Token ct)

-    {

-        Token *t;

-

-        if (ct.next)

-            t = ct.next;

-        else

-        {

-            t = new Token;

-            scan(t);

-            t.next  = null;

-            ct.next = t;

-        }

-        return t;

-    }

-

-    // Turn next token in buffer into a token.

-

-    void scan(Token *t)

-    {

-//		debug writefln("scan token");

-        uint lastLine = loc.linnum;

-        uint linnum;

-

-        t.blockComment = null;

-        t.lineComment  = null;

-        while (true)

-        {

-            t.ptr = p;

-//			debug writefln( "    p = %d, *p = ", cast(uint)p, cast(char)*p );

-            switch (*p)

-            {

-            case 0:

-            case 0x1a:

-                t.value = TOK.TOKeof;                                           // end of file

-//					debug writefln( "    EOF" );

-                return;

-

-            case ' ':

-            case '\t':

-            case '\v':

-            case '\f':

-                p++;

-//					debug writefln( "    whitespace" );

-                continue;                                                               // skip white space

-

-            case '\r':

-//					debug writefln( "    cr" );

-                p++;

-                if (*p != '\n')                                                 // if CR stands by itself

-                    loc.linnum++;

-                continue;                                                       // skip white space

-

-            case '\n':

-//					debug writefln( "    nl" );

-                p++;

-                loc.linnum++;

-                continue;                                                               // skip white space

-

-            case '0':

-            case '1':

-            case '2':

-            case '3':

-            case '4':

-            case '5':

-            case '6':

-            case '7':

-            case '8':

-            case '9':

-                t.value = number(t);

-                return;

-

-/*

-   #if CSTRINGS

-                            case '\'':

-                                t.value = charConstant(t, 0);

-                                return;

-

-                            case '"':

-                                t.value = stringConstant(t,0);

-                                return;

-

-                            case 'l':

-                            case 'L':

-                                if( p[1] == '\'')

-                                {

-                                    p++;

-                                    t.value = charConstant(t, 1);

-                                    return;

-                                }

-                                else if( p[1] == '"')

-                                {

-                                    p++;

-                                    t.value = stringConstant(t, 1);

-                                    return;

-                                }

-   #else

- */

-            case '\'':

-//					debug writefln( "    char" );

-                t.value = charConstant(t, 0);

-                return;

-

-            case 'r':

-//					debug writefln( "    wysiwyg" );

-                if (p[1] != '"')

-                    goto case_identifier;

-                p++;

-

-            case '`':

-                t.value = wysiwygStringConstant(t, *p);

-                return;

-

-            case 'x':

-//					debug writefln( "    hex string" );

-                if (p[1] != '"')

-                    goto case_identifier;

-                p++;

-                t.value = hexStringConstant(t);

-                return;

-

-

-            case '"':

-//					debug writefln( "    string" );

-                t.value = escapeStringConstant(t, 0);

-//					debug writefln( t.ustring );

-                return;

-

-            case '\\':                                  // escaped string literal

-//					debug writefln( "    escaped string literal" );

-                uint c;

-                stringbuffer.offset = 0;

-                do

-                {

-                    p++;

-                    c = escapeSequence();

-                    stringbuffer.write(c);

-                } while (*p == '\\');

-//					t.len = stringbuffer.offset;

-//					stringbuffer.write(cast(byte)0);

-                t.ustring = stringbuffer.toString;

-//					memcpy( t.ustring.ptr, stringbuffer.data, stringbuffer.offset );

-                t.postfix = 0;

-                t.value   = TOK.TOKstring;

-                return;

-

-            case 'l':

-            case 'L':

-//	#endif

-

-            case 'a':

-            case 'b':

-            case 'c':

-            case 'd':

-            case 'e':

-            case 'f':

-            case 'g':

-            case 'h':

-            case 'i':

-            case 'j':

-            case 'k':

-            case 'm':

-            case 'n':

-            case 'o':

-            case 'p':

-            case 'q':                             /*case 'r':*/

-            case 's':

-            case 't':

-            case 'u':

-            case 'v':

-            case 'w':                                         /*case 'x':*/

-            case 'y':

-            case 'z':

-            case 'A':

-            case 'B':

-            case 'C':

-            case 'D':

-            case 'E':

-            case 'F':

-            case 'G':

-            case 'H':

-            case 'I':

-            case 'J':

-            case 'K':

-            case 'M':

-            case 'N':

-            case 'O':

-            case 'P':

-            case 'Q':

-            case 'R':

-            case 'S':

-            case 'T':

-            case 'U':

-            case 'V':

-            case 'W':

-            case 'X':

-            case 'Y':

-            case 'Z':

-            case '_':

- case_identifier:

-                {

-//					debug writefln( "    identifier" );

-                    ubyte c;

-                    do

-                    {

-                        c = *++p;

-                    } while (isidchar(c) || (c & 0x80 && isUniAlpha(decodeUTF())));

-

-//					sv = stringtable.update((char *)t.ptr, p - t.ptr);

-                    char[] tmp;

-                    tmp.length = p - t.ptr;

-                    memcpy(tmp.ptr, t.ptr, p - t.ptr);

-                    Identifier id;

-                    Identifier *pid = tmp in stringtable;

-                    if (pid)

-                    {

-                        id = *pid;

-                    }

-

-                    if (id is null)

-                    {

-                        id               = new Identifier(tmp, TOK.TOKidentifier);

-                        stringtable[tmp] = id;

-                    }

-

-                    t.identifier = id;

-                    t.value      = cast(TOK)id.value;

-                    anyToken     = 1;

-

-                    // if special identifier token

-                    if (*t.ptr == '_')

-                    {

-                        static char date[11 + 1];

-                        static char time[8 + 1];

-                        static char timestamp[24 + 1];

-

-                        if (!date[0])                           // lazy evaluation

-                        {

-                            //!!

-                            /+

-                                    time_t t;

-                                    char *p;

-                                    .time(&t);

-                                    p = ctime(&t);

-                                    assert(p);

-                                    sprintf(date.ptr, "%.6s %.4s", p + 4, p + 20);

-                                    sprintf(time.ptr, "%.8s", p + 11);

-                                    sprintf(timestamp.ptr, "%.24s", p);

-                             +/

-                        }

-

-                        if (mod && id is Id.FILE)

-                        {

-                            t.value = TOK.TOKstring;

-                            if (loc.filename.length)

-                                t.ustring = loc.filename;

-                            else

-                                t.ustring = mod.identifier.toChars();

-                            goto Llen;

-                        }

-                        else if (mod && id == Id.LINE)

-                        {

-                            t.value      = TOK.TOKint64v;

-                            t.uns64value = loc.linnum;

-                        }

-                        else if (id == Id.DATE)

-                        {

-                            t.value = TOK.TOKstring;

-                            //! t.ustring = date;

-                            goto Llen;

-                        }

-                        else if (id == Id.TIME)

-                        {

-                            t.value = TOK.TOKstring;

-                            //! t.ustring = time;

-                            goto Llen;

-                        }

-                        else if (id == Id.TIMESTAMP)

-                        {

-                            t.value = TOK.TOKstring;

-                            //! t.ustring = timestamp;

- Llen:

-                            t.postfix = 0;

-//							t.len = strlen((char *)t.ustring);

-                        }

-                    }

-                    //printf("t.value = %d\n",t.value);

-                    return;

-                }

-

-            // comments

-            case '/':

-                p++;

-                switch (*p)

-                {

-                case '=':

-                    p++;

-                    t.value = TOK.TOKdivass;

-                    return;

-

-                case '*':                               // '/*'

-                    p++;

-                    linnum = loc.linnum;

-                    while (true)

-                    {

-                        while (true)

-                        {

-                            ubyte c = *p;

-                            switch (c)

-                            {

-                            case '/':

-                                break;

-

-                            case '\n':

-                                loc.linnum++;

-                                p++;

-                                continue;

-

-                            case '\r':

-                                p++;

-                                if (*p != '\n')

-                                    loc.linnum++;

-                                continue;

-

-                            case 0:

-                            case 0x1A:

-                                error("unterminated /* */ comment");

-                                p       = end;

-                                t.value = TOK.TOKeof;

-                                return;

-

-                            default:

-                                if (c & 0x80)

-                                {

-                                    uint u = decodeUTF();

-                                    if (u == PS || u == LS)

-                                        loc.linnum++;

-                                }

-                                p++;

-                                continue;

-                            }

-                            break;

-                        }

-                        p++;

-                        if (p[-2] == '*' && p - 3 != t.ptr)

-                            break;

-                    }

-

-                    if (commentToken)

-                    {

-                        t.value = TOK.TOKcomment;

-                        return;

-                    }

-                    // if /** but not /**/

-                    else if (doDocComment && t.ptr[2] == '*' && p - 4 != t.ptr)

-                        getDocComment(t, lastLine == linnum);                                           //! ?

-                    continue;

-

-                case '/':                                       // do // style comments

-                    linnum = loc.linnum;

-                    while (1)

-                    {

-                        ubyte c = *++p;

-                        switch (c)

-                        {

-                        case '\n':

-                            break;

-

-                        case '\r':

-                            if (p[1] == '\n')

-                                p++;

-                            break;

-

-                        case 0:

-                        case 0x1a:

-                            if (commentToken)

-                            {

-                                p       = end;

-                                t.value = TOK.TOKcomment;

-                                return;

-                            }

-                            if (doDocComment && t.ptr[2] == '/')

-                                getDocComment(t, lastLine == linnum);

-                            p       = end;

-                            t.value = TOK.TOKeof;

-                            return;

-

-                        default:

-                            if (c & 0x80)

-                            {

-                                uint u = decodeUTF();

-                                if (u == PS || u == LS)

-                                    break;

-                            }

-                            continue;

-                        }

-                        break;

-                    }

-

-                    if (commentToken)

-                    {

-                        p++;

-                        loc.linnum++;

-                        t.value = TOK.TOKcomment;

-                        return;

-                    }

-                    if (doDocComment && t.ptr[2] == '/')

-                        getDocComment(t, lastLine == linnum);

-

-                    p++;

-                    loc.linnum++;

-                    continue;

-

-                case '+':

-                    {

-                        int nest;

-                        linnum = loc.linnum;

-                        p++;

-                        nest = 1;

-                        while (1)

-                        {

-                            ubyte c = *p;

-                            switch (c)

-                            {

-                            case '/':

-                                p++;

-                                if (*p == '+')

-                                {

-                                    p++;

-                                    nest++;

-                                }

-                                continue;

-

-                            case '+':

-                                p++;

-                                if (*p == '/')

-                                {

-                                    p++;

-                                    if (--nest == 0)

-                                        break;

-                                }

-                                continue;

-

-                            case '\r':

-                                p++;

-                                if (*p != '\n')

-                                    loc.linnum++;

-                                continue;

-

-                            case '\n':

-                                loc.linnum++;

-                                p++;

-                                continue;

-

-                            case 0:

-                            case 0x1A:

-                                error("unterminated /+ +/ comment");

-                                p       = end;

-                                t.value = TOK.TOKeof;

-                                return;

-

-                            default:

-                                if (c & 0x80)

-                                {

-                                    uint u = decodeUTF();

-                                    if (u == PS || u == LS)

-                                        loc.linnum++;

-                                }

-                                p++;

-                                continue;

-                            }

-                            break;

-                        }

-                        if (commentToken)

-                        {

-                            t.value = TOK.TOKcomment;

-                            return;

-                        }

-                        if (doDocComment && t.ptr[2] == '+' && p - 4 != t.ptr)

-                        {

-                            // if /++ but not /++/

-                            getDocComment(t, lastLine == linnum);

-                        }

-                        continue;

-                    }

-

-                default:

-                    break;

-                }

-                t.value = TOK.TOKdiv;

-                return;

-

-            case '.':

-                p++;

-                if (isdigit(*p))

-                {

-                    p--;

-                    t.value = inreal(t);

-                }

-                else if (p[0] == '.')

-                {

-                    if (p[1] == '.')

-                    {

-                        p      += 2;

-                        t.value = TOK.TOKdotdotdot;

-                    }

-                    else

-                    {

-                        p++;

-                        t.value = TOK.TOKslice;

-                    }

-                }

-                else

-                    t.value = TOK.TOKdot;

-                return;

-

-            case '&':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    t.value = TOK.TOKandass;

-                }

-                else if (*p == '&')

-                {

-                    p++;

-                    t.value = TOK.TOKandand;

-                }

-                else

-                    t.value = TOK.TOKand;

-                return;

-

-            // |, ||, |=

-            case '|':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    t.value = TOK.TOKorass;

-                }

-                else if (*p == '|')

-                {

-                    p++;

-                    t.value = TOK.TOKoror;

-                }

-                else

-                    t.value = TOK.TOKor;

-                return;

-

-            case '-':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    t.value = TOK.TOKminass;

-                }

-                else if (*p == '-')

-                {

-                    p++;

-                    t.value = TOK.TOKminusminus;

-                }

-                else

-                    t.value = TOK.TOKmin;

-                return;

-

-            // +, +=, ++

-            case '+':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    t.value = TOK.TOKaddass;                                    // +=

-                }

-                else if (*p == '+')

-                {

-                    p++;

-                    t.value = TOK.TOKplusplus;                                          // ++

-                }

-                else

-                    t.value = TOK.TOKadd;                                                       // +

-                return;

-

-            // <, <=, <<=, <<, <>=, <>

-            case '<':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    t.value = TOK.TOKle;                                                // <=

-                }

-                else if (*p == '<')

-                {

-                    p++;

-                    if (*p == '=')

-                    {

-                        p++;

-                        t.value = TOK.TOKshlass;                                        // <<=

-                    }

-                    else

-                        t.value = TOK.TOKshl;                                           // <<

-                }

-                else if (*p == '>')

-                {

-                    p++;

-                    if (*p == '=')

-                    {

-                        p++;

-                        t.value = TOK.TOKleg;                                           // <>=

-                    }

-                    else

-                        t.value = TOK.TOKlg;                                            // <>

-                }

-                else

-                    t.value = TOK.TOKlt;                                                // <

-                return;

-

-            // >, >>, >>>, >=, >>=, >>>=

-            case '>':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    t.value = TOK.TOKge;                                                // >=

-                }

-                else if (*p == '>')

-                {

-                    p++;

-                    if (*p == '=')

-                    {

-                        p++;

-                        t.value = TOK.TOKshrass;                                        // >>=

-                    }

-                    else if (*p == '>')

-                    {

-                        p++;

-                        if (*p == '=')

-                        {

-                            p++;

-                            t.value = TOK.TOKushrass;                           // >>>=

-                        }

-                        else

-                            t.value = TOK.TOKushr;                                      // >>>

-                    }

-                    else

-                        t.value = TOK.TOKshr;                                           // >>

-                }

-                else

-                    t.value = TOK.TOKgt;                                                // >

-                return;

-

-            case '!':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    if (*p == '=')

-                    {

-                        p++;

-                        t.value = TOK.TOKnotidentity;                                   // !==

-                    }

-                    else

-                        t.value = TOK.TOKnotequal;                                      // !=

-                }

-                else if (*p == '<')

-                {

-                    p++;

-                    if (*p == '>')

-                    {

-                        p++;

-                        if (*p == '=')

-                        {

-                            p++;

-                            t.value = TOK.TOKunord;                             // !<>=

-                        }

-                        else

-                            t.value = TOK.TOKue;                                // !<>

-                    }

-                    else if (*p == '=')

-                    {

-                        p++;

-                        t.value = TOK.TOKug;                                    // !<=

-                    }

-                    else

-                        t.value = TOK.TOKuge;                                   // !<

-                }

-                else if (*p == '>')

-                {

-                    p++;

-                    if (*p == '=')

-                    {

-                        p++;

-                        t.value = TOK.TOKul;                                    // !>=

-                    }

-                    else

-                        t.value = TOK.TOKule;                                   // !>

-                }

-                else

-                    t.value = TOK.TOKnot;                                       // !

-                return;

-

-            case '=':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    if (*p == '=')

-                    {

-                        p++;

-                        t.value = TOK.TOKidentity;                                      // ===

-                    }

-                    else

-                        t.value = TOK.TOKequal;                                         // ==

-                }

-                else

-                    t.value = TOK.TOKassign;                                    // =

-                return;

-

-            case '~':

-                p++;

-                if (*p == '=')

-                {

-                    p++;

-                    t.value = TOK.TOKcatass;                                            // ~=

-                }

-                else

-                    t.value = TOK.TOKtilde;                                             // ~

-                return;

-

-            // SINGLE

-            case '(': p++; t.value = TOK.TOKlparen;     return;

-

-            case ')': p++; t.value = TOK.TOKrparen;     return;

-

-            case '[': p++; t.value = TOK.TOKlbracket;   return;

-

-            case ']': p++; t.value = TOK.TOKrbracket;   return;

-

-            case '{': p++; t.value = TOK.TOKlcurly;     return;

-

-            case '}': p++; t.value = TOK.TOKrcurly;     return;

-

-            case '?': p++; t.value = TOK.TOKquestion;   return;

-

-            case ',': p++; t.value = TOK.TOKcomma;              return;

-

-            case ';': p++; t.value = TOK.TOKsemicolon;  return;

-

-            case ':': p++; t.value = TOK.TOKcolon;              return;

-

-            case '$': p++; t.value = TOK.TOKdollar;     return;

-

-            // DOUBLE

-            case '*': p++; if (*p == '=')

-                {

-                    p++; t.value = TOK.TOKmulass;

-                }

-                else

-                    t.value = TOK.TOKmul;

-                return;

-

-            case '%': p++; if (*p == '=')

-                {

-                    p++; t.value = TOK.TOKmodass;

-                }

-                else

-                    t.value = TOK.TOKmod;

-                return;

-

-            case '^': p++; if (*p == '=')

-                {

-                    p++; t.value = TOK.TOKxorass;

-                }

-                else

-                    t.value = TOK.TOKxor;

-                return;

-

-// removed 148	case '~': p++; if( *p == '=' ) { p++; t.value = TOK.TOKcatass; } else t.value = TOK.TOKtilde; return;

-

-

-            case '#':

-                p++;

-                Pragma();

-                continue;

-

-            default:

-                {

-                    debug writefln("    default char");

-                    ubyte c = *p;

-                    if (c & 0x80)

-                    {

-                        uint u = decodeUTF();

-                        // Check for start of unicode identifier

-                        if (isUniAlpha(u))

-                            goto case_identifier;

-

-                        if (u == PS || u == LS)

-                        {

-                            loc.linnum++;

-                            p++;

-                            continue;

-                        }

-                    }

-                    if (isprint(c))

-                        error("unsupported char '%s'", cast(char)c);

-                    else

-                        error("unsupported char 0x%02x", cast(ubyte)c);

-                    p++;

-                    continue;

-                }

-            }

-        }

-    }

-

-

-

-    // Parse escape sequence.

-    uint escapeSequence()

-    {

-        uint c;

-        int  n;

-        int  ndigits;

-

-        c = *p;

-        switch (c)

-        {

-        case '\'':

-        case '"':

-        case '?':

-        case '\\':

- Lconsume:

-            p++;

-            break;

-

-        case 'a':       c = 7;          goto Lconsume;

-

-        case 'b':       c = 8;          goto Lconsume;

-

-        case 'f':       c = 12;         goto Lconsume;

-

-        case 'n':       c = 10;         goto Lconsume;

-

-        case 'r':       c = 13;         goto Lconsume;

-

-        case 't':       c = 9;          goto Lconsume;

-

-        case 'v':       c = 11;         goto Lconsume;

-

-        case 'u':

-            ndigits = 4;

-            goto Lhex;

-

-        case 'U':

-            ndigits = 8;

-            goto Lhex;

-

-        case 'x':

-            ndigits = 2;

- Lhex:

-            p++;

-            c = *p;

-            if (ishex(c))

-            {

-                uint v;

-                n = 0;

-                v = 0;

-                while (1)

-                {

-                    if (isdigit(c))

-                        c -= '0';

-                    else if (islower(c))

-                        c -= 'a' - 10;

-                    else

-                        c -= 'A' - 10;

-                    v = v * 16 + c;

-                    c = *++p;

-                    if (++n == ndigits)

-                        break;

-                    if (!ishex(c))

-                    {

-                        error("escape hex sequence has %d hex digits instead of %d", n, ndigits);

-                        break;

-                    }

-                }

-//!				    if( ndigits != 2 && !utf_isValidDchar(v))

-//!						error("invalid UTF character \\U%08x", v);

-                c = v;

-            }

-            else

-                error("undefined escape hex sequence \\%s\n", c);

-            break;

-

-        case '&':                                       // named character entity

-            for (ubyte *idstart = ++p; 1; p++)

-            {

-                switch (*p)

-                {

-                case ';':

-                    //!!!

-                    /+

-                       c = HtmlNamedEntity(idstart, p - idstart);

-                       if( c == ~0 )

-                       {

-                            error("unnamed character entity &%.*s;", p - idstart, idstart);

-                            c = ' ';

-                       }

-

-                       p++;

-                     +/

-                    break;

-

-                default:

-                    if (isalpha(*p) || (p != idstart + 1 && isdigit(*p)))

-                        continue;

-                    error("unterminated named entity");

-                    break;

-                }

-                break;

-            }

-            break;

-

-        case 0:

-        case 0x1a:                                      // end of file

-            c = '\\';

-            break;

-

-        default:

-            if (isoctal(c))

-            {

-                ubyte v;

-                n = 0;

-                do

-                {

-                    v = v * 8 + (c - '0');

-                    c = *++p;

-                } while (++n < 3 && isoctal(c));

-                c = v;

-            }

-            else

-                error("undefined escape sequence \\%s\n", c);

-            break;

-        }

-        return c;

-    }

-

-    /**************************************

-     */

-

-    TOK wysiwygStringConstant(Token *t, int tc)

-    {

-        uint c;

-        Loc  start = loc;

-

-        p++;

-        stringbuffer.offset = 0;

-        while (1)

-        {

-            c = *p++;

-            switch (c)

-            {

-            case '\n':

-                loc.linnum++;

-                break;

-

-            case '\r':

-                if (*p == '\n')

-                    continue;                           // ignore

-                c = '\n';                               // treat EndOfLine as \n character

-                loc.linnum++;

-                break;

-

-            case 0:

-            case 0x1a:

-                error("unterminated string constant starting at %s", start.toChars());

-                t.ustring = "";

-                t.postfix = 0;

-                return TOK.TOKstring;

-

-            case '"':

-            case '`':

-                if (c == tc)

-                {

-//				    t.len = stringbuffer.offset;

-                    stringbuffer.write(cast(byte)0);

-                    t.ustring = stringbuffer.toString;

-//				    t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-//				    memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-                    stringPostfix(t);

-                    return TOK.TOKstring;

-                }

-                break;

-

-            default:

-                if (c & 0x80)

-                {

-                    p--;

-                    uint u = decodeUTF();

-                    p++;

-                    if (u == PS || u == LS)

-                        loc.linnum++;

-                    stringbuffer.write(u);

-                    continue;

-                }

-                break;

-            }

-            stringbuffer.write(c);

-        }

-    }

-

-    /**************************************

-     * Lex hex strings:

-     *	x"0A ae 34FE BD"

-     */

-

-    TOK hexStringConstant(Token *t)

-    {

-        uint c;

-        Loc  start = loc;

-        uint n     = 0;

-        uint v;

-

-        p++;

-        stringbuffer.offset = 0;

-        while (1)

-        {

-            c = *p++;

-            switch (c)

-            {

-            case ' ':

-            case '\t':

-            case '\v':

-            case '\f':

-                continue;                                               // skip white space

-

-            case '\r':

-                if (*p == '\n')

-                    continue;                                           // ignore

-

-            // Treat isolated '\r' as if it were a '\n'

-            case '\n':

-                loc.linnum++;

-                continue;

-

-            case 0:

-            case 0x1a:

-                error("unterminated string constant starting at %s", start.toChars());

-                t.ustring = "";

-                t.postfix = 0;

-                return TOK.TOKstring;

-

-            case '"':

-                if (n & 1)

-                {

-                    error("odd number (%d) of hex characters in hex string", n);

-                    stringbuffer.write(v);

-                }

-//				t.len = stringbuffer.offset;

-//				stringbuffer.write(cast(byte)0);

-                t.ustring = stringbuffer.toString;

-//				t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-//				memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-                stringPostfix(t);

-                return TOK.TOKstring;

-

-            default:

-                if (c >= '0' && c <= '9')

-                    c -= '0';

-                else if (c >= 'a' && c <= 'f')

-                    c -= 'a' - 10;

-                else if (c >= 'A' && c <= 'F')

-                    c -= 'A' - 10;

-                else if (c & 0x80)

-                {

-                    p--;

-                    uint u = decodeUTF();

-                    p++;

-                    if (u == PS || u == LS)

-                        loc.linnum++;

-                    else

-                        error("non-hex character \\u%x", u);

-                }

-                else

-                    error("non-hex character '%s'", c);

-                if (n & 1)

-                {

-                    v = (v << 4) | c;

-                    stringbuffer.write(v);

-                }

-                else

-                    v = c;

-                n++;

-                break;

-            }

-        }

-    }

-

-    /**************************************

-     */

-

-    TOK escapeStringConstant(Token *t, int wide)

-    {

-        uint c;

-        Loc  start = loc;

-

-        p++;

-        stringbuffer.offset = 0;

-        //    debug writefln( "escape string constant: %s", std.string.toString( cast(char*)p ) );

-        while (1)

-        {

-            c = *p++;

-            switch (c)

-            {

-            case '\\':

-                switch (*p)

-                {

-                case 'u':

-                case 'U':

-                case '&':

-                    c = escapeSequence();

-                    stringbuffer.write(c);

-                    continue;

-

-                default:

-                    c = escapeSequence();

-                    break;

-                }

-                break;

-

-            case '\n':

-                loc.linnum++;

-                break;

-

-            case '\r':

-                if (*p == '\n')

-                    continue;                           // ignore

-                c = '\n';                               // treat EndOfLine as \n character

-                loc.linnum++;

-                break;

-

-            case '"':

-//			        writefln( "end of string: ", stringbuffer.toString );

-                t.ustring = stringbuffer.toString().dup;

-                //				t.len = stringbuffer.offset;

-                //				stringbuffer.write(cast(byte)0);

-                //				t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-                //				memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-                stringPostfix(t);

-

-                return TOK.TOKstring;

-

-            case 0:

-            case 0x1a:

-                p--;

-                error("unterminated string constant starting at %s", start.toChars());

-                t.ustring = "";

-//					t.len = 0;

-                t.postfix = 0;

-                return TOK.TOKstring;

-

-            default:

-                if (c & 0x80)

-                {

-                    p--;

-                    c = decodeUTF();

-                    if (c == LS || c == PS)

-                    {

-                        c = '\n';

-                        loc.linnum++;

-                    }

-                    p++;

-                    stringbuffer.write(cast(char)c);

-                    continue;

-                }

-                break;

-            }

-            stringbuffer.write(cast(char)c);

-//			writefln( stringbuffer.toString );

-        }

-    }

-

-    //**************************************

-    TOK charConstant(Token *t, int wide)

-    {

-        uint c;

-        TOK  tk = TOK.TOKcharv;

-

-        //printf("Lexer.charConstant\n");

-        p++;

-        c = *p++;

-        switch (c)

-        {

-        case '\\':

-            switch (*p)

-            {

-            case 'u':

-                t.uns64value = escapeSequence();

-                tk           = TOK.TOKwcharv;

-                break;

-

-            case 'U':

-            case '&':

-                t.uns64value = escapeSequence();

-                tk           = TOK.TOKdcharv;

-                break;

-

-            default:

-                t.uns64value = escapeSequence();

-                break;

-            }

-            break;

-

-        case '\n':

- L1:

-            loc.linnum++;

-

-        case '\r':

-        case 0:

-        case 0x1a:

-        case '\'':

-            error("unterminated character constant");

-            return tk;

-

-        default:

-            if (c & 0x80)

-            {

-                p--;

-                c = decodeUTF();

-                p++;

-                if (c == LS || c == PS)

-                    goto L1;

-                if (c < 0xd800 || (c >= 0xe000 && c < 0xfffe))

-                    tk = TOK.TOKwcharv;

-                else

-                    tk = TOK.TOKdcharv;

-            }

-            t.uns64value = c;

-            break;

-        }

-

-        if (*p != '\'')

-        {

-            error("unterminated character constant");

-            return tk;

-        }

-        p++;

-        return tk;

-    }

-

-    // Get postfix of string literal.

-    void stringPostfix(Token *t)

-    {

-        switch (*p)

-        {

-        case 'c':

-        case 'w':

-        case 'd':

-            t.postfix = *p;

-            p++;

-            break;

-

-        default:

-            t.postfix = 0;

-            break;

-        }

-    }

-

-    /***************************************

-     * Read \u or \U unicode sequence

-     * Input:

-     *	u	'u' or 'U'

-     */

-    /*

-       uint Wchar(uint u)

-       {

-        uint value;

-        uint n;

-        ubyte c;

-        uint nchars;

-

-        nchars = (u == 'U') ? 8 : 4;

-        value = 0;

-        for (n = 0; 1; n++)

-        {

-       ++p;

-                    if( n == nchars)

-                        break;

-                    c = *p;

-                    if( !ishex(c))

-                    {

-                            error("\\%s sequence must be followed by %d hex characters", u, nchars);

-                        break;

-                    }

-                    if( isdigit(c))

-                        c -= '0';

-                    else if( islower(c))

-                        c -= 'a' - 10;

-                    else

-                        c -= 'A' - 10;

-                    value <<= 4;

-                    value |= c;

-        }

-        return value;

-       }

-     */

-

-    /**************************************

-     * Read in a number.

-     * If it's an integer, store it in tok.TKutok.Vlong.

-     *	integers can be decimal, octal or hex

-     *	Handle the suffixes U, UL, LU, L, etc.

-     * If it's double, store it in tok.TKutok.Vdouble.

-     * Returns:

-     *	TKnum

-     *	TKdouble,...

-     */

-

-    TOK number(Token *t)

-    {

-        //debug writefln("Lexer.number()");

-        // We use a state machine to collect numbers

-        enum STATE

-        {

-            STATE_initial,

-            STATE_0,

-            STATE_decimal,

-            STATE_octal,

-            STATE_octale,

-            STATE_hex,

-            STATE_binary,

-            STATE_hex0,

-            STATE_binary0,

-            STATE_hexh,

-            STATE_error

-        }

-

-        enum FLAGS

-        {

-            FLAGS_decimal  = 1,                         // decimal

-            FLAGS_unsigned = 2,                         // u or U suffix

-            FLAGS_long     = 4,                         // l or L suffix

-        }

-        FLAGS flags = FLAGS.FLAGS_decimal;

-

-        int   i;

-        TOK   result;

-        int   base;

-

-        stringbuffer.offset = 0;

-//		stringbuffer.data = null;

-        STATE state  = STATE.STATE_initial;

-        ubyte *start = p;

-

-        TOK _isreal()

-        {

-            p = start;

-            return inreal(t);

-        }

-

-        while (true)

-        {

-            char c = cast(char)*p;

-            switch (state)

-            {

-            case STATE.STATE_initial:                           // opening state

-                if (c == '0')

-                    state = STATE.STATE_0;

-                else

-                    state = STATE.STATE_decimal;

-                break;

-

-            case STATE.STATE_0:

-                flags = cast(FLAGS)(flags & ~FLAGS.FLAGS_decimal);

-                switch (c)

-                {

-                //	#if ZEROH

-//					    case 'H':			// 0h

-//					    case 'h':

-//							goto hexh;

-                //	#endif

-                case 'X':

-                case 'x':

-                    state = STATE.STATE_hex0;

-                    break;

-

-                case '.':

-                    if (p[1] == '.')                                            // .. is a separate token

-                        goto done;

-

-                case 'i':

-                case 'f':

-                case 'F':

-                    goto _Real;

-

-                //	#if ZEROH

-//					    case 'E':

-//					    case 'e':

-//							goto case_hex;

-                //	#endif

-                case 'B':

-                case 'b':

-                    state = STATE.STATE_binary0;

-                    break;

-

-                case '0':

-                case '1':

-                case '2':

-                case '3':

-                case '4':

-                case '5':

-                case '6':

-                case '7':

-                    state = STATE.STATE_octal;

-                    break;

-

-                //	#if ZEROH

-//					    case '8': case '9': case 'A':

-//					    case 'C': case 'D': case 'F':

-//					    case 'a': case 'c': case 'd': case 'f':

-//						    case_hex:

-//							state = STATE.STATE_hexh;

-//							break;

-                //	#endif

-                case '_':

-                    state = STATE.STATE_octal;

-                    p++;

-                    continue;

-

-                default:

-                    goto done;

-                }

-                break;

-

-            case STATE.STATE_decimal:                           // reading decimal number

-

-                // if its not a digit - decimal complete or not a decimal

-                if (!isdigit(c))

-                {

-//						debug writefln( "\tnon-digit( %s )", c );

-                    //	#if ZEROH

-//					    if( ishex(c) || c == 'H' || c == 'h' )

-//							goto hexh;

-                    //	#endif

-                    //! wtf ?

-                    // ignore embedded _

-                    if (c == '_')

-                    {

-                        p++;

-                        continue;

-                    }

-

-                    // check decimal point - make real

-                    if (c == '.' && p[1] != '.')

-                        goto _Real;

-

-                    // check for mantra - make real

-                    if (c == 'i' || c == 'f' || c == 'F' || c == 'e' || c == 'E')

-                    {

- _Real:                 // It's a real number. Back up and rescan as a real

-                        p = start;

-                        return inreal(t);

-                    }

-

-                    goto done;

-                }

-                break;

-

-            case STATE.STATE_hex0:                              // reading hex number

-            case STATE.STATE_hex:

-                if (!ishex(c))

-                {

-                    if (c == '_')                                       // ignore embedded _

-                    {

-                        p++;

-                        continue;

-                    }

-                    if (c == '.' && p[1] != '.')

-                        goto _Real;

-                    if (c == 'P' || c == 'p' || c == 'i')

-                        goto _Real;

-                    if (state == STATE.STATE_hex0)

-                        error("Hex digit expected, not '%s'", c);

-                    goto done;

-                }

-                state = STATE.STATE_hex;

-                break;

-

-            //	#if ZEROH

-//				    hexh:

-//						state = STATE.STATE_hexh;

-//

-//				    case STATE.STATE_hexh:		// parse numbers like 0FFh

-//						if( !ishex(c))

-//						{

-//						    if( c == 'H' || c == 'h')

-//						    {

-//								p++;

-//								base = 16;

-//								goto done;

-//						    }

-//						    else

-//						    {

-//								// Check for something like 1E3 or 0E24

-//								if( memchr(stringbuffer.data.ptr, 'E', stringbuffer.offset) || memchr( stringbuffer.data.ptr, 'e', stringbuffer.offset))

-//								    goto _Real;

-//								error("Hex digit expected, not '%s'", c);

-//								goto done;

-//						    }

-//						}

-//						break;

-            //		#endif

-

-            case STATE.STATE_octal:                                     // reading octal number

-            case STATE.STATE_octale:                                    // reading octal number with non-octal digits

-                if (!isoctal(c))

-                {

-//				#if ZEROH

-//						    if( ishex(c) || c == 'H' || c == 'h' )

-//								goto hexh;

-//				#endif

-                    if (c == '_')                                               // ignore embedded _

-                    {

-                        p++;

-                        continue;

-                    }

-                    if (c == '.' && p[1] != '.')

-                        goto _Real;

-                    if (c == 'i')

-                        goto _Real;

-                    if (isdigit(c))

-                        state = STATE.STATE_octale;

-                    else

-                        goto done;

-                }

-                break;

-

-            case STATE.STATE_binary0:                                   // starting binary number

-            case STATE.STATE_binary:                                    // reading binary number

-                if (c != '0' && c != '1')

-                {

-                    //			#if ZEROH

-//						    if( ishex(c) || c == 'H' || c == 'h' )

-//								goto hexh;

-                    //			#endif

-                    if (c == '_')                                               // ignore embedded _

-                    {

-                        p++;

-                        continue;

-                    }

-                    if (state == STATE.STATE_binary0)

-                    {

-                        error("binary digit expected");

-                        state = STATE.STATE_error;

-                        break;

-                    }

-                    else

-                        goto done;

-                }

-                state = STATE.STATE_binary;

-                break;

-

-            case STATE.STATE_error:                                     // for error recovery

-                if (!isdigit(c))                                        // scan until non-digit

-                    goto done;

-                break;

-

-            default:

-                assert(0);

-            }

-            stringbuffer.write(cast(char)c);

-            p++;

-        }

- done:

-        stringbuffer.write(cast(char)0);                // terminate string

-

-//		debug writefln( "\tdigit complete( %s )", stringbuffer.toString );

-

-        if (state == STATE.STATE_octale)

-            error("Octal digit expected");

-

-        uinteger_t n;                           // unsigned >=64 bit integer type

-

-        if (stringbuffer.offset == 2 && (state == STATE.STATE_decimal || state == STATE.STATE_0))

-            n = stringbuffer.data[0] - '0';

-        else

-        {

-            // Convert string to integer

-            char *p = cast(char *)stringbuffer.data.ptr;

-            int  r  = 10;

-            int  d;

-            if (*p == '0')

-            {

-                if (p[1] == 'x' || p[1] == 'X')

-                {

-                    // "0x#"

-                    p += 2;

-                    r  = 16;

-                }

-                else if (p[1] == 'b' || p[1] == 'B')

-                {

-                    // "0b#" - binary

-                    p += 2;

-                    r  = 2;

-                }

-                else if (isdigit(p[1]))

-                {

-                    p += 1;

-                    r  = 8;

-                }

-            }

-

-            n = 0;

-

-            while (true)

-            {

-                if (*p >= '0' && *p <= '9')

-                    d = *p - '0';

-                else if (*p >= 'a' && *p <= 'z')

-                    d = *p - 'a' + 10;

-                else if (*p >= 'A' && *p <= 'Z')

-                    d = *p - 'A' + 10;

-                else

-                    break;

-

-                if (d >= r)

-                    break;

-

-                if (n * r + d < n)

-                {

-                    error("integer overflow");

-                    break;

-                }

-

-                n = n * r + d;

-                p++;

-            }

-

-            // if n needs more than 64 bits

-            if (n.sizeof > 8 && n > 0xffffffffffffffffL)

-                error("integer overflow");

-        }

-

-        // Parse trailing 'u', 'U', 'l' or 'L' in any combination

-        while (true)

-        {

-            ubyte f;

-            switch (*p)

-            {

-            case 'U':

-            case 'u':

-                f = FLAGS.FLAGS_unsigned;

-                goto L1;

-

-            case 'L':

-            case 'l':

-                f = FLAGS.FLAGS_long;

- L1:

-                p++;

-                if (flags & f)

-                    error("unrecognized token");

-                flags = cast(FLAGS)(flags | f);

-                continue;

-

-            default:

-                break;

-            }

-            break;

-        }

-

-        switch (flags)

-        {

-        case 0:

-            /* Octal or Hexadecimal constant.

-             * First that fits: int, uint, long, ulong

-             */

-            if (n & 0x8000000000000000L)

-                result = TOK.TOKuns64v;

-            else if (n & 0xffffffff00000000L)

-                result = TOK.TOKint64v;

-            else if (n & 0x80000000)

-                result = TOK.TOKuns32v;

-            else

-                result = TOK.TOKint32v;

-            break;

-

-        case FLAGS.FLAGS_decimal:

-            /* First that fits: int, long, long long

-             */

-            if (n & 0x8000000000000000L)

-            {

-                error("signed integer overflow");

-                result = TOK.TOKuns64v;

-            }

-            else if (n & 0xffffffff80000000L)

-                result = TOK.TOKint64v;

-            else

-                result = TOK.TOKint32v;

-            break;

-

-        case FLAGS.FLAGS_unsigned:

-        case FLAGS.FLAGS_decimal | FLAGS.FLAGS_unsigned:

-            /* First that fits: uint, ulong

-             */

-            if (n & 0xffffffff00000000L)

-                result = TOK.TOKuns64v;

-            else

-                result = TOK.TOKuns32v;

-            break;

-

-        case FLAGS.FLAGS_decimal | FLAGS.FLAGS_long:

-            if (n & 0x8000000000000000L)

-            {

-                error("signed integer overflow");

-                result = TOK.TOKuns64v;

-            }

-            else

-                result = TOK.TOKint64v;

-            break;

-

-        case FLAGS.FLAGS_long:

-            if (n & 0x8000000000000000L)

-                result = TOK.TOKuns64v;

-            else

-                result = TOK.TOKint64v;

-            break;

-

-        case FLAGS.FLAGS_unsigned | FLAGS.FLAGS_long:

-        case FLAGS.FLAGS_decimal | FLAGS.FLAGS_unsigned | FLAGS.FLAGS_long:

-            result = TOK.TOKuns64v;

-            break;

-

-        default:

-            debug writefln("%x", flags);

-            assert(0);

-        }

-        t.uns64value = n;

-        return result;

-    }

-

-    /**************************************

-     * Read in characters, converting them to real.

-     * Bugs:

-     *	Exponent overflow not detected.

-     *	Too much requested precision is not detected.

-     */

-

-    TOK inreal(Token *t)

-    {

-        int  dblstate;

-        uint c;

-        char hex;                       // is this a hexadecimal-floating-constant?

-        TOK  result;

-

-        //printf("Lexer.inreal()\n");

-        stringbuffer.offset = 0;

-        dblstate            = 0;

-        hex                 = 0;

- Lnext:

-        while (1)

-        {

-            // Get next char from input

-            c = *p++;

-            //printf("dblstate = %d, c = '%s'\n", dblstate, c);

-            while (1)

-            {

-                switch (dblstate)

-                {

-                case 0:                                 // opening state

-                    if (c == '0')

-                        dblstate = 9;

-                    else if (c == '.')

-                        dblstate = 3;

-                    else

-                        dblstate = 1;

-                    break;

-

-                case 9:

-                    dblstate = 1;

-                    if (c == 'X' || c == 'x')

-                    {

-                        hex++;

-                        break;

-                    }

-

-                case 1:                                 // digits to left of .

-                case 3:                                 // digits to right of .

-                case 7:                                 // continuing exponent digits

-                    if (!isdigit(c) && !(hex && isxdigit(c)))

-                    {

-                        if (c == '_')

-                            goto Lnext;                         // ignore embedded '_'

-                        dblstate++;

-                        continue;

-                    }

-                    break;

-

-                case 2:                                 // no more digits to left of .

-                    if (c == '.')

-                    {

-                        dblstate++;

-                        break;

-                    }

-

-                case 4:                                 // no more digits to right of .

-                    if ((c == 'E' || c == 'e') || hex && (c == 'P' || c == 'p'))

-                    {

-                        dblstate = 5;

-                        hex      = 0;                           // exponent is always decimal

-                        break;

-                    }

-                    if (hex)

-                        error("binary-exponent-part required");

-                    goto done;

-

-                case 5:                                 // looking immediately to right of E

-                    dblstate++;

-                    if (c == '-' || c == '+')

-                        break;

-

-                case 6:                                 // 1st exponent digit expected

-                    if (!isdigit(c))

-                        error("exponent expected");

-                    dblstate++;

-                    break;

-

-                case 8:                                 // past end of exponent digits

-                    goto done;

-                }

-                break;

-            }

-            stringbuffer.write(c);

-        }

- done:

-        p--;

-

-        stringbuffer.write(cast(byte)0);

-

-//	#if _WIN32 && __DMC__

-        char *save = __locale_decpoint;

-

-        __locale_decpoint = ".";

-//	#endif

-        t.float80value = strtold(cast(char *)stringbuffer.data.ptr, null);

-        errno          = 0;

-        switch (*p)

-        {

-        case 'F':

-        case 'f':

-            strtof(cast(char *)stringbuffer.data.ptr, null);

-            result = TOK.TOKfloat32v;

-            p++;

-            break;

-

-        default:

-            strtod(cast(char *)stringbuffer.data.ptr, null);

-            result = TOK.TOKfloat64v;

-            break;

-

-        case 'L':

-        case 'l':

-            result = TOK.TOKfloat80v;

-            p++;

-            break;

-        }

-        if (*p == 'i' || *p == 'I')

-        {

-            p++;

-            switch (result)

-            {

-            case TOK.TOKfloat32v:

-                result = TOK.TOKimaginary32v;

-                break;

-

-            case TOK.TOKfloat64v:

-                result = TOK.TOKimaginary64v;

-                break;

-

-            case TOK.TOKfloat80v:

-                result = TOK.TOKimaginary80v;

-                break;

-            }

-        }

-//	#if _WIN32 && __DMC__

-        __locale_decpoint = save;

-//	#endif

-        if (errno == ERANGE)

-            error("number is not representable");

-        return result;

-    }

-

-

-

-

-    /*********************************************

-     * Do pragma.

-     * Currently, the only pragma supported is:

-     *	#line linnum [filespec]

-     */

-

-    void Pragma()

-    {

-        Token  tok;

-        int    linnum;

-

-        char[] filespec;

-        Loc    loc = this.loc;

-

-        scan(&tok);

-

-        if (tok.value != TOK.TOKidentifier || tok.identifier != Id.line)

-            goto Lerr;

-

-        scan(&tok);

-        if (tok.value == TOK.TOKint32v || tok.value == TOK.TOKint64v)

-            linnum = tok.uns64value - 1;

-        else

-            goto Lerr;

-

-        while (1)

-        {

-            switch (*p)

-            {

-            case 0:

-            case 0x1a:

-            case '\n':

- Lnewline:

-                this.loc.linnum = linnum;

-                if (filespec.length)

-                    this.loc.filename = filespec;

-                return;

-

-            case '\r':

-                p++;

-                if (*p != '\n')

-                {

-                    p--;

-                    goto Lnewline;

-                }

-                continue;

-

-            case ' ':

-            case '\t':

-            case '\v':

-            case '\f':

-                p++;

-                continue;                                               // skip white space

-

-            case '_':

-                if (mod && memcmp(p, cast(char *)"__FILE__", 8) == 0)

-                {

-                    p += 8;

-//!					    filespec = mem.strdup(loc.filename ? loc.filename : mod.identifier.toChars());

-                }

-                continue;

-

-            case '"':

-                if (filespec)

-                    goto Lerr;

-                stringbuffer.offset = 0;

-                p++;

-                while (1)

-                {

-                    uint c;

-                    c = *p;

-                    switch (c)

-                    {

-                    case '\n':

-                    case '\r':

-                    case 0:

-                    case 0x1a:

-                        goto Lerr;

-

-                    case '"':

-                        stringbuffer.write(cast(byte)0);

-                        //						    filespec = mem.strdup((char *)stringbuffer.data);

-                        filespec = stringbuffer.toString.dup;

-                        p++;

-                        break;

-

-                    default:

-                        if (c & 0x80)

-                        {

-                            uint u = decodeUTF();

-                            if (u == PS || u == LS)

-                                goto Lerr;

-                        }

-                        stringbuffer.write(c);

-                        p++;

-                        continue;

-                    }

-                    break;

-                }

-                continue;

-

-            default:

-                if (*p & 0x80)

-                {

-                    uint u = decodeUTF();

-                    if (u == PS || u == LS)

-                        goto Lnewline;

-                }

-                goto Lerr;

-            }

-        }

-

- Lerr:

-        errorLoc(loc, "#line integer [\"filespec\"]\\n expected");

-    }

-

-

-

-    /***************************************************

-     * Parse doc comment embedded between t.ptr and p.

-     * Remove trailing blanks and tabs from lines.

-     * Replace all newlines with \n.

-     * Remove leading comment character from each line.

-     * Decide if it's a lineComment or a blockComment.

-     * Append to previous one for this token.

-     */

-

-    void getDocComment(Token *t, uint lineComment)

-    {

-        auto OutBuffer buf       = new OutBuffer;

-        ubyte          ct        = t.ptr[2];

-        ubyte          *q        = t.ptr + 3; // start of comment text

-        int            linestart = 0;

-

-        ubyte          *qend = p;

-

-        if (ct == '*' || ct == '+')

-            qend -= 2;

-

-        // Scan over initial row of ****'s or ++++'s or ////'s

-        for (; q < qend; q++)

-        {

-            if (*q != ct)

-                break;

-        }

-

-        // Remove trailing row of ****'s or ++++'s

-        if (ct != '/')

-        {

-            for (; q < qend; qend--)

-            {

-                if (qend[-1] != ct)

-                    break;

-            }

-        }

-

-        for (; q < qend; q++)

-        {

-            ubyte c = *q;

-

-            switch (c)

-            {

-            case '*':

-            case '+':

-                if (linestart && c == ct)

-                {

-                    linestart = 0;

-                    // Trim preceding whitespace up to preceding \n

-                    while (buf.offset && (buf.data[buf.offset - 1] == ' ' || buf.data[buf.offset - 1] == '\t'))

-                        buf.offset--;

-                    continue;

-                }

-                break;

-

-            case ' ':

-            case '\t':

-                break;

-

-            case '\r':

-                if (q[1] == '\n')

-                    continue;                                   // skip the \r

-                goto Lnewline;

-

-            default:

-                if (c == 226)

-                {

-                    // If LS or PS

-                    if (q[1] == 128 &&

-                        (q[2] == 168 || q[2] == 169))

-                    {

-                        q += 2;

-                        goto Lnewline;

-                    }

-                }

-                linestart = 0;

-                break;

-

- Lnewline:

-                c = '\n';                               // replace all newlines with \n

-

-            case '\n':

-                linestart = 1;

-

-                // Trim trailing whitespace

-                while (buf.offset && (buf.data[buf.offset - 1] == ' ' || buf.data[buf.offset - 1] == '\t'))

-                    buf.offset--;

-

-                break;

-            }

-            buf.write(c);

-        }

-

-        // Always end with a newline

-        if (!buf.offset || buf.data[buf.offset - 1] != '\n')

-            buf.writenl();

-

-        //buf.write(cast(char)0);

-

-        // It's a line comment if the start of the doc comment comes

-        // after other non-whitespace on the same line.

-//	    ubyte** dc = (lineComment && anyToken)

-//				 ? &t.lineComment

-//				 : &t.blockComment;

-

-        char[] dc = (lineComment && anyToken) ? t.lineComment : t.blockComment;

-

-        // Combine with previous doc comment, if any

-        if (dc.length)

-            dc = combineComments(dc, buf.toString().dup);

-        else

-            dc = buf.toString().dup;

-

-//		writefln( dc );

-

-        if (lineComment && anyToken)

-            t.lineComment = dc;

-        else

-            t.blockComment = dc;

-    }

-}

-

-// character maps

-static ubyte[256] cmtable;

-

-const int CMoctal  = 0x1;

-const int CMhex    = 0x2;

-const int CMidchar = 0x4;

-

-ubyte isoctal(ubyte c)

-{

-    return cmtable[c] & CMoctal;

-}

-ubyte ishex(ubyte c)

-{

-    return cmtable[c] & CMhex;

-}

-ubyte isidchar(ubyte c)

-{

-    return cmtable[c] & CMidchar;

-}

-

-static void cmtable_init()

-{

-    for (uint c = 0; c < cmtable.length; c++)

-    {

-        if ('0' <= c && c <= '7')

-            cmtable[c] |= CMoctal;

-        if (isdigit(c) || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F'))

-            cmtable[c] |= CMhex;

-        if (isalnum(c) || c == '_')

-            cmtable[c] |= CMidchar;

-    }

-}

-

-

-/+

-   struct StringValue

-   {

-    union

-    {

-                int intvalue;

-                void *ptrvalue;

-                dchar *string;

-    }

-

-    char[] lstring;

-   }

-   #define CASE_BASIC_TYPES

-        case TOKwchar: case TOKdchar:

-        case TOKbit: case TOKbool: case TOKchar:

-        case TOKint8: case TOKuns8:

-        case TOKint16: case TOKuns16:

-        case TOKint32: case TOKuns32:

-        case TOKint64: case TOKuns64:

-        case TOKfloat32: case TOKfloat64: case TOKfloat80:

-        case TOKimaginary32: case TOKimaginary64: case TOKimaginary80:

-        case TOKcomplex32: case TOKcomplex64: case TOKcomplex80:

-        case TOKvoid:

-

-   #define CASE_BASIC_TYPES_X(t)					\

-        case TOKvoid:	 t = Type::tvoid;  goto LabelX;		\

-        case TOKint8:	 t = Type::tint8;  goto LabelX;		\

-        case TOKuns8:	 t = Type::tuns8;  goto LabelX;		\

-        case TOKint16:	 t = Type::tint16; goto LabelX;		\

-        case TOKuns16:	 t = Type::tuns16; goto LabelX;		\

-        case TOKint32:	 t = Type::tint32; goto LabelX;		\

-        case TOKuns32:	 t = Type::tuns32; goto LabelX;		\

-        case TOKint64:	 t = Type::tint64; goto LabelX;		\

-        case TOKuns64:	 t = Type::tuns64; goto LabelX;		\

-        case TOKfloat32: t = Type::tfloat32; goto LabelX;	\

-        case TOKfloat64: t = Type::tfloat64; goto LabelX;	\

-        case TOKfloat80: t = Type::tfloat80; goto LabelX;	\

-        case TOKimaginary32: t = Type::timaginary32; goto LabelX;	\

-        case TOKimaginary64: t = Type::timaginary64; goto LabelX;	\

-        case TOKimaginary80: t = Type::timaginary80; goto LabelX;	\

-        case TOKcomplex32: t = Type::tcomplex32; goto LabelX;	\

-        case TOKcomplex64: t = Type::tcomplex64; goto LabelX;	\

-        case TOKcomplex80: t = Type::tcomplex80; goto LabelX;	\

-        case TOKbit:	 t = Type::tbit;     goto LabelX;	\

-        case TOKchar:	 t = Type::tchar;    goto LabelX;	\

-        case TOKwchar:	 t = Type::twchar; goto LabelX;	\

-        case TOKdchar:	 t = Type::tdchar; goto LabelX;	\

-        LabelX

- +/

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40007-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40007-Lexer.d
deleted file mode 100644
index 50f40a49..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40007-Lexer.d
+++ /dev/null
@@ -1,2414 +0,0 @@
-/+

- *      Copyright (c) 1999-2006 by Digital Mars

- *      All Rights Reserved

- *      written by Walter Bright www.digitalmars.com

- *      License for redistribution is by either the Artistic License in artistic.txt, or the GNU General Public License in gnu.txt.

- *      See the included readme.txt for details.

- *      D Language conversion by: J Duncan

- +/

-

-/**

- *      d language lexer

- */

-

-module dparser.Lexer;

-

-import dparser.Root;

-

-import dparser.Tokens;

-import dparser.Token;

-import dparser.Keyword;

-

-import dparser.Types;

-

-import dparser.Module;

-import dparser.Identifier;

-import dparser.unialpha;

-

-import dparser.OutBuffer;

-

-//private import std.ctype;

-//private import std.string;

-//import dwf.core.debugapi;

-

-int errno = 0;

-

-//#if _WIN32 && __DMC__

-// from \dm\src\include\setlocal.h

-//extern "C" char * __cdecl __locale_decpoint;

-char* __locale_decpoint;

-//#endif

-//const uint LS = 0x2028;	// UTF line separator

-//const uint PS = 0x2029;	// UTF paragraph separator

-

-//extern int isUniAlpha(unsigned u);

-//extern int HtmlNamedEntity(unsigned char *p, int length);

-

-/**

- *      Lexer object

- */

-

-class Lexer

-{

-    static           Identifier[char[]]       stringtable;

-    static OutBuffer stringbuffer;

-    static Token     * freelist;

-

-    Token            token;        // current token

-    Module           mod;          // current module

-    Loc              loc;          // for error messages

-    ubyte            *base;        // pointer to start of buffer

-    ubyte            *end;         // past end of buffer

-    ubyte            *p;           // current character

-    int              doDocComment; // collect doc comment information

-    int              anyToken;     // !=0 means seen at least one token

-    int              commentToken; // !=0 means comments are TOKcomment's

-

-

-    this(Module mod, ubyte* base, uint begoffset, uint endoffset, int doDocComment, int commentToken)

-    {

-        if (stringbuffer is null) {

-            stringbuffer = new OutBuffer;

-        }

-        loc = Loc(mod, 1);

-

-        this.base         = base;

-        this.end          = base + endoffset;

-        this.p            = base + begoffset;

-        this.mod          = mod;

-        this.doDocComment = doDocComment;

-        this.commentToken = commentToken;

-

-        /*

-         *      If first line starts with '#!', ignore the line

-         */

-

-        if (p[0] == '#' && p[1] == '!') {

-            p += 2;

-            while (true) {

-                ubyte c = *p;

-                switch (c) {

-                case '\n':

-                    p++;

-                    break;

-

-                case '\r':

-                    p++;

-                    if (*p == '\n') {

-                        p++;

-                    }

-                    break;

-

-                case 0:

-                case 0x1A:

-                    break;

-

-                default:

-                    if (c & 0x80) {

-                        uint u = decodeUTF();

-                        if (u == PS || u == LS) {

-                            break;

-                        }

-                    }

-                    p++;

-                    continue;

-                }

-                break;

-            }

-

-            loc.linnum = 2;

-        }

-    }

-

-

-

-    // generate a unique identifier for this string

-    static Identifier idPool(in char[] str) {

-//	    StringValue sv;

-//	    uint len = s.length;

-//	    StringValue sv = stringtable.update(s, len);

-//	    Identifier* id = cast(Identifier*) sv.ptrvalue;

-//	    if( id is null )

-        if ((str in stringtable) == null) {

-            stringtable[str] = new Identifier(str, TOK.TOKidentifier);

-        }

-        return(stringtable[str]);

-    }

-

-    static void initKeywords() {

-        // build character map

-        cmtable_init();

-

-        // create keyword tokens & identifiers

-        dparser.Keyword.initKeywords();

-

-        // create standard lexer tokens

-        dparser.Token.createLexerTokens();

-    }

-

-    // Combine two document comments into one.

-    static char[] combineComments(char[] c1, char[] c2) {

-        char[] c = c2;

-        if (c1.length) {

-            c = c1;

-            if (c2.length) {

-                c = c1 ~ "\n" ~ c2;

-            }

-        }

-        return(c);

-    }

-

-    // Decode UTF character. Issue error messages for invalid sequences. Return decoded character, advance p to last character in UTF sequence.

-    //! fix

-    uint decodeUTF() {

-        ubyte * s = p;

-        ubyte c   = *s;

-

-        assert(c & 0x80);

-        if (!(c & 0x80)) {

-            return(c);

-        }

-

-        return(cast(uint)'X');

-        /*

-         *  dchar u;

-         *  uint len;

-         *

-         *

-         *

-         *  // Check length of remaining string up to 6 UTF-8 characters

-         *  for( len = 1; len < 6 && s[len]; len++ )

-         *  {

-         *

-         *  }

-         *              /+

-         *  uint idx = 0;

-         *  char* msg = utf_decodeChar( s, len, &idx, &u );

-         *  p += idx - 1;

-         *  if( msg )

-         *  {

-         *              error(msg);

-         *  }

-         * +/

-         *  return u;

-         */

-    }

-

-    void error(...) {

-        if ((mod !is null) && !global.gag) {

-            writefln(formatLoc(loc, _arguments, _argptr));

-            /*

-             * char[] p = loc.toChars();

-             * if( p.length )

-             *  writef( "%s: ", p );

-             * writefx( stdout, _arguments, _argptr, 1 );

-             */

-            if (global.errors >= global.max_errors) {                   // moderate blizzard of cascading messages

-                throw new Exception("too many errors");

-            }

-        }

-

-        global.errors++;

-    }

-

-    void errorLoc(Loc loc, ...) {

-        if ((mod !is null) && !global.gag) {

-            writefln(formatLoc(loc, _arguments, _argptr));

-            /*

-             * char[] p = loc.toChars();

-             * if( p.length )

-             *  writef("%s: ", p);

-             * writefx(stdout, _arguments, _argptr, 1);

-             */

-            if (global.errors >= 20) {                  // moderate blizzard of cascading messages

-                throw new Exception("too many errors");

-            }

-        }

-

-        global.errors++;

-    }

-

-

-    TOK nextToken() {

-        if (token.next) {

-            Token* t = token.next;

-            memcpy(&token, t, Token.sizeof);

-//			t.next = freelist;

-//			freelist = t;

-        }

-        else {

-            scan(&token);

-        }

-//	    token.print();

-        return(token.value);

-    }

-

-    Token* peek(inout Token ct) {

-        Token* t;

-

-        if (ct.next) {

-            t = ct.next;

-        }

-        else {

-            t = new Token;

-            scan(t);

-            t.next  = null;

-            ct.next = t;

-        }

-        return(t);

-    }

-

-    // Turn next token in buffer into a token.

-

-    void scan(Token* t) {

-//		debug writefln("scan token");

-        uint lastLine = loc.linnum;

-        uint linnum;

-

-        t.blockComment = null;

-        t.lineComment  = null;

-        while (true) {

-            t.ptr = p;

-//			debug writefln( "    p = %d, *p = ", cast(uint)p, cast(char)*p );

-            switch (*p) {

-            case 0:

-            case 0x1a:

-                t.value = TOK.TOKeof;                                           // end of file

-//					debug writefln( "    EOF" );

-                return;

-

-            case ' ':

-            case '\t':

-            case '\v':

-            case '\f':

-                p++;

-//					debug writefln( "    whitespace" );

-                continue;                                                               // skip white space

-

-            case '\r':

-//					debug writefln( "    cr" );

-                p++;

-                if (*p != '\n') {                                               // if CR stands by itself

-                    loc.linnum++;

-                }

-                continue;                                                               // skip white space

-

-            case '\n':

-//					debug writefln( "    nl" );

-                p++;

-                loc.linnum++;

-                continue;                                                               // skip white space

-

-            case '0':

-            case '1':

-            case '2':

-            case '3':

-            case '4':

-            case '5':

-            case '6':

-            case '7':

-            case '8':

-            case '9':

-                t.value = number(t);

-                return;

-

-/*

- * #if CSTRINGS

- *                          case '\'':

- *                              t.value = charConstant(t, 0);

- *                              return;

- *

- *                          case '"':

- *                              t.value = stringConstant(t,0);

- *                              return;

- *

- *                          case 'l':

- *                          case 'L':

- *                              if( p[1] == '\'')

- *                              {

- *                                  p++;

- *                                  t.value = charConstant(t, 1);

- *                                  return;

- *                              }

- *                              else if( p[1] == '"')

- *                              {

- *                                  p++;

- *                                  t.value = stringConstant(t, 1);

- *                                  return;

- *                              }

- * #else

- */

-            case '\'':

-//					debug writefln( "    char" );

-                t.value = charConstant(t, 0);

-                return;

-

-            case 'r':

-//					debug writefln( "    wysiwyg" );

-                if (p[1] != '"') {

-                    goto case_identifier;

-                }

-                p++;

-

-            case '`':

-                t.value = wysiwygStringConstant(t, *p);

-                return;

-

-            case 'x':

-//					debug writefln( "    hex string" );

-                if (p[1] != '"') {

-                    goto case_identifier;

-                }

-                p++;

-                t.value = hexStringConstant(t);

-                return;

-

-

-            case '"':

-//					debug writefln( "    string" );

-                t.value = escapeStringConstant(t, 0);

-//					debug writefln( t.ustring );

-                return;

-

-            case '\\':                                  // escaped string literal

-//					debug writefln( "    escaped string literal" );

-                uint c;

-                stringbuffer.offset = 0;

-                do {

-                    p++;

-                    c = escapeSequence();

-                    stringbuffer.write(c);

-                } while (*p == '\\');

-//					t.len = stringbuffer.offset;

-//					stringbuffer.write(cast(byte)0);

-                t.ustring = stringbuffer.toString;

-//					memcpy( t.ustring.ptr, stringbuffer.data, stringbuffer.offset );

-                t.postfix = 0;

-                t.value   = TOK.TOKstring;

-                return;

-

-            case 'l':

-            case 'L':

-//	#endif

-

-            case 'a':

-            case 'b':

-            case 'c':

-            case 'd':

-            case 'e':

-            case 'f':

-            case 'g':

-            case 'h':

-            case 'i':

-            case 'j':

-            case 'k':

-            case 'm':

-            case 'n':

-            case 'o':

-            case 'p':

-            case 'q':                             /*case 'r':*/

-            case 's':

-            case 't':

-            case 'u':

-            case 'v':

-            case 'w':                                         /*case 'x':*/

-            case 'y':

-            case 'z':

-            case 'A':

-            case 'B':

-            case 'C':

-            case 'D':

-            case 'E':

-            case 'F':

-            case 'G':

-            case 'H':

-            case 'I':

-            case 'J':

-            case 'K':

-            case 'M':

-            case 'N':

-            case 'O':

-            case 'P':

-            case 'Q':

-            case 'R':

-            case 'S':

-            case 'T':

-            case 'U':

-            case 'V':

-            case 'W':

-            case 'X':

-            case 'Y':

-            case 'Z':

-            case '_':

-case_identifier:

-                {

-//					debug writefln( "    identifier" );

-                    ubyte c;

-                    do {

-                        c = *++p;

-                    } while (isidchar(c) || (c & 0x80 && isUniAlpha(decodeUTF())));

-

-//					sv = stringtable.update((char *)t.ptr, p - t.ptr);

-                    char[] tmp;

-                    tmp.length = p - t.ptr;

-                    memcpy(tmp.ptr, t.ptr, p - t.ptr);

-                    Identifier id;

-                    Identifier * pid = tmp in stringtable;

-                    if (pid) {

-                        id = *pid;

-                    }

-

-                    if (id is null) {

-                        id               = new Identifier(tmp, TOK.TOKidentifier);

-                        stringtable[tmp] = id;

-                    }

-

-                    t.identifier = id;

-                    t.value      = cast(TOK)id.value;

-                    anyToken     = 1;

-

-                    // if special identifier token

-                    if (*t.ptr == '_') {

-                        static char date[11 + 1];

-                        static char time[8 + 1];

-                        static char timestamp[24 + 1];

-

-                        if (!date[0]) {                         // lazy evaluation

-                            //!!

-                            /+

-                             *      time_t t;

-                             *      char *p;

-                             *      .time(&t);

-                             *      p = ctime(&t);

-                             *      assert(p);

-                             *      sprintf(date.ptr, "%.6s %.4s", p + 4, p + 20);

-                             *      sprintf(time.ptr, "%.8s", p + 11);

-                             *      sprintf(timestamp.ptr, "%.24s", p);

-                             +/

-                        }

-

-                        if (mod && id is Id.FILE) {

-                            t.value = TOK.TOKstring;

-                            if (loc.filename.length) {

-                                t.ustring = loc.filename;

-                            }

-                            else {

-                                t.ustring = mod.identifier.toChars();

-                            }

-                            goto Llen;

-                        }

-                        else if (mod && id == Id.LINE) {

-                            t.value      = TOK.TOKint64v;

-                            t.uns64value = loc.linnum;

-                        }

-                        else if (id == Id.DATE) {

-                            t.value = TOK.TOKstring;

-                            //! t.ustring = date;

-                            goto Llen;

-                        }

-                        else if (id == Id.TIME) {

-                            t.value = TOK.TOKstring;

-                            //! t.ustring = time;

-                            goto Llen;

-                        }

-                        else if (id == Id.TIMESTAMP) {

-                            t.value = TOK.TOKstring;

-                            //! t.ustring = timestamp;

-Llen:

-                            t.postfix = 0;

-//							t.len = strlen((char *)t.ustring);

-                        }

-                    }

-                    //printf("t.value = %d\n",t.value);

-                    return;

-                }

-

-            // comments

-            case '/':

-                p++;

-                switch (*p) {

-                case '=':

-                    p++;

-                    t.value = TOK.TOKdivass;

-                    return;

-

-                case '*':                               // '/*'

-                    p++;

-                    linnum = loc.linnum;

-                    while (true) {

-                        while (true) {

-                            ubyte c = *p;

-                            switch (c) {

-                            case '/':

-                                break;

-

-                            case '\n':

-                                loc.linnum++;

-                                p++;

-                                continue;

-

-                            case '\r':

-                                p++;

-                                if (*p != '\n') {

-                                    loc.linnum++;

-                                }

-                                continue;

-

-                            case 0:

-                            case 0x1A:

-                                error("unterminated /* */ comment");

-                                p       = end;

-                                t.value = TOK.TOKeof;

-                                return;

-

-                            default:

-                                if (c & 0x80) {

-                                    uint u = decodeUTF();

-                                    if (u == PS || u == LS) {

-                                        loc.linnum++;

-                                    }

-                                }

-                                p++;

-                                continue;

-                            }

-                            break;

-                        }

-                        p++;

-                        if (p[-2] == '*' && p - 3 != t.ptr) {

-                            break;

-                        }

-                    }

-

-                    if (commentToken) {

-                        t.value = TOK.TOKcomment;

-                        return;

-                    }

-                    // if /** but not /**/

-                    else if (doDocComment && t.ptr[2] == '*' && p - 4 != t.ptr) {

-                        getDocComment(t, lastLine == linnum);                                           //! ?

-                    }

-                    continue;

-

-                case '/':                                       // do // style comments

-                    linnum = loc.linnum;

-                    while (1) {

-                        ubyte c = *++p;

-                        switch (c) {

-                        case '\n':

-                            break;

-

-                        case '\r':

-                            if (p[1] == '\n') {

-                                p++;

-                            }

-                            break;

-

-                        case 0:

-                        case 0x1a:

-                            if (commentToken) {

-                                p       = end;

-                                t.value = TOK.TOKcomment;

-                                return;

-                            }

-                            if (doDocComment && t.ptr[2] == '/') {

-                                getDocComment(t, lastLine == linnum);

-                            }

-                            p       = end;

-                            t.value = TOK.TOKeof;

-                            return;

-

-                        default:

-                            if (c & 0x80) {

-                                uint u = decodeUTF();

-                                if (u == PS || u == LS) {

-                                    break;

-                                }

-                            }

-                            continue;

-                        }

-                        break;

-                    }

-

-                    if (commentToken) {

-                        p++;

-                        loc.linnum++;

-                        t.value = TOK.TOKcomment;

-                        return;

-                    }

-                    if (doDocComment && t.ptr[2] == '/') {

-                        getDocComment(t, lastLine == linnum);

-                    }

-

-                    p++;

-                    loc.linnum++;

-                    continue;

-

-                case '+':

-                    {

-                        int nest;

-                        linnum = loc.linnum;

-                        p++;

-                        nest = 1;

-                        while (1) {

-                            ubyte c = *p;

-                            switch (c) {

-                            case '/':

-                                p++;

-                                if (*p == '+') {

-                                    p++;

-                                    nest++;

-                                }

-                                continue;

-

-                            case '+':

-                                p++;

-                                if (*p == '/') {

-                                    p++;

-                                    if (--nest == 0) {

-                                        break;

-                                    }

-                                }

-                                continue;

-

-                            case '\r':

-                                p++;

-                                if (*p != '\n') {

-                                    loc.linnum++;

-                                }

-                                continue;

-

-                            case '\n':

-                                loc.linnum++;

-                                p++;

-                                continue;

-

-                            case 0:

-                            case 0x1A:

-                                error("unterminated /+ +/ comment");

-                                p       = end;

-                                t.value = TOK.TOKeof;

-                                return;

-

-                            default:

-                                if (c & 0x80) {

-                                    uint u = decodeUTF();

-                                    if (u == PS || u == LS) {

-                                        loc.linnum++;

-                                    }

-                                }

-                                p++;

-                                continue;

-                            }

-                            break;

-                        }

-                        if (commentToken) {

-                            t.value = TOK.TOKcomment;

-                            return;

-                        }

-                        if (doDocComment && t.ptr[2] == '+' && p - 4 != t.ptr) {

-                            // if /++ but not /++/

-                            getDocComment(t, lastLine == linnum);

-                        }

-                        continue;

-                    }

-

-                default:

-                    break;

-                }

-                t.value = TOK.TOKdiv;

-                return;

-

-            case '.':

-                p++;

-                if (isdigit(*p)) {

-                    p--;

-                    t.value = inreal(t);

-                }

-                else if (p[0] == '.') {

-                    if (p[1] == '.') {

-                        p      += 2;

-                        t.value = TOK.TOKdotdotdot;

-                    }

-                    else {

-                        p++;

-                        t.value = TOK.TOKslice;

-                    }

-                }

-                else {

-                    t.value = TOK.TOKdot;

-                }

-                return;

-

-            case '&':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    t.value = TOK.TOKandass;

-                }

-                else if (*p == '&') {

-                    p++;

-                    t.value = TOK.TOKandand;

-                }

-                else {

-                    t.value = TOK.TOKand;

-                }

-                return;

-

-            // |, ||, |=

-            case '|':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    t.value = TOK.TOKorass;

-                }

-                else if (*p == '|') {

-                    p++;

-                    t.value = TOK.TOKoror;

-                }

-                else {

-                    t.value = TOK.TOKor;

-                }

-                return;

-

-            case '-':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    t.value = TOK.TOKminass;

-                }

-                else if (*p == '-') {

-                    p++;

-                    t.value = TOK.TOKminusminus;

-                }

-                else {

-                    t.value = TOK.TOKmin;

-                }

-                return;

-

-            // +, +=, ++

-            case '+':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    t.value = TOK.TOKaddass;                                    // +=

-                }

-                else if (*p == '+') {

-                    p++;

-                    t.value = TOK.TOKplusplus;                                          // ++

-                }

-                else {

-                    t.value = TOK.TOKadd;                                                       // +

-                }

-                return;

-

-            // <, <=, <<=, <<, <>=, <>

-            case '<':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    t.value = TOK.TOKle;                                                // <=

-                }

-                else if (*p == '<') {

-                    p++;

-                    if (*p == '=') {

-                        p++;

-                        t.value = TOK.TOKshlass;                                        // <<=

-                    }

-                    else {

-                        t.value = TOK.TOKshl;                                           // <<

-                    }

-                }

-                else if (*p == '>') {

-                    p++;

-                    if (*p == '=') {

-                        p++;

-                        t.value = TOK.TOKleg;                                           // <>=

-                    }

-                    else {

-                        t.value = TOK.TOKlg;                                            // <>

-                    }

-                }

-                else {

-                    t.value = TOK.TOKlt;                                                // <

-                }

-                return;

-

-            // >, >>, >>>, >=, >>=, >>>=

-            case '>':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    t.value = TOK.TOKge;                                                // >=

-                }

-                else if (*p == '>') {

-                    p++;

-                    if (*p == '=') {

-                        p++;

-                        t.value = TOK.TOKshrass;                                        // >>=

-                    }

-                    else if (*p == '>') {

-                        p++;

-                        if (*p == '=') {

-                            p++;

-                            t.value = TOK.TOKushrass;                           // >>>=

-                        }

-                        else {

-                            t.value = TOK.TOKushr;                                      // >>>

-                        }

-                    }

-                    else {

-                        t.value = TOK.TOKshr;                                           // >>

-                    }

-                }

-                else {

-                    t.value = TOK.TOKgt;                                                // >

-                }

-                return;

-

-            case '!':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    if (*p == '=') {

-                        p++;

-                        t.value = TOK.TOKnotidentity;                                   // !==

-                    }

-                    else {

-                        t.value = TOK.TOKnotequal;                                      // !=

-                    }

-                }

-                else if (*p == '<') {

-                    p++;

-                    if (*p == '>') {

-                        p++;

-                        if (*p == '=') {

-                            p++;

-                            t.value = TOK.TOKunord;                             // !<>=

-                        }

-                        else {

-                            t.value = TOK.TOKue;                                // !<>

-                        }

-                    }

-                    else if (*p == '=') {

-                        p++;

-                        t.value = TOK.TOKug;                                    // !<=

-                    }

-                    else {

-                        t.value = TOK.TOKuge;                                   // !<

-                    }

-                }

-                else if (*p == '>') {

-                    p++;

-                    if (*p == '=') {

-                        p++;

-                        t.value = TOK.TOKul;                                    // !>=

-                    }

-                    else {

-                        t.value = TOK.TOKule;                                   // !>

-                    }

-                }

-                else {

-                    t.value = TOK.TOKnot;                                       // !

-                }

-                return;

-

-            case '=':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    if (*p == '=') {

-                        p++;

-                        t.value = TOK.TOKidentity;                                      // ===

-                    }

-                    else {

-                        t.value = TOK.TOKequal;                                         // ==

-                    }

-                }

-                else {

-                    t.value = TOK.TOKassign;                                    // =

-                }

-                return;

-

-            case '~':

-                p++;

-                if (*p == '=') {

-                    p++;

-                    t.value = TOK.TOKcatass;                                            // ~=

-                }

-                else {

-                    t.value = TOK.TOKtilde;                                             // ~

-                }

-                return;

-

-            // SINGLE

-            case '(': p++; t.value = TOK.TOKlparen;     return;

-

-            case ')': p++; t.value = TOK.TOKrparen;     return;

-

-            case '[': p++; t.value = TOK.TOKlbracket;   return;

-

-            case ']': p++; t.value = TOK.TOKrbracket;   return;

-

-            case '{': p++; t.value = TOK.TOKlcurly;     return;

-

-            case '}': p++; t.value = TOK.TOKrcurly;     return;

-

-            case '?': p++; t.value = TOK.TOKquestion;   return;

-

-            case ',': p++; t.value = TOK.TOKcomma;              return;

-

-            case ';': p++; t.value = TOK.TOKsemicolon;  return;

-

-            case ':': p++; t.value = TOK.TOKcolon;              return;

-

-            case '$': p++; t.value = TOK.TOKdollar;     return;

-

-            // DOUBLE

-            case '*': p++; if (*p == '=') {

-                    p++; t.value = TOK.TOKmulass;

-            }

-                else {

-                    t.value = TOK.TOKmul;

-                } return;

-

-            case '%': p++; if (*p == '=') {

-                    p++; t.value = TOK.TOKmodass;

-            }

-                else {

-                    t.value = TOK.TOKmod;

-                } return;

-

-            case '^': p++; if (*p == '=') {

-                    p++; t.value = TOK.TOKxorass;

-            }

-                else {

-                    t.value = TOK.TOKxor;

-                } return;

-

-// removed 148	case '~': p++; if( *p == '=' ) { p++; t.value = TOK.TOKcatass; } else t.value = TOK.TOKtilde; return;

-

-

-            case '#':

-                p++;

-                Pragma();

-                continue;

-

-            default:

-                {

-                    debug writefln("    default char");

-                    ubyte c = *p;

-                    if (c & 0x80) {

-                        uint u = decodeUTF();

-                        // Check for start of unicode identifier

-                        if (isUniAlpha(u)) {

-                            goto case_identifier;

-                        }

-

-                        if (u == PS || u == LS) {

-                            loc.linnum++;

-                            p++;

-                            continue;

-                        }

-                    }

-                    if (isprint(c)) {

-                        error("unsupported char '%s'", cast(char)c);

-                    }

-                    else {

-                        error("unsupported char 0x%02x", cast(ubyte)c);

-                    }

-                    p++;

-                    continue;

-                }

-            }

-        }

-    }

-

-

-

-    // Parse escape sequence.

-    uint escapeSequence() {

-        uint c;

-        int  n;

-        int  ndigits;

-

-        c = *p;

-        switch (c) {

-        case '\'':

-        case '"':

-        case '?':

-        case '\\':

-Lconsume:

-            p++;

-            break;

-

-        case 'a':       c = 7;          goto Lconsume;

-

-        case 'b':       c = 8;          goto Lconsume;

-

-        case 'f':       c = 12;         goto Lconsume;

-

-        case 'n':       c = 10;         goto Lconsume;

-

-        case 'r':       c = 13;         goto Lconsume;

-

-        case 't':       c = 9;          goto Lconsume;

-

-        case 'v':       c = 11;         goto Lconsume;

-

-        case 'u':

-            ndigits = 4;

-            goto Lhex;

-

-        case 'U':

-            ndigits = 8;

-            goto Lhex;

-

-        case 'x':

-            ndigits = 2;

-Lhex:

-            p++;

-            c = *p;

-            if (ishex(c)) {

-                uint v;

-                n = 0;

-                v = 0;

-                while (1) {

-                    if (isdigit(c)) {

-                        c -= '0';

-                    }

-                    else if (islower(c)) {

-                        c -= 'a' - 10;

-                    }

-                    else {

-                        c -= 'A' - 10;

-                    }

-                    v = v * 16 + c;

-                    c = *++p;

-                    if (++n == ndigits) {

-                        break;

-                    }

-                    if (!ishex(c)) {

-                        error("escape hex sequence has %d hex digits instead of %d", n, ndigits);

-                        break;

-                    }

-                }

-//!				    if( ndigits != 2 && !utf_isValidDchar(v))

-//!						error("invalid UTF character \\U%08x", v);

-                c = v;

-            }

-            else {

-                error("undefined escape hex sequence \\%s\n", c);

-            }

-            break;

-

-        case '&':                                       // named character entity

-            for (ubyte *idstart = ++p; 1; p++) {

-                switch (*p) {

-                case ';':

-                    //!!!

-                    /+

-                     * c = HtmlNamedEntity(idstart, p - idstart);

-                     * if( c == ~0 )

-                     * {

-                     *      error("unnamed character entity &%.*s;", p - idstart, idstart);

-                     *      c = ' ';

-                     * }

-                     *

-                     * p++;

-                     +/

-                    break;

-

-                default:

-                    if (isalpha(*p) || (p != idstart + 1 && isdigit(*p))) {

-                        continue;

-                    }

-                    error("unterminated named entity");

-                    break;

-                }

-                break;

-            }

-            break;

-

-        case 0:

-        case 0x1a:                                      // end of file

-            c = '\\';

-            break;

-

-        default:

-            if (isoctal(c)) {

-                ubyte v;

-                n = 0;

-                do {

-                    v = v * 8 + (c - '0');

-                    c = *++p;

-                } while (++n < 3 && isoctal(c));

-                c = v;

-            }

-            else {

-                error("undefined escape sequence \\%s\n", c);

-            }

-            break;

-        }

-        return(c);

-    }

-

-    /**************************************

-     */

-

-    TOK wysiwygStringConstant(Token *t, int tc) {

-        uint c;

-        Loc  start = loc;

-

-        p++;

-        stringbuffer.offset = 0;

-        while (1) {

-            c = *p++;

-            switch (c) {

-            case '\n':

-                loc.linnum++;

-                break;

-

-            case '\r':

-                if (*p == '\n') {

-                    continue;                           // ignore

-                }

-                c = '\n';                               // treat EndOfLine as \n character

-                loc.linnum++;

-                break;

-

-            case 0:

-            case 0x1a:

-                error("unterminated string constant starting at %s", start.toChars());

-                t.ustring = "";

-                t.postfix = 0;

-                return(TOK.TOKstring);

-

-            case '"':

-            case '`':

-                if (c == tc) {

-//				    t.len = stringbuffer.offset;

-                    stringbuffer.write(cast(byte)0);

-                    t.ustring = stringbuffer.toString;

-//				    t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-//				    memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-                    stringPostfix(t);

-                    return(TOK.TOKstring);

-                }

-                break;

-

-            default:

-                if (c & 0x80) {

-                    p--;

-                    uint u = decodeUTF();

-                    p++;

-                    if (u == PS || u == LS) {

-                        loc.linnum++;

-                    }

-                    stringbuffer.write(u);

-                    continue;

-                }

-                break;

-            }

-            stringbuffer.write(c);

-        }

-    }

-

-    /**************************************

-     * Lex hex strings:

-     *	x"0A ae 34FE BD"

-     */

-

-    TOK hexStringConstant(Token *t) {

-        uint c;

-        Loc  start = loc;

-        uint n     = 0;

-        uint v;

-

-        p++;

-        stringbuffer.offset = 0;

-        while (1) {

-            c = *p++;

-            switch (c) {

-            case ' ':

-            case '\t':

-            case '\v':

-            case '\f':

-                continue;                                               // skip white space

-

-            case '\r':

-                if (*p == '\n') {

-                    continue;                                           // ignore

-                }

-

-            // Treat isolated '\r' as if it were a '\n'

-            case '\n':

-                loc.linnum++;

-                continue;

-

-            case 0:

-            case 0x1a:

-                error("unterminated string constant starting at %s", start.toChars());

-                t.ustring = "";

-                t.postfix = 0;

-                return(TOK.TOKstring);

-

-            case '"':

-                if (n & 1) {

-                    error("odd number (%d) of hex characters in hex string", n);

-                    stringbuffer.write(v);

-                }

-//				t.len = stringbuffer.offset;

-//				stringbuffer.write(cast(byte)0);

-                t.ustring = stringbuffer.toString;

-//				t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-//				memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-                stringPostfix(t);

-                return(TOK.TOKstring);

-

-            default:

-                if (c >= '0' && c <= '9') {

-                    c -= '0';

-                }

-                else if (c >= 'a' && c <= 'f') {

-                    c -= 'a' - 10;

-                }

-                else if (c >= 'A' && c <= 'F') {

-                    c -= 'A' - 10;

-                }

-                else if (c & 0x80) {

-                    p--;

-                    uint u = decodeUTF();

-                    p++;

-                    if (u == PS || u == LS) {

-                        loc.linnum++;

-                    }

-                    else {

-                        error("non-hex character \\u%x", u);

-                    }

-                }

-                else {

-                    error("non-hex character '%s'", c);

-                }

-                if (n & 1) {

-                    v = (v << 4) | c;

-                    stringbuffer.write(v);

-                }

-                else {

-                    v = c;

-                }

-                n++;

-                break;

-            }

-        }

-    }

-

-    /**************************************

-     */

-

-    TOK escapeStringConstant(Token *t, int wide) {

-        uint c;

-        Loc  start = loc;

-

-        p++;

-        stringbuffer.offset = 0;

-        //    debug writefln( "escape string constant: %s", std.string.toString( cast(char*)p ) );

-        while (1) {

-            c = *p++;

-            switch (c) {

-            case '\\':

-                switch (*p) {

-                case 'u':

-                case 'U':

-                case '&':

-                    c = escapeSequence();

-                    stringbuffer.write(c);

-                    continue;

-

-                default:

-                    c = escapeSequence();

-                    break;

-                }

-                break;

-

-            case '\n':

-                loc.linnum++;

-                break;

-

-            case '\r':

-                if (*p == '\n') {

-                    continue;                           // ignore

-                }

-                c = '\n';                               // treat EndOfLine as \n character

-                loc.linnum++;

-                break;

-

-            case '"':

-//			        writefln( "end of string: ", stringbuffer.toString );

-                t.ustring = stringbuffer.toString().dup;

-                //				t.len = stringbuffer.offset;

-                //				stringbuffer.write(cast(byte)0);

-                //				t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-                //				memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-                stringPostfix(t);

-

-                return(TOK.TOKstring);

-

-            case 0:

-            case 0x1a:

-                p--;

-                error("unterminated string constant starting at %s", start.toChars());

-                t.ustring = "";

-//					t.len = 0;

-                t.postfix = 0;

-                return(TOK.TOKstring);

-

-            default:

-                if (c & 0x80) {

-                    p--;

-                    c = decodeUTF();

-                    if (c == LS || c == PS) {

-                        c = '\n';

-                        loc.linnum++;

-                    }

-                    p++;

-                    stringbuffer.write(cast(char)c);

-                    continue;

-                }

-                break;

-            }

-            stringbuffer.write(cast(char)c);

-//			writefln( stringbuffer.toString );

-        }

-    }

-

-    //**************************************

-    TOK charConstant(Token *t, int wide) {

-        uint c;

-        TOK  tk = TOK.TOKcharv;

-

-        //printf("Lexer.charConstant\n");

-        p++;

-        c = *p++;

-        switch (c) {

-        case '\\':

-            switch (*p) {

-            case 'u':

-                t.uns64value = escapeSequence();

-                tk           = TOK.TOKwcharv;

-                break;

-

-            case 'U':

-            case '&':

-                t.uns64value = escapeSequence();

-                tk           = TOK.TOKdcharv;

-                break;

-

-            default:

-                t.uns64value = escapeSequence();

-                break;

-            }

-            break;

-

-        case '\n':

-L1:

-            loc.linnum++;

-

-        case '\r':

-        case 0:

-        case 0x1a:

-        case '\'':

-            error("unterminated character constant");

-            return(tk);

-

-        default:

-            if (c & 0x80) {

-                p--;

-                c = decodeUTF();

-                p++;

-                if (c == LS || c == PS) {

-                    goto L1;

-                }

-                if (c < 0xd800 || (c >= 0xe000 && c < 0xfffe)) {

-                    tk = TOK.TOKwcharv;

-                }

-                else {

-                    tk = TOK.TOKdcharv;

-                }

-            }

-            t.uns64value = c;

-            break;

-        }

-

-        if (*p != '\'') {

-            error("unterminated character constant");

-            return(tk);

-        }

-        p++;

-        return(tk);

-    }

-

-    // Get postfix of string literal.

-    void stringPostfix(Token *t) {

-        switch (*p) {

-        case 'c':

-        case 'w':

-        case 'd':

-            t.postfix = *p;

-            p++;

-            break;

-

-        default:

-            t.postfix = 0;

-            break;

-        }

-    }

-

-    /***************************************

-     * Read \u or \U unicode sequence

-     * Input:

-     *	u	'u' or 'U'

-     */

-    /*

-     * uint Wchar(uint u)

-     * {

-     *  uint value;

-     *  uint n;

-     *  ubyte c;

-     *  uint nchars;

-     *

-     *  nchars = (u == 'U') ? 8 : 4;

-     *  value = 0;

-     *  for (n = 0; 1; n++)

-     *  {

-     * ++p;

-     *              if( n == nchars)

-     *                  break;

-     *              c = *p;

-     *              if( !ishex(c))

-     *              {

-     *                      error("\\%s sequence must be followed by %d hex characters", u, nchars);

-     *                  break;

-     *              }

-     *              if( isdigit(c))

-     *                  c -= '0';

-     *              else if( islower(c))

-     *                  c -= 'a' - 10;

-     *              else

-     *                  c -= 'A' - 10;

-     *              value <<= 4;

-     *              value |= c;

-     *  }

-     *  return value;

-     * }

-     */

-

-    /**************************************

-     * Read in a number.

-     * If it's an integer, store it in tok.TKutok.Vlong.

-     *	integers can be decimal, octal or hex

-     *	Handle the suffixes U, UL, LU, L, etc.

-     * If it's double, store it in tok.TKutok.Vdouble.

-     * Returns:

-     *	TKnum

-     *	TKdouble,...

-     */

-

-    TOK number(Token *t) {

-        //debug writefln("Lexer.number()");

-        // We use a state machine to collect numbers

-        enum STATE {

-            STATE_initial,

-            STATE_0,

-            STATE_decimal,

-            STATE_octal,

-            STATE_octale,

-            STATE_hex,

-            STATE_binary,

-            STATE_hex0,

-            STATE_binary0,

-            STATE_hexh,

-            STATE_error

-        }

-

-        enum FLAGS {

-            FLAGS_decimal  = 1,                         // decimal

-            FLAGS_unsigned = 2,                         // u or U suffix

-            FLAGS_long     = 4,                         // l or L suffix

-        }

-        FLAGS flags = FLAGS.FLAGS_decimal;

-

-        int   i;

-        TOK   result;

-        int   base;

-

-        stringbuffer.offset = 0;

-//		stringbuffer.data = null;

-        STATE state   = STATE.STATE_initial;

-        ubyte * start = p;

-

-        TOK _isreal() {

-            p = start;

-            return(inreal(t));

-        }

-

-        while (true) {

-            char c = cast(char)*p;

-            switch (state) {

-            case STATE.STATE_initial:                           // opening state

-                if (c == '0') {

-                    state = STATE.STATE_0;

-                }

-                else {

-                    state = STATE.STATE_decimal;

-                }

-                break;

-

-            case STATE.STATE_0:

-                flags = cast(FLAGS)(flags & ~FLAGS.FLAGS_decimal);

-                switch (c) {

-                //	#if ZEROH

-//					    case 'H':			// 0h

-//					    case 'h':

-//							goto hexh;

-                //	#endif

-                case 'X':

-                case 'x':

-                    state = STATE.STATE_hex0;

-                    break;

-

-                case '.':

-                    if (p[1] == '.') {                                          // .. is a separate token

-                        goto done;

-                    }

-

-                case 'i':

-                case 'f':

-                case 'F':

-                    goto _Real;

-

-                //	#if ZEROH

-//					    case 'E':

-//					    case 'e':

-//							goto case_hex;

-                //	#endif

-                case 'B':

-                case 'b':

-                    state = STATE.STATE_binary0;

-                    break;

-

-                case '0':

-                case '1':

-                case '2':

-                case '3':

-                case '4':

-                case '5':

-                case '6':

-                case '7':

-                    state = STATE.STATE_octal;

-                    break;

-

-                //	#if ZEROH

-//					    case '8': case '9': case 'A':

-//					    case 'C': case 'D': case 'F':

-//					    case 'a': case 'c': case 'd': case 'f':

-//						    case_hex:

-//							state = STATE.STATE_hexh;

-//							break;

-                //	#endif

-                case '_':

-                    state = STATE.STATE_octal;

-                    p++;

-                    continue;

-

-                default:

-                    goto done;

-                }

-                break;

-

-            case STATE.STATE_decimal:                           // reading decimal number

-

-                // if its not a digit - decimal complete or not a decimal

-                if (!isdigit(c)) {

-//						debug writefln( "\tnon-digit( %s )", c );

-                    //	#if ZEROH

-//					    if( ishex(c) || c == 'H' || c == 'h' )

-//							goto hexh;

-                    //	#endif

-                    //! wtf ?

-                    // ignore embedded _

-                    if (c == '_') {

-                        p++;

-                        continue;

-                    }

-

-                    // check decimal point - make real

-                    if (c == '.' && p[1] != '.') {

-                        goto _Real;

-                    }

-

-                    // check for mantra - make real

-                    if (c == 'i' || c == 'f' || c == 'F' || c == 'e' || c == 'E') {

-_Real:                  // It's a real number. Back up and rescan as a real

-                        p = start;

-                        return(inreal(t));

-                    }

-

-                    goto done;

-                }

-                break;

-

-            case STATE.STATE_hex0:                              // reading hex number

-            case STATE.STATE_hex:

-                if (!ishex(c)) {

-                    if (c == '_') {                                     // ignore embedded _

-                        p++;

-                        continue;

-                    }

-                    if (c == '.' && p[1] != '.') {

-                        goto _Real;

-                    }

-                    if (c == 'P' || c == 'p' || c == 'i') {

-                        goto _Real;

-                    }

-                    if (state == STATE.STATE_hex0) {

-                        error("Hex digit expected, not '%s'", c);

-                    }

-                    goto done;

-                }

-                state = STATE.STATE_hex;

-                break;

-

-            //	#if ZEROH

-//				    hexh:

-//						state = STATE.STATE_hexh;

-//

-//				    case STATE.STATE_hexh:		// parse numbers like 0FFh

-//						if( !ishex(c))

-//						{

-//						    if( c == 'H' || c == 'h')

-//						    {

-//								p++;

-//								base = 16;

-//								goto done;

-//						    }

-//						    else

-//						    {

-//								// Check for something like 1E3 or 0E24

-//								if( memchr(stringbuffer.data.ptr, 'E', stringbuffer.offset) || memchr( stringbuffer.data.ptr, 'e', stringbuffer.offset))

-//								    goto _Real;

-//								error("Hex digit expected, not '%s'", c);

-//								goto done;

-//						    }

-//						}

-//						break;

-            //		#endif

-

-            case STATE.STATE_octal:                                     // reading octal number

-            case STATE.STATE_octale:                                    // reading octal number with non-octal digits

-                if (!isoctal(c)) {

-//				#if ZEROH

-//						    if( ishex(c) || c == 'H' || c == 'h' )

-//								goto hexh;

-//				#endif

-                    if (c == '_') {                                             // ignore embedded _

-                        p++;

-                        continue;

-                    }

-                    if (c == '.' && p[1] != '.') {

-                        goto _Real;

-                    }

-                    if (c == 'i') {

-                        goto _Real;

-                    }

-                    if (isdigit(c)) {

-                        state = STATE.STATE_octale;

-                    }

-                    else {

-                        goto done;

-                    }

-                }

-                break;

-

-            case STATE.STATE_binary0:                                   // starting binary number

-            case STATE.STATE_binary:                                    // reading binary number

-                if (c != '0' && c != '1') {

-                    //			#if ZEROH

-//						    if( ishex(c) || c == 'H' || c == 'h' )

-//								goto hexh;

-                    //			#endif

-                    if (c == '_') {                                             // ignore embedded _

-                        p++;

-                        continue;

-                    }

-                    if (state == STATE.STATE_binary0) {

-                        error("binary digit expected");

-                        state = STATE.STATE_error;

-                        break;

-                    }

-                    else {

-                        goto done;

-                    }

-                }

-                state = STATE.STATE_binary;

-                break;

-

-            case STATE.STATE_error:                                     // for error recovery

-                if (!isdigit(c)) {                                      // scan until non-digit

-                    goto done;

-                }

-                break;

-

-            default:

-                assert(0);

-            }

-            stringbuffer.write(cast(char)c);

-            p++;

-        }

-done:

-        stringbuffer.write(cast(char)0);                // terminate string

-

-//		debug writefln( "\tdigit complete( %s )", stringbuffer.toString );

-

-        if (state == STATE.STATE_octale) {

-            error("Octal digit expected");

-        }

-

-        uinteger_t n;                           // unsigned >=64 bit integer type

-

-        if (stringbuffer.offset == 2 && (state == STATE.STATE_decimal || state == STATE.STATE_0)) {

-            n = stringbuffer.data[0] - '0';

-        }

-        else {

-            // Convert string to integer

-            char* p = cast(char*)stringbuffer.data.ptr;

-            int r   = 10;

-            int d;

-            if (*p == '0') {

-                if (p[1] == 'x' || p[1] == 'X') {

-                    // "0x#"

-                    p += 2;

-                    r  = 16;

-                }

-                else if (p[1] == 'b' || p[1] == 'B') {

-                    // "0b#" - binary

-                    p += 2;

-                    r  = 2;

-                }

-                else if (isdigit(p[1])) {

-                    p += 1;

-                    r  = 8;

-                }

-            }

-

-            n = 0;

-

-            while (true) {

-                if (*p >= '0' && *p <= '9') {

-                    d = *p - '0';

-                }

-                else if (*p >= 'a' && *p <= 'z') {

-                    d = *p - 'a' + 10;

-                }

-                else if (*p >= 'A' && *p <= 'Z') {

-                    d = *p - 'A' + 10;

-                }

-                else {

-                    break;

-                }

-

-                if (d >= r) {

-                    break;

-                }

-

-                if (n * r + d < n) {

-                    error("integer overflow");

-                    break;

-                }

-

-                n = n * r + d;

-                p++;

-            }

-

-            // if n needs more than 64 bits

-            if (n.sizeof > 8 && n > 0xffffffffffffffffL) {

-                error("integer overflow");

-            }

-        }

-

-        // Parse trailing 'u', 'U', 'l' or 'L' in any combination

-        while (true) {

-            ubyte f;

-            switch (*p) {

-            case 'U':

-            case 'u':

-                f = FLAGS.FLAGS_unsigned;

-                goto L1;

-

-            case 'L':

-            case 'l':

-                f = FLAGS.FLAGS_long;

-L1:

-                p++;

-                if (flags & f) {

-                    error("unrecognized token");

-                }

-                flags = cast(FLAGS)(flags | f);

-                continue;

-

-            default:

-                break;

-            }

-            break;

-        }

-

-        switch (flags) {

-        case 0:

-            /* Octal or Hexadecimal constant.

-             * First that fits: int, uint, long, ulong

-             */

-            if (n & 0x8000000000000000L) {

-                result = TOK.TOKuns64v;

-            }

-            else if (n & 0xffffffff00000000L) {

-                result = TOK.TOKint64v;

-            }

-            else if (n & 0x80000000) {

-                result = TOK.TOKuns32v;

-            }

-            else {

-                result = TOK.TOKint32v;

-            }

-            break;

-

-        case FLAGS.FLAGS_decimal:

-            /* First that fits: int, long, long long

-             */

-            if (n & 0x8000000000000000L) {

-                error("signed integer overflow");

-                result = TOK.TOKuns64v;

-            }

-            else if (n & 0xffffffff80000000L) {

-                result = TOK.TOKint64v;

-            }

-            else {

-                result = TOK.TOKint32v;

-            }

-            break;

-

-        case FLAGS.FLAGS_unsigned:

-        case FLAGS.FLAGS_decimal | FLAGS.FLAGS_unsigned:

-            /* First that fits: uint, ulong

-             */

-            if (n & 0xffffffff00000000L) {

-                result = TOK.TOKuns64v;

-            }

-            else {

-                result = TOK.TOKuns32v;

-            }

-            break;

-

-        case FLAGS.FLAGS_decimal | FLAGS.FLAGS_long:

-            if (n & 0x8000000000000000L) {

-                error("signed integer overflow");

-                result = TOK.TOKuns64v;

-            }

-            else {

-                result = TOK.TOKint64v;

-            }

-            break;

-

-        case FLAGS.FLAGS_long:

-            if (n & 0x8000000000000000L) {

-                result = TOK.TOKuns64v;

-            }

-            else {

-                result = TOK.TOKint64v;

-            }

-            break;

-

-        case FLAGS.FLAGS_unsigned | FLAGS.FLAGS_long:

-        case FLAGS.FLAGS_decimal | FLAGS.FLAGS_unsigned | FLAGS.FLAGS_long:

-            result = TOK.TOKuns64v;

-            break;

-

-        default:

-            debug writefln("%x", flags);

-            assert(0);

-        }

-        t.uns64value = n;

-        return(result);

-    }

-

-    /**************************************

-     * Read in characters, converting them to real.

-     * Bugs:

-     *	Exponent overflow not detected.

-     *	Too much requested precision is not detected.

-     */

-

-    TOK inreal(Token *t) {

-        int  dblstate;

-        uint c;

-        char hex;                       // is this a hexadecimal-floating-constant?

-        TOK  result;

-

-        //printf("Lexer.inreal()\n");

-        stringbuffer.offset = 0;

-        dblstate            = 0;

-        hex                 = 0;

-Lnext:

-        while (1) {

-            // Get next char from input

-            c = *p++;

-            //printf("dblstate = %d, c = '%s'\n", dblstate, c);

-            while (1) {

-                switch (dblstate) {

-                case 0:                                 // opening state

-                    if (c == '0') {

-                        dblstate = 9;

-                    }

-                    else if (c == '.') {

-                        dblstate = 3;

-                    }

-                    else {

-                        dblstate = 1;

-                    }

-                    break;

-

-                case 9:

-                    dblstate = 1;

-                    if (c == 'X' || c == 'x') {

-                        hex++;

-                        break;

-                    }

-

-                case 1:                                 // digits to left of .

-                case 3:                                 // digits to right of .

-                case 7:                                 // continuing exponent digits

-                    if (!isdigit(c) && !(hex && isxdigit(c))) {

-                        if (c == '_') {

-                            goto Lnext;                         // ignore embedded '_'

-                        }

-                        dblstate++;

-                        continue;

-                    }

-                    break;

-

-                case 2:                                 // no more digits to left of .

-                    if (c == '.') {

-                        dblstate++;

-                        break;

-                    }

-

-                case 4:                                 // no more digits to right of .

-                    if ((c == 'E' || c == 'e') || hex && (c == 'P' || c == 'p')) {

-                        dblstate = 5;

-                        hex      = 0;                           // exponent is always decimal

-                        break;

-                    }

-                    if (hex) {

-                        error("binary-exponent-part required");

-                    }

-                    goto done;

-

-                case 5:                                 // looking immediately to right of E

-                    dblstate++;

-                    if (c == '-' || c == '+') {

-                        break;

-                    }

-

-                case 6:                                 // 1st exponent digit expected

-                    if (!isdigit(c)) {

-                        error("exponent expected");

-                    }

-                    dblstate++;

-                    break;

-

-                case 8:                                 // past end of exponent digits

-                    goto done;

-                }

-                break;

-            }

-            stringbuffer.write(c);

-        }

-done:

-        p--;

-

-        stringbuffer.write(cast(byte)0);

-

-//	#if _WIN32 && __DMC__

-        char *save = __locale_decpoint;

-

-        __locale_decpoint = ".";

-//	#endif

-        t.float80value = strtold(cast(char *)stringbuffer.data.ptr, null);

-        errno          = 0;

-        switch (*p) {

-        case 'F':

-        case 'f':

-            strtof(cast(char *)stringbuffer.data.ptr, null);

-            result = TOK.TOKfloat32v;

-            p++;

-            break;

-

-        default:

-            strtod(cast(char *)stringbuffer.data.ptr, null);

-            result = TOK.TOKfloat64v;

-            break;

-

-        case 'L':

-        case 'l':

-            result = TOK.TOKfloat80v;

-            p++;

-            break;

-        }

-        if (*p == 'i' || *p == 'I') {

-            p++;

-            switch (result) {

-            case TOK.TOKfloat32v:

-                result = TOK.TOKimaginary32v;

-                break;

-

-            case TOK.TOKfloat64v:

-                result = TOK.TOKimaginary64v;

-                break;

-

-            case TOK.TOKfloat80v:

-                result = TOK.TOKimaginary80v;

-                break;

-            }

-        }

-//	#if _WIN32 && __DMC__

-        __locale_decpoint = save;

-//	#endif

-        if (errno == ERANGE) {

-            error("number is not representable");

-        }

-        return(result);

-    }

-

-

-

-

-    /*********************************************

-     * Do pragma.

-     * Currently, the only pragma supported is:

-     *	#line linnum [filespec]

-     */

-

-    void Pragma() {

-        Token  tok;

-        int    linnum;

-

-        char[] filespec;

-        Loc    loc = this.loc;

-

-        scan(&tok);

-

-        if (tok.value != TOK.TOKidentifier || tok.identifier != Id.line) {

-            goto Lerr;

-        }

-

-        scan(&tok);

-        if (tok.value == TOK.TOKint32v || tok.value == TOK.TOKint64v) {

-            linnum = tok.uns64value - 1;

-        }

-        else {

-            goto Lerr;

-        }

-

-        while (1) {

-            switch (*p) {

-            case 0:

-            case 0x1a:

-            case '\n':

-Lnewline:

-                this.loc.linnum = linnum;

-                if (filespec.length) {

-                    this.loc.filename = filespec;

-                }

-                return;

-

-            case '\r':

-                p++;

-                if (*p != '\n') {

-                    p--;

-                    goto Lnewline;

-                }

-                continue;

-

-            case ' ':

-            case '\t':

-            case '\v':

-            case '\f':

-                p++;

-                continue;                                               // skip white space

-

-            case '_':

-                if (mod && memcmp(p, cast(char*)"__FILE__", 8) == 0) {

-                    p += 8;

-//!					    filespec = mem.strdup(loc.filename ? loc.filename : mod.identifier.toChars());

-                }

-                continue;

-

-            case '"':

-                if (filespec) {

-                    goto Lerr;

-                }

-                stringbuffer.offset = 0;

-                p++;

-                while (1) {

-                    uint c;

-                    c = *p;

-                    switch (c) {

-                    case '\n':

-                    case '\r':

-                    case 0:

-                    case 0x1a:

-                        goto Lerr;

-

-                    case '"':

-                        stringbuffer.write(cast(byte)0);

-                        //						    filespec = mem.strdup((char *)stringbuffer.data);

-                        filespec = stringbuffer.toString.dup;

-                        p++;

-                        break;

-

-                    default:

-                        if (c & 0x80) {

-                            uint u = decodeUTF();

-                            if (u == PS || u == LS) {

-                                goto Lerr;

-                            }

-                        }

-                        stringbuffer.write(c);

-                        p++;

-                        continue;

-                    }

-                    break;

-                }

-                continue;

-

-            default:

-                if (*p & 0x80) {

-                    uint u = decodeUTF();

-                    if (u == PS || u == LS) {

-                        goto Lnewline;

-                    }

-                }

-                goto Lerr;

-            }

-        }

-

-Lerr:

-        errorLoc(loc, "#line integer [\"filespec\"]\\n expected");

-    }

-

-

-

-    /***************************************************

-     * Parse doc comment embedded between t.ptr and p.

-     * Remove trailing blanks and tabs from lines.

-     * Replace all newlines with \n.

-     * Remove leading comment character from each line.

-     * Decide if it's a lineComment or a blockComment.

-     * Append to previous one for this token.

-     */

-

-    void getDocComment(Token *t, uint lineComment) {

-        auto OutBuffer buf       = new OutBuffer;

-        ubyte          ct        = t.ptr[2];

-        ubyte          *q        = t.ptr + 3; // start of comment text

-        int            linestart = 0;

-

-        ubyte          *qend = p;

-

-        if (ct == '*' || ct == '+') {

-            qend -= 2;

-        }

-

-        // Scan over initial row of ****'s or ++++'s or ////'s

-        for (; q < qend; q++) {

-            if (*q != ct) {

-                break;

-            }

-        }

-

-        // Remove trailing row of ****'s or ++++'s

-        if (ct != '/') {

-            for (; q < qend; qend--) {

-                if (qend[-1] != ct) {

-                    break;

-                }

-            }

-        }

-

-        for (; q < qend; q++) {

-            ubyte c = *q;

-

-            switch (c) {

-            case '*':

-            case '+':

-                if (linestart && c == ct) {

-                    linestart = 0;

-                    // Trim preceding whitespace up to preceding \n

-                    while (buf.offset && (buf.data[buf.offset - 1] == ' ' || buf.data[buf.offset - 1] == '\t')) {

-                        buf.offset--;

-                    }

-                    continue;

-                }

-                break;

-

-            case ' ':

-            case '\t':

-                break;

-

-            case '\r':

-                if (q[1] == '\n') {

-                    continue;                                   // skip the \r

-                }

-                goto Lnewline;

-

-            default:

-                if (c == 226) {

-                    // If LS or PS

-                    if (q[1] == 128 &&

-                        (q[2] == 168 || q[2] == 169)) {

-                        q += 2;

-                        goto Lnewline;

-                    }

-                }

-                linestart = 0;

-                break;

-

-Lnewline:

-                c = '\n';                               // replace all newlines with \n

-

-            case '\n':

-                linestart = 1;

-

-                // Trim trailing whitespace

-                while (buf.offset && (buf.data[buf.offset - 1] == ' ' || buf.data[buf.offset - 1] == '\t')) {

-                    buf.offset--;

-                }

-

-                break;

-            }

-            buf.write(c);

-        }

-

-        // Always end with a newline

-        if (!buf.offset || buf.data[buf.offset - 1] != '\n') {

-            buf.writenl();

-        }

-

-        //buf.write(cast(char)0);

-

-        // It's a line comment if the start of the doc comment comes

-        // after other non-whitespace on the same line.

-//	    ubyte** dc = (lineComment && anyToken)

-//				 ? &t.lineComment

-//				 : &t.blockComment;

-

-        char[] dc = (lineComment && anyToken) ? t.lineComment : t.blockComment;

-

-        // Combine with previous doc comment, if any

-        if (dc.length) {

-            dc = combineComments(dc, buf.toString().dup);

-        }

-        else {

-            dc = buf.toString().dup;

-        }

-

-//		writefln( dc );

-

-        if (lineComment && anyToken) {

-            t.lineComment = dc;

-        }

-        else {

-            t.blockComment = dc;

-        }

-    }

-}

-

-// character maps

-static ubyte[256] cmtable;

-

-const int CMoctal  = 0x1;

-const int CMhex    = 0x2;

-const int CMidchar = 0x4;

-

-ubyte isoctal(ubyte c) {

-    return(cmtable[c] & CMoctal);

-}

-ubyte ishex(ubyte c) {

-    return(cmtable[c] & CMhex);

-}

-ubyte isidchar(ubyte c) {

-    return(cmtable[c] & CMidchar);

-}

-

-static void cmtable_init() {

-    for (uint c = 0; c < cmtable.length; c++) {

-        if ('0' <= c && c <= '7') {

-            cmtable[c] |= CMoctal;

-        }

-        if (isdigit(c) || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F')) {

-            cmtable[c] |= CMhex;

-        }

-        if (isalnum(c) || c == '_') {

-            cmtable[c] |= CMidchar;

-        }

-    }

-}

-

-

-/+

- * struct StringValue

- * {

- *  union

- *  {

- *              int intvalue;

- *              void *ptrvalue;

- *              dchar *string;

- *  }

- *

- *  char[] lstring;

- * }

- * #define CASE_BASIC_TYPES

- *      case TOKwchar: case TOKdchar:

- *      case TOKbit: case TOKbool: case TOKchar:

- *      case TOKint8: case TOKuns8:

- *      case TOKint16: case TOKuns16:

- *      case TOKint32: case TOKuns32:

- *      case TOKint64: case TOKuns64:

- *      case TOKfloat32: case TOKfloat64: case TOKfloat80:

- *      case TOKimaginary32: case TOKimaginary64: case TOKimaginary80:

- *      case TOKcomplex32: case TOKcomplex64: case TOKcomplex80:

- *      case TOKvoid:

- *

- * #define CASE_BASIC_TYPES_X(t)					\

- *      case TOKvoid:	 t = Type::tvoid;  goto LabelX;		\

- *      case TOKint8:	 t = Type::tint8;  goto LabelX;		\

- *      case TOKuns8:	 t = Type::tuns8;  goto LabelX;		\

- *      case TOKint16:	 t = Type::tint16; goto LabelX;		\

- *      case TOKuns16:	 t = Type::tuns16; goto LabelX;		\

- *      case TOKint32:	 t = Type::tint32; goto LabelX;		\

- *      case TOKuns32:	 t = Type::tuns32; goto LabelX;		\

- *      case TOKint64:	 t = Type::tint64; goto LabelX;		\

- *      case TOKuns64:	 t = Type::tuns64; goto LabelX;		\

- *      case TOKfloat32: t = Type::tfloat32; goto LabelX;	\

- *      case TOKfloat64: t = Type::tfloat64; goto LabelX;	\

- *      case TOKfloat80: t = Type::tfloat80; goto LabelX;	\

- *      case TOKimaginary32: t = Type::timaginary32; goto LabelX;	\

- *      case TOKimaginary64: t = Type::timaginary64; goto LabelX;	\

- *      case TOKimaginary80: t = Type::timaginary80; goto LabelX;	\

- *      case TOKcomplex32: t = Type::tcomplex32; goto LabelX;	\

- *      case TOKcomplex64: t = Type::tcomplex64; goto LabelX;	\

- *      case TOKcomplex80: t = Type::tcomplex80; goto LabelX;	\

- *      case TOKbit:	 t = Type::tbit;     goto LabelX;	\

- *      case TOKchar:	 t = Type::tchar;    goto LabelX;	\

- *      case TOKwchar:	 t = Type::twchar; goto LabelX;	\

- *      case TOKdchar:	 t = Type::tdchar; goto LabelX;	\

- *      LabelX

- +/

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40010-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40010-template.d
deleted file mode 100644
index 33a4155b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40010-template.d
+++ /dev/null
@@ -1,30 +0,0 @@
-
-template Foo(T, U)
-{
-    class Bar { }
-
-    T foo(T t, U u)
-    {
-    }
-
-    T abc;
-
-    typedef T            *FooType;
-    typedef Tte          **FooType0;
-    typedef int          *FooType1;
-    typedef const char   FooType2;
-}
-
-alias Foo!(int, char) f;
-f.Bar b;
-f.foo(1, 2);
-f.abc = 3;
-
-to!string(10.0);
-TFoo!int.t x;
-
-class Abc(T)
-{
-    T t;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40011-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40011-template.d
deleted file mode 100644
index 5c106063..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40011-template.d
+++ /dev/null
@@ -1,27 +0,0 @@
-template Foo (T, U)
-{
-    class Bar { }
-
-    T foo(T t, U u) {
-    }
-
-    T abc;
-
-    typedef T*           FooType;
-    typedef Tte**        FooType0;
-    typedef int*         FooType1;
-    typedef const char   FooType2;
-}
-
-alias Foo!(int, char) f;
-f.Bar b;
-f.foo(1, 2);
-f.abc = 3;
-
-to!string(10.0);
-TFoo!int.t x;
-
-class Abc (T)
-{
-    T t;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40020-funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40020-funcfunc.d
deleted file mode 100644
index de673e78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40020-funcfunc.d
+++ /dev/null
@@ -1,5 +0,0 @@
-int main()
-{
-    mWriter("class Clst_"c)(cluster.getChild(HO_SHORT_NAME).getText())(" : Cluster {"c).newline;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40021-tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40021-tst01.d
deleted file mode 100644
index e19c7c8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40021-tst01.d
+++ /dev/null
@@ -1,25 +0,0 @@
-package void writeRegister(int aRegisterOffset, ushort aValue)
-in
-{
-    assert(aRegisterOffset >= 0);
-    assert(aRegisterOffset < IMAGE_SIZE);
-}
-body {
-    int  idx = aRegisterOffset / 2;
-    mMemCache[idx] = aValue;
-    uint readback;
-    uint st;
-    uint st2;
-    volatile {
-        mMemImage[idx] = aValue;
-        //readback = (cast(uint*)mMemImage.ptr)[ idx/2 ];
-        //st = mMemImage[ 0x28/2 ];
-        //st2 = mMemImage[ 0x2A/2 ];
-    }
-    //if( aValue != readback )
-    {
-        //debug(IRQ) writefln( "writeRegister %04x, %04x", aRegisterOffset, aValue);
-    }
-    // comment
-}
-//
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40022-tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40022-tst02.d
deleted file mode 100644
index aa138a86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40022-tst02.d
+++ /dev/null
@@ -1,30 +0,0 @@
-package static ushort calcHeaderCrc(bool aStartupFrame, bool aSyncFrame, ushort aFrameId, ushort aPayloadWords) {
-    uint crcData = aPayloadWords;
-
-    crcData |= (aFrameId << 7);
-
-    if (aSyncFrame) {
-        crcData |= BIT_19;
-    }
-
-    if (aStartupFrame) {
-        crcData |= BIT_18;
-    }
-
-    ushort       crc       = 0x1a;
-    const ushort table[16] = [
-        0x0000, 0x0385, 0x070A, 0x048F,
-        0x0591, 0x0614, 0x029B, 0x011E,
-        0x00A7, 0x0322, 0x07AD, 0x0428,
-        0x0536, 0x06B3, 0x023C, 0x01B9
-    ];
-
-    for (int i = 0; i < 5; ++i) {
-        if (i != 0) {
-            crcData <<= 4;
-        }
-        crc = ((crc << 4) & 0x7FF) ^ table[((crc >> 7) ^ (crcData >> 16)) & 0x0F];
-    }
-
-    return(crc);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40023-bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40023-bug-indent.d
deleted file mode 100644
index 6071604d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40023-bug-indent.d
+++ /dev/null
@@ -1,39 +0,0 @@
-class TemplatedClass(T) {}
-class TemplatedClass2(T, U) {}
-
-class Axxxxxxxxxxxxxxxx {
-    alias A = int *;
-    void f()
-    {
-    }
-}
-
-class C
-{
-    //--------------| <= (1) - non first col comment -> indent
-    Axxxxxxxxxxxxxxxx.A createAssignment()
-    {
-        return(null);
-    }
-    void func2(Axxxxxxxxxxxxxxxx[] container)
-    {
-        foreach (v; container)
-        {
-            v.f();
-        }
-    }
-
-    //                  | <= (2)
-    void func3(TemplatedClass!int aValue)
-    {
-    }
-
-    void func4(TemplatedClass2!(int, int) b)
-    {
-    }
-}
-
-int main()
-{
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40024-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40024-tst03.d
deleted file mode 100644
index 2344510d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40024-tst03.d
+++ /dev/null
@@ -1,152 +0,0 @@
-import std.stdio;
-
-void foo()
-{
-    float  f = x % y;
-    double d = x % y;
-    real   r = x % y;
-
-    result = (x < y);    // false if x or y is nan
-    assert(e == 0);
-    int array[17];
-
-    array[] = value;
-    int array[17];
-
-    for (i = 0; i < array.length; i++)
-        func(array[i]);
-    int array[17];
-
-    foreach (int value; array)
-        func(value);
-    int[] array;
-
-    array.length            = array.length + 1;
-    array[array.length - 1] = x;
-    char[] s1;
-    char[] s2;
-    char[] s;
-
-    s = s1 ~ s2;
-    s ~= "hello";
-
-
-    writefln("Calling all cars %s times!", ntimes);
- Louter:
-    for (i = 0; i < 10; i++)
-    {
-        for (j = 0; j < 10; j++)
-        {
-            if (j == 3)
-                break Louter;
-            if (j == 4)
-                continue Louter;
-        }
-    }
-    // break Louter goes here
-    typedef bit    bHandle;
-    typedef int    iHandle = -1;
-    typedef void   *Handle = cast(void *)(-1);
-    Handle h;
-
-    h = func();
-    if (h != Handle.init)
-        ;
-    char[] string = "hello";
-
-    if (string < "betty")
-        ;
-    int *p = address;
-
-    volatile { i = *p; }
-
-    char[] ml = "This text spans
-multiple
-lines
-";
-}
-
-void dostring(char[] s)
-{
-    switch (s)
-    {
-    case "hello":;
-
-    case "goodbye":;
-
-    case "maybe":;
-
-    default:;
-    }
-}
-
-struct ABC
-{
-    int           z;    // z is aligned to the default
-
-    align (1) int x;    // x is byte aligned
-    align (4)
-    {
-        ...             // declarations in {} are dword aligned
-    }
-    align (2) :         // switch to word alignment from here on
-
-    int y;              // y is word aligned
-}
-
-struct Foo
-{
-    int i;
-    union
-    {
-        struct { int x; long y; }
-        char *p;
-    }
-}
-
-struct Foo { int x; int y; }    // note there is no terminating ;
-Foo foo;
-
-
-struct Foo { int x; int y; }
-
-off = Foo.y.offsetof;
-
-union U { int a; long b; }
-U x = { a:5 };
-
-struct S { int a; int b; }
-S x = { b:3, a:5 };
-
-int[3] a = [ 3, 2, 0 ];
-int[3] a = [ 3, 2 ];            // unsupplied initializers are 0, just like in C
-int[3] a = [ 2:0, 0:3, 1:2 ];
-int[3] a = [ 2:0, 0:3, 2 ];     // if not supplied, the index is the
-                                // previous one plus one.
-
-enum color { black, red, green }
-int[3] c = [ black:3, green:2, red:5 ];
-
-char[]  file        = `c:\root\file.c`;
-char[]  quoteString = \"  r"[^\\]*(\\.[^\\]*)*"  \";
-
-char[]  hello     = "hello world" \n;
-char[]  foo_ascii = "hello";       // string is taken to be ascii
-wchar[] foo_wchar = "hello";       // string is taken to be wchar
-
-enum COLORS { red, blue, green };
-
-char[][COLORS.max + 1] cstring = [
-    COLORS.red   : "red",
-    COLORS.blue  : "blue",
-    COLORS.green : "green",
-];
-
-const ushort table1[16] = [
-    0x00A7, 0x0322, 0x07AD, 0x0428,
-    0x0536, 0x06B3, 0x023C, 0x01B9
-];
-
-const ushort table2[16] = [ 0x0000, 0x0385, 0x070A, 0x048F,
-                            0x0536, 0x06B3, 0x023C, 0x01B9];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40025-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40025-tst03.d
deleted file mode 100644
index 15811ebc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40025-tst03.d
+++ /dev/null
@@ -1,157 +0,0 @@
-import std.stdio;
-
-void foo()
-{
-    float  f = x % y;
-    double d = x % y;
-    real   r = x % y;
-
-    result = (x < y);    // false if x or y is nan
-    assert(e == 0);
-    int array[ 17 ];
-
-    array[] = value;
-    int array[ 17 ];
-
-    for (i = 0; i < array.length; i++)
-        func(array[ i ]);
-    int array[ 17 ];
-
-    foreach (int value; array)
-        func(value);
-    int[] array;
-
-    array.length              = array.length + 1;
-    array[ array.length - 1 ] = x;
-    char[] s1;
-    char[] s2;
-    char[] s;
-
-    s = s1 ~ s2;
-    s ~= "hello";
-
-
-    writefln("Calling all cars %s times!", ntimes);
- Louter:
-    for (i = 0; i < 10; i++)
-    {
-        for (j = 0; j < 10; j++)
-        {
-            if (j == 3)
-                break Louter;
-            if (j == 4)
-                continue Louter;
-        }
-    }
-    // break Louter goes here
-    typedef bit    bHandle;
-    typedef int    iHandle = -1;
-    typedef void   *Handle = cast(void *)(-1);
-    Handle h;
-
-    h = func();
-    if (h != Handle.init)
-        ;
-    char[] string = "hello";
-
-    if (string < "betty")
-        ;
-    int *p = address;
-
-    volatile { i = *p; }
-
-    char[] ml = "This text spans
-multiple
-lines
-";
-}
-
-void dostring(char[] s)
-{
-    switch (s)
-    {
-    case "hello":;
-
-    case "goodbye":;
-
-    case "maybe":;
-
-    default:;
-    }
-}
-
-struct ABC
-{
-    int           z;    // z is aligned to the default
-
-    align (1) int x;    // x is byte aligned
-    align (4)
-    {
-        ...             // declarations in {} are dword aligned
-    }
-    align (2) :         // switch to word alignment from here on
-
-    int y;              // y is word aligned
-}
-
-struct Foo
-{
-    int i;
-    union
-    {
-        struct { int x; long y; }
-        char *p;
-    }
-}
-
-struct Foo { int x; int y; }    // note there is no terminating ;
-Foo foo;
-
-
-struct Foo { int x; int y; }
-
-off = Foo.y.offsetof;
-
-union U { int a; long b; }
-U x = { a:5 };
-
-struct S { int a; int b; }
-S x = { b:3, a:5 };
-
-int[ 3 ] a = [ 3, 2, 0 ];
-int[ 3 ] a = [ 3, 2 ];            // unsupplied initializers are 0, just like in C
-int[ 3 ] a = [ 2:0, 0:3, 1:2 ];
-int[ 3 ] a = [ 2:0, 0:3, 2 ];     // if not supplied, the index is the
-                                  // previous one plus one.
-
-enum color { black, red, green }
-int[ 3 ] c = [ black:3, green:2, red:5 ];
-
-char[]  file        = `c:\root\file.c`;
-char[]  quoteString = \"  r"[^\\]*(\\.[^\\]*)*"  \";
-
-char[]  hello     = "hello world" \n;
-char[]  foo_ascii = "hello";       // string is taken to be ascii
-wchar[] foo_wchar = "hello";       // string is taken to be wchar
-
-enum COLORS { red, blue, green };
-
-char[][ COLORS.max + 1 ] cstring =
-[
-    COLORS.red:"red",
-    COLORS.blue:"blue",
-    COLORS.green:"green",
-];
-
-const ushort table1[ 16 ] =
-[
-    0x00A7, 0x0322, 0x07AD, 0x0428,
-    0x0536, 0x06B3, 0x023C, 0x01B9
-];
-
-const ushort table2[ 16 ] =
-[
-    0x0000, 0x0385, 0x070A, 0x048F,
-    0x0536, 0x06B3, 0x023C, 0x01B9
-];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40026-wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40026-wysiwyg_strings.d
deleted file mode 100644
index cfdec32a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40026-wysiwyg_strings.d
+++ /dev/null
@@ -1,9 +0,0 @@
-auto s = `\`;
-auto t = `\a
-b
-`;
-
-auto u = r"\";
-auto v = r"\a
-b
-";
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40027-static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40027-static_if_in_struct.d
deleted file mode 100644
index be936335..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40027-static_if_in_struct.d
+++ /dev/null
@@ -1,5 +0,0 @@
-struct Widget {

-	static if (true)

-		void fun() {

-		}

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40030-delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40030-delegate.d
deleted file mode 100644
index 5f7beceb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40030-delegate.d
+++ /dev/null
@@ -1,22 +0,0 @@
-module er;
-
-void delegate(ubyte[] a) TSender;
-bool delegate(ushort a)  TVerifier;
-typedef ushort          TAddr;
-
-public void delegate(ubyte[] a) TSender;
-public bool delegate(ushort a)  TVerifier;
-public typedef ushort   TAddr;
-
-void delegate() dg;
-dg = {
-    int y;
-};
-
-int opApply(int delegate(inout Type[, ...]) dg);
-
-void main()
-{
-    assert(findIf("bcecg", (int x) { return x == 'a'; }) == 5);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40035-enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40035-enum.d
deleted file mode 100644
index 24d0ef63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40035-enum.d
+++ /dev/null
@@ -1,7 +0,0 @@
-/* sized enum like in C# */
-enum Metrics : int
-{
-    SM_CXSCREEN = 0,
-    SM_CYSCREEN,
-    SM_CXVSCROLL,
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40040-sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40040-sort_import.d
deleted file mode 100644
index db26c1e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40040-sort_import.d
+++ /dev/null
@@ -1,19 +0,0 @@
-// should be ddd, eee, fff
-import ddd;
-import eee;
-import fff;
-
-// should be aaa, ccc
-import aaa;
-import ccc;
-// should be just bbb
-import bbb;
-
-// should not change these, as it can't handle multi-line imports
-private import mango.ccc;
-private import mango.bbb,
-               mango.aaa;
-
-void foo();
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40050-strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40050-strings.d
deleted file mode 100644
index 4964ad7a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40050-strings.d
+++ /dev/null
@@ -1,32 +0,0 @@
-
-/* This file goes over all the various string formats for D */
-
-int foo(int bar)
-{
-    char[] a;
-    char   b;
-
-    a = r"WYSIWYG";
-    a = `WYSIWYG`;
-    b = 'c';
-    a = x"12 34 5678 90";
-    a = "This\nis a \"test\"";
-    a = \' ~ \" ~ \? ~ \\ ~ \a ~ \b ~ \f ~ \n ~ \r ~ \t ~ \v;
-    a = \x1B ~ \0 ~ \74 ~ \123;
-    a = \u1234 ~ \U12345678;
-    a = \&amp; ~ 'a';
-    a = "Another" " " "Test";
-
-    /+ test back to back EscapeSequences +/
-    a = \r\n\xff\&amp;\u1234;
-
-    a = "char"c;
-    a = "wchar"w;
-    a = "dchar"d;
-
-    /*
-     * multi line string
-     */
-    a = r"Line 1
-         line 2";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40051-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40051-numbers.d
deleted file mode 100644
index 72d55727..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40051-numbers.d
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/* This file goes over all the various number formats for D */
-
-int foo(int bar)
-{
-    int a;
-
-    /*
-     *  Interger Literals
-     */
-
-    /* Suffixes */
-    a = 0L + 123U + 345u + 456Lu + 567LU + 678UL + 789_uL;
-
-    /* Decimal */
-    a = 0 + 123456 + 123_456 + 1_2_3_4_5_6;
-
-    /* Binary */
-    a = 0b1010101 + 0B1001;
-
-    /* Octal */
-    a = 01234567_ + 07_6_5_2;
-
-    /* Hexadecimal */
-    a = 0x1234567890abcdefABCDEF_ + 0X7_6_5_2;
-
-    float  b;
-    real   c;
-    ifloat d;
-    ireal  e;
-
-    /* Floats: float [FloatSuffix] [ImaginarySuffix] */
-
-    /* HexFloat */
-    b = 0xabc.defp-1024 + 0x.defP-64 + 0x123p+32 + 0x123P+16 + 0x123p1024;
-    d = 0x123p45 + 0x234.fi + 0. + .3f;
-    e = 3 + 5i;
-    e = 3.4 + 5.6i;
-}
-
-/* test '..' ranges */
-void main()
-{
-    char[] c = "kkkkkkkkkkkkkkkkkkkkk";
-    writefln("%s", c[2 .. 3]);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40052-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40052-numbers.d
deleted file mode 100644
index 8cf51f29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40052-numbers.d
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This file goes over all the various number formats for D */
-
-int foo(int bar) {
-    int a;
-
-    /*
-     *  Interger Literals
-     */
-
-    /* Suffixes */
-    a = 0L + 123U + 345u + 456Lu + 567LU + 678UL + 789_uL;
-
-    /* Decimal */
-    a = 0 + 123456 + 123_456 + 1_2_3_4_5_6;
-
-    /* Binary */
-    a = 0b1010101 + 0B1001;
-
-    /* Octal */
-    a = 01234567_ + 07_6_5_2;
-
-    /* Hexadecimal */
-    a = 0x1234567890abcdefABCDEF_ + 0X7_6_5_2;
-
-    float  b;
-    real   c;
-    ifloat d;
-    ireal  e;
-
-    /* Floats: float [FloatSuffix] [ImaginarySuffix] */
-
-    /* HexFloat */
-    b = 0xabc.defp-1024 + 0x.defP-64 + 0x123p+32 + 0x123P+16 + 0x123p1024;
-    d = 0x123p45 + 0x234.fi + 0. + .3f;
-    e = 3 + 5i;
-    e = 3.4 + 5.6i;
-}
-
-/* test '..' ranges */
-void main() {
-    char[] c = "kkkkkkkkkkkkkkkkkkkkk";
-    writefln("%s", c[2..3]);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40060-casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40060-casts.d
deleted file mode 100644
index b1d6b50b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40060-casts.d
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo(int a)
-{
-    char ch;
-
-    ch = cast(char)a;
-    ch = cast(char)45;
-    ch = (char)a; // not a d cast
-    ch = (int) 45;
-    ch = cast(foo)*bar;
-    ch = cast(foo)-bar;
-    ch = cast(foo)+45;
-    ch = cast(foo)&45;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40061-const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40061-const.d
deleted file mode 100644
index 8277f0c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40061-const.d
+++ /dev/null
@@ -1,11 +0,0 @@
-// hello
-A b()
-{
-    return null;
-}
-
-const(C) d()
-{
-    return null;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40070-d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40070-d_sp_paren.d
deleted file mode 100644
index cc38daae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40070-d_sp_paren.d
+++ /dev/null
@@ -1,23 +0,0 @@
-version(unittest) {
-	import foo;
-}
-
-void main() {
-	scope(exit) {
-		foo();
-	}
-
-	scope(success) suckit();
-
-	scope f = new Foo();
-	if (foo)
-	{
-	}
-
-	try {
-		throw(e);
-	}
-	catch(Exception e) {
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40080-static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40080-static_if.d
deleted file mode 100644
index 0eb3a1a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40080-static_if.d
+++ /dev/null
@@ -1,11 +0,0 @@
-ClLinearExpression opBinary(string op) (double constant)
-{
-    static if (op == "+")
-        return new ClLinearExpression(this, 1, constant);
-    else static if (op == "-")
-        return new ClLinearExpression(this, 1, -constant);
-    else static if (op == "*")
-        return new ClLinearExpression(this, constant, 0);
-    else static if (op == "/")
-        return new ClLinearExpression(this, 1.0 / constant, 0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40090-square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40090-square_indent_tab.d
deleted file mode 100644
index e9657860..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40090-square_indent_tab.d
+++ /dev/null
@@ -1,25 +0,0 @@
-auto getOperatorsMap() {
-	return [
-		"/"     : TokenType.Slash,
-		"/="    : TokenType.SlashAssign,
-		"."     : TokenType.Dot,
-		".."    : TokenType.DoubleDot,
-		"..."   : TokenType.TripleDot,
-		"&"     : TokenType.Ampersand,
-		"&="    : TokenType.AmpersandAssign,
-		"&&"    : TokenType.DoubleAmpersand,
-		"|"     : TokenType.Pipe,
-		"|="    : TokenType.PipeAssign,
-		"||"    : TokenType.DoublePipe,
-		"-"     : TokenType.Minus,
-		"-="    : TokenType.MinusAssign,
-		"--"    : TokenType.DoubleMinus,
-		"+"     : TokenType.Plus,
-		"+="    : TokenType.PlusAssign,
-		"++"    : TokenType.DoublePlus,
-		"<"     : TokenType.Less,
-		"<="    : TokenType.LessAssign,
-		"<<"    : TokenType.DoubleLess
-	];
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40100-1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40100-1438.d
deleted file mode 100644
index 66c47d3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40100-1438.d
+++ /dev/null
@@ -1 +0,0 @@
-invariant(1 <= day && day <= 31);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40201-invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40201-invariant.d
deleted file mode 100644
index 3da6240f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40201-invariant.d
+++ /dev/null
@@ -1 +0,0 @@
-invariant (C)c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40300-extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40300-extern_.d
deleted file mode 100644
index 40131d6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40300-extern_.d
+++ /dev/null
@@ -1,6 +0,0 @@
-extern(D) : void func();
-
-void x()
-{
-    int xx;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40400-vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40400-vbraces000.d
deleted file mode 100644
index 616bb259..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40400-vbraces000.d
+++ /dev/null
@@ -1,15 +0,0 @@
-struct A

-{

-	static if (true)

-		void f() {

-		}

-}

-struct B

-{

-	static if(true) {

-		int a;

-	}

-	else{

-		int e;

-	}

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40401-vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40401-vbraces001.d
deleted file mode 100644
index 6d7e96f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40401-vbraces001.d
+++ /dev/null
@@ -1,9 +0,0 @@
-module x;

-static if (1)

-	void fun()

-	{

-	}

-static if (1)

-	void gun()

-	{

-	}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40402-vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40402-vbraces002.d
deleted file mode 100644
index c966d140..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40402-vbraces002.d
+++ /dev/null
@@ -1,23 +0,0 @@
-int super_fun(bool a, bool b, bool c, bool d)

-{

-	int i = 6;

-	static if (true)

-		while (true)

-			if(b) {

-				return 1;

-			}

-			else if (c) {

-				while (true)

-					if(d) {

-						return 2;

-					}

-					else{

-						while (true)

-							if(a)

-								return 3;

-					}

-			}

-	while (d)

-		return 4;

-	return 1;

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40403-template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40403-template_use.d
deleted file mode 100644
index 94cdbf6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40403-template_use.d
+++ /dev/null
@@ -1,2 +0,0 @@
-auto x = a!"23" + a!`23` + a!`2
-3` + a!23 + a!23.23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40500-template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40500-template_spacing000.d
deleted file mode 100644
index 627ca266..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40500-template_spacing000.d
+++ /dev/null
@@ -1,12 +0,0 @@
-void fun() {

-	if (something(a1, a2))

-		return;

-	if (something!a1)

-		return;

-	if (something!(a1, a2) )

-		return;

-	if (something!(a1, a2).Ptr)

-		return;

-	if (something!a1.Ptr)

-		return;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40501-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40501-template_spacing001.d
deleted file mode 100644
index dc3242ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40501-template_spacing001.d
+++ /dev/null
@@ -1,9 +0,0 @@
-void func0(TemplatedClass2!(int, int)b){

-}

-

-void func1(TemplatedClass2!(int, int)b){

-}

-

-

-void func2(TemplatedClass!int b){

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40502-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40502-template_spacing001.d
deleted file mode 100644
index 3c238a1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40502-template_spacing001.d
+++ /dev/null
@@ -1,9 +0,0 @@
-void func0(TemplatedClass2!(int, int) b){

-}

-

-void func1(TemplatedClass2!(int, int) b){

-}

-

-

-void func2(TemplatedClass!int b){

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40503-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40503-template_spacing001.d
deleted file mode 100644
index 010cbe07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40503-template_spacing001.d
+++ /dev/null
@@ -1,9 +0,0 @@
-void func0(TemplatedClass2!(int, int)   b){

-}

-

-void func1(TemplatedClass2!(int, int) b){

-}

-

-

-void func2(TemplatedClass!int   b){

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40504-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40504-type_spacing000.d
deleted file mode 100644
index 1e47f131..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40504-type_spacing000.d
+++ /dev/null
@@ -1,2 +0,0 @@
-alias jhash hash;

-alias Foo!(int, char) f;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40505-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40505-type_spacing000.d
deleted file mode 100644
index 1e47f131..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40505-type_spacing000.d
+++ /dev/null
@@ -1,2 +0,0 @@
-alias jhash hash;

-alias Foo!(int, char) f;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40506-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40506-type_spacing000.d
deleted file mode 100644
index e11e545b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40506-type_spacing000.d
+++ /dev/null
@@ -1,2 +0,0 @@
-alias jhash        hash;

-alias Foo!(int, char)    f;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/ecma/90000-example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/ecma/90000-example-1.es
deleted file mode 100644
index 45f9b6cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/ecma/90000-example-1.es
+++ /dev/null
@@ -1,12 +0,0 @@
-x = 0;            // A global variable
-var y = 'Hello!'; // Another global variable
-
-function f()
-{
-   var z = 'foxes'; // A local variable
-
-   twenty = 20;     // Global because keyword var is not used
-   return(x);       // We can use x here because it is global
-}
-// The value of z is no longer available
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80000-assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80000-assert.java
deleted file mode 100644
index fbc20ba7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80000-assert.java
+++ /dev/null
@@ -1,9 +0,0 @@
-public class JavaClass {
-   public static void main(String[] args)
-   {
-      /* assert EXPRESSION1 ; */
-      assert (a != null) && (b != null);
-      /* assert EXPRESSION1 : EXPRESSION2 ; */
-      assert (a != null) && (b != null) : "Message";
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80010-annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80010-annotation1.java
deleted file mode 100644
index 314a0b91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80010-annotation1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE,ElementType.METHOD,
-         ElementType.CONSTRUCTOR,ElementType.ANNOTATION_TYPE,
-         ElementType.PACKAGE,ElementType.FIELD,ElementType.LOCAL_VARIABLE})
-@Inherited
-
-public @interface Unfinished {
-public enum Priority { LOW, MEDIUM, HIGH }
-String value();
-String[] changedBy() default "";
-String[] lastChangedBy() default "";
-Priority priority() default Priority.MEDIUM;
-String createdBy() default "James Gosling";
-String lastChanged() default "08/07/2011";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80011-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80011-annotation2.java
deleted file mode 100644
index 1acc459f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80011-annotation2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Foo {private Runnable bar=new Runnable(){
-			  @Override @SuppressWarnings("baz") public void run(){
-				  quux();
-			  }
-		  };}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80012-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80012-annotation2.java
deleted file mode 100644
index 1acc459f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80012-annotation2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Foo {private Runnable bar=new Runnable(){
-			  @Override @SuppressWarnings("baz") public void run(){
-				  quux();
-			  }
-		  };}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80013-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80013-annotation2.java
deleted file mode 100644
index 42f5a1df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80013-annotation2.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class Foo {private Runnable bar=new Runnable(){
-			  @Override
-			  @SuppressWarnings("baz") public void run(){
-				  quux();
-			  }
-		  };}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80014-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80014-annotation2.java
deleted file mode 100644
index 42f5a1df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80014-annotation2.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class Foo {private Runnable bar=new Runnable(){
-			  @Override
-			  @SuppressWarnings("baz") public void run(){
-				  quux();
-			  }
-		  };}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80020-foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80020-foreach.java
deleted file mode 100644
index 69967517..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80020-foreach.java
+++ /dev/null
@@ -1,9 +0,0 @@
-public class Foo {
-
-    public static void main(String[] args) {
-        for (ProcessDefinition processDefinition:
-             allOfTheDefinitions.getData()) {
-            doit(processDefinition);
-        }
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80030-variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80030-variable_aligns.java
deleted file mode 100644
index c73b62d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80030-variable_aligns.java
+++ /dev/null
@@ -1,35 +0,0 @@
-class Aligns {
-final int         SZF  = 4;
-final int         SZ2F = 4;
-final int         aBarF;
-final int         someIntsF[];
-final int         someIntsSzdF[4];
-final int[]       someMoreIntsF;
-final int         lotsOfIntsF[][][][][][];
-final int[][][][] lotsMoreIntsF;
-final Tem<Plate>  edVarF;
-final int         aBarSetF                   = null;
-final int         someIntsSetF[]             = null;
-final int         someIntsSzdSetF[4]         = null;
-final int[]       someMoreIntsSetF           = null;
-final int         lotsOfIntsSetF[][][][][][] = null;
-final int[][][][] lotsMoreIntsSetF           = null;
-final Tem<Plate>  edVarF = null;
-int               SZ     = 4;
-int               SZ2    = 4;
-int               aBar;
-int               someInts[];
-int               someIntsSzd[4];
-int               spacer;
-int[]             someMoreInts;
-int               lotsOfInts[][][][][][];
-int[][][][]       lotsMoreInts;
-Tem<Plate>        edVar;
-int               aBarSet                   = null;
-int               someIntsSet[]             = null;
-int               someIntsSzdSet[4]         = null;
-int[]             someMoreIntsSet           = null;
-int               lotsOfIntsSet[][][][][][] = null;
-int[][][][]       lotsMoreIntsSet           = null;
-Tem<Plate>        edVar = null;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80040-try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80040-try.java
deleted file mode 100644
index 78a55849..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80040-try.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public static void main(String[] args) {
-	try (File file = new File("filename.txt"))
-	{
-		doit(processDefinition);
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80050-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80050-double_brace.java
deleted file mode 100644
index e00246e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80050-double_brace.java
+++ /dev/null
@@ -1,21 +0,0 @@
-member.func(new List() {{
-   add("Text");
-   add("Text",
-       "Hello");
-}});
-
-
-private static final Set<String> VALID_CODES = new HashSet<String>() {{
-   add("XZ13s");
-   add("AB21/X");
-   add("YYLEX");
-   add("AR2D");
-}};
-
-add(new JPanel() {{
-   setLayout(...);
-   setBorder(...);
-   add(new JLabel(...));
-   add(new JSpinner(...));
-}});
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80051-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80051-double_brace.java
deleted file mode 100644
index 66183ada..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80051-double_brace.java
+++ /dev/null
@@ -1,24 +0,0 @@
-member.func(new List()
-{{
-   add("Text");
-   add("Text",
-       "Hello");
-}});
-
-
-private static final Set<String> VALID_CODES = new HashSet<String>()
-{{
-   add("XZ13s");
-   add("AB21/X");
-   add("YYLEX");
-   add("AR2D");
-}};
-
-add(new JPanel()
-{{
-   setLayout(...);
-   setBorder(...);
-   add(new JLabel(...));
-   add(new JSpinner(...));
-}});
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80060-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80060-synchronized.java
deleted file mode 100644
index b8b70a6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80060-synchronized.java
+++ /dev/null
@@ -1,37 +0,0 @@
-public class A
-{
-	private synchronized static void g(){
-		int x=1;
-	}
-	synchronized A f(){
-		return null;
-	}
-	public void foo(){
-		g();
-
-		synchronized ( this )
-		{
-			g();
-		}
-
-		g();
-
-		synchronized ( this )
-		{
-			synchronized ( this )
-			{
-				synchronized ( this )
-				{
-					g();
-				}
-			}
-
-			g();
-		}
-
-		synchronized ( this )
-		{
-			g();
-		}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80061-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80061-synchronized.java
deleted file mode 100644
index 73fc9b1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80061-synchronized.java
+++ /dev/null
@@ -1,29 +0,0 @@
-public class A {
-	private synchronized static void g(){
-		int x=1;
-	}
-	synchronized A f(){
-		return null;
-	}
-	public void foo(){
-		g(); synchronized(this)
-		{
-			g();
-		}
-		g(); synchronized(this)
-		{
-			synchronized(this)
-			{
-				synchronized(this)
-				{
-					g();
-				}
-			}
-			g();
-		}
-		synchronized(this)
-		{
-			g();
-		}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80062-sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80062-sp_this_paren.java
deleted file mode 100644
index 1c189223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80062-sp_this_paren.java
+++ /dev/null
@@ -1,9 +0,0 @@
-public class JavaClass {
-public JavaClass() {
-	this (1);
-}
-
-public JavaClass(int i) {
-	super (i);
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80063-i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80063-i1121.java
deleted file mode 100644
index 18567ec3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80063-i1121.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Test {
-public static void main() {
-	btn.addActionListener(e->{
-			System.exit(0);
-		});
-}
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80064-long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80064-long_cl_cmt.java
deleted file mode 100644
index af7a1c7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80064-long_cl_cmt.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Cls
-{
-public void f();
-} /* class Cls */
-// no class end semicolon
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80065-Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80065-Java8DoubleColon.java
deleted file mode 100644
index ec594909..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80065-Java8DoubleColon.java
+++ /dev/null
@@ -1,10 +0,0 @@
-import java.util.Objects;
-import java.util.function.Predicate;
-
-public class Java8DoubleColon {
-public static void main(String[] args) {
-	Predicate<Object> p = Objects::nonNull;
-	System.out.println(false == p.test(null));
-	System.out.println(true == p.test(p));
-}
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80066-sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80066-sp_after_for_colon.java
deleted file mode 100644
index 38515aed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80066-sp_after_for_colon.java
+++ /dev/null
@@ -1 +0,0 @@
-for (Type var : expr)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80067-doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80067-doxy-javadoc-alignment.java
deleted file mode 100644
index 6b9f748b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80067-doxy-javadoc-alignment.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * @author  Firstname Lastname <address @ example.com>
- * @version 1.6 (current version number of program)
- * @since   1.2 (the version of the package to which this class was
- *          first added)
- */
-
-/**
- * Short one line description.                           (1)
- *
- * Longer description. If there were any, it would be    (2) here.
- *
- * And even more explanations to follow in consecutive paragraphs
- * separated by HTML paragraph breaks... or so we think, haha. After
- * this paragraph, add a reference to an @param to verify that it is
- * ignored since it does not occur at the beginning of the line. Let's
- * also throw in an @return to verify that it passes the test as well.
- *
- * @param  variable Description text text text.          (3)
- * @return          Description text text text.
- */
-
-/**
- * Validates a chess move.
- *
- * Use {@link #doMove(int fromFile, int fromRank, int toFile, int
- * toRank)} to move a piece.
- *
- * @param  fromFile file from which a piece is being moved
- * @param  fromRank rank from which a piece is being moved
- * @param  toFile   file to which a piece is being moved
- * @param  toRank   rank to which a piece is being moved
- * @return          true if the move is valid, otherwise false
- * @since           1.0
- */
-
-/**
- * Draws as much of the specified image as is currently available with
- * its northwest corner at the specified coordinate (x, y). This
- * method will return immediately in all cases, even if the entire
- * image has not yet been scaled, dithered and converted for the
- * current output device.
- *
- * If the current output representation is not yet complete then the
- * method will return false and the indicated {@link ImageObserver}
- * object will be notified as the conversion process progresses.
- *
- * @param  img      the image to be drawn
- * @param  x, y     the x- and y-coordinates of the northwest corner
- *                  of the destination rectangle in pixels
- * @param  observer the image observer to be notified as more of the
- *                  image is converted.  May be null
- * @return          true if the image is completely loaded and was
- *                  painted successfully; false otherwise.
- * @see             Image
- * @see             ImageObserver
- * @since           1.0
- */
-
-/**
- * @see   #create(int, int, int, int)
- * @see   #finalize()
- * @see   Component#getGraphics()
- * @see   Component#paint(Graphics)
- * @see   Component#update(Graphics)
- * @since 1.0
- */
-
-/**
- * Disposes of this graphics context once it is no longer referenced.
- *
- * @see   #dispose()
- * @since 1.0
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80100-sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80100-sf567.java
deleted file mode 100644
index 9fc644b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80100-sf567.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.temp.test;
-
-public class Database
-{
-private Database(String fileName)
-{
-	readConfig(fileName, "asdfasdf", 1);
-	readConfig(ame,      "aasdf",    1);
-
-	Database.readConfig(fileName, "asdfasdf", 1);
-	Database.readConfig(ame,      "aasdf",    1);
-}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80200-sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80200-sp_before_byref.java
deleted file mode 100644
index 7927ee89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80200-sp_before_byref.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public static void method() {
-	if (argA != null && argB != null) {
-	}
-	return (argA != null && argB != null);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80201-generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80201-generics.java
deleted file mode 100644
index 086786c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80201-generics.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Note: Some tests running on this _input_ file rely upon that the tripple
-// closing '>' are not separated by spaces or anything else!
-public class TestClass {
-private static void initMap(void) {
-	HashMap<String, HashMap<String, List<Track>>> resolutionTracks = new HashMap<String, HashMap<String, List<Track>>>();
-}
-
-private static void addTrackToMap(String resolution, Track track, HashMap<String, HashMap<String, List<Track>>> resolutionTracks) {
-	HashMap<String, List<Track>> tracks = null;
-
-	if (resolutionTracks.containsKey(resolution)) {
-		tracks = resolutionTracks.get(resolution);
-	} else {
-		tracks = new HashMap<String, List<Track>>();
-		tracks.put("soun", new LinkedList<Track>());
-		tracks.put("vide", new LinkedList<Track>());
-		resolutionTracks.put(resolution, tracks);
-	}
-
-	if (track.getHandler() != null) {
-		if (track.getHandler().equals("soun")) {
-			List<Track> audioTracks = tracks.get("soun");
-			audioTracks.add(track);
-		} else if (track.getHandler().equals("vide")) {
-			List<Track> videoTracks = tracks.get("vide");
-			videoTracks.add(track);
-		}
-	}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80202-generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80202-generics_wildcard.java
deleted file mode 100644
index 358e333b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80202-generics_wildcard.java
+++ /dev/null
@@ -1,25 +0,0 @@
-public class TestClass {
-    private Map< ? , ? > map1 = null;
-    private Map< ? , ? > map2 = null;
-    private Map< ? , ? > map3 = null;
-
-    public static HttpUriRequest getHttpUriRequest(TestClassAPIRequestMethod method, String apiPath) {
-        switch (method) {
-        case BOTTOM_LEFT:
-            break;
-        case GET:
-            req = new HttpGet(url);
-            break;
-        case POST:
-            req = new HttpPost(url);
-            break;
-        case PUT:
-            req = new HttpPut(url);
-            break;
-        case DELETE:
-            req = new HttpDelete(url);
-            break;
-        }
-        return req;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80203-generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80203-generics_return_type.java
deleted file mode 100644
index 1f2aa340..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80203-generics_return_type.java
+++ /dev/null
@@ -1,8 +0,0 @@
-public class TestClass {
-    public static <T> void executeRequest(final HttpUriRequest request, final ITestClassAPIResponseListener<T> responseListener) {
-    }
-
-    public <T extends YourType> T mymethod(T type) {
-        return type;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80204-cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80204-cast.java
deleted file mode 100644
index 30d0dcc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80204-cast.java
+++ /dev/null
@@ -1,24 +0,0 @@
-public class JavaClass {
-    private boolean isButtonHit(ImageView imageView, int x, int y) {
-        if (imageView != null) {
-            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) imageView.getLayoutParams();
-            Rect buttonRect = new Rect((int) (layoutParams.leftMargin - buttonExtraMargin),
-                (int) (layoutParams.topMargin - buttonExtraMargin),
-                (int) (layoutParams.leftMargin + imageView.getWidth() + buttonExtraMargin),
-                (int) (layoutParams.topMargin + imageView.getHeight() + buttonExtraMargin));
-
-            if (buttonRect.contains(x, y)) {
-                return true;
-            }
-        }
-
-        Map< ? , ? > map = (Map< ? , ? >) object;
-
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static List<Object> fromJSON(JSONArray obj) {
-        return (List<Object>) fromJSON((Object) obj);
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80205-sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80205-sp_after_angle.java
deleted file mode 100644
index bd654485..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80205-sp_after_angle.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class TestClassPrefetchData implements ITestClassAPIInputStreamResponseListener {
-    private class TestClassPrefetchDataWrite extends AsyncTask<Void, Void, Void> {
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80206-annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80206-annotation3.java
deleted file mode 100644
index 3d84c04c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80206-annotation3.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class LocalTests extends IosTest {
-    /**
-     * Check that app started up correctly. Then check that app continually runs for 5 seconds.
-     * Then wait up to 20 seconds for the splash screen disappear.
-     * @throws InterruptedException
-     */
-    @Test(groups = {"testdroid", "local"})
-    public void checkAppForCrash() throws InterruptedException {
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80300-Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80300-Issue_670.java
deleted file mode 100644
index b0aa2cf0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80300-Issue_670.java
+++ /dev/null
@@ -1,4 +0,0 @@
-Class definition:
-public class A_Really_Really_Long_Class_Name extends
-	Another_Really_Long_Class_Name {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80301-issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80301-issue_672.java
deleted file mode 100644
index 16a077a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80301-issue_672.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public abstract class KeyValueItemWriter<K, V> implements ItemWriter<V>,
-		                InitializingBean {}
-//3456789=123456789=12
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80302-Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80302-Issue_1845.java
deleted file mode 100644
index 062c89d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80302-Issue_1845.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Version implements Comparable<Version> {
-
-@Override
-public int compareTo(@NonNull Version that) {
-	return 0;
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80303-Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80303-Issue_1122.java
deleted file mode 100644
index 111ee739..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80303-Issue_1122.java
+++ /dev/null
@@ -1,3 +0,0 @@
-private void save()
-throws IOException {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80304-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80304-Issue_1124.java
deleted file mode 100644
index bca3cb33..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80304-Issue_1124.java
+++ /dev/null
@@ -1,6 +0,0 @@
-new URL(url)
-.
-openConnection();
-new URL(url)
-.
-openConnection();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80305-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80305-Issue_1124.java
deleted file mode 100644
index 0469fed1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80305-Issue_1124.java
+++ /dev/null
@@ -1,2 +0,0 @@
-new URL(url).openConnection();
-new URL(url).openConnection();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
deleted file mode 100644
index 19b6df0f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
+++ /dev/null
@@ -1,29 +0,0 @@
-class MyClass {
-	void foo(List<Integer> arr) {
-		arr.forEach(n -> {
-			// Okay: This line will be indented with only tabs.
-			if (cond1) { // Okay
-				// BAD1: This line will be indented with tabs up to lambda brace level, then spaces for the rest.
-				if (cond2) // BAD2
-					// Okay
-					bar(); // Okay
-				if (cond3) // BAD3
-				{ // BAD4
-					// BAD5
-					bar(); // BAD6
-				} // Okay
-			} // Okay
-			if (cond4) { // Okay
-				/*
-				BAD7: C-style comments will also be affected on all lines.
-				*/
-			} // Okay
-			if (cond5) // Okay
-			{ // Okay
-				bar(); // BAD8
-			} // Okay
-			if (cond6) // Okay
-				bar; // Okay
-		});
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10018-delete-space-oc.mm
deleted file mode 100644
index 8760241b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10018-delete-space-oc.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* EditorApplication */

-

-#include <string>

-

-#ifdef __OBJC__

-#import <Cocoa/Cocoa.h>

-

-class HierarchyState;

-@interface EditorApplication : NSObject

-{

-	IBOutlet id m_MainWindow;

-	IBOutlet id m_PaneController;

-	id m_RenderTimer;

-

-	IBOutlet id m_CutItem;

-	IBOutlet id m_CopyItem;

-	IBOutlet id m_PasteItem;

-

-	IBOutlet id m_DuplicateItem;

-	IBOutlet id m_DeleteItem;

-

-	IBOutlet id m_FrameSelectedItem;

-	IBOutlet id m_FindItem;

-	IBOutlet id m_SelectAllItem;

-}

-

-- (IBAction)SaveAssets: (id)sender;

-- (IBAction)CloseScene: (id)sender;

-- (IBAction)NewProject: (id)sender;

-- (IBAction)OpenProject: (id)sender;

-

-- (IBAction)SaveAsSceneToDisk: (id)sender;

-

-- (IBAction)EnterSerialNumber: (id)sender;

-- (IBAction)ReturnLicense: (id)sender;

-- (IBAction)CompileScene: (id)sender;

-- (IBAction)CompileSceneAutomatic: (id)sender;

-

-- (IBAction)saveDocument: (id)sender;

-

-- (IBAction)LoadSceneFromDisk: (id)sender;

-

-- (void)RemoveDisplayTimer;

-- (void)RegisterUpdateTimer: (int)frequency;

-

-- (void)refreshModifiedFile: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

-- (void)closeFile: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

-

-- (IBAction)ShowAboutDialog: (id)sender;

-- (IBAction)ShowPreferences: (id)sender;

-- (IBAction)ShowPackageManager: (id)sender;

-

-- (IBAction) delete: (id)sender;

-- (IBAction) copy: (id)action;

-- (IBAction)paste: (id)action;

-- (IBAction)duplicate: (id)action;

-- (IBAction)cut: (id)action;

-- (IBAction)selectAll: (id)action;

-- (IBAction)find: (id)action;

-- (IBAction)frameSelected: (id)action;

-- (IBAction)frameSelectedWithLock: (id)action;

-

-// Assetstore protocol handler and registration

-- (void)registerAssetStoreURLProtocol;

-- (void)getUrl: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

-

-@end

-

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10019-func-param-wrap-oc.mm
deleted file mode 100644
index 45601228..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10019-func-param-wrap-oc.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-if(progress <= 0)

-{

-	[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,

-	                                                   NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10020-align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10020-align-objc-like-xcode.m
deleted file mode 100644
index 93066246..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10020-align-objc-like-xcode.m
+++ /dev/null
@@ -1,8 +0,0 @@
-- (void)foo {
-  [self dismissWithReason: DismissReason::Auto animated: TRUE];
-  [self dismissWithReason: DismissReason::Auto
-                 animated: TRUE];
-  [self
-   dismissWithReason: DismissReason::Auto
-   animated: TRUE];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10021-double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10021-double-indent-objc-dict.m
deleted file mode 100644
index a93bd81e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10021-double-indent-objc-dict.m
+++ /dev/null
@@ -1,17 +0,0 @@
-id a = @{
-	@"a": @1,
-	@"b": @2,
-};
-
-struct foo_t b = {
-	1,
-	2,
-};
-
-SomeObject *build()
-{
-	return @{
-		@"a": @1,
-		@"b": @2,
-	};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10022-indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10022-indent-objc-block.m
deleted file mode 100644
index 4aab0fc0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10022-indent-objc-block.m
+++ /dev/null
@@ -1,149 +0,0 @@
-const auto c =
-  [FDSTapTargetComponent
-   accessibilityContext:{
-     .accessibilityLabel = ^{
-       return [AccessibilityLabelBuilder build];
-     }
-   }];
-
-methodCall1(^{
-  send(component1);
-},
-            x);
-
-methodCall2( ^ {
-  send(component2);
-});
-
-[array block:^ (id obj, NSUInteger idx, BOOL *stop) {
-         NSLog(@"Object at index %lu is %@", idx, obj);
-       }];
-
-
-[UIView animateWithDuration:3.0f animation:^{
-                                   LOG(@"animate");
-                                 }
- completion:^(BOOL finished){
-   LOG(@"finished");
- }];
-
-[UIView
- animationBlock: ^ {
-   [[Log alloc] callback:^NSString *(NSString *result){
-                  return @"log";
-   }];
- }
- completion:^(BOOL finished){
-   LOG(@"finished");
- }];
-
-
-methodCall3(x, ^KSC::ActionCell::Item (Item item) {
-  variant.action.send(component);
-});
-
-methodCall4(  x, ^ id (Component *c) {
-  NSLog(@"methodCall4");
-});
-
-methodCall5(  ^ id (Component *c) {
-  NSLog(@"methodCall5");
-});
-
-methodCall6(  ^(NSString *)(Component *c) {
-  return @"methodCall6";
-});
-
-methodCall7(^ (Component *c) {
-  NSLog(@"methodCall7");
-}, y);
-
-methodCall8(x,  ^(Component *c) {
-  NSLog(@"methodCall8");
-}, y);
-
-
-[Object callMethod:xArg
- block:^id (Component *c) {
-   NSLog(@"methodCall4");
- }];
-
-[Object callMethod:xArg
- block:^id (Component *c) {
-   NSLog(@"methodCall5");
- }];
-
-[Object callMethod:xArg block:^(NSString *)(Component *c) {
-                          return @"methodCall6";
-                        }];
-
-
-[Object callMethod:xArg
- block:^ (Component *c) {
-   NSLog(@"methodCall7");
- }
- yMethod:yArg];
-
-[Object callMethod:xArg
- block:^(Component *c) {
-   NSLog(@"methodCall8");
- }
- yMethod:yArg];
-
-[Object callMethod:xArg
- block:^(NSString *)(Component *c1) {
-   [Object callMethod:xArg block:^(Component *c) {
-                             NSLog(@"methodCal9");
-                           }
-    yMethod:yArg];
- }
- anotherBlock:^(NSString *)(Component *c2) {
-   return @"methodCall10";
- }
- yetAnotherBlock:^(NSString *)(Component *c3) {
-   return @"methodCall11";
- }];
-
-[dialog
- dismissWithCompletion:^{
-   _deleteConversation(
-     strongSelf->_session,
-     ^{
-       if (auto const innerStrongSelf = weakSelf) {
-         [NavigationCoordinator(innerStrongSelf)
-          dismissViewController:innerStrongSelf
-          completion:nil];
-       }
-     });
- }];
-
-
-[FlexboxComponent
- newWithView:{
-   {
-     .accessibilityLabel = ^{
-       return
-       [[[[AccessibilityLabelBuilder builder]
-          appendPhrase:title]
-         appendPhrase:body]
-        getResult];
-     },
-   }
- }];
-
-
-MainComponent(
-    .builder = ^{
-  return
-  value;
-},
-  param1,
-  param2,
-  );
-
-KSC::map(
-  _items,
-  ^ ActionCell::Item (Item item)  {
-  return x;
-}
-  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50001-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50001-Fraction.h
deleted file mode 100644
index b1e373c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50001-Fraction.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#import <Foundation/NSObject.h>
-
-@interface Fraction : NSObject
-{
-   int numerator;
-   int denominator;
-}
-
--(void) print;
--(void) setNumerator: (int) d;
--(void) setDenominator: (int) d;
--(int)  numerator;
--(int)  denominator;
--(void) setNumDen: (int) n: (int) d;
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50002-Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50002-Fraction.m
deleted file mode 100644
index 4ad6dfc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50002-Fraction.m
+++ /dev/null
@@ -1,29 +0,0 @@
-#import "Fraction.h"
-#import <stdio.h>
-
-@implementation Fraction
--(void) print
-{
-   printf("%i/%i", numerator, denominator);
-}
-
--(void) setNumerator: (int) n
-{
-   numerator = n;
-}
-
--(void) setDenominator: (int) d
-{
-   denominator = d;
-}
-
--(int) denominator
-{
-   return denominator;
-}
-
--(int) numerator
-{
-   return numerator;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50003-main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50003-main.m
deleted file mode 100644
index ec082dc1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50003-main.m
+++ /dev/null
@@ -1,22 +0,0 @@
-#import <stdio.h>
-#import "Fraction.h"
-
-int main(int argc, const char *argv[])
-{
-   // create a new instance
-   Fraction *frac = [[Fraction alloc] init];
-
-   // set the values
-   [frac setNumerator: 1];
-   [frac setDenominator: 3];
-
-   // print it
-   printf("The fraction is: ");
-   [frac print];
-   printf("\n");
-
-   // free memory
-   [frac release];
-
-   return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50004-string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50004-string.m
deleted file mode 100644
index bbfeb51e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50004-string.m
+++ /dev/null
@@ -1,10 +0,0 @@
-
--(void)moreScannedData: (Image *) img from: (int) start to: (int) stop;
--(void)moreScannedData: (Image *) img from: (int) start to: (int) stop;
-
-public bool Enabled
-{
-   NSString *whatever = @"some lovely text, the fox and co";
-
-   a = (enderedImage->h - toplines - bottomlines);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50005-Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50005-Declarations.h
deleted file mode 100644
index 3b65c41c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50005-Declarations.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-@interface EmptyClass : NSObject
--(void)aMessage: (id) arg;
-@end
-
-@interface EmptyClass : NSObject
-{
-}
--(void)aMessage: (id) arg;
-@end
-
-@interface NSObject (ObjectAdditions)
--(void)aMessage: (id) arg;
-@end
-
-@protocol TestProtocol
--(void)aMessage: (id) arg;
-@end
-
-@interface TestClass : NSObject<TestProtocol>
-{
-}
--(void)aMessage: (id) arg;
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50006-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50006-exceptions.m
deleted file mode 100644
index 609d2086..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50006-exceptions.m
+++ /dev/null
@@ -1,27 +0,0 @@
-
-int main(int argc, const char *argv[])
-{
-   @try
-   {
-      [NSException raise: NSInternalInconsistency
-                  format: @"An internal inconsistency was raised"];
-   }
-   @catch (NSException *e)
-   {
-      NSLog(@"Catch");
-   }
-   @finally
-   {
-      NSLog(@"Finally");
-   }
-
-   @throw [NSException exceptionWithName: @"foo" reason: @"bar" userInfo: nil];
-
-   NSException *exception = [NSException exceptionWithName: @"HotTeaException"
-                                                    reason: @"The tea is too hot"
-                                                  userInfo: nil];
-
-   @throw exception;
-
-   return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50007-misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50007-misc.m
deleted file mode 100644
index 4de222a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50007-misc.m
+++ /dev/null
@@ -1,25 +0,0 @@
--(id)init
-{
-   GLfloat wc[3][3] = { { 0.6, 0.6, 0.0 }, { 1.0, 0.7, 0.1 }, { 0.5, 0.7, 0.2 }, };
-   GLfloat cc[3][3] = { { 0.0, 0.0, 0.6 }, { 0.3, 0.1, 0.5 }, { 0.0, 0.0, 0.5 }, };
-   GLfloat sc[3]    = { 0.75, 0.75, 0.75 };
-
-   return [self initWithWarmColors: (float *)&wc coolColors: (float *)&cc
-                      surfaceColor: sc enableTexturing: NO enableSpecular: YES
-              enableQuakeDisruptor: NO];
-
-   [NSException raise: NSInternalInconsistency
-               format: @"An internal inconsistency was raised"];
-
-   for (i = 0; i < [a count]; i++)
-   {
-      [thePerson setAmount: (1.5 * 17) forKey: @"overtime"];
-      [screen showtext : x: y: @"Message"];
-   }
-}
-
-*outError = [NSError errorWithDomain: NSCocoaErrorDomain
-                                code: 0
-                            userInfo: [NSDictionary
-                        dictionaryWithObject: @"Some Description"
-                                      forKey: NSLocalizedDescriptionKey]];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50008-protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50008-protocol.m
deleted file mode 100644
index 50c4314a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50008-protocol.m
+++ /dev/null
@@ -1,31 +0,0 @@
-
-NSAssert([self.delegate conformsToProtocol: @protocol(UISearchBarDelegate)], @"Some Error.");
-
-Protocol *counter = @protocol(ReferenceCounting);
-
-@protocol ReferenceCounting
-
--setRefCount: (int)count;
-
--(int)refCount;
-
--incrementCount;
-
--decrementCount;
-
-@end
-
-@interface Formatter : NSObject<Formatting, Prettifying>
-
-@end
-
-if ([receiver conformsTo: @protocol(ReferenceCounting)])
-{
-   [receiver incrementCount];
-}
-
-@protocol B;
-
-@protocol A
--Foo: (id<B>)anObject;
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50009-literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50009-literals.mm
deleted file mode 100644
index 4bd99277..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50009-literals.mm
+++ /dev/null
@@ -1,47 +0,0 @@
-
-NSDictionary *dictionary = @{
-   @0: @"red", @1: @"green", @2: @"blue"
-};
-
-NSArray *array = @[@0, @1, @2, @YES, @'Z', @42U];
-
-NSArray *multilineArray = @[
-   @0, @1, @2, @YES,
-   @'Z', @42U
-];
-
-void main(int argc, const char *argv[])
-{
-   // character literals.
-   NSNumber *theLetterZ = @'Z';         // equivalent to [NSNumber numberWithChar:'Z']
-
-   // integral literals.
-   NSNumber *fortyTwo         = @42;    // equivalent to [NSNumber numberWithInt:42]
-   NSNumber *fortyTwoUnsigned = @42U;   // equivalent to [NSNumber numberWithUnsignedInt:42U]
-   NSNumber *fortyTwoLong     = @42L;   // equivalent to [NSNumber numberWithLong:42L]
-   NSNumber *fortyTwoLongLong = @42LL;  // equivalent to [NSNumber numberWithLongLong:42LL]
-
-   // floating point literals.
-   NSNumber *piFloat  = @3.141592654F;  // equivalent to [NSNumber numberWithFloat:3.141592654F]
-   NSNumber *piDouble = @3.1415926535;  // equivalent to [NSNumber numberWithDouble:3.1415926535]
-
-   // BOOL literals.
-   NSNumber *yesNumber = @YES;          // equivalent to [NSNumber numberWithBool:YES]
-   NSNumber *noNumber  = @NO;           // equivalent to [NSNumber numberWithBool:NO]
-
-   // Raw string literals
-   NSString *rawString          = [NSString stringWithFormat:@R"(embedded " quotes " )"];
-   NSString *delimiterRawString = [NSString stringWithFormat:@R"<<<(embedded "quotes ')<<<"];
-   NSString *groupIDString      = [NSString stringWithFormat:@R"({"group_id " : " % @",})", groupID];
-   NSString *config             = @R"({"config_v1" : [
-  {"op1" : {"type":{"unsupported1":{}}},"markers":[123]},
-  {"op2" : {"type":{"jobs":{"suspend":true,"resume":false}}},"markers":[1]},
-  {"op3" : {"type":{"Good Format":{}}},"markers":[123]}
-  ]})";
-
-
-#ifdef __cplusplus
-   NSNumber *trueNumber  = @true;       // equivalent to [NSNumber numberWithBool:(BOOL)true]
-   NSNumber *falseNumber = @false;      // equivalent to [NSNumber numberWithBool:(BOOL)false]
-#endif
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50010-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50010-return_type.m
deleted file mode 100644
index 62275a52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50010-return_type.m
+++ /dev/null
@@ -1,42 +0,0 @@
-#import <Foundation/NSObject.h>
-#import <stdio.h>
-
-@interface Fraction : NSObject
-{
-    int numerator;
-    int denominator;
-}
--(void) print;
--(void) setNumerator: (int) d;
--(void) setDenominator: (int) d;
--(int)  numerator;
--(int)  denominator;
--(void) setNumDen: (int) n: (int) d;
-@end
-
-@implementation Fraction
--(void) print
-{
-    printf("%i/%i", numerator, denominator);
-}
-
--(void) setNumerator: (int) n
-{
-    numerator = n;
-}
-
--(void)     setDenominator: (int) d
-{
-    denominator = d;
-}
-
--(int) denominator
-{
-    return(denominator);
-}
-
--(int) numerator
-{
-    return(numerator);
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50011-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50011-return_type.m
deleted file mode 100644
index 7cc95485..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50011-return_type.m
+++ /dev/null
@@ -1,42 +0,0 @@
-#import <Foundation/NSObject.h>
-#import <stdio.h>
-
-@interface Fraction : NSObject
-{
-    int numerator;
-    int denominator;
-}
--(void) print;
--(void) setNumerator: (int) d;
--(void) setDenominator: (int) d;
--(int)  numerator;
--(int)  denominator;
--(void) setNumDen: (int) n: (int) d;
-@end
-
-@implementation Fraction
--(void) print
-{
-    printf("%i/%i", numerator, denominator);
-}
-
--(void) setNumerator: (int) n
-{
-    numerator = n;
-}
-
--(void) setDenominator: (int) d
-{
-    denominator = d;
-}
-
--(int) denominator
-{
-    return(denominator);
-}
-
--(int) numerator
-{
-    return(numerator);
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50012-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50012-return_type.m
deleted file mode 100644
index 106c5466..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50012-return_type.m
+++ /dev/null
@@ -1,42 +0,0 @@
-#import <Foundation/NSObject.h>
-#import <stdio.h>
-
-@interface Fraction : NSObject
-{
-    int numerator;
-    int denominator;
-}
--(void)print;
--(void)setNumerator: (int) d;
--(void)setDenominator: (int) d;
--(int) numerator;
--(int) denominator;
--(void)setNumDen: (int) n: (int) d;
-@end
-
-@implementation Fraction
--(void)print
-{
-    printf("%i/%i", numerator, denominator);
-}
-
--(void)setNumerator: (int) n
-{
-    numerator = n;
-}
-
--(void)setDenominator: (int) d
-{
-    denominator = d;
-}
-
--(int)denominator
-{
-    return(denominator);
-}
-
--(int)numerator
-{
-    return(numerator);
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
deleted file mode 100644
index 847e9dca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
+++ /dev/null
@@ -1,2 +0,0 @@
-@interface TestObject(categoryName)<ProtocolName>:BaseClass
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50015-receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50015-receiver.m
deleted file mode 100644
index dd6ee3d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50015-receiver.m
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-@implementation MyDocument
-
--(NSString *) appPath
-{
-   [AClass AFunc];
-   return [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50016-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50016-ternary.m
deleted file mode 100644
index 42a573f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50016-ternary.m
+++ /dev/null
@@ -1,6 +0,0 @@
-NSString *str  = (otherString ?: @"this is the placeholder");
-NSString *str2 = (str ? otherString : @"this is the other placeholder");
-NSString *str3 = str ? [[NSString alloc] initWithString: str] : @"this is the third placeholder";
-id       str4  = str ? [self methodWithParameter1: @{ @"bla": ({ [self anotherMethod: @{ @"id": @1 }];
-                                                               }) }
-                                    andParameter2: @{ @"dict_key": @{ @"nested_dict_key_1": @(1), @"nested_dict_key_2": @"colon:in:string" } }] : [self anotherMethod: str ? @1 : @2];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50017-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50017-ternary.m
deleted file mode 100644
index d53fc319..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50017-ternary.m
+++ /dev/null
@@ -1,5 +0,0 @@
-NSString *str = (otherString ?: @"this is the placeholder");
-NSString *str2 = (str ? otherString : @"this is the other placeholder");
-NSString *str3 = str ? [[NSString alloc] initWithString:str] : @"this is the third placeholder";
-id str4 = str ? [self methodWithParameter1:@{@"bla": ({[self anotherMethod:@{@"id": @1}];})}
-                 andParameter2:@{@"dict_key": @{@"nested_dict_key_1": @(1), @"nested_dict_key_2": @"colon:in:string"}}] : [self anotherMethod:str ? @1 : @2];
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50018-indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
deleted file mode 100644
index 0b6e1fa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
+++ /dev/null
@@ -1,102 +0,0 @@
-flag
-? [Cmpnt Cmpnt:(isChildActionSheet ? TypeBack : TypeCancel)]
-: nil;
-
-
-[[BottomSheetItem alloc]
- iconName:selected
- ? g.re
-	 .at
- : g
-	 .re
-	 .at
- builder:nil
- handler:^{
- }
-]
-
-
-[[BottomSheetItem alloc]
-iconName: selected
- ? iconName : g
-	 .re
-	 .at
-builder: nil
-handler: ^{
-	 }
-]
-
-        (event
-	?   [FSBottomSheetActionCellItemVariant
-	     action:AKAction<> :: actionFromSenderlessBlock(^{
-								    auto const strongSelf = weakSelf;
-							    })]
-	: nil);
-
-
-[[ViewController alloc] strategy: (strategy
-	? [QuestionMarkStmt new]
-	: [ColonStmt new])
- toolbox: _one];
-
-[[ViewController alloc] strategy: (strategy
-	?: [SourceStrategy new])
- toolbox: _two];
-
-
-
-flag1
-?   ( flag2
-		? ( flag3
-				?   [ViewController selector1:^{
-					     NSLog(@"selector1");
-				     }]
-				:  [ViewController selector2:^(){
-					    NSLog(@"selector2");
-				    }] )
-		:   ( result3  )
-		)
-:  (  flag5
-		? ( flag
-				? result4
-				: [ViewController preSelector:flag selector3:{
-					   .x = 10,
-				   }])
-		:   (  flag6
-				? [ViewController preSelector:flag selector3:^{
-					   NSLog(@"selector3");
-				   }]
-				: ( result7   )
-				)
-		);
-
-
-flag1
-?   result1
-:  (
-		flag5
-		);
-
-
-
-showButton ? Action<>::actionFromBlock(^(Component *component) {
-	return nil;
-}) : nil;
-
-showButton
-? Action<>::actionFromBlock(^(Component *component) {
-	return nil;
-})
-: nil;
-
-showButton
-? Action<>::actionFromBlock(^(Component *component) {
-	return nil;
-}) : nil;
-
-
-showButton
-? Action<>::actionFromBlock([] (Component *component) {
-	return nil;
-})
-: nil;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50020-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50020-selector.m
deleted file mode 100644
index c53db6fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50020-selector.m
+++ /dev/null
@@ -1,6 +0,0 @@
-@selector (methodNameWithArg:);
-@selector   (methodNameNoArg);
-@selector       (methodNameArg1:arg2:);
-
-NSArray *sortedTZs = [[NSTimeZone knownTimeZoneNames]
-                      sortedArrayUsingSelector : @selector (compare:)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50021-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50021-selector.m
deleted file mode 100644
index 3442f700..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50021-selector.m
+++ /dev/null
@@ -1,6 +0,0 @@
-@selector (methodNameWithArg:);
-@selector (methodNameNoArg);
-@selector (methodNameArg1:arg2:);
-
-NSArray *sortedTZs = [[NSTimeZone knownTimeZoneNames]
-                      sortedArrayUsingSelector : @selector (compare:)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50022-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50022-selector.m
deleted file mode 100644
index 1d790cc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50022-selector.m
+++ /dev/null
@@ -1,6 +0,0 @@
-@selector(methodNameWithArg:);
-@selector(methodNameNoArg);
-@selector(methodNameArg1:arg2:);
-
-NSArray *sortedTZs = [[NSTimeZone knownTimeZoneNames]
-                      sortedArrayUsingSelector : @selector(compare:)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50025-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50025-exceptions.m
deleted file mode 100644
index 609d2086..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50025-exceptions.m
+++ /dev/null
@@ -1,27 +0,0 @@
-
-int main(int argc, const char *argv[])
-{
-   @try
-   {
-      [NSException raise: NSInternalInconsistency
-                  format: @"An internal inconsistency was raised"];
-   }
-   @catch (NSException *e)
-   {
-      NSLog(@"Catch");
-   }
-   @finally
-   {
-      NSLog(@"Finally");
-   }
-
-   @throw [NSException exceptionWithName: @"foo" reason: @"bar" userInfo: nil];
-
-   NSException *exception = [NSException exceptionWithName: @"HotTeaException"
-                                                    reason: @"The tea is too hot"
-                                                  userInfo: nil];
-
-   @throw exception;
-
-   return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50026-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50026-exceptions.m
deleted file mode 100644
index 150de092..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50026-exceptions.m
+++ /dev/null
@@ -1,27 +0,0 @@
-
-int main(int argc, const char *argv[])
-{
-   @try
-   {
-      [NSException raise: NSInternalInconsistency
-                  format: @"An internal inconsistency was raised"];
-   }
-   @catch (NSException *e)
-   {
-      NSLog(@"Catch");
-   }
-   @finally
-   {
-      NSLog(@"Finally");
-   }
-
-   @throw[NSException exceptionWithName: @"foo" reason: @"bar" userInfo: nil];
-
-   NSException *exception = [NSException exceptionWithName: @"HotTeaException"
-                                                    reason: @"The tea is too hot"
-                                                  userInfo: nil];
-
-   @throw exception;
-
-   return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50030-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50030-sort_import.m
deleted file mode 100644
index e0cfcb88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50030-sort_import.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// should be ddd, eee, fff
-#import "ddd"
-#import "eee"
-#import "fff"
-
-#import "aaa"
-#import "ccc"
-// should be just bbb
-#import "bbb"
-
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-#import "sort_import.h"
-
-#import "Action+Internal.h"
-#import "Action+Public.h"
-#import "Action.h"
-#import <UIKit/UIKit.h>
-
-#include "Test+Internal.h"
-#include "Test.h"
-
-#import "Something.h"
-#import "Something_Internal.h"
-#import "Something_Public.h"
-
-#import "AAA"
-#import "BBB.h"
-#include "CCC.h"
-#include "DDD"
-#import "EEE.h"
-#import <KKK>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50031-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50031-sort_import.m
deleted file mode 100644
index e0cfcb88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50031-sort_import.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// should be ddd, eee, fff
-#import "ddd"
-#import "eee"
-#import "fff"
-
-#import "aaa"
-#import "ccc"
-// should be just bbb
-#import "bbb"
-
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-#import "sort_import.h"
-
-#import "Action+Internal.h"
-#import "Action+Public.h"
-#import "Action.h"
-#import <UIKit/UIKit.h>
-
-#include "Test+Internal.h"
-#include "Test.h"
-
-#import "Something.h"
-#import "Something_Internal.h"
-#import "Something_Public.h"
-
-#import "AAA"
-#import "BBB.h"
-#include "CCC.h"
-#include "DDD"
-#import "EEE.h"
-#import <KKK>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50032-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50032-sort_import.m
deleted file mode 100644
index 37b4d643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50032-sort_import.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// should be ddd, eee, fff
-#import "ddd"
-#import "eee"
-#import "fff"
-
-#import "aaa"
-#import "ccc"
-// should be just bbb
-#import "bbb"
-
-#import "sort_import.h"
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-
-#import "Action.h"
-#import "Action+Internal.h"
-#import "Action+Public.h"
-#import <UIKit/UIKit.h>
-
-#include "Test.h"
-#include "Test+Internal.h"
-
-#import "Something.h"
-#import "Something_Internal.h"
-#import "Something_Public.h"
-
-#import "AAA"
-#import "BBB.h"
-#include "CCC.h"
-#include "DDD"
-#import "EEE.h"
-#import <KKK>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50033-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50033-sort_import.m
deleted file mode 100644
index 7c2ab21f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50033-sort_import.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// should be ddd, eee, fff
-#import "ddd"
-#import "eee"
-#import "fff"
-
-#import "aaa"
-#import "ccc"
-// should be just bbb
-#import "bbb"
-
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-#import "sort_import.h"
-
-#import "Action+Internal.h"
-#import "Action+Public.h"
-#import "Action.h"
-#import <UIKit/UIKit.h>
-
-#include "Test+Internal.h"
-#include "Test.h"
-
-#import "Something.h"
-#import "Something_Internal.h"
-#import "Something_Public.h"
-
-#import "AAA"
-#include "DDD"
-#import <KKK>
-#import "BBB.h"
-#include "CCC.h"
-#import "EEE.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50034-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50034-sort_import.m
deleted file mode 100644
index f8a42242..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50034-sort_import.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// should be ddd, eee, fff
-#import "ddd"
-#import "eee"
-#import "fff"
-
-#import "aaa"
-#import "ccc"
-// should be just bbb
-#import "bbb"
-
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-#import "sort_import.h"
-
-#import <UIKit/UIKit.h>
-#import "Action+Internal.h"
-#import "Action+Public.h"
-#import "Action.h"
-
-#include "Test+Internal.h"
-#include "Test.h"
-
-#import "Something.h"
-#import "Something_Internal.h"
-#import "Something_Public.h"
-
-#import <KKK>
-#import "AAA"
-#import "BBB.h"
-#include "CCC.h"
-#include "DDD"
-#import "EEE.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import.m
deleted file mode 100644
index f8a42242..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// should be ddd, eee, fff
-#import "ddd"
-#import "eee"
-#import "fff"
-
-#import "aaa"
-#import "ccc"
-// should be just bbb
-#import "bbb"
-
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-#import "sort_import.h"
-
-#import <UIKit/UIKit.h>
-#import "Action+Internal.h"
-#import "Action+Public.h"
-#import "Action.h"
-
-#include "Test+Internal.h"
-#include "Test.h"
-
-#import "Something.h"
-#import "Something_Internal.h"
-#import "Something_Public.h"
-
-#import <KKK>
-#import "AAA"
-#import "BBB.h"
-#include "CCC.h"
-#include "DDD"
-#import "EEE.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import_group.m
deleted file mode 100644
index 251829df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import_group.m
+++ /dev/null
@@ -1,32 +0,0 @@
-#import <KKK> // Duplicate with comment
-#import <SSS>
-
-#import "aaa"
-#import "AAA"
-#import "AAABBB"
-#import "bbb"
-#import "ccc"
-#import "ddd"
-#include "DDD"
-#import "eee"
-#import "fff"
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-#import "Action.h"
-#import "Action+Internal.h"
-#import "Action+Internal.hpp"
-#import "Action+Public.h"
-#import "BBB.h"
-#include "CCC.h"
-#import "DDD.h"
-#import "EEE.h"
-#import "sort_import.h"
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-#import "Something.h"
-#import "Something_Internal.h"
-#import "Something_Public.h"
-#include "Test.h"
-#include "Test+Internal.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50040-complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50040-complex_method.m
deleted file mode 100644
index 29467813..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50040-complex_method.m
+++ /dev/null
@@ -1,30 +0,0 @@
-// Turn the document contents into a single savable lump of data
-- (NSData *) dataOfType:(NSString *)typeName error:(NSError **)outError {
-#pragma unused(typeName)
-
-    // Produce the data lump:
-    NSData * retval = [NSKeyedArchiver archivedDataWithRootObject:model];
-
-    // If the lump is nil something went wrong
-    // fill out the error object to explain what wrent wrong
-    if ( outError != NULL ) {
-        // The sender wanted an error reported. If there
-        // was a problem, fill in an NSError object
-        if (retval == nil) {
-            // The error object should include an (unhelpful)
-            // explanation of what happened
-            NSDictionary * userInfoDict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                           @"Internal error formatting data", NSLocalizedDescriptionKey,
-                                           @"Archiving of data failed. Probably a bug.", NSLocalizedFailureReasonErrorKey,
-                                           @"There's nothing you can do.", NSLocalizedRecoverySuggestionErrorKey, nil];
-
-            *outError = [NSError errorWithDomain:LinearInternalErrorDomain
-                                            code:linErrCantFormatDocumentData
-                                        userInfo:userInfoDict];
-        } else {
-            // No problem. Don't supply an error object.
-            *outError = nil;
-        }
-    }
-    return retval;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50050-real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50050-real_world_file.m
deleted file mode 100644
index 1f7370d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50050-real_world_file.m
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * File: ATColorTableController.m
- * Abstract: A controller used by the ATImageTextCell to edit the color property. It is implemented in an abstract enough way to be used by a class other than the cell.
- *
- * Version: 1.0
- *
- * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
- * Inc. ("Apple") in consideration of your agreement to the following
- * terms, and your use, installation, modification or redistribution of
- * this Apple software constitutes acceptance of these terms.  If you do
- * not agree with these terms, please do not use, install, modify or
- * redistribute this Apple software.
- *
- * In consideration of your agreement to abide by the following terms, and
- * subject to these terms, Apple grants you a personal, non-exclusive
- * license, under Apple's copyrights in this original Apple software (the
- * "Apple Software"), to use, reproduce, modify and redistribute the Apple
- * Software, with or without modifications, in source and/or binary forms;
- * provided that if you redistribute the Apple Software in its entirety and
- * without modifications, you must retain this notice and the following
- * text and disclaimers in all such redistributions of the Apple Software.
- * Neither the name, trademarks, service marks or logos of Apple Inc. may
- * be used to endorse or promote products derived from the Apple Software
- * without specific prior written permission from Apple.  Except as
- * expressly stated in this notice, no other rights or licenses, express or
- * implied, are granted by Apple herein, including but not limited to any
- * patent rights that may be infringed by your derivative works or by other
- * works in which the Apple Software may be incorporated.
- *
- * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
- * MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
- * THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
- * OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
- *
- * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
- * MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
- * AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
- * STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- */
-
-#import "ATColorTableController.h"
-#import "ATPopupWindow.h"
-
-@implementation ATColorTableController
-
-+ (ATColorTableController *) sharedColorTableController {
-    static ATColorTableController * gSharedColorTableController = nil;
-
-    if (gSharedColorTableController == nil) {
-        gSharedColorTableController = [[[self class] alloc] initWithNibName:@"ColorTable" bundle:[NSBundle bundleForClass:[self class]]];
-    }
-    return gSharedColorTableController;
-}
-
-@synthesize delegate = _delegate;
-@dynamic selectedColor, selectedColorName;
-
-- (void) dealloc {
-    [_colorList release];
-    [_colorNames release];
-    [_window release];
-    [super dealloc];
-}
-
-- (void) loadView {
-    [super loadView];
-    _colorList = [[NSColorList colorListNamed:@"Crayons"] retain];
-    _colorNames = [[_colorList allKeys] retain];
-    [_tableColorList setIntercellSpacing:NSMakeSize(3, 3)];
-    [_tableColorList setTarget:self];
-    [_tableColorList setAction:@selector(_tableViewAction:)];
-}
-
-- (NSColor *) selectedColor {
-    NSString * name = [self selectedColorName];
-
-    if (name != nil) {
-        return [_colorList colorWithKey:name];
-    } else {
-        return nil;
-    }
-}
-
-- (NSString *) selectedColorName {
-    if ([_tableColorList selectedRow] != -1) {
-        return [_colorNames objectAtIndex:[_tableColorList selectedRow]];
-    } else {
-        return nil;
-    }
-}
-
-- (void) _selectColor:(NSColor *)color {
-    // Search for that color in our list
-    NSInteger row = 0;
-
-    for (NSString * name in _colorNames) {
-        NSColor * colorInList = [_colorList colorWithKey:name];
-        if ([color isEqual:colorInList]) {
-            break;
-        }
-        row++;
-    }
-    _updatingSelection = YES;
-    if (row != -1) {
-        [_tableColorList scrollRowToVisible:row];
-        [_tableColorList selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-    } else {
-        [_tableColorList scrollRowToVisible:0];
-        [_tableColorList selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO];
-    }
-    _updatingSelection = NO;
-}
-
-- (void) _createWindowIfNeeded {
-    if (_window == nil) {
-        NSRect viewFrame = self.view.frame;
-        // Create and setup our window
-        _window = [[ATPopupWindow alloc] initWithContentRect:viewFrame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
-        [_window setReleasedWhenClosed:NO];
-        [_window setLevel:NSPopUpMenuWindowLevel];
-        [_window setHasShadow:YES];
-        [[_window contentView] addSubview:self.view];
-        [_window makeFirstResponder:_tableColorList];
-
-        // Make the window have a clear color and be non-opaque for our pop-up animation
-        [_window setBackgroundColor:[NSColor clearColor]];
-        [_window setOpaque:NO];
-    }
-}
-
-- (void) _windowClosed:(NSNotification *)note {
-    if (_eventMonitor) {
-        [NSEvent removeMonitor:_eventMonitor];
-        _eventMonitor = nil;
-    }
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowWillCloseNotification object:_window];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationDidResignActiveNotification object:nil];
-}
-
-- (void) _closeAndSendAction:(BOOL)sendAction {
-    [_window close];
-    if (sendAction) {
-        if ([self.delegate respondsToSelector:@selector(colorTableController:didChooseColor:named:)]) {
-            [self.delegate colorTableController:self didChooseColor:self.selectedColor named:self.selectedColorName];
-        }
-    } else {
-        if ([self.delegate respondsToSelector:@selector(didCancelColorTableController:)]) {
-            [self.delegate didCancelColorTableController:self];
-        }
-    }
-}
-
-- (void) _windowShouldClose:(NSNotification *)note {
-    [self _closeAndSendAction:NO];
-}
-
-- (void) editColor:(NSColor *)color locatedAtScreenRect:(NSRect)rect {
-    [self _createWindowIfNeeded];
-    [self _selectColor:color];
-    NSPoint origin = rect.origin;
-    NSRect windowFrame = [_window frame];
-
-    // The origin is the lower left; subtract the window's height
-    origin.y -= NSHeight(windowFrame);
-    // Center the popup window under the rect
-    origin.y += floor(NSHeight(rect) / 3.0);
-    origin.x -= floor(NSWidth(windowFrame) / 2.0);
-    origin.x += floor(NSWidth(rect) / 2.0);
-
-    [_window setFrameOrigin:origin];
-    [_window popup];
-
-    // Add some watches on the window and application
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(_windowClosed:)
-                                                 name:NSWindowWillCloseNotification
-                                               object:_window];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowShouldClose:) name:NSApplicationDidResignActiveNotification object:nil];
-
-    // Start watching events to figure out when to close the window
-    NSAssert(_eventMonitor == nil, @"_eventMonitor should not be created yet");
-    _eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask | NSKeyDownMask handler: ^(NSEvent * incomingEvent) {
-                         NSEvent * result = incomingEvent;
-                         NSWindow * targetWindowForEvent = [incomingEvent window];
-                         if (targetWindowForEvent != _window) {
-                             [self _closeAndSendAction:NO];
-                         } else if ([incomingEvent type] == NSKeyDown) {
-                             if ([incomingEvent keyCode] == 53) {
-                                 // Escape
-                                 [self _closeAndSendAction:NO];
-                                 result = nil; // Don't process the event
-                             } else if ([incomingEvent keyCode] == 36) {
-                                 // Enter
-                                 [self _closeAndSendAction:YES];
-                                 result = nil;
-                             }
-                         }
-                         return result;
-                     }];
-}
-
-- (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView {
-    return _colorNames.count;
-}
-
-- (id) tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    return [_colorNames objectAtIndex:row];
-}
-
-- (void) tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    NSColor * color = [_colorList colorWithKey:[_colorNames objectAtIndex:row]];
-
-    [cell setColor:color];
-}
-
-- (void) _tableViewAction:(id)sender {
-    [self _closeAndSendAction:YES];
-}
-
-@end
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50060-oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50060-oc-split.m
deleted file mode 100644
index a7bcd4de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50060-oc-split.m
+++ /dev/null
@@ -1,10 +0,0 @@
-[self findstart:&startBarcode end:&endBarcode forLine:greenScalePixels derivative:greenDerivative centerAt:xAxisCenterPoint min:&minValue max:&maxValue];
-
-[self findstart:&startBarcode
-            end:&endBarcode
-        forLine:greenScalePixels
-     derivative:greenDerivative
-       centerAt:xAxisCenterPoint
-            min:&minValue
-            max:&maxValue];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50061-bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50061-bug_167.m
deleted file mode 100644
index 28087bb4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50061-bug_167.m
+++ /dev/null
@@ -1,7 +0,0 @@
-- (void)dealloc {
-	[self closeFile];
-
-	[self setData:nil];
-
-	[super dealloc];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50062-issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50062-issue_2631.m
deleted file mode 100644
index a4404650..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50062-issue_2631.m
+++ /dev/null
@@ -1,17 +0,0 @@
-@protocol SomeProtocol
-Props Method(const Contents& options = {});
-@end
-
-@interface SomeClass
-Props Method1(const Contents& options = {});
-@end
-
-
-@implementation SomeClass
-Props Method1(const Contents options = {});
-@end
-
-void Method2(const Contents options = {}) {
-}
-
-void Method3(const Contents& options = { .text = 10 });
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50070-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50070-blocks.m
deleted file mode 100644
index 5b8e5d35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50070-blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int *(^blkReturningPointer)(int) = ^int *(int a) {
-    return a + 1;
-};
-
-void (^blk2)(int *) = ^(int *b) {
-    *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^(int anInt) {
-    return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50071-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50071-blocks.m
deleted file mode 100644
index 5b8e5d35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50071-blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int *(^blkReturningPointer)(int) = ^int *(int a) {
-    return a + 1;
-};
-
-void (^blk2)(int *) = ^(int *b) {
-    *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^(int anInt) {
-    return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50072-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50072-blocks.m
deleted file mode 100644
index 5b8e5d35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50072-blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int *(^blkReturningPointer)(int) = ^int *(int a) {
-    return a + 1;
-};
-
-void (^blk2)(int *) = ^(int *b) {
-    *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^(int anInt) {
-    return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50073-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50073-blocks.m
deleted file mode 100644
index 9a08c6a0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50073-blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int *(^blkReturningPointer)(int) = ^ int *(int a) {
-    return a + 1;
-};
-
-void (^blk2)(int *) = ^ (int *b) {
-    *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^  (int anInt) {
-    return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50074-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50074-blocks.m
deleted file mode 100644
index cb523489..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50074-blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int *(^blkReturningPointer)(int) = ^ int *(int a) {
-    return a + 1;
-};
-
-void (^blk2)(int *) = ^ (int *b) {
-    *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^ (int anInt) {
-    return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50075-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50075-blocks.m
deleted file mode 100644
index 5b8e5d35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50075-blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int *(^blkReturningPointer)(int) = ^int *(int a) {
-    return a + 1;
-};
-
-void (^blk2)(int *) = ^(int *b) {
-    *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^(int anInt) {
-    return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50076-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50076-blocks.m
deleted file mode 100644
index 5b8e5d35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50076-blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int *(^blkReturningPointer)(int) = ^int *(int a) {
-    return a + 1;
-};
-
-void (^blk2)(int *) = ^(int *b) {
-    *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^(int anInt) {
-    return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50077-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50077-more_blocks.m
deleted file mode 100644
index 75870d32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50077-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^(int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^{ putc('0' + d);
-});
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL *(id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50078-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50078-more_blocks.m
deleted file mode 100644
index 91d27d55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50078-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^(int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^{ putc('0' + d);
-       });
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL (id item) {
-                    return [item length] > 20;
-                }];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL *(id item) {
-                    return [item length] > 20;
-                }];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50079-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50079-more_blocks.m
deleted file mode 100644
index f6af5562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50079-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^(int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^{ putc('0' + d);
-});
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect:^BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect:^BOOL *(id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50080-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50080-more_blocks.m
deleted file mode 100644
index 1fbb7c34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50080-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^ (int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^ { putc('0' + d);
-});
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL *(id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50081-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50081-more_blocks.m
deleted file mode 100644
index 1fbb7c34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50081-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^ (int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^ { putc('0' + d);
-});
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL *(id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50082-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50082-more_blocks.m
deleted file mode 100644
index 75870d32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50082-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^(int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^{ putc('0' + d);
-});
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL *(id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50083-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50083-more_blocks.m
deleted file mode 100644
index f6af5562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50083-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^(int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^{ putc('0' + d);
-});
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect:^BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect:^BOOL *(id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50084-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50084-more_blocks.m
deleted file mode 100644
index 75870d32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50084-more_blocks.m
+++ /dev/null
@@ -1,74 +0,0 @@
-int (^myBlock)(int) = ^(int num) {
-    return num * multiplier;
-};
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10;
-repeat(10, ^{ putc('0' + d);
-});
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *);
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block)
-{
-    FILE *fp = fopen(f, "r");
-
-    if (!fp)
-    {
-        return;
-    }
-    char line[1024];
-
-    while (fgets(line, 1024, fp))
-    {
-        block(line);
-    }
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC)
--(NSArray *)map: (id (^)(id)) xform
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        [result addObject: xform(elem)];
-    }
-    return result;
-}
-
--(NSArray *)collect: (BOOL (^)(id)) predicate
-{
-    id result = [NSMutableArray array];
-
-    for (id elem in self)
-    {
-        if (predicate(elem))
-        {
-            [result addObject: elem];
-        }
-    }
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^BOOL *(id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50085-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50085-block_in_method.m
deleted file mode 100644
index 7a91d13e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50085-block_in_method.m
+++ /dev/null
@@ -1,69 +0,0 @@
-
-void Events1(NSString *    identifier, void (^handler)());
-
-void Events2(NSString *    identifier, void (^)());
-
-@implementation NSArray (WWDC)
-- (NSArray *)map:(id (^)(id))xform {
-	id result = [NSMutableArray array];
-	for (id elem in self)
-		[result addObject:xform(elem)];
-	return result;
-}
-
-
-- (NSArray *)collect:(BOOL ( ^ )(id))predicate {
-	id result = [NSMutableArray array];
-	for (id elem in self)
-		if (predicate(elem))
-			[result addObject:elem];
-	return result;
-}
-
-
-- (void)each:(void (^)(id object))block {
-	[self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-	     block(obj);
-	 }];
-}
-
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL (id item) {
-                    return [item length] > 20;
-				}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL* (id item) {
-                    return [item length] > 20;
-				}];
-
-@end
-
-nestedMethodCall(methodCall( ^ BOOL * (id item) {
-	NSLog(@"methodCall")
-}));
-
-nestedMethodCall(
-	arg1,
-	methodCall(  ^ NSString * (id item) {
-	NSLog(@"methodCall")
-}));
-
-nestedMethodCall(
-	arg1,
-	methodCall(  ^ {
-	NSLog(@"methodCall")
-},
-	             arg2)
-	);
-
-nestedMethodCall(
-	methodCall(  ^ {
-	NSLog(@"methodCall")
-})
-	);
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50086-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50086-block_in_method.m
deleted file mode 100644
index c5c9ae6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50086-block_in_method.m
+++ /dev/null
@@ -1,66 +0,0 @@
-
-void Events1(NSString *    identifier, void (^handler)());
-
-void Events2(NSString *    identifier, void (^)());
-
-@implementation NSArray (WWDC)
-- (NSArray *)map:(id (^)(id))xform {
-	id result = [NSMutableArray array];
-	for (id elem in self)
-		[result addObject:xform(elem)];
-	return result;
-}
-
-- (NSArray *)collect:(BOOL ( ^ )(id))predicate {
-	id result = [NSMutableArray array];
-	for (id elem in self)
-		if (predicate(elem))
-			[result addObject:elem];
-	return result;
-}
-
-- (void)each:(void (^)(id object))block {
-	[self enumerateObjectsUsingBlock:^ (id obj, NSUInteger idx, BOOL *stop) {
-	                                         block(obj);
-					 }];
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect:^ BOOL (id item) {
-                                         return [item length] > 20;
-				 }];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect:^ BOOL* (id item) {
-                                         return [item length] > 20;
-				 }];
-
-@end
-
-nestedMethodCall(methodCall(^ BOOL * (id item) {
-	NSLog(@"methodCall")
-}));
-
-nestedMethodCall(
-	arg1,
-	methodCall(^ NSString * (id item) {
-	NSLog(@"methodCall")
-}));
-
-nestedMethodCall(
-	arg1,
-	methodCall(^ {
-	NSLog(@"methodCall")
-},
-	           arg2)
-	);
-
-nestedMethodCall(
-	methodCall(^ {
-	NSLog(@"methodCall")
-})
-	);
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
deleted file mode 100644
index af5c2b7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
+++ /dev/null
@@ -1,71 +0,0 @@
-[NSPasteboardItem pasteboardItemWithProvider:self
-                                    forTypes:@[ NSPasteboardTypePDF ]
-                                     andData:@[
-         kNSUTIExportedAgaroseGel,
-         [NSKeyedArchiver archivedDataWithRootObject:self.selectedIndexes.count != 0 ?[self.gels objectsAtIndexes:self.selectedIndexes] : self.gels]
- ]];
-
-[ViewController simple_First:firstArg
-                  simple_Two:secondArg
-                    simple_3:thirdArg];
-
-
-[ViewController preFirst:(
-                        pre_1_arg
-                        )];
-
-[ViewController firstSelectorOne:arg1 preFirst:(
-                                              pre_1_arg
-                                              )];
-
-[ViewController preFirst:^{
-         return arg4;
- }
-        firstSelectorOne:arg1];
-
-[ViewController firstSelectorOne:arg1 preFirst:^{
-         return arg4;
- }];
-
-[ViewController firstSelectorOne:(flag
-                  ? arg5_1
-                  : arg5_2
-                        ) toolbox:_toolbox];
-
-[ViewController preFirst:(
-                        pre_1_arg
-                        )
-        firstSelectorOne:
- arg1
-            selector_two:(
-                    arg2
-                    )
-              Selector_3:{
-                      .arg3 = 1
-              }
-         fourth_Selector:^{
-         return arg4;
- }
-       selector_number_5:(flag
-         ? arg5_1
-         : arg5_2
-               )
-       selector_number_5:(flag
-         ? arg5_1
-         : arg5_2
-               )
-                  sixSel:(flag
-                    ?: arg6_1)
-        seventh_selector:(
-                arg7
-                )
-              toolboxSel:toolboxArg];
-
-[[ViewController alloc] strategy:(strategy
-                          ? [QuestionMarkStmt new]
-                          : [ColonStmt new])
-                         toolbox:_one];
-
-[[ViewController alloc] strategy:(strategy
-                          ?: [SourceStrategy new])
-                         toolbox:_two];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50090-kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50090-kw.m
deleted file mode 100644
index ef52dd8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50090-kw.m
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <stdio.h>
-#include <objc/Object.h>
-
-@protocol Job
--do;
-@end
-
-@interface MyJob : Object<Job>
--do;
-@end
-@implementation MyJob
--do
-{
-   printf("Doing Job\n");
-   return self;
-}
-@end
-
-@interface JobExecutor : Object
--doWith: (id<Job>)job for: (int)count;
-@end
-
-@implementation JobExecutor
--doWith: (id<Job>)job for: (int)count
-{
-   for (int i = 0; i < count; ++i)
-   {
-      [job do];
-   }
-   return self;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50091-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50091-block_in_method.m
deleted file mode 100644
index 705435d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50091-block_in_method.m
+++ /dev/null
@@ -1,66 +0,0 @@
-
-void Events1(NSString *identifier, void (^handler)());
-
-void Events2(NSString *identifier, void (^)());
-
-@implementation NSArray (WWDC)
-- (NSArray *)map:(id (^)(id))xform {
-	id result = [NSMutableArray array];
-	for (id elem in self)
-		[result addObject:xform(elem)];
-	return result;
-}
-
-- (NSArray *)collect:(BOOL ( ^ )(id))predicate {
-	id result = [NSMutableArray array];
-	for (id elem in self)
-		if (predicate(elem))
-			[result addObject:elem];
-	return result;
-}
-
-- (void)each:(void (^)(id object))block {
-	[self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-	         block(obj);
-	 }];
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL (id item) {
-                        return [item length] > 20;
-		}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL * (id item) {
-                        return [item length] > 20;
-		}];
-
-@end
-
-nestedMethodCall(methodCall( ^ BOOL * (id item) {
-	NSLog(@"methodCall")
-}));
-
-nestedMethodCall(
-	arg1,
-	methodCall(  ^ NSString * (id item) {
-	NSLog(@"methodCall")
-}));
-
-nestedMethodCall(
-	arg1,
-	methodCall(  ^ {
-	NSLog(@"methodCall")
-},
-	             arg2)
-	);
-
-nestedMethodCall(
-	methodCall(  ^ {
-	NSLog(@"methodCall")
-})
-	);
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50095-box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50095-box.m
deleted file mode 100644
index 45b0de1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50095-box.m
+++ /dev/null
@@ -1,16 +0,0 @@
-NSArray      *test = @[];
-NSNumber     *test = @(42 * 2);
-NSNumber     *test = @4.0;
-NSDictionary *test = @{
-   @"foo":@"bar"
-};
-
-@implementation UrlTemplateTest
--(void)test
-{
-   NSString *test   = @"";
-   NSString *string = [[NSMutableString alloc] initWithString: @""];
-
-   STAssertEqualObjects(string, @"", nil);
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50100-bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50100-bug_340.m
deleted file mode 100644
index ec5135ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50100-bug_340.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-@implementation MyDocument
-- (void) locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error {
-  [UIAlertView showError:error
-               withTitle:NSLocalizedString(@"Your location cannot be determined",
-                                           @"The location of the user cannot be guessed")
-                 message:NSLocalizedString(@"You can try again by pressing the refresh button",
-                                           @"Recovery suggestion when the location cannot be found")];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50110-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50110-msg_align.m
deleted file mode 100644
index 041148c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50110-msg_align.m
+++ /dev/null
@@ -1,61 +0,0 @@
-
-BOOL immediatlyReady = [self ensureResource: mutableResources[0]
-                    existsInDirectoryAtPath: mutablePaths[0]
-                                  queueMode: mode
-                          completionHandler: completionHandler
-                               errorHandler: errorHandler];
-
-[myObject doFooWith1: arg1
-               name1: arg2            // some lines with >1 arg
-              error1: arg3];
-
-[myObject doFooWith2: arg4
-               name2: arg5
-              error2: arg6];
-
-[myObject doFooWith3: arg7
-               name3: arg8 // aligning keywords instead of colons
-              error3: arg9];
-
-[myObject doithereguysA: argA
-      reallylongargname: argB
-                another: argC];
-
-int foo()
-{
-   [UIView transitionWithView: self.window
-                     duration: 0.3
-                      options: UIViewAnimationOptionTransitionCrossDissolve
-                   animations:^{
-                      BOOL oldState = [UIView areAnimationsEnabled];
-                      [UIView setAnimationsEnabled: NO];
-                      self.window.rootViewController = self.viewController;
-                      [UIView setAnimationsEnabled: oldState];
-                   }
-                   completion:^(BOOL finished) {
-                      BOOL foo;
-                   }];
-}
-
-int foo2()
-{
-   [UIView transitionWithView: self.window
-                     duration: 0.3
-                      options: UIViewAnimationOptionTransitionCrossDissolve
-                   animations:^{
-                      BOOL oldState = [UIView areAnimationsEnabled];
-                      [UIView setAnimationsEnabled: NO];
-                      self.window.rootViewController = self.viewController;
-                      [UIView setAnimationsEnabled: oldState];
-                   }
-                   completion:^(BOOL finished) {
-                      BOOL foo;
-                   }];
-
-   [[HRNewsService sharedInstance] registerPushToken: deviceToken
-                                             success:^{
-                                                DLog(@"Finished Registering Push Token!");
-                                                self.notificationsEnabled = YES;
-                                             }
-                                                fail: nil];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50111-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50111-ns_enum.m
deleted file mode 100644
index 1b960272..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50111-ns_enum.m
+++ /dev/null
@@ -1,27 +0,0 @@
-// The semicolons at the end of these declarations are not superfluous.
-typedef NS_ENUM (NSUInteger, MyEnum) {MyValue1, MyValue2, MyValue3};
-typedef NS_OPTIONS (NSUInteger, MyBitmask) {MyBit1, MyBit2, MyBit3};
-
-// NS_ENUM specifies the type and name of the enum.
-typedef enum {
-	MyValue1,
-	MyValue2,
-	MyValue3
-} MyEnum;
-typedef NS_ENUM (NSUInteger, MyEnum) {
-	MyValue1,
-	MyValue2,
-	MyValue3
-};
-
-// NS_OPTIONS is equivalent to NS_ENUM, but semantically used for bitmask enums.
-typedef enum {
-	MyBit1 = (1u << 0),
-	MyBit2Longer = (1u << 1),
-	MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-} MyBitmask;
-typedef NS_OPTIONS (NSUInteger, MyBitmask) {
-	MyBit1 = (1u << 0),
-	MyBit2Longer = (1u << 1),
-	MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50112-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50112-ns_enum.m
deleted file mode 100644
index 1b960272..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50112-ns_enum.m
+++ /dev/null
@@ -1,27 +0,0 @@
-// The semicolons at the end of these declarations are not superfluous.
-typedef NS_ENUM (NSUInteger, MyEnum) {MyValue1, MyValue2, MyValue3};
-typedef NS_OPTIONS (NSUInteger, MyBitmask) {MyBit1, MyBit2, MyBit3};
-
-// NS_ENUM specifies the type and name of the enum.
-typedef enum {
-	MyValue1,
-	MyValue2,
-	MyValue3
-} MyEnum;
-typedef NS_ENUM (NSUInteger, MyEnum) {
-	MyValue1,
-	MyValue2,
-	MyValue3
-};
-
-// NS_OPTIONS is equivalent to NS_ENUM, but semantically used for bitmask enums.
-typedef enum {
-	MyBit1 = (1u << 0),
-	MyBit2Longer = (1u << 1),
-	MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-} MyBitmask;
-typedef NS_OPTIONS (NSUInteger, MyBitmask) {
-	MyBit1 = (1u << 0),
-	MyBit2Longer = (1u << 1),
-	MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50113-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50113-ns_enum.m
deleted file mode 100644
index 5c30d740..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50113-ns_enum.m
+++ /dev/null
@@ -1,27 +0,0 @@
-// The semicolons at the end of these declarations are not superfluous.
-typedef NS_ENUM(NSUInteger, MyEnum) {MyValue1, MyValue2, MyValue3};
-typedef NS_OPTIONS(NSUInteger, MyBitmask) {MyBit1, MyBit2, MyBit3};
-
-// NS_ENUM specifies the type and name of the enum.
-typedef enum {
-	MyValue1,
-	MyValue2,
-	MyValue3
-} MyEnum;
-typedef NS_ENUM(NSUInteger, MyEnum) {
-	MyValue1,
-	MyValue2,
-	MyValue3
-};
-
-// NS_OPTIONS is equivalent to NS_ENUM, but semantically used for bitmask enums.
-typedef enum {
-	MyBit1 = (1u << 0),
-	MyBit2Longer = (1u << 1),
-	MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-} MyBitmask;
-typedef NS_OPTIONS(NSUInteger, MyBitmask) {
-	MyBit1 = (1u << 0),
-	MyBit2Longer = (1u << 1),
-	MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50120-gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50120-gh137.m
deleted file mode 100644
index ff41543a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50120-gh137.m
+++ /dev/null
@@ -1,18 +0,0 @@
-[UIView animateWithDuration:0.2f delay:0.f options:UIViewAnimationCurveEaseInOut animations: ^{
-    self.transform = CGAffineTransformMakeScale(1.05f, 1.05f);
-} completion: ^(BOOL finished) {
-    [UIView animateWithDuration:0.08f delay:0.f options:UIViewAnimationOptionCurveEaseInOut animations: ^{
-        self.transform = CGAffineTransformIdentity;
-        [UIView animateWithDuration:1 delay:0 options:0 animations:^   {
-            // blah
-        } completion:nil];
-    }];
-}];
-
-dispatch_async(foo, ^{
-    dispatch_async(bar, ^{
-        dispatch_async(qux, ^{
-            quz();
-        });
-    });
-})
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50200-more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50200-more_blocks_2.m
deleted file mode 100644
index 8835454f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50200-more_blocks_2.m
+++ /dev/null
@@ -1,18 +0,0 @@
-// Test a case where blocks wrapped by parentheses were causing the parser to crash
-int (^myBlock)(int) = (^(int num) {
-    return num * multiplier;
-});
-
-dispatch_async(thread, (^{
-    dispatch_async(thread, ^{
-        dispatch_async(thread, ^{
-            NSLog(@"Hooray for dispatch_async!");
-        });
-    });
-}));
-
-// Example of a unit test using Kiwi
-beforeAll(^{
-    NSString *serviceURL = [NSURL URLWithString: @"http://TEST_URL"];
-    NSLog(serviceURL);
-});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50201-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50201-blocks_align.m
deleted file mode 100644
index 505c9b99..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50201-blocks_align.m
+++ /dev/null
@@ -1,16 +0,0 @@
-[[HRNewsService sharedInstance] unregisterPushToken: data
-                                            success:^{
-                                                self.notificationsEnabled = NO;
-                                                if (data.param)
-                                                {
-                                                    self.loudNotifications = YES;
-                                                }
-                                            }
-                                               fail:^{
-                                                   self.notificationsEnabled = NO;
-                                                   if (data.param)
-                                                   {
-                                                       self.loudNotifications = YES;
-                                                   }
-                                               }
-];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50202-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50202-blocks_align.m
deleted file mode 100644
index 439ac716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50202-blocks_align.m
+++ /dev/null
@@ -1,16 +0,0 @@
-[[HRNewsService sharedInstance] unregisterPushToken: data
-                                            success:^{
-                                                       self.notificationsEnabled = NO;
-                                                       if (data.param)
-                                                       {
-                                                           self.loudNotifications = YES;
-                                                       }
-                                                   }
-                                               fail:^{
-                                                       self.notificationsEnabled = NO;
-                                                       if (data.param)
-                                                       {
-                                                           self.loudNotifications = YES;
-                                                       }
-                                                   }
-];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50203-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50203-blocks_align.m
deleted file mode 100644
index 07bd3cf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50203-blocks_align.m
+++ /dev/null
@@ -1,16 +0,0 @@
-[[HRNewsService sharedInstance] unregisterPushToken: data
-                                            success:^{
-                                                         self.notificationsEnabled = NO;
-                                                         if (data.param)
-                                                         {
-                                                             self.loudNotifications = YES;
-                                                         }
-                                                     }
-                                               fail:^{
-                                                         self.notificationsEnabled = NO;
-                                                         if (data.param)
-                                                         {
-                                                             self.loudNotifications = YES;
-                                                         }
-                                                     }
-];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50204-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50204-blocks_align.m
deleted file mode 100644
index a2cefc1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50204-blocks_align.m
+++ /dev/null
@@ -1,16 +0,0 @@
-[[HRNewsService sharedInstance] unregisterPushToken: data
-                                            success:^{
-                                                        self.notificationsEnabled = NO;
-                                                        if (data.param)
-                                                        {
-                                                            self.loudNotifications = YES;
-                                                        }
-                                                    }
-                                               fail:^{
-                                                        self.notificationsEnabled = NO;
-                                                        if (data.param)
-                                                        {
-                                                            self.loudNotifications = YES;
-                                                        }
-                                                    }
-];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50205-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50205-msg_align.m
deleted file mode 100644
index f024b44c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50205-msg_align.m
+++ /dev/null
@@ -1,61 +0,0 @@
-
-BOOL immediatlyReady = [self ensureResource: mutableResources[0]
-                    existsInDirectoryAtPath: mutablePaths[0]
-                                  queueMode: mode
-                          completionHandler: completionHandler
-                               errorHandler: errorHandler];
-
-[myObject doFooWith1: arg1
-               name1: arg2            // some lines with >1 arg
-              error1: arg3];
-
-[myObject doFooWith2: arg4
-               name2: arg5
-              error2: arg6];
-
-[myObject doFooWith3: arg7
-               name3: arg8 // aligning keywords instead of colons
-              error3: arg9];
-
-[myObject doithereguysA: argA
-      reallylongargname: argB
-                another: argC];
-
-int foo()
-{
-    [UIView transitionWithView: self.window
-                      duration: 0.3
-                       options: UIViewAnimationOptionTransitionCrossDissolve
-                    animations:^{
-                        BOOL oldState = [UIView areAnimationsEnabled];
-                        [UIView setAnimationsEnabled: NO];
-                        self.window.rootViewController = self.viewController;
-                        [UIView setAnimationsEnabled: oldState];
-                    }
-                    completion:^(BOOL finished) {
-                        BOOL foo;
-                    }];
-}
-
-int foo2()
-{
-    [UIView transitionWithView: self.window
-                      duration: 0.3
-                       options: UIViewAnimationOptionTransitionCrossDissolve
-                    animations:^{
-                        BOOL oldState = [UIView areAnimationsEnabled];
-                        [UIView setAnimationsEnabled: NO];
-                        self.window.rootViewController = self.viewController;
-                        [UIView setAnimationsEnabled: oldState];
-                    }
-                    completion:^(BOOL finished) {
-                        BOOL foo;
-                    }];
-
-    [[HRNewsService sharedInstance] registerPushToken: deviceToken
-                                              success:^{
-                                                  DLog(@"Finished Registering Push Token!");
-                                                  self.notificationsEnabled = YES;
-                                              }
-                                                 fail: nil];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50206-issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50206-issue_2727.m
deleted file mode 100644
index 5639c298..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50206-issue_2727.m
+++ /dev/null
@@ -1,2 +0,0 @@
-typedef NSArray<NSString *> *(^Finder)(NSArray *);
-typedef NSArray<NSString *> *(^Handler)(NSDictionary<NSString *, NSArray *> *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50207-issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50207-issue_3031.mm
deleted file mode 100644
index 75e6f5ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50207-issue_3031.mm
+++ /dev/null
@@ -1,4 +0,0 @@
-if (flag) {
-	[video fcls:filter.class strength:fv];
-}
-[values forKey:(filterID)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50300-msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50300-msg.m
deleted file mode 100644
index 79c1a60a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50300-msg.m
+++ /dev/null
@@ -1,3 +0,0 @@
-[obj doSomething: 0 withArgs: @""];
-[@"" doSomething: 0 withArgs: @""];
-NSString *result = (id)[obj arg: param value: 3];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50400-for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50400-for.m
deleted file mode 100644
index 35c34bce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50400-for.m
+++ /dev/null
@@ -1,16 +0,0 @@
-[[HRNewsService sharedInstance] fetchBreakingNewsItemWithId: self.breakingNewsId
-                                                    success:^(id responseObject) {
-                                                       NSDictionary *thing;
-                                                       for (NSArray *dictionary in photos)
-                                                       {
-                                                       }
-                                                    }
-                                                    failure:^(NSError *error) {
-                                                       // Failure?
-                                                    }];
-
-// We also need to consider cases where a non-pointer type (or, a pointer without the star) is declared in ObjC.
-for (id obj in someDictionary)
-{
-   NSLog(@"This could be anything! Objective-C really needs parametrized collections.");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50410-oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50410-oc_cond_colon.m
deleted file mode 100644
index 8059a3c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50410-oc_cond_colon.m
+++ /dev/null
@@ -1,9 +0,0 @@
-[self.vendorID_TextField setStringValue : string ? string:@""];
-
-x = [NSString str : path];
-x = [NSString strFormat : @"Data/%s", path];
-x = path[0] == '/' ? path:"abc";
-x = path[0] == '/' ? [NSString str : path]:[NSString strFormat : @"Data/%s", path];
-
-id<MTLBuffer> buf = data ? [metal::g_Device newBufferWithBytes : data length : len options : MTLResourceOptionCPUCacheModeDefault]
-                        :[metal::g_Device newBufferWithLength : len options : MTLResourceOptionCPUCacheModeDefault];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50411-attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
deleted file mode 100644
index 49dfaefa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
+++ /dev/null
@@ -1,19 +0,0 @@
-int w1[1];
-int w2 [[maybe_unused]] = 0;
-int w3 [[foo(w1[0])]];                                                                                          // unknown attribute foo
-int w4 [[foo((w1[0]))]];                                                                                        // unknown attribute foo
-int w5 [[foo(w1[0] [[maybe_unused]])]];                                                         // unknown attribute foo
-int w6 [[foo(w1[0] [[maybe_unused]]), [[deprecated]]]];                         // expected ] before [[deprecated
-int w7 [[w1[0]]] = 0;                                                                                           // expected ] before [ in w1[
-int w8 [[ [[maybe_unused]] ]];                                                                          // expected ] before [[maybe_unused
-int w9 [ [ foo ] ] = 0;
-
-@implementation Foo
-- (void) message {
-	Foo* foo = [[Foo alloc] init];
-}
-@end
-
-Foo* foo = [[Foo alloc] init];
-
-[[Foo sharedInstance] broadcast:[world hello]];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50500-code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50500-code_placeholder.m
deleted file mode 100644
index f6a745ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50500-code_placeholder.m
+++ /dev/null
@@ -1,5 +0,0 @@
-double          delayInSeconds = 2.0;
-dispatch_time_t popTime        = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
-dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-   <#code to be executed on the main queue after delay#>
-});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50510-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50510-gh293.m
deleted file mode 100644
index a1dffc49..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50510-gh293.m
+++ /dev/null
@@ -1,15 +0,0 @@
-self.someErrorView = ({
-	UIView *view = [[UIView alloc] init];
-	view.backgroundColor = [UIColor redColor];
-	[view addSubview:({
-		self.someErrorLabel = ({
-			UILabel *label = [[UILabel alloc] init];
-			label.textAlignment = NSTextAlignmentCenter;
-			label.backgroundColor = [UIColor clearColor];
-			label;
-			});
-		})];
-	view;
-	});
-[self.view addSubview:self.someErrorView];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50511-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50511-gh293.m
deleted file mode 100644
index 6e4c180a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50511-gh293.m
+++ /dev/null
@@ -1,15 +0,0 @@
-self.someErrorView = ({
-	UIView *view = [[UIView alloc] init];
-	view.backgroundColor = [UIColor redColor];
-	[view addSubview:({
-		self.someErrorLabel = ({
-			UILabel *label = [[UILabel alloc] init];
-			label.textAlignment = NSTextAlignmentCenter;
-			label.backgroundColor = [UIColor clearColor];
-			label;
-		});
-	})];
-	view;
-});
-[self.view addSubview:self.someErrorView];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50512-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50512-sp_oc_catch.m
deleted file mode 100644
index 6040b071..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50512-sp_oc_catch.m
+++ /dev/null
@@ -1,18 +0,0 @@
-
-- (void) foo:(NSString*) inString
-{
-	@try {
-	}
-	@catch (NSException* const inException) {
-	}
-}
-
-- (void) bar:(NSString*) inString
-{
-	@try {
-	}
-	@catch (NSException* const inException) {
-	}
-	@finally{
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50513-sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50513-sp_oc_boxed.m
deleted file mode 100644
index 916e9330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50513-sp_oc_boxed.m
+++ /dev/null
@@ -1,9 +0,0 @@
-
-- (void) foo {
-	NSArray* a = @[];
-	NSDictionary* b = @{};
-	NSArray<NSString*>* array = @[ @"hello", @"world" ];
-	NSDictionary<NSString*, NSString*>* dictionary = @{ @"foo": @"bar", @"foo2": @"bar2" };
-
-	NSString* const type = [pasteboard availableTypeFromArray:@[ NSPasteboardTypeString ]];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50514-indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50514-indent_boxed.m
deleted file mode 100644
index 165ee244..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50514-indent_boxed.m
+++ /dev/null
@@ -1,74 +0,0 @@
-
-- (IBAction) copy:(nullable id) inSender {
-    NSPasteboard* const pasteboard = NSPasteboard.generalPasteboard;
-    [pasteboard clearContents];
-    [pasteboard writeObjects:@[
-	[NSPasteboardItem pasteboardItemWithProvider:self forTypes:@[ NSPasteboardTypePDF ]
-	                                     andData:@[ kNSUTIExportedAgaroseGel,
-	                                                [NSKeyedArchiver archivedDataWithRootObject:self.selectedIndexes.count != 0 ?[self.gels objectsAtIndexes:self.selectedIndexes] : self.gels]
-	]]
-    ]];
-}
-
-- (IBAction) copy:(nullable id) inSender {
-    NSPasteboard* const pasteboard = NSPasteboard.generalPasteboard;
-    [pasteboard clearContents];
-    [pasteboard writeObjects:@[[NSPasteboardItem pasteboardItemWithProvider:self forTypes:@[ NSPasteboardTypePDF ] andData:@[
-				   kNSUTIExportedAgaroseGel, [NSKeyedArchiver archivedDataWithRootObject:self.selectedIndexes.count != 0 ?[self.gels objectsAtIndexes:self.selectedIndexes] : self.gels]
-    ]] ]];
-
-    NSArray* a = @[];
-    NSArray* b = @[@1,@2,@3];
-    NSArray* c = @[
-	@1, @2, @3
-    ];
-    NSArray* d = @[@[@1], @[@2], @[@3]];
-    NSArray* e = @[
-	@[@1], @[@2], @[@3]
-    ];
-    NSMutableArray* f = [NSMutableArray arrayWithArray:@[@[@1], @[@2], @[@3]]];
-    NSMutableArray* g = [NSMutableArray arrayWithArray:@[
-	    @[@1], @[@2], @[@3]
-    ]];
-    NSMutableDictionary* d1 = [NSMutableDictionary dictionaryWithDictionary:@{
-        @"Keys":@[
-	    @{@"A": @1},
-	    @{@"B": @2}.
-	    @{@"C": @3}
-        ]
-    }];
-}
-
-inline static void installGelMarkers(void) {
-    [NSOperationQueue.mainQueue addOperationWithBlock:^{
-        [accessoryView.textStorage setAttributedString:[[NSAttributedString alloc] initWithString:error.localizedDescription attributes:@{ NSFontAttributeName: [NSFont systemFontOfSize:NSFont.systemFontSize] }]];
-        NSAlert *alert = [[NSAlert alloc] init];
-    }];
-}
-
-[[NSAttributedString alloc] initWithString:inJunction.reverseName attributes:@{
-    NSFontAttributeName: font,
-    NSForegroundColorAttributeName: inJunction.reverseColor
-}];
-@{
-    NSFontAttributeName: self.font,
-    NSForegroundColorAttributeName: inJunction.forwardColor
-}
-[[NSAttributedString alloc] initWithString:inJunction.reverseName attributes:@{ NSFontAttributeName: font, NSForegroundColorAttributeName: inJunction.reverseColor }];
-[[NSAttributedString alloc] initWithString:inJunction.reverseName
-                                attributes:@{ NSFontAttributeName: font, NSForegroundColorAttributeName: inJunction.reverseColor }];
-- (void) drawReversePrimerForJunction:(GibsonJunction*) inJunction bounds:(NSRect) inBounds {
-    NSString* const string1 = nil,
-        string2 = nil,
-        string3 = nil;
-//does not compile but does test shift operator formatting
-    std::ostringstream ostream;
-    ostream << "hello"
-            << ' '
-            << "world";
-    NSString* const string = inJunction.reversePrimer;
-    [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[string substringToIndex:range.location] attributes:@{
-        NSFontAttributeName: self.font,
-        NSForegroundColorAttributeName: inJunction.forwardColor
-    }]];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50515-sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50515-sp_oc_synchronized.m
deleted file mode 100644
index ffff5618..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50515-sp_oc_synchronized.m
+++ /dev/null
@@ -1,11 +0,0 @@
-- (void) unobserveAllKeyPaths {
-	@synchronized (self) {
-	}
-}
-#if 1
-#define SYNCHRONIZED_BEGIN(x) @synchronized (x) {
-#define SYNCHRONIZED_END }
-#else
-#define SYNCHRONIZED_BEGIN(x)
-#define SYNCHRONIZED_END
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50600-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50600-bug_i_477.m
deleted file mode 100644
index 0e7cbb78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50600-bug_i_477.m
+++ /dev/null
@@ -1,4 +0,0 @@
-[dataArray enumerateObjectsUsingBlock:^(dataType *data, NSUInteger idx, BOOL *stop)
- {
-         // Do stuff!
- }];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_408.m
deleted file mode 100644
index 700d159d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_408.m
+++ /dev/null
@@ -1 +0,0 @@
-CGFloat fontSize = floorf([font pointSize] * [self tileContentScale] + 0.5);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_477.m
deleted file mode 100644
index 700d159d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_477.m
+++ /dev/null
@@ -1 +0,0 @@
-CGFloat fontSize = floorf([font pointSize] * [self tileContentScale] + 0.5);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50602-bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50602-bug_i_125-412.m
deleted file mode 100644
index 4beec2d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50602-bug_i_125-412.m
+++ /dev/null
@@ -1,9 +0,0 @@
-[[NSFileManager defaultManager] createFileAtPath:path
-                                        contents:data
-                                      attributes:nil]
-
-[self.myProperty setObject: obj forKey: key];
-
-NSString *newValue = [@"my string" stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
-
-NSString *newValue = [myStrings[0] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50603-gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50603-gh511.m
deleted file mode 100644
index 2c86e32d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50603-gh511.m
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOL         valid = YES;
-NSDictionary *p    = valid ? @{
-   @"Test": @"Example"
-} : nil;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50604-bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50604-bug_497.m
deleted file mode 100644
index 121503b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50604-bug_497.m
+++ /dev/null
@@ -1,13 +0,0 @@
-NSArray *array = @[@1,
-                   @2,
-                   @3,
-                   @4];
-
-NSArray *array = @{ @1: @1,
-                    @2: @2,
-                    @3: @3,
-                    @4: @4 };
-
-int i = 1
-          + 1
-          + 2;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50605-bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50605-bug_404.m
deleted file mode 100644
index 8244ebd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50605-bug_404.m
+++ /dev/null
@@ -1,6 +0,0 @@
-@interface Test1 : Test2
-@end
-
-
-@interface Test<T1 : id<T3> > : Test2<P1>
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50606-bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50606-bug_1366.m
deleted file mode 100644
index f4058b1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50606-bug_1366.m
+++ /dev/null
@@ -1,14 +0,0 @@
-@implementation UCTestClass
-
--(void) test
-{
-   switch (test)
-   {
-   case "longlonglonglong": {
-      i = 1;
-   }
-   break;
-   }
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
deleted file mode 100644
index 14eaed36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@implementation TestClass
-
-- (void)testMethod {
-    NSData *jsonData = [self dataUsingEncoding:NSUTF8StringEncoding];
-    id jsonParsedObj = [jsonSerializationClass JSONObjectWithData:jsonData options:0 error:&jsonError];
-    NSString *ret = [[TestClass sharedInstance]testString];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50608-blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50608-blocks_align2.m
deleted file mode 100644
index b37c1b4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50608-blocks_align2.m
+++ /dev/null
@@ -1,89 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)method1 {
-    [session mergeCommonMovieItems:^(NSURL *exportURL, NSError *exportError) {
-        NSDictionary *settings = [self getSettings];
-
-        [session postSessionWithCallback:^(NSError *error, id d) {
-            if (error == nil) {
-                [session uploadSessionWithCallback:^(NSError *error, id d) {
-                    NSLog(@"OK");
-                }];
-            } else {
-                NSLog(@"Something went wrong: %@", error);
-                return;
-            }
-        }];
-    }];
-}
-
-- (void)postSelection:(NSString *)testName
-            selection:(NSString *)selection {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self warmup:^{
-            [self setReady];
-        }];
-    });
-
-    dispatch_after(retryTime, dispatch_get_main_queue(), ^(void) {
-        [self postSelection:testName selection:selection];
-    });
-
-    [TestClassRequest performMethod:TestClassRequestMethodPOST
-                    responseHandler:^(NSURLResponse *response) {
-                        dispatch_after(retryTime, dispatch_get_main_queue(), ^(void) {
-                            [self postSelection:testName selection:selection];
-                        });
-                    }];
-
-    [UIView transitionWithView:self.view.window duration:0.75 options:UIViewAnimationOptionTransitionFlipFromRight animations:^{
-                                                                                                                       [self presentViewController:viewController animated:NO completion:nil];
-                                                                                                                   } complete:^{}];
-}
-
-- (void)closeEditor {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if ([[TestClass sharedInstance] TestClassController] != nil && [[[TestClass sharedInstance] TestClassController] isKindOfClass:[TestClassSocialViewController class]]) {
-            [[TestClass sharedInstance].TestClassTransitionController transitionToViewController:[[TestClass sharedInstance] TestClassController] withCompletitionHandler:^{
-                [[TestClass sharedInstance] setTestClassVideoPlayerViewController:nil];
-            }];
-        } else if ([[TestClass sharedInstance] TestClassController] != nil && [[[TestClass sharedInstance] TestClassController] isKindOfClass:[TestClassModalViewController class]]) {
-            [[TestClass sharedInstance].TestClassTransitionController transitionToViewController:nil withCompletitionHandler:^{
-                [[TestClass sharedInstance] setTestClassVideoPlayerViewController:nil];
-            }];
-        } else {
-            [[TestClass sharedInstance] hideTestClass];
-        }
-    });
-}
-
-- (void)testMethodWrapper {
-    SEL testMethodForSelectorSel = @selector(testMethod:);
-    __block void *testMethodForSelectorBlock = TestFunction(encoderTest, testMethodForSelectorSel, ^id (__typeof(encoderTest) self, SEL aSelector) {
-        NSLog(@"OK");
-    });
-}
-
-- (void)method2 {
-    [TestClassRequest performMethod:TestClassRequestMethodPOST
-                    responseHandler:^(NSURLResponse *response, NSData *responseData, NSError *error) {
-                        [self checkPermissions:connection withCallback:^(NSError *error, id data) {
-                            [self bar];
-                        }];
-                    }];
-}
-
-- (void)method3 {
-    [TestClassRequest performMethod:TestClassRequestMethodPOST responseHandler:^(NSURLResponse *response, NSData *responseData, NSError *error) {
-        [self checkPermissions:connection withCallback:^(NSError *error, id data) {
-            [self bar];
-        }];
-    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50609-negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50609-negative_value.m
deleted file mode 100644
index 9aa4dc80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50609-negative_value.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-
-int main(void) {
-	int i = -1;
-	NSNumber *foo1 = @-1;
-	NSNumber *foo2 = @(-1);
-	NSNumber *foo3 = @1;
-	NSNumber *foo4 = @(1);
-	NSNumber *foo5 = @(i);
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50610-nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50610-nelem.m
deleted file mode 100644
index d42ce3b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50610-nelem.m
+++ /dev/null
@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-
-/* get #of elements in a static array */
-#ifndef NELEM
-#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
-#endif
-
-int main(void) {
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50611-for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50611-for2.m
deleted file mode 100644
index 535bc50b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50611-for2.m
+++ /dev/null
@@ -1,2 +0,0 @@
-for (UIWindow *testWindow in [[UIApplication sharedApplication] windows]) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50612-chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50612-chunk_ends_type1.m
deleted file mode 100644
index fb9bb4e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50612-chunk_ends_type1.m
+++ /dev/null
@@ -1,23 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)uploadWithClientData:(NSMutableDictionary *)data withCallback:(TestClassCallback)callback {
-    TestClassSessionInstance *session = [[TestClassSession sharedInstance] currentOrLastSession];
-
-    if (session == nil || data == nil) {
-        if (callback != nil)
-            return callback(nil, nil);
-        return;
-    }
-    [session mergeCommonMovieItems:^(NSURL *exportURL, NSError *exportError) {
-        if (exportError != nil)
-            return callback(exportError, nil);
-        NSDictionary *settings = [self getSettings];
-    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50613-chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50613-chunk_ends_type2.m
deleted file mode 100644
index 64efc7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50613-chunk_ends_type2.m
+++ /dev/null
@@ -1,32 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define TESTCLASS_SINGLETON_FOR_CLASS(classname, accessorname) \
-    static classname *shared##classname = nil;
-
-#define PUSH_CONTEXT(contextArg) \
-    EAGLContext *oldContext = [EAGLContext currentContext]; \
-    if (oldContext != contextArg) { \
-        [EAGLContext setCurrentContext:contextArg]; \
-    }
-
-#define POP_CONTEXT(contextArg) \
-    if (oldContext != contextArg) { \
-        [EAGLContext setCurrentContext:oldContext]; \
-    }
-
-#define CURRENT_CONTEXT \
-    NSOpenGLContext *currentContext = [NSOpenGLContext currentContext];
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-TESTCLASS_SINGLETON_FOR_CLASS(TestClass, sharedInstance);
-
-- (void)drawSomething {
-    PUSH_CONTEXT(_context);
-    POP_CONTEXT(_context);
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50614-chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50614-chunk_ends_type3.m
deleted file mode 100644
index 8f0ae62c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50614-chunk_ends_type3.m
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define MACRO(foo) \
-    if (_##foo == NULL) { \
-        Log("do %s", str(foo)); \
-        _##foo = (foo##_t *) process(PR_FLAG, str(foo)); \
-    }
-
-#define OVERLOAD(base, foo) \
-    foo##_override_t *foo##_bar = (foo##_override_t *) process(base##_bar, str(foo)); \
-    _##foo##_override = (foo##_override_t *) process(base##_cache, str(foo));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50615-block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50615-block_literal_protocol.m
deleted file mode 100644
index 35879a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50615-block_literal_protocol.m
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)drawSomething:(id<MTLCommandBuffer>)commandBuffer {
-    [renderPass performDrawBlock:^(id<MTLRenderCommandEncoder> renderCommandEncoder) {
-                    screenBlitObject.texture = src;
-
-                    // Make sure the pipeline state pixelformat is the same as destination pixel format
-                    [screenBlitObject updatePipelineState:dst.pixelFormat];
-
-                    [screenBlitObject drawWithRenderCommandEncoder:renderCommandEncoder];
-                } withTargetTexture:dst andCommandBuffer:commandBuffer];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50616-oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50616-oc_msg_in_pp.m
deleted file mode 100644
index 8496973b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50616-oc_msg_in_pp.m
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float) ((rgbValue & 0xFF0000) >> 16)) / 255.0 green:((float) ((rgbValue & 0xFF00) >> 8)) / 255.0 blue:((float) (rgbValue & 0xFF)) / 255.0 alpha:1.0]
-
-#if TARGET_OS_IPHONE
-#define GL_CONTEXT_ALLOC(parentContext) [[EAGLContext alloc] initWithAPI:GL_CONTEXT_VERSION(parentContext) sharegroup:[parentContext sharegroup]]
-#else
-#define GL_CONTEXT_ALLOC(parentContext) [[NSOpenGLContext alloc] initWithFormat:[[NSOpenGLPixelFormat alloc] initWithCGLPixelFormatObj:CGLGetPixelFormat([parentContext CGLContextObj])] shareContext:parentContext]
-#endif
-
-#define NSLocalizedString(key, comment) \
-    [TestClassBundle localizedStringForKey:(key) value:@"" table:nil]
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50617-boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50617-boxed_receiver.m
deleted file mode 100644
index e4c247fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50617-boxed_receiver.m
+++ /dev/null
@@ -1,37 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@implementation TestClass
-
-- (NSDictionary *)constructUploadHeaders {
-    NSDictionary *headers;
-
-    headers = @{
-        @"Content-Length": [@(contentLength) stringValue],
-        @"Content-Length2": [contentLength stringValue],
-        @"Content-Disposition": [NSString stringWithFormat:@"name=\"%@\"; filename=\"%@\"", @"asset_data", identifier],
-        @"Content-Type": @"application/octet-stream",
-        @"ETag": uploadEtag
-    };
-
-    return headers;
-}
-
-- (BOOL)isStrimmed {
-    if ([(TestClassVideoEditorView *) (self.parentComponentsView.superview) isTrimmed]) {
-        return YES;
-    }
-    if ([((TestClassVideoEditorView *) self.parentComponentsView.superview) isTrimmed]) {
-        return YES;
-    }
-    return NO;
-}
-
-- (void)session {
-    TestCaseSessionInstance *session = ((TestClassVideoEditorView *) self.parentComponentsView.superview).session;
-
-    [(TestClassVideoEditorView *) (self.parentComponentsView.superview) closeEditor];
-
-    [menubutton.badge setBadgeText:[@(count + 1) stringValue]];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50618-func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50618-func_def.mm
deleted file mode 100644
index 49de2fea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50618-func_def.mm
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <Foundation/Foundation.h>
-
-extern "C" void function1(void *self, uint32_t *arg2, uint32_t *arg3);
-
-MACRO1(void, function2, type1 arg1, type2 arg2, const type1 *arg3);
-
-MACRO2(status_t, function3,
-    void *arg1,
-    const sp<IFoo>& arg2) {
-}
-
-MACRO2(type4, function4, const void **arg1, type1 arg2, const type3 *arg3, type4 arg4, type4 arg5, bool arg6) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50619-cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50619-cast.m
deleted file mode 100644
index 1e588579..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50619-cast.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)foo {
-    previewViewController.previewControllerDelegate = (id<TestClassDelegate>) [TestClass sharedInstance];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50620-sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50620-sp_after_angle.m
deleted file mode 100644
index 318071ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50620-sp_after_angle.m
+++ /dev/null
@@ -1,21 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass2 : TestClassNavigationViewController {
-    BOOL foo;
-}
-
-@implementation TestClass2
-
-@end
-
-@interface TestClass : TestClassNavigationViewController<UIWebViewDelegate, UIActionSheetDelegate> {
-    NSURL *webpageUrl;
-    UIWebView *webView;
-    BOOL toolbarVisible;
-    BOOL loading;
-    NSString *endPrefix;
-}
-
-@implementation TestClass
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50621-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50621-Fraction.h
deleted file mode 100644
index 77403abd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50621-Fraction.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/NSObject.h>
-
-@interface Fraction : NSObject {
-    int numerator;
-    int denominator;
-}
-
-- (void)print;
-- (void)setNumerator:(int)d;
-- (void)setDenominator:(int)d;
-- (int)numerator;
-- (int)denominator;
-- (void)setNumDen:(int)n:(int)d;
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
deleted file mode 100644
index f17c10ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
+++ /dev/null
@@ -1,300 +0,0 @@
-// C/C++/Obj-C/Obj-C++ wrapper that exports C functions
-//
-// As an example, distributed with .c suffix,
-// but depending on extension needs, can be
-// compiled as C, C++, Obj-C or Obj-C++
-
-#include <stdio.h>
-#include <unistd.h>
-#include "TestClassNativeHelper.h"
-
-#undef NDEBUG
-
-#if defined(__ANDROID__)
-
-#define TCH_LOGI(...) __android_log_print(ANDROID_LOG_INFO, "TestClassNativeHelper", __VA_ARGS__)
-#define TCH_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, "TestClassNativeHelper", __VA_ARGS__)
-
-#ifndef NDEBUG
-#define TCH_LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, "TestClassNativeHelper", __VA_ARGS__)
-#else
-#define TCH_LOGV(...)
-#endif
-
-#define TCH_ELOG TCH_LOGV("%s", __FUNCTION__)
-
-void TCH_onTestClassUploadDidProgress(C_JNIEnv *env, jobject thiz, jint videoId, jdouble progress) {
-    TCH_ELOG;
-}
-
-#ifndef TCH_NELEM
-#define TCH_NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
-#endif
-
-static const char *kTCHTestClassClass = "com/testclass/TestClass/TestClass";
-static const char *kTCHTestClassLoader = "com.testclass.TestClass.TestClass";
-
-static const char *kTCHTestClassNativeListenerClass = "com/testclass/TestClass/communication/TestClassNativeListener";
-static const char *kTCHTestClassNativeListenerLoader = "com.testclass.TestClass.communication.TestClassNativeListener";
-
-static JavaVM *TCH_vm = NULL;
-
-static JNINativeMethod TCH_listenerMethods[] = {
-    { "onTestClassUploadDidProgress", "(ID)V", (void *) TCH_onTestClassUploadDidProgress },
-};
-
-static C_JNIEnv *TCH_getEnv() {
-    C_JNIEnv *ret = NULL;
-
-    if (TCH_vm == NULL) {
-        TCH_LOGE("TCH_getEnv failed, no JVM");
-        return NULL;
-    }
-
-#if defined(__cplusplus)
-    JNIEnv *env = NULL;
-
-    if (TCH_vm->GetEnv((void **) &env, JNI_VERSION_1_6) != JNI_OK) {
-        JavaVMAttachArgs args;
-        args.version = JNI_VERSION_1_6;
-        args.name = NULL;
-        args.group = NULL;
-
-        int attachStatus;
-        if ((attachStatus = TCH_vm->AttachCurrentThread(&env, &args)) < 0) {
-            TCH_LOGE("TCH_getEnv failed");
-        }
-    }
-    ret = (C_JNIEnv *) env;
-#else
-    JNIEnv *env = NULL;
-
-    if ((*TCH_vm)->GetEnv(TCH_vm, (void **) &env, JNI_VERSION_1_6) != JNI_OK) {
-        JavaVMAttachArgs args;
-        args.version = JNI_VERSION_1_6;
-        args.name = NULL;
-        args.group = NULL;
-
-        int attachStatus;
-        if ((attachStatus = (*TCH_vm)->AttachCurrentThread(TCH_vm, &env, &args)) < 0) {
-            TCH_LOGE("TCH_getEnv failed");
-        }
-    }
-    ret = env;
-#endif /* if defined(__cplusplus) */
-    return ret;
-}
-
-static jclass TCH_loadClass(C_JNIEnv *env, jobject activity, const char *className) {
-    jclass cls_Activity = (*env)->GetObjectClass((JNIEnv *) env, activity);
-    jmethodID mid_getClassLoader = (*env)->GetMethodID((JNIEnv *) env, cls_Activity, "getClassLoader", "()Ljava/lang/ClassLoader;");
-    jobject obj_classLoader = (*env)->CallObjectMethod((JNIEnv *) env, activity, mid_getClassLoader);
-
-    jclass cls_classLoader = (*env)->GetObjectClass((JNIEnv *) env, obj_classLoader);
-    jmethodID mid_loadClass = (*env)->GetMethodID((JNIEnv *) env, cls_classLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
-
-    jstring _className = (*env)->NewStringUTF((JNIEnv *) env, className);
-    jclass cls = (jclass) (*env)->CallObjectMethod((JNIEnv *) env, obj_classLoader, mid_loadClass, _className);
-
-    (*env)->DeleteLocalRef((JNIEnv *) env, _className);
-
-    if (!cls) {
-        TCH_LOGE("Couldn't find class %s", className);
-    }
-
-    return cls;
-}
-
-#define TCH_str2(x)             #x
-#define TCH_str(x)              TCH_str2(x)
-
-#define TCH_CLASS(_class)       tchClass_##_class
-
-#define TCH_LOCAL_CLASS(_class) local_tchClass_##_class
-
-#define TCH_REGISTER_CLASS(_class) \
-    jclass TCH_CLASS(_class) = NULL;
-
-#define TCH_EXTERN_CLASS(_class) \
-    jclass TCH_CLASS(_class);
-
-#define TCH_METHOD(_method)     tchMethod_##_method
-
-#define TCH_REGISTER_METHOD(_method) \
-    jmethodID TCH_METHOD(_method) = NULL;
-
-#define TCH_EXTERN_METHOD(_method) \
-    jmethodID TCH_METHOD(_method);
-
-#define TCH_REGISTER_NATIVES(_env, _class, methods) \
-    if ((*_env)->RegisterNatives((JNIEnv *) _env, TCH_CLASS(_class), methods, TCH_NELEM(methods)) < 0) { \
-        TCH_LOGE("RegisterNatives failed for %s\n", TCH_str(_class)); \
-    }
-
-#define TCH_FIND_CLASS(_env, _class, _className) \
-    jclass TCH_LOCAL_CLASS(_class) = (*_env)->FindClass((JNIEnv *) _env, _className); \
-    if (TCH_LOCAL_CLASS(_class) == NULL) { \
-        TCH_LOGE("Unable to find class %s\n", _className); \
-    } else { \
-        TCH_CLASS(_class) = (jclass) (*_env)->NewGlobalRef((JNIEnv *) _env, TCH_LOCAL_CLASS(_class)); \
-    }
-
-#define TCH_FIND_STATIC_METHOD(_env, _class, _method, _prototype) \
-    TCH_METHOD(_method) = (*_env)->GetStaticMethodID((JNIEnv *) _env, TCH_CLASS(_class), TCH_str(_method), _prototype); \
-    if (TCH_METHOD(_method) == NULL) { \
-        TCH_LOGE("Unable to find method %s", TCH_str(_method)); \
-    }
-
-#define TCH_FIND_STATIC_METHOD2(_env, _class, _method, _symbol, _prototype) \
-    TCH_METHOD(_method) = (*_env)->GetStaticMethodID((JNIEnv *) _env, TCH_CLASS(_class), TCH_str(_symbol), _prototype); \
-    if (TCH_METHOD(_method) == NULL) { \
-        TCH_LOGE("Unable to find method %s", TCH_str(_method)); \
-    }
-
-#define TCH_CALL_STATIC_METHOD_ARGS(_env, _class, _method, ...) \
-    (*_env)->CallStaticVoidMethod((JNIEnv *) _env, TCH_CLASS(_class), TCH_METHOD(_method), __VA_ARGS__);
-
-#define TCH_CALL_STATIC_METHOD_BOOL(_env, _class, _method) \
-    (*_env)->CallStaticBooleanMethod((JNIEnv *) _env, TCH_CLASS(_class), TCH_METHOD(_method));
-
-TCH_REGISTER_CLASS(testclassClass);
-TCH_REGISTER_METHOD(testclassConstructor);
-static jobject TCH_testclassInstance = NULL;
-
-TCH_REGISTER_CLASS(testclassNativeListenerClass);
-TCH_REGISTER_METHOD(testclassNativeListenerConstructor);
-static jobject TCH_testclassNativeListenerInstance = NULL;
-
-TCH_REGISTER_METHOD(isSupported);
-TCH_REGISTER_METHOD(initTestClass);
-
-static void TCH_preload(C_JNIEnv *env) {
-    TCH_ELOG;
-
-    if (TCH_CLASS(testclassClass) == NULL) {
-        TCH_FIND_CLASS(env, testclassClass, kTCHTestClassClass);
-    }
-
-    // Class really not found or not loaded, bail
-    if (TCH_CLASS(testclassClass) == NULL) {
-        return;
-    }
-
-    if (TCH_CLASS(testclassClass) != NULL && TCH_METHOD(isSupported) == NULL) {
-        TCH_FIND_STATIC_METHOD(env, testclassClass, isSupported, "()Z");
-        TCH_FIND_STATIC_METHOD(env, testclassClass, initTestClass, "(Lcom/testclass/TestClass/ITestClassListener;Landroid/app/Activity;)Z");
-
-        if (TCH_CLASS(testclassClass) != NULL) {
-            TCH_METHOD(testclassConstructor) = (*env)->GetMethodID((JNIEnv *) env, TCH_CLASS(testclassClass), "<init>", "()V");
-            jobject constructor = (*env)->NewObject((JNIEnv *) env, TCH_CLASS(testclassClass), TCH_METHOD(testclassConstructor));
-            TCH_testclassInstance = (*env)->NewGlobalRef((JNIEnv *) env, constructor);
-        }
-
-        if (TCH_CLASS(testclassNativeListenerClass) == NULL) {
-            TCH_FIND_CLASS(env, testclassNativeListenerClass, kTCHTestClassNativeListenerClass);
-        }
-
-        if (TCH_CLASS(testclassNativeListenerClass) != NULL) {
-            TCH_METHOD(testclassNativeListenerConstructor) = (*env)->GetMethodID((JNIEnv *) env, TCH_CLASS(testclassNativeListenerClass), "<init>", "()V");
-            jobject listener = (*env)->NewObject((JNIEnv *) env, TCH_CLASS(testclassNativeListenerClass), TCH_METHOD(testclassNativeListenerConstructor));
-            TCH_testclassNativeListenerInstance = (*env)->NewGlobalRef((JNIEnv *) env, listener);
-            TCH_REGISTER_NATIVES(env, testclassNativeListenerClass, TCH_listenerMethods);
-            TCH_LOGV("Initializing built-in listener");
-        }
-    }
-}
-
-#elif defined(__APPLE__)
-
-#ifndef NDEBUG
-#define TCH_LOGV(...)  NSLog(__VA_ARGS__)
-#else
-#define TCH_LOGV(...)
-#endif
-
-#define TCH_ELOG TCH_LOGV(@"%s", __FUNCTION__)
-
-#if defined(__cplusplus)
-#define TCH_NS(_class) ::_class
-#else
-#define TCH_NS(_class) _class
-#endif
-
-@interface TCH_delegateHandler : NSObject<TestClassDelegate>
-@end
-
-@implementation TCH_delegateHandler
-- (void)testclassUploadDidProgress:(NSNumber *)videoId progress:(NSNumber *)progress {
-    TCH_ELOG;
-}
-
-@end
-
-static TCH_delegateHandler *TCH_builtInHandler = nil;
-
-#endif /* if defined(__ANDROID__) */
-
-#if defined(__ANDROID__)
-
-void TCH_initTestClass(JNIEnv *env, jobject activity, jobject listener) {
-    TCH_ELOG;
-
-    C_JNIEnv *cenv = NULL;
-#if defined(__cplusplus)
-    cenv = (C_JNIEnv *) env;
-#else
-    cenv = env;
-#endif
-
-    if (TCH_vm == NULL) {
-        int status = (*cenv)->GetJavaVM((JNIEnv *) cenv, &TCH_vm);
-        if (status != 0) {
-            TCH_LOGE("GetJavaVM failed");
-            return;
-        }
-    }
-
-    TCH_CLASS(testclassClass) = TCH_loadClass(cenv, activity, kTCHTestClassLoader);
-    TCH_CLASS(testclassNativeListenerClass) = TCH_loadClass(cenv, activity, kTCHTestClassNativeListenerLoader);
-    TCH_preload(cenv);
-
-    jobject listenerRef = listener;
-    if (listenerRef == NULL) {
-        TCH_LOGV("Using built-in listener");
-        listenerRef = TCH_testclassNativeListenerInstance;
-    }
-
-    TCH_CALL_STATIC_METHOD_ARGS(cenv, testclassClass, initTestClass, listenerRef, activity);
-}
-
-#elif defined(__APPLE__)
-
-void TCH_initTestClass(UIViewController *viewController, id<TestClassDelegate> testclassDelegate) {
-    TCH_ELOG;
-
-    id<TestClassDelegate> testclassDelegateRef = testclassDelegate;
-    if (testclassDelegateRef == nil) {
-        TCH_builtInHandler = [[TCH_delegateHandler alloc] init];
-        testclassDelegateRef = TCH_builtInHandler;
-    }
-
-    [TCH_NS(TestClass) initWithDelegate:testclassDelegateRef andParentViewController:viewController];
-}
-
-#endif /* if defined(__ANDROID__) */
-
-bool TCH_isSupported(void) {
-    TCH_ELOG;
-    bool ret = false;
-
-#if defined(__ANDROID__)
-    C_JNIEnv *env = TCH_getEnv();
-    if (env && TCH_CLASS(testclassClass)) {
-        ret = (bool) TCH_CALL_STATIC_METHOD_BOOL(env, testclassClass, isSupported);
-    }
-#elif defined(__APPLE__)
-    ret = (bool) [TCH_NS(TestClass) isSupported];
-#endif
-
-    return ret;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50623-extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50623-extern-c-attribute.m
deleted file mode 100644
index 1c752682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50623-extern-c-attribute.m
+++ /dev/null
@@ -1,15 +0,0 @@
-struct {
-    int foo;
-} bar;
-
-extern "C" int *i;
-extern "C" {  int *i; }
-int *i;
-extern "C" NSString *i;
-extern "C" {  NSString *i; }
-NSString *i;
-
-__attribute__((visibility("default"))) int *i;
-__attribute__((visibility("default"))) NSString *i;
-
-#define DEFINE_NOTIFICATION(name) extern "C" __attribute__((visibility("default"))) NSString *const name = @#name;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50624-typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50624-typeof.m
deleted file mode 100644
index 968aad5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50624-typeof.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.m>
-
-@implementation MyViewController
-
-- (void)method1 {
-    __weak __typeof(self) weakSelf1 = self;
-    __weak typeof(self) weakSelf2 = self;
-    __weak MyViewController *weakSelf3 = self;
-    NSString *srcStr = [[NSString alloc] initWithBytes:kShaderSource length:sizeof(kShaderSource) encoding:NSASCIIStringEncoding];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
deleted file mode 100644
index f98a27ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <Foundation/Foundation>
-
-int main(void) {
-    NSDictionary *productParameters = @{ @"id": appStoreID };
-    NSDictionary *options = @{ AVURLAssetPreferPreciseDurationAndTimingKey: @YES };
-    NSDictionary *baz = @{ foo: bar };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50626-chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50626-chunk_ends_type4.m
deleted file mode 100644
index dd4d55fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50626-chunk_ends_type4.m
+++ /dev/null
@@ -1,48 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)session_thumbnail_url:(NSDictionary *)data {
-    [session mergeCommonMovieItems:^(NSURL *exportURL, NSError *error) {
-#if 0
-        [response setValue:[thumbnailUrl absoluteString] forKey:@"thumbnail_url"];
-#else
-        NSString *extension = [thumbnailUrl pathExtension];
-        NSData *imageData = [NSData dataWithContentsOfURL:thumbnailUrl];
-        NSString *base64EncodedImage = [TestClassCommon Base64Encode:imageData];
-
-        NSString *base64Image = nil;
-        if ([extension isEqualToString:@"jpg"] == YES) {
-            base64Image = [NSString stringWithFormat:@"data:image/jpg;base64, %@", base64EncodedImage];
-        } else {
-            base64Image = [NSString stringWithFormat:@"data:image/png;base64, %@", base64EncodedImage];
-        }
-        [response setValue:base64Image forKey:@"thumbnail_url"];
-#endif
-
-        [TestClassWebViewController sendEvent:[NSString stringWithFormat:@"session_thumbnail:%@", sessionId] withArgs:response];
-    }];
-}
-
-- (void)addFoo:(NSDictionary *)postData {
-    [TestClassRequest performMethod:TestClassRequestMethodPOST
-                         onResource:resource
-                    usingParameters:postData
-                        withAccount:[TestClass account]
-             sendingProgressHandler:nil
-                    responseHandler:^(NSURLResponse *response, NSData *responseData, NSError *error) {
-                        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;
-                        if ([httpResponse statusCode] == 200) {
-#if DEBUG
-                            NSString *rsp = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
-                            TestClassLog(@"TOGGLE CONNECTION ADDED response:%li responseData:%@ error:%@", (long) [((NSHTTPURLResponse *) response) statusCode], rsp, [error localizedDescription]);
-#endif
-                            NSJSONSerialization *jsonConnection = [responseData TestClassJSONObject];
-                        }
-                    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50627-method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50627-method_ends_semicolon.m
deleted file mode 100644
index b1ca36fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50627-method_ends_semicolon.m
+++ /dev/null
@@ -1,17 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass
-
-+ (void)cancelRequest:(id)request;
-
-@end
-
-@implementation TestClass
-
-// Occasionally there will be user errors where someone will
-// copy the interface method declaration to implementation
-// and leaves the semicolon
-+ (void)cancelRequest:(id)request; {
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50628-macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50628-macro-close-brace.m
deleted file mode 100644
index 0eb3fa81..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50628-macro-close-brace.m
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#if TARGET_RT_BIG_ENDIAN
-#define FourCC2Str(fourcc) (const char[]) { *((char *) &fourcc), *(((char *) &fourcc) + 1), *(((char *) &fourcc) + 2), *(((char *) &fourcc) + 3), 0}
-#else
-#define FourCC2Str(fourcc) (const char[]) { *(((char *) &fourcc) + 3), *(((char *) &fourcc) + 2), *(((char *) &fourcc) + 1), *(((char *) &fourcc) + 0), 0}
-#endif
-
-#if 1
-#define SYNCHRONIZED_BEGIN(x) @synchronized(x) {
-#define SYNCHRONIZED_END }
-#else
-#define SYNCHRONIZED_BEGIN(x)
-#define SYNCHRONIZED_END
-#endif
-
-#define AUTORELEASEPOOL_BEGIN @autoreleasepool {
-#define AUTORELEASEPOOL_END }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50629-pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50629-pp_bool.m
deleted file mode 100644
index b1bf896c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50629-pp_bool.m
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#if TARGET_OS_MAC && !TARGET_OS_IPHONE
-#import <AppKit/AppKit.h>
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
deleted file mode 100644
index e423c05a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
+++ /dev/null
@@ -1,103 +0,0 @@
-mapToPtr(^(const LeftAddOn::Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr( x, ^ (const Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr( ^ (const Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr(
-	arg1, ^ ( NSString * ) (const Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-}, arg2
-	);
-
-mapToPtr(arg1, ^ ( NSString *) (const Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr( ^()(const Props &addOnProps) {
-	FSTheme *const theme = AK::getTheme();
-}, arg2);
-
-
-
-methodCall(^{
-	variant.action.send(Cmpnt);
-});
-
-methodCall(
-	^{
-	variant.action.send(Cmpnt);
-}, x);
-
-
-methodCall(  x, ^id (Cmpnt *c) {
-	NSLog(@"Something");
-});
-
-methodCall(  ^id (Cmpnt *c) {
-	NSLog(@"Something");
-});
-
-methodCall(  ^(Cmpnt *c) {
-	NSLog(@"Something");
-});
-
-methodCall(
-	^ (Cmpnt *c) {
-	NSLog(@"Something");
-}, y);
-
-methodCall(
-	x,  ^(Cmpnt *c) {
-	NSLog(@"Something");
-}, y
-	);
-
-
-methodCall(
-	arg1,
-	arg2,
-	arg3
-	);
-
-methodCall(arg1, arg2, arg3);
-
-methodCall(
-	arg1,
-	arg2, {
-	.x = 10,
-}
-	);
-
-methodCall(
-	arg1, {
-	.x = 10,
-},
-	arg2
-	);
-
-methodCall({
-	.x = 10,
-},
-           arg2);
-
-
-outerMethodCall(
-	methodCall(^{
-	// action
-},
-	           x)
-	);
-
-outerMethodCall(
-	methodCall(^{
-	variant.action.send(Cmpnt);
-},
-	           x)
-	);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-react_native.m
deleted file mode 100644
index 657e90d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-react_native.m
+++ /dev/null
@@ -1,42 +0,0 @@
-#import "FOOAddressBookManager.h"
-#import <React/RCTBridge.h>
-#import <React/RCTEventDispatcher.h>
-
-/*
- * #define RCT_EXPORT_METHOD(method) \
- *  - (void)__rct_export__##method { \
- *    __attribute__((used, section("__DATA,RCTExport"))) \
- *    static const char *__rct_export_entry__[] = { __func__, #method }; \
- *  } \
- *  - (void)method \
- */
-
-@interface FOOAddressBook : NSObject
-@end
-
-@implementation FOOAddressBookManager
-
-RCT_EXPORT_MODULE(FOOAddressBook)
-
-RCT_EXPORT_METHOD(getAddresses:(NSDictionary *) data callback:(RCTResponseSenderBlock) callback)
-{
-    NSMutableArray *addresses = [[FOOAddressBook sharedInstance] getAddresses:data];
-    if (addresses != nil)
-        callback(@[[NSNull null], addresses]);
-    else
-        callback(@[@"getAddresses returned nil."]);
-}
-
-RCT_EXPORT_METHOD(getStatus:(RCTResponseSenderBlock) callback)
-{
-    callback(@[[NSNull null], [[FOOAddressBook sharedInstance] getStatus]]);
-}
-
-RCT_EXPORT_METHOD(requestAccess:(RCTResponseSenderBlock) callback)
-{
-    [[FOOAddressBook sharedInstance] requestAccess:^(NSString *status) {
-        callback(@[[NSNull null], status]);
-    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50700-cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50700-cmt_insert.m
deleted file mode 100644
index ec94c42b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50700-cmt_insert.m
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * @file cmt_insert.m
- * Description
- *
- * $Id$
- */
-@protocol spacingProtocol
-
-@property NSInteger spacing;
-
-@end
-
-@interface cmt_insert
-
-+ (cmt_insert*) shareInstance;
-
-@property (readonly) BOOL isAvailable;
-
-@property (copy) NSArray<NSString*>* contents;
-
-- (void) updateContents:(NSArray<NSString*>*) inContents andRefresh:(BOOL) inRefresh;
-
-@end
-
-@implementation cmt_insert
-
-/**
- * +[cmt_insert sharedInstance]
- *
- * @return TODO
- */
-+ (cmt_insert*) sharedInstance {
-	return nil;
-}
-
-/**
- * -[cmt_insert isAvailable]
- *
- * @return TODO
- */
-- (BOOL) isAvailable {
-	return YES;
-}
-
-/**
- * -[cmt_insert contents]
- *
- * @return TODO
- */
-- (NSArray<NSString*>*) contents {
-	return @[];
-}
-
-/**
- * -[cmt_insert setContents:]
- *
- * @param inContents TODO
- */
-- (void) setContents:(NSArray<NSString*>*) inContents {
-}
-
-/**
- * -[cmt_insert updateContents:andRefresh:]
- *
- * @param inContents TODO
- * @param inRefresh TODO
- */
-- (void) updateContents:(NSArray<NSString*>*) inContents andRefresh:(BOOL) inRefresh {
-}
-
-@end
-
-@interface cmt_insert_with_protocol (spacingProtocol)
-@end
-
-@implementation cmt_insert_with_protocol (spacingProtocol)
-
-/**
- * -[cmt_insert_with_protocol(spacingProtocol) spacing]
- *
- * @return TODO
- */
-- (NSInteger) spacing {
-	return 0;
-}
-
-/**
- * -[cmt_insert_with_protocol(spacingProtocol) setSpacing:]
- *
- * @param inSpacing TODO
- */
-- (void) setSpacing:(NSInteger) inSpacing {
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50701-cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50701-cmt_insert2.m
deleted file mode 100644
index 7a90cc57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50701-cmt_insert2.m
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @file cmt_insert2.m
- * Description
- *
- * $Id$
- */
-NSURLResourceKey const NSURLCanonicalPathKey API_AVAILABLE(macosx(10.12), ios(10.0), watchos(3.0), tvos(10.0));
-
-@interface foo ()
-
-@property BOOL usesStrongWriteBarrier API_DEPRECATED("Garbage collection no longer supported", macosx(10.5, 10.12), ios(2.0, 10.0), watchos(2.0, 3.0), tvos(9.0, 10.0));
-
-static const NSWindowStyleMask NSResizableWindowMask API_DEPRECATED_WITH_REPLACEMENT("NSWindowStyleMaskResizable", macosx(10.0, 10.12)) = NSWindowStyleMaskResizable;
-
-- (NSString*) extensionForType:(NSString*) inFileType API_AVAILABLE(macosx(10.12), ios(10.0), watchos(3.0), tvos(10.0));
-
-@end
-
-@implementation foo
-
-/**
- * -[foo filePromiseProvider:fileNameForType:]
- *
- * @param inFilePromiseProvider TODO
- * @param inFileType TODO
- * @return TODO
- */
-- (NSString*) filePromiseProvider:(NSFilePromiseProvider*) inFilePromiseProvider fileNameForType:(NSString*) inFileType API_AVAILABLE(macos(10.12)) {
-}
-/**
- * -[foo filePromiseProvider:fileNameForType:]
- *
- * @param inFilePromiseProvider TODO
- * @param inFileType TODO
- * @return TODO
- */
-- (NSString*) filePromiseProvider:(NSFilePromiseProvider*) inFilePromiseProvider fileNameForType:(NSString*) inFileType API_DEPRECATED_WITH_REPLACEMENT(macos(10.12))
-{
-}
-/**
- * -[foo filePromiseProvider:fileNameForType:]
- *
- * @param inFilePromiseProvider TODO
- * @param inFileType TODO
- * @return TODO
- */
-- (NSString*) filePromiseProvider:(NSFilePromiseProvider*) inFilePromiseProvider fileNameForType:(NSString*) inFileType API_UNAVAILABLE(macos(10.12)) {
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50800-properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50800-properties.m
deleted file mode 100644
index fa9ca930..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50800-properties.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#define nonnull_strong nonnull, strong
-#define myatomic nonatomic
-@interface UCTestClass ()
-
-@property (nonatomic,readonly,strong,null_unspecified) NSString* test1;
-@property (nonatomic,readonly,strong,nullable) NSString* test2;
-@property (nonatomic,readonly,strong,nonnull,getter=test2Getter) NSString* test3;
-@property (nonatomic,readonly,strong,null_resettable,getter=test2Getter,setter=test2Setter:) NSString* test4;
-@property (class,nonatomic,readonly,assign,nonnull,getter=test5Getter) NSString* test5;
-@property (class,assign,getter=test5Getter,myatomic,nonnull_strong) NSString* test6;
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50801-i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50801-i1213.m
deleted file mode 100644
index f47e5964..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50801-i1213.m
+++ /dev/null
@@ -1,9 +0,0 @@
-int main (int argc, const char * argv[])
-{
-	switch (argc)
-	{
-	case 0 ... 1:
-		return 1;
-	}
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50802-available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50802-available.m
deleted file mode 100644
index 5054043a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50802-available.m
+++ /dev/null
@@ -1,12 +0,0 @@
--(void) test {
-    if (@available(macOS 10.12.2, *)) {
-        self.automaticTextCompletionEnabled = YES;
-        self.allowsCharacterPickerTouchBarItem = NO;
-    }
-
-    if (@available( macOS 10.12,*)) {
-        self.automaticTextCompletionEnabled = YES;
-        self.allowsCharacterPickerTouchBarItem = NO;
-    }
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50803-indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50803-indent_single_newline.m
deleted file mode 100644
index a70184e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50803-indent_single_newline.m
+++ /dev/null
@@ -1,15 +0,0 @@
-
-- (BOOL)isSomethingTrue:(BOOL) something {
-    
-    if (something) {
-        //Yes it's true
-        
-        return YES;
-    }
-    else {
-        //No it's false
-        
-        return NO;
-    }
-    
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50804-issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50804-issue_2629.m
deleted file mode 100644
index 6d6cbf30..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50804-issue_2629.m
+++ /dev/null
@@ -1,18 +0,0 @@
-@implementation SomeClass
-- (void)someMethod {
-    enumerateItems(
-        ^(NSInteger section) {
-    });
-}
-
-- (void)someOtherMethod {
-    items.enumerateItems(
-        ^(NSInteger section, NSInteger index, id<NSObject> object, BOOL *stop) {
-        enumerator(index, object, TypeInsert);
-    },
-        nil,
-        some_param
-        );
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50805-issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50805-issue_2724.m
deleted file mode 100644
index 23241732..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50805-issue_2724.m
+++ /dev/null
@@ -1,19 +0,0 @@
-// OC mesg inside array/dictionary
-_sections1 = @[
-    [SectionModel resultsWithContacts:contacts]
-];
-
-_sections2 = @[
-    [[SectionModel mesg] resultsWithContacts1:contacts1],
-    [[SectionModel mesg] resultsWithContacts2:contacts2]
-];
-
-_sections3 = @[[SectionModel resultsWithContacts:contacts]];
-
-@[
-    something
-];
-
-@[
-    [something mesg]
-];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50810-bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50810-bug_841.m
deleted file mode 100644
index 8e8a6713..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50810-bug_841.m
+++ /dev/null
@@ -1,4 +0,0 @@
-- (void)myMethod {
-	NSInteger rowCount = [sectionProvider collectionView:self.collectionView
-	                               numberOfRowsInSection:section];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50811-bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50811-bug_1674.m
deleted file mode 100644
index 7d23b230..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50811-bug_1674.m
+++ /dev/null
@@ -1,4 +0,0 @@
-- (void)test {
-    [test handleOpenURL:url
-      sourceApplication:sourceApplication]
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50812-bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50812-bug_1683.m
deleted file mode 100644
index 3ee562c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50812-bug_1683.m
+++ /dev/null
@@ -1 +0,0 @@
-[mutString addAttributes:@{ NSParagraphStyleAttributeName : style } range:range];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50813-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
deleted file mode 100644
index 65d13399..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
+++ /dev/null
@@ -1,25 +0,0 @@
-@protocol ControllerDelegate <NSObject, Controller>
-@end
-
-@protocol Controller  <NSObject>
-@end
-
-@interface CollectionViewController ()  <DataSource> {
-}
-@end
-
-@interface CollectionViewController (Flow) <FlowDelegate> : NSObject
-{
-	NSDictionary <NSString *, NSString *> dict;
-}
-@end
-
-@interface MyClass : NSObject  <Protocol_A, Protocol_B>
-
-@end
-
-@implementation ViewController
-- (void)someMethod {
-	auto const *dict = [NSMutableDictionary  < NSString *, NSString * > new];
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50814-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
deleted file mode 100644
index be1f49ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
+++ /dev/null
@@ -1,25 +0,0 @@
-@protocol ControllerDelegate <NSObject, Controller>
-@end
-
-@protocol Controller <NSObject>
-@end
-
-@interface CollectionViewController () <DataSource> {
-}
-@end
-
-@interface CollectionViewController (Flow) <FlowDelegate> : NSObject
-{
-	NSDictionary <NSString *, NSString *> dict;
-}
-@end
-
-@interface MyClass : NSObject <Protocol_A, Protocol_B>
-
-@end
-
-@implementation ViewController
-- (void)someMethod {
-	auto const *dict = [NSMutableDictionary  < NSString *, NSString * > new];
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50815-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
deleted file mode 100644
index 1fef0cc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
+++ /dev/null
@@ -1,25 +0,0 @@
-@protocol ControllerDelegate<NSObject, Controller>
-@end
-
-@protocol Controller<NSObject>
-@end
-
-@interface CollectionViewController ()<DataSource> {
-}
-@end
-
-@interface CollectionViewController (Flow)<FlowDelegate> : NSObject
-{
-	NSDictionary <NSString *, NSString *> dict;
-}
-@end
-
-@interface MyClass : NSObject<Protocol_A, Protocol_B>
-
-@end
-
-@implementation ViewController
-- (void)someMethod {
-	auto const *dict = [NSMutableDictionary  < NSString *, NSString * > new];
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50816-issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50816-issue_2675.m
deleted file mode 100644
index ccb80f6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50816-issue_2675.m
+++ /dev/null
@@ -1,66 +0,0 @@
-@interface Example1 : NSObject
-typedef ObjectType0 X;
-typedef ObjectType1 _Nullable (^Handler1)(id<Fragment> fragment);
-typedef ObjectType2 _Nullable (^Handler2)(id<Fragment> fragment);
-@end
-
-@interface Example2 : NSObject
-typedef ObjectType1 _Nullable (^Handler1)(id<Fragment> fragment);
-typedef ObjectType2 _Nullable (^Handler2)(id<Fragment> fragment);
-@end
-
-@interface AnotherExample1 : NSObject
-SOME_MACRO_OPEN
-				- (instancetype)init;
-
-SOME_MACRO_CLOSE
-@end
-
-SOME_MACRO_OPEN
-				@interface AnotherExample2 : NSObject
-SOME_MACRO_CLOSE
-- (instancetype)init;
-
-@end
-
-@interface SomeInterface : NSObject
-
-// Some comment goes here
-@end
-
-@interface YetAnotherExample : NSObject
-
-// What about this comment
-// here
-- (instancetype)init;
-@end
-
-@interface YetOneAnotherExample : NSObject
-
-/// What about this comment
-/// here
-- (instancetype)init;
-@end
-
-@interface YetOneOtherExample : NSObject
-
-/// What about this comment
-/// here
-- (instancetype)init;
-@end
-
-
-@interface YetOneMoreExample : NSObject
-
-/* Different comment pattern */
-- (instancetype)init;
-@end
-
-
-@interface YetOneMoreOtherExample : NSObject
-
-/* Multiline
-   Comments
- */
-- (instancetype)init;
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50817-issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50817-issue_2722.m
deleted file mode 100644
index 8919895a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50817-issue_2722.m
+++ /dev/null
@@ -1,4 +0,0 @@
-// Pointer inside OC message
-[*messageClass.rlock() paramName:argValue];
-[*messageClass1 paramName1:argValue1];
-[*someClass->var sendMessage:@"message"];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50900-1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50900-1927.m
deleted file mode 100644
index 3ae39e47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50900-1927.m
+++ /dev/null
@@ -1,17 +0,0 @@
-- (void) foo:(NSString*) inString
-{
-	@try {
-	} @catch(NSException* const inException)
-	{
-	}
-}
-
-- (void) bar:(NSString*) inString
-{
-	@try {
-	}
-	@catch (NSException* const inException) {
-	}
-	@finally {
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50901-Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50901-Issue_2172.m
deleted file mode 100644
index efa73591..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50901-Issue_2172.m
+++ /dev/null
@@ -1,11 +0,0 @@
-if (YES)
-{
-   NSString *sqlStr = [NSString stringWithFormat:@"INSERT INTO %@ (%@ , %@) VALUES
-                              ('%@','%@')"
-                       , ContactsRemark_Table
-                       , ContactsRemark_FollowId
-                       , ContactsRemark_MarkName
-                       , followId
-                       , markName
-                      ];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50902-Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50902-Issue_2289.m
deleted file mode 100644
index 19fe5cdf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50902-Issue_2289.m
+++ /dev/null
@@ -1,5 +0,0 @@
-+ (void)foo:(bar)block {
-	for (int i = 0; i < 5; i++) @autoreleasepool {
-		// stuff
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50903-Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50903-Issue_681.oc
deleted file mode 100644
index 1e71cdaa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50903-Issue_681.oc
+++ /dev/null
@@ -1,19 +0,0 @@
-int q;
-
-@interface MyClass ()
-@property (nonatomic, weak) UIView someView;
-@property (nonatomic, weak) UIView anotherView;
-
-@end
-
-@implementation MyClass
-- (void)someKindOfFunction
-{
-	some code;
-}
-- (void)anotherOfFunction
-{
-	some code;
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50904-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50904-double_angle_space.m
deleted file mode 100644
index 0e6c0c0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50904-double_angle_space.m
+++ /dev/null
@@ -1,25 +0,0 @@
-static const NSArray< id< NSObject>> **controllers = nil;
-
-NSArray< id< BlockController>> *someMethod();
-
-@interface Fraction : NSObject
-	void Compute(
-		Image< E::Matrix<SType, Dim,1>> const& src,
-		Image<E::Matrix<TType,Dim,1>>& dst);
-@end
-@implementation SomeClass
-- (void)initializeControllers:( NSArray< id< BlockController>> *)hybridContollers {
-	if (index < children.count) {
-		const unsigned int wl = w>>lvl;
-
-		assert(x<0 && y>=3);
-		assert(y <0&&z> 2);
-		assert(a>>1);
-		assert(b >>1);
-
-		return static_cast< id <CKMountable>>(children[index]);
-	}
-
-	NSArray<id< BlockController>> *controllers = hybridContollers;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50905-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50905-double_angle_space.m
deleted file mode 100644
index 9636a38e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50905-double_angle_space.m
+++ /dev/null
@@ -1,25 +0,0 @@
-static const NSArray< id< NSObject> > **controllers = nil;
-
-NSArray< id< BlockController> > *someMethod();
-
-@interface Fraction : NSObject
-	void Compute(
-		Image< E::Matrix<SType, Dim,1> > const& src,
-		Image<E::Matrix<TType,Dim,1> >& dst);
-@end
-@implementation SomeClass
-- (void)initializeControllers:( NSArray< id< BlockController> > *)hybridContollers {
-	if (index < children.count) {
-		const unsigned int wl = w>>lvl;
-
-		assert(x<0 && y>=3);
-		assert(y <0&&z> 2);
-		assert(a>>1);
-		assert(b >>1);
-
-		return static_cast< id <CKMountable> >(children[index]);
-	}
-
-	NSArray<id< BlockController> > *controllers = hybridContollers;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50906-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50906-double_angle_space.m
deleted file mode 100644
index 5c16c25f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50906-double_angle_space.m
+++ /dev/null
@@ -1,25 +0,0 @@
-static const NSArray< id< NSObject> > **controllers = nil;
-
-NSArray< id< BlockController> > *someMethod();
-
-@interface Fraction : NSObject
-	void Compute(
-		Image< E::Matrix<SType, Dim,1> > const& src,
-		Image<E::Matrix<TType,Dim,1> >& dst);
-@end
-@implementation SomeClass
-- (void)initializeControllers:( NSArray< id< BlockController> > *)hybridContollers {
-	if (index < children.count) {
-		const unsigned int wl = w>>lvl;
-
-		assert(x<0 && y>=3);
-		assert(y <0&&z> 2);
-		assert(a>>1);
-		assert(b >>1);
-
-		return static_cast< id <CKMountable>>(children[index]);
-	}
-
-	NSArray<id< BlockController> > *controllers = hybridContollers;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60000-functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60000-functions.pawn
deleted file mode 100644
index 853c70ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60000-functions.pawn
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// prototypes
-forward bar();
-native baz();
-foo();
-
-enum rect { left, top, right, bottom }
-native intersect[rect](src1[rect], src2[rect]);
-
-native getparam(a[], b[], size) = host_getparam;
-
-// function w/o brace
-main()
-{
-    printf("hello\n");
-}
-foo()
-{
-    bar();
-}
-
-stock ts_is_waiting(id)
-{
-    return(ts_get_message(id) == TSMSG_WAITING);
-}
-
-// regular old functions
-baz()
-{
-    do_something();
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60001-comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60001-comment.p
deleted file mode 100644
index f63deb62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60001-comment.p
+++ /dev/null
@@ -1,46 +0,0 @@
-/* parse C comments interactively, using events and a state machine */
-main()
-{
-    state plain;
-}
-@keypressed(key) <plain>
-{
-    state (key == '/') slash;
-    if (key != '/') {
-        echo key;
-    }
-}
-@keypressed(key) <slash>
-{
-    state (key != '/') plain;
-    state (key == '*') comment;
-    echo '/';    /* print '/' held back from previous state */
-    if (key != '/') {
-        echo key;
-    }
-}
-@keypressed(key) <comment>
-{
-    echo key;
-    state (key == '*') star;
-}
-@keypressed(key) <star>
-{
-    echo key;
-    state (key != '*') comment;
-    state (key == '/') plain;
-}
-echo(key) <plain, slash>
-{
-    printchar key, yellow;
-}
-echo(key) <comment, star>
-{
-    printchar key, green;
-}
-printchar(ch, colour)
-{
-    setattr .foreground = colour;
-    printf "%c", ch;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60002-traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60002-traffic.p
deleted file mode 100644
index a902e497..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60002-traffic.p
+++ /dev/null
@@ -1,52 +0,0 @@
-/* traffic light synchronizer, using states in an event-driven model */
-#include <time>
-main()
-{
-    state green_wait;
-}
-@keypressed(key) <green_wait>
-{
-    state yellow_wait;
-}
-@keypressed(key) <red_walk, red_wait>
-{
-    state red_walk;
-}
-@keypressed(key) <>
-{
-}                                        /* fallback */
-@timer()         <yellow_wait>
-{
-    state red_walk;
-}
-@timer()         <red_walk>
-{
-    state red_wait;
-}
-@timer()         <red_wait>
-{
-    state green_wait;
-}
-@timer()         <>
-{
-}                                        /* fallback */
-entry() <green_wait>
-{
-    print "Green / Don't walk\n";
-}
-entry() <yellow_wait>
-{
-    print "Yellow / Don't walk\n";
-    settimer 2000;
-}
-entry() <red_walk>
-{
-    print "Red / Walk\n";
-    settimer 5000;
-}
-entry() <red_wait>
-{
-    print "Red / Don't walk\n";
-    settimer 2000;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60003-tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60003-tags.pawn
deleted file mode 100644
index 038101c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60003-tags.pawn
+++ /dev/null
@@ -1,69 +0,0 @@
-
-enum token
-{
-    t_type,
-    Rational:t_value,
-    t_word[20],
-}
-
-
-new bool:flag = true;     /* "flag" can only hold "true" or "false" */
-const error:success = 0;
-const error:fatal= 1;
-const error:nonfatal = 2;
-error:errno = fatal;
-
-native printf(const format[], { Float, _ }: ...);
-
-new Float:chance_to_avoid = (p_resists[id][RESISTIDX_FIRE] >= RESIST_MAX_VALUE) ?
-                            1.00 : (float ( p_resists[id][RESISTIDX_FIRE] ) / float ( RESIST_MAX_VALUE ));
-
-xplevel_lev[j] = XP_PER_LEVEL_BASE_LT + ( (j - 10) * XP_PER_LEVEL_LT) +
-                 floatround ( float ( j / 20 ) * XP_PER_LEVEL_LT );
-
-
-main()
-{
-    new Float:xpos;
-    new Float:ypos;
-
-    new apple:elstar;    /* variable "elstar" with tag "apple" */
-    new orange:valencia; /* variable "valencia" with tag "orange" */
-    new x;               /* untagged variable "x" */
-    elstar = valencia;   /* tag mismatch */
-    elstar = x;          /* tag mismatch */
-    x = valencia;        /* ok */
-
-    new Float:chance_to_avoid = (p_resists[id][RESISTIDX_FIRE] >= RESIST_MAX_VALUE) ?
-                                1.00 : (float( p_resists[id][RESISTIDX_FIRE] ) / float( RESIST_MAX_VALUE ));
-
-    xplevel_lev[j] = XP_PER_LEVEL_BASE_LT + ( (j - 10) * XP_PER_LEVEL_LT) +
-                     floatround( float( j / 20 ) * XP_PER_LEVEL_LT );
-
-    if (apple:valencia < elstar) {
-        valencia = orange:elstar;
-    }
-
-some_label: // target for a goto
-    #pragma rational Float
-
-    new Float:limit = -5.0;
-    new Float:value = -1.0;
-    if (value < limit) {
-        printf("Value %f below limit %f\n", _:value, _:limit);
-    } else {
-        printf("Value above limit\n");
-    }
-    goto some_label;
-}
-
-foo()
-{
-    if (ape) {
-        dofunc(1);
-    } else if (monkey) {
-        dofunc(2);
-    } else {
-        dofunc(3);
-    }
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60004-enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60004-enum.pawn
deleted file mode 100644
index c2bc8b62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60004-enum.pawn
+++ /dev/null
@@ -1,91 +0,0 @@
-
-enum rect { left, top, right, bottom }
-
-enum boot (<<= 1) { a=1, b, c, d }
-
-enum booty (<<= 1)
-{
-    a=1, b, c, d
-}
-
-forward addvector(a[], const b[], size);
-
-enum message {
-    text[40 char],
-    priority
-}
-
-enum token
-{
-    t_type,
-    Rational:t_value,
-    t_word[20],
-}
-
-new bool:flag = true;
-
-increment(&value, incr=1)
-{
-    value += incr;
-}
-
-new msg[message] = { !"My Text", 1 };
-main()
-{
-    new my_rect[rect];
-
-    my_rect[left] = 10;
-    my_rect[right] = 100;
-    my_rect[top] = 10;
-    my_rect[bottom] = 100;
-
-    for (new i = 0; rect:i < rect; i++) {
-        my_rect[rect:i] *= 2;
-    }
-
-    new vect[3] = { 1, 2, 3 };
-    addvector(vect, { 5, 5, 5 }, 3);
-
-    new Float:xpos;
-    new Float:ypos;
-
-    new a = 5;
-    increment(a);
-    increment(a, _);
-    increment(a, 1);
-}
-
-sum(a, b)
-{
-    return a + b;
-}
-
-power(x, y)
-{
-    /* returns x raised to the power of y */
-    assert y >= 0;
-    new r = 1;
-    for (new i = 0; i < y; i++) {
-        r *= x;
-    }
-    return r;
-}
-
-addvector(a[], const b[], size)
-{
-    for (new i = 0; i < size; i++) {
-        a[i] += b[i];
-    }
-}
-
-stock remove_filepath(szFilePath[], szFile[], pMax)
-{
-    new len = strlen(szFilePath);
-
-    while ((--len >= 0) && (szFilePath[len] != '/') &&
-           (szFilePath[len] != '\'')) { }
-
-    copy(szFile, pMax, szFilePath[len + 1]);
-
-    return;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60005-unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60005-unbraced.p
deleted file mode 100644
index 1a22a3af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60005-unbraced.p
+++ /dev/null
@@ -1,15 +0,0 @@
-
-public eBombPickUp(id)
-{
-    if (BombPickUp) {
-        announceEvent(id, "PICKED_BOMB");
-    }
-}
-
-stock Float:operator-(Float:oper)
-{
-    return oper ^ Float:((-1) ^ ((-1) / 2)); /* IEEE values are sign/magnitude */
-}
-
-native Float:floatadd( Float:dividend, Float:divisor );
-native Result:dbi_query( Sql:_sql, _query[], { Float, _ }: ... );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60010-str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60010-str-escape.p
deleted file mode 100644
index 3aa54453..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60010-str-escape.p
+++ /dev/null
@@ -1,6 +0,0 @@
-main()
-{
-    printf "This is a testof the ^" alternate escape char, value 0x5e";
-    printf "If ^" it doesn't work, there ^"should be some errors";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60020-switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60020-switch-vsemi.sma
deleted file mode 100644
index a0c720f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60020-switch-vsemi.sma
+++ /dev/null
@@ -1,16 +0,0 @@
-public plugin_init()

-{

-    new i=5;

-

-    switch(i) {

-    case 3: return false;

-    case 5:

-    {

-        i = 6;

-        return true;

-    }

-    default: {

-        return true;

-    }

-    }

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60030-crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60030-crusty_ex-1.sma
deleted file mode 100644
index 23e042dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60030-crusty_ex-1.sma
+++ /dev/null
@@ -1,28 +0,0 @@
-public hudtext16(textblock[], colr, colg, colb, posx, posy, screen, time, id)
-{
-	new y;
-	if (contain(textblock, "^n") == -1) // if there is no linebreak in the text, we can just show it as it is
-	{
-		set_hudmessage(colr, colg, colb, float(posx) / 1000.0, float(posy) / 1000.0, 0, 6.0, float(time), 0.2, 0.2, screen);
-		show_hudmessage(id, textblock);
-	}
-	else                                // more than one line
-	{
-		new out[128], rowcounter = 0, tmp[512], textremain = true; y = screen;
-
-		new i = contain(textblock, "^n");
-
-		do
-		{
-		}
-		while (textremain > 0);
-
-		copy(out, i, textblock);    // we need to get the first line of text before the loop
-
-		do
-		{
-		}
-		while (textremain);
-	}
-	return screen - y;              // we will return how many screens of text we printed
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60040-preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60040-preproc.pawn
deleted file mode 100644
index 6df8101f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60040-preproc.pawn
+++ /dev/null
@@ -1,7 +0,0 @@
-#define SetTeleType(%1,%2)	set_pev(%1, pev_iuser1, %2)
-#define SetTeleMate(%1,%2)	set_pev(%1, pev_iuser2, %2*7)
-
-#define x(%0,%1) \
-	y(%1, %0)
-
-#emit CONST.pri 1911
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60050-gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60050-gh419.pawn
deleted file mode 100644
index 9db7b08f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60050-gh419.pawn
+++ /dev/null
@@ -1,8 +0,0 @@
-#if AMXX_VERSION_NUM < 183
-public client_disconnect( player_id )
-#else
-public client_disconnected( player_id )
-#endif
-{
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60100-Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60100-Issue_2586.pawn
deleted file mode 100644
index d93360ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60100-Issue_2586.pawn
+++ /dev/null
@@ -1,4 +0,0 @@
-static stock const data[][] = {
-    {0b00000011001111000010011100000000, 0b00000011001111000010011100000000},
-    {0b00000011001111000010011100000000, 0b00000011001111000010011100000000}
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02400-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02400-mysql.sqc
deleted file mode 100644
index ec8ad604..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02400-mysql.sqc
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-/*----------------------------------------------------------------*/
-EXEC SQL INCLUDE SQLCA;
-short sqlcode;
-
-EXEC SQL BEGIN DECLARE SECTION;
-   int host_a;
-   double host_b;
-   char host_c;
-EXEC SQL END DECLARE SECTION;
-
-EXEC SQL DECLARE csr1 CURSOR FOR
-   SELECT a, b, c
-   FROM table1
-   WHERE x = :hostvar1;
-
-/* dollar sign notation */
-$ DECLARE cursorName CURSOR for
-   SELECT
-   a,
-   b
-   INTO
-   $struct->a,
-   $struct->b
-   FROM table;
-
-/*----------------------------------------------------------------*/
-void main(void)
-{
-   hostvar1 = 42;
-
-   EXEC SQL OPEN csr1;
-   if (sqlcode < 0)
-   {
-      exit(0);
-   }
-
-   while (rc >= 0 && rc != 100)
-   {
-      EXEC SQL FETCH csr1 INTO :host_a, :host_b, :host_c;
-      printf("Fetch %d, %lf, %s\n", host_a, host_b, host_c);
-   }
-
-   EXEC SQL CLOSE csr1;
-}
-
-void foo(void)
-{
-   strcpy(demoquery1, "some SQL statement");
-   EXEC SQL prepare demo3id from :demoquery1;
-   /* a comment */
-   EXEC SQL declare demo3cursor cursor for demo3id;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02401-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02401-sta-select.sqc
deleted file mode 100644
index 1142c3b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02401-sta-select.sqc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************
-**
-** A sample program that demonstrates the use of Static embedded SQL.
-** Before compiling this program, be sure you have created a table
-** called video and inserted some tuples in it.
-**
-********************************************************/
-#include <stdio.h>
-
-/* sqlca: is the sql communications area. All error codes
- * are returned from db2 in that structure which is filled
- * each time an interaction with db2 takes place.
- */
-
-EXEC SQL INCLUDE SQLCA;          /* SQL communication area structure */
-
-EXEC SQL BEGIN DECLARE SECTION;  /* declare host variables    */
-   char db_name[8];              /* database name             */
-   char video_title[30];         /* title of the video        */
-   short video_id;               /* serial number             */
-   char director[20];            /* director name             */
-EXEC SQL END DECLARE SECTION;
-
-/* These lines are redundant here because the default
- * action is to continue. They just show the kind of
- * errors that could arise and one way to control them.
- */
-
-EXEC SQL WHENEVER SQLWARNING CONTINUE;  /* sqlca.sqlcode > 0    */
-EXEC SQL WHENEVER SQLERROR CONTINUE;    /* sqlca.sqlcode < 0    */
-EXEC SQL WHENEVER NOT FOUND CONTINUE;   /* sqlca.sqlcode = 100  */
-                                        /* sqlca.sqlcode = 0 (no error) */
-
-void main()
-{
-   strcpy(db_name, "csc343h");
-
-/* C variables are preceded by a colon when they are passed to DB2 */
-
-   EXEC SQL CONNECT TO :db_name;
-
-   if (sqlca.sqlcode != 0)
-   {
-      printf("Connect failed!: reason %ld\n", sqlca.sqlcode);
-      exit(1);
-   }
-
-/* cursor delcaration. Have to declare a cursor each time you
- * want tuples back from db2
- */
-
-   EXEC SQL DECLARE c1 CURSOR FOR
-      SELECT video_title
-      FROM video;
-
-/* you have to open the cursor in order to get tuples back */
-
-   EXEC SQL OPEN c1;
-
-   do
-   {
-      /* fetch tuples from the cursor. This will execute the statement
-       * the cursor implements and will return the results */
-
-      EXEC SQL FETCH c1 into :video_title;
-      if (SQLCODE != 0)
-      {
-         break;                 /* SQLCODE refers to sqlca.sqlcode */
-      }
-      /* host variables should have ':' prefix when they are used in DB2 commands */
-
-      printf("%s\n", video_title);
-   } while (1);
-   EXEC SQL CLOSE c1;
-   EXEC SQL CONNECT RESET;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02402-issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02402-issue_527.sqc
deleted file mode 100644
index 17ccfa3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02402-issue_527.sqc
+++ /dev/null
@@ -1,18 +0,0 @@
-void myfunc1()

-{

-    EXEC SQL create or replace

-        function my_func (in_str IN varchar2)

-        return date

-        IS

-        x date;

-    BEGIN

-    IF in_str IS NULL THEN

-        x := NULL;

-    ELSIF substr

-        (in_str, 5,  1) = '-' THEN

-                          x := to_date(in_str, 'YYYY-MM-DD HH24:MI:SS');

-    END IF;

-    return x;

-    END my_func;

-    END-EXEC;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21000-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21000-mysql.sqc
deleted file mode 100644
index f8b6004e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21000-mysql.sqc
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-/*----------------------------------------------------------------*/
-EXEC SQL INCLUDE SQLCA;
-short sqlcode;
-
-EXEC SQL BEGIN DECLARE SECTION;
-   int host_a;
-   double host_b;
-   char host_c;
-EXEC SQL END DECLARE SECTION;
-
-EXEC SQL DECLARE csr1 CURSOR FOR
-   SELECT a, b, c
-   FROM table1
-   WHERE x = :hostvar1;
-
-/*----------------------------------------------------------------*/
-void main(void)
-{
-   hostvar1 = 42;
-
-   EXEC SQL OPEN csr1;
-   if (sqlcode < 0)
-   {
-      exit(0);
-   }
-
-   while (rc >= 0 && rc != 100)
-   {
-      EXEC SQL FETCH csr1 INTO :host_a, :host_b, :host_c;
-      printf("Fetch %d, %lf, %s\n", host_a, host_b, host_c);
-   }
-
-   EXEC SQL CLOSE csr1;
-}
-
-void foo(void)
-{
-   strcpy(demoquery1, "some SQL statement");
-   EXEC SQL prepare demo3id from :demoquery1;
-   /* a comment */
-   EXEC SQL declare demo3cursor cursor for demo3id;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21001-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21001-sta-select.sqc
deleted file mode 100644
index 1142c3b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21001-sta-select.sqc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************
-**
-** A sample program that demonstrates the use of Static embedded SQL.
-** Before compiling this program, be sure you have created a table
-** called video and inserted some tuples in it.
-**
-********************************************************/
-#include <stdio.h>
-
-/* sqlca: is the sql communications area. All error codes
- * are returned from db2 in that structure which is filled
- * each time an interaction with db2 takes place.
- */
-
-EXEC SQL INCLUDE SQLCA;          /* SQL communication area structure */
-
-EXEC SQL BEGIN DECLARE SECTION;  /* declare host variables    */
-   char db_name[8];              /* database name             */
-   char video_title[30];         /* title of the video        */
-   short video_id;               /* serial number             */
-   char director[20];            /* director name             */
-EXEC SQL END DECLARE SECTION;
-
-/* These lines are redundant here because the default
- * action is to continue. They just show the kind of
- * errors that could arise and one way to control them.
- */
-
-EXEC SQL WHENEVER SQLWARNING CONTINUE;  /* sqlca.sqlcode > 0    */
-EXEC SQL WHENEVER SQLERROR CONTINUE;    /* sqlca.sqlcode < 0    */
-EXEC SQL WHENEVER NOT FOUND CONTINUE;   /* sqlca.sqlcode = 100  */
-                                        /* sqlca.sqlcode = 0 (no error) */
-
-void main()
-{
-   strcpy(db_name, "csc343h");
-
-/* C variables are preceded by a colon when they are passed to DB2 */
-
-   EXEC SQL CONNECT TO :db_name;
-
-   if (sqlca.sqlcode != 0)
-   {
-      printf("Connect failed!: reason %ld\n", sqlca.sqlcode);
-      exit(1);
-   }
-
-/* cursor delcaration. Have to declare a cursor each time you
- * want tuples back from db2
- */
-
-   EXEC SQL DECLARE c1 CURSOR FOR
-      SELECT video_title
-      FROM video;
-
-/* you have to open the cursor in order to get tuples back */
-
-   EXEC SQL OPEN c1;
-
-   do
-   {
-      /* fetch tuples from the cursor. This will execute the statement
-       * the cursor implements and will return the results */
-
-      EXEC SQL FETCH c1 into :video_title;
-      if (SQLCODE != 0)
-      {
-         break;                 /* SQLCODE refers to sqlca.sqlcode */
-      }
-      /* host variables should have ':' prefix when they are used in DB2 commands */
-
-      printf("%s\n", video_title);
-   } while (1);
-   EXEC SQL CLOSE c1;
-   EXEC SQL CONNECT RESET;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70000-list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70000-list.vala
deleted file mode 100644
index 1893dcb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70000-list.vala
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-using GLib;
-
-public class GListTest : Object
-{
-   public GListTest { }
-
-   static int main(string[] args)
-   {
-      List<string> list;
-      list.append("TestString1");
-      list.append("myTest");
-      message("list.length()=%d", list.length());
-
-      for (int i = 0; i < list.length(); i++)
-      {
-         string list2 = list.nth_data(i);
-         message("%s", list2);
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70001-advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70001-advanced.vala
deleted file mode 100644
index ca88a821..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70001-advanced.vala
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Advanced Vala Sample Code */
-using GLib;
-public class Sample : Object {
-   public string name { get; set; }
-   public signal void foo();
-   public Sample (construct string !name)
-   {
-   }
-   public void run()
-   {
-      foo += s => {
-         stdout.printf("Lambda expression %s!\n", name);
-      }
-
-      /* Calling lambda expression */
-      foo();
-   }
-   static int main(string[] args)
-   {
-      foreach (string arg in args)
-      {
-         var sample = new Sample(arg);
-         sample.run();
-         /* Object will automatically be freed
-          * at the end of the block */
-      }
-      return(0);
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70010-verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70010-verbatim_str.vala
deleted file mode 100644
index fb0824ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70010-verbatim_str.vala
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Advanced Vala Sample Code */
-using GLib;
-public class Sample : Object {
-   public string name { get; set; }
-   public signal void foo();
-   public Sample (construct string !name)
-   {
-   }
-   public void run()
-   {
-      foo += s => {
-         stdout.printf("Lambda expression %s!\n", name);
-      }
-
-      /* Calling lambda expression */
-      foo();
-   }
-   static int main(string[] args)
-   {
-      string sql   = """ SELECT name "my_name" 
-                        FROM table
-                        WHERE id='4'
-                  """;
-      var    where = """ WHERE name LIKE '%blah% 
-         """;
-
-      foreach (string arg in args)
-      {
-         var sample = new Sample(arg);
-         sample.run();
-         /* Object will automatically be freed
-          * at the end of the block */
-      }
-      return(0);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70011-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70011-verbatim_str2.vala
deleted file mode 100644
index c607d7b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70011-verbatim_str2.vala
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Advanced Vala Sample Code */
-using GLib;
-public class Sample : Object {
-   public string name { get; set; }
-   public signal void foo();
-   public Sample (construct string !name)
-   {
-   }
-   public void run()
-   {
-      foo += s => {
-         stdout.printf("Lambda expression %s!\n", name);
-      }
-
-      /* Calling lambda expression */
-      foo();
-   }
-   static int main(string[] args)
-   {
-      string sql   = """SELECT name	"my_name"
-	FROM table
-	WHERE id='4'
-""";
-      var    where = """ WHERE name LIKE '%blah%
-	"""     ;
-
-      foreach (string arg in args)
-      {
-         var sample = new Sample(arg);
-         sample.run();
-         /* Object will automatically be freed
-          * at the end of the block
-          * a	tab	b
-          * c	tab	d
-          */
-      }
-      return(0);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70012-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70012-verbatim_str2.vala
deleted file mode 100644
index c253b86b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70012-verbatim_str2.vala
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Advanced Vala Sample Code */
-using GLib;
-public class Sample : Object {
-   public string name { get; set; }
-   public signal void foo();
-   public Sample (construct string !name)
-   {
-   }
-   public void run()
-   {
-      foo += s => {
-         stdout.printf("Lambda expression %s!\n", name);
-      }
-
-      /* Calling lambda expression */
-      foo();
-   }
-   static int main(string[] args)
-   {
-      string sql   = """SELECT name	"my_name"
-	FROM table
-	WHERE id='4'
-""";
-      var    where = """ WHERE name LIKE '%blah%
-	""";
-
-      foreach (string arg in args)
-      {
-         var sample = new Sample(arg);
-         sample.run();
-         /* Object will automatically be freed
-          * at the end of the block
-          * a   tab     b
-          * c   tab     d
-          */
-      }
-      return(0);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70020-preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70020-preproc.vala
deleted file mode 100644
index 9cc1ba1a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70020-preproc.vala
+++ /dev/null
@@ -1,12 +0,0 @@
-int main()
-{
-#if WANT_TO_COMPILE_THIS
-   gtkwidget.clicked.connect((widdget) => { message("Clicked");
-                             });
-#else
-   gtkwidget.enabled.connect((widdget) => {
-      message("Clicked");
-   });
-#endif
-   return(0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70287-gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70287-gh287.vala
deleted file mode 100644
index be39a9db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70287-gh287.vala
+++ /dev/null
@@ -1,40 +0,0 @@
-int main()
-{
-   key_press_event.connect((e) => {
-      switch (e.keyval)
-      {
-      case Gdk.Key.@0:
-         if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0)
-         {
-            action_zoom_default_font();
-            return(true);
-         }
-
-         break;
-
-      case Gdk.Key.@1:           //alt+[1-8]
-      case Gdk.Key.@7:
-      case Gdk.Key.@8:
-         if (((e.state & Gdk.ModifierType.MOD1_MASK) != 0) && settings.alt_changes_tab)
-         {
-            var i = e.keyval - 49;
-            if (i > notebook.n_tabs - 1)
-            {
-               return(false);
-            }
-
-            notebook.current = notebook.get_tab_by_index((int)i);
-            return(true);
-         }
-
-         break;
-
-      default:
-         assert_not_reached();
-      }
-
-      return(false);
-   });
-
-   return(0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70300-Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70300-Issue_2090.vala
deleted file mode 100644
index 5b4e1716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70300-Issue_2090.vala
+++ /dev/null
@@ -1 +0,0 @@
-int ? some_int = null;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70301-Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70301-Issue_2270.vala
deleted file mode 100644
index 2202627c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70301-Issue_2270.vala
+++ /dev/null
@@ -1 +0,0 @@
-new Gtk.Label (_ ("Label text"));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/fixtest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/fixtest.sh
deleted file mode 100755
index 76fac4bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/fixtest.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# $Id: difftest.sh 798 2007-07-24 16:01:09Z bengardner $
-#
-# Copies the files for a test from results/ to output/
-#
-
-if [ -z "$1" ] ; then
-    fn=$(basename $0)
-    echo "Usage: $fn TEST [...]"
-    echo
-    echo "  TEST : the test number pattern, may contain wildcards"
-    echo "         You can put multiple test numbers on the command line"
-    echo
-    echo "The script will find all matching tests in the results folder and copy them"
-    echo "into the output folder."
-    echo
-    echo "Examples:"
-    echo "$fn 30014        # copy test 30014"
-    echo "$fn 30014 00110  # copy tests 30014 and 00110"
-    echo "$fn '*'          # copy all tests"
-    exit 1
-fi
-
-while [ -n "$1" ] ; do
-    # Use '*' as the pattern if one wasn't defined
-    patt=$1
-    path="results"
-
-    # Find the tests that match, remove the .svn folders
-    files=$(find $path -name "$patt-*" -type f | sed "/\.svn/d")
-
-    did1=''
-    for t in $files ; do
-        other=$(echo $t | sed "s/^results/output/")
-        echo "cp $t $other"
-        cp $t $other
-    done
-
-    shift 1
-done
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/imported.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/imported.test
deleted file mode 100644
index b20f0247..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/imported.test
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file contains tests examples we copied from other distributions.
-#
-#
-# this suite is not an ordinary language test suite.
-#
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/1225.c
deleted file mode 100644
index c6533cb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/1225.c
+++ /dev/null
@@ -1,6 +0,0 @@
-float ign_guy(){}
-a alig_guy(){}
-int align_guy(){}
-unsigned int align_here();
-int this_works(int x);
-int bug(int);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue-2278.c
deleted file mode 100644
index 1ecfecf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue-2278.c
+++ /dev/null
@@ -1,10 +0,0 @@
-typedef int LIST_tzHEAD;
-typedef int tucBOOL;
-struct LIST_zNODE { int a; int b;};
-struct LIST_zzzDATA { int a; int b;};
-
-int foo1( LIST_tzHEAD *pList,
-         tucBOOL ( *pFn )( struct LIST_zNODE *pNode,
-                             struct LIST_zzzDATA *pListData,
-                               void *arg1 ),
-        void *arg2 );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2279.c
deleted file mode 100644
index 88c0ae84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2279.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/*| AG_DECLARE() |*/
-/* *INDENT-OFF* */
-static int x;
-/* *INDENT-ON* */
-/*| END |*/
-
-static FILE     *ramfp    = NULL;
-static FILE     *dbgfp    = NULL;
-static xxxXXXXX *pLockXXX = NULL;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2360.c
deleted file mode 100644
index dd4530c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2360.c
+++ /dev/null
@@ -1,39 +0,0 @@
-int short_function();
-int some_very_very_very_very_very_very_very_very_long_function();
-int main() {
-    // short condition, no existing newlines
-    if (short_function()) {}
-
-    // short condition, existing newlines
-    if (
-        short_function()
-        ) {}
-
-    // long condition, no newlines
-    if (some_very_very_very_very_very_very_very_very_long_function() &&
-        some_very_very_very_very_very_very_very_very_long_function()) {}
-
-    // long condition, newlines
-    else if (
-            some_very_very_very_very_very_very_very_very_long_function() &&
-            some_very_very_very_very_very_very_very_very_long_function()
-            ) {}
-
-    // switch condition
-    switch (some_very_very_very_very_very_very_very_very_long_function() &&
-        some_very_very_very_very_very_very_very_very_long_function()) {
-    case default: break;
-    }
-
-    // while condition, line comments
-    while (
-        // comment 1
-        short_function()
-        // comment 2
-        ) {}
-
-    // for condition, inline comments
-    for ( /* a */ int i=0; some_very_very_very_very_very_very_very_very_long_function()
-    && some_very_very_very_very_very_very_very_very_long_function() && i < 10; i++ // trailing comment
-    ){}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2411.c
deleted file mode 100644
index 40244488..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2411.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo() {
-	/*
-		hello world
-	*/
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2640.c
deleted file mode 100644
index ba25bcbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2640.c
+++ /dev/null
@@ -1,12 +0,0 @@
-struct Struct
-{
-	void test1(int* x)
-	{
-		*x = 1;
-	}
-};
-
-void test2(int* x)
-{
-	*x = 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2845.h
deleted file mode 100644
index 9f34b1dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2845.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef   __PACKED_STRUCT
-  #define __PACKED_STRUCT                        __packed struct
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/add_long_comment.c
deleted file mode 100644
index 5900de52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/add_long_comment.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * trailing comments are added at 8 newlines in this test.
- *
- *
- */
-void short_function(void)
-{
-   /* this is a 'short' function, so no added comment */
-}
-
-void long_function(void)
-{
-   /* this is a 'long' function, so a comment is added */
-   switch (some_int_value())
-   {
-   case 0:
-      handle_zero();
-      break;
-
-   case 50:
-      handle_fifty();
-      break;
-
-   case 127:
-      handle_another_value();
-      break;
-
-   default:
-      boy_do_i_lack_imagination();
-      break;
-   }
-
-   /* call one last function... */
-   one_last_func_call();
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-equ.c
deleted file mode 100644
index 374ccbfb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-equ.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// note - set threshold to three
-void foo(void)
-{
-   a = 1;
-   bb = 2;
-   ccc = 3;
-   dddd = 4;
-   eeeee = 5;
-   ffffff = 6;
-
-
-
-   a = 1;
-   eeeeee = 5;
-   fffffff = 6;
-
-
-
-   a = 1;
-   eeeee = 5;
-   ccc = 3;
-   ffffff = 6;
-
-
-   a = 1;
-   iiiiiiiiiiiiieeeee = 5;
-   ccc = 3;
-   ffffff = 6;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto-vars.c
deleted file mode 100644
index e1dd71ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto-vars.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int doStuff(int   i,
-            float f );
-
-int doStuff(int i,
-      float f );
-
-
-MACRO_MODIFIER int doStuff(int   i,
-                 float f );
-
-typedef void (*my_callback)(int id,
-void *context);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto.c
deleted file mode 100644
index 64dfce00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto.c
+++ /dev/null
@@ -1,4 +0,0 @@
-unsigned int align_here();
-int this_works(int x);
-int bug(int); // BUG: left-aligned
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-string.c
deleted file mode 100644
index f652e88f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-string.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// note - set threshold to three
-void foo(void)
-{
-   printf("This is the first line\n"
-     "And this is the second.\n");
-
-   fprintf(stderr, "This is the first line\n"
-     "And this is the second.\n");
-
-   fprintf(stderr, "Format string: %s", "This is the first line\n"
-     "And this is the second.\n");
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-struct-init.c
deleted file mode 100644
index 084994ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-struct-init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-
-const char *token_names[] =
-{
-   [CT_POUND] = "POUND",
-   [CT_PREPROC] = "PREPROC",
-   [CT_PREPROC_BODY] = "PREPROC_BODY",
-   [CT_PP] = "PP",
-   [CT_ELIPSIS]  = "ELIPSIS",
-   [CT_NAMESPACE]= "NAMESPACE",
-   [CT_NEW]  = "NEW",
-   [CT_OPERATOR] = "OPERATOR",
-   [CT_THROW]  = "THROW",
-   [CT_TRY]   = "TRY",
-   [CT_USING]   = "USING",
-   [CT_PAREN_OPEN] = "PAREN_OPEN",
-};
-
-
-int main(int argc, char *argv[])
-{
-   struct junk a[] = {
-      { "version", 0, 0, 0},
-      {"file", 1, 150, 'f'},
-      {"config", 1, 0, 'c'},
-   {"parsed", 25, 0, 'p'},
-      { NULL, 0, 0, 0}
-   };
-}
-
- color_t colors[] = {
-    {"red",{255,0,0}},{"blue",{0,255,0}},
-    {"green",{0,0,255}},{"purple",{255,255,0}},
- };
-
- struct foo_t bar = {
-    .name = "bar",
- .age  = 21
-};
-
-
-
-struct foo_t bars[] = {
-    [0] = { .name = "bar",
-        .age    = 21 },
-   [1] = { .name = "barley",
-         .age = 55 },
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-typedef.c
deleted file mode 100644
index ae17eb4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-typedef.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-typedef int MY_INT;
-typedef int * MY_INTP;
-typedef int(*foo_t)(void *bar);
-typedef int(*somefunc_t)(void *barstool);
-typedef int int8_t __attribute__((__mode__(__QI__)));
-typedef int uint8_t;
-typedef struct _IDirectFBSurface         IDirectFBSurface;
-typedef struct _IDirectFBPalette         IDirectFBPalette;
-typedef struct timezone *__restrict   __timezone_ptr_t;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-var.c
deleted file mode 100644
index adbf8a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-var.c
+++ /dev/null
@@ -1,52 +0,0 @@
-struct foo1 {
- unsigned int d_ino;
- const char *d_reclen;
- unsigned short d_namlen;
- char d_name[1];
-};
-
-struct foo2
-{
- unsigned int a : 1;
- unsigned int bcd : 3;
- unsigned int ef : 2;
- unsigned int  : 2;
-
- unsigned short more;
-
- int fields;
-};
-
-typedef struct {
-bitfld a : 8;
-bitfld b : 16;
-bitfld : 8;
-} type_t;
-
-struct foo { int a; char *b };
-
-static   int idx;
-static   const char **tmp;
-
-static   char buf[64];
-static unsigned long how_long;
-// comment
-static   int **tmp;
-static   char buf[64];
-
-
-void bar(int someval,
-         void *puser,
-         const char *filename,
-         struct willy *the_list,
-         int list_len)
-{
-   int idx;
-   const char **tmp;
-   char buf[64];
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_attr.c
deleted file mode 100644
index 0f4cfee1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_attr.c
+++ /dev/null
@@ -1,4 +0,0 @@
-
-char test[3] _PREPROCESSOR_SOMETHING;
-int numberThatIsReallyCool _PREPROCESSOR_SOMETHING;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_keep_extra.c
deleted file mode 100644
index 2bc0f532..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_keep_extra.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void f()
-{
-    int    x= 3;
-    int b     = 4;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_418.c
deleted file mode 100644
index 421b9547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_418.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char const *argv[])
-{
-    align_prams( param1 + param1, param2, param3 );
-
-
-    align_prams( p4, p5, p6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_419.c
deleted file mode 100644
index 421b9547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_419.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char const *argv[])
-{
-    align_prams( param1 + param1, param2, param3 );
-
-
-    align_prams( p4, p5, p6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_416.c
deleted file mode 100644
index f4f6606e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_416.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main(int argc, char const *argv[])
-{
-    align_prams( param1 + longParamToWhichLargeIndentToAlignFor, param2, param3 );
-    align_prams( p4, p5, p6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_417.c
deleted file mode 100644
index c3c881eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_417.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main(int argc, char const *argv[])
-{
-    align_prams( param1 + longParamToWhichLargeIndentToAlignFor, param2, param3 );
-    align_prams( p4, p5, p6 );   
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_stack.c
deleted file mode 100644
index 0f88df06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_stack.c
+++ /dev/null
@@ -1,5 +0,0 @@
-static int idx;
-static const char **tmp;
-
-static int** tmp;
-static char buf[64];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/asm.c
deleted file mode 100644
index 1fb5015c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/asm.c
+++ /dev/null
@@ -1,9 +0,0 @@
-void foo(void)
-{
-		asm __volatile__ (
-			"subl %2,%0\n\t"
-			"sbbl %3,%1"
-			:"=a" (l), "=d" (h)
-			:"g" (sl), "g" (sh),
-			"0" (l), "1" (h));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/attribute.c
deleted file mode 100644
index babe229f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/attribute.c
+++ /dev/null
@@ -1,4 +0,0 @@
-__attribute__((visibility("default")))    int* i;
-__attribute__((visibility("default")))    FooString* i;
-
-#define DEFINE_NOTIFICATION(name) extern "C" __attribute__((visibility ("default")))    FooString*  const name = #name;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/backslash-newline-lex.c
deleted file mode 100644
index 0f20388c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/backslash-newline-lex.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void f () { g ("\
-");
-  g ("\n", stdout);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/beautifier-off.c
deleted file mode 100644
index 033179cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/beautifier-off.c
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + bar2), bar3, bar4);
-
-/* *INDENT-OFF* */
-   int foo[] = {
-      1,   3,   5,
-      3,   5,   7,
-      5,   7,   9,
-   };
-/* *INDENT-ON* */
-
-#define multilinemacro do { (x+5); } while (0); \
-printf("a multilinemacro"); \
-printf("a multilinemacro2");
-
-int main(int argc, char *argv[])
-{
-/* *INDENT-OFF* */
-
-   int a, b;
-a = 1; // stupid comment \
-b = 2;
-
-/* *INDENT-ON* */
-return(a+b);
-}
-
-/* *INDENT-OFF* */
-int a;
-/* *INDENT-ON* */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bits.c
deleted file mode 100644
index 9a12f484..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bits.c
+++ /dev/null
@@ -1,7 +0,0 @@
-struct foo {
-  unsigned long bar;
-  u_int ndots : 4,
-nsort: 4,
-: 0; 
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bool-pos.c
deleted file mode 100644
index d6887223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bool-pos.c
+++ /dev/null
@@ -1,61 +0,0 @@
-void foo(void)
-{
-   if ((a != 0) &&
-       (b == 0) &&
-       (c < 0) && (d > 0))
-   {
-      printf("hi");
-   }
-
-   if (flag1
-#ifdef FLAG2
-       || flag2
-#endif
-       )
-   {
-      printf("yar");
-   }
-
-   if (flag1 &&
-#ifdef FLAG2
-       flag2 &&
-#endif
-       flag3)
-   {
-      printf("bo");
-   }
-
-   if ((a != 0)
-       && (b == 0)
-       && (c < 0))
-   {
-      printf("hi");
-   }
-
-   if ((a != 0)
-       &&
-       (b == 0)
-       &&
-       (c < 0))
-   {
-      printf("hi");
-   }
-
-   if (!this -> writeOwiFile () ||              // comment1
-       broken () || !saveArchiveData ()         /* comment2 */
-       || broken () || !deleteCentralArchive () // comment3
-       || broken () || !copyArchivFiles ()      // comment4
-       || broken () || !appendToPlanetDb ())    // comment5
-   {
-      ;
-   }
-
-   foobar(param1,
-          param2, param3,
-          param4);
-
-   foobar2(param1
-           , param2, param3
-           , param4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/br_cmt.c
deleted file mode 100644
index 4e57d2de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/br_cmt.c
+++ /dev/null
@@ -1,14 +0,0 @@
-int main()
-{
-	if( foo == bar )
-	{ /* this works */
-                a;
-	}else
-    if( ranz != bar )
-	{ /* this works too */
-                b;
-	}else
-	{ /* this is broken */
-        c;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove.c
deleted file mode 100644
index c62506e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove.c
+++ /dev/null
@@ -1,78 +0,0 @@
-
-void foo(void)
-{
-   int a = 0;
-   while (a < 3)
-   {
-      a++;
-   }
-
-   while (b < a)
-      b++;
-
-   do
-   {
-      a--;
-   } while (a > 0);
-
-   for (a = 0; a < 10; a++)
-   {
-      printf("a=%d\n", a);
-   }
-
-   if (a == 10)
-   {
-      printf("a looks good\n");
-   }
-
-   if (state == ST_RUN)
-   {
-      if ((foo < bar) &&
-          (bar > foo2))
-      {
-         if (a < 5)
-         {
-            a *= a;
-         }
-      }
-   }
-
-   while (*ptr++ != ',')
-   {
-   }
-}
-
-// mod_full_brace_for = remove should not remove the braces in this example:
-int main() {
-  if(true)         // indent=1
-    for(int i = 0; i < 3; i++) {
-      if(false)
-        continue;  // indent=4
-    }
-  else
-    return;        // indent=2
-}
-
-// mod_full_brace_if = remove should not remove the braces in this example:
-int main() {
-  if(true) {
-    for(int i = 0; i < 3; i++)
-      if(false)
-        continue;  // indent=4
-  }
-  else
-    return;        // indent=2
-}
-
-int main()
-{
-	while (1) {
-		if (0)
-			break;
-		switch (1) {
-		case 1:
-			break;
-		}
-	}
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove2.c
deleted file mode 100644
index e5b73723..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove2.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* else is tied to if(two) */
-int main() {
-  if (one) {
-    if (two)
-      sleep (1);
-    else
-      sleep (2);
-  }
-
-  if (three)
-      sleep(1);
-  else
-      if (four)
-         sleep(2);
-}
-
-/* else is tied to if(one) */
-int main() {
-  if (one) {
-    if (two)
-      sleep (1);
-  }
-  else {
-    if (three)
-      sleep (2);
-  }
-}
-
-/* else.1 is tied to if(two), else.2 is tied to if(one) */
-int main() {
-  if (one) {
-    if (two)
-      sleep (1);
-    else {
-      if (three)
-	sleep (2);
-    }
-  }
-  else
-    sleep (3);
-}
-int main() {
-
- if (read_write == I2C_SMBUS_READ)
-        {
-         msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-        }
-       else
-         {
-         msg[0].len = data->block[0] + 1;
-       }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove3.c
deleted file mode 100644
index 9cde8bbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove3.c
+++ /dev/null
@@ -1,31 +0,0 @@
-void foo()
-{
-if(myBoolean) {
-#ifdef DEBUG
-printf("ACK");
-#endif
-}
-return true;
-}
-
-void foo2()
-{
-    if (m_errno == ERR_NONE) {
-        function1(variables);
-        function2(variables);
-    } else {
-        function1(varialbes);
-    }
-    //MyComment1
-    //MyComment2
-}
-
-void foo3()
-{
-    if (statment)
-        if (statment) {
-            condition;
-            return true;
-        }
-    return false;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace.c
deleted file mode 100644
index 31f3b42b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace.c
+++ /dev/null
@@ -1,13 +0,0 @@
-

-

-

-int function(int arg) {

-  int i;

-  for (i=0;i<5;i++){

-    /* Do something... */

-  }

-  if(i<0){

-  /*Do something else...*/  }

-

-  return 0;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-2.c
deleted file mode 100644
index a34d73d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-while (a >= 0)
-{
-   if (b)
-      for (j = 0; j < 10; j++)
-      {
-         if (j == b)
-         {
-            return;
-         }
-         a++;
-      }
-   b--;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-3.c
deleted file mode 100644
index 1f1a2066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-3.c
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-   list_for_each(k) {
-      if (a)
-         if (b)
-         {
-            c++;
-         }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-4.c
deleted file mode 100644
index 385f4a8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-4.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int foo(int bar)
-{
-#ifndef CONFIG_1
-       bar -= 3;
-#else
-       for (j = 0; j < NR_CPUS; j++)
-               if (cpu_online(j))
-                       bar++;
-#endif
-	return 0;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-5.c
deleted file mode 100644
index c77cc912..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-5.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * this is a really tough case - perhaps we shouldn't keep any #if crap
- * unless they all end with the same stack?
- */
-void foo(void)
-{
-   int a;
-#ifdef CONFIG_BLK_DEV_INITRD
-   if (initrd_start)
-      ROOT_DEV = Root_RAM0;
-#elif defined(CONFIG_ROOT_NFS)
-   ROOT_DEV = Root_NFS;
-#elif defined(CONFIG_BLK_DEV_IDEDISK)
-   ROOT_DEV = Root_HDA1;
-#else
-   ROOT_DEV = Root_SDA1;
-#endif
-   return;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces.c
deleted file mode 100644
index 20733afc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces.c
+++ /dev/null
@@ -1,79 +0,0 @@
-
-void foo(void)
-{
-   int a = 0;
-   while (a < 3)
-   {
-      a++;
-   }
-
-   while (b < a)  // trailing C++ comment
-      b++;
-
-   do  // trailing C++ comment
-   {
-      a--;
-   } while (a > 0);
-
-   do
-      a--;
-   while (a > 0);
-
-   for (a = 0; a < 10; a++) // trailing C++ comment
-   {
-      printf("a=%d\n", a);
-   }
-
-   if (a == 10)  // trailing C++ comment
-   {
-      printf("a looks good\n");
-   }
-   else // trailing C++ comment
-   {
-      printf("not so good\n");
-   }
-
-   if (state == ST_RUN)
-   {
-      if ((foo < bar) &&
-          (bar > foo2))
-      {
-         if (a < 5)
-         {
-            a *= a;
-         }
-         else if (b != 0)
-            a /= b;
-         else // trailing C++ comment
-            a += b;
-      }
-   }
-
-   list_for_each(k) {
-      if (a)
-         if (b)
-         {
-            c++;
-         }
-   }
-
-
-   while (1)
-      ;  /* hang forever */
-}
-
-void f() {
-  if (buf[0] == '~' && strchr(tmp, '/') == NULL) {
-    buf = mallocstrcpy(buf, tmp);
-    matches = username_tab_completion(tmp, &num_matches);
-  }
-  /* If we're in the middle of the original line, copy the string
-  only up to the cursor position into buf, so tab completion
-  will result in buf's containing only the tab-completed
-  path/filename. */
-  else if (strlen(buf) > strlen(tmp))
-    buf = mallocstrcpy(buf, tmp);
-}
-
-void f() {} void g() {}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bsnl.c
deleted file mode 100644
index b2b38b8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bsnl.c
+++ /dev/null
@@ -1,5 +0,0 @@
-# define SOME_MACRO \
-    bool has_err; \  
-    bool is_comp;\  
-    struct some_stream ostream
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1041.c
deleted file mode 100644
index 193c750b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1041.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void (*g_func_table[32])(void) = {
-        [0 ... 31] = func_dummy,
-        [0] = func_0,
-        [1] = func_1,
-        [2] = func_2,
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1196.c
deleted file mode 100644
index 9fdabca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1196.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef __cplusplus

-extern "C" {

-#endif

-

-void foo(void);

-

-#ifdef __cplusplus

-}

-#endif
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1702.c
deleted file mode 100644
index bf74c8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1702.c
+++ /dev/null
@@ -1,29 +0,0 @@
-extern struct device device_list[];
-extern struct device device_list_end[];
-
-static int
-device_probe(struct device *dev)
-{
-	int err;
-}
-
-/* ===================== */
-struct scpi_mem {
-	struct scpi_msg tx_msg; /**< The reply to be sent to a client. */
-	struct scpi_msg rx_msg; /**< The request received from a client. */
-};
-
-struct scpi_buffer {
-	struct scpi_mem mem;    /**< Memory for the request/reply messages. */
-	uint8_t         client; /**< Client that should receive the reply. */
-	bool            busy;   /**< Flag telling if this buffer is in use. */
-};
-
-static void
-scpi_receive_message(struct device *dev __unused, uint8_t client, uint32_t msg)
-{
-	struct scpi_buffer *buffer;
-	struct scpi_msg    *rx_msg = &SCPI_MEM_AREA(client).rx_msg;
-
-	assert(dev == scpi_msgbox);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1718.c
deleted file mode 100644
index eaddc974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1718.c
+++ /dev/null
@@ -1,8 +0,0 @@
-switch (code)
-{
-case A:
-#ifdef XXX
-	func(code);
-#endif
-	break;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_2331.c
deleted file mode 100644
index f30c53d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_2331.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#define SET_STACK(stack)            \
-	do {                            \
-		__asm__ __volatile__ (      \
-			"mov S, %[oper]"        \
-			:                       \
-			: [oper] "r" (stack)    \
-			: "S"                   \
-			);                      \
-	} while (0)
-
-int somearray  [10];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_3156.c
deleted file mode 100644
index 508a0098..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_3156.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define X 1 +
-int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_489.c
deleted file mode 100644
index e83d351b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_489.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define UHI_AOA { \

-		.install = uhi_aoa_install, \

-		.enable = uhi_aoa_enable, \

-		.uninstall = uhi_aoa_uninstall, \

-		.sof_notify = NULL, \

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_671.c
deleted file mode 100644
index 01a3b02b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_671.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#define FOO_MAX 10
-
-bool foo[FOO_MAX];
-
-void
-foo_bar( int a,
-           int* b,
-    bool foo[FOO_MAX] );
-
-void A()
-{
-      int a;
-  int *b;
-                 foo_bar( a, b, foo);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_222.c
deleted file mode 100644
index 4f0ded31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_222.c
+++ /dev/null
@@ -1,6 +0,0 @@
-whatever *find_node_for_address(whatever2 *foo,
-                                thingy *bar,
-                                whatever3 *(func_ptr)(
-                                    whatever4 *foo2,
-                                    thingy2 *bar2));
-//3456789=123456789=123456789=123456789=123456789=12
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_771.c
deleted file mode 100644
index c933487d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_771.c
+++ /dev/null
@@ -1,17 +0,0 @@
-typedef struct Foo_s {
-    int  a;
-    int      *b;
-    float   **c;
-    bool *******d;
-    FooBar ***A;
-    FoBar  ***B;
-}FooS;
-
-typedef struct Foo_a {
-    int    a;
-    int    *b;
-    float  **c;
-    bool   *******d;
-    FooBar ***A;
-    FoBar  ***B;
-}FooA;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_876.c
deleted file mode 100644
index ab2a05db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_876.c
+++ /dev/null
@@ -1 +0,0 @@
-#define A 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-1.c
deleted file mode 100644
index 39050c07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-1.c
+++ /dev/null
@@ -1,52 +0,0 @@
-int oldfoo(bar)
-   char bar;
-{
-   return bar -2;
-}
-
-int i2c_use_client(struct i2c_client *client)
-{
-   int ret;
-
-   ret = i2c_inc_use_client(client);
-   if (ret)
-      return ret;
-
-   if ((client->flags & I2C_CLIENT_ALLOW_USE) || (a &&
-       something_else))
-   {
-      if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-         client->usage_count++;
-      else if (client->usage_count > 0)
-         goto busy;
-      else
-         client->usage_count++;
-   }
-
-   return 0;
-   busy:
-   i2c_dec_use_client(client);
-   return -EBUSY;
-}
-
-void get_name(void)
-{
-   a = (int)5;
-
-   if (a)
-      if (b)
-         b--;
-      else
-      {
-         a++;
-      }
-   for (a=0; a < 10; a++)
-      if (b)
-      {
-         b--;
-      }
-      else
-         a++;
-   return;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-2.c
deleted file mode 100644
index 42bed259..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-static void tcps_proc_server_msg(void *p_user, const ptc_msg_info_t *p_info)
-{
-   if (z)
-   {
-      if (a)
-      /* comment */
-      {
-         a++;
-      }
-      /* comment */
-      else if (b)
-      {
-         b++;
-      }
-      /* Comment */
-      else
-      {
-         c++;
-      }
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-3.c
deleted file mode 100644
index 4f85044a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-3.c
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#ifdef CRUD
-#define JUNK a
-#endif
-
-#ifdef __QNX__
-/**
- * Does all that QNX trickery to get the MAC address of the interface
- *
- * @param if_name The interface name: ie "en0" or "eth0"
- * @param mac     Pointer to a 6-byte array
- * @return        SUCCESS or FAILURE
- */
-static INT32 socket_get_mac_qnx(const CHAR *if_name, UINT8 *mac)
-{
-   CHAR           ionet_name[50];
-   INT32          en_fd;
-#if QNX_RELEASE >= 630
-   nic_config_t   nic;
-   INT32          dcmd = DCMD_IO_NET_GET_CONFIG;
-#else
-   Nic_t          nic;
-   INT32          dcmd = DCMD_IO_NET_NICINFO;
-#endif
-   INT32          ret_val = FAILURE;
-
-   memset(mac, 0, 6);
-
-   /* Build the full name */
-   snprintf(ionet_name, sizeof(ionet_name), "/dev/io-net/%s", if_name);
-
-   /* Open the device */
-   en_fd = open(ionet_name, O_RDWR);
-   if (en_fd >= 0)
-   {
-      /* Get the interface info */
-      if (devctl(en_fd, dcmd, &nic, sizeof(nic), NULL) == EOK)
-      {
-         memcpy(mac, nic.current_address, 6);
-         ret_val = SUCCESS;
-      }
-
-      close(en_fd);
-   }
-   return(ret_val);
-}
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-4.c
deleted file mode 100644
index e01c2c32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-4.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-static void set_md_connected(CHAR *msg_data)
-{
-   UINT32      rd_idx = 0;
-   CHAR        mobile_device_id[MOBILE_DEVICE_NAME_LEN];
-   CHAR        ip_addr[IP_ADDRESS_LEN];
-   CHAR        mac_addr[MAC_ADDR_LEN];
-   CHAR        ap_name[AP_NAME_LEN];
-
-   rdc_strz(msg_data,MAX_SIZE,&rd_idx,mobile_device_id,0);
-   rdc_strz(msg_data,MAX_SIZE,&rd_idx,ip_addr,0);
-   rdc_strz(msg_data,MAX_SIZE,&rd_idx,mac_addr,0);
-   rdc_strz(msg_data,MAX_SIZE,&rd_idx,ap_name,0);
-
-#if defined (DB_MGR_ORACLE)
-   (void)db_set_md_connected(mobile_device_id,ip_addr,mac_addr,ap_name);
-   LOG(LFTR,"CONNECTED Loco %s, IP Addr %s,MAC Addr %s, AP Name %s",
-       mobile_device_id,ip_addr,mac_addr,ap_name);
-#elif defined (DB_MGR_FILE)
-   LOG(LFTR,"%s CONNECTED Loco %s, IP Addr %s,MAC Addr %s, AP Name %s",
-       status_str,mobile_device_id,ip_addr,mac_addr,ap_name);
-#else
-#error Unknown device type must be DB_MGR_ORACLE or DB_MGR_FILE
-#endif
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-5.c
deleted file mode 100644
index 626eb7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-5.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-static void log_roll_file(log_output_t *plo)
-{
-   INT32       retcode;
-   const CHAR  *name_save;
-   const CHAR  *name_temp;
-
-   if (plo->pfile != NULL)
-   {
-
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-6.c
deleted file mode 100644
index 99ebbdda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-6.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*=-------------------------------------------------------------------------=*\
-*
-|  FUNCTION NAME: mult2
-|
-|  DESCRIPTION:
-|     Multiplies a number by two.
-|
-|  INPUTS/OUTPUTS:
-|     val - the number to double
-|
-|  RETURNS:
-|     val * 2
-*
-\*=-------------------------------------------------------------------------=*/
-int mult2(int val)
-{
-   return val * 2;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-7.c
deleted file mode 100644
index a879aa17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-7.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-struct somestruct *
-mult2(int val);
-
-somestruct *
-dumb_func(int val);
-
-
-
-struct somestruct *
-mult2(int val)
-{
-   int a;
-
-   a = val + (foo * bar);
-
-   a = val + (bar);
-
-   a = val + (CFoo::bar_t)7;
-
-   a = val + (myfoo.size);
-
-   return NULL;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-8.c
deleted file mode 100644
index 8870a663..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-8.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-void foo(void)
-{
-p[0].x = x + (rx * cos(rs));
-p[0].y = y - (ry * sin(rs));
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs.c
deleted file mode 100644
index d75a4782..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs.c
+++ /dev/null
@@ -1,35 +0,0 @@
-typedef struct {
-   int a;
-   char b;
-} foo_t;
-
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
-{
-	union i2c_smbus_data data;
-	int i;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_READ,command,
-	                      I2C_SMBUS_I2C_BLOCK_DATA,&data))
-		return -1;
-	else {
-		for (i=1;i<=data.block[0];i ++)
-			values[i-1] = data.block[i];
-		return data.block[0];
-	}
-}
-
-void foo(void)
-{
-   adap->nr=  id &  MAX_ID_MASK;
-
-   list_for_each(item,&drivers) {
-      driver=list_entry(item, struct i2c_driver, list);
-      if (driver->detach_adapter)
-         if ((res = driver->detach_adapter(adap)))
-         {
-            dev_err(&adap->dev, "detach_adapter failed "
-                    "for driver [%s]\n", driver->name);
-            goto out_unlock;
-         }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case-nl_before_return.c
deleted file mode 100644
index 67adaddd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case-nl_before_return.c
+++ /dev/null
@@ -1,77 +0,0 @@
-int foo(int arg)
-{
-    switch (arg)
-    {
-        case 0: return 1;
-        case 1:
-            return 2;
-        case 2:
-            printf("Hello world!\n");
-            return 3;
-        case 3:
-        {
-            int a = 4;
-            return a;
-        }
-        case 4:
-
-            return 5;
-        case 5:
-            printf("Hello world!\n");
-
-            return 6;
-        case 6:
-        {
-            int a = 7;
-
-            return a;
-        }
-        case 7: /* comment */ return 8;
-        case 8:
-            /* C-style comment */
-            return 9;
-        case 9: /* trailing comment */
-            return 10;
-        case 10: /* trailing comment */
-            /* C-style comment */
-            return 11;
-        case 11:
-            // C++-style comment
-            return 12;
-        case 12:
-            // Multi-line
-            // C++-style comment
-            return 13;
-        case 13: // trailing comment
-            // Multi-line
-            // C++-style comment
-            return 14;
-        case 14:
-
-            // Multi-line
-            // C++-style comment
-            return 15;
-        case 15:
-
-            /* C-style comment */
-            return 16;
-        case 16:
-            /*
-             * Multi-line C-style comment
-             */
-            return 17;
-        case 17:
-            /*--------------------*/
-            /* Multi-part comment */
-            /*--------------------*/
-            return 18;
-        case 18:
-            /*---------------------*/
-            // Mixed-style comment
-            /*---------------------*/
-            return 19;
-        default:
-            return arg++;
-    }
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case.c
deleted file mode 100644
index ffceda0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case.c
+++ /dev/null
@@ -1,69 +0,0 @@
-void foo(void)
-{
-   switch(ch)
-   {
-   // handle 'a'
-   case 'a':
-      {
-         handle_a();
-         multiline(123,
-                   345);
-         break;
-      }
-
-   // handle 'b'
-   case 'b':
-      handle_b();
-      multiline(123,
-                345);
-      break;
-
-   // handle 'c' and 'd'
-   case 'c':
-   case 'd':
-      // c and d are really the same thing
-      handle_cd();
-      multiline(123,
-                345);
-      break;
-
-   case 'e':
-      {
-         handle_a();
-         multiline(123,
-                   345);
-      }
-      break;
-      // case1
-   case (case1):
-   {
-           //do stuff
-       break;
-   }
-   case (case2):
-       {
-           //do stuff
-       break;
-       }
-   case (case3):
-
-           /*do stuff*/
-       break;
-   case (case3):
-       statement();
-       {
-          another_statement();
-       }
-       break;
-
- // really should not get here
-   default:
-      handle_default();
-      multiline(123,
-                345);
-      break;
-   }
-   multiline(123,
-             345);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cast_brace.c
deleted file mode 100644
index 7ec7f67a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cast_brace.c
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-void disappearing_semicolon(void)
-{
-r = (recordtypecast){a, b, c}; //<--
-p = Table_put(t,a,&r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/casts.c
deleted file mode 100644
index f09f5c5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/casts.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#define SOME_VAL1      ((MYINT)-1)
-#define SOME_VAL2      (-2)
-#define SOME_VAL3      -3
-#define MULT(X,Y)      (X) * (Y)
-#define SOME_JUNK    /*lint -e123 */(const mytype *)-1
-
-typedef (*my_fcn_ptr_t)(char *, int);
-typedef (my_fcn_t)(char *, int);
-
-void foo(void)
-{
-   uint crc = crc32_calc_full((const UINT8 *)"String", 6);
-
-   crc = crc32_calc_full((const UINT8 *)&crc, sizeof(crc));
-
-   a = (b) - 4;
-
-   a = (UINT) - 4;
-   a = (UINT) + 4;
-   a = (UINT) * 4;
-   a = (UINT) & 4;
-
-   a = (uint32_t) - pb;
-   a = (uint32_t) + pb;
-   a = (uint32_t) * pb;
-   a = (uint32_t) & pb;
-
-   a = (Uint) - 4;
-   a = (Uint) + 4;
-   a = (Uint) * 4;
-   a = (Uint) & 4;
-
-   a = b * (int)flt;
-   a = b * ((int)flt);
-
-   a = b * (int)flt;
-   a = b * (INT8)flt;
-   a = b * (Uint)flt;
-
-   a = *(int)&b;
-   a = *(CHAR)&b;
-   a = *(Uint)&b;
-
-   a = (int)*pb;
-   a = (CHAR)*pb;
-   a = (Uint)*pb;
-
-   a = (int)'a';
-   a = (UINT8)'a';
-   a = (Uint)'a';
-
-   a = (int)*'a';
-   a = (UINT8)*'a';
-   a = (Uint)*'a';
-
-   a = (int)*5;
-   a = (UINT)*5;
-   a = (Uint)*5;
-
-   a = (int)*ape;
-   a = (UINT)*ape;
-   a = (Uint)*ape;
-
-   a = (int)ape;
-   a = (UINT)ape;
-   a = (Uint)ape;
-
-   a = (int)sizeof(x);
-   a = (INT16)sizeof(x);
-   a = (Uint)sizeof(x);
-
-   a = (int)foo(x);
-   a = (CHAR)foo(x);
-   a = (Uint)foo(x);
-
-   a = (int)(x);
-   a = (CHAR)(x);
-   a = (Uint)(x);
-
-   a = (int)*(x);
-   a = (CHAR)*(x);
-   a = (Uint)*(x);
-
-   a = (unsigned int)(1 + 4);
-   a = (int)(1 + 1);
-   a = (void *)(&str);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/clang-has_include.h
deleted file mode 100644
index d153e70a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/clang-has_include.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if __has_include (<tr1/unordered_set>)
-#  include <tr1/unordered_set>
-#endif
-#if __has_include("unordered_set.h") ||   __has_include_next (<tr1/unordered_set>)
-#  include <tr1/unordered_set>
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt-align.c
deleted file mode 100644
index 658bac4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt-align.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef HAVE_FOO 
-void foo(void)
-{
-   if (bar)
-   {
-   call_some_function(); /* call the function */
-   return(foo); /* comment */
-}          /* if (bar) */
-}
-#endif       /* HAVE_FOO */
-#ifndef HAVE_BAR /* bar isn't available on all HW */
-void bar(void)
-{
-   if (foo)
-   {
-    call_some_function(); /* call the function */
-    return(foo); /* comment */
-  } /* if (foo) */
-}
-#endif /* HAVE_BAR */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi.c
deleted file mode 100644
index 8e01c5fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/************************************************
- * This is a multiline comment.
- * The first and last lines are the same length
- ************************************************/
-
-/****************************************************************************

-    A multi-line comment that is broken in two parts.

-*//**

-    Second part

-****************************************************************************/

-
-/****************************************************************************

-    A multi-line comment that is broken in two parts.

-*/         /**

-    Second part

-****************************************************************************/

-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi_utf8.c
deleted file mode 100644
index 05b01f84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi_utf8.c
+++ /dev/null
@@ -1,2 +0,0 @@
-/* This is a multiline comment with a UTF8 character: á
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_nl_end.c
deleted file mode 100644
index 48929d07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_nl_end.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int do_this

-(

-   int x,

-   int y

-)

-{

-   x += y;              // x = x + y

-   if(x == 3)

-      x++;      // x plus 1

-

-   return (x)

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_reflow.c
deleted file mode 100644
index 6c40e11b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_reflow.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-  * Search the tree for a match that satisfies specific comparison criteria,
-  *                 branch contains the desired data for which to search the tree
-  * @param compareFunc is a binary function object that defines
-  *                                                                how to compare
-  *    nodes
-  * @param bRetrieve indicates whether or not the input search branch should be modified to reflect a branch in the tree, assuming a match satisfying the given search criteria exists
-  * @return true if a branch matching the input is found
-  *                    or returns nullptr otherwise
-  *
-  *    It was the best of times, it was the worst of times,
-  *           it was the age of wisdom, it was the age of foolishness, it was the epoch of belief,
-  *        it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope,
-  *            it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven,
-  *        we were all going direct the other way--in short, the period was so far like the present period, that some of its noisiest authorities insisted
-  *                                     on its being received, for good or for evil, in the superlative degree of comparison only.
-  *
-  *        There were a king with a large jaw and a queen with a plain face
-  *                      on the throne of England; there were a king with a large jaw and a queen with a fair
-  *                                 face,
-  *                           on the throne of France. In both countries it was clearer than crystal to the lords of the
-  *                           State preserves of loaves and fishes, that things in general were settled for ever.
-  *
-  *            It was the year of Our Lord one thousand seven hundred and seventy-five.
-  *                                                 Spiritual revelations were conceded to England at that favoured period, as at this. Mrs.
-  *                                       Southcott had recently attained her five-and-twentieth blessed birthday, of whom a prophetic private in the Life
-  *                 Guards had heralded the sublime appearance by announcing that arrangements were made for the swallowing up of London and Westminster.
-  *           Even the Cock-lane ghost had been laid only a round dozen of years, after rapping out its messages, as the spirits of this very year last past
-  *                           (supernaturally deficient in originality) rapped out theirs. Mere messages in the earthly order of events had lately come to
-  *                     the English Crown and People, from a congress of British subjects in America: which, strange to relate, have proved more important
-  *               to the human race than any communications yet received through any of the chickens of the Cock-lane brood.
-  */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_right_align.c
deleted file mode 100644
index b707f0bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_right_align.c
+++ /dev/null
@@ -1,47 +0,0 @@
-

-int foo1(int bar)

-{

-   if(bar)

-   {

-      if(b)

-      {

-         if(a)

-         {

-            if(r)

-            {

-               return(r);       /* cool */

-            }

-            else /* if (r) */

-            {

-               return(bar);     /* uncool */

-            } /* if (r) */

-         } /* if (a) */

-      } /* if (b) */

-   } /* if (bar) */

-

-   return(-1);

-} /* foo */

-

-int foo2(int bar)

-{

-   if(bar)

-   {

-      if(b)

-      {

-         if(a)

-         {

-            if(r)

-            {

-               return(r);

-            }

-            else

-            {

-               return(bar);

-            } /* if (r) */

-         } /* if (a) */

-      } /* if (b) */

-   } /* if (bar) */

-

-   return(-1);

-} /* foo */

-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/code_width.c
deleted file mode 100644
index 1b2fbbaa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/code_width.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
-static int short_function_name(struct device *dev, struct device_driver *drv);
-
-/* Assuming a 60-column limit */
-static int short_function_name(struct device *dev, struct device_driver *drv)
-{
-        this->translateLabels(labelID, completedLabelID, selectedLabelID, text, selectedText, completedText, fontId, selectedFontId, completedFontId);
-    call_some_really_long_function.of_some_sort(some_long_parameter1, some_long_parameter2);
-
-    abc = call_some_other_really_long_function.of_some_sort(some_long_parameter1, some_long_parameter2);
-
-    abc.def.ghi = call_some_other_really_long_function.of_some_sort(some_long_parameter1, some_long_parameter2);
-
-    abcdefghijklmnopqrstuvwxyz = abc + def + ghi + jkl + mno + prq + stu+ vwx + yz;
-
-    return 1;
-}
-
-typedef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx yyyyyyyyyyyyyyyyyyyyyy;
-
-typedef some_return_value (*some_function_type)(another_type parameter1, another_type parameter2);
-
-typedef struct xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-{
-   int yyyyyyyyyyyyyyyyyyyyyy;
-} x_t;
-
-static void some_really_long_function_name(struct device *dev, struct device_driver *drv)
-{
-   if ((some_variable_name && somefunction(param1, param2, param3)))
-   {
-      asdfghjk = asdfasdfasd.aasdfasd + (asdfasd.asdas * 1234.65);
-   }
-
-   for (struct something_really_really_excessive *a_long_ptr_name = get_first_item(); a_long_ptr_name != NULL; a_long_ptr_name = get_next_item(a_long_ptr_name))
-   {
-   }
-
-   for (a = get_first(); a != NULL; a = get_next(a))
-   {
-   }
-
-   for (a_ptr = get_first(); a_ptr != NULL; a_ptr = get_next(a))
-   {
-   }
-
- register_clcmd( "examine", "do_examine", -1, "-Allows a player to examine the health and armor of a teammate" );
-       register_clcmd( "/examine", "do_examine", -1,
-                      "-Allows a player to examine the health and armor of a teammate" );
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/colon-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/colon-asm.c
deleted file mode 100644
index 5125af19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/colon-asm.c
+++ /dev/null
@@ -1,19 +0,0 @@
-static void
-__marvel_access_rtc(void *info)
-{
-	struct marvel_rtc_access_info *rtc_access = info;
-
-	register unsigned long __r0 __asm__("$0");
-	register unsigned long __r16 __asm__("$16") = rtc_access->function;
-	register unsigned long __r17 __asm__("$17") = rtc_access->index;
-	register unsigned long __r18 __asm__("$18") = rtc_access->data;
-	
-	__asm__ __volatile__(
-		"call_pal %4 # cserve rtc"
-		: "=r"(__r16), "=r"(__r17), "=r"(__r18), "=r"(__r0)
-		: "i"(PAL_cserve), "0"(__r16), "1"(__r17), "2"(__r18)
-		: "$1", "$22", "$23", "$24", "$25");
-
-	rtc_access->data = __r0;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-convert.c
deleted file mode 100644
index 4282ab0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-convert.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// This is your typical header comment
- int foo(int bar)
- {
-    int idx;
-    int res = 0;     // trailing comment
-                   // that spans two lines
-
-
-    // Comment with embedded /* C comment */
-    for (idx = 1; idx < bar; idx++)
-       /* comment in virtual braces */
-       res += idx;
-
-    // Multi-line comment with embedded /* C comment */ and junk
-    // afterwards
-    res *= idx;       // some comment
-
-                      // almost continued, but a NL in between
-
-// col1 comment in level 1
-// second comment
-   return(res);
-}
-
-   // col1 comment in level 0
- // and another
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-indent.c
deleted file mode 100644
index d5295d6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-indent.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * This is your typical header comment
- */
- int foo(int bar)
- {
-    int idx;
-    int res = 0;     // trailing comment
-                   // that spans two lines
-    for (idx = 1; idx < bar; idx++)
-       /* comment in virtual braces */
-       res += idx;
-
-    res *= idx;       // some comment
-
-                      // almost continued, but a NL in between
-
-// col1 comment in level 1
-// second comment
-   return(res);
-}
-
-   // col1 comment in level 0
- // and another
-
-void foo()
-{
- if( bar )
- {
-   foo();
- }
- /*else if( bar2 )
- {
-   foo2();
- }
- */else if( bar3 )
- {
-   foo3();
- }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cond.c
deleted file mode 100644
index aec2f0a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cond.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-int foo1(bool b, int tv, int fv)
-{
-   return b   ?   tv   : fv;
-}
-
-int foo2(bool b, int tv, int fv)
-{
-   return b?tv:fv;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/custom_types_ssl.c
deleted file mode 100644
index 0454f81d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/custom_types_ssl.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef  HEADER_CONF_H
-#define HEADER_CONF_H
-
-#ifdef  __cplusplus
-extern "C"
-#endif
-{
-
-typedef struct
-	{
-	char *section;
-	char *name;
-	char *value;
-	} CONF_VALUE;
-
-DECLARE_STACK_OF(CONF_VALUE);
-DECLARE_LHASH_OF(CONF_VALUE);
-
-struct conf_st;
-struct conf_method_st;
-typedef struct conf_method_st CONF_METHOD;
-
-int CONF_set_default_method(CONF_METHOD *meth);
-void CONF_set_nconf(CONF *conf,LHASH_OF(CONF_VALUE) *hash);
-LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf,const char *file,
-				long *eline);
-#ifndef OPENSSL_NO_FP_API
-LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-				   long *eline);
-#endif
-LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,long *eline);
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-				       const char *section);
-char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf,const char *group,
-		      const char *name);
-long CONF_get_number(LHASH_OF(CONF_VALUE) *conf,const char *group,
-		     const char *name);
-void CONF_free(LHASH_OF(CONF_VALUE) *conf);
-int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
-int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
-
-
-}
-
-
-void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash)
-	{
-	if (default_CONF_method == NULL)
-		default_CONF_method = NCONF_default();
-
-	default_CONF_method->init(conf);
-	conf->data = hash;
-	}
-
-
-LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-				long *eline)
-	{
-	LHASH_OF(CONF_VALUE) *ltmp;
-	BIO *in=NULL;
-
-#ifdef OPENSSL_SYS_VMS
-	in=BIO_new_file(file, "r");
-#else
-	in=BIO_new_file(file, "rb");
-#endif
-	if (in == NULL)
-		{
-		CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);
-		return NULL;
-		}
-
-	return ltmp;
-	}
-
-#ifndef OPENSSL_NO_FP_API
-LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-				   long *eline)
-	{
-	BIO *btmp;
-	LHASH_OF(CONF_VALUE) *ltmp;
-	if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
-		CONFerr(CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB);
-		return NULL;
-	}
-	ltmp = CONF_load_bio(conf, btmp, eline);
-	BIO_free(btmp);
-	return ltmp;
-	}
-#endif
-
-LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-				    long *eline)
-	{
-	CONF ctmp;
-	int ret;
-
-	CONF_set_nconf(&ctmp, conf);
-
-	ret = NCONF_load_bio(&ctmp, bp, eline);
-	if (ret)
-		return ctmp.data;
-	return NULL;
-	}
-
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-				       const char *section)
-	{
-	if (conf == NULL)
-		{
-		return NULL;
-		}
-	else
-		{
-		CONF ctmp;
-		CONF_set_nconf(&ctmp, conf);
-		return NCONF_get_section(&ctmp, section);
-		}
-	}
-
-char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf,const char *group,
-		      const char *name)
-	{
-	if (conf == NULL)
-		{
-		return NCONF_get_string(NULL, group, name);
-		}
-	else
-		{
-		return NCONF_get_string(&ctmp, group, name);
-		}
-	}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/define-if-indent.c
deleted file mode 100644
index 1ef47273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/define-if-indent.c
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#define foobar(x) \
-{ \
-for (i=0; i < x; i++) \
-{ \
-junk(i,x); \
-} \
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/deref.c
deleted file mode 100644
index 100464fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/deref.c
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo(int *pA, int *pB)
-{
-   *pB = some.arr[*pA];
-
-foo(sizeof bar / sizeof * bar, baz);
-
-}
-
-#define MEM_READ_BYTE(phwi, addr, data)					  \
- 	* data = * ((PUCHAR)((phwi)->m_pVirtualMemory + addr))
-
-#define MEM_WRITE_BYTE(phwi, addr, data)				  \
-	* ((PUCHAR)((phwi)->m_pVirtualMemory + addr)) = (UCHAR)(data)
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/directfb.h
deleted file mode 100644
index 3531fa21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/directfb.h
+++ /dev/null
@@ -1,1596 +0,0 @@
-typedef unsigned int size_t;
-typedef unsigned char __u_char;
-typedef unsigned short int __u_short;
-typedef unsigned int __u_int;
-typedef unsigned long int __u_long;
-typedef signed char __int8_t;
-typedef unsigned char __uint8_t;
-typedef signed short int __int16_t;
-typedef unsigned short int __uint16_t;
-typedef signed int __int32_t;
-typedef unsigned int __uint32_t;
-__extension__ typedef signed long long int __int64_t;
-__extension__ typedef unsigned long long int __uint64_t;
-__extension__ typedef long long int __quad_t;
-__extension__ typedef unsigned long long int __u_quad_t;
-__extension__ typedef __u_quad_t __dev_t;
-__extension__ typedef unsigned int __uid_t;
-__extension__ typedef unsigned int __gid_t;
-__extension__ typedef unsigned long int __ino_t;
-__extension__ typedef __u_quad_t __ino64_t;
-__extension__ typedef unsigned int __mode_t;
-__extension__ typedef unsigned int __nlink_t;
-__extension__ typedef long int __off_t;
-__extension__ typedef __quad_t __off64_t;
-__extension__ typedef int __pid_t;
-__extension__ typedef struct { int __val[2]; } __fsid_t;
-__extension__ typedef long int __clock_t;
-__extension__ typedef unsigned long int __rlim_t;
-__extension__ typedef __u_quad_t __rlim64_t;
-__extension__ typedef unsigned int __id_t;
-__extension__ typedef long int __time_t;
-__extension__ typedef unsigned int __useconds_t;
-__extension__ typedef long int __suseconds_t;
-__extension__ typedef int __daddr_t;
-__extension__ typedef long int __swblk_t;
-__extension__ typedef int __key_t;
-__extension__ typedef int __clockid_t;
-__extension__ typedef int __timer_t;
-__extension__ typedef long int __blksize_t;
-__extension__ typedef long int __blkcnt_t;
-__extension__ typedef __quad_t __blkcnt64_t;
-__extension__ typedef unsigned long int __fsblkcnt_t;
-__extension__ typedef __u_quad_t __fsblkcnt64_t;
-__extension__ typedef unsigned long int __fsfilcnt_t;
-__extension__ typedef __u_quad_t __fsfilcnt64_t;
-__extension__ typedef int __ssize_t;
-typedef __off64_t __loff_t;
-typedef __quad_t *__qaddr_t;
-typedef char *__caddr_t;
-__extension__ typedef int __intptr_t;
-__extension__ typedef unsigned int __socklen_t;
-typedef __u_char u_char;
-typedef __u_short u_short;
-typedef __u_int u_int;
-typedef __u_long u_long;
-typedef __quad_t quad_t;
-typedef __u_quad_t u_quad_t;
-typedef __fsid_t fsid_t;
-typedef __loff_t loff_t;
-typedef __ino_t ino_t;
-typedef __dev_t dev_t;
-typedef __gid_t gid_t;
-typedef __mode_t mode_t;
-typedef __nlink_t nlink_t;
-typedef __uid_t uid_t;
-typedef __off_t off_t;
-typedef __pid_t pid_t;
-typedef __id_t id_t;
-typedef __ssize_t ssize_t;
-typedef __daddr_t daddr_t;
-typedef __caddr_t caddr_t;
-typedef __key_t key_t;
-typedef __time_t time_t;
-typedef __clockid_t clockid_t;
-typedef __timer_t timer_t;
-typedef unsigned long int ulong;
-typedef unsigned short int ushort;
-typedef unsigned int uint;
-typedef int int8_t __attribute__ ((__mode__ (__QI__)));
-typedef int int16_t __attribute__ ((__mode__ (__HI__)));
-typedef int int32_t __attribute__ ((__mode__ (__SI__)));
-typedef int int64_t __attribute__ ((__mode__ (__DI__)));
-typedef unsigned int u_int8_t __attribute__ ((__mode__ (__QI__)));
-typedef unsigned int u_int16_t __attribute__ ((__mode__ (__HI__)));
-typedef unsigned int u_int32_t __attribute__ ((__mode__ (__SI__)));
-typedef unsigned int u_int64_t __attribute__ ((__mode__ (__DI__)));
-typedef int register_t __attribute__ ((__mode__ (__word__)));
-typedef int __sig_atomic_t;
-typedef struct
-  {
-    unsigned long int __val[(1024 / (8 * sizeof (unsigned long int)))];
-  } __sigset_t;
-typedef __sigset_t sigset_t;
-struct timespec
-  {
-    __time_t tv_sec;
-    long int tv_nsec;
-  };
-struct timeval
-  {
-    __time_t tv_sec;
-    __suseconds_t tv_usec;
-  };
-typedef __suseconds_t suseconds_t;
-typedef long int __fd_mask;
-typedef struct
-  {
-    __fd_mask __fds_bits[1024 / (8 * sizeof (__fd_mask))];
-  } fd_set;
-typedef __fd_mask fd_mask;
-extern int select (int __nfds, fd_set *__restrict __readfds,
-     fd_set *__restrict __writefds,
-     fd_set *__restrict __exceptfds,
-     struct timeval *__restrict __timeout);
-__extension__
-extern __inline unsigned int gnu_dev_major (unsigned long long int __dev)
-     __attribute__ ((__nothrow__));
-__extension__
-extern __inline unsigned int gnu_dev_minor (unsigned long long int __dev)
-     __attribute__ ((__nothrow__));
-__extension__
-extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major,
-       unsigned int __minor)
-     __attribute__ ((__nothrow__));
-__extension__ extern __inline unsigned int
-__attribute__ ((__nothrow__)) gnu_dev_major (unsigned long long int __dev)
-{
-  return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
-}
-__extension__ extern __inline unsigned int
-__attribute__ ((__nothrow__)) gnu_dev_minor (unsigned long long int __dev)
-{
-  return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
-}
-__extension__ extern __inline unsigned long long int
-__attribute__ ((__nothrow__)) gnu_dev_makedev (unsigned int __major, unsigned int __minor)
-{
-  return ((__minor & 0xff) | ((__major & 0xfff) << 8)
-   | (((unsigned long long int) (__minor & ~0xff)) << 12)
-   | (((unsigned long long int) (__major & ~0xfff)) << 32));
-}
-typedef __blkcnt_t blkcnt_t;
-typedef __fsblkcnt_t fsblkcnt_t;
-typedef __fsfilcnt_t fsfilcnt_t;
-struct __sched_param
-  {
-    int __sched_priority;
-  };
-typedef int __atomic_lock_t;
-struct _pthread_fastlock
-{
-  long int __status;
-  __atomic_lock_t __spinlock;
-};
-typedef struct _pthread_descr_struct *_pthread_descr;
-typedef struct __pthread_attr_s
-{
-  int __detachstate;
-  int __schedpolicy;
-  struct __sched_param __schedparam;
-  int __inheritsched;
-  int __scope;
-  size_t __guardsize;
-  int __stackaddr_set;
-  void *__stackaddr;
-  size_t __stacksize;
-} pthread_attr_t;
-__extension__ typedef long long __pthread_cond_align_t;
-typedef struct
-{
-  struct _pthread_fastlock __c_lock;
-  _pthread_descr __c_waiting;
-  char __padding[48 - sizeof (struct _pthread_fastlock)
-   - sizeof (_pthread_descr) - sizeof (__pthread_cond_align_t)];
-  __pthread_cond_align_t __align;
-} pthread_cond_t;
-typedef struct
-{
-  int __dummy;
-} pthread_condattr_t;
-typedef unsigned int pthread_key_t;
-typedef struct
-{
-  int __m_reserved;
-  int __m_count;
-  _pthread_descr __m_owner;
-  int __m_kind;
-  struct _pthread_fastlock __m_lock;
-} pthread_mutex_t;
-typedef struct
-{
-  int __mutexkind;
-} pthread_mutexattr_t;
-typedef int pthread_once_t;
-typedef unsigned long int pthread_t;
-typedef struct {
- unsigned long fds_bits [(1024/(8 * sizeof(unsigned long)))];
-} __kernel_fd_set;
-typedef void (*__kernel_sighandler_t)(int);
-typedef int __kernel_key_t;
-typedef int __kernel_mqd_t;
-typedef unsigned long __kernel_ino_t;
-typedef unsigned short __kernel_mode_t;
-typedef unsigned short __kernel_nlink_t;
-typedef long __kernel_off_t;
-typedef int __kernel_pid_t;
-typedef unsigned short __kernel_ipc_pid_t;
-typedef unsigned short __kernel_uid_t;
-typedef unsigned short __kernel_gid_t;
-typedef unsigned int __kernel_size_t;
-typedef int __kernel_ssize_t;
-typedef int __kernel_ptrdiff_t;
-typedef long __kernel_time_t;
-typedef long __kernel_suseconds_t;
-typedef long __kernel_clock_t;
-typedef int __kernel_timer_t;
-typedef int __kernel_clockid_t;
-typedef int __kernel_daddr_t;
-typedef char * __kernel_caddr_t;
-typedef unsigned short __kernel_uid16_t;
-typedef unsigned short __kernel_gid16_t;
-typedef unsigned int __kernel_uid32_t;
-typedef unsigned int __kernel_gid32_t;
-typedef unsigned short __kernel_old_uid_t;
-typedef unsigned short __kernel_old_gid_t;
-typedef unsigned short __kernel_old_dev_t;
-typedef long long __kernel_loff_t;
-typedef struct {
- int __val[2];
-} __kernel_fsid_t;
-typedef unsigned short umode_t;
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-typedef __u16 __le16;
-typedef __u16 __be16;
-typedef __u32 __le32;
-typedef __u32 __be32;
-typedef __u64 __le64;
-typedef __u64 __be64;
-struct timezone
-  {
-    int tz_minuteswest;
-    int tz_dsttime;
-  };
-typedef struct timezone *__restrict __timezone_ptr_t;
-extern int gettimeofday (struct timeval *__restrict __tv,
-    __timezone_ptr_t __tz) __attribute__ ((__nothrow__));
-extern int settimeofday (__const struct timeval *__tv,
-    __const struct timezone *__tz) __attribute__ ((__nothrow__));
-extern int adjtime (__const struct timeval *__delta,
-      struct timeval *__olddelta) __attribute__ ((__nothrow__));
-enum __itimer_which
-  {
-    ITIMER_REAL = 0,
-    ITIMER_VIRTUAL = 1,
-    ITIMER_PROF = 2
-  };
-struct itimerval
-  {
-    struct timeval it_interval;
-    struct timeval it_value;
-  };
-typedef int __itimer_which_t;
-extern int getitimer (__itimer_which_t __which,
-        struct itimerval *__value) __attribute__ ((__nothrow__));
-extern int setitimer (__itimer_which_t __which,
-        __const struct itimerval *__restrict __new,
-        struct itimerval *__restrict __old) __attribute__ ((__nothrow__));
-extern int utimes (__const char *__file, __const struct timeval __tvp[2])
-     __attribute__ ((__nothrow__));
-extern int lutimes (__const char *__file, __const struct timeval __tvp[2])
-     __attribute__ ((__nothrow__));
-extern int futimes (int __fd, __const struct timeval __tvp[2]) __attribute__ ((__nothrow__));
-typedef enum {
-     DIKT_UNICODE = 0x0000,
-     DIKT_SPECIAL = 0xF000,
-     DIKT_FUNCTION = 0xF100,
-     DIKT_MODIFIER = 0xF200,
-     DIKT_LOCK = 0xF300,
-     DIKT_DEAD = 0xF400,
-     DIKT_CUSTOM = 0xF500,
-     DIKT_IDENTIFIER = 0xF600
-} DFBInputDeviceKeyType;
-typedef enum {
-     DIMKI_SHIFT,
-     DIMKI_CONTROL,
-     DIMKI_ALT,
-     DIMKI_ALTGR,
-     DIMKI_META,
-     DIMKI_SUPER,
-     DIMKI_HYPER,
-     DIMKI_FIRST = DIMKI_SHIFT,
-     DIMKI_LAST = DIMKI_HYPER
-} DFBInputDeviceModifierKeyIdentifier;
-typedef enum {
-     DIKI_UNKNOWN = ((DIKT_IDENTIFIER) | (0)),
-     DIKI_A,
-     DIKI_B,
-     DIKI_C,
-     DIKI_D,
-     DIKI_E,
-     DIKI_F,
-     DIKI_G,
-     DIKI_H,
-     DIKI_I,
-     DIKI_J,
-     DIKI_K,
-     DIKI_L,
-     DIKI_M,
-     DIKI_N,
-     DIKI_O,
-     DIKI_P,
-     DIKI_Q,
-     DIKI_R,
-     DIKI_S,
-     DIKI_T,
-     DIKI_U,
-     DIKI_V,
-     DIKI_W,
-     DIKI_X,
-     DIKI_Y,
-     DIKI_Z,
-     DIKI_0,
-     DIKI_1,
-     DIKI_2,
-     DIKI_3,
-     DIKI_4,
-     DIKI_5,
-     DIKI_6,
-     DIKI_7,
-     DIKI_8,
-     DIKI_9,
-     DIKI_F1,
-     DIKI_F2,
-     DIKI_F3,
-     DIKI_F4,
-     DIKI_F5,
-     DIKI_F6,
-     DIKI_F7,
-     DIKI_F8,
-     DIKI_F9,
-     DIKI_F10,
-     DIKI_F11,
-     DIKI_F12,
-     DIKI_SHIFT_L,
-     DIKI_SHIFT_R,
-     DIKI_CONTROL_L,
-     DIKI_CONTROL_R,
-     DIKI_ALT_L,
-     DIKI_ALT_R,
-     DIKI_ALTGR,
-     DIKI_META_L,
-     DIKI_META_R,
-     DIKI_SUPER_L,
-     DIKI_SUPER_R,
-     DIKI_HYPER_L,
-     DIKI_HYPER_R,
-     DIKI_CAPS_LOCK,
-     DIKI_NUM_LOCK,
-     DIKI_SCROLL_LOCK,
-     DIKI_ESCAPE,
-     DIKI_LEFT,
-     DIKI_RIGHT,
-     DIKI_UP,
-     DIKI_DOWN,
-     DIKI_TAB,
-     DIKI_ENTER,
-     DIKI_SPACE,
-     DIKI_BACKSPACE,
-     DIKI_INSERT,
-     DIKI_DELETE,
-     DIKI_HOME,
-     DIKI_END,
-     DIKI_PAGE_UP,
-     DIKI_PAGE_DOWN,
-     DIKI_PRINT,
-     DIKI_PAUSE,
-     DIKI_QUOTE_LEFT,
-     DIKI_MINUS_SIGN,
-     DIKI_EQUALS_SIGN,
-     DIKI_BRACKET_LEFT,
-     DIKI_BRACKET_RIGHT,
-     DIKI_BACKSLASH,
-     DIKI_SEMICOLON,
-     DIKI_QUOTE_RIGHT,
-     DIKI_COMMA,
-     DIKI_PERIOD,
-     DIKI_SLASH,
-     DIKI_LESS_SIGN,
-     DIKI_KP_DIV,
-     DIKI_KP_MULT,
-     DIKI_KP_MINUS,
-     DIKI_KP_PLUS,
-     DIKI_KP_ENTER,
-     DIKI_KP_SPACE,
-     DIKI_KP_TAB,
-     DIKI_KP_F1,
-     DIKI_KP_F2,
-     DIKI_KP_F3,
-     DIKI_KP_F4,
-     DIKI_KP_EQUAL,
-     DIKI_KP_SEPARATOR,
-     DIKI_KP_DECIMAL,
-     DIKI_KP_0,
-     DIKI_KP_1,
-     DIKI_KP_2,
-     DIKI_KP_3,
-     DIKI_KP_4,
-     DIKI_KP_5,
-     DIKI_KP_6,
-     DIKI_KP_7,
-     DIKI_KP_8,
-     DIKI_KP_9,
-     DIKI_KEYDEF_END,
-     DIKI_NUMBER_OF_KEYS = DIKI_KEYDEF_END - ((DIKT_IDENTIFIER) | (0))
-} DFBInputDeviceKeyIdentifier;
-typedef enum {
-     DIKS_NULL = ((DIKT_UNICODE) | (0x00)),
-     DIKS_BACKSPACE = ((DIKT_UNICODE) | (0x08)),
-     DIKS_TAB = ((DIKT_UNICODE) | (0x09)),
-     DIKS_RETURN = ((DIKT_UNICODE) | (0x0D)),
-     DIKS_CANCEL = ((DIKT_UNICODE) | (0x18)),
-     DIKS_ESCAPE = ((DIKT_UNICODE) | (0x1B)),
-     DIKS_SPACE = ((DIKT_UNICODE) | (0x20)),
-     DIKS_EXCLAMATION_MARK = ((DIKT_UNICODE) | (0x21)),
-     DIKS_QUOTATION = ((DIKT_UNICODE) | (0x22)),
-     DIKS_NUMBER_SIGN = ((DIKT_UNICODE) | (0x23)),
-     DIKS_DOLLAR_SIGN = ((DIKT_UNICODE) | (0x24)),
-     DIKS_PERCENT_SIGN = ((DIKT_UNICODE) | (0x25)),
-     DIKS_AMPERSAND = ((DIKT_UNICODE) | (0x26)),
-     DIKS_APOSTROPHE = ((DIKT_UNICODE) | (0x27)),
-     DIKS_PARENTHESIS_LEFT = ((DIKT_UNICODE) | (0x28)),
-     DIKS_PARENTHESIS_RIGHT = ((DIKT_UNICODE) | (0x29)),
-     DIKS_ASTERISK = ((DIKT_UNICODE) | (0x2A)),
-     DIKS_PLUS_SIGN = ((DIKT_UNICODE) | (0x2B)),
-     DIKS_COMMA = ((DIKT_UNICODE) | (0x2C)),
-     DIKS_MINUS_SIGN = ((DIKT_UNICODE) | (0x2D)),
-     DIKS_PERIOD = ((DIKT_UNICODE) | (0x2E)),
-     DIKS_SLASH = ((DIKT_UNICODE) | (0x2F)),
-     DIKS_0 = ((DIKT_UNICODE) | (0x30)),
-     DIKS_1 = ((DIKT_UNICODE) | (0x31)),
-     DIKS_2 = ((DIKT_UNICODE) | (0x32)),
-     DIKS_3 = ((DIKT_UNICODE) | (0x33)),
-     DIKS_4 = ((DIKT_UNICODE) | (0x34)),
-     DIKS_5 = ((DIKT_UNICODE) | (0x35)),
-     DIKS_6 = ((DIKT_UNICODE) | (0x36)),
-     DIKS_7 = ((DIKT_UNICODE) | (0x37)),
-     DIKS_8 = ((DIKT_UNICODE) | (0x38)),
-     DIKS_9 = ((DIKT_UNICODE) | (0x39)),
-     DIKS_COLON = ((DIKT_UNICODE) | (0x3A)),
-     DIKS_SEMICOLON = ((DIKT_UNICODE) | (0x3B)),
-     DIKS_LESS_THAN_SIGN = ((DIKT_UNICODE) | (0x3C)),
-     DIKS_EQUALS_SIGN = ((DIKT_UNICODE) | (0x3D)),
-     DIKS_GREATER_THAN_SIGN = ((DIKT_UNICODE) | (0x3E)),
-     DIKS_QUESTION_MARK = ((DIKT_UNICODE) | (0x3F)),
-     DIKS_AT = ((DIKT_UNICODE) | (0x40)),
-     DIKS_CAPITAL_A = ((DIKT_UNICODE) | (0x41)),
-     DIKS_CAPITAL_B = ((DIKT_UNICODE) | (0x42)),
-     DIKS_CAPITAL_C = ((DIKT_UNICODE) | (0x43)),
-     DIKS_CAPITAL_D = ((DIKT_UNICODE) | (0x44)),
-     DIKS_CAPITAL_E = ((DIKT_UNICODE) | (0x45)),
-     DIKS_CAPITAL_F = ((DIKT_UNICODE) | (0x46)),
-     DIKS_CAPITAL_G = ((DIKT_UNICODE) | (0x47)),
-     DIKS_CAPITAL_H = ((DIKT_UNICODE) | (0x48)),
-     DIKS_CAPITAL_I = ((DIKT_UNICODE) | (0x49)),
-     DIKS_CAPITAL_J = ((DIKT_UNICODE) | (0x4A)),
-     DIKS_CAPITAL_K = ((DIKT_UNICODE) | (0x4B)),
-     DIKS_CAPITAL_L = ((DIKT_UNICODE) | (0x4C)),
-     DIKS_CAPITAL_M = ((DIKT_UNICODE) | (0x4D)),
-     DIKS_CAPITAL_N = ((DIKT_UNICODE) | (0x4E)),
-     DIKS_CAPITAL_O = ((DIKT_UNICODE) | (0x4F)),
-     DIKS_CAPITAL_P = ((DIKT_UNICODE) | (0x50)),
-     DIKS_CAPITAL_Q = ((DIKT_UNICODE) | (0x51)),
-     DIKS_CAPITAL_R = ((DIKT_UNICODE) | (0x52)),
-     DIKS_CAPITAL_S = ((DIKT_UNICODE) | (0x53)),
-     DIKS_CAPITAL_T = ((DIKT_UNICODE) | (0x54)),
-     DIKS_CAPITAL_U = ((DIKT_UNICODE) | (0x55)),
-     DIKS_CAPITAL_V = ((DIKT_UNICODE) | (0x56)),
-     DIKS_CAPITAL_W = ((DIKT_UNICODE) | (0x57)),
-     DIKS_CAPITAL_X = ((DIKT_UNICODE) | (0x58)),
-     DIKS_CAPITAL_Y = ((DIKT_UNICODE) | (0x59)),
-     DIKS_CAPITAL_Z = ((DIKT_UNICODE) | (0x5A)),
-     DIKS_SQUARE_BRACKET_LEFT = ((DIKT_UNICODE) | (0x5B)),
-     DIKS_BACKSLASH = ((DIKT_UNICODE) | (0x5C)),
-     DIKS_SQUARE_BRACKET_RIGHT = ((DIKT_UNICODE) | (0x5D)),
-     DIKS_CIRCUMFLEX_ACCENT = ((DIKT_UNICODE) | (0x5E)),
-     DIKS_UNDERSCORE = ((DIKT_UNICODE) | (0x5F)),
-     DIKS_GRAVE_ACCENT = ((DIKT_UNICODE) | (0x60)),
-     DIKS_SMALL_A = ((DIKT_UNICODE) | (0x61)),
-     DIKS_SMALL_B = ((DIKT_UNICODE) | (0x62)),
-     DIKS_SMALL_C = ((DIKT_UNICODE) | (0x63)),
-     DIKS_SMALL_D = ((DIKT_UNICODE) | (0x64)),
-     DIKS_SMALL_E = ((DIKT_UNICODE) | (0x65)),
-     DIKS_SMALL_F = ((DIKT_UNICODE) | (0x66)),
-     DIKS_SMALL_G = ((DIKT_UNICODE) | (0x67)),
-     DIKS_SMALL_H = ((DIKT_UNICODE) | (0x68)),
-     DIKS_SMALL_I = ((DIKT_UNICODE) | (0x69)),
-     DIKS_SMALL_J = ((DIKT_UNICODE) | (0x6A)),
-     DIKS_SMALL_K = ((DIKT_UNICODE) | (0x6B)),
-     DIKS_SMALL_L = ((DIKT_UNICODE) | (0x6C)),
-     DIKS_SMALL_M = ((DIKT_UNICODE) | (0x6D)),
-     DIKS_SMALL_N = ((DIKT_UNICODE) | (0x6E)),
-     DIKS_SMALL_O = ((DIKT_UNICODE) | (0x6F)),
-     DIKS_SMALL_P = ((DIKT_UNICODE) | (0x70)),
-     DIKS_SMALL_Q = ((DIKT_UNICODE) | (0x71)),
-     DIKS_SMALL_R = ((DIKT_UNICODE) | (0x72)),
-     DIKS_SMALL_S = ((DIKT_UNICODE) | (0x73)),
-     DIKS_SMALL_T = ((DIKT_UNICODE) | (0x74)),
-     DIKS_SMALL_U = ((DIKT_UNICODE) | (0x75)),
-     DIKS_SMALL_V = ((DIKT_UNICODE) | (0x76)),
-     DIKS_SMALL_W = ((DIKT_UNICODE) | (0x77)),
-     DIKS_SMALL_X = ((DIKT_UNICODE) | (0x78)),
-     DIKS_SMALL_Y = ((DIKT_UNICODE) | (0x79)),
-     DIKS_SMALL_Z = ((DIKT_UNICODE) | (0x7A)),
-     DIKS_CURLY_BRACKET_LEFT = ((DIKT_UNICODE) | (0x7B)),
-     DIKS_VERTICAL_BAR = ((DIKT_UNICODE) | (0x7C)),
-     DIKS_CURLY_BRACKET_RIGHT = ((DIKT_UNICODE) | (0x7D)),
-     DIKS_TILDE = ((DIKT_UNICODE) | (0x7E)),
-     DIKS_DELETE = ((DIKT_UNICODE) | (0x7F)),
-     DIKS_ENTER = DIKS_RETURN,
-     DIKS_CURSOR_LEFT = ((DIKT_SPECIAL) | (0x00)),
-     DIKS_CURSOR_RIGHT = ((DIKT_SPECIAL) | (0x01)),
-     DIKS_CURSOR_UP = ((DIKT_SPECIAL) | (0x02)),
-     DIKS_CURSOR_DOWN = ((DIKT_SPECIAL) | (0x03)),
-     DIKS_INSERT = ((DIKT_SPECIAL) | (0x04)),
-     DIKS_HOME = ((DIKT_SPECIAL) | (0x05)),
-     DIKS_END = ((DIKT_SPECIAL) | (0x06)),
-     DIKS_PAGE_UP = ((DIKT_SPECIAL) | (0x07)),
-     DIKS_PAGE_DOWN = ((DIKT_SPECIAL) | (0x08)),
-     DIKS_PRINT = ((DIKT_SPECIAL) | (0x09)),
-     DIKS_PAUSE = ((DIKT_SPECIAL) | (0x0A)),
-     DIKS_OK = ((DIKT_SPECIAL) | (0x0B)),
-     DIKS_SELECT = ((DIKT_SPECIAL) | (0x0C)),
-     DIKS_GOTO = ((DIKT_SPECIAL) | (0x0D)),
-     DIKS_CLEAR = ((DIKT_SPECIAL) | (0x0E)),
-     DIKS_POWER = ((DIKT_SPECIAL) | (0x0F)),
-     DIKS_POWER2 = ((DIKT_SPECIAL) | (0x10)),
-     DIKS_OPTION = ((DIKT_SPECIAL) | (0x11)),
-     DIKS_MENU = ((DIKT_SPECIAL) | (0x12)),
-     DIKS_HELP = ((DIKT_SPECIAL) | (0x13)),
-     DIKS_INFO = ((DIKT_SPECIAL) | (0x14)),
-     DIKS_TIME = ((DIKT_SPECIAL) | (0x15)),
-     DIKS_VENDOR = ((DIKT_SPECIAL) | (0x16)),
-     DIKS_ARCHIVE = ((DIKT_SPECIAL) | (0x17)),
-     DIKS_PROGRAM = ((DIKT_SPECIAL) | (0x18)),
-     DIKS_CHANNEL = ((DIKT_SPECIAL) | (0x19)),
-     DIKS_FAVORITES = ((DIKT_SPECIAL) | (0x1A)),
-     DIKS_EPG = ((DIKT_SPECIAL) | (0x1B)),
-     DIKS_PVR = ((DIKT_SPECIAL) | (0x1C)),
-     DIKS_MHP = ((DIKT_SPECIAL) | (0x1D)),
-     DIKS_LANGUAGE = ((DIKT_SPECIAL) | (0x1E)),
-     DIKS_TITLE = ((DIKT_SPECIAL) | (0x1F)),
-     DIKS_SUBTITLE = ((DIKT_SPECIAL) | (0x20)),
-     DIKS_ANGLE = ((DIKT_SPECIAL) | (0x21)),
-     DIKS_ZOOM = ((DIKT_SPECIAL) | (0x22)),
-     DIKS_MODE = ((DIKT_SPECIAL) | (0x23)),
-     DIKS_KEYBOARD = ((DIKT_SPECIAL) | (0x24)),
-     DIKS_PC = ((DIKT_SPECIAL) | (0x25)),
-     DIKS_SCREEN = ((DIKT_SPECIAL) | (0x26)),
-     DIKS_TV = ((DIKT_SPECIAL) | (0x27)),
-     DIKS_TV2 = ((DIKT_SPECIAL) | (0x28)),
-     DIKS_VCR = ((DIKT_SPECIAL) | (0x29)),
-     DIKS_VCR2 = ((DIKT_SPECIAL) | (0x2A)),
-     DIKS_SAT = ((DIKT_SPECIAL) | (0x2B)),
-     DIKS_SAT2 = ((DIKT_SPECIAL) | (0x2C)),
-     DIKS_CD = ((DIKT_SPECIAL) | (0x2D)),
-     DIKS_TAPE = ((DIKT_SPECIAL) | (0x2E)),
-     DIKS_RADIO = ((DIKT_SPECIAL) | (0x2F)),
-     DIKS_TUNER = ((DIKT_SPECIAL) | (0x30)),
-     DIKS_PLAYER = ((DIKT_SPECIAL) | (0x31)),
-     DIKS_TEXT = ((DIKT_SPECIAL) | (0x32)),
-     DIKS_DVD = ((DIKT_SPECIAL) | (0x33)),
-     DIKS_AUX = ((DIKT_SPECIAL) | (0x34)),
-     DIKS_MP3 = ((DIKT_SPECIAL) | (0x35)),
-     DIKS_PHONE = ((DIKT_SPECIAL) | (0x36)),
-     DIKS_AUDIO = ((DIKT_SPECIAL) | (0x37)),
-     DIKS_VIDEO = ((DIKT_SPECIAL) | (0x38)),
-     DIKS_INTERNET = ((DIKT_SPECIAL) | (0x39)),
-     DIKS_MAIL = ((DIKT_SPECIAL) | (0x3A)),
-     DIKS_NEWS = ((DIKT_SPECIAL) | (0x3B)),
-     DIKS_DIRECTORY = ((DIKT_SPECIAL) | (0x3C)),
-     DIKS_LIST = ((DIKT_SPECIAL) | (0x3D)),
-     DIKS_CALCULATOR = ((DIKT_SPECIAL) | (0x3E)),
-     DIKS_MEMO = ((DIKT_SPECIAL) | (0x3F)),
-     DIKS_CALENDAR = ((DIKT_SPECIAL) | (0x40)),
-     DIKS_EDITOR = ((DIKT_SPECIAL) | (0x41)),
-     DIKS_RED = ((DIKT_SPECIAL) | (0x42)),
-     DIKS_GREEN = ((DIKT_SPECIAL) | (0x43)),
-     DIKS_YELLOW = ((DIKT_SPECIAL) | (0x44)),
-     DIKS_BLUE = ((DIKT_SPECIAL) | (0x45)),
-     DIKS_CHANNEL_UP = ((DIKT_SPECIAL) | (0x46)),
-     DIKS_CHANNEL_DOWN = ((DIKT_SPECIAL) | (0x47)),
-     DIKS_BACK = ((DIKT_SPECIAL) | (0x48)),
-     DIKS_FORWARD = ((DIKT_SPECIAL) | (0x49)),
-     DIKS_FIRST = ((DIKT_SPECIAL) | (0x4A)),
-     DIKS_LAST = ((DIKT_SPECIAL) | (0x4B)),
-     DIKS_VOLUME_UP = ((DIKT_SPECIAL) | (0x4C)),
-     DIKS_VOLUME_DOWN = ((DIKT_SPECIAL) | (0x4D)),
-     DIKS_MUTE = ((DIKT_SPECIAL) | (0x4E)),
-     DIKS_AB = ((DIKT_SPECIAL) | (0x4F)),
-     DIKS_PLAYPAUSE = ((DIKT_SPECIAL) | (0x50)),
-     DIKS_PLAY = ((DIKT_SPECIAL) | (0x51)),
-     DIKS_STOP = ((DIKT_SPECIAL) | (0x52)),
-     DIKS_RESTART = ((DIKT_SPECIAL) | (0x53)),
-     DIKS_SLOW = ((DIKT_SPECIAL) | (0x54)),
-     DIKS_FAST = ((DIKT_SPECIAL) | (0x55)),
-     DIKS_RECORD = ((DIKT_SPECIAL) | (0x56)),
-     DIKS_EJECT = ((DIKT_SPECIAL) | (0x57)),
-     DIKS_SHUFFLE = ((DIKT_SPECIAL) | (0x58)),
-     DIKS_REWIND = ((DIKT_SPECIAL) | (0x59)),
-     DIKS_FASTFORWARD = ((DIKT_SPECIAL) | (0x5A)),
-     DIKS_PREVIOUS = ((DIKT_SPECIAL) | (0x5B)),
-     DIKS_NEXT = ((DIKT_SPECIAL) | (0x5C)),
-     DIKS_BEGIN = ((DIKT_SPECIAL) | (0x5D)),
-     DIKS_DIGITS = ((DIKT_SPECIAL) | (0x5E)),
-     DIKS_TEEN = ((DIKT_SPECIAL) | (0x5F)),
-     DIKS_TWEN = ((DIKT_SPECIAL) | (0x60)),
-     DIKS_BREAK = ((DIKT_SPECIAL) | (0x61)),
-     DIKS_EXIT = ((DIKT_SPECIAL) | (0x62)),
-     DIKS_SETUP = ((DIKT_SPECIAL) | (0x63)),
-     DIKS_CURSOR_LEFT_UP = ((DIKT_SPECIAL) | (0x64)),
-     DIKS_CURSOR_LEFT_DOWN = ((DIKT_SPECIAL) | (0x65)),
-     DIKS_CURSOR_UP_RIGHT = ((DIKT_SPECIAL) | (0x66)),
-     DIKS_CURSOR_DOWN_RIGHT = ((DIKT_SPECIAL) | (0x67)),
-     DIKS_F1 = (((DIKT_FUNCTION) | (1))),
-     DIKS_F2 = (((DIKT_FUNCTION) | (2))),
-     DIKS_F3 = (((DIKT_FUNCTION) | (3))),
-     DIKS_F4 = (((DIKT_FUNCTION) | (4))),
-     DIKS_F5 = (((DIKT_FUNCTION) | (5))),
-     DIKS_F6 = (((DIKT_FUNCTION) | (6))),
-     DIKS_F7 = (((DIKT_FUNCTION) | (7))),
-     DIKS_F8 = (((DIKT_FUNCTION) | (8))),
-     DIKS_F9 = (((DIKT_FUNCTION) | (9))),
-     DIKS_F10 = (((DIKT_FUNCTION) | (10))),
-     DIKS_F11 = (((DIKT_FUNCTION) | (11))),
-     DIKS_F12 = (((DIKT_FUNCTION) | (12))),
-     DIKS_SHIFT = (((DIKT_MODIFIER) | ((1 << DIMKI_SHIFT)))),
-     DIKS_CONTROL = (((DIKT_MODIFIER) | ((1 << DIMKI_CONTROL)))),
-     DIKS_ALT = (((DIKT_MODIFIER) | ((1 << DIMKI_ALT)))),
-     DIKS_ALTGR = (((DIKT_MODIFIER) | ((1 << DIMKI_ALTGR)))),
-     DIKS_META = (((DIKT_MODIFIER) | ((1 << DIMKI_META)))),
-     DIKS_SUPER = (((DIKT_MODIFIER) | ((1 << DIMKI_SUPER)))),
-     DIKS_HYPER = (((DIKT_MODIFIER) | ((1 << DIMKI_HYPER)))),
-     DIKS_CAPS_LOCK = ((DIKT_LOCK) | (0x00)),
-     DIKS_NUM_LOCK = ((DIKT_LOCK) | (0x01)),
-     DIKS_SCROLL_LOCK = ((DIKT_LOCK) | (0x02)),
-     DIKS_DEAD_ABOVEDOT = ((DIKT_DEAD) | (0x00)),
-     DIKS_DEAD_ABOVERING = ((DIKT_DEAD) | (0x01)),
-     DIKS_DEAD_ACUTE = ((DIKT_DEAD) | (0x02)),
-     DIKS_DEAD_BREVE = ((DIKT_DEAD) | (0x03)),
-     DIKS_DEAD_CARON = ((DIKT_DEAD) | (0x04)),
-     DIKS_DEAD_CEDILLA = ((DIKT_DEAD) | (0x05)),
-     DIKS_DEAD_CIRCUMFLEX = ((DIKT_DEAD) | (0x06)),
-     DIKS_DEAD_DIAERESIS = ((DIKT_DEAD) | (0x07)),
-     DIKS_DEAD_DOUBLEACUTE = ((DIKT_DEAD) | (0x08)),
-     DIKS_DEAD_GRAVE = ((DIKT_DEAD) | (0x09)),
-     DIKS_DEAD_IOTA = ((DIKT_DEAD) | (0x0A)),
-     DIKS_DEAD_MACRON = ((DIKT_DEAD) | (0x0B)),
-     DIKS_DEAD_OGONEK = ((DIKT_DEAD) | (0x0C)),
-     DIKS_DEAD_SEMIVOICED_SOUND = ((DIKT_DEAD) | (0x0D)),
-     DIKS_DEAD_TILDE = ((DIKT_DEAD) | (0x0E)),
-     DIKS_DEAD_VOICED_SOUND = ((DIKT_DEAD) | (0x0F)),
-     DIKS_CUSTOM0 = (((DIKT_CUSTOM) | (0))),
-     DIKS_CUSTOM1 = (((DIKT_CUSTOM) | (1))),
-     DIKS_CUSTOM2 = (((DIKT_CUSTOM) | (2))),
-     DIKS_CUSTOM3 = (((DIKT_CUSTOM) | (3))),
-     DIKS_CUSTOM4 = (((DIKT_CUSTOM) | (4))),
-     DIKS_CUSTOM5 = (((DIKT_CUSTOM) | (5))),
-     DIKS_CUSTOM6 = (((DIKT_CUSTOM) | (6))),
-     DIKS_CUSTOM7 = (((DIKT_CUSTOM) | (7))),
-     DIKS_CUSTOM8 = (((DIKT_CUSTOM) | (8))),
-     DIKS_CUSTOM9 = (((DIKT_CUSTOM) | (9)))
-} DFBInputDeviceKeySymbol;
-typedef enum {
-     DILS_SCROLL = 0x00000001,
-     DILS_NUM = 0x00000002,
-     DILS_CAPS = 0x00000004
-} DFBInputDeviceLockState;
-typedef enum {
-     DIKSI_BASE = 0x00,
-     DIKSI_BASE_SHIFT = 0x01,
-     DIKSI_ALT = 0x02,
-     DIKSI_ALT_SHIFT = 0x03,
-     DIKSI_LAST = DIKSI_ALT_SHIFT
-} DFBInputDeviceKeymapSymbolIndex;
-typedef struct {
-     int code;
-     DFBInputDeviceLockState locks;
-     DFBInputDeviceKeyIdentifier identifier;
-     DFBInputDeviceKeySymbol symbols[DIKSI_LAST+1];
-} DFBInputDeviceKeymapEntry;
-extern const unsigned int directfb_major_version;
-extern const unsigned int directfb_minor_version;
-extern const unsigned int directfb_micro_version;
-extern const unsigned int directfb_binary_age;
-extern const unsigned int directfb_interface_age;
-const char * DirectFBCheckVersion( unsigned int required_major,
-                                   unsigned int required_minor,
-                                   unsigned int required_micro );
-typedef struct _IDirectFB IDirectFB;
-typedef struct _IDirectFBScreen IDirectFBScreen;
-typedef struct _IDirectFBDisplayLayer IDirectFBDisplayLayer;
-typedef struct _IDirectFBSurface IDirectFBSurface;
-typedef struct _IDirectFBPalette IDirectFBPalette;
-typedef struct _IDirectFBWindow IDirectFBWindow;
-typedef struct _IDirectFBInputDevice IDirectFBInputDevice;
-typedef struct _IDirectFBEventBuffer IDirectFBEventBuffer;
-typedef struct _IDirectFBFont IDirectFBFont;
-typedef struct _IDirectFBImageProvider IDirectFBImageProvider;
-typedef struct _IDirectFBVideoProvider IDirectFBVideoProvider;
-typedef struct _IDirectFBDataBuffer IDirectFBDataBuffer;
-typedef struct _IDirectFBGL IDirectFBGL;
-typedef enum {
-     DFB_OK,
-     DFB_FAILURE,
-     DFB_INIT,
-     DFB_BUG,
-     DFB_DEAD,
-     DFB_UNSUPPORTED,
-     DFB_UNIMPLEMENTED,
-     DFB_ACCESSDENIED,
-     DFB_INVARG,
-     DFB_NOSYSTEMMEMORY,
-     DFB_NOVIDEOMEMORY,
-     DFB_LOCKED,
-     DFB_BUFFEREMPTY,
-     DFB_FILENOTFOUND,
-     DFB_IO,
-     DFB_BUSY,
-     DFB_NOIMPL,
-     DFB_MISSINGFONT,
-     DFB_TIMEOUT,
-     DFB_MISSINGIMAGE,
-     DFB_THIZNULL,
-     DFB_IDNOTFOUND,
-     DFB_INVAREA,
-     DFB_DESTROYED,
-     DFB_FUSION,
-     DFB_BUFFERTOOLARGE,
-     DFB_INTERRUPTED,
-     DFB_NOCONTEXT,
-     DFB_TEMPUNAVAIL,
-     DFB_LIMITEXCEEDED,
-     DFB_NOSUCHMETHOD,
-     DFB_NOSUCHINSTANCE,
-     DFB_ITEMNOTFOUND,
-     DFB_VERSIONMISMATCH,
-     DFB_NOSHAREDMEMORY
-} DFBResult;
-typedef enum {
-     DFB_FALSE = 0,
-     DFB_TRUE = !DFB_FALSE
-} DFBBoolean;
-typedef struct {
-     int x;
-     int y;
-} DFBPoint;
-typedef struct {
-     int x;
-     int w;
-} DFBSpan;
-typedef struct {
-     int w;
-     int h;
-} DFBDimension;
-typedef struct {
-     int x;
-     int y;
-     int w;
-     int h;
-} DFBRectangle;
-typedef struct {
-     float x;
-     float y;
-     float w;
-     float h;
-} DFBLocation;
-typedef struct {
-     int x1;
-     int y1;
-     int x2;
-     int y2;
-} DFBRegion;
-typedef struct {
-     int l;
-     int t;
-     int r;
-     int b;
-} DFBInsets;
-typedef struct {
-     int x1;
-     int y1;
-     int x2;
-     int y2;
-     int x3;
-     int y3;
-} DFBTriangle;
-typedef struct {
-     __u8 a;
-     __u8 r;
-     __u8 g;
-     __u8 b;
-} DFBColor;
-DFBResult DirectFBError(
-                             const char *msg,
-                             DFBResult result
-                       );
-DFBResult DirectFBErrorFatal(
-                             const char *msg,
-                             DFBResult result
-                            );
-const char *DirectFBErrorString(
-                         DFBResult result
-                      );
-const char *DirectFBUsageString( void );
-DFBResult DirectFBInit(
-                         int *argc,
-                         char **argv[]
-                      );
-DFBResult DirectFBSetOption(
-                         const char *name,
-                         const char *value
-                      );
-DFBResult DirectFBCreate(
-                          IDirectFB **interface
-                        );
-typedef unsigned int DFBScreenID;
-typedef unsigned int DFBDisplayLayerID;
-typedef unsigned int DFBDisplayLayerSourceID;
-typedef unsigned int DFBWindowID;
-typedef unsigned int DFBInputDeviceID;
-typedef __u32 DFBDisplayLayerIDs;
-typedef enum {
-     DFSCL_NORMAL = 0x00000000,
-     DFSCL_FULLSCREEN,
-     DFSCL_EXCLUSIVE
-} DFBCooperativeLevel;
-typedef enum {
-     DLCAPS_NONE = 0x00000000,
-     DLCAPS_SURFACE = 0x00000001,
-     DLCAPS_OPACITY = 0x00000002,
-     DLCAPS_ALPHACHANNEL = 0x00000004,
-     DLCAPS_SCREEN_LOCATION = 0x00000008,
-     DLCAPS_FLICKER_FILTERING = 0x00000010,
-     DLCAPS_DEINTERLACING = 0x00000020,
-     DLCAPS_SRC_COLORKEY = 0x00000040,
-     DLCAPS_DST_COLORKEY = 0x00000080,
-     DLCAPS_BRIGHTNESS = 0x00000100,
-     DLCAPS_CONTRAST = 0x00000200,
-     DLCAPS_HUE = 0x00000400,
-     DLCAPS_SATURATION = 0x00000800,
-     DLCAPS_LEVELS = 0x00001000,
-     DLCAPS_FIELD_PARITY = 0x00002000,
-     DLCAPS_WINDOWS = 0x00004000,
-     DLCAPS_SOURCES = 0x00008000,
-     DLCAPS_ALPHA_RAMP = 0x00010000,
-     DLCAPS_PREMULTIPLIED = 0x00020000,
-     DLCAPS_SCREEN_POSITION = 0x00100000,
-     DLCAPS_SCREEN_SIZE = 0x00200000,
-     DLCAPS_ALL = 0x0033FFFF
-} DFBDisplayLayerCapabilities;
-typedef enum {
-     DSCCAPS_NONE = 0x00000000,
-     DSCCAPS_VSYNC = 0x00000001,
-     DSCCAPS_POWER_MANAGEMENT = 0x00000002,
-     DSCCAPS_MIXERS = 0x00000010,
-     DSCCAPS_ENCODERS = 0x00000020,
-     DSCCAPS_OUTPUTS = 0x00000040,
-     DSCCAPS_ALL = 0x00000073
-} DFBScreenCapabilities;
-typedef enum {
-     DLOP_NONE = 0x00000000,
-     DLOP_ALPHACHANNEL = 0x00000001,
-     DLOP_FLICKER_FILTERING = 0x00000002,
-     DLOP_DEINTERLACING = 0x00000004,
-     DLOP_SRC_COLORKEY = 0x00000008,
-     DLOP_DST_COLORKEY = 0x00000010,
-     DLOP_OPACITY = 0x00000020,
-     DLOP_FIELD_PARITY = 0x00000040
-} DFBDisplayLayerOptions;
-typedef enum {
-     DLBM_UNKNOWN = 0x00000000,
-     DLBM_FRONTONLY = 0x00000001,
-     DLBM_BACKVIDEO = 0x00000002,
-     DLBM_BACKSYSTEM = 0x00000004,
-     DLBM_TRIPLE = 0x00000008,
-     DLBM_WINDOWS = 0x00000010
-} DFBDisplayLayerBufferMode;
-typedef enum {
-     DSDESC_CAPS = 0x00000001,
-     DSDESC_WIDTH = 0x00000002,
-     DSDESC_HEIGHT = 0x00000004,
-     DSDESC_PIXELFORMAT = 0x00000008,
-     DSDESC_PREALLOCATED = 0x00000010,
-     DSDESC_PALETTE = 0x00000020
-} DFBSurfaceDescriptionFlags;
-typedef enum {
-     DPDESC_CAPS = 0x00000001,
-     DPDESC_SIZE = 0x00000002,
-     DPDESC_ENTRIES = 0x00000004
-} DFBPaletteDescriptionFlags;
-typedef enum {
-     DSCAPS_NONE = 0x00000000,
-     DSCAPS_PRIMARY = 0x00000001,
-     DSCAPS_SYSTEMONLY = 0x00000002,
-     DSCAPS_VIDEOONLY = 0x00000004,
-     DSCAPS_DOUBLE = 0x00000010,
-     DSCAPS_SUBSURFACE = 0x00000020,
-     DSCAPS_INTERLACED = 0x00000040,
-     DSCAPS_SEPARATED = 0x00000080,
-     DSCAPS_STATIC_ALLOC = 0x00000100,
-     DSCAPS_TRIPLE = 0x00000200,
-     DSCAPS_PREMULTIPLIED = 0x00001000,
-     DSCAPS_DEPTH = 0x00010000,
-     DSCAPS_ALL = 0x000113F7,
-     DSCAPS_FLIPPING = DSCAPS_DOUBLE | DSCAPS_TRIPLE
-} DFBSurfaceCapabilities;
-typedef enum {
-     DPCAPS_NONE = 0x00000000
-} DFBPaletteCapabilities;
-typedef enum {
-     DSDRAW_NOFX = 0x00000000,
-     DSDRAW_BLEND = 0x00000001,
-     DSDRAW_DST_COLORKEY = 0x00000002,
-     DSDRAW_SRC_PREMULTIPLY = 0x00000004,
-     DSDRAW_DST_PREMULTIPLY = 0x00000008,
-     DSDRAW_DEMULTIPLY = 0x00000010,
-     DSDRAW_XOR = 0x00000020
-} DFBSurfaceDrawingFlags;
-typedef enum {
-     DSBLIT_NOFX = 0x00000000,
-     DSBLIT_BLEND_ALPHACHANNEL = 0x00000001,
-     DSBLIT_BLEND_COLORALPHA = 0x00000002,
-     DSBLIT_COLORIZE = 0x00000004,
-     DSBLIT_SRC_COLORKEY = 0x00000008,
-     DSBLIT_DST_COLORKEY = 0x00000010,
-     DSBLIT_SRC_PREMULTIPLY = 0x00000020,
-     DSBLIT_DST_PREMULTIPLY = 0x00000040,
-     DSBLIT_DEMULTIPLY = 0x00000080,
-     DSBLIT_DEINTERLACE = 0x00000100
-} DFBSurfaceBlittingFlags;
-typedef enum {
-     DFXL_NONE = 0x00000000,
-     DFXL_FILLRECTANGLE = 0x00000001,
-     DFXL_DRAWRECTANGLE = 0x00000002,
-     DFXL_DRAWLINE = 0x00000004,
-     DFXL_FILLTRIANGLE = 0x00000008,
-     DFXL_BLIT = 0x00010000,
-     DFXL_STRETCHBLIT = 0x00020000,
-     DFXL_TEXTRIANGLES = 0x00040000,
-     DFXL_DRAWSTRING = 0x01000000,
-     DFXL_ALL = 0x0107000F
-} DFBAccelerationMask;
-typedef struct {
-     DFBAccelerationMask acceleration_mask;
-     DFBSurfaceDrawingFlags drawing_flags;
-     DFBSurfaceBlittingFlags blitting_flags;
-     unsigned int video_memory;
-} DFBCardCapabilities;
-typedef enum {
-     DLTF_NONE = 0x00000000,
-     DLTF_GRAPHICS = 0x00000001,
-     DLTF_VIDEO = 0x00000002,
-     DLTF_STILL_PICTURE = 0x00000004,
-     DLTF_BACKGROUND = 0x00000008,
-     DLTF_ALL = 0x0000000F
-} DFBDisplayLayerTypeFlags;
-typedef enum {
-     DIDTF_NONE = 0x00000000,
-     DIDTF_KEYBOARD = 0x00000001,
-     DIDTF_MOUSE = 0x00000002,
-     DIDTF_JOYSTICK = 0x00000004,
-     DIDTF_REMOTE = 0x00000008,
-     DIDTF_VIRTUAL = 0x00000010,
-     DIDTF_ALL = 0x0000001F
-} DFBInputDeviceTypeFlags;
-typedef enum {
-     DICAPS_KEYS = 0x00000001,
-     DICAPS_AXES = 0x00000002,
-     DICAPS_BUTTONS = 0x00000004,
-     DICAPS_ALL = 0x00000007
-} DFBInputDeviceCapabilities;
-typedef enum {
-     DIBI_LEFT = 0x00000000,
-     DIBI_RIGHT = 0x00000001,
-     DIBI_MIDDLE = 0x00000002,
-     DIBI_FIRST = DIBI_LEFT,
-     DIBI_LAST = 0x0000001F
-} DFBInputDeviceButtonIdentifier;
-typedef enum {
-     DIAI_X = 0x00000000,
-     DIAI_Y = 0x00000001,
-     DIAI_Z = 0x00000002,
-     DIAI_FIRST = DIAI_X,
-     DIAI_LAST = 0x0000001F
-} DFBInputDeviceAxisIdentifier;
-typedef enum {
-     DWDESC_CAPS = 0x00000001,
-     DWDESC_WIDTH = 0x00000002,
-     DWDESC_HEIGHT = 0x00000004,
-     DWDESC_PIXELFORMAT = 0x00000008,
-     DWDESC_POSX = 0x00000010,
-     DWDESC_POSY = 0x00000020,
-     DWDESC_SURFACE_CAPS = 0x00000040
-} DFBWindowDescriptionFlags;
-typedef enum {
-     DBDESC_FILE = 0x00000001,
-     DBDESC_MEMORY = 0x00000002
-} DFBDataBufferDescriptionFlags;
-typedef enum {
-     DWCAPS_NONE = 0x00000000,
-     DWCAPS_ALPHACHANNEL = 0x00000001,
-     DWCAPS_DOUBLEBUFFER = 0x00000002,
-     DWCAPS_INPUTONLY = 0x00000004,
-     DWCAPS_NODECORATION = 0x00000008,
-     DWCAPS_ALL = 0x0000000F
-} DFBWindowCapabilities;
-typedef enum {
-     DFFA_NONE = 0x00000000,
-     DFFA_NOKERNING = 0x00000001,
-     DFFA_NOHINTING = 0x00000002,
-     DFFA_MONOCHROME = 0x00000004,
-     DFFA_NOCHARMAP = 0x00000008
-} DFBFontAttributes;
-typedef enum {
-     DFDESC_ATTRIBUTES = 0x00000001,
-     DFDESC_HEIGHT = 0x00000002,
-     DFDESC_WIDTH = 0x00000004,
-     DFDESC_INDEX = 0x00000008,
-     DFDESC_FIXEDADVANCE = 0x00000010
-} DFBFontDescriptionFlags;
-typedef struct {
-     DFBFontDescriptionFlags flags;
-     DFBFontAttributes attributes;
-     int height;
-     int width;
-     unsigned int index;
-     int fixed_advance;
-} DFBFontDescription;
-typedef enum {
-     DSPF_UNKNOWN = 0x00000000,
-     DSPF_ARGB1555 = ( (((0 ) & 0x7F) ) | (((15) & 0x1F) << 7) | (((1) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((2 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_RGB16 = ( (((1 ) & 0x7F) ) | (((16) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((2 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_RGB24 = ( (((2 ) & 0x7F) ) | (((24) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((3 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_RGB32 = ( (((3 ) & 0x7F) ) | (((24) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((4 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_ARGB = ( (((4 ) & 0x7F) ) | (((24) & 0x1F) << 7) | (((8) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((4 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_A8 = ( (((5 ) & 0x7F) ) | (((0) & 0x1F) << 7) | (((8) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_YUY2 = ( (((6 ) & 0x7F) ) | (((16) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((2 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_RGB332 = ( (((7 ) & 0x7F) ) | (((8) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_UYVY = ( (((8 ) & 0x7F) ) | (((16) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((2 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_I420 = ( (((9 ) & 0x7F) ) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((2 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_YV12 = ( (((10 ) & 0x7F) ) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((2 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_LUT8 = ( (((11 ) & 0x7F) ) | (((8) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((1 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_ALUT44 = ( (((12 ) & 0x7F) ) | (((4) & 0x1F) << 7) | (((4) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((1 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_AiRGB = ( (((13 ) & 0x7F) ) | (((24) & 0x1F) << 7) | (((8) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((4 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((1 ) ? 1 :0) << 31) ),
-     DSPF_A1 = ( (((14 ) & 0x7F) ) | (((0) & 0x1F) << 7) | (((1) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((1 ) & 0x07) << 17) | (((0 ) & 0x07) << 20) | (((7 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_NV12 = ( (((15 ) & 0x7F) ) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((2 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_NV16 = ( (((16 ) & 0x7F) ) | (((24) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((2 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_ARGB2554 = ( (((17 ) & 0x7F) ) | (((14) & 0x1F) << 7) | (((2) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((2 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_ARGB4444 = ( (((18 ) & 0x7F) ) | (((12) & 0x1F) << 7) | (((4) & 0x0F) << 12) | (((1 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((2 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((0 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) ),
-     DSPF_NV21 = ( (((19 ) & 0x7F) ) | (((12) & 0x1F) << 7) | (((0) & 0x0F) << 12) | (((0 ) ? 1 :0) << 16) | (((0 ) & 0x07) << 17) | (((1 ) & 0x07) << 20) | (((0 ) & 0x07) << 23) | (((2 ) & 0x03) << 26) | (((0 ) & 0x03) << 28) | (((0 ) ? 1 :0) << 30) | (((0 ) ? 1 :0) << 31) )
-} DFBSurfacePixelFormat;
-typedef struct {
-     DFBSurfaceDescriptionFlags flags;
-     DFBSurfaceCapabilities caps;
-     int width;
-     int height;
-     DFBSurfacePixelFormat pixelformat;
-     struct {
-          void *data;
-          int pitch;
-     } preallocated[2];
-     struct {
-          DFBColor *entries;
-          unsigned int size;
-     } palette;
-} DFBSurfaceDescription;
-typedef struct {
-     DFBPaletteDescriptionFlags flags;
-     DFBPaletteCapabilities caps;
-     unsigned int size;
-     DFBColor *entries;
-} DFBPaletteDescription;
-typedef struct {
-     DFBDisplayLayerTypeFlags type;
-     DFBDisplayLayerCapabilities caps;
-     char name[32];
-     int level;
-     int regions;
-     int sources;
-} DFBDisplayLayerDescription;
-typedef struct {
-     DFBDisplayLayerSourceID source_id;
-     char name[24];
-} DFBDisplayLayerSourceDescription;
-typedef struct {
-     DFBScreenCapabilities caps;
-     char name[32];
-     int mixers;
-     int encoders;
-     int outputs;
-} DFBScreenDescription;
-typedef struct {
-     DFBInputDeviceTypeFlags type;
-     DFBInputDeviceCapabilities caps;
-     int min_keycode;
-     int max_keycode;
-     DFBInputDeviceAxisIdentifier max_axis;
-     DFBInputDeviceButtonIdentifier max_button;
-     char name[32];
-     char vendor[40];
-} DFBInputDeviceDescription;
-typedef struct {
-     DFBWindowDescriptionFlags flags;
-     DFBWindowCapabilities caps;
-     int width;
-     int height;
-     DFBSurfacePixelFormat pixelformat;
-     int posx;
-     int posy;
-     DFBSurfaceCapabilities surface_caps;
-} DFBWindowDescription;
-typedef struct {
-     DFBDataBufferDescriptionFlags flags;
-     const char *file;
-     struct {
-          const void *data;
-          unsigned int length;
-     } memory;
-} DFBDataBufferDescription;
-typedef enum {
-     DFENUM_OK = 0x00000000,
-     DFENUM_CANCEL = 0x00000001
-} DFBEnumerationResult;
-typedef DFBEnumerationResult (*DFBVideoModeCallback) (
-     int width,
-     int height,
-     int bpp,
-     void *callbackdata
-);
-typedef DFBEnumerationResult (*DFBScreenCallback) (
-     DFBScreenID screen_id,
-     DFBScreenDescription desc,
-     void *callbackdata
-);
-typedef DFBEnumerationResult (*DFBDisplayLayerCallback) (
-     DFBDisplayLayerID layer_id,
-     DFBDisplayLayerDescription desc,
-     void *callbackdata
-);
-typedef DFBEnumerationResult (*DFBInputDeviceCallback) (
-     DFBInputDeviceID device_id,
-     DFBInputDeviceDescription desc,
-     void *callbackdata
-);
-typedef int (*DFBGetDataCallback) (
-     void *buffer,
-     unsigned int length,
-     void *callbackdata
-);
-typedef enum {
-     DVCAPS_BASIC = 0x00000000,
-     DVCAPS_SEEK = 0x00000001,
-     DVCAPS_SCALE = 0x00000002,
-     DVCAPS_INTERLACED = 0x00000004,
-     DVCAPS_BRIGHTNESS = 0x00000010,
-     DVCAPS_CONTRAST = 0x00000020,
-     DVCAPS_HUE = 0x00000040,
-     DVCAPS_SATURATION = 0x00000080
-} DFBVideoProviderCapabilities;
-typedef enum {
-     DCAF_NONE = 0x00000000,
-     DCAF_BRIGHTNESS = 0x00000001,
-     DCAF_CONTRAST = 0x00000002,
-     DCAF_HUE = 0x00000004,
-     DCAF_SATURATION = 0x00000008
-} DFBColorAdjustmentFlags;
-typedef struct {
-     DFBColorAdjustmentFlags flags;
-     __u16 brightness;
-     __u16 contrast;
-     __u16 hue;
-     __u16 saturation;
-} DFBColorAdjustment;
-struct _IDirectFB { void *priv; int magic; DFBResult (*AddRef)( IDirectFB *thiz ); DFBResult (*Release)( IDirectFB *thiz ); DFBResult (*SetCooperativeLevel) ( IDirectFB *thiz, DFBCooperativeLevel level ); DFBResult (*SetVideoMode) ( IDirectFB *thiz, int width, int height, int bpp ); DFBResult (*GetCardCapabilities) ( IDirectFB *thiz, DFBCardCapabilities *ret_caps ); DFBResult (*EnumVideoModes) ( IDirectFB *thiz, DFBVideoModeCallback callback, void *callbackdata ); DFBResult (*CreateSurface) ( IDirectFB *thiz, const DFBSurfaceDescription *desc, IDirectFBSurface **ret_interface ); DFBResult (*CreatePalette) ( IDirectFB *thiz, const DFBPaletteDescription *desc, IDirectFBPalette **ret_interface ); DFBResult (*EnumScreens) ( IDirectFB *thiz, DFBScreenCallback callback, void *callbackdata ); DFBResult (*GetScreen) ( IDirectFB *thiz, DFBScreenID screen_id, IDirectFBScreen **ret_interface ); DFBResult (*EnumDisplayLayers) ( IDirectFB *thiz, DFBDisplayLayerCallback callback, void *callbackdata ); DFBResult (*GetDisplayLayer) ( IDirectFB *thiz, DFBDisplayLayerID layer_id, IDirectFBDisplayLayer **ret_interface ); DFBResult (*EnumInputDevices) ( IDirectFB *thiz, DFBInputDeviceCallback callback, void *callbackdata ); DFBResult (*GetInputDevice) ( IDirectFB *thiz, DFBInputDeviceID device_id, IDirectFBInputDevice **ret_interface ); DFBResult (*CreateEventBuffer) ( IDirectFB *thiz, IDirectFBEventBuffer **ret_buffer ); DFBResult (*CreateInputEventBuffer) ( IDirectFB *thiz, DFBInputDeviceCapabilities caps, DFBBoolean global, IDirectFBEventBuffer **ret_buffer ); DFBResult (*CreateImageProvider) ( IDirectFB *thiz, const char *filename, IDirectFBImageProvider **ret_interface ); DFBResult (*CreateVideoProvider) ( IDirectFB *thiz, const char *filename, IDirectFBVideoProvider **ret_interface ); DFBResult (*CreateFont) ( IDirectFB *thiz, const char *filename, const DFBFontDescription *desc, IDirectFBFont **ret_interface ); DFBResult (*CreateDataBuffer) ( IDirectFB *thiz, const DFBDataBufferDescription *desc, IDirectFBDataBuffer **ret_interface ); DFBResult (*SetClipboardData) ( IDirectFB *thiz, const char *mime_type, const void *data, unsigned int size, struct timeval *ret_timestamp ); DFBResult (*GetClipboardData) ( IDirectFB *thiz, char **ret_mimetype, void **ret_data, unsigned int *ret_size ); DFBResult (*GetClipboardTimeStamp) ( IDirectFB *thiz, struct timeval *ret_timestamp ); DFBResult (*Suspend) ( IDirectFB *thiz ); DFBResult (*Resume) ( IDirectFB *thiz ); DFBResult (*WaitIdle) ( IDirectFB *thiz ); DFBResult (*WaitForSync) ( IDirectFB *thiz ); DFBResult (*GetInterface) ( IDirectFB *thiz, const char *type, const char *implementation, void *arg, void **ret_interface ); };
-typedef enum {
-     DLSCL_SHARED = 0,
-     DLSCL_EXCLUSIVE,
-     DLSCL_ADMINISTRATIVE
-} DFBDisplayLayerCooperativeLevel;
-typedef enum {
-     DLBM_DONTCARE = 0,
-     DLBM_COLOR,
-     DLBM_IMAGE,
-     DLBM_TILE
-} DFBDisplayLayerBackgroundMode;
-typedef enum {
-     DLCONF_NONE = 0x00000000,
-     DLCONF_WIDTH = 0x00000001,
-     DLCONF_HEIGHT = 0x00000002,
-     DLCONF_PIXELFORMAT = 0x00000004,
-     DLCONF_BUFFERMODE = 0x00000008,
-     DLCONF_OPTIONS = 0x00000010,
-     DLCONF_SOURCE = 0x00000020,
-     DLCONF_SURFACE_CAPS = 0x00000040,
-     DLCONF_ALL = 0x0000007F
-} DFBDisplayLayerConfigFlags;
-typedef struct {
-     DFBDisplayLayerConfigFlags flags;
-     int width;
-     int height;
-     DFBSurfacePixelFormat pixelformat;
-     DFBDisplayLayerBufferMode buffermode;
-     DFBDisplayLayerOptions options;
-     DFBDisplayLayerSourceID source;
-     DFBSurfaceCapabilities surface_caps;
-} DFBDisplayLayerConfig;
-typedef enum {
-     DSPM_ON = 0,
-     DSPM_STANDBY,
-     DSPM_SUSPEND,
-     DSPM_OFF
-} DFBScreenPowerMode;
-typedef enum {
-     DSMCAPS_NONE = 0x00000000,
-     DSMCAPS_FULL = 0x00000001,
-     DSMCAPS_SUB_LEVEL = 0x00000002,
-     DSMCAPS_SUB_LAYERS = 0x00000004,
-     DSMCAPS_BACKGROUND = 0x00000008
-} DFBScreenMixerCapabilities;
-typedef struct {
-     DFBScreenMixerCapabilities caps;
-     DFBDisplayLayerIDs layers;
-     int sub_num;
-     DFBDisplayLayerIDs sub_layers;
-     char name[24];
-} DFBScreenMixerDescription;
-typedef enum {
-     DSMCONF_NONE = 0x00000000,
-     DSMCONF_TREE = 0x00000001,
-     DSMCONF_LEVEL = 0x00000002,
-     DSMCONF_LAYERS = 0x00000004,
-     DSMCONF_BACKGROUND = 0x00000010,
-     DSMCONF_ALL = 0x00000017
-} DFBScreenMixerConfigFlags;
-typedef enum {
-     DSMT_UNKNOWN = 0x00000000,
-     DSMT_FULL = 0x00000001,
-     DSMT_SUB_LEVEL = 0x00000002,
-     DSMT_SUB_LAYERS = 0x00000003
-} DFBScreenMixerTree;
-typedef struct {
-     DFBScreenMixerConfigFlags flags;
-     DFBScreenMixerTree tree;
-     int level;
-     DFBDisplayLayerIDs layers;
-     DFBColor background;
-} DFBScreenMixerConfig;
-typedef enum {
-     DSOCAPS_NONE = 0x00000000,
-     DSOCAPS_CONNECTORS = 0x00000001,
-     DSOCAPS_ENCODER_SEL = 0x00000010,
-     DSOCAPS_SIGNAL_SEL = 0x00000020,
-     DSOCAPS_CONNECTOR_SEL = 0x00000040,
-     DSOCAPS_ALL = 0x00000071
-} DFBScreenOutputCapabilities;
-typedef enum {
-     DSOC_UNKNOWN = 0x00000000,
-     DSOC_VGA = 0x00000001,
-     DSOC_SCART = 0x00000002,
-     DSOC_YC = 0x00000004,
-     DSOC_CVBS = 0x00000008
-} DFBScreenOutputConnectors;
-typedef enum {
-     DSOS_NONE = 0x00000000,
-     DSOS_VGA = 0x00000001,
-     DSOS_YC = 0x00000002,
-     DSOS_CVBS = 0x00000004,
-     DSOS_RGB = 0x00000008,
-     DSOS_YCBCR = 0x00000010
-} DFBScreenOutputSignals;
-typedef struct {
-     DFBScreenOutputCapabilities caps;
-     DFBScreenOutputConnectors all_connectors;
-     DFBScreenOutputSignals all_signals;
-     char name[24];
-} DFBScreenOutputDescription;
-typedef enum {
-     DSOCONF_NONE = 0x00000000,
-     DSOCONF_ENCODER = 0x00000001,
-     DSOCONF_SIGNALS = 0x00000002,
-     DSOCONF_CONNECTORS = 0x00000004,
-     DSOCONF_ALL = 0x00000007
-} DFBScreenOutputConfigFlags;
-typedef struct {
-     DFBScreenOutputConfigFlags flags;
-     int encoder;
-     DFBScreenOutputSignals out_signals;
-     DFBScreenOutputConnectors out_connectors;
-} DFBScreenOutputConfig;
-typedef enum {
-     DSECAPS_NONE = 0x00000000,
-     DSECAPS_TV_STANDARDS = 0x00000001,
-     DSECAPS_TEST_PICTURE = 0x00000002,
-     DSECAPS_MIXER_SEL = 0x00000004,
-     DSECAPS_OUT_SIGNALS = 0x00000008,
-     DSECAPS_SCANMODE = 0x00000010,
-     DSECAPS_BRIGHTNESS = 0x00000100,
-     DSECAPS_CONTRAST = 0x00000200,
-     DSECAPS_HUE = 0x00000400,
-     DSECAPS_SATURATION = 0x00000800,
-     DSECAPS_ALL = 0x00000f1f
-} DFBScreenEncoderCapabilities;
-typedef enum {
-     DSET_UNKNOWN = 0x00000000,
-     DSET_CRTC = 0x00000001,
-     DSET_TV = 0x00000002
-} DFBScreenEncoderType;
-typedef enum {
-     DSETV_UNKNOWN = 0x00000000,
-     DSETV_PAL = 0x00000001,
-     DSETV_NTSC = 0x00000002,
-     DSETV_SECAM = 0x00000004
-} DFBScreenEncoderTVStandards;
-typedef enum {
-     DSESM_UNKNOWN = 0x00000000,
-     DSESM_INTERLACED = 0x00000001,
-     DSESM_PROGRESSIVE = 0x00000002
-} DFBScreenEncoderScanMode;
-typedef struct {
-     DFBScreenEncoderCapabilities caps;
-     DFBScreenEncoderType type;
-     DFBScreenEncoderTVStandards tv_standards;
-     DFBScreenOutputSignals out_signals;
-     char name[24];
-} DFBScreenEncoderDescription;
-typedef enum {
-     DSECONF_NONE = 0x00000000,
-     DSECONF_TV_STANDARD = 0x00000001,
-     DSECONF_TEST_PICTURE = 0x00000002,
-     DSECONF_MIXER = 0x00000004,
-     DSECONF_OUT_SIGNALS = 0x00000008,
-     DSECONF_SCANMODE = 0x00000010,
-     DSECONF_TEST_COLOR = 0x00000020,
-     DSECONF_ADJUSTMENT = 0x00000040,
-     DSECONF_ALL = 0x0000007F
-} DFBScreenEncoderConfigFlags;
-typedef enum {
-     DSETP_OFF = 0x00000000,
-     DSETP_MULTI = 0x00000001,
-     DSETP_SINGLE = 0x00000002,
-     DSETP_WHITE = 0x00000010,
-     DSETP_YELLOW = 0x00000020,
-     DSETP_CYAN = 0x00000030,
-     DSETP_GREEN = 0x00000040,
-     DSETP_MAGENTA = 0x00000050,
-     DSETP_RED = 0x00000060,
-     DSETP_BLUE = 0x00000070,
-     DSETP_BLACK = 0x00000080
-} DFBScreenEncoderTestPicture;
-typedef struct {
-     DFBScreenEncoderConfigFlags flags;
-     DFBScreenEncoderTVStandards tv_standard;
-     DFBScreenEncoderTestPicture test_picture;
-     int mixer;
-     DFBScreenOutputSignals out_signals;
-     DFBScreenEncoderScanMode scanmode;
-     DFBColor test_color;
-     DFBColorAdjustment adjustment;
-} DFBScreenEncoderConfig;
-struct _IDirectFBScreen { void *priv; int magic; DFBResult (*AddRef)( IDirectFBScreen *thiz ); DFBResult (*Release)( IDirectFBScreen *thiz ); DFBResult (*GetID) ( IDirectFBScreen *thiz, DFBScreenID *ret_screen_id ); DFBResult (*GetDescription) ( IDirectFBScreen *thiz, DFBScreenDescription *ret_desc ); DFBResult (*EnumDisplayLayers) ( IDirectFBScreen *thiz, DFBDisplayLayerCallback callback, void *callbackdata ); DFBResult (*SetPowerMode) ( IDirectFBScreen *thiz, DFBScreenPowerMode mode ); DFBResult (*WaitForSync) ( IDirectFBScreen *thiz ); DFBResult (*GetMixerDescriptions) ( IDirectFBScreen *thiz, DFBScreenMixerDescription *ret_descriptions ); DFBResult (*GetMixerConfiguration) ( IDirectFBScreen *thiz, int mixer, DFBScreenMixerConfig *ret_config ); DFBResult (*TestMixerConfiguration) ( IDirectFBScreen *thiz, int mixer, const DFBScreenMixerConfig *config, DFBScreenMixerConfigFlags *ret_failed ); DFBResult (*SetMixerConfiguration) ( IDirectFBScreen *thiz, int mixer, const DFBScreenMixerConfig *config ); DFBResult (*GetEncoderDescriptions) ( IDirectFBScreen *thiz, DFBScreenEncoderDescription *ret_descriptions ); DFBResult (*GetEncoderConfiguration) ( IDirectFBScreen *thiz, int encoder, DFBScreenEncoderConfig *ret_config ); DFBResult (*TestEncoderConfiguration) ( IDirectFBScreen *thiz, int encoder, const DFBScreenEncoderConfig *config, DFBScreenEncoderConfigFlags *ret_failed ); DFBResult (*SetEncoderConfiguration) ( IDirectFBScreen *thiz, int encoder, const DFBScreenEncoderConfig *config ); DFBResult (*GetOutputDescriptions) ( IDirectFBScreen *thiz, DFBScreenOutputDescription *ret_descriptions ); DFBResult (*GetOutputConfiguration) ( IDirectFBScreen *thiz, int output, DFBScreenOutputConfig *ret_config ); DFBResult (*TestOutputConfiguration) ( IDirectFBScreen *thiz, int output, const DFBScreenOutputConfig *config, DFBScreenOutputConfigFlags *ret_failed ); DFBResult (*SetOutputConfiguration) ( IDirectFBScreen *thiz, int output, const DFBScreenOutputConfig *config ); };
-struct _IDirectFBDisplayLayer { void *priv; int magic; DFBResult (*AddRef)( IDirectFBDisplayLayer *thiz ); DFBResult (*Release)( IDirectFBDisplayLayer *thiz ); DFBResult (*GetID) ( IDirectFBDisplayLayer *thiz, DFBDisplayLayerID *ret_layer_id ); DFBResult (*GetDescription) ( IDirectFBDisplayLayer *thiz, DFBDisplayLayerDescription *ret_desc ); DFBResult (*GetSourceDescriptions) ( IDirectFBDisplayLayer *thiz, DFBDisplayLayerSourceDescription *ret_descriptions ); DFBResult (*GetCurrentOutputField) ( IDirectFBDisplayLayer *thiz, int *ret_field ); DFBResult (*GetSurface) ( IDirectFBDisplayLayer *thiz, IDirectFBSurface **ret_interface ); DFBResult (*GetScreen) ( IDirectFBDisplayLayer *thiz, IDirectFBScreen **ret_interface ); DFBResult (*SetCooperativeLevel) ( IDirectFBDisplayLayer *thiz, DFBDisplayLayerCooperativeLevel level ); DFBResult (*GetConfiguration) ( IDirectFBDisplayLayer *thiz, DFBDisplayLayerConfig *ret_config ); DFBResult (*TestConfiguration) ( IDirectFBDisplayLayer *thiz, const DFBDisplayLayerConfig *config, DFBDisplayLayerConfigFlags *ret_failed ); DFBResult (*SetConfiguration) ( IDirectFBDisplayLayer *thiz, const DFBDisplayLayerConfig *config ); DFBResult (*SetScreenLocation) ( IDirectFBDisplayLayer *thiz, float x, float y, float width, float height ); DFBResult (*SetScreenPosition) ( IDirectFBDisplayLayer *thiz, int x, int y ); DFBResult (*SetScreenRectangle) ( IDirectFBDisplayLayer *thiz, int x, int y, int width, int height ); DFBResult (*SetOpacity) ( IDirectFBDisplayLayer *thiz, __u8 opacity ); DFBResult (*SetSourceRectangle) ( IDirectFBDisplayLayer *thiz, int x, int y, int width, int height ); DFBResult (*SetFieldParity) ( IDirectFBDisplayLayer *thiz, int field ); DFBResult (*SetSrcColorKey) ( IDirectFBDisplayLayer *thiz, __u8 r, __u8 g, __u8 b ); DFBResult (*SetDstColorKey) ( IDirectFBDisplayLayer *thiz, __u8 r, __u8 g, __u8 b ); DFBResult (*GetLevel) ( IDirectFBDisplayLayer *thiz, int *ret_level ); DFBResult (*SetLevel) ( IDirectFBDisplayLayer *thiz, int level ); DFBResult (*SetBackgroundMode) ( IDirectFBDisplayLayer *thiz, DFBDisplayLayerBackgroundMode mode ); DFBResult (*SetBackgroundImage) ( IDirectFBDisplayLayer *thiz, IDirectFBSurface *surface ); DFBResult (*SetBackgroundColor) ( IDirectFBDisplayLayer *thiz, __u8 r, __u8 g, __u8 b, __u8 a ); DFBResult (*GetColorAdjustment) ( IDirectFBDisplayLayer *thiz, DFBColorAdjustment *ret_adj ); DFBResult (*SetColorAdjustment) ( IDirectFBDisplayLayer *thiz, const DFBColorAdjustment *adj ); DFBResult (*CreateWindow) ( IDirectFBDisplayLayer *thiz, const DFBWindowDescription *desc, IDirectFBWindow **ret_interface ); DFBResult (*GetWindow) ( IDirectFBDisplayLayer *thiz, DFBWindowID window_id, IDirectFBWindow **ret_interface ); DFBResult (*EnableCursor) ( IDirectFBDisplayLayer *thiz, int enable ); DFBResult (*GetCursorPosition) ( IDirectFBDisplayLayer *thiz, int *ret_x, int *ret_y ); DFBResult (*WarpCursor) ( IDirectFBDisplayLayer *thiz, int x, int y ); DFBResult (*SetCursorAcceleration) ( IDirectFBDisplayLayer *thiz, int numerator, int denominator, int threshold ); DFBResult (*SetCursorShape) ( IDirectFBDisplayLayer *thiz, IDirectFBSurface *shape, int hot_x, int hot_y ); DFBResult (*SetCursorOpacity) ( IDirectFBDisplayLayer *thiz, __u8 opacity ); DFBResult (*WaitForSync) ( IDirectFBDisplayLayer *thiz ); };
-typedef enum {
-     DSFLIP_NONE = 0x00000000,
-     DSFLIP_WAIT = 0x00000001,
-     DSFLIP_BLIT = 0x00000002,
-     DSFLIP_ONSYNC = 0x00000004,
-     DSFLIP_PIPELINE = 0x00000008,
-     DSFLIP_WAITFORSYNC = DSFLIP_WAIT | DSFLIP_ONSYNC
-} DFBSurfaceFlipFlags;
-typedef enum {
-     DSTF_LEFT = 0x00000000,
-     DSTF_CENTER = 0x00000001,
-     DSTF_RIGHT = 0x00000002,
-     DSTF_TOP = 0x00000004,
-     DSTF_BOTTOM = 0x00000008,
-     DSTF_TOPLEFT = DSTF_TOP | DSTF_LEFT,
-     DSTF_TOPCENTER = DSTF_TOP | DSTF_CENTER,
-     DSTF_TOPRIGHT = DSTF_TOP | DSTF_RIGHT,
-     DSTF_BOTTOMLEFT = DSTF_BOTTOM | DSTF_LEFT,
-     DSTF_BOTTOMCENTER = DSTF_BOTTOM | DSTF_CENTER,
-     DSTF_BOTTOMRIGHT = DSTF_BOTTOM | DSTF_RIGHT
-} DFBSurfaceTextFlags;
-typedef enum {
-     DSLF_READ = 0x00000001,
-     DSLF_WRITE = 0x00000002
-} DFBSurfaceLockFlags;
-typedef enum {
-     DSPD_NONE = 0,
-     DSPD_CLEAR = 1,
-     DSPD_SRC = 2,
-     DSPD_SRC_OVER = 3,
-     DSPD_DST_OVER = 4,
-     DSPD_SRC_IN = 5,
-     DSPD_DST_IN = 6,
-     DSPD_SRC_OUT = 7,
-     DSPD_DST_OUT = 8
-} DFBSurfacePorterDuffRule;
-typedef enum {
-     DSBF_ZERO = 1,
-     DSBF_ONE = 2,
-     DSBF_SRCCOLOR = 3,
-     DSBF_INVSRCCOLOR = 4,
-     DSBF_SRCALPHA = 5,
-     DSBF_INVSRCALPHA = 6,
-     DSBF_DESTALPHA = 7,
-     DSBF_INVDESTALPHA = 8,
-     DSBF_DESTCOLOR = 9,
-     DSBF_INVDESTCOLOR = 10,
-     DSBF_SRCALPHASAT = 11
-} DFBSurfaceBlendFunction;
-typedef struct {
-     float x;
-     float y;
-     float z;
-     float w;
-     float s;
-     float t;
-} DFBVertex;
-typedef enum {
-     DTTF_LIST,
-     DTTF_STRIP,
-     DTTF_FAN
-} DFBTriangleFormation;
-struct _IDirectFBSurface { void *priv; int magic; DFBResult (*AddRef)( IDirectFBSurface *thiz ); DFBResult (*Release)( IDirectFBSurface *thiz ); DFBResult (*GetCapabilities) ( IDirectFBSurface *thiz, DFBSurfaceCapabilities *ret_caps ); DFBResult (*GetSize) ( IDirectFBSurface *thiz, int *ret_width, int *ret_height ); DFBResult (*GetVisibleRectangle) ( IDirectFBSurface *thiz, DFBRectangle *ret_rect ); DFBResult (*GetPixelFormat) ( IDirectFBSurface *thiz, DFBSurfacePixelFormat *ret_format ); DFBResult (*GetAccelerationMask) ( IDirectFBSurface *thiz, IDirectFBSurface *source, DFBAccelerationMask *ret_mask ); DFBResult (*GetPalette) ( IDirectFBSurface *thiz, IDirectFBPalette **ret_interface ); DFBResult (*SetPalette) ( IDirectFBSurface *thiz, IDirectFBPalette *palette ); DFBResult (*SetAlphaRamp) ( IDirectFBSurface *thiz, __u8 a0, __u8 a1, __u8 a2, __u8 a3 ); DFBResult (*Lock) ( IDirectFBSurface *thiz, DFBSurfaceLockFlags flags, void **ret_ptr, int *ret_pitch ); DFBResult (*Unlock) ( IDirectFBSurface *thiz ); DFBResult (*Flip) ( IDirectFBSurface *thiz, const DFBRegion *region, DFBSurfaceFlipFlags flags ); DFBResult (*SetField) ( IDirectFBSurface *thiz, int field ); DFBResult (*Clear) ( IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b, __u8 a ); DFBResult (*SetClip) ( IDirectFBSurface *thiz, const DFBRegion *clip ); DFBResult (*SetColor) ( IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b, __u8 a ); DFBResult (*SetColorIndex) ( IDirectFBSurface *thiz, unsigned int index ); DFBResult (*SetSrcBlendFunction) ( IDirectFBSurface *thiz, DFBSurfaceBlendFunction function ); DFBResult (*SetDstBlendFunction) ( IDirectFBSurface *thiz, DFBSurfaceBlendFunction function ); DFBResult (*SetPorterDuff) ( IDirectFBSurface *thiz, DFBSurfacePorterDuffRule rule ); DFBResult (*SetSrcColorKey) ( IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b ); DFBResult (*SetSrcColorKeyIndex) ( IDirectFBSurface *thiz, unsigned int index ); DFBResult (*SetDstColorKey) ( IDirectFBSurface *thiz, __u8 r, __u8 g, __u8 b ); DFBResult (*SetDstColorKeyIndex) ( IDirectFBSurface *thiz, unsigned int index ); DFBResult (*SetBlittingFlags) ( IDirectFBSurface *thiz, DFBSurfaceBlittingFlags flags ); DFBResult (*Blit) ( IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rect, int x, int y ); DFBResult (*TileBlit) ( IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rect, int x, int y ); DFBResult (*BatchBlit) ( IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rects, const DFBPoint *dest_points, int num ); DFBResult (*StretchBlit) ( IDirectFBSurface *thiz, IDirectFBSurface *source, const DFBRectangle *source_rect, const DFBRectangle *destination_rect ); DFBResult (*TextureTriangles) ( IDirectFBSurface *thiz, IDirectFBSurface *texture, const DFBVertex *vertices, const int *indices, int num, DFBTriangleFormation formation ); DFBResult (*SetDrawingFlags) ( IDirectFBSurface *thiz, DFBSurfaceDrawingFlags flags ); DFBResult (*FillRectangle) ( IDirectFBSurface *thiz, int x, int y, int w, int h ); DFBResult (*DrawRectangle) ( IDirectFBSurface *thiz, int x, int y, int w, int h ); DFBResult (*DrawLine) ( IDirectFBSurface *thiz, int x1, int y1, int x2, int y2 ); DFBResult (*DrawLines) ( IDirectFBSurface *thiz, const DFBRegion *lines, unsigned int num_lines ); DFBResult (*FillTriangle) ( IDirectFBSurface *thiz, int x1, int y1, int x2, int y2, int x3, int y3 ); DFBResult (*FillRectangles) ( IDirectFBSurface *thiz, const DFBRectangle *rects, unsigned int num ); DFBResult (*FillSpans) ( IDirectFBSurface *thiz, int y, const DFBSpan *spans, unsigned int num ); DFBResult (*SetFont) ( IDirectFBSurface *thiz, IDirectFBFont *font ); DFBResult (*GetFont) ( IDirectFBSurface *thiz, IDirectFBFont **ret_font ); DFBResult (*DrawString) ( IDirectFBSurface *thiz, const char *text, int bytes, int x, int y, DFBSurfaceTextFlags flags ); DFBResult (*DrawGlyph) ( IDirectFBSurface *thiz, unsigned int index, int x, int y, DFBSurfaceTextFlags flags ); DFBResult (*GetSubSurface) ( IDirectFBSurface *thiz, const DFBRectangle *rect, IDirectFBSurface **ret_interface ); DFBResult (*GetGL) ( IDirectFBSurface *thiz, IDirectFBGL **ret_interface ); DFBResult (*Dump) ( IDirectFBSurface *thiz, const char *directory, const char *prefix ); };
-struct _IDirectFBPalette { void *priv; int magic; DFBResult (*AddRef)( IDirectFBPalette *thiz ); DFBResult (*Release)( IDirectFBPalette *thiz ); DFBResult (*GetCapabilities) ( IDirectFBPalette *thiz, DFBPaletteCapabilities *ret_caps ); DFBResult (*GetSize) ( IDirectFBPalette *thiz, unsigned int *ret_size ); DFBResult (*SetEntries) ( IDirectFBPalette *thiz, const DFBColor *entries, unsigned int num_entries, unsigned int offset ); DFBResult (*GetEntries) ( IDirectFBPalette *thiz, DFBColor *ret_entries, unsigned int num_entries, unsigned int offset ); DFBResult (*FindBestMatch) ( IDirectFBPalette *thiz, __u8 r, __u8 g, __u8 b, __u8 a, unsigned int *ret_index ); DFBResult (*CreateCopy) ( IDirectFBPalette *thiz, IDirectFBPalette **ret_interface ); };
-typedef enum {
-     DIKS_UP = 0x00000000,
-     DIKS_DOWN = 0x00000001
-} DFBInputDeviceKeyState;
-typedef enum {
-     DIBS_UP = 0x00000000,
-     DIBS_DOWN = 0x00000001
-} DFBInputDeviceButtonState;
-typedef enum {
-     DIBM_LEFT = 0x00000001,
-     DIBM_RIGHT = 0x00000002,
-     DIBM_MIDDLE = 0x00000004
-} DFBInputDeviceButtonMask;
-typedef enum {
-     DIMM_SHIFT = (1 << DIMKI_SHIFT),
-     DIMM_CONTROL = (1 << DIMKI_CONTROL),
-     DIMM_ALT = (1 << DIMKI_ALT),
-     DIMM_ALTGR = (1 << DIMKI_ALTGR),
-     DIMM_META = (1 << DIMKI_META),
-     DIMM_SUPER = (1 << DIMKI_SUPER),
-     DIMM_HYPER = (1 << DIMKI_HYPER)
-} DFBInputDeviceModifierMask;
-struct _IDirectFBInputDevice { void *priv; int magic; DFBResult (*AddRef)( IDirectFBInputDevice *thiz ); DFBResult (*Release)( IDirectFBInputDevice *thiz ); DFBResult (*GetID) ( IDirectFBInputDevice *thiz, DFBInputDeviceID *ret_device_id ); DFBResult (*GetDescription) ( IDirectFBInputDevice *thiz, DFBInputDeviceDescription *ret_desc ); DFBResult (*GetKeymapEntry) ( IDirectFBInputDevice *thiz, int keycode, DFBInputDeviceKeymapEntry *ret_entry ); DFBResult (*CreateEventBuffer) ( IDirectFBInputDevice *thiz, IDirectFBEventBuffer **ret_buffer ); DFBResult (*AttachEventBuffer) ( IDirectFBInputDevice *thiz, IDirectFBEventBuffer *buffer ); DFBResult (*GetKeyState) ( IDirectFBInputDevice *thiz, DFBInputDeviceKeyIdentifier key_id, DFBInputDeviceKeyState *ret_state ); DFBResult (*GetModifiers) ( IDirectFBInputDevice *thiz, DFBInputDeviceModifierMask *ret_modifiers ); DFBResult (*GetLockState) ( IDirectFBInputDevice *thiz, DFBInputDeviceLockState *ret_locks ); DFBResult (*GetButtons) ( IDirectFBInputDevice *thiz, DFBInputDeviceButtonMask *ret_buttons ); DFBResult (*GetButtonState) ( IDirectFBInputDevice *thiz, DFBInputDeviceButtonIdentifier button, DFBInputDeviceButtonState *ret_state ); DFBResult (*GetAxis) ( IDirectFBInputDevice *thiz, DFBInputDeviceAxisIdentifier axis, int *ret_pos ); DFBResult (*GetXY) ( IDirectFBInputDevice *thiz, int *ret_x, int *ret_y ); };
-typedef enum {
-     DFEC_NONE = 0x00,
-     DFEC_INPUT = 0x01,
-     DFEC_WINDOW = 0x02,
-     DFEC_USER = 0x03
-} DFBEventClass;
-typedef enum {
-     DIET_UNKNOWN = 0,
-     DIET_KEYPRESS,
-     DIET_KEYRELEASE,
-     DIET_BUTTONPRESS,
-     DIET_BUTTONRELEASE,
-     DIET_AXISMOTION
-} DFBInputEventType;
-typedef enum {
-     DIEF_NONE = 0x000,
-     DIEF_TIMESTAMP = 0x001,
-     DIEF_AXISABS = 0x002,
-     DIEF_AXISREL = 0x004,
-     DIEF_KEYCODE = 0x008,
-     DIEF_KEYID = 0x010,
-     DIEF_KEYSYMBOL = 0x020,
-     DIEF_MODIFIERS = 0x040,
-     DIEF_LOCKS = 0x080,
-     DIEF_BUTTONS = 0x100,
-     DIEF_GLOBAL = 0x200
-} DFBInputEventFlags;
-typedef struct {
-     DFBEventClass clazz;
-     DFBInputEventType type;
-     DFBInputDeviceID device_id;
-     DFBInputEventFlags flags;
-     struct timeval timestamp;
-     int key_code;
-     DFBInputDeviceKeyIdentifier key_id;
-     DFBInputDeviceKeySymbol key_symbol;
-     DFBInputDeviceModifierMask modifiers;
-     DFBInputDeviceLockState locks;
-     DFBInputDeviceButtonIdentifier button;
-     DFBInputDeviceButtonMask buttons;
-     DFBInputDeviceAxisIdentifier axis;
-     int axisabs;
-     int axisrel;
-} DFBInputEvent;
-typedef enum {
-     DWET_NONE = 0x00000000,
-     DWET_POSITION = 0x00000001,
-     DWET_SIZE = 0x00000002,
-     DWET_CLOSE = 0x00000004,
-     DWET_DESTROYED = 0x00000008,
-     DWET_GOTFOCUS = 0x00000010,
-     DWET_LOSTFOCUS = 0x00000020,
-     DWET_KEYDOWN = 0x00000100,
-     DWET_KEYUP = 0x00000200,
-     DWET_BUTTONDOWN = 0x00010000,
-     DWET_BUTTONUP = 0x00020000,
-     DWET_MOTION = 0x00040000,
-     DWET_ENTER = 0x00080000,
-     DWET_LEAVE = 0x00100000,
-     DWET_WHEEL = 0x00200000,
-     DWET_POSITION_SIZE = DWET_POSITION | DWET_SIZE,
-     DWET_ALL = 0x003F033F
-} DFBWindowEventType;
-typedef struct {
-     DFBEventClass clazz;
-     DFBWindowEventType type;
-     DFBWindowID window_id;
-     int x;
-     int y;
-     int cx;
-     int cy;
-     int step;
-     int w;
-     int h;
-     int key_code;
-     DFBInputDeviceKeyIdentifier key_id;
-     DFBInputDeviceKeySymbol key_symbol;
-     DFBInputDeviceModifierMask modifiers;
-     DFBInputDeviceLockState locks;
-     DFBInputDeviceButtonIdentifier button;
-     DFBInputDeviceButtonMask buttons;
-     struct timeval timestamp;
-} DFBWindowEvent;
-typedef struct {
-     DFBEventClass clazz;
-     unsigned int type;
-     void *data;
-} DFBUserEvent;
-typedef union {
-     DFBEventClass clazz;
-     DFBInputEvent input;
-     DFBWindowEvent window;
-     DFBUserEvent user;
-} DFBEvent;
-struct _IDirectFBEventBuffer { void *priv; int magic; DFBResult (*AddRef)( IDirectFBEventBuffer *thiz ); DFBResult (*Release)( IDirectFBEventBuffer *thiz ); DFBResult (*Reset) ( IDirectFBEventBuffer *thiz ); DFBResult (*WaitForEvent) ( IDirectFBEventBuffer *thiz ); DFBResult (*WaitForEventWithTimeout) ( IDirectFBEventBuffer *thiz, unsigned int seconds, unsigned int milli_seconds ); DFBResult (*GetEvent) ( IDirectFBEventBuffer *thiz, DFBEvent *ret_event ); DFBResult (*PeekEvent) ( IDirectFBEventBuffer *thiz, DFBEvent *ret_event ); DFBResult (*HasEvent) ( IDirectFBEventBuffer *thiz ); DFBResult (*PostEvent) ( IDirectFBEventBuffer *thiz, const DFBEvent *event ); DFBResult (*WakeUp) ( IDirectFBEventBuffer *thiz ); DFBResult (*CreateFileDescriptor) ( IDirectFBEventBuffer *thiz, int *ret_fd ); };
-typedef enum {
-     DWOP_NONE = 0x00000000,
-     DWOP_COLORKEYING = 0x00000001,
-     DWOP_ALPHACHANNEL = 0x00000002,
-     DWOP_OPAQUE_REGION = 0x00000004,
-     DWOP_SHAPED = 0x00000008,
-     DWOP_KEEP_POSITION = 0x00000010,
-     DWOP_KEEP_SIZE = 0x00000020,
-     DWOP_KEEP_STACKING = 0x00000040,
-     DWOP_GHOST = 0x00001000,
-     DWOP_INDESTRUCTIBLE = 0x00002000,
-     DWOP_ALL = 0x0000307F
-} DFBWindowOptions;
-typedef enum {
-     DWSC_MIDDLE = 0x00000000,
-     DWSC_UPPER = 0x00000001,
-     DWSC_LOWER = 0x00000002
-} DFBWindowStackingClass;
-struct _IDirectFBWindow { void *priv; int magic; DFBResult (*AddRef)( IDirectFBWindow *thiz ); DFBResult (*Release)( IDirectFBWindow *thiz ); DFBResult (*GetID) ( IDirectFBWindow *thiz, DFBWindowID *ret_window_id ); DFBResult (*GetPosition) ( IDirectFBWindow *thiz, int *ret_x, int *ret_y ); DFBResult (*GetSize) ( IDirectFBWindow *thiz, int *ret_width, int *ret_height ); DFBResult (*CreateEventBuffer) ( IDirectFBWindow *thiz, IDirectFBEventBuffer **ret_buffer ); DFBResult (*AttachEventBuffer) ( IDirectFBWindow *thiz, IDirectFBEventBuffer *buffer ); DFBResult (*EnableEvents) ( IDirectFBWindow *thiz, DFBWindowEventType mask ); DFBResult (*DisableEvents) ( IDirectFBWindow *thiz, DFBWindowEventType mask ); DFBResult (*GetSurface) ( IDirectFBWindow *thiz, IDirectFBSurface **ret_surface ); DFBResult (*SetOptions) ( IDirectFBWindow *thiz, DFBWindowOptions options ); DFBResult (*GetOptions) ( IDirectFBWindow *thiz, DFBWindowOptions *ret_options ); DFBResult (*SetColorKey) ( IDirectFBWindow *thiz, __u8 r, __u8 g, __u8 b ); DFBResult (*SetColorKeyIndex) ( IDirectFBWindow *thiz, unsigned int index ); DFBResult (*SetOpacity) ( IDirectFBWindow *thiz, __u8 opacity ); DFBResult (*SetOpaqueRegion) ( IDirectFBWindow *thiz, int x1, int y1, int x2, int y2 ); DFBResult (*GetOpacity) ( IDirectFBWindow *thiz, __u8 *ret_opacity ); DFBResult (*SetCursorShape) ( IDirectFBWindow *thiz, IDirectFBSurface *shape, int hot_x, int hot_y ); DFBResult (*RequestFocus) ( IDirectFBWindow *thiz ); DFBResult (*GrabKeyboard) ( IDirectFBWindow *thiz ); DFBResult (*UngrabKeyboard) ( IDirectFBWindow *thiz ); DFBResult (*GrabPointer) ( IDirectFBWindow *thiz ); DFBResult (*UngrabPointer) ( IDirectFBWindow *thiz ); DFBResult (*GrabKey) ( IDirectFBWindow *thiz, DFBInputDeviceKeySymbol symbol, DFBInputDeviceModifierMask modifiers ); DFBResult (*UngrabKey) ( IDirectFBWindow *thiz, DFBInputDeviceKeySymbol symbol, DFBInputDeviceModifierMask modifiers ); DFBResult (*Move) ( IDirectFBWindow *thiz, int dx, int dy ); DFBResult (*MoveTo) ( IDirectFBWindow *thiz, int x, int y ); DFBResult (*Resize) ( IDirectFBWindow *thiz, int width, int height ); DFBResult (*SetStackingClass) ( IDirectFBWindow *thiz, DFBWindowStackingClass stacking_class ); DFBResult (*Raise) ( IDirectFBWindow *thiz ); DFBResult (*Lower) ( IDirectFBWindow *thiz ); DFBResult (*RaiseToTop) ( IDirectFBWindow *thiz ); DFBResult (*LowerToBottom) ( IDirectFBWindow *thiz ); DFBResult (*PutAtop) ( IDirectFBWindow *thiz, IDirectFBWindow *lower ); DFBResult (*PutBelow) ( IDirectFBWindow *thiz, IDirectFBWindow *upper ); DFBResult (*Close) ( IDirectFBWindow *thiz ); DFBResult (*Destroy) ( IDirectFBWindow *thiz ); };
-struct _IDirectFBFont { void *priv; int magic; DFBResult (*AddRef)( IDirectFBFont *thiz ); DFBResult (*Release)( IDirectFBFont *thiz ); DFBResult (*GetAscender) ( IDirectFBFont *thiz, int *ret_ascender ); DFBResult (*GetDescender) ( IDirectFBFont *thiz, int *ret_descender ); DFBResult (*GetHeight) ( IDirectFBFont *thiz, int *ret_height ); DFBResult (*GetMaxAdvance) ( IDirectFBFont *thiz, int *ret_maxadvance ); DFBResult (*GetKerning) ( IDirectFBFont *thiz, unsigned int prev_index, unsigned int current_index, int *ret_kern_x, int *ret_kern_y ); DFBResult (*GetStringWidth) ( IDirectFBFont *thiz, const char *text, int bytes, int *ret_width ); DFBResult (*GetStringExtents) ( IDirectFBFont *thiz, const char *text, int bytes, DFBRectangle *ret_logical_rect, DFBRectangle *ret_ink_rect ); DFBResult (*GetGlyphExtents) ( IDirectFBFont *thiz, unsigned int index, DFBRectangle *ret_rect, int *ret_advance ); };
-typedef enum {
-     DICAPS_NONE = 0x00000000,
-     DICAPS_ALPHACHANNEL = 0x00000001,
-     DICAPS_COLORKEY = 0x00000002
-} DFBImageCapabilities;
-typedef struct {
-     DFBImageCapabilities caps;
-     __u8 colorkey_r;
-     __u8 colorkey_g;
-     __u8 colorkey_b;
-} DFBImageDescription;
-typedef void (*DIRenderCallback)(DFBRectangle *rect, void *ctx);
-struct _IDirectFBImageProvider { void *priv; int magic; DFBResult (*AddRef)( IDirectFBImageProvider *thiz ); DFBResult (*Release)( IDirectFBImageProvider *thiz ); DFBResult (*GetSurfaceDescription) ( IDirectFBImageProvider *thiz, DFBSurfaceDescription *ret_dsc ); DFBResult (*GetImageDescription) ( IDirectFBImageProvider *thiz, DFBImageDescription *ret_dsc ); DFBResult (*RenderTo) ( IDirectFBImageProvider *thiz, IDirectFBSurface *destination, const DFBRectangle *destination_rect ); DFBResult (*SetRenderCallback) ( IDirectFBImageProvider *thiz, DIRenderCallback callback, void *callback_data ); };
-typedef int (*DVFrameCallback)(void *ctx);
-struct _IDirectFBVideoProvider { void *priv; int magic; DFBResult (*AddRef)( IDirectFBVideoProvider *thiz ); DFBResult (*Release)( IDirectFBVideoProvider *thiz ); DFBResult (*GetCapabilities) ( IDirectFBVideoProvider *thiz, DFBVideoProviderCapabilities *ret_caps ); DFBResult (*GetSurfaceDescription) ( IDirectFBVideoProvider *thiz, DFBSurfaceDescription *ret_dsc ); DFBResult (*PlayTo) ( IDirectFBVideoProvider *thiz, IDirectFBSurface *destination, const DFBRectangle *destination_rect, DVFrameCallback callback, void *ctx ); DFBResult (*Stop) ( IDirectFBVideoProvider *thiz ); DFBResult (*SeekTo) ( IDirectFBVideoProvider *thiz, double seconds ); DFBResult (*GetPos) ( IDirectFBVideoProvider *thiz, double *ret_seconds ); DFBResult (*GetLength) ( IDirectFBVideoProvider *thiz, double *ret_seconds ); DFBResult (*GetColorAdjustment) ( IDirectFBVideoProvider *thiz, DFBColorAdjustment *ret_adj ); DFBResult (*SetColorAdjustment) ( IDirectFBVideoProvider *thiz, const DFBColorAdjustment *adj ); };
-struct _IDirectFBDataBuffer { void *priv; int magic; DFBResult (*AddRef)( IDirectFBDataBuffer *thiz ); DFBResult (*Release)( IDirectFBDataBuffer *thiz ); DFBResult (*Flush) ( IDirectFBDataBuffer *thiz ); DFBResult (*SeekTo) ( IDirectFBDataBuffer *thiz, unsigned int offset ); DFBResult (*GetPosition) ( IDirectFBDataBuffer *thiz, unsigned int *ret_offset ); DFBResult (*GetLength) ( IDirectFBDataBuffer *thiz, unsigned int *ret_length ); DFBResult (*WaitForData) ( IDirectFBDataBuffer *thiz, unsigned int length ); DFBResult (*WaitForDataWithTimeout) ( IDirectFBDataBuffer *thiz, unsigned int length, unsigned int seconds, unsigned int milli_seconds ); DFBResult (*GetData) ( IDirectFBDataBuffer *thiz, unsigned int length, void *ret_data, unsigned int *ret_read ); DFBResult (*PeekData) ( IDirectFBDataBuffer *thiz, unsigned int length, int offset, void *ret_data, unsigned int *ret_read ); DFBResult (*HasData) ( IDirectFBDataBuffer *thiz ); DFBResult (*PutData) ( IDirectFBDataBuffer *thiz, const void *data, unsigned int length ); DFBResult (*CreateImageProvider) ( IDirectFBDataBuffer *thiz, IDirectFBImageProvider **interface ); };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/dos.c
deleted file mode 100644
index 108c3b1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/dos.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/**

- * This is your typical header comment

- */

-int foo(int bar)

-{

-   int idx;

-   int res = 0;      // trailing comment

-                     // that spans two lines

-   for (idx = 1; idx < bar; idx++)

-   {

-      /* comment in virtual braces */

-      res += idx;

-   }

-

-

-   res *= idx;        // some comment

-

-   // almost continued, but a NL in between

-

-// col1 comment in level 1

-   return(res);

-}

-

-// col1 comment in level 0

-

-/*

-   Silly multiline comment.

-

-   Oh yes.

-

-   Really

-*/

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/doxy-comment.c
deleted file mode 100644
index ef0414ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/doxy-comment.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int a; //a
-int a; ///a
-int a; ///<a
-int a; //!a
-int a; //!<a
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/else-if.c
deleted file mode 100644
index 06cc37f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/else-if.c
+++ /dev/null
@@ -1,29 +0,0 @@
-int test (int A, int B) {
-
-  int C;
-
-  if (A == 0)
-    if (B == 0)
-      C = 1;
-    else if (B == 1)
-      C = 2;
-    else
-      C = 3;
-  else if (A == 1)
-    if (B == 0)
-      C = 4;
-    else if (B == 1)
-      C = 5;
-    else
-      C = 6;
-  else
-    if (B == 0)
-      C = 7;
-    else if (B == 1)
-      C = 8;
-    else
-      C = 9;
-
-  return C;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/empty-for.c
deleted file mode 100644
index d9fb686a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/empty-for.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void foo(void)
-{
-   for (;x<2;x++)
-   {
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/endif.c
deleted file mode 100644
index fd621299..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/endif.c
+++ /dev/null
@@ -1,30 +0,0 @@
-int do_this

-(

-   int x,

-   int y

-)

-{

-

-   x++;

-   #ifdef ABC

-      #ifdef DEF

-         x += y;

-      #endif

-   #endif

-a++;

- #ifdef ABC

-b++;

-      #ifdef DEF

-         c++;

- #ifdef HIJ

-         d++;

-      #endif

-e++;

-      #endif

-f++;

-   #endif

-g++;

-

-   return (x)

-}

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum-struct-init.c
deleted file mode 100644
index 6660e4a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum-struct-init.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-enum foo_idx
-{
-   FOO_1,
-   FOO_2,
-   FOO_3,
-};
-
-struct foo
-{
-   const char *str;
-   int        values[8];
-};
-
-struct foo bar[] =
-{
-   [FOO_1] = {
-      "junk",
-      { 1 } },
-
-   [FOO_2] = {
-      "morejunk",
-      {1, 2, 3} },
-
-   [FOO_3] = {
-      "somemore",
-      {1, 2, 3, 4, 5, 6} },
-
-};
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_comma_ifdef.c
deleted file mode 100644
index aa80cf48..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_comma_ifdef.c
+++ /dev/null
@@ -1,7 +0,0 @@
-enum A {
-  a,
-  b,
-#ifdef __clang__
-  c
-#endif
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_gallery.c
deleted file mode 100644
index 2be93194..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_gallery.c
+++ /dev/null
@@ -1,28 +0,0 @@
-enum one { liner };
-
-enum not {
-
-a, one,
-
-liner };
-
-enum foo { bar, baz, quux };
-
-/*
- * In some tests, the following line remains longer than 80
- * characters. Perhaps a bug?
-*/
-enum longer_enum_that { will, not, all, fit, on, one, line, as, longg, as, the, cutoff, is, reasonable, because, this, is, a, very, very, wide, line };
-
-enum q { w,
-e,r,
-t,
-
-
-y
-
-
-}
-
-
-;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/extern.c
deleted file mode 100644
index 3bcfcbe5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/extern.c
+++ /dev/null
@@ -1,4 +0,0 @@
-extern "C"    int* i;
-extern "C" {  int* i; }
-extern "C"    FooString* i;
-extern "C" {  FooString* i; }
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent.c
deleted file mode 100644
index ff9f812b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent.c
+++ /dev/null
@@ -1,35 +0,0 @@
-int this_is_a_function_proto(int a,
-char * b);
-
-int this_is_a_function_def(int a,
-char * b)
-{
-this_is_a_function_call(a,
-b);
-
-a = another_function_call(a,
-b);
-
-}
-
-typedef const char * pu8_t;
-
-typedef short (*hello1)(char         coolParam,
-          ushort *,
-       unsigned int anotherone);
-
-typedef const unsigned char * (getfcn_t)(
-int idx, ulong op);
-
-short (*hello2)(char         coolParam,
-          ulong *,
-	uchar,
-               unsigned int anotherone);
-
-const unsigned char * (*getstr) (
-int idx,
-ulong op);
-
-short hello3 (char         coolParam,
-        ushort *,
-              unsigned int anotherone);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent_func_def_col1.c
deleted file mode 100644
index 235731c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent_func_def_col1.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#if A
-/* dfsdsdfd */
-int X;
-#endif
-
-#if A
-void func1_1(void);
-#endif
-
-#if A
-#if A
-int X1;
-void func1_1(void)
-{
-#if A
-/* ttiti */
-if (B)
-{
-#if A
-/* dsfdf */
-a=5;
-#endif
-}
-#endif
-}
-int Y1;
-
-    void func1_2(void)
-	{
-	}
-		int Z1;
-#endif
-#endif
-
-#if A
-#if A
-int X2;
-/* fsdsfd */
-void func2_1(void)
-{
-#if A
-/* ttiti */
-if (B)
-{
-#if A
-/* dsfdf */
-a=5;
-#endif
-}
-#endif
-}
-		int Y2;
-#endif
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_type.c
deleted file mode 100644
index d49d381d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_type.c
+++ /dev/null
@@ -1,38 +0,0 @@
-typedef void (*my_fcn_ptr)(char *, int);
-typedef const char *(my_fcn_ptr)(char *, int);
-typedef int (my_fcn_ptr)(char *, int);
-typedef struct foo *(my_fcn_ptr)(char *, int);
-typedef enum foo *(*my_fcn_ptr)(char *, int);
-typedef const struct foo *(*my_fcn_ptr)(char *, int);
-typedef BOOL (my_fcn_ptr)(char *, int);
-typedef INT32 (*my_fcn_ptr)(char *, int);
-typedef int INT32;
-typedef struct foo {
-   int a;
-} fooey;
-
-typedef struct {
-   int a;
-} queso;
-
-struct myfoo {
-   INT32 age;
-   const struct foo *(*my_fcn_ptr)(char *, int);
-   const CHAR *name;
-   MYTYPE (*foo)(int, char);
-   void *user;
-   void (*foo)(int, char);
-};
-
-SMU foo(void)
-{
-   double AAA=1.e-3,BBB=0.016,CCC=2*DDD*sqrt(EEE);
-   a = 4;
-   ( * ABC )();
-   return SMUIFY(a);
-}
-
-typedef struct {
-    void (*newObject)(const object_info * info, const IObject * *interface, struct object_h* instance);
-} IObjectFactory;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/for-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/for-space.c
deleted file mode 100644
index 1064d493..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/for-space.c
+++ /dev/null
@@ -1,17 +0,0 @@
-void f()
-{
-for ( ; it != Values.end(); ++it)
-BTree.insert(std::pair < int, double > (*it, double (*it) + 1.0));
-
-
-for ( ; vIt != Values.end(); ++vIt)
-{ }
-for ( ; vIt != Values.end(); ++vIt)
-{ }
-
-for ( ; ; ) ;
-for (int i = 0; i < 42; ) i += 3;
-
-for (int i = 0; i < 42; ++i) k += 3;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/freebsd.c
deleted file mode 100644
index c9ef164f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/freebsd.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Make the structure name match the typedef. */
-typedef struct bar {
-	int	level;
-} BAR;
-typedef int		foo;	/* This is foo. */
-typedef const long	baz;	/* This is baz. */
-
-
-static char	*function(int _arg, const char *_arg2, struct foo *_arg3,
-		    struct bar *_arg4);
-static void	 usage(void);
-
-/*
- * All major routines should have a comment briefly describing what
- * they do.  The comment before the "main" routine should describe
- * what the program does.
- */
-int
-main(int argc, char *argv[])
-{
-	char *ep;
-	long num;
-	int ch;
-
-	while ((ch = getopt(argc, argv, "abNn:")) != -1)
-		switch (ch) {		/* Indent the switch. */
-		case 'a':		/* Don't indent the case. */
-			aflag = 1;	/* Indent case body one tab. */
-			/* FALLTHROUGH */
-		case 'b':
-			bflag = 1;
-			break;
-		case 'N':
-			Nflag = 1;
-			break;
-		case 'n':
-			num = strtol(optarg, &ep, 10);
-			if (num <= 0 || *ep != '\0') {
-				warnx("illegal number, -n argument -- %s",
-				    optarg);
-				usage();
-			}
-			break;
-		case '?':
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	argc -= optind;
-	argv += optind;
-
-	for (p = buf; *p != '\0'; ++p)
-		;	/* nothing */
-	for (;;)
-		stmt;
-	for (;;) {
-		zed = a + really + long + statement + that + needs +
-		    two + lines + gets + indented + four + spaces +
-		    on + the + second + and + subsequent + lines;
-	}
-	for (;;) {
-		if (cond)
-			stmt;
-	}
-	if (val != NULL)
-		val = realloc(val, newsize);
-
-        fcn_call(with, a, really, long, list, of, parameters,
-                 that, spans, two, lines);
-
-	for (; cnt < 15; cnt++) {
-		stmt1;
-		stmt2;
-	}
-
-        almod = (chunk_is_single_line_comment(pc) &&
-                cpd.settings[UO_indent_relative_single_line_comments].b) ?
-            ALMODE_KEEP_REL : ALMODE_KEEP_ABS;
-
-	/* Indentation is an 8 character tab.  Second level indents are four spaces.
-	 * If you have to wrap a long statement, put the operator at the end of the
-	 * line.
-	 */
-
-	while (cnt < 20 && this_variable_name_is_too_long &&
-	    ep != NULL)
-		zappy = a + really + long + statement + that + needs
-		    + two + lines + gets + indented + four + spaces +
-		    on + the + second + and + subsequent + lines;
-
-   // Do not add whitespace at the end of a line, and only use tabs followed by
-   // spaces to form the indentation.  Do not use more spaces than a tab will
-   // produce and do not use spaces in front of tabs.
-   //
-   // Closing and opening braces go on the same line as the else.  Braces that
-   // are not necessary may be left out.
-
-	if (test)
-		stmt;
-	else if (bar) {
-		stmt;
-		stmt;
-	} else
-		stmt;
-
-        // No spaces after function names.  Commas have a space after them.  No spa-
-        // ces after `(' or `[' or preceding `]' or `)' characters.
-
-	error = function(a1, a2);
-	if (error != 0)
-		exit(error);
-
-        // Unary operators do not require spaces, binary operators do.  Do not use
-        // parentheses unless they are required for precedence or unless the state-
-        // ment is confusing without them.  Remember that other people may confuse
-        // easier than you.  Do YOU understand the following?
-
-	a = b->c[0] + ~d == (e || f) || g && h ? i : j >> 1;
-	k = !(l & FLAGS);
-
-
-        // Exits should be 0 on success, or 1 on failure.
-
-	exit(0);	   /*
-			    * Avoid obvious comments such as
-			    * "Exit 0 on success."
-                            */
-}
-
-static char *
-     function(a1, a2, fl, a4)
-	     int a1, a2;     /* Declare ints, too, don't default them. */
-	     float fl;	     /* Beware double vs. float prototype differences. */
-	     int a4;	     /* List in order declared. */
-     {
-     }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user.c
deleted file mode 100644
index 275d8c5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int func(n)  
-{  
-  int a = foo (); 
-  char *a = _("some text");
-  char *str = N_("other text");
-} 
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user2.c
deleted file mode 100644
index 38ecb232..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-#define CMD_CHECK(expr) do { { expr; } CMDAssert(); } while (0)
-#define INTERNAL(expr)  do { internalUse = 1; { expr; } internalUse = 0; } while (0)
-
-int func(n) {
-	CMD_CHECK(fflush(stdout););
-	CMD_CHECK(fflush(stdout));
-	CMD_CHECK(fflush(stdout) );
-	CMD_CHECK( fflush(stdout) );
-	CMD_CHECK( fflush(stdout));
-	CMD_CHECK( fflush(stdout););
-	CMD_CHECK( fflush(stdout); );
-	CMD_CHECK( INTERNAL(fflush(stdout)) );
-	CMD_CHECK( INTERNAL(fflush(stdout) ); );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_wrap.c
deleted file mode 100644
index 7589d03b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_wrap.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void FSUB(MPI_Foo)(MPI_Fint* sendcount); 
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/funcfunc.c
deleted file mode 100644
index ee717abc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/funcfunc.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main()
-{
-   mWriter( "class Clst_"c )( cluster.getChild( HO_SHORT_NAME ).getText() )( " : Cluster {"c ).newline;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/function-def.c
deleted file mode 100644
index 778d121f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/function-def.c
+++ /dev/null
@@ -1,24 +0,0 @@
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int param1,
-          int param2,
-          char *param2);
-
-void foo3(int      param1,
-          int     param2,
-          char  *param2
-          );
-
-struct whoopee *foo4(int param1, int param2, char *param2);
-
-const struct snickers *
-foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf("boo!\n");
-}
-
-EXPORT int DoStuff(int    Num);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/gh399.c
deleted file mode 100644
index 00f868a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/gh399.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-void foo()
-{
-    for(i = 0; i * i < n; i++)
-    {
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/global-vars.c
deleted file mode 100644
index 9576341b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/global-vars.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-static int another_try;
-struct something yup;
-align_me_t  please;
-const char *name = "hello";
-static nothing really;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/hello.c
deleted file mode 100644
index 5849783c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/hello.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>

-

-void HelloWorld(char* pString)

-{

-    printf("%s\n", pString);

-} /* HelloWorld */

-

-int main()

-{

-    HelloWorld("Hello world");

-    

-    return 0;

-} /* main */

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1270.c
deleted file mode 100644
index 4831a47a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1270.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifdef asm
-#endif
-/* comment should stay */
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1413.c
deleted file mode 100644
index 4287ca86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1413.c
+++ /dev/null
@@ -1 +0,0 @@
-#
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1564.c
deleted file mode 100644
index c906ef9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1564.c
+++ /dev/null
@@ -1,13 +0,0 @@
-void f(){
-	return f(p0,
-	         p1);
-}
-
-typedef enum
-{
-	xxx = 0x00   /* comment */
-	, yyy = 0x01 /* comment */
-	, zzz = 0x02 /* comment */
-	, ttt = 0x03 /* comment */
-	, rrr = 0x04 /* comment */
-}some_label;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i2c-core.c
deleted file mode 100644
index 29bdb584..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i2c-core.c
+++ /dev/null
@@ -1,1234 +0,0 @@
-/* i2c-core.c - a device driver for the iic-bus interface		     */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-99 Simon G. Vogl
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
-   All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
-   SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/idr.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-
-
-static LIST_HEAD(adapters);
-static LIST_HEAD(drivers);
-static DECLARE_MUTEX(core_lists);
-static DEFINE_IDR(i2c_adapter_idr);
-
-static int i2c_device_match(struct device *dev, struct device_driver *drv)
-{
-	return 1;
-}
-
-static int i2c_bus_suspend(struct device * dev, pm_message_t state)
-{
-	int rc = 0;
-
-	if (dev->driver && dev->driver->suspend)
-		rc = dev->driver->suspend(dev,state,0);
-	return rc;
-}
-
-static int i2c_bus_resume(struct device * dev)
-{
-	int rc = 0;
-	
-	if (dev->driver && dev->driver->resume)
-		rc = dev->driver->resume(dev,0);
-	return rc;
-}
-
-struct bus_type i2c_bus_type = {
-	.name =		"i2c",
-	.match =	i2c_device_match,
-	.suspend =      i2c_bus_suspend,
-	.resume =       i2c_bus_resume,
-};
-
-static int i2c_device_probe(struct device *dev)
-{
-	return -ENODEV;
-}
-
-static int i2c_device_remove(struct device *dev)
-{
-	return 0;
-}
-
-void i2c_adapter_dev_release(struct device *dev)
-{
-	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-	complete(&adap->dev_released);
-}
-
-struct device_driver i2c_adapter_driver = {
-	.name =	"i2c_adapter",
-	.bus = &i2c_bus_type,
-	.probe = i2c_device_probe,
-	.remove = i2c_device_remove,
-};
-
-static void i2c_adapter_class_dev_release(struct class_device *dev)
-{
-	struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-	complete(&adap->class_dev_released);
-}
-
-struct class i2c_adapter_class = {
-	.name =		"i2c-adapter",
-	.release =	&i2c_adapter_class_dev_release,
-};
-
-static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-	return sprintf(buf, "%s\n", adap->name);
-}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
-static void i2c_client_release(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	complete(&client->released);
-}
-
-static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	return sprintf(buf, "%s\n", client->name);
-}
-
-/*
- * We can't use the DEVICE_ATTR() macro here as we want the same filename for a
- * different type of a device.  So beware if the DEVICE_ATTR() macro ever
- * changes, this definition will also have to change.
- */
-static struct device_attribute dev_attr_client_name = {
-	.attr	= {.name = "name", .mode = S_IRUGO, .owner = THIS_MODULE },
-	.show	= &show_client_name,
-};
-
-
-/* ---------------------------------------------------
- * registering functions
- * ---------------------------------------------------
- */
-
-/* -----
- * i2c_add_adapter is called from within the algorithm layer,
- * when a new hw adapter registers. A new device is register to be
- * available for clients.
- */
-int i2c_add_adapter(struct i2c_adapter *adap)
-{
-	int id, res = 0;
-	struct list_head   *item;
-	struct i2c_driver  *driver;
-
-	down(&core_lists);
-
-	if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0) {
-		res = -ENOMEM;
-		goto out_unlock;
-	}
-
-	res = idr_get_new(&i2c_adapter_idr, adap, &id);
-	if (res < 0) {
-		if (res == -EAGAIN)
-			res = -ENOMEM;
-		goto out_unlock;
-	}
-
-	adap->nr =  id & MAX_ID_MASK;
-	init_MUTEX(&adap->bus_lock);
-	init_MUTEX(&adap->clist_lock);
-	list_add_tail(&adap->list,&adapters);
-	INIT_LIST_HEAD(&adap->clients);
-
-	/* Add the adapter to the driver core.
-	 * If the parent pointer is not set up,
-	 * we add this adapter to the host bus.
-	 */
-	if (adap->dev.parent == NULL)
-		adap->dev.parent = &platform_bus;
-	sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
-	adap->dev.driver = &i2c_adapter_driver;
-	adap->dev.release = &i2c_adapter_dev_release;
-	device_register(&adap->dev);
-	device_create_file(&adap->dev, &dev_attr_name);
-
-	/* Add this adapter to the i2c_adapter class */
-	memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-	adap->class_dev.dev = &adap->dev;
-	adap->class_dev.class = &i2c_adapter_class;
-	strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-	class_device_register(&adap->class_dev);
-
-	dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
-
-	/* inform drivers of new adapters */
-	list_for_each(item,&drivers) {
-		driver = list_entry(item, struct i2c_driver, list);
-		if (driver->flags & I2C_DF_NOTIFY)
-			/* We ignore the return code; if it fails, too bad */
-			driver->attach_adapter(adap);
-	}
-
-out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-
-int i2c_del_adapter(struct i2c_adapter *adap)
-{
-	struct list_head  *item, *_n;
-	struct i2c_adapter *adap_from_list;
-	struct i2c_driver *driver;
-	struct i2c_client *client;
-	int res = 0;
-
-	down(&core_lists);
-
-	/* First make sure that this adapter was ever added */
-	list_for_each_entry(adap_from_list, &adapters, list) {
-		if (adap_from_list == adap)
-			break;
-	}
-	if (adap_from_list != adap) {
-		pr_debug("i2c-core: attempting to delete unregistered "
-			 "adapter [%s]\n", adap->name);
-		res = -EINVAL;
-		goto out_unlock;
-	}
-
-	list_for_each(item,&drivers) {
-		driver = list_entry(item, struct i2c_driver, list);
-		if (driver->detach_adapter)
-			if ((res = driver->detach_adapter(adap))) {
-				dev_err(&adap->dev, "detach_adapter failed "
-					"for driver [%s]\n", driver->name);
-				goto out_unlock;
-			}
-	}
-
-	/* detach any active clients. This must be done first, because
-	 * it can fail; in which case we give up. */
-	list_for_each_safe(item, _n, &adap->clients) {
-		client = list_entry(item, struct i2c_client, list);
-
-		/* detaching devices is unconditional of the set notify
-		 * flag, as _all_ clients that reside on the adapter
-		 * must be deleted, as this would cause invalid states.
-		 */
-		if ((res=client->driver->detach_client(client))) {
-			dev_err(&adap->dev, "detach_client failed for client "
-				"[%s] at address 0x%02x\n", client->name,
-				client->addr);
-			goto out_unlock;
-		}
-	}
-
-	/* clean up the sysfs representation */
-	init_completion(&adap->dev_released);
-	init_completion(&adap->class_dev_released);
-	class_device_unregister(&adap->class_dev);
-	device_remove_file(&adap->dev, &dev_attr_name);
-	device_unregister(&adap->dev);
-	list_del(&adap->list);
-
-	/* wait for sysfs to drop all references */
-	wait_for_completion(&adap->dev_released);
-	wait_for_completion(&adap->class_dev_released);
-
-	/* free dynamically allocated bus id */
-	idr_remove(&i2c_adapter_idr, adap->nr);
-
-	dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
-
- out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-
-/* -----
- * What follows is the "upwards" interface: commands for talking to clients,
- * which implement the functions to access the physical information of the
- * chips.
- */
-
-int i2c_add_driver(struct i2c_driver *driver)
-{
-	struct list_head   *item;
-	struct i2c_adapter *adapter;
-	int res = 0;
-
-	down(&core_lists);
-
-	/* add the driver to the list of i2c drivers in the driver core */
-	driver->driver.name = driver->name;
-	driver->driver.bus = &i2c_bus_type;
-	driver->driver.probe = i2c_device_probe;
-	driver->driver.remove = i2c_device_remove;
-
-	res = driver_register(&driver->driver);
-	if (res)
-		goto out_unlock;
-	
-	list_add_tail(&driver->list,&drivers);
-	pr_debug("i2c-core: driver [%s] registered\n", driver->name);
-
-	/* now look for instances of driver on our adapters */
-	if (driver->flags & I2C_DF_NOTIFY) {
-		list_for_each(item,&adapters) {
-			adapter = list_entry(item, struct i2c_adapter, list);
-			driver->attach_adapter(adapter);
-		}
-	}
-
- out_unlock:
-	up(&core_lists);
-	return res;
-}
-
-int i2c_del_driver(struct i2c_driver *driver)
-{
-	struct list_head   *item1, *item2, *_n;
-	struct i2c_client  *client;
-	struct i2c_adapter *adap;
-	
-	int res = 0;
-
-	down(&core_lists);
-
-	/* Have a look at each adapter, if clients of this driver are still
-	 * attached. If so, detach them to be able to kill the driver
-	 * afterwards.
-	 *
-	 * Removing clients does not depend on the notify flag, else
-	 * invalid operation might (will!) result, when using stale client
-	 * pointers.
-	 */
-	list_for_each(item1,&adapters) {
-		adap = list_entry(item1, struct i2c_adapter, list);
-		if (driver->detach_adapter) {
-			if ((res = driver->detach_adapter(adap))) {
-				dev_err(&adap->dev, "detach_adapter failed "
-					"for driver [%s]\n", driver->name);
-				goto out_unlock;
-			}
-		} else {
-			list_for_each_safe(item2, _n, &adap->clients) {
-				client = list_entry(item2, struct i2c_client, list);
-				if (client->driver != driver)
-					continue;
-				dev_dbg(&adap->dev, "detaching client [%s] "
-					"at 0x%02x\n", client->name,
-					client->addr);
-				if ((res = driver->detach_client(client))) {
-					dev_err(&adap->dev, "detach_client "
-						"failed for client [%s] at "
-						"0x%02x\n", client->name,
-						client->addr);
-					goto out_unlock;
-				}
-			}
-		}
-	}
-
-	driver_unregister(&driver->driver);
-	list_del(&driver->list);
-	pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
-
- out_unlock:
-	up(&core_lists);
-	return 0;
-}
-
-static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
-{
-	struct list_head   *item;
-	struct i2c_client  *client;
-
-	list_for_each(item,&adapter->clients) {
-		client = list_entry(item, struct i2c_client, list);
-		if (client->addr == addr)
-			return -EBUSY;
-	}
-	return 0;
-}
-
-int i2c_check_addr(struct i2c_adapter *adapter, int addr)
-{
-	int rval;
-
-	down(&adapter->clist_lock);
-	rval = __i2c_check_addr(adapter, addr);
-	up(&adapter->clist_lock);
-
-	return rval;
-}
-
-int i2c_attach_client(struct i2c_client *client)
-{
-	struct i2c_adapter *adapter = client->adapter;
-
-	down(&adapter->clist_lock);
-	if (__i2c_check_addr(client->adapter, client->addr)) {
-		up(&adapter->clist_lock);
-		return -EBUSY;
-	}
-	list_add_tail(&client->list,&adapter->clients);
-	up(&adapter->clist_lock);
-	
-	if (adapter->client_register)  {
-		if (adapter->client_register(client))  {
-			dev_dbg(&adapter->dev, "client_register "
-				"failed for client [%s] at 0x%02x\n",
-				client->name, client->addr);
-		}
-	}
-
-	if (client->flags & I2C_CLIENT_ALLOW_USE)
-		client->usage_count = 0;
-
-	client->dev.parent = &client->adapter->dev;
-	client->dev.driver = &client->driver->driver;
-	client->dev.bus = &i2c_bus_type;
-	client->dev.release = &i2c_client_release;
-	
-	snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-		"%d-%04x", i2c_adapter_id(adapter), client->addr);
-	dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-		client->name, client->dev.bus_id);
-	device_register(&client->dev);
-	device_create_file(&client->dev, &dev_attr_client_name);
-	
-	return 0;
-}
-
-
-int i2c_detach_client(struct i2c_client *client)
-{
-	struct i2c_adapter *adapter = client->adapter;
-	int res = 0;
-	
-	if ((client->flags & I2C_CLIENT_ALLOW_USE)
-	 && (client->usage_count > 0)) {
-		dev_warn(&client->dev, "Client [%s] still busy, "
-			 "can't detach\n", client->name);
-		return -EBUSY;
-	}
-
-	if (adapter->client_unregister)  {
-		res = adapter->client_unregister(client);
-		if (res) {
-			dev_err(&client->dev,
-				"client_unregister [%s] failed, "
-				"client not detached\n", client->name);
-			goto out;
-		}
-	}
-
-	down(&adapter->clist_lock);
-	list_del(&client->list);
-	init_completion(&client->released);
-	device_remove_file(&client->dev, &dev_attr_client_name);
-	device_unregister(&client->dev);
-	up(&adapter->clist_lock);
-	wait_for_completion(&client->released);
-
- out:
-	return res;
-}
-
-static int i2c_inc_use_client(struct i2c_client *client)
-{
-
-	if (!try_module_get(client->driver->owner))
-		return -ENODEV;
-	if (!try_module_get(client->adapter->owner)) {
-		module_put(client->driver->owner);
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static void i2c_dec_use_client(struct i2c_client *client)
-{
-	module_put(client->driver->owner);
-	module_put(client->adapter->owner);
-}
-
-int i2c_use_client(struct i2c_client *client)
-{
-	int ret;
-
-	ret = i2c_inc_use_client(client);
-	if (ret)
-		return ret;
-
-	if (client->flags & I2C_CLIENT_ALLOW_USE) {
-		if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
-			client->usage_count++;
-		else if (client->usage_count > 0)
-			goto busy;
-		else
-			client->usage_count++;
-	}
-
-	return 0;
- busy:
-	i2c_dec_use_client(client);
-	return -EBUSY;
-}
-
-int i2c_release_client(struct i2c_client *client)
-{
-	if(client->flags & I2C_CLIENT_ALLOW_USE) {
-		if(client->usage_count>0)
-			client->usage_count--;
-		else {
-			pr_debug("i2c-core: %s used one too many times\n",
-				__FUNCTION__);
-			return -EPERM;
-		}
-	}
-	
-	i2c_dec_use_client(client);
-	
-	return 0;
-}
-
-void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
-{
-	struct list_head  *item;
-	struct i2c_client *client;
-
-	down(&adap->clist_lock);
-	list_for_each(item,&adap->clients) {
-		client = list_entry(item, struct i2c_client, list);
-		if (!try_module_get(client->driver->owner))
-			continue;
-		if (NULL != client->driver->command) {
-			up(&adap->clist_lock);
-			client->driver->command(client,cmd,arg);
-			down(&adap->clist_lock);
-		}
-		module_put(client->driver->owner);
-       }
-       up(&adap->clist_lock);
-}
-
-static int __init i2c_init(void)
-{
-	int retval;
-
-	retval = bus_register(&i2c_bus_type);
-	if (retval)
-		return retval;
-	retval = driver_register(&i2c_adapter_driver);
-	if (retval)
-		return retval;
-	return class_register(&i2c_adapter_class);
-}
-
-static void __exit i2c_exit(void)
-{
-	class_unregister(&i2c_adapter_class);
-	driver_unregister(&i2c_adapter_driver);
-	bus_unregister(&i2c_bus_type);
-}
-
-subsys_initcall(i2c_init);
-module_exit(i2c_exit);
-
-/* ----------------------------------------------------
- * the functional interface to the i2c busses.
- * ----------------------------------------------------
- */
-
-int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
-{
-	int ret;
-
-	if (adap->algo->master_xfer) {
-#ifdef DEBUG
-		for (ret = 0; ret < num; ret++) {
-			dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
-				"len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
-				'R' : 'W', msgs[ret].addr, msgs[ret].len);
-		}
-#endif
-
-		down(&adap->bus_lock);
-		ret = adap->algo->master_xfer(adap,msgs,num);
-		up(&adap->bus_lock);
-
-		return ret;
-	} else {
-		dev_dbg(&adap->dev, "I2C level transfers not supported\n");
-		return -ENOSYS;
-	}
-}
-
-int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
-{
-	int ret;
-	struct i2c_adapter *adap=client->adapter;
-	struct i2c_msg msg;
-
-	msg.addr = client->addr;
-	msg.flags = client->flags & I2C_M_TEN;
-	msg.len = count;
-	msg.buf = (char *)buf;
-	
-	ret = i2c_transfer(adap, &msg, 1);
-
-	/* If everything went ok (i.e. 1 msg transmitted), return #bytes
-	   transmitted, else error code. */
-	return (ret == 1) ? count : ret;
-}
-
-int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
-{
-	struct i2c_adapter *adap=client->adapter;
-	struct i2c_msg msg;
-	int ret;
-
-	msg.addr = client->addr;
-	msg.flags = client->flags & I2C_M_TEN;
-	msg.flags |= I2C_M_RD;
-	msg.len = count;
-	msg.buf = buf;
-
-	ret = i2c_transfer(adap, &msg, 1);
-
-	/* If everything went ok (i.e. 1 msg transmitted), return #bytes
-	   transmitted, else error code. */
-	return (ret == 1) ? count : ret;
-}
-
-
-int i2c_control(struct i2c_client *client,
-	unsigned int cmd, unsigned long arg)
-{
-	int ret = 0;
-	struct i2c_adapter *adap = client->adapter;
-
-	dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
-	switch (cmd) {
-		case I2C_RETRIES:
-			adap->retries = arg;
-			break;
-		case I2C_TIMEOUT:
-			adap->timeout = arg;
-			break;
-		default:
-			if (adap->algo->algo_control!=NULL)
-				ret = adap->algo->algo_control(adap,cmd,arg);
-	}
-	return ret;
-}
-
-/* ----------------------------------------------------
- * the i2c address scanning function
- * Will not work for 10-bit addresses!
- * ----------------------------------------------------
- */
-static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-			     int (*found_proc) (struct i2c_adapter *, int, int))
-{
-	int err;
-
-	/* Make sure the address is valid */
-	if (addr < 0x03 || addr > 0x77) {
-		dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-			 addr);
-		return -EINVAL;
-	}
-
-	/* Skip if already in use */
-	if (i2c_check_addr(adapter, addr))
-		return 0;
-
-	/* Make sure there is something at this address, unless forced */
-	if (kind < 0) {
-		if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-				   I2C_SMBUS_QUICK, NULL) < 0)
-			return 0;
-
-		/* prevent 24RF08 corruption */
-		if ((addr & ~0x0f) == 0x50)
-			i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-				       I2C_SMBUS_QUICK, NULL);
-	}
-
-	/* Finally call the custom detection function */
-	err = found_proc(adapter, addr, kind);
-
-	/* -ENODEV can be returned if there is a chip at the given address
-	   but it isn't supported by this chip driver. We catch it here as
-	   this isn't an error. */
-	return (err == -ENODEV) ? 0 : err;
-}
-
-int i2c_probe(struct i2c_adapter *adapter,
-	      struct i2c_client_address_data *address_data,
-	      int (*found_proc) (struct i2c_adapter *, int, int))
-{
-	int i, err;
-	int adap_id = i2c_adapter_id(adapter);
-
-	/* Forget it if we can't probe using SMBUS_QUICK */
-	if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
-		return -1;
-
-	/* Force entries are done first, and are not affected by ignore
-	   entries */
-	if (address_data->forces) {
-		unsigned short **forces = address_data->forces;
-		int kind;
-
-		for (kind = 0; forces[kind]; kind++) {
-			for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-			     i += 2) {
-				if (forces[kind][i] == adap_id
-				 || forces[kind][i] == ANY_I2C_BUS) {
-					dev_dbg(&adapter->dev, "found force "
-						"parameter for adapter %d, "
-						"addr 0x%02x, kind %d\n",
-						adap_id, forces[kind][i + 1],
-						kind);
-					err = i2c_probe_address(adapter,
-						forces[kind][i + 1],
-						kind, found_proc);
-					if (err)
-						return err;
-				}
-			}
-		}
-	}
-
-	/* Probe entries are done second, and are not affected by ignore
-	   entries either */
-	for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
-		if (address_data->probe[i] == adap_id
-		 || address_data->probe[i] == ANY_I2C_BUS) {
-			dev_dbg(&adapter->dev, "found probe parameter for "
-				"adapter %d, addr 0x%02x\n", adap_id,
-				address_data->probe[i + 1]);
-			err = i2c_probe_address(adapter,
-						address_data->probe[i + 1],
-						-1, found_proc);
-			if (err)
-				return err;
-		}
-	}
-
-	/* Normal entries are done last, unless shadowed by an ignore entry */
-	for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
-		int j, ignore;
-
-		ignore = 0;
-		for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-		     j += 2) {
-			if ((address_data->ignore[j] == adap_id ||
-			     address_data->ignore[j] == ANY_I2C_BUS)
-			 && address_data->ignore[j + 1]
-			    == address_data->normal_i2c[i]) {
-				dev_dbg(&adapter->dev, "found ignore "
-					"parameter for adapter %d, "
-					"addr 0x%02x\n", adap_id,
-					address_data->ignore[j + 1]);
-			}
-			ignore = 1;
-			break;
-		}
-		if (ignore)
-			continue;
-
-		dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-			"addr 0x%02x\n", adap_id,
-			address_data->normal_i2c[i]);
-		err = i2c_probe_address(adapter, address_data->normal_i2c[i],
-					-1, found_proc);
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
-struct i2c_adapter* i2c_get_adapter(int id)
-{
-	struct i2c_adapter *adapter;
-	
-	down(&core_lists);
-	adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
-	if (adapter && !try_module_get(adapter->owner))
-		adapter = NULL;
-
-	up(&core_lists);
-	return adapter;
-}
-
-void i2c_put_adapter(struct i2c_adapter *adap)
-{
-	module_put(adap->owner);
-}
-
-/* The SMBus parts */
-
-#define POLY    (0x1070U << 3)
-static u8
-crc8(u16 data)
-{
-	int i;
-
-	for(i = 0; i < 8; i++) {
-		if (data & 0x8000)
-			data = data ^ POLY;
-		data = data << 1;
-	}
-	return (u8)(data >> 8);
-}
-
-/* CRC over count bytes in the first array plus the bytes in the rest
-   array if it is non-null. rest[0] is the (length of rest) - 1
-   and is included. */
-static u8 i2c_smbus_partial_pec(u8 crc, int count, u8 *first, u8 *rest)
-{
-	int i;
-
-	for(i = 0; i < count; i++)
-		crc = crc8((crc ^ first[i]) << 8);
-	if(rest != NULL)
-		for(i = 0; i <= rest[0]; i++)
-			crc = crc8((crc ^ rest[i]) << 8);
-	return crc;
-}
-
-static u8 i2c_smbus_pec(int count, u8 *first, u8 *rest)
-{
-	return i2c_smbus_partial_pec(0, count, first, rest);
-}
-
-/* Returns new "size" (transaction type)
-   Note that we convert byte to byte_data and byte_data to word_data
-   rather than invent new xxx_PEC transactions. */
-static int i2c_smbus_add_pec(u16 addr, u8 command, int size,
-			     union i2c_smbus_data *data)
-{
-	u8 buf[3];
-
-	buf[0] = addr << 1;
-	buf[1] = command;
-	switch(size) {
-		case I2C_SMBUS_BYTE:
-			data->byte = i2c_smbus_pec(2, buf, NULL);
-			size = I2C_SMBUS_BYTE_DATA;
-			break;
-		case I2C_SMBUS_BYTE_DATA:
-			buf[2] = data->byte;
-			data->word = buf[2] ||
-			            (i2c_smbus_pec(3, buf, NULL) << 8);
-			size = I2C_SMBUS_WORD_DATA;
-			break;
-		case I2C_SMBUS_WORD_DATA:
-			/* unsupported */
-			break;
-		case I2C_SMBUS_BLOCK_DATA:
-			data->block[data->block[0] + 1] =
-			             i2c_smbus_pec(2, buf, data->block);
-			size = I2C_SMBUS_BLOCK_DATA_PEC;
-			break;
-	}
-	return size;	
-}
-
-static int i2c_smbus_check_pec(u16 addr, u8 command, int size, u8 partial,
-			       union i2c_smbus_data *data)
-{
-	u8 buf[3], rpec, cpec;
-
-	buf[1] = command;
-	switch(size) {
-		case I2C_SMBUS_BYTE_DATA:
-			buf[0] = (addr << 1) | 1;
-			cpec = i2c_smbus_pec(2, buf, NULL);
-			rpec = data->byte;
-			break;
-		case I2C_SMBUS_WORD_DATA:
-			buf[0] = (addr << 1) | 1;
-			buf[2] = data->word & 0xff;
-			cpec = i2c_smbus_pec(3, buf, NULL);
-			rpec = data->word >> 8;
-			break;
-		case I2C_SMBUS_WORD_DATA_PEC:
-			/* unsupported */
-			cpec = rpec = 0;
-			break;
-		case I2C_SMBUS_PROC_CALL_PEC:
-			/* unsupported */
-			cpec = rpec = 0;
-			break;
-		case I2C_SMBUS_BLOCK_DATA_PEC:
-			buf[0] = (addr << 1);
-			buf[2] = (addr << 1) | 1;
-			cpec = i2c_smbus_pec(3, buf, data->block);
-			rpec = data->block[data->block[0] + 1];
-			break;
-		case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-			buf[0] = (addr << 1) | 1;
-			rpec = i2c_smbus_partial_pec(partial, 1,
-			                             buf, data->block);
-			cpec = data->block[data->block[0] + 1];
-			break;
-		default:
-			cpec = rpec = 0;
-			break;
-	}
-	if (rpec != cpec) {
-		pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n",
-			rpec, cpec);
-		return -1;
-	}
-	return 0;	
-}
-
-s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
-{
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
- 	                      value,0,I2C_SMBUS_QUICK,NULL);
-}
-
-s32 i2c_smbus_read_byte(struct i2c_client *client)
-{
-	union i2c_smbus_data data;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                   I2C_SMBUS_READ,0,I2C_SMBUS_BYTE, &data))
-		return -1;
-	else
-		return 0x0FF & data.byte;
-}
-
-s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
-{
-	union i2c_smbus_data data;	/* only for PEC */
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_WRITE,value, I2C_SMBUS_BYTE,&data);
-}
-
-s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
-{
-	union i2c_smbus_data data;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                   I2C_SMBUS_READ,command, I2C_SMBUS_BYTE_DATA,&data))
-		return -1;
-	else
-		return 0x0FF & data.byte;
-}
-
-s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
-{
-	union i2c_smbus_data data;
-	data.byte = value;
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_WRITE,command,
-	                      I2C_SMBUS_BYTE_DATA,&data);
-}
-
-s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
-{
-	union i2c_smbus_data data;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                   I2C_SMBUS_READ,command, I2C_SMBUS_WORD_DATA, &data))
-		return -1;
-	else
-		return 0x0FFFF & data.word;
-}
-
-s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
-{
-	union i2c_smbus_data data;
-	data.word = value;
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_WRITE,command,
-	                      I2C_SMBUS_WORD_DATA,&data);
-}
-
-s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
-			       u8 length, u8 *values)
-{
-	union i2c_smbus_data data;
-	int i;
-	if (length > I2C_SMBUS_BLOCK_MAX)
-		length = I2C_SMBUS_BLOCK_MAX;
-	for (i = 1; i <= length; i++)
-		data.block[i] = values[i-1];
-	data.block[0] = length;
-	return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-			      I2C_SMBUS_WRITE,command,
-			      I2C_SMBUS_BLOCK_DATA,&data);
-}
-
-/* Returns the number of read bytes */
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
-{
-	union i2c_smbus_data data;
-	int i;
-	if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
-	                      I2C_SMBUS_READ,command,
-	                      I2C_SMBUS_I2C_BLOCK_DATA,&data))
-		return -1;
-	else {
-		for (i = 1; i <= data.block[0]; i++)
-			values[i-1] = data.block[i];
-		return data.block[0];
-	}
-}
-
-/* Simulate a SMBus command using the i2c protocol
-   No checking of parameters is done!  */
-static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
-                                   unsigned short flags,
-                                   char read_write, u8 command, int size,
-                                   union i2c_smbus_data * data)
-{
-	/* So we need to generate a series of msgs. In the case of writing, we
-	  need to use only one message; when reading, we need two. We initialize
-	  most things with sane defaults, to keep the code below somewhat
-	  simpler. */
-	unsigned char msgbuf0[34];
-	unsigned char msgbuf1[34];
-	int num = read_write == I2C_SMBUS_READ?2:1;
-	struct i2c_msg msg[2] = { { addr, flags, 1, msgbuf0 },
-	                          { addr, flags | I2C_M_RD, 0, msgbuf1 }
-	                        };
-	int i;
-
-	msgbuf0[0] = command;
-	switch(size) {
-	case I2C_SMBUS_QUICK:
-		msg[0].len = 0;
-		/* Special case: The read/write field is used as data */
-		msg[0].flags = flags | (read_write==I2C_SMBUS_READ)?I2C_M_RD:0;
-		num = 1;
-		break;
-	case I2C_SMBUS_BYTE:
-		if (read_write == I2C_SMBUS_READ) {
-			/* Special case: only a read! */
-			msg[0].flags = I2C_M_RD | flags;
-			num = 1;
-		}
-		break;
-	case I2C_SMBUS_BYTE_DATA:
-		if (read_write == I2C_SMBUS_READ)
-			msg[1].len = 1;
-		else {
-			msg[0].len = 2;
-			msgbuf0[1] = data->byte;
-		}
-		break;
-	case I2C_SMBUS_WORD_DATA:
-		if (read_write == I2C_SMBUS_READ)
-			msg[1].len = 2;
-		else {
-			msg[0].len=3;
-			msgbuf0[1] = data->word & 0xff;
-			msgbuf0[2] = (data->word >> 8) & 0xff;
-		}
-		break;
-	case I2C_SMBUS_PROC_CALL:
-		num = 2; /* Special case */
-		read_write = I2C_SMBUS_READ;
-		msg[0].len = 3;
-		msg[1].len = 2;
-		msgbuf0[1] = data->word & 0xff;
-		msgbuf0[2] = (data->word >> 8) & 0xff;
-		break;
-	case I2C_SMBUS_BLOCK_DATA:
-	case I2C_SMBUS_BLOCK_DATA_PEC:
-		if (read_write == I2C_SMBUS_READ) {
-			dev_err(&adapter->dev, "Block read not supported "
-			       "under I2C emulation!\n");
-			return -1;
-		} else {
-			msg[0].len = data->block[0] + 2;
-			if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2) {
-				dev_err(&adapter->dev, "smbus_access called with "
-				       "invalid block write size (%d)\n",
-				       data->block[0]);
-				return -1;
-			}
-			if(size == I2C_SMBUS_BLOCK_DATA_PEC)
-				(msg[0].len)++;
-			for (i = 1; i <= msg[0].len; i++)
-				msgbuf0[i] = data->block[i-1];
-		}
-		break;
-	case I2C_SMBUS_BLOCK_PROC_CALL:
-	case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-		dev_dbg(&adapter->dev, "Block process call not supported "
-		       "under I2C emulation!\n");
-		return -1;
-	case I2C_SMBUS_I2C_BLOCK_DATA:
-		if (read_write == I2C_SMBUS_READ) {
-			msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;
-		} else {
-			msg[0].len = data->block[0] + 1;
-			if (msg[0].len > I2C_SMBUS_I2C_BLOCK_MAX + 1) {
-				dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "
-				       "invalid block write size (%d)\n",
-				       data->block[0]);
-				return -1;
-			}
-			for (i = 1; i <= data->block[0]; i++)
-				msgbuf0[i] = data->block[i];
-		}
-		break;
-	default:
-		dev_err(&adapter->dev, "smbus_access called with invalid size (%d)\n",
-		       size);
-		return -1;
-	}
-
-	if (i2c_transfer(adapter, msg, num) < 0)
-		return -1;
-
-	if (read_write == I2C_SMBUS_READ)
-		switch(size) {
-			case I2C_SMBUS_BYTE:
-				data->byte = msgbuf0[0];
-				break;
-			case I2C_SMBUS_BYTE_DATA:
-				data->byte = msgbuf1[0];
-				break;
-			case I2C_SMBUS_WORD_DATA:
-			case I2C_SMBUS_PROC_CALL:
-				data->word = msgbuf1[0] | (msgbuf1[1] << 8);
-				break;
-			case I2C_SMBUS_I2C_BLOCK_DATA:
-				/* fixed at 32 for now */
-				data->block[0] = I2C_SMBUS_I2C_BLOCK_MAX;
-				for (i = 0; i < I2C_SMBUS_I2C_BLOCK_MAX; i++)
-					data->block[i+1] = msgbuf1[i];
-				break;
-		}
-	return 0;
-}
-
-
-s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
-                   char read_write, u8 command, int size,
-                   union i2c_smbus_data * data)
-{
-	s32 res;
-	int swpec = 0;
-	u8 partial = 0;
-
-	flags &= I2C_M_TEN | I2C_CLIENT_PEC;
-	if((flags & I2C_CLIENT_PEC) &&
-	   !(i2c_check_functionality(adapter, I2C_FUNC_SMBUS_HWPEC_CALC))) {
-		swpec = 1;
-		if(read_write == I2C_SMBUS_READ &&
-		   size == I2C_SMBUS_BLOCK_DATA)
-			size = I2C_SMBUS_BLOCK_DATA_PEC;
-		else if(size == I2C_SMBUS_PROC_CALL)
-			size = I2C_SMBUS_PROC_CALL_PEC;
-		else if(size == I2C_SMBUS_BLOCK_PROC_CALL) {
-			i2c_smbus_add_pec(addr, command,
-		                          I2C_SMBUS_BLOCK_DATA, data);
-			partial = data->block[data->block[0] + 1];
-			size = I2C_SMBUS_BLOCK_PROC_CALL_PEC;
-		} else if(read_write == I2C_SMBUS_WRITE &&
-		          size != I2C_SMBUS_QUICK &&
-		          size != I2C_SMBUS_I2C_BLOCK_DATA)
-			size = i2c_smbus_add_pec(addr, command, size, data);
-	}
-
-	if (adapter->algo->smbus_xfer) {
-		down(&adapter->bus_lock);
-		res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write,
-		                                command,size,data);
-		up(&adapter->bus_lock);
-	} else
-		res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,
-	                                      command,size,data);
-
-	if(res >= 0 && swpec &&
-	   size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA &&
-	   (read_write == I2C_SMBUS_READ || size == I2C_SMBUS_PROC_CALL_PEC ||
-	    size == I2C_SMBUS_BLOCK_PROC_CALL_PEC)) {
-		if(i2c_smbus_check_pec(addr, command, size, partial, data))
-			return -1;
-	}
-	return res;
-}
-
-
-/* Next four are needed by i2c-isa */
-EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
-EXPORT_SYMBOL_GPL(i2c_adapter_driver);
-EXPORT_SYMBOL_GPL(i2c_adapter_class);
-EXPORT_SYMBOL_GPL(i2c_bus_type);
-
-EXPORT_SYMBOL(i2c_add_adapter);
-EXPORT_SYMBOL(i2c_del_adapter);
-EXPORT_SYMBOL(i2c_add_driver);
-EXPORT_SYMBOL(i2c_del_driver);
-EXPORT_SYMBOL(i2c_attach_client);
-EXPORT_SYMBOL(i2c_detach_client);
-EXPORT_SYMBOL(i2c_use_client);
-EXPORT_SYMBOL(i2c_release_client);
-EXPORT_SYMBOL(i2c_clients_command);
-EXPORT_SYMBOL(i2c_check_addr);
-
-EXPORT_SYMBOL(i2c_master_send);
-EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_control);
-EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_get_adapter);
-EXPORT_SYMBOL(i2c_put_adapter);
-EXPORT_SYMBOL(i2c_probe);
-
-EXPORT_SYMBOL(i2c_smbus_xfer);
-EXPORT_SYMBOL(i2c_smbus_write_quick);
-EXPORT_SYMBOL(i2c_smbus_read_byte);
-EXPORT_SYMBOL(i2c_smbus_write_byte);
-EXPORT_SYMBOL(i2c_smbus_read_byte_data);
-EXPORT_SYMBOL(i2c_smbus_write_byte_data);
-EXPORT_SYMBOL(i2c_smbus_read_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
-
-MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
-MODULE_DESCRIPTION("I2C-Bus main module");
-MODULE_LICENSE("GPL");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/if_chain.c
deleted file mode 100644
index 948492dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/if_chain.c
+++ /dev/null
@@ -1,82 +0,0 @@
-void foo(void)
-{
-   if (cond_a) {
-       fcn_a();
-       fcn_b();
-   } else {
-       fcn_c();
-   }
-
-   if (cond_b) {
-       fcn_d();
-   } else {
-       fcn_e();
-   }
-
-   if (cond_c) {
-       fcn_f();
-       fcn_g();
-   } else
-       fcn_h();
-
-   if (cond_d)
-       fcn_i();
-   else {
-       fcn_j();
-       fcn_k();
-   }
-
-   if (cond_e)
-       fcn_l();
-   else
-       fcn_m();
-
-   	if (cond_f)
-		fcn_n();
-	else if (cond_g) {
-                fcn_o();
-		while (cond_g) {
-			fcn_p();
-		}
-	} else if (cond_h)
-		while (cond_i) {
-			fcn_q();
-			fcn_r();
-		}
-	else
-		fcn_s();
-}
-
-/* this next bit test whether vbraces can be successfully converted
- * when the closing brace is in an #ifdef.
- * Note that the author should have braced the code to begin with.
- */
-void bar(void)
-{
-			 if (jiffies >= hw_priv->Counter[ port ].time) {
-				hw_priv->Counter[ port ].fRead = 1;
-				if (port == MAIN_PORT) {
-					hw_priv->Counter[ MAIN_PORT ].time = jiffies + HZ * 6;
-				} else
-					hw_priv->Counter[ port ].time =
-
-#ifdef SOME_DEFINE
-						hw_priv->Counter[ port - 1 ].time + HZ * 2;
-
-#else /* ifdef SOME_DEFINE */
-						hw_priv->Counter[ MAIN_PORT ].time + HZ * 2;
-#endif /* ifdef SOME_DEFINE */
-			}
-}
-
-void funct(int v1, int v2, int v3)
-{
-    if ( v1 )
-    {
-	if ( v2 ) f1();
-    }
-    else
-    {
-	if ( v3 ) f2();
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-indent.c
deleted file mode 100644
index 5043c01f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-indent.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifdef foo
-#include <foo1.h>
-#else
-#include <foo2.h>
-#endif
-
-#ifdef foo
-/* Commentary for func1() */
-void func1();
-
-/* Commentary for func2() */
-void func2();
-#endif
-
-int
-show_interrupts(struct seq_file *p, void *v)
-{
-#ifndef CONFIG_SMP
-	a++;
-#else
-	for (b = 0; b < 9; b++)
-		if (b & 1)
-			k++;
-#endif
-
-    if (v)
-    {
-       bar(v);
-       #if DEBUG == 1
-       printf("yup\n");
-       #endif
-    }
-}
-
-void foo()
-{
-int i=0;
-#if DEBUG == 1
-i--;
-#endif
-i++;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-nest.c
deleted file mode 100644
index 68baf1fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-nest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-namespace MonoTests.System.IO.IsolatedStorageTest {
-   public class NonAbstractIsolatedStorage : IsolatedStorage {
-      public NonAbstractIsolatedStorage () {
-         string s = String.Format ("{0} {1}",
-                                   Environment.NewLine,
-#if NET_2_0
-                                   String.Empty);
-#else
-                                   "            ");
-#endif
-      }
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/include_define.h
deleted file mode 100644
index 13380cac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/include_define.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define MY_HEADER  <foo/inc.h>
-
-#include MY_HEADER
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-assign.c
deleted file mode 100644
index 58ed9c52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-assign.c
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo(void)
-{
-   int a;
-   junk(a = 3);
-}
-
-void f()
-{
-  int x = size_t(1.0) +
-    2;
-  int y = (size_t(1.0) +
-    5);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-macro-brace.c
deleted file mode 100644
index 8c3f9941..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-macro-brace.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#define X do {\
-a; \
-b; \
-} while (0)
-
-#define X\
-y; \
-z
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-off-after-assign.c
deleted file mode 100644
index d01f58c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-off-after-assign.c
+++ /dev/null
@@ -1,29 +0,0 @@
-void foo(void)
-{
-   int a;
-   int b =
-   veryLongMethodCall(
-     arg1,
-     longMethodCall(
-       arg2,
-       methodCall(
-         arg3, arg4
-       )
-     )
-   );
-   junk(a =
-   3);
-}
-
-void f()
-{
-  int x = size_t(1.0) +
-    2;
-  int y = (size_t(1.0) +
-    5);
-
-  int z =
-  size_t(1.0)
-  + 5
-  + size_t(2.0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-vbrace.c
deleted file mode 100644
index 8b48e235..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-vbrace.c
+++ /dev/null
@@ -1,6 +0,0 @@
-
-void x(void)
-{
-if (a>b)
-b=a;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_first_bool_expr.c
deleted file mode 100644
index ec68ac3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_first_bool_expr.c
+++ /dev/null
@@ -1,22 +0,0 @@
-void test(void)

-{

-b1=a&b||c==d;

-b2=(a&b)||c==d;

-b3=(a&b||c==d);

-

-

-if (a==3 && b==2 & c || d && r){}

-

-

-if (/*test*/a||b){}

-

-if (/*test*/a||/*truc*/b){}

-

-if (a/*test*/||b){}

-

-if (a||/*test*/b){}

-

- a=3; if ((aaaaaaaaaaaaaaa ==  sqddqsqsdqsdqsd)   &&   (dfdssdfsdfsdfsdfs  || (qsdfsdfsdfqsdfqsdfqsdsd == fsdqfsdfsdfsdf))) { a++;}
-
-while ((aaaaaaaaaaaaaaa ==  sqddqsqsdqsdqsd)   &&   (dfdssdfsdfsdfsdfs  || (qsdfsdfsdfqsdfqsdfqsdsd == fsdqfsdfsdfsdf))) { a++;}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-1.c
deleted file mode 100644
index b76e375b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-1.c
+++ /dev/null
@@ -1,34 +0,0 @@
-void foo(void)
-{
-    int a = x ? y : 
-            z,
-        b = x ? (y) : 
-            (z),
-        c = x ? *y : 
-            *z,
-        d = x ? &y : 
-            &z;
-
-
-    if (x ? y : 
-            z)
-    {
-        baz;
-    }         
-    if (x ? (y) : 
-            (z))
-    {
-        baz;
-    }          
-    if (x ? *y : 
-            *z)
-    {
-        baz;
-    }          
-    if (x ? &y : 
-            &z)
-    {
-        baz;
-    }           
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-2.c
deleted file mode 100644
index 20f1df64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-2.c
+++ /dev/null
@@ -1,34 +0,0 @@
-void foo(void)
-{
-    int a = x ? y 
-        : z,
-        b = x ? (y) 
-        : (z),
-        c = x ? *y 
-        : *z,
-        d = x ? &y 
-        : &z;
-
-
-    if (x ? y 
-        : z)
-    {
-        baz;
-    }         
-    if (x ? (y) 
-        : (z))
-    {
-        baz;
-    }          
-    if (x ? *y 
-        : *z)
-    {
-        baz;
-    }          
-    if (x ? &y 
-        : &z)
-    {
-        baz;
-    }           
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/kw_subst.c
deleted file mode 100644
index 5d37f823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/kw_subst.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <string>
-
-int foo1()
-{
-}
-
-/** header comment */
-#if 2
-int foo2(void)
-{
-}
-#endif
-
-#if 1
-void foo3(int a)
-{
-}
-#endif
-
-void *foo4(int a, int b, int c)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/lvalue.c
deleted file mode 100644
index 2f2cc17d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/lvalue.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()
-{
-   if (c * ssize < initialCapacity);
-   if (Item* item=nextItem());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mac.c
deleted file mode 100644
index ce4e7937..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mac.c
+++ /dev/null
@@ -1 +0,0 @@
-/**
 * This is your typical header comment
 */
 int foo(int bar)
 {
    int idx;
    int res = 0;     // trailing comment
                   // that spans two lines
    for (idx = 1; idx < bar; idx++)
       /* comment in virtual braces */
       res += idx;

    res *= idx;       // some comment

                      // almost continued, but a NL in between

// col1 comment in level 1
   return(res);
}

   // col1 comment in level 0

\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/macro-returns.c
deleted file mode 100644
index 0febb263..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/macro-returns.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#define foo1 return x + \
-  y
-
-#define foo2 return (x + \
-  y)
-
-#define foo3 return \
-  0
-
-#define foo4 return \
-  (0)
-
-#define foo5 return /* empty */
-
-#define foo6 return \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/minus-minus.c
deleted file mode 100644
index 4eb69237..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/minus-minus.c
+++ /dev/null
@@ -1,33 +0,0 @@
-int a = 5;
-int *b = &a;
-int negneg(void)
-{
-   return - -a;
-}
-
-int pospos(void)
-{
-   return + +a;
-}
-
-int negpos(void)
-{
-   return - +a;
-}
-
-int posneg(void)
-{
-   return + -a;
-}
-
-#if VERSION < -5
-int negnegneg(void)
-{
-   return - - -a;
-}
-#else
-int negat(void)
-{
-   return - *b;
-}
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/misc.c
deleted file mode 100644
index cd948007..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/misc.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************/
-/* Before Unrustify */
-/********************/
-
-#define MACRO( cond, action ) if ((cond)) (action)
-
-void hurz(murks)
-{
-   if (murks = 4)              // This comment belongs to (murks = 4)
-      schrott();               // And this to schrott()
-#ifdef SCHNIEPEL
-   else if (murks = 6)         // This comment belongs to (murks = 6)
-                               // I had to write more comment than one line
-                               // so I inserted some comment only blocks
-      schniepel();
-#endif // SCHNIEPEL
-   else
-      flursen();
-
-   if (murks = 4)              // This comment belongs to (murks = 4)
-#ifdef FOO
-      foo();
-#else
-      bar();
-#endif
-      if (murks = 4)              // This comment belongs to (murks = 4)
-      {
-         schrott();               // And this to schrott()
-      }
-   return;
-} // hurz()
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod-paren.c
deleted file mode 100644
index 14bb9836..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod-paren.c
+++ /dev/null
@@ -1,79 +0,0 @@
-
-int foo(int a, int b)
-{
-if ( ! (a || b) )
-{
-return (1);
-}
-return 0;
-}
-
-void fooo()
-{
-if(enabled) value = 1;
-
-if(enabled && value==100)
-{
-}
-
-if(value==100)
-{
-}
-
-if(value==100 && i<15 || enabled)
-{
-}
-
-if(!failed && (value==100 && i<15) || enabled)
-{
-}
-
-}
-
-void foo3()
-{
-   if (strcmp(a, b) == 0 && total < 5)
-   {
-      add_item(a);
-   }
-
-   if (glob_add_path(gd, gd->dir, NULL,
-                     (flags & GLOB_MARK) && S_ISDIR(gd->st.st_mode)) != 0)
-   {
-      bar();
-   }
-  return ;
-}
-
-int foo1(void)
-{
-   FOO_ERROR("connect: can only connected from state CLOSED", pcb->state == CLOSED, return ERR_ISCONN);
-return ERR_OK;
-}
-
-int foo2(void)
-{
-
-return (-1);
-}
-
-void foo(void)
-{
-if (!value
-#ifdef OPTION
-|| value == SOMECONST
-#endif /* comment */
-)
-{
-}
-}
-
-void foo3(void)
-{
-   if (*p == '-' && p[1] != ']' ?
-       *text <= *++p && *text >= last : *text == *p)
-   {
-      matched = TRUE;
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod_case_brace.c
deleted file mode 100644
index 4bd9abde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod_case_brace.c
+++ /dev/null
@@ -1,57 +0,0 @@
-int foo(int bar)
-{
-  switch (bar)
-  { 
-    case 0: {
- 	showit(0);
-    }
-c++;
-    break;
-
-    case 1: {
-       showit(bar);
-    break;
-    }
-
-    case 2: 
-    break;
-    
-    case 3: {
-       int a = bar * 3;
-       showit(a);
-    }
-c++;
-    break;
-    case 4: 
-    	foo(bar - 1);
-    	{
- 		showit(0);
-	}
-    case 10: 
-	switch (gl_bug)
-	{
-		case 'a': {
-	   		gl_foo = true;
-			break;
-		}
-
-		case 'b':
-		case 'c': {
-			gl_foo = false;
-			break;
-		}
-		default:
-		{
-			// nothing
-		}
-		break;
-	}
-	break;
-    
-    default:
-    { 
-    }
-    break;   
-  }
-return(-1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/multi.h
deleted file mode 100644
index 33acea34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/multi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-This is a multiline
-comment that should
-not be indented
-*/
-{
-    /*
-    No trailing spaces
-
-    in this comment
-    */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/my_infile.c
deleted file mode 100644
index 8b8cd113..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/my_infile.c
+++ /dev/null
@@ -1,161 +0,0 @@
-#include <stdlib.h> /* exit */
-#include <unistd.h> /* _exit */
-
-int foo(int);
-
-extern int baz;
-
-int foo(int bar)
-{
-/* Switch blocks: */
- switch( c ) {
-     case 1:
-  case 2:
-      bar+=2;
-            break;
-            
-       case 3:
-           bar++;
-            baz++;
-           case 4:
-     break;
-            default:
-               break;
-        }
-    
-  switch (bar) {
-      case 0:
-    bar++;
-     break;
-   case 1:
-           bar++;
-       return bar;
-     case 2:
-    bar++;
-       goto x;
-       case 3:
-        bar++;
-       /*FALLTHROUGH*/
-       case 4:
-           bar++;
-       exit(bar);
-       /*NOTREACHED*/
-       case 5:
-           bar++;
-       _exit(bar);
-       /*NOTREACHED*/
-       case 6:
-           bar++;
-           if (baz > 2)
-               break;       /* inside if statement; don't align with case */
-           else
-               return baz;  /* inside if statement; don't align with case */
-       /*NOTREACHED*/
-       case 7:
-         switch (baz) {
-  case 0: /* do nothing */
-      break;
-      case 1:
-        return baz;
-       case 2:
-           baz--;
-       goto x;
-     case 3:
-         exit(baz);
-       /*NOTREACHED*/
-          case 4:
-         _exit(baz);
-         /*NOTREACHED*/
-         case 5:
-           baz--;
-        /*FALLTHROUGH*/
-      default:
-          for (; baz > 0; baz--)
-          if (baz == bar)
-              break;  /* break out of for loop, unrelated to switch statement */
-                 else
-                         bar++;
-            break;
-         }
-        break;
-      default:
-          bar++;
-     break;
-   }
-   
-   
-switch (a)
-{
-    case 0:
-      // code
-            break;
-}   
-
-
-switch ( a ) {
-    case 0:
-      if ( k > 0 )
-        break;
-      z = 1;
- break;
- case 1:
-  if ( k < 0 )
-   break;
-  z = 2;
- case 2:
-   z = 3;
-  break;
-}
-
-   
-   return bar;
-}
-
-
-int foo2(int op)
- {
-  switch (op)
-    {
-      case 1:
-       do_something();
-     break;
-      case 2:
-       do_something_else();
-     case 3:
-        do_something_different();
-         do_something_more();
-       break;
-    }
-      return -1;
-  }
-   
-int foo3(int op)
-  {
-    for(int nnn = op; nnn <= 100; nnn++)
-    {
-     switch (nnn)
-   {
-     case 1:
-      do_something();
-        break;
-  case 2:
-           do_something_else();
-       case 3:
-          if (do_something_different())
-       {
-           do_this();
-            break;
-          }
-        do_something_more();
-      break;
-      
-      default:
-          ; // nothing
-          break;
-      
-    }
-    }
-      return -1;
-  }   
-   
-   
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/negative_value.c
deleted file mode 100644
index 6399fbef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/negative_value.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-int main(void) {
-	int i = -1;
-	int j = 30 * -1;
-
-	int frames = 127;
-	frames = ((frames + 15) & -16);
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/newline_after_endif.c
deleted file mode 100644
index 2a0cbe62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/newline_after_endif.c
+++ /dev/null
@@ -1,53 +0,0 @@
-int main

-(

-)

-{

-   #ifdef useJPLvelocity

-      for(i = 0; i < x; i++)

-         y++;

-   #endif

-

-   return (0);

-} /* main */

-

-int main

-(

-)

-{

-   if(y < 3)

-      y++;

-

-   #ifdef ABC

-      if(y < 3)

-         y++ // comment

-   #endif

-

-   if(y < 3)

-      y++;

-

-   y++;

-

-   return (0);

-} /* main */

-

-int main

-(

-)

-{

-   #ifdef ABC

-      if(j < y)

-      {

-         if(j < x)

-         {

-            j++;

-            #ifdef XYZ

-               if(j < x)

-                  j++;

-            #endif

-         }

-      }

-   #endif

-

-   return (0);

-} /* main */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-comment.c
deleted file mode 100644
index 70c49200..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-comment.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This is your typical header comment
- */
- int foo(int bar)
- {
-    int idx;
-    int res = 0;     // trailing comment
-                   // that spans two lines
-    /* multi-line comment
-    */
-    idx = 50;
-    /* single line comment */
-    for (idx = 1; idx < bar; idx++)
-       /* comment in virtual braces */
-       res += idx;
-    switch (res)
-    {
-        case 1:
-            // C++-style comment
-            res++;
-            break;
-        case 2:
-            /* C-style comment */
-            res--;
-            break;
-        case 3:
-            /* Multi-line comment
-            */
-            res = 0;
-            break;
-        case 4:
-
-            // C++-style comment
-            res++;
-            break;
-        case 5:
-
-            /* C-style comment */
-            res--;
-            break;
-        default:
-
-            /* Multi-line comment
-            */
-            res = 0;
-            break;
-    }
-
-    res *= idx;       // some comment
-
-                      // almost continued, but a NL in between
-
-    i++;
-// col1 comment in level 1
-// second comment
-   return(res);
-}
-
-   // col1 comment in level 0
- // and another
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont.c
deleted file mode 100644
index 9f87950f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont.c
+++ /dev/null
@@ -1,21 +0,0 @@
-

-#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + bar2), bar3, bar4);

-

-#define VNV_RECORD_CYCLES(m) do { \

-uint16_t cyc_out = ((uint16_t )TMR4) - cyc_in; \

-if (cyc_out < vnv_ticks[m].min) vnv_ticks[m].min = cyc_out; \

-if (cyc_out > vnv_ticks[m].max) vnv_ticks[m].max = cyc_out; \

-} while (0)

-

-#define multilinemacro do { (x+5); } while (0); \

-printf("a multilinemacro"); \

-printf("a multilinemacro2");

-

-int main(int argc, char *argv[])

-{

-   int a, b;

-a = 1; // stupid comment \\

-b = 2;

-

-return(a+b);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont2.c
deleted file mode 100644
index b3f079e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-

-#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + bar2), bar3, bar4);

-

-#define multilinemacro do { (x+5); } while (0); \

-printf("a multilinemacro"); \

-printf("a multilinemacro2");

-

-int main(int argc, char *argv[])

-{

-   int a, b;

-a = 1; // stupid comment \

-b = 2;

-

-return(a+b);

-}

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-semicolon.c
deleted file mode 100644
index 8e0f59d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-semicolon.c
+++ /dev/null
@@ -1,21 +0,0 @@
-void foo(void)
-{
-   a = 5; b = 3; j = 6;
-
-   for (a = 0; a < j; a++)
-   {
-      b *= (a + b);
-   }
-}
-
-struct somestruct { int a; char b; foo c; bar *d; };
-
-struct foo { int a; char *b };
-
-void f()
-{
-for (;;)
-nothing();
-foobar();
-}
-;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-ver-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-ver-def.c
deleted file mode 100644
index 9684ed27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-ver-def.c
+++ /dev/null
@@ -1,9 +0,0 @@
-void foo(void)
-{
-   int a;
-   int b;// comment
-
-   /* comment */
-   a = b;
-   return;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_assign.c
deleted file mode 100644
index b2495c13..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_assign.c
+++ /dev/null
@@ -1,19 +0,0 @@
-
-void foo()
-{
-   some.really_long.variable_name
-  = another.big.one[55] +
-   something_else;
-
-  some.really_long.variable_name =
-   another.big.one[55] +
-   something_else;
-
-   some.really_long.variable_name = another.big.one[55] +
-  something_else;
-
-   a_really_long_assignment_to_test = line_breaks_around_assign_and_arith;
-
-   a_really_long_assignment_to_test = line_breaks_around + assign_and_arith;
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_before_return.c
deleted file mode 100644
index da5ed3eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_before_return.c
+++ /dev/null
@@ -1,173 +0,0 @@
-int foo1(int arg)
-{
-    if (arg == 0) return 1;
-    if (arg == 1) /* comment */ return 2;
-    if (arg == 2)
-        /* C-style comment */
-        return 3;
-    if (arg == 3) /* trailing comment */
-        return 4;
-    if (arg == 4) /* trailing comment */
-        /* C-style comment */
-        return 5;
-    if (arg == 5)
-        // C++-style comment
-        return 6;
-    if (arg == 6)
-        // Multi-line
-        // C++-style comment
-        return 7;
-    if (arg == 7) // trailing comment
-        // Multi-line
-        // C++-style comment
-        return 8;
-    if (arg == 8)
-        /*
-         * Multi-line C-style comment
-         */
-        return 9;
-    if (arg == 9)
-        /*--------------------*/
-        /* Multi-part comment */
-        /*--------------------*/
-        return 10;
-    if (arg == 10)
-        //-----------------------
-        /*
-         * Mixed-style comment
-         */
-        //-----------------------
-        return 11;
-    if (arg == 11)
-        /* comment */ return 12;
-    if (arg == 12)
-
-        // C++-style comment
-        return 13;
-    return arg + 1;
-}
-
-int foo2(int arg)
-{
-    if (arg == 0) { return 1; }
-    if (arg == 1) { /* comment */ return 2; }
-    if (arg == 2) {
-        /* C-style comment */
-        return 3;
-    }
-    if (arg == 3) { /* trailing comment */
-        return 4;
-    }
-    if (arg == 4) { /* trailing comment */
-        /* C-style comment */
-        return 5;
-    }
-    if (arg == 5) {
-        // C++-style comment
-        return 6;
-    }
-    if (arg == 6) {
-        // Multi-line
-        // C++-style comment
-        return 7;
-    }
-    if (arg == 7) { // trailing comment
-        // Multi-line
-        // C++-style comment
-        return 8;
-    }
-    if (arg == 8) {
-        /*
-         * Multi-line C-style comment
-         */
-        return 9;
-    }
-    if (arg == 9)
-    {
-        /*--------------------*/
-        /* Multi-part comment */
-        /*--------------------*/
-        return 10;
-    }
-    if (arg == 10)
-    {
-        //-----------------------
-        /* Mixed-style comment */
-        //-----------------------
-        return 11;
-    }
-    if (arg == 11)
-    {
-        /* comment */ return 12;
-    }
-    if (arg == 12) {
-
-        /* C-style comment */
-        return 13;
-    }
-    return arg + 1;
-}
-
-int foo2(int arg)
-{
-    if (arg == 0) { int a = 1; return a; }
-    if (arg == 1) { int a = 2; /* comment */ return a; }
-    if (arg == 2) {
-        int a = 3;
-        /* C-style comment */
-        return a;
-    }
-    if (arg == 3) {
-        int a = 4; /* trailing comment */
-        return a;
-    }
-    if (arg == 4) {
-        int a = 5; /* trailing comment */
-        /* C-style comment */
-        return a;
-    }
-    if (arg == 5) {
-        int a = 6;
-        // C++-style comment
-        return a;
-    }
-    if (arg == 6) {
-        int a = 7;
-        // Multi-line
-        // C++-style comment
-        return a;
-    }
-    if (arg == 7) {
-        int a = 8; // trailing comment
-        // Multi-line
-        // C++-style comment
-        return a;
-    }
-    if (arg == 8) {
-        int a = 9;
-        /*--------------------*/
-        /* Multi-part comment */
-        /*--------------------*/
-        return a;
-    }
-    if (arg == 9) {
-        int a = 10;
-        /*---------------------*/
-        // Mixed-style comment
-        /*---------------------*/
-        return a;
-    }
-    if (arg == 11)
-    {
-        int a = 12;
-        /* comment */ return a;
-    }
-    if (arg == 12) {
-        int a = 13;
-        /*
-         * Multi-line C-style comment
-         */
-        return a;
-    }
-    return arg + 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_create_one_liner.c
deleted file mode 100644
index 16887eca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_create_one_liner.c
+++ /dev/null
@@ -1,17 +0,0 @@
-void foo()
-{
-if (a)
-  b++;
-if (a) {
-  b++;
-}
-if (a)
- if (b)
-   c++;
-
-for (i=0;i<5;i++)
-  bar(i);
-while (i>0)
-bar(--i);
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_ds_struct_enum.c
deleted file mode 100644
index d19964ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_ds_struct_enum.c
+++ /dev/null
@@ -1,21 +0,0 @@
-struct foo {
- unsigned int d_ino;
- /* Comment */
- unsigned short d_reclen;
- unsigned short d_namlen;
- /* Comment */
- char d_name[1];
-};
-
-struct foo
-{
-   /* Comment */
- unsigned int d_ino;
- unsigned short d_reclen;
- unsigned short d_namlen;
- /* Comment */
- char d_name[1];
-};
-
-struct foo { int a; char *b };
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_endif.c
deleted file mode 100644
index d738d74a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_endif.c
+++ /dev/null
@@ -1,13 +0,0 @@
-int main

-(

-)

-{

-   #ifdef useJPLvelocity
-

-      for(i = 0; i < x; i++)

-         y++;

-   #endif

-

-   return (0);

-} /* main */

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_proto_endif.c
deleted file mode 100644
index f50766b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_proto_endif.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#include <stdio.h>
-
-static void status_cb(status_t *status);
-static int add_conn(const char *path);
-
-#ifdef USE_FOO_CMD
-static void foo_cmd(void *user, const info_t *info);
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_return_expr.c
deleted file mode 100644
index e917e399..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_return_expr.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-int foo1(void)
-{
-   bar();
-   return NewClass(1);
-}
-
-int foo2(void)
-{
-   return
-      NewClass(2);
-}
-
-int foo3(void)
-{
-   bar(none);
-   // comment
-   return(3);
-}
-
-int foo4(void)
-{
-   return
-      (4);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-define.c
deleted file mode 100644
index fdb02e31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-define.c
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-
-#define LOG_FMT(sev, args...)                           \
-   do { foo(); } while (0)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-init.c
deleted file mode 100644
index 91d92d55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-init.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-enum boo { FOO = 1 };
-
-void foo(void)
-{
-   char str[123] = { 0 };
-
-   enum hoo { NOO = 1 };
-
-   strcat(str, "foo");
-}
-
-void f(){if(bar())baz(1);else baz(2);}
-
-int foo() { return 0; }
-
-void foo(int a, int b)
-{
-if (a == b) { a++; }
-else { b++; }
-if (a == b) a++;
-else b++;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one_liners.c
deleted file mode 100644
index 1f6e0d3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one_liners.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int baz() { return 0; }
-
-int main()
-{
-int a, b;
-int f[2] = { 1, 2 };
-enum foo { BAR = 15 };
-if (1) { a++; b++; }
-while (0) { a++; b++; }
-do { a++; b++; } while (0);
-for (;;) { a++; b++; };
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren-indent.c
deleted file mode 100644
index df5b1c14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren-indent.c
+++ /dev/null
@@ -1,46 +0,0 @@
-static void *foo(int param1,
-   char *param2
-    );
-
-
-static void *foo
-(
-   int param1,
-   char *param2
-)
-{
-   for (
-        int i = 0;
-       i< 10;
-         i++
-          )
-   {
-      bar(
-         arg1,
-         arg2
-         );
-      if ( ( abc < bcd )
-         &&( 123 < abc )
-            )
-      {
-         none(arg1,
-            arg2,
-              arg3
-            );
-      }
-   }
-}
-
-
-void CWarningAnalyzer::SetEffect(int FilterNumber
-                              ,bool Exclude
-                                 , int  Red
-                                  , int  Green
-                                  , int  Blue
-                                   , bool Italic
-                                , bool Bold
-                                  , bool Underlined
-                            )
-{
-   /* TODO */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren_indent.c
deleted file mode 100644
index 4b0ff447..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren_indent.c
+++ /dev/null
@@ -1,12 +0,0 @@
-function1
-(something1);
-
-function2
-      (something2);
-
-x = (float)
-(number);
-
-x = (float)
-     (number);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pascal_ptr.c
deleted file mode 100644
index 5b0116ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pascal_ptr.c
+++ /dev/null
@@ -1,13 +0,0 @@
-foobar_t*  a;
-int  *b;
-int *  c;
-something no;
-
-char *  main()
-{
- int i = (5*3)+2;
-}
-
-void foo(int* a, int *b, int * c)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_compare.c
deleted file mode 100644
index b0942de0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_compare.c
+++ /dev/null
@@ -1,11 +0,0 @@
-void foo(void)
-{
-   if ((a_really_long_number >
-       another_really_long_number) 
-       ||
- (some_really_long_bool 
-   != another_really_long_bool))
-	{		
-		foo2();
-	} 
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_conditional.c
deleted file mode 100644
index 100545e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_conditional.c
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo(void)
-{
-   // conditional colon
-   a = bar() ? 2 :
-       3;
-   a = bar() ? 2 
-       : 3;
-
-   // conditional question
-   a = bar() ? 
-       2 : 3;
-   a = bar() 
-       ? 2 : 3;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-before-func-def.c
deleted file mode 100644
index 948ce135..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-before-func-def.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#define m_new(type, num) ((type *)(m_malloc(sizeof(type) * (num))))
-void *m_malloc(size_t num_bytes);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-if-indent.c
deleted file mode 100644
index cd9d6c4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-if-indent.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* this is a comment */
-
-/* should be in a H file but put in this file to avoid multiplying the number of test files */
-#ifndef COMSTACK_TYPES_H
-#define COMSTACK_TYPES_H
-
-#include "STD_TYPES.h"
-#ifdef COMINL_coENABLE_1
-#ifdef COMINL_coENABLE_2
-#include "def.h"
-#endif
-#endif
-
-#if (COMINL_coMINIMUM_DELAY_TIME_1 == COMINL_coENABLE)
-#if (COMINL_coMINIMUM_DELAY_TIME_2 == COMINL_coENABLE)
-#include "def1.h"
-#define COMINL_coMINIMUM_DELAY_TIME_1
-#include "def2.h"
-#endif
-#endif
-
-/* no indentation */
-#if COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE
-#include "MEMSRV.h"
-#endif
-
-/* already well indented  */
-#ifndef COMINL_coAPPLI_TX_CONFIRMATION
-   #error "Define COMINL_coAPPLI_TX_CONFIRMATION is undefined"
-#endif
-
-/* bad indentation */
-#ifndef COMINL_coENABLE
- #error "Define COMINL_coENABLE is undefined"
-#endif
-
-
-#ifdef COMINL_coENABLE_3
-typedef enum
-{
-  BUFREQ_OK            =0,
-     BUFREQ_E_NOT_OK      =     1,
-   BUFREQ_E_BUSY=2,
-BUFREQ_E_OVFL    =3
-}
-BufReq_ReturnType;
-#endif
-
-
-
-#if COMINL_coSTART_STOP_PERIODIC == COMINL_coENABLE
-void COMINL_vidInit(void)
-{
-   uint8           u8LocalMsgIdx;
-
-   if (COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer < COMINL_udtNB_MESSAGES_RX)
-   {
-      u8LocalMsgIdx = E_OK;
-   }
-   else
-   {
-      u8LocalMsgIdx = E_NOT_OK;
-   }
-
-/* nested #if...already well indented */
-   #if COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE
-   /*!Trace to: VEES_R_11_04044_004.01*/
-      for(u8LocalMsgIdx = 0; u8LocalMsgIdx < COMINL_udtNB_MESSAGES_RX; u8LocalMsgIdx++)
-      {
-         #if COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE
-            COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-         #else /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-            COMINL_kastrVarReceiveMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer = 0;
-         #endif /* COMINL_coRX_DEADLINE_MONITORING == COMINL_coENABLE */
-      }
-   #endif /* COMINL_coRX_MESSAGE_VAR == COMINL_coENABLE */
-
-
-
-/* nested #if... no indentation  */
-#if COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE
-   /*!Trace to: VEES_R_11_04044_004.01*/
-   for(u8LocalMsgIdx = 0; u8LocalMsgIdx < COMINL_udtNB_MESSAGES_TX; u8LocalMsgIdx++)
-   {
-#if COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE
-      COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtDeadlineMonTimer = 0;
-      COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bDeadlineMonEnable  = FALSE;
-#endif /* COMINL_coTX_DEADLINE_MONITORING == COMINL_coENABLE */
-#if COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE
-      COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtINMDeadlineMonTimer = 0;
-#else /* COMINL_coTX_INM_DEADLINE_MONITORING == COMINL_coENABLE */
-      COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtMDTTimer   = 0;
-      COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].bMDTMsgToSend = FALSE;
-#endif /*COMINL_coMINIMUM_DELAY_TIME == COMINL_coENABLE*/
-#if COMINL_coMIXED_MODE != COMINL_coDISABLE
-      COMINL_kastrVarTransmitMsg[u8LocalMsgIdx].udtPeriodicTimer = 0;
-#endif
-   }
-#endif /* COMINL_coTX_MESSAGE_VAR == COMINL_coENABLE */
-}
-#endif
-
-
-void myfunction(void)
-{
-int i;
-#ifdef COMINL_coTX_MESSAGE_VAR
-#ifndef COMINL_coMIXED_MODE
-#pragma MyPragma
-int j;
-#endif
-#endif
-int k;
-}
-
-
-#endif /* COMSTACK_TYPES_H */
-
-/*------------------------------- end of file --------------------------------*/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-nest.c
deleted file mode 100644
index b602471b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-nest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#if AA
-int foo() {
-   #if BB
-#else
-    #if CC
- #else
-      #endif
-   #endif
-}
-  #endif
-
-int bar()
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-space.c
deleted file mode 100644
index 67cf3e55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-space.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Some file header comment thingy.
- */
-#ifndef SOME_H_INCLUDED
-#define SOME_H_INCLUDED
-
-#include "Somefile.h"
-
-#define SOMEMACRO    (1+4)
-
-#ifdef WIN32
-
-#include "windows_compat.h"
-
-#else /* not WIN32 */
-
-#if defined HAVE_STDINT_H
-#include <stdint.h>
-#elif defined HAVE_INTTYPES_H
-#include <inttypes.h>
-#define YOUR_OS_SUCKS
-#else
-#error "Don't know where int8_t is defined"
-#endif
-
-typedef uint32_t   UINT32;
-
-#endif   /* ifdef WIN32 */
-
-#endif   /* SOME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_concat_asn1.h
deleted file mode 100644
index 9874cf04..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_concat_asn1.h
+++ /dev/null
@@ -1,296 +0,0 @@
-#ifndef HEADER_ASN1_H
-#define HEADER_ASN1_H
-
-#define V_ASN1_UNIVERSAL		0x00
-#define	V_ASN1_APPLICATION		0x40
-#define V_ASN1_CONTEXT_SPECIFIC		0x80
-#define V_ASN1_PRIVATE			0xc0
-
-#define V_ASN1_CONSTRUCTED		0x20
-#define V_ASN1_PRIMITIVE_TAG		0x1f
-#define V_ASN1_PRIMATIVE_TAG		0x1f
-
-#define V_ASN1_APP_CHOOSE		-2	/* let the recipient choose */
-#define V_ASN1_OTHER			-3	/* used in ASN1_TYPE */
-#define V_ASN1_ANY			-4	/* used in ASN1 template code */
-
-#define V_ASN1_NEG			0x100	/* negative flag */
-
-#define V_ASN1_UNDEF			-1
-#define V_ASN1_EOC			0
-#define V_ASN1_BOOLEAN			1	/**/
-#define V_ASN1_INTEGER			2
-#define V_ASN1_NEG_INTEGER		(2 | V_ASN1_NEG)
-#define V_ASN1_BIT_STRING		3
-#define V_ASN1_OCTET_STRING		4
-#define V_ASN1_NULL			5
-#define V_ASN1_OBJECT			6  /* object identifier */
-#define V_ASN1_OBJECT_DESCRIPTOR	7
-#define V_ASN1_EXTERNAL			8  /* external / instance of */
-#define V_ASN1_REAL			9
-#define V_ASN1_ENUMERATED		10
-#define V_ASN1_NEG_ENUMERATED		(10 | V_ASN1_NEG)
-#define V_ASN1_EMBEDDED_PDV		11
-#define V_ASN1_UTF8STRING		12
-#define V_ASN1_SEQUENCE			16
-#define V_ASN1_SET			17
-#define V_ASN1_NUMERICSTRING		18	/**/
-#define V_ASN1_PRINTABLESTRING		19
-#define V_ASN1_T61STRING		20
-#define V_ASN1_TELETEXSTRING		20	/* alias */
-#define V_ASN1_VIDEOTEXSTRING		21  /**/
-#define V_ASN1_IA5STRING		22
-#define V_ASN1_UTCTIME			23
-#define V_ASN1_GENERALIZEDTIME		24	/**/
-#define V_ASN1_GRAPHICSTRING		25	/**/
-#define V_ASN1_ISO64STRING		26	/**/
-#define V_ASN1_VISIBLESTRING		26	/* alias */
-#define V_ASN1_GENERALSTRING		27	/**/
-#define V_ASN1_UNIVERSALSTRING		28	/**/
-#define V_ASN1_BMPSTRING		30
-
-/* For use with d2i_ASN1_type_bytes() */
-#define B_ASN1_NUMERICSTRING	0x0001
-#define B_ASN1_PRINTABLESTRING	0x0002
-#define B_ASN1_T61STRING	0x0004
-#define B_ASN1_TELETEXSTRING	0x0004
-#define B_ASN1_VIDEOTEXSTRING	0x0008
-#define B_ASN1_IA5STRING	0x0010
-#define B_ASN1_GRAPHICSTRING	0x0020
-#define B_ASN1_ISO64STRING	0x0040
-#define B_ASN1_VISIBLESTRING	0x0040
-#define B_ASN1_GENERALSTRING	0x0080
-#define B_ASN1_UNIVERSALSTRING	0x0100
-#define B_ASN1_OCTET_STRING	0x0200
-#define B_ASN1_BIT_STRING	0x0400
-#define B_ASN1_BMPSTRING	0x0800
-#define B_ASN1_UNKNOWN		0x1000
-#define B_ASN1_UTF8STRING	0x2000
-#define B_ASN1_UTCTIME		0x4000
-#define B_ASN1_GENERALIZEDTIME	0x8000
-#define B_ASN1_SEQUENCE		0x10000
-
-/* For use with ASN1_mbstring_copy() */
-#define MBSTRING_FLAG		0x1000
-#define MBSTRING_UTF8		(MBSTRING_FLAG)
-#define MBSTRING_ASC		(MBSTRING_FLAG|1)
-#define MBSTRING_BMP		(MBSTRING_FLAG|2)
-#define MBSTRING_UNIV		(MBSTRING_FLAG|4)
-
-#define SMIME_OLDMIME		0x400
-#define SMIME_CRLFEOL		0x800
-#define SMIME_STREAM		0x1000
-
-struct X509_algor_st;
-DECLARE_STACK_OF(X509_ALGOR);
-
-#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */
-#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */
-
-/* We MUST make sure that, except for constness, asn1_ctx_st and
-   asn1_const_ctx are exactly the same.  Fortunately, as soon as
-   the old ASN1 parsing macros are gone, we can throw this away
-   as well... */
-typedef struct asn1_ctx_st
-	{
-	unsigned char *p;					/* work char pointer */
-	int eos;						/* end of sequence read for indefinite encoding */
-	int error;	/* error code to use when returning an error */
-	int inf;	/* constructed if 0x20, indefinite is 0x21 */
-	int tag;						/* tag from last 'get object' */
-	int xclass;	/* class from last 'get object' */
-	size_t slen;				/* length of last 'get object' */
-	unsigned char *max; /* largest value of p allowed */
-	unsigned char *q;/* temporary variable */
-	unsigned char **pp;/* variable */
-	int line;	/* used in error processing */
-	} ASN1_CTX;
-
-typedef struct asn1_const_ctx_st
-	{
-	const unsigned char *p;/* work char pointer */
-	int eos;	                               /* end of sequence read for indefinite encoding */
-	int error;	/* error code to use when returning an error */
-	int inf; /* constructed if 0x20, indefinite is 0x21 */
-	int tag;                    /* tag from last 'get object' */
-	int xclass;                                       /* class from last 'get object' */
-	size_t slen;	/* length of last 'get object' */
-	const unsigned char *max; /* largest value of p allowed */
-	const unsigned char *q;/* temporary variable */
-	const unsigned char **pp;/* variable */
-	int line;	/* used in error processing */
-	} ASN1_const_CTX;
-
-/* These are used internally in the ASN1_OBJECT to keep track of
- * whether the names and data need to be free()ed */
-#define ASN1_OBJECT_FLAG_DYNAMIC	 0x01	/* internal use */
-#define ASN1_OBJECT_FLAG_CRITICAL	 0x02	/* critical x509v3 object id */
-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04	/* internal use */
-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA 	 0x08	/* internal use */
-typedef struct asn1_object_st
-	{
-	const char *sn,*ln;
-	int nid;
-	size_t length;
-	const unsigned char *data;	/* data remains const after init */
-	int flags;	/* Should we free this one */
-	} ASN1_OBJECT;
-
-#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
-/* This indicates that the ASN1_STRING is not a real value but just a place
- * holder for the location where indefinite length constructed data should
- * be inserted in the memory buffer 
- */
-#define ASN1_STRING_FLAG_NDEF 0x010 
-
-/* This flag is used by the CMS code to indicate that a string is not
- * complete and is a place holder for content when it had all been 
- * accessed. The flag will be reset when content has been written to it.
- */
-
-#define ASN1_STRING_FLAG_CONT 0x020 
-
-/* This is the base type that holds just about everything :-) */
-typedef struct asn1_string_st
-	{
-	size_t length;
-	int type;
-	unsigned char *data;
-	/* The value of the following field depends on the type being
-	 * held.  It is mostly being used for BIT_STRING so if the
-	 * input data has a non-zero 'unused bits' value, it will be
-	 * handled correctly */
-	long flags;
-	} ASN1_STRING;
-
-/* ASN1_ENCODING structure: this is used to save the received
- * encoding of an ASN1 type. This is useful to get round
- * problems with invalid encodings which can break signatures.
- */
-
-typedef struct ASN1_ENCODING_st
-	{
-	unsigned char *enc;	/* DER encoding */
-	size_t len;		/* Length of encoding */
-	int modified;		 /* set to 1 if 'enc' is invalid */
-	} ASN1_ENCODING;
-
-/* Used with ASN1 LONG type: if a long is set to this it is omitted */
-#define ASN1_LONG_UNDEF	0x7fffffffL
-
-#define STABLE_FLAGS_MALLOC	0x01
-#define STABLE_NO_MASK		0x02
-#define DIRSTRING_TYPE	\
- (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)
-#define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)
-
-/* Declarations for template structures: for full definitions
- * see asn1t.h
- */
-typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
-typedef struct ASN1_ITEM_st ASN1_ITEM;
-typedef struct ASN1_TLC_st ASN1_TLC;
-/* This is just an opaque pointer */
-typedef struct ASN1_VALUE_st ASN1_VALUE;
-
-/* Declare ASN1 functions: the implement macro in in asn1t.h */
-
-#define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
-
-#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)
-
-#define DECLARE_ASN1_FUNCTIONS_name(type, name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name); \
-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)
-
-#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name); \
-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
-
-#define	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
-	type *d2i_##name(type **a, const unsigned char **in, size_t len); \
-	int i2d_##name(const type *a, unsigned char **out); \
-	DECLARE_ASN1_ITEM(itname)
-
-#define	DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
-	type *d2i_##name(type **a, const unsigned char **in, size_t len); \
-	int i2d_##name(const type *a, unsigned char **out); \
-	DECLARE_ASN1_ITEM(name)
-
-#define	DECLARE_ASN1_NDEF_FUNCTION(name) \
-	int i2d_##name##_NDEF(const name *a, unsigned char **out)
-
-#define DECLARE_ASN1_FUNCTIONS_const(name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS(name); \
-	DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)
-
-#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-	type *name##_new(void); \
-	void name##_free(type *a)
-
-#define DECLARE_ASN1_PRINT_FUNCTION(stname) \
-	DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)
-
-#define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
-	int fname##_print_ctx(BIO *out, const stname *x, int indent, \
-					 const ASN1_PCTX *pctx)
-
-
-/*
- * WARNING WARNING WARNING
- *
- * uncrustify still introduces whitespace in here at some spots, but then
- * one might ask how crazy we want to go regarding ## encumbered parsing?
- * There's always the copout of INDENT-OFF markers for files like these,
- * once you've got them 95% right through uncrustify and that extra 5% 
- * by hand ;-)
- */
-#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,size_t)
-#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)
-#define TYPEDEF_I2D_OF_CONST(type) typedef int i2d_of_const_##type(const type *,unsigned char **)    /* [i_a] */
-#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type); TYPEDEF_I2D_OF_CONST(type)    /* [i_a] */
-
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#define ASN1_ITEM_ref(iptr) (&(iptr##_it))
-
-#define ASN1_ITEM_rptr(ref) (&(ref##_it))
-
-#define DECLARE_ASN1_ITEM(name) \
-	extern const ASN1_ITEM name##_it;
-
-
-#define ASN1_STRFLGS_RFC2253	(ASN1_STRFLGS_ESC_2253 | \
-				ASN1_STRFLGS_ESC_CTRL | \
-				ASN1_STRFLGS_ESC_MSB | \
-				ASN1_STRFLGS_UTF8_CONVERT | \
-				ASN1_STRFLGS_DUMP_UNKNOWN | \
-				ASN1_STRFLGS_DUMP_DER)
-
-DECLARE_STACK_OF(ASN1_INTEGER);
-DECLARE_ASN1_SET_OF(ASN1_INTEGER);
-
-DECLARE_STACK_OF(ASN1_GENERALSTRING);
-
-typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY);
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY);
-
-
-#define B_ASN1_DIRECTORYSTRING \
-			B_ASN1_PRINTABLESTRING| \
-			B_ASN1_TELETEXSTRING|\
-			B_ASN1_BMPSTRING|\
-			B_ASN1_UNIVERSALSTRING|\
-			B_ASN1_UTF8STRING
-
-#define B_ASN1_DISPLAYTEXT \
-			B_ASN1_IA5STRING| \
-			B_ASN1_VISIBLESTRING| \
-			B_ASN1_BMPSTRING|\
-			B_ASN1_UTF8STRING
-
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_ret.c
deleted file mode 100644
index c35e4294..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_ret.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#if 0
-int
-#else
-unsigned
-#endif
-f()
-{
-return 0;
-}
-
-#ifdef FOO
-#define BAR .
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma.c
deleted file mode 100644
index a0dcd975..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#pragma do not change anything in this pragma!
-
-// This next bit should parse as '#', pragma, preproc-body, nl-cont, 
-//   preproc-body, nl-cont, preproc-body
-#pragma multi \
-   line \
-      pragma
-
-#pragma mark -------- Protected Member Functions ----------------
-
-#pragma some comment follows    // comment
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma_asm.c
deleted file mode 100644
index a7834613..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma_asm.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    int a = 1;
-    int very_long = 2;
-    printf("Hello, World!\n");
-    printf("a is %d and very_long is %d\n",a,very_long);
-    return 0;
-}
-
-#pragma asm
-    XREF     _my_var
-
-    PUSH     #LOW(my_func)
-    PUSH     #HIGH(my_func)
-
-#pragma dummyendasm
-
-    PUSH     _my_var+2
-    PUSH     _my_var+1
-    PUSH     _my_var+0
-    RETF
-    App_CallEnd:
-#pragma endasm
-
-int main2(int argc, char *argv[])
-{
-    int a = 1;
-    int very_long = 2;
-    printf("Hello, World!\n");
-    printf("a is %d and very_long is %d\n",a,very_long);
-    return 0;
-}
-
-#pragma asm
-    XREF     _my_var
-
-    PUSH     #LOW(my_func)
-    PUSH     #HIGH(my_func)
-
-#pragma dummyendasm
-
-    PUSH     _my_var+2
-    PUSH     _my_var+1
-    PUSH     _my_var+0
-    RETF
-    App_CallEnd:
-#pragma  endasm
-
-int main3(int argc, char *argv[])
-{
-    int a = 1;
-    int very_long = 2;
-    printf("Hello, World!\n");
-    printf("a is %d and very_long is %d\n",a,very_long);
-    return 0;
-}
-
-#pragma asm
-    XREF     _my_var
-
-    PUSH     #LOW(my_func)
-    PUSH     #HIGH(my_func)
-
-#pragma dummyendasm
-
-    PUSH     _my_var+2
-    PUSH     _my_var+1
-    PUSH     _my_var+0
-    RETF
-    App_CallEnd:
-#pragma	 	endasm
-
-int main3(int argc, char *argv[])
-{
-    int a = 1;
-    int very_long = 2;
-    printf("Hello, World!\n");
-    printf("a is %d and very_long is %d\n",a,very_long);
-    return 0;
-}
-
-#asm
-    sll     a           ; 3
-    jrc     sub_1f      ; 3 subtract $1f if A.x has a degree 8
-    ret
-sub_1f:
-    xor     a,#$1f      ; 2
-#endasm
-
-int main3(int argc, char *argv[])
-{
-    int a = 1;
-    int very_long = 2;
-    printf("Hello, World!\n");
-    printf("a is %d and very_long is %d\n",a,very_long);
-    return 0;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/preproc-if.c
deleted file mode 100644
index 71fbf792..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/preproc-if.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-int main()
-{
-int a;
-#ifndef SOMEDEF
-int b;
-#endif /* SOMEDEF */
-
-if (a)
-{
-}
-#ifndef SOMEDEF
-else if (b)
-{
-}
-#endif /* SOMEDEF */
-
-/* same thing w/o preprocs for reference */
-if (a)
-{
-}
-else if (b)
-{
-}
-
-#ifdef FOO
-do
-{
-Foo();
-}
-#endif
-while(Loop--);
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-compound-literal.c
deleted file mode 100644
index 8547c3a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-compound-literal.c
+++ /dev/null
@@ -1,5 +0,0 @@
-struct f z(void) {
-return (struct f){
-.z = 1,
-};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-multi.c
deleted file mode 100644
index 846ca21c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-multi.c
+++ /dev/null
@@ -1,46 +0,0 @@
-
-static inline long
-get_tv32(struct timeval *o, struct timeval32 __user *i)
-{
-	return !access_ok(VERIFY_READ, i, sizeof(*i)) ||
-                (__get_user(o->tv_sec, &i->tv_sec) |
-		 __get_user(o->tv_usec, &i->tv_usec));
-}
-
-static inline long
-get_tv32(struct timeval *o, struct timeval32 __user *i)
-{
-	return (!access_ok(VERIFY_READ, i, sizeof(*i)) ||
-                (__get_user(o->tv_sec, &i->tv_sec) |
-		 __get_user(o->tv_usec, &i->tv_usec)));
-}
-
-const char *
-dcrp_license_feature(int32_t idx)
-{
-#define FEATURESTR(f) \
-  case DCRMIB_LICENSE_##f: \
-    return DCRP_LICENSE_FEATURE_##f##_STR
-
-  switch(idx) {
-    DCRP_LICENSE_FOREACH_FEATURES(FEATURESTR);
-  }
-
-  return "";
-
-}
-
-
-static int
-isValidLicenseType(int32_t idx)
-{
-#define CHECKFEATURE(f) \
-  case DCRMIB_LICENSE_##f: \
-    return 1
-
-  switch(idx) {
-    DCRP_LICENSE_FOREACH_FEATURES(CHECKFEATURE);
-  }
-
-  return n * foo(5);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/semicolons.c
deleted file mode 100644
index d7e2379a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/semicolons.c
+++ /dev/null
@@ -1,75 +0,0 @@
-
-int foo(int bar)
-{
-   for (;;)
-   {
-      break;
-   };;
-   if (a)
-   {
-      foo();;
-   };
-
-   if (b)
-      if (c)
-        bar();
-      else
-         ;
-
-   else
-   {
-      foo();;;;;
-   };
-   switch (a)
-   {
-   case 1: break;
-   case 2: break;
-   default: break;;
-   };;
-   while (b-->0)
-   {
-      bar();;
-   };
-   do
-   {
-      bar();
-   } while (b-->0  );
-};
-
-enum FPP {
-   FPP_ONE = 1,
-   FPP_TWO = 2,
-};;
-
-struct narg {
-   int abc;  ;  ;
-   char def;  ;   ;
-   ;
-   ;const char *ghi;
-};
-
-void f2(void)
-{
-   { i++; };
-
-   for (;;) ;
-
-   for (;;) { ; }
-}
-
-int main(int argc, char *argv[])
-{
-if( argc == 1 )
-{
-printf("one");
-};
-else if( argc == 2 )
-{
-printf("two");
-};
-else
-{
-printf("%d", argc);
-};
-return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf588.c
deleted file mode 100644
index d1c5f1cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf588.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define APPEND_TO_STREAM(VAR0) << #VAR0
-#define APPEND_TO_STREAM(VAR0, VAR1) << #VAR0 << ", " << #VAR1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf594.c
deleted file mode 100644
index cd08cce6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf594.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void foo()
-{
-if (x < d >> 1)
-{
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sort_include.c
deleted file mode 100644
index 0f1956d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sort_include.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// should be ddd, eee, fff
-#include "ddd"
-#include "fff"
-#include "eee"
-
-// should be aaa, ccc
-#include "ccc"
-#include "aaa"
-// should be just bbb
-#include "bbb"
-
-// should be a, aa
-#include "aa"
-#include "a"
-
-// should be a, aa
-#include <aa>
-#include <a>
-
-// should be b, a
-#include <a>
-#include "b"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_after_sparen.c
deleted file mode 100644
index 8a86dd25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_after_sparen.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// test for bug # 637
-void foo(void)
-{
-while (1);
-	while (1);
-	while (1) ;
-	while (1)  ;
-		while (1);
-	if (n) {
-	while (1);
-		while (1);
-		while (1) ;
-		while (1)  ;
-			while (1);
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_cmt_cpp_start.c
deleted file mode 100644
index b9b07287..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_cmt_cpp_start.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-//zero
-// one
-//  two
-//   three
-void foo(void);
-
-////four
-//// five
-//// six
-void bar(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_embed_comment.c
deleted file mode 100644
index 88a54dff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_embed_comment.c
+++ /dev/null
@@ -1,8 +0,0 @@
-void f();
-void g(int);
-void h()
-{
-f(/*foo*/);
-g(42/*foo*/);
-g(/*foo*/42);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_func_call_user_inside_fparen.c
deleted file mode 100644
index ba921b9f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_func_call_user_inside_fparen.c
+++ /dev/null
@@ -1 +0,0 @@
-USER(foo[0]);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sparen-indent.c
deleted file mode 100644
index fe770681..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sparen-indent.c
+++ /dev/null
@@ -1,19 +0,0 @@
-void f(void) {
-
-if (a
-&& b) {
-h();
-}
-
-for (a = b;
-c;
-d++) {
-h();
-}
-
-while (z
-&& w) {
-h();
-}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_prefixes.c
deleted file mode 100644
index e901c9ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_prefixes.c
+++ /dev/null
@@ -1,23 +0,0 @@
-void foo()
-{
-	BSTR test = L"SID";
-	CHAR s[]  = "This is a \"test\"";
-	CHAR ch   = 'a';
-}
-
-/* The 'u8', 'u', and 'U' prefixes */
-const char     *s1 = u8"I'm a UTF-8 string.";
-const char16_t *s2 = u"This is a UTF-16 string.";
-const char32_t *s3 = U"This is a UTF-32 string.";
-
-const char c1 = u8'1';
-const char16_t c2 = u'2';
-const char32_t c3 = U'4';
-const wchar_t c4 = L'w';
-const char16_t u = u'\u007f';
-
-OutputType some_variable = "1234"_Suffix;      //Calls the const char * version
-OutputType some_variable = u8"1234"_Suffix;    //Calls the const char * version
-OutputType some_variable = L"1234"_Suffix;     //Calls the const wchar_t * version
-OutputType some_variable = u"1234"_Suffix;     //Calls the const char16_t * version
-OutputType some_variable = U"1234"_Suffix;     //Calls the const char32_t * version
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_utf8.c
deleted file mode 100644
index a473e1bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_utf8.c
+++ /dev/null
@@ -1 +0,0 @@
-char* x = "中国語 (�体)";
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/struct-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/struct-brace.c
deleted file mode 100644
index 7d08b4ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/struct-brace.c
+++ /dev/null
@@ -1,17 +0,0 @@
-struct foo {
- unsigned int d_ino;
- unsigned short d_reclen;
- unsigned short d_namlen;
- char d_name[1];
-};
-
-struct foo
-{
- unsigned int d_ino;
- unsigned short d_reclen;
- unsigned short d_namlen;
- char d_name[1];
-};
-
-struct foo { int a; char *b };
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch-case.c
deleted file mode 100644
index add9fcfa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch-case.c
+++ /dev/null
@@ -1,117 +0,0 @@
-
-asmlinkage unsigned long
-osf_setsysinfo(unsigned long op, void __user *buffer, unsigned long nbytes,
-	       int __user *start, void __user *arg)
-{
-	switch (op) {
-	case SSI_IEEE_FP_CONTROL: {
-		unsigned long swcr, fpcr;
-		unsigned int *state;
-
-		/*
-		 * Alpha Architecture Handbook 4.7.7.3:
-		 * To be fully IEEE compiant, we must track the current IEEE
-		 * exception state in software, because spurrious bits can be
-		 * set in the trap shadow of a software-complete insn.
-		 */
-
-		if (get_user(swcr, (unsigned long __user *)buffer))
-			return -EFAULT;
-		state = &current_thread_info()->ieee_state;
-
-		/* Update softare trap enable bits.  */
-		*state = (*state & ~IEEE_SW_MASK) | (swcr & IEEE_SW_MASK);
-
-		/* Update the real fpcr.  */
-		fpcr = rdfpcr() & FPCR_DYN_MASK;
-		fpcr |= ieee_swcr_to_fpcr(swcr);
-		wrfpcr(fpcr);
-
-		return 0;
-	}
-
-	case SSI_IEEE_RAISE_EXCEPTION: {
-		unsigned long exc, swcr, fpcr, fex;
-		unsigned int *state;
-
-		if (get_user(exc, (unsigned long __user *)buffer))
-			return -EFAULT;
-		state = &current_thread_info()->ieee_state;
-		exc &= IEEE_STATUS_MASK;
-
-		/* Update softare trap enable bits.  */
- 		swcr = (*state & IEEE_SW_MASK) | exc;
-		*state |= exc;
-
-		/* Update the real fpcr.  */
-		fpcr = rdfpcr();
-		fpcr |= ieee_swcr_to_fpcr(swcr);
-		wrfpcr(fpcr);
-
- 		/* If any exceptions set by this call, and are unmasked,
-		   send a signal.  Old exceptions are not signaled.  */
-		fex = (exc >> IEEE_STATUS_TO_EXCSUM_SHIFT) & swcr;
- 		if (fex) {
-			siginfo_t info;
-			int si_code = 0;
-
-			if (fex & IEEE_TRAP_ENABLE_DNO) si_code = FPE_FLTUND;
-			if (fex & IEEE_TRAP_ENABLE_INE) si_code = FPE_FLTRES;
-			if (fex & IEEE_TRAP_ENABLE_UNF) si_code = FPE_FLTUND;
-			if (fex & IEEE_TRAP_ENABLE_OVF) si_code = FPE_FLTOVF;
-			if (fex & IEEE_TRAP_ENABLE_DZE) si_code = FPE_FLTDIV;
-			if (fex & IEEE_TRAP_ENABLE_INV) si_code = FPE_FLTINV;
-
-			info.si_signo = SIGFPE;
-			info.si_errno = 0;
-			info.si_code = si_code;
-			info.si_addr = NULL;  /* FIXME */
- 			send_sig_info(SIGFPE, &info, current);
- 		}
-		return 0;
-	}
-
-	case SSI_IEEE_STATE_AT_SIGNAL:
-	case SSI_IEEE_IGNORE_STATE_AT_SIGNAL:
-		/*
-		 * Not sure anybody will ever use this weird stuff.  These
-		 * ops can be used (under OSF/1) to set the fpcr that should
-		 * be used when a signal handler starts executing.
-		 */
-		break;
-
- 	case SSI_NVPAIRS: {
-		unsigned long v, w, i;
-		unsigned int old, new;
-		
- 		for (i = 0; i < nbytes; ++i) {
-
- 			if (get_user(v, 2*i + (unsigned int __user *)buffer))
- 				return -EFAULT;
- 			if (get_user(w, 2*i + 1 + (unsigned int __user *)buffer))
- 				return -EFAULT;
- 			switch (v) {
- 			case SSIN_UACPROC:
-			again:
-				old = current_thread_info()->flags;
-				new = old & ~(UAC_BITMASK << UAC_SHIFT);
-				new = new | (w & UAC_BITMASK) << UAC_SHIFT;
-				if (cmpxchg(&current_thread_info()->flags,
-					    old, new) != old)
-					goto again;
- 				break;
-
- 			default:
- 				return -EOPNOTSUPP;
- 			}
- 		}
- 		return 0;
-	}
-
-	default:
-		break;
-	}
-
-	return -EOPNOTSUPP;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch.c
deleted file mode 100644
index 5b760363..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-int foo(int op)
-{
-   switch (op)
-   {
-   case 1: {
-         do_something();
-         return 0;
-      }
-
-   case 2: 
-      do_something_else();
-      return 1;
-
-   case 3:
-   case 4:
-      /* don't do anything */
-      break;
-
-   case 5:
-      return 3;
-
-   default:
-      break;
-   }
-
-   return -1;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/t3.in.c
deleted file mode 100644
index e352f736..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/t3.in.c
+++ /dev/null
@@ -1,10 +0,0 @@
-extern /*@observer@*/ /*@null@*/ const dcroid_t* dcrp_oidget
-(
- /*@in@*/ const char* h,
- /*@in@*/const char* t
-  ) /*@ensures maxRead(result) >= 0@*/;
-
-extern /*@observer@*/const char* dcrp_oidlabel
-(
- /*@in@*/const dcroid_t* oid
- );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type-cast.c
deleted file mode 100644
index 5760b466..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type-cast.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-void foo(void)
-{
-   drab bar;
-   bar = (bat) * r;
-   bar = (int) * r;
-   bar = (UINT8) * r;
-   bar = (time_t) * r;
-
-   a = &arg[dog * 13];
-   b = arg[dog * cat];
-   hc = "0123456789ABCDEF"[0xf & *val];
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type_wrap.c
deleted file mode 100644
index 13b74455..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type_wrap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void foo(void)
-{
-   STACK_OF(X509) * st=sk_X509_new_null();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/utf8-identifiers.c
deleted file mode 100644
index e3281aac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/utf8-identifiers.c
+++ /dev/null
@@ -1,13 +0,0 @@
-void FooUtf8Сhar(void) // C is encoded in UTF-8
-{
-}
-
-struct テスト         // Japanese 'test'
-{
-    void トスト() {}  // Japanese 'toast'
-};
-
-int main() {
-    テスト パン;        // Japanese パン 'bread'
-    パン.トスト();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vardefcol.c
deleted file mode 100644
index bdb40e8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vardefcol.c
+++ /dev/null
@@ -1,14 +0,0 @@
-static string foo,
-bar;
-
-void f()
-{
-SomeNamedType *var1,
-                  * var2;
-}
-
-void b()
-{
-AnotherType var1,
-var2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/various_colons.c
deleted file mode 100644
index 516a5a72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/various_colons.c
+++ /dev/null
@@ -1,21 +0,0 @@
-struct foo {
-        unsigned int a:4;int b : 4;
-};
-
-int bar(int x)
-{
-        switch (x){ case 1: return 2; case 4: return 4;
-                        case
-                             6
-                                :
-                                return
-                                        8;
-        case 10:
-                return 19;
-        }return 0;
-
-}
-
-
-int main(void){bar(10);
-foo: bar(-9); bar(9);baz:return 0;}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-do.c
deleted file mode 100644
index 1cefd1df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-do.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-struct beef a =
-{
-   1, 2, 3
-};
-
-void get_name(void)
-{
-   int _ = 3;
-   do
-      a--;
-   while (a);
-
-   while (a) //something
-      a--;
-
-   do
-      while (a) //something
-         a--;
-   while (b--);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-pp.c
deleted file mode 100644
index 5ea209c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-pp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-void f() {
-if(0)
-#pragma omp atomic
-i++;
-}
-
-
-void f() {
-if(0)
-#if foo
-i++;
-#else
-i+=2;
-#endif
-}
-
-void f()
-{
-while(108) {
-if(42)
-#pragma omp critical
-{ }
-if(23)
-#pragma omp critical
-++i;
-while (16)
-{ }
-int i = 15;
-if(8)
-#pragma omp atomic
-i += 4;
-}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-while.c
deleted file mode 100644
index 22291748..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-while.c
+++ /dev/null
@@ -1,41 +0,0 @@
-unsigned long xdl_adler32(unsigned long adler, unsigned char const *buf,
-                          unsigned int len)
-{
-   int k;
-   unsigned long s1 = adler & 0xffff;
-   unsigned long s2 = (adler >> 16) & 0xffff;
-
-   if (!buf)
-      return 1;
-
-   while (len > 0)
-   {
-      k = len < NMAX ? len :NMAX;
-      len -= k;
-      while (k >= 16)
-      {
-         DO16(buf);
-         buf += 16;
-         k -= 16;
-      }
-      if (k != 0)
-         do
-         {
-            s1 += *buf++;
-            s2 += s1;
-         } while (--k);
-      s1 %= BASE;
-      s2 %= BASE;
-   }
-
-   return(s2 << 16) | s1;
-}
-
-void f(){
-while(1)
-if(2)
-3;
-else
-4;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/whole_file_ifdef.c
deleted file mode 100644
index bb16e116..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/whole_file_ifdef.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Header */
-#ifdef WHOLE_FILE
-void foo();
-#endif /* WHOLE_FILE */
-/* Footer */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/xml.c
deleted file mode 100644
index fe7afdf4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/xml.c
+++ /dev/null
@@ -1,9 +0,0 @@
-void foo(void)
-{
-const char *a= "<xml>"
-"<data Parent=\"%d\" Name=\"%s\">"
-"<Child Id=\"%d\"/>"
-"</data>"
-"</xml>";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp
deleted file mode 100644
index e0379b43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int i = 0; /* a b *//* a b */  int b = 0;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp
deleted file mode 100644
index 6f874926..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-typedef enum {
-  HAL_USART_ENABLED = 64,                   ///< Requested task impossible while
-                                            ///< peripheral in question is
-                                            ///< enabled
-  HAL_USART_DISABLED,                       ///< Requested task impossible while
-                                            ///< peripheral in question is
-                                            ///< disabled
-  HAL_USART_GPIO_ERROR,                     ///< GPIO tied with USART peripheral
-                                            ///< returned error state
-  HAL_USART_BUFFER_DEPLETED,                ///< Not enough data to be read
-  HAL_USART_BUFFER_FULL                     ///< Data requested to be written
-                                            ///< didn't fit into buffer
-} hal_usart_errors_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp
deleted file mode 100644
index 4a2c05fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp
+++ /dev/null
@@ -1 +0,0 @@
-using Foo = std::function<void (const bool)>;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-result = (Foo)this;

-result = (Foo)foo;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp
deleted file mode 100644
index a6aface7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-f()

-{

-	{

-		{

-			{

-#				if 1

-				return 0;

-#				endif

-

-				#if 1

-				return 0;

-				#endif

-			}

-		}

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp
deleted file mode 100644
index ad1ed6f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Foo^ foo = dynamic_cast<Bar^>(bar);

-Foo* foo = dynamic_cast<Bar*>(bar);

-x = a^b;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp
deleted file mode 100644
index 4e18c597..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-typedef void (*func)();
-typedef void (__stdcall *func)();
-
-typedef std::vector<string *> * (*   Finder )(std::string *);
-typedef vector<std::string *> * (* Handler )(std::map< std::string  * , vector *> *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp
deleted file mode 100644
index bb6b14fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-extern "C" int* i;

-extern "C" { int* i; }

-int* i;

-extern "C" NSString* i;

-extern "C" { NSString* i; }

-NSString* i;

-

-__attribute__((visibility ("default"))) int* i;

-__attribute__((visibility ("default"))) NSString* i;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp
deleted file mode 100644
index 1b8f4bc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void AkonadiServer::createDatabase()
-{
-    DbConfig::configuredDatabase()->apply(db);
-    db.setDatabaseName(DbConfig::configuredDatabase()->databaseName());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp
deleted file mode 100644
index 3c4f3b9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-class Foo
-{ 
-  public:
-    Foo( int bar)=0;
-    Foo( int bar = 777 );
-    Foo( const Foo & ) = delete;
-    Foo( int boo ) =default;
-    Foo( unsigned int ) =default;
-    Foo( unsigned int boo=999 );
-    Foo &operator= ( const Foo & ) = delete;
-    ~Foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp
deleted file mode 100644
index dfa5a906..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-  //a cpp comment
-  ///<a Doygen comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h
deleted file mode 100644
index deede79a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h
+++ /dev/null
@@ -1,10 +0,0 @@
-class Example

-{

-  

-  Example()

-    : member(0)

-  {}

-  

-  int member;

-  

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp
deleted file mode 100644
index 365df31f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp
+++ /dev/null
@@ -1 +0,0 @@
-::some::very::looong::_and::complicated::name::MyType & a;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp
deleted file mode 100644
index c3765ce4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class MyClass
-{
-public:
-   void foo(::some::very::looong::_and::complicated::name::MyType& a,
-      ::some::very::looong::_and::complicated::name::MyType& b,
-      some::very::looong::_and::complicated::name::MyType& c);
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp
deleted file mode 100644
index 6c48cb63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class MyClass
-{
-public:
-   ::some::name * foo;
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp
deleted file mode 100644
index d8cf883a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-unsigned __int32 b = 1ui32;
-unsigned __int64 b = 1ui64;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp
deleted file mode 100644
index ba6386dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-int i1 = EEnumType::a & EEnumType::b;
-int i2 = a & b;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp
deleted file mode 100644
index 19461b71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-ut8 u32s[sizeof (ut32)] = {
-0
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp
deleted file mode 100644
index 6a9042c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp
+++ /dev/null
@@ -1 +0,0 @@
-typedef ::foo::moon::extra::common::super::VeryLongClassName <::foo::moon::extra::common::super::ISuperNice, ::foo::moon::extra::common::super::NiceStoryAboutTheSea, ::foo::moon::extra::common::super::TheVeryLastParameter> AVeryLongNameForDemonstration;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp
deleted file mode 100644
index 7c69e7fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-char buf [2000];
-
-buf  [0] = 5;
-buf     [1] = 6;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h
deleted file mode 100644
index 63787999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define MGT_TYPE_WINDOW (mgt_window_get_type ())
-
-G_DECLARE_FINAL_TYPE (MgtWindow, mgt_window, MGT, WINDOW, GtkApplicationWindow)
-
-MgtWindow *mgt_window_new (MgtApplication *app);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp
deleted file mode 100644
index 2583c0e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int getFoo() { return foo; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp
deleted file mode 100644
index 4a2c97b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-switch (a)
-{
-  case 0:
-    // code
-          break;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp
deleted file mode 100644
index bca40664..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#define NUM_LPM_TESTS (sizeof(tests) / sizeof(tests[0]))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp
deleted file mode 100644
index 90cb2049..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#define INC_REF_COUNT(ref_count) ++ref_count
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp
deleted file mode 100644
index 10be5586..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class X15
-{
-enum Enum
-{
-	e1
-};
-
-operator Enum();
-};
-
-::X15::operator ::X15::Enum()
-{
-	return e1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp
deleted file mode 100644
index 31d08c29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class X16
-{
-public:
-X16();
-};
-
-// https://en.cppreference.com/w/cpp/language/function-try-block
-X16::X16()
-try
-{
-}
-catch (...)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp
deleted file mode 100644
index fd8b1384..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-template<class T>
-class foo
-{
-public:
-        T x;
-        foo<T>(int a): x(a)
-        {
-                int y = a;
-                int z = 13;
-        }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp
deleted file mode 100644
index bf5530c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void x()
-{
-   a = c0*d0();
-   a = b?c+d:e;
-   a = b?c*d:e;
-   a = b?c+d():e;
-   a = b1?c1*d1():e1;
-   a = b2?c2()*d2:e2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp
deleted file mode 100644
index 9c02605a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace n1 {
-   namespace n2 {
-
- void func() {
-           another_func([]() {
-         return 42;
-                     });
-       }
-
-           }
-   }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp
deleted file mode 100644
index 93e0799c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace n1 {
-                 namespace n2 {
-      namespace n3 {
-
-        void func() {
-      another_func([]() {
-                                     return 42;
-          });
-    }
-
-    }
-    }
-    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp
deleted file mode 100644
index 0c07555d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace ns1
-{
-namespace ns2
-{
-void func0()
-{
-functionThatTakesALambda( [&] () -> void
-{
-lambdaBody;
-});
-functionThatTakesALambda( [&] __device__ () -> void
-{
-lambdaBody;
-});
-functionThatTakesALambda( [&] __host__ __device__ () -> void
-{
-lambdaBody;
-});
-functionThatTakesALambda( [&] DEVICE_LAMBDA_CONTEXT () -> void
-{
-lambdaBody;
-});
-functionThatTakesALambda( [&] HOST_DEVICE_LAMBDA_CONTEXT () -> void
-{
-lambdaBody;
-});
-}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp
deleted file mode 100644
index e5b3ceeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-int x1 = 0;
-foobar long_x2 = 0;
-foo<int> x3 = 0;
-int x4[] = {1, 2, 3};
-decltype(x1) x5 = 0;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp
deleted file mode 100644
index 80b7ddc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define FLAG1               0x101  /* struct foo should not be used.
-The struct is unsafe */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp
deleted file mode 100644
index 94d0aa28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-class X21
-{
-public:
-void f(
-int p1, int p2);
-};
-
-void
-X21::f(
-int p1, int p2)
-{
-}
-
-void
-n1()
-{
-	X21 x21;
-	x21.f(
-111, 122);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp
deleted file mode 100644
index 627eba3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void wpa_smk_send_error(struct wpa_authenticator *wpa_auth,
-                               struct wpa_state_machine *sm, const u8 *peer,
-                               u16 mui, u16 error_type)
-{
-         u8 kde[2 + RSN_SELECTOR_LEN + ETH_ALEN +
-               2 + RSN_SELECTOR_LEN + sizeof(struct rsn_error_kde)];
-         u8 *pos;
-         struct rsn_error_kde error;
-         
-         wpa_auth_logger(wpa_auth, sm->addr, LOGGER_DEBUG,
-                "Sending SMK Error");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp
deleted file mode 100644
index 581f4db4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp
+++ /dev/null
@@ -1 +0,0 @@
-typedef std::function<size_t (int arg)> Fail;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp
deleted file mode 100644
index 6e32d683..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <AClass.h>
-#include <SomeClass.h>
-#include <TheClass.h>
-#include <iostream>
-#include <vector>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp
deleted file mode 100644
index 4726f44b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void GoAbsolutePosition( /* [in1] */ double arg1_,
-                         /* [in2] */ double arg2_ );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp
deleted file mode 100644
index 3e07c686..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void Test()
-{
-    aaaaaa = condition ? FunctionWithVeryLongName( andWithVeryLongArgumentsToo1, andWithVeryLongArgumentsToo2 )
-                       : FunctionWithVeryLongName( andWithVeryLongArgumentsToo2, andWithVeryLongArgumentsToo1 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp
deleted file mode 100644
index ad53fa57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void funcName()                       const;
-void ncName()     override;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp
deleted file mode 100644
index 88fb2249..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace
-{ 
-        enum EnumValue
-        {
-                EnumValue1 = 1 << 1
-                                               };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp
deleted file mode 100644
index 1e4d6bf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-int f( int a )
-{
-        switch ( a )
-        {
-        case 1:
-        {
-                return a;
-        }
-        case 2:
-#if 1
-        case 3:
-#endif
-        {
-                return a;
-        }
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp
deleted file mode 100644
index dce02df3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void f( int a )
-{
-        namespace C { enum { Value }; }
-        const bool ok = ( a & C::Value ) && true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp
deleted file mode 100644
index 543b9827..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * m
- */
-void
-m(){ return 0; }
-/*
- * n
- */
-void
-n(){ return 0; }
-/*
- * n
- */
-int&
-n( int& x ){ return x; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp
deleted file mode 100644
index d9ac55c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void f1()
-{
-   int a;
-   int b;
-   auto lambda1 = [ &a ](){ return true; };
-   auto lambda2 = [ &a = b ](){ return true; };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp
deleted file mode 100644
index beeffc7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class Foo
-{
-  public:
-    Foo( int bar = 1 );
-    Foo( const Foo & ) = delete;
-    Foo &operator= ( const Foo & ) = delete;
-    ~Foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp
deleted file mode 100644
index c9cbacda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-using namespace std;
-
-namespace ui      { class CClass; }              // Expected to stay as-is
-namespace ui::dlg { class CClassDlg; }           // Expected to stay as-is (new in C++17)
-
-namespace ui {              // Brace should be on the next line
-class CClass1;              // Should be indented
-class CClass2;
-class CClass3;
-class CClass4;
-class CClass5;
-class CClass6;
-class CClass7;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp
deleted file mode 100644
index 3573b20d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-void Launcher::signal(int code)
-{
-    /*
-    1 HUP      2 INT      3 QUIT     4 ILL      5 TRAP     6 ABRT     7 BUS
-    8 FPE      9 KILL    10 USR1    11 SEGV    12 USR2    13 PIPE    14 ALRM
-    15 TERM    16 STKFLT  17 CHLD    18 CONT    19 STOP    20 TSTP    21 TTIN
-    22 TTOU    23 URG     24 XCPU    25 XFSZ    26 VTALRM  27 PROF    28 WINCH
-    29 POLL    30 PWR     31 SYS
-
-
-        Operation          WinCode     NixCode
-        Status             128          1 (HUP)
-        Terminate          N/A          2 (INT) Linux or macOS uses this for CTRL-C.
-                        129          3
-                        130          4
-                        131          5
-                        132          6
-                        133          7
-                                        8
-                                        9
-                                    10
-                                    11
-                                    12
-                                    13
-                                    14
-        Terminate          N/A         15 (TERM) Linux or macOS uses this for CTRL-C.
-                                    16
-                       N/A         17 (CHILD) Child process exited.
-                        N/A         28 WINCH, window changed size.
-        */
-
-    // Convert to lower range
-    if (code >= 128)
-    {
-        code -= 127;
-    }
-
-
-
-
-    
-
-    event_queue.push(code);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp
deleted file mode 100644
index cb6e24bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()
-{
-for(int i = 0;i < 1;i++) {return (false);}
-float g = 0.13;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp
deleted file mode 100644
index 65382eb9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-static void GPUFailedMsgA(const long long int error, const char* file, int line)
-{
-if (GPUFailedMsgAI(error, file, line)) {
-throw std::runtime_error("Failure");
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp
deleted file mode 100644
index 9f575dc1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int foo()
-{
-if (false) {return 1;}
-if (true) {return 2;}
-float a = 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp
deleted file mode 100644
index 7632ed27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void main()
-{
-if (true) { return;}
-
-mInitialized = true;
-return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp
deleted file mode 100644
index 5dbc4fbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class A
-{
-public:
-    virtual void f11111111( int a, int b, int c )   = 0;
-    virtual void f2( int* ptr2 = nullptr ) = 0;
-    virtual void f2333( int* ptr3 = 3 ) = delete;
-    void f244444( int* ptr4 = 4 ) = default;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp
deleted file mode 100644
index 9268c2e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-SettingsDelta::SettingsDelta(
-      const LastEffectiveContextData& lastEffCtxData)
-   : Member2(lastEffCtxData.member2())
-   , Member3(lastEffCtxData.member3().c_str())
-   , Functor([this](const int& num) { Callback(num); })
-   , Member4(lastEffCtxData.member4().c_str())
-   , Member5(lastEffCtxData.member5())
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp
deleted file mode 100644
index 44b9e75f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-int foo(int op)
-{
-        switch (op)
-        {
-        case 1:
-                do_something();
-        break;
-        case 2:
-                do_something_else();
-        case 3:
-                if (do_something_different())
-                {
-                        do_this();
-                break; // this should be indented like the surrounding code
-                }
-                do_something_more();
-        break;
-        }
-        return -1;
-        for (;;)
-        {
-        break;
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp
deleted file mode 100644
index 4763c574..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template<class T>
-class Foo<T>::Baz {
-  Baz() noexcept
-    : i(0)
-  {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp
deleted file mode 100644
index 1b35ac11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template<class T>
-class Foo<T>::Bar {
-  void
-  Bar(int iii) : iii(0)
-  {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp
deleted file mode 100644
index 8c0ae3e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-using AbstractLinkPtr = AbstractLink*;
-using AbstractLinkPtrPtr = AbstractLink**;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp
deleted file mode 100644
index 0bc9cf8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-CPoint GetPoint()
-{
-	return { obj_.GetCoordinateXFromObject(),
-	         obj_.GetCoordinateYFromObject(),
-	         obj_.GetCoordinateZFromObject() };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg
deleted file mode 100644
index 955a1f9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cmt_with_tabs            = false
-indent_class_on_colon           = true
-indent_constr_colon             = true
-indent_relative_single_line_comments = true
-indent_access_spec_body         = true
-nl_func_leave_one_liners        = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 4
-nl_before_opening_brace_func_class_def = force
-nl_class_colon                  = add
-pos_class_colon                 = lead
-align_var_class_span            = 3
-align_var_struct_span           = 3
-pp_if_indent_code               = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp
deleted file mode 100644
index 837b0506..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-class Capteur {
-    public:
-        Capteur ();
-    public:
-        float  val_num;
-        float  val_num_prec;    // La valeur précédente pour la comparaison
-        String tendance;        // La variable text récupérée du flux Internet
-        String val_texte;       // La variable text récupérée du flux Internet
-};
-
-class Capteur_CO2 : public Capteur {
-    public:
-        Capteur_CO2() :
-            un_membre_en_plus ( 0 ) {}
-    public:
-        int un_membre_en_plus;
-};
-
-
-class Salon {
-    public:
-        Capteur     temperature;
-        Capteur     humidite;
-        Capteur     pression;
-        Capteur_CO2 CO2;
-};
-
-
-typedef struct Exterieur Exterieur;
-struct Exterieur {  // Structure qui regroupe toutes les variables de la station météo
-    float  temp_num;
-    float  temp_num_prec;   // La valeur précédente pour la comparaison
-    int    humidite;
-    int    humidite_prec;   // La valeur précédente pour la comparaison
-    String temp_tendance;   // La variable text récupérée du flux Internet
-    String temp_texte;      // La variable text récupérée du flux Internet
-    String humidite_texte;  // La variable text récupérée du flux Internet
-    Exterieur () :
-                 temp_num ( -99.9 ),
-                 temp_num_prec ( -99.9 ),
-                 humidite ( 0 ),
-                 humidite_prec ( 0 ),
-                 temp_tendance ( "up" ),
-                 temp_texte ( "" ),
-                 humidite_texte ( "" ) {}
-};
-
-
-
-for ( int i = 3; i < 42; i++ ) {
-    Serial.print ( "TEXTE(AC" );
-    Serial.print ( i );
-    Serial.print ( ";\"0\");\",\";" );
-}
-#define OLIVE     0x7BE0
-#define LIGHTGREY 0xC618
-#ifndef _NETATMO_FONCTIONS_WIFI_h
-    #define _NETATMO_FONCTIONS_WIFI_h
-    #if defined ( ARDUINO ) && ARDUINO >= 100
-        #include "arduino.h"
-        #if defined ( RORO )
-            #define qsijnqsijdn 1323
-            // asbdsqhbdsqibd
-        #endif
-        #define qsijnqsijdn 1323
-
-    #else
-        #define qsijnqsijdn 1323
-
-        #include "WProgram.h"
-    #endif  // if defined ( ARDUINO ) && ARDUINO >= 100
-    #define qsijnqsijdn 1323
-
-#endif  // ifndef _NETATMO_FONCTIONS_WIFI_h
-
-// Essaie de signe=se+szde/szz-sszzd%zdzd
-zzez  = { 1, 2, 3 };
-toto += 1 + 2 / 9 - 3 / 2;
-
-int fonction ( ( int *zeze ), ( ss ) ) { ksjbshjdbshjdb = 1;}
-fonction ( ( &zeze ), ( ss ) );
-fonction ();
-// Définition des structures de données
-typedef struct Exterieur Exterieur;
-struct Exterieur {      // Structure qui regroupe toutes les variables de la station météo
-    float  temp_num;
-    float  temp_num_prec;   // La valeur précédente pour la comparaison
-    int    humidite;
-    int    humidite_prec;   // La valeur précédente pour la comparaison
-    String temp_tendance;   // La variable text récupérée du flux Internet
-};
-Exterieur tototot = { -99, -99, -99, -99, 99 };
-
-// Température Extérieure
-float _Temp_Ext = -99.9;
-float _Temp_Ext_Precedente = -99.9;     // La valeur précédente pour la comparaison
-String _Temp_Ext_Tendance  = "up";
-
-UTFT myGLCD ( SSD1963_800 = 1, 38, 39, 40, 41 );    // (byte model, int RS, int WR, int CS, int RST, int SER)
-UTFT_Geometry geo_myGLCD ( &myGLCD );
-
-const char *jour_semaine[[1], [2]] = {
-    "\0",
-    "Vendredi\0",
-    "Dimanche\0"
-};
-
-void Centrer_Nombre_Int_dans_Zone ( int _nbr, int Y, int X1, int X2, int COULEUR );
-void Centrer_Nombre_Float_dans_Zone ( float _nbr, int Y, int X1, int X2, int COULEUR );
-
-void Centrer_Nombre_Int_dans_Zone ( int _nbr, int Y, int X1, int X2, int COULEUR ) {
-    toto = 1 + 2 / 9 - 3 / 2;
-    String _texte = String ( _nbr, 1 );
-    if ( X2 > X1 ) {
-        X = X1 + ( X2 - X1 + 1 - _texte.length () * myGLCD.getFontXsize () ) / 2;
-    }
-    else {
-        X = X2 + ( X1 - X2 - myGLCD.getFontXsize () ) / 2;
-    }
-    if ( X <= 0 ) {
-        Serial.print ( F ( "-- Erreur dans le fonction Centrer_Nombre_Int_dans_Zone : la valeur calculée de X est négative ou nulle, elle vaut :" ) );
-        Serial.println ( X );
-        Serial.print ( F ( "Le texte qui génère cette erreur est : " ) );
-        Serial.println ( _texte );
-    }
-    else {
-        myGLCD.setColor ( COULEUR );
-        myGLCD.printNumI ( _nbr, X, Y );
-    }
-}
-
-void Texte_Bonjour () {
-    myGLCD.setColor ( VGA_AQUA );
-    myGLCD.setBackColor ( VGA_TRANSPARENT );
-
-
-
-    myGLCD.setFont ( Grotesk32x64 );
-    myGLCD.print ( F ( "BONJOUR" ), CENTER, 20 );
-    myGLCD.setFont ( BigFont );
-    myGLCD.print ( F ( "*** NETATMO AFFICHAGE DEPORTE ***" ), CENTER, 100 );
-    myGLCD.print ( F ( "Debut : Mai 2019 / MAJ : Juillet 2019" ), CENTER, 120 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp
deleted file mode 100644
index 787ce29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace fooD {
-	void a();
-	void b();
-	void c();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp
deleted file mode 100644
index 9478d63e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace fooD {
-	void a();
-	void b();
-	void c();
-	void d();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp
deleted file mode 100644
index 08d0556b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void Func1()
-{
-	OtherFunc( 5, b );
-}
-
-void Func2()
-{
-	Func3( p1, p2, p3 );
-	Func3( p111, p222, p333 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp
deleted file mode 100644
index 356fd9af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Smooth
-// Copyright (C) 2017 Per
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp
deleted file mode 100644
index ac0b1dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// A
-
-
-std::string getText()
-{
-	return "Hello World";
-}
-
-int main(int argc, char *argv[])
-{
-	std::cout << getText() << std::endl;
-	return 0;
-}
-// This is Hello World with a function call and
-
-// form feed characters in it for emacs page-break-lines extension
-// which draws a horizontal line for each FF char it finds.
-//
-// this file contains two single h. lines and two consecutive h. lines
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp
deleted file mode 100644
index af00e16e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace bar
-{
-void none();
-};
-
-void foo()
-{
-	namespace // does not
-	x         // start a
-	=         // namespace
-	bar;
-
-	x::none();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp
deleted file mode 100644
index c919d5a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void test()
-{
-        int { 0 };
-        int abcdef { 0 };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp
deleted file mode 100644
index 2a64bd8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void timer_cb1(struct timer_node *n);
-typedef void timer_cb   (struct timer_node *n);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma region
-#pragma endregion
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma region
-#pragma endregion
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp
deleted file mode 100644
index fbcfec1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//example file
-typedef int X35GlobalT1;
-typedef int X35T2;
-
-void fooX35a()
-{
-   ::X35GlobalT1 a1;
-   X35T2 a2;
-
-   ::X35GlobalT1 a3 = 1;
-   X35T2 a4 = 1;
-}
-
-void fooX35b()
-{
-   X35GlobalT1 a1;
-   X35T2 a2;
-
-   X35GlobalT1 a3 = 1;
-   X35T2 a4 = 1;
-}
-
-class X35_1a
-{
-   private:
-      ::X35GlobalT1 a1;
-      X35T2 a2;
-
-      ::X35GlobalT1 a3 = 1;
-      X35T2 a4 = 1;
-};
-
-class X35_1b
-{
-   private:
-      X35GlobalT1 a1;
-      X35T2 a2;
-
-      X35GlobalT1 a3= 1;
-      X35T2 a4 = 1;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp
deleted file mode 100644
index 15232fc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-int getFoo() { return foo; }
-
-int main (int argc, char *argv[])
-{
-    printf("hello world!\n");
-
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp
deleted file mode 100644
index 721d4d78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-template
-<bool = (sizeof(unsigned long) >= sizeof(size_t))>
-struct LongFitsIntoSizeTMinusOne { ... }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp
deleted file mode 100644
index 44373e77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-class [[nodiscard]] CClass final
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp
deleted file mode 100644
index fc79cd0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <pybind11/pybind11.h>
-namespace py = pybind11;
-PYBIND11_MODULE(example, m)
-{
-	py::class_<Pet>(m, "Pet").def(py::init<const std::string&>()).def(
-		"setName_T",
-		&Pet::setName).def("getName", &Pet::getName);
-}
-
-auto three()->int
-{
-	return 3;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp
deleted file mode 100644
index adf9bfe9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-int fail = doSomething(
-  argument
-).doNotIndentMe();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp
deleted file mode 100644
index 01ed232e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-const auto lambda = [this](int arg) {
-  doSomething();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp
deleted file mode 100644
index 798a719a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-int GPUReconstructionOCL2Backend::GetOCLPrograms()
-{
-
-#ifdef OPENCL2_ENABLED_SPIRV // clang-format off
-  if (ver >= 2.2) {
-    mInternals->program = clCreateProgramWithIL(mInternals->context, _makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_spirv, _makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_spirv_size, &ocl_error);
-  } else
-	{
-		size_t program_sizes[1] = {_makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_src_size};
-		char* programs_sources[1] = {_makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_src};
-		mInternals->program = clCreateProgramWithSource(mInternals->context, (cl_uint) 1, (const char**) &programs_sources, program_sizes, &ocl_error);
-	}
-#endif // clang-format on
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp
deleted file mode 100644
index d2517e8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void function(void) {
-        int a = 0;
-        int b = (a==1)?1:2;
-        int c = (a==1)     ?     1     :     2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp
deleted file mode 100644
index e73c67a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void funcPROTO( int parameter1, int parameter2, 
-	int parameter3, int parameter4, 
-	int parameter5, int parameter6, 
-	int parameter7);
-
-void funcDEF( int parameter1, int parameter2, 
-	int parameter3, int parameter4, 
-	int parameter5, int parameter6, 
-	int parameter7)
-{
-funcCALL( parameter1, parameter2, 
-	parameter3, parameter4, 
-	parameter5, parameter6, 
-	parameter7 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp
deleted file mode 100644
index 1e2f5d02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class SubClass2 : public SuperClass
-{
-bool variable;
-int abcde;
-SubClass2()
-        : SuperClass()
-{
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp
deleted file mode 100644
index d29d2c47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-struct Point2D
-{
-	float x;
-	float y;
-};
-
-struct : Point2D
-{
-	float z;
-} point;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp
deleted file mode 100644
index f484d4ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-struct BaseStruct {};
-struct : BaseStruct {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp
deleted file mode 100644
index 0b394620..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-std::vector<Object> someVector = {
-  flag && (hasFeedback != nil)
-  ? objectA
-  : objectB,
-};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp
deleted file mode 100644
index ef3b5a4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class C
-{
-public:
-   size_t f4 : 8 * sizeof(size_t) - 2; // <-- this star is treated a pointer token
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp
deleted file mode 100644
index 4173ad5d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class Class
-{
-std::mutex* a;
-int* b;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp
deleted file mode 100644
index ec4554e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#define DEFINE_OPERATORS(classT, flagsT)          \
-    inline classT::flagsT                         \
-    operator&(const classT::flagsT&          lh1, \
-              const classT::flagsT::EnumType rh1) \
-    {                                             \
-        return classT::flagsT(lhs) &= rhs;        \
-    }                                             \
-                                                  \
-    inline classT::flagsT                         \
-    operator&(const classT::flagsT::EnumType lh2, \
-              const classT::flagsT&          rh2) \
-    {                                             \
-        return classT::flagsT(lhs) &= rhs;        \
-    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp
deleted file mode 100644
index 7b76eb43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-VIEW_CONTROLLER_MACRO(ThreadButton)
-UIViewController * MSGCreate(MBAMailbox *  mailbox, NSNumber *  threadKey);
-
-
-NS_SWIFT_NAME(Create(String))
-Controller * create(NSString *  str);
-
-
-MACRO_FUNCTION
-Object * create( NSString * str, NSDictionary<NSString *, NSArray *> *  data, string **  str)
-{
-  return nullptr;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp
deleted file mode 100644
index 7b85c0ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp
+++ /dev/null
@@ -1 +0,0 @@
-connect(server, SIGNAL(newConnection()), this, SLOT(ok()));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp
deleted file mode 100644
index f83e3536..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-void func(int a){
-    switch (a)
-    {
-            case 1:
-                ;
-                break;
-
-            case 2:
-                ;
-            break;
-
-        case 3:
-           {
-            int b = 3;
-                 }
-               break;
-
-        case 4:
-        {
-            float f = 4.0;
-        }
-  break;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp
deleted file mode 100644
index 9d76fe44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#define FOO \
-\
-    int my_type; \
-    int a; \
-    float b; \
-    double c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp
deleted file mode 100644
index 237c8ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int main() {}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp
deleted file mode 100644
index 3c84969b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void
-foo(map< int, int >& aaa,
-int bbb)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp
deleted file mode 100644
index 1ac9a86e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// a function call:
-int a = b(5);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp
deleted file mode 100644
index cbe9c4a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-Foo::Foo(int a,
-         int b)
-    : a_(a),  // the comment should stay here
-      b_(b)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp
deleted file mode 100644
index ab7c285f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-class CDiagnostic
-{
-        CDiagnostic& operator<<( int value_ ) { return ns::operator<<( *this, value_ ); }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp
deleted file mode 100644
index 03f2ae4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int
-main()
-{
-int i, j, k, l, m, q;
-
-i = rand();
-k = rand();
-l = rand();
-m = rand();
-j = rand();
-q = i * j + (2 * l) /m - ( 100 * k ) + k * k - i * i + 3000 * j + 1000 ; /* this is a very long trailing c comment */
-
-// the trailing * */ above should be */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp
deleted file mode 100644
index 6cb7e112..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void SnRequestTracefork::onCurlTestError(QProcess::ProcessError _error) {
-    myerror(QString("Curl process failed with error %1").arg(_error));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp
deleted file mode 100644
index eb0228c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace farm::animal::chicken::leg
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp
deleted file mode 100644
index f2dc1717..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class Test {
-public:
-    void funca()
-    {
-        static_cast<A>(funcb(static_cast<B>(
-            info)));
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp
deleted file mode 100644
index 44272d56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-module x;
-static if (1) {{
-    int x;
-}}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp
deleted file mode 100644
index af3020d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-class Capteur_CO2
-    : public Capteur
-    , aabc
-    , def
-{
-public:
-    Capteur_CO2()
-        : un ( 1 )
-        , deux(2) {
-    }
-};
-class Capteur_CO3
-    : public Capteur,
-      aabc,
-      def
-{
-public:
-    Capteur_CO3()
-        : un ( 1 ),
-          deux(2) {
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp
deleted file mode 100644
index 294c5e85..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class CObject
-{
-void f()
-{
-        CObject obj( b1 && c1, b2 && c2 );
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp
deleted file mode 100644
index 0474c710..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp
+++ /dev/null
@@ -1 +0,0 @@
-ValuePrimaryKey<int64_t, Schema, ColumnId1{0}> id = { kTableName, kColumnNameId };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp
deleted file mode 100644
index cea47724..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <iostream>
-#include <sstream>
-#include <string>
-
-struct StringBuilder
-{
-        template <typename T>
-        StringBuilder& append(const T& thing)
-        {
-                ss << thing;
-                return *this;
-        }
-        std::string build()
-        {
-                return ss.str();
-        }
-        std::stringstream ss;
-};
-
-int main()
-{
-        std::string my_____String = StringBuilder().append(7).append(" + ").append(21).append(" = ").append(7 + 21).build();
-        std::string my_____String = StringBuilder()
-                .append(7)
-                .append(" + ")
-                .append(21)
-                .append(" = ")
-                .append(7 + 21)
-                .build();
-
-      std::cout << my___String << std::endl;
-}
-
-void function()
-{
-      auto response = ResponseBuilder_1(1)
-         .setStatus_1(status)
-         .finish_1();
-
-    ResponseBuilder_2(request)
-        .setStatus_2(status)
-        .finish_2();
-
-          return ResponseBuilder_3(request).setStatus_3(status).finish_3();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp
deleted file mode 100644
index ae10d5a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum empty {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp
deleted file mode 100644
index 9d42a72d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-template< typename Enum > class Flags
-{
-  public:
-    constexpr Flags() : value{ 0 } {}
-    constexpr Flags( Enum f ) : value( static_cast< value_t >( f ) ) {}
-    constexpr Flags( Flags const& ) = default;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp
deleted file mode 100644
index 82c2bec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-auto foo() -> decltype(0)
-{
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp
deleted file mode 100644
index c2cd8b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void f()
-{
-    CallFunction( //-V556: Warning disabled because blablabla
-        param1,
-        param2 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp
deleted file mode 100644
index 43e19e96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace Namespace1
-{
-   namespace Namespace2
-   {
-      namespace Namespace3
-      {
-         namespace Namespace4
-         {
-            namespace Namespace5
-            {
-               namespace Namespace6
-               {
-                  namespace Namespace7
-                  {
-                     namespace Namespace8
-                     {
-                        class ClassName
-                        {
-                           public:
-                                 ClassName(int a,
-                                 int b);
-
-                           private:
-                                 int a;
-                                 int b;
-                        };
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp
deleted file mode 100644
index 9b130982..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-int main(int argc, char** argv) {
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp
deleted file mode 100644
index e5bc781f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp
+++ /dev/null
@@ -1 +0,0 @@
-if (p == b);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp
deleted file mode 100644
index d37d7ac3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-int index = -1;
-
-int main(void)
-{
-    const int x = 2;
-    int y = index < -x ? 1 : index > x ? 2 : 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp
deleted file mode 100644
index b546e7be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace SomeLongNamespaceName {
-class Foo { };
-}
-
-class Bar : SomeLongNamespaceName::Foo {
-public:
-Bar()
-        : SomeLongNamespaceName::Foo(),
-             myNumber(3), // <-- this line
-             myOtherNumber(5)
-{
-}
-private:
-int myNumber;
-int myOtherNumber;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp
deleted file mode 100644
index ddbb473e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class Class
-{
-int fa();
-int* fpa();
-int fb();
-int& frb();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp
deleted file mode 100644
index 9e64526e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-int a;// Рука
-int d;/* Рука */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp
deleted file mode 100644
index b91f431d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-void main()
-{
-	while (*stringcur)
-	{
-#ifdef NO8BIT
-		if (((*bufcur++ ^ *stringcur) & 0x7F) != 0)
-#else /* NO8BIT */
-		if (*bufcur++ != *stringcur)
-#endif /* NO8BIT */ /* Issue #3034 */
-                        break;
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp
deleted file mode 100644
index fe9aed25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-int main()
-{
-  switch (opcode)
-  {
-    case 1:
-      return Number(localeCompare(s, a0.toString(exec)));
-
-#ifndef A
-    case 2:
-      result = String("<big>" + s + "</big>");
-      break;
-#endif
-
-  }
-
-  switch (ev->command)
-  {
-    case (3):
-      ev->note = *ptrdata; ptrdata++; currentpos++;
-      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-      if (ev->vel==0)
-	note[ev->chn][ev->note]=FALSE;
-      else
-	note[ev->chn][ev->note]=TRUE;
-
-#ifdef B
-      if (ev->chn==6) {
-	if (ev->vel==0) printfdebug("Note Onf\n");
-	else printfdebug("Note On\n");
-      };
-#endif
-      break;
-    case (4) :
-#ifdef C
-      if (ev->chn==6) printfdebug("Note Off\n");
-#endif
-      ev->note = *ptrdata;ptrdata++;currentpos++; 
-      ev->vel  = *ptrdata;ptrdata++;currentpos++;
-      note[ev->chn][ev->note]=FALSE;
-
-      break;
-    case (5) :
-#ifdef D
-      if (ev->chn==6) printfdebug ("Key press\n");
-#endif
-      ev->note = *ptrdata;ptrdata++;currentpos++; 
-      ev->vel  = *ptrdata;ptrdata++;currentpos++;
-      break;
-
-#ifndef E
-    case 6:
-      result = String("<big>" + s + "</big>");
-      break;
-#endif
-		}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp
deleted file mode 100644
index 739b1305..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-int main()
-{
-  int af;
-  int A;
-  int B;
-  switch (af)
-    {
-    case 1:
-      B = 2;
-    case 2:
-      return 1;
-    case 3:
-      A = 1;
-      break;
-#ifdef ALL_THE_CASE
-    case 4:
-      return 2;
-#endif
-#ifdef ALL_THE_CASE
-    case 5:
-      B = 2;
-#endif
-    case (6):
-      B=13;
-#ifdef PART_OF_THE_CASE_UNDER
-      A=1;
-#endif
-      break;
-    case (7) :
-#ifdef PART_OF_THE_CASE_ABOVE
-      A=5;
-#endif
-      B=7;
-      break;
-    default:
-      B= 50;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp
deleted file mode 100644
index 678d6ce4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-int main()
-{
-  int sa_family;
-  int d;
-  int scopeid;
-  switch (sa_family)
-    {
-    case 1:
-#ifdef AF_INET6
-      if (d == 1)
-	scopeid = 1;
-      else
-	scopeid = 2;
-      return 5;
-#else
-      return 6;
-#endif
-
-    case 2:
-#ifdef AF_INET6
-      TQString scopeid("%");
-      if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
-	scopeid += TQString::number(d->addr.in6->sin6_scope_id);
-      else
-	scopeid.truncate(0);
-      return d->ref.ipAddress().toString() + scopeid;
-#endif
-
-    case 3:
-#ifdef AF_INET6
-      TQString scopeid("%");
-      if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
-	scopeid += TQString::number(d->addr.in6->sin6_scope_id);
-      else
-	scopeid.truncate(0);
-      return d->ref.ipAddress().toString() + scopeid;
-#endif
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp
deleted file mode 100644
index cb468be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define VTABLE_DECLARE                                            \
-	extern struct vtable_struct_name_macro vtable_base_macro; \
-	struct vtable_struct_name_macro
-
-#define VTABLE_METHOD(retvalue, method, args ...) \
-	retvalue(*method)(args)
-
-VTABLE_DECLARE {
-	VTABLE_METHOD(int, get, const char *name);
-	VTABLE_METHOD(int, set, const char *name, int value);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp
deleted file mode 100644
index 77d0d337..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void func(){
-  parallel_for(0, 100, [&](int aaaaaa, int bbbbbbb, int ccccccc, int ddddddd, const int eee){
-    // do something
-    return a;
-  });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp
deleted file mode 100644
index 2d8b38d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void func()
-{
-  parallel_for(0, 100, [ & ] ( const int i ) {
-    const std::vector<int> values = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
-    return values[i];
-  });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp
deleted file mode 100644
index 85c9b7e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ABC
-#     define ABC
-
-#ifdef XYZ1
-extern "C" {
-#endif
-
-#ifdef XYZ2
-}
-#endif
-
-#endif
-int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp
deleted file mode 100644
index 4d66bbf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef ABC
-#     define ABC
-
-#ifdef XYZ1
-extern "C" {
-#endif
-
-#ifdef XYZ2
-}
-#endif
-
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp
deleted file mode 100644
index f94e88e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-KJS::Value KJS::KateJSViewProtoFunc::call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args)
-{
-  switch (id)
-  {
-    case KateJSView::SetCursorPositionReal:
-      return KJS::Boolean( view->setCursorPositionReal( args[0].toUInt32(exec), args[1].toUInt32(exec) ) );
-
-    // SelectionInterface goes in the view, in anticipation of the future
-    case KateJSView::Selection:
-      return KJS::String( view->selection() );
-  }
-
-  return KJS::Undefined();
-}
-
-void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
-                                 uint &attrCol, bool &unclosedTag)
-{
-  for(pos = 0; pos < len; ++pos) {
-    int ch = text.at(pos).unicode();
-    switch(ch) {
-      case '<':
-        ++numTags;
-        break;
-
-      // don't indent because of DOCTYPE, comment, CDATA, etc.
-      case '!':
-        if(lastCh == '<') --numTags;
-        break;
-
-      // don't indent because of xml decl or PI
-      case '?':
-        if(lastCh == '<') --numTags;
-        break;
-    }
-  }
-}
-
-static YYSIZE_T yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-  {
-    for (;;)
-      switch (*++yyp)
-      {
-        case '\\':
-          if (*++yyp != '\\')
-            yyres[yyn] = *yyp;
-        /* Fall through.  */
-        default:
-          if (yyres)
-            yyres[yyn] = *yyp;
-          yyn++;
-          break;
-      }
-  }
-  return yystpcpy (yyres, yystr) - yyres;
-}
-
-Value RegExpProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args)
-{
-  if (!thisObj.inherits(&RegExpImp::info)) {
-    if (thisObj.inherits(&RegExpPrototypeImp::info)) {
-      switch (id) {
-        case ToString: return String("//"); // FireFox returns /(?:)/
-      }
-    }
-    return err;
-  }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp
deleted file mode 100644
index 2a76b5a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-DCOPClient::DCOPClient()
-{
-	TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this,
-	        TQT_SLOT(processPostedMessagesInternal()));
-	TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp
deleted file mode 100644
index fd369e24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-DCOPClient::DCOPClient()
-{
-	TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this,
-	        TQT_SLOT(processPostedMessagesInternal()));
-	TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp
deleted file mode 100644
index 25906e08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-DCOPClient::DCOPClient()
-{
-	TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this,
-	        TQT_SLOT(processPostedMessagesInternal()));
-	TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout()));
-}
-
-#include <dcopclient.moc>
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp
deleted file mode 100644
index 75c6072b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-auto j = int{0};
-auto j = decltype(int){0};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp
deleted file mode 100644
index 04119de3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()
-{
-    for( unsigned p = 0; p < np;
-         ++p )
-    {
-      double* o = bar[p];
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp
deleted file mode 100644
index 63090f4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#define CONTINUE_IF(expr) { if ((expr)) continue; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp
deleted file mode 100644
index 90084874..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-//we manually indented continuation here to prevent 'reallyLongArgumentName' from crossing 
-//our line length limit
-void ReallyLongClassName::ReallyLongMethondName(int arg1,
-                            int reallyLongArgumentName)
-
-void LongClassName::LongMethondName(int arg1,
-                            int reallyLongArgumentName)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp
deleted file mode 100644
index 05eca611..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-         do                 {
-        xxx = _error;
-     }while(0)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp
deleted file mode 100644
index 9c7f1ee9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-{
-	/*
-	 * test for new lines, everywhere
-	 */
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp
deleted file mode 100644
index 01e7cc97..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    /*
-     * test for new lines, everywhere
-     */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
deleted file mode 100644
index b0e13d6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// test \

-blah()

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp
deleted file mode 100644
index ee6239f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-bool AkonadiServer::quit()
-{
-    QTimer::singleShot(   0, this, SLOT   (   doQuit(   )   )   );
-}
-
-void AkonadiServer::incomingConnection(quintptr socketDescriptor)
-{
-    QPointer<ConnectionThread> thread = new ConnectionThread(socketDescriptor, this);
-    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp
deleted file mode 100644
index d3ef9396..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-bool Handler::failureResponse(const QByteArray &failureMessage)
-{
-    response.setString(failureMessage);
-    Q_EMIT responseAvailable(response);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp
deleted file mode 100644
index 37156618..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void Cache::collection()
-{
-    Q_FOREACH(QString partName, lParts) {
-        a = 5;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp
deleted file mode 100644
index a0fb07d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void Cache::collection()
-{
-    Q_FOREVER{
-        a = 5;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
deleted file mode 100644
index 5a4c8e7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-bool AkonadiServer :: init ()
-{
-    connect ( watcher , SIGNAL( serviceOwnerChanged ( QString,  QString,QString ) ),
-            this, SLOT(serviceOwnerChanged(QString,QString, QString)));
-    return true;
-}
-
-connect(&mapper, SIGNAL(mapped(Q1 &)), this, SLOT(onSomeEvent(const Q2 &)));
-
-connect(&mapper,
-      SIGNAL(mapped(Q1 &)),
-      this,
-      SLOT(onSomeEvent(const Q2 &)));
-
-connect(&mapper,
-      SIGNAL(emitted(Q1 *)),
-      this,
-      SLOT(accept(const Q2 *)));
-
-connect(&mapper,
-      SIGNAL(emitted(X< int >)),
-      this,
-      SLOT(accept(X< int >)));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp
deleted file mode 100644
index ea1c724e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#define inline_2 __forceinline

-#define inline(i) inline_##i

-inline(2) f()

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h
deleted file mode 100644
index 60dc3791..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/**

- * @file Timestamp.h

- * Definition of class example::Timestamp.

- */

-

-#ifndef __Timestamp_h_

-#define __Timestamp_h_

-

-#include <string>

-

-namespace example {

-

-class IStreamable;

-class InStream;

-class OutStream;

-

-/**

- * Timestamp is a timestamp with nanosecond resolution.

- */

-class Timestamp

-  : public IStreamable

-{

-

-public:

-

-  /**

-   * Default constructor.

-   */

-  Timestamp();

-

-  /**

-   * Constructor.

-   *

-   * @param sec   The seconds

-   * @param nsec  The nanoseconds

-   */

-  Timestamp(long sec, unsigned long nsec);

-

-  /**

-   * Destructor.

-   */

-  virtual ~Timestamp();

-

-  /**

-   * Adds two timestamps.

-   *

-   * @param rhs The other timestamp

-   * @return The resulting timestamp

-   */

-  Timestamp operator+ (const Timestamp& rhs) const;

-

-  /**

-   * Substracts two timestamps.

-   *

-   * @param rhs The other timestamp

-   * @return The resulting timestamp

-   */

-  Timestamp operator- (const Timestamp& rhs) const;

-

-  /**

-   * Compares two timestamps.

-   *

-   * @param rhs The other timestamp

-   * @return true if timestamp is smaller than the given timestamp

-   */

-  bool operator< (const Timestamp& rhs) const;

-

-  /**

-   * Compares two timestamps.

-   *

-   * @param rhs The other timestamp

-   * @return true if timestamp is greater than the given timestamp

-   */

-  bool operator> (const Timestamp& rhs) const;

-

-  /**

-   * Compares two timestamps.

-   *

-   * @param rhs The other timestamp

-   * @return true if timestamp is equal to the given timestamp

-   */

-  bool operator== (const Timestamp& rhs) const;

-

-  /**

-   * Compares two timestamps.

-   *

-   * @param rhs The other timestamp

-   * @return true if timestamp is not equal to the given timestamp

-   */

-  bool operator!= (const Timestamp& rhs) const;

-

-  /**

-   * Adds an other timestamp.

-   *

-   * @param rhs The other timestamp

-   */

-  void operator+= (const Timestamp& rhs);

-

-  /**

-   * Adds milliseconds.

-   *

-   * @param ms The milliseconds

-   * @return The resulting timestamp

-   */

-  Timestamp addMilliseconds(unsigned long ms) const;

-

-  /**

-   * Adds nanoseconds.

-   *

-   * @param ns The nanoseconds

-   * @return The resulting timestamp

-   */

-  Timestamp addNanoseconds(unsigned long ns) const;

-

-  /**

-   * Checks if this timestamp is zero.

-   *

-   * @return true if timestamp is zero

-   */

-  bool isZero() const;

-

-  /**

-   * Gets the milliseconds.

-   * @attention Negativ timestamp return zero

-   *

-   * @return The milliseconds

-   */

-  unsigned long getMilliseconds() const;

-

-  /**

-   * Divide timestamps by two.

-   *

-   * @return The resulting timestamp

-   */

-  Timestamp divideByTwo();

-

-  /**

-   * Gets the string-representation.

-   *

-   * @return The string representation

-   */

-  std::string getString() const;

-

-  /**

-   * Gets the string-representation in milliseconds.

-   *

-   * @return The string representation

-   */

-  std::string getStringMilliseconds() const;

-

-  /**

-   * Resets the timestamp.

-   */

-  void reset();

-

-  /** The seconds */

-  long sec;

-

-  /** The nanoseconds */

-  unsigned long nsec;

-

-  InStream& operator << (InStream& in);

-

-  OutStream& operator >> (OutStream& out) const;

-

-};

-} // namespace

-

-#endif // __Timestamp_h_

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp
deleted file mode 100644
index 3228cf2a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-friend class :: GameObject;

-void GameObject :: Foo();

-

-auto x = :: GlobalFunc();

-

-friend void ::testing::  PrintDebugInformationForFakesInUse();

-

-template<class TransferFunction>

-void ::DateTime :: Transfer(TransferFunction & transfer)

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp
deleted file mode 100755
index 9cc7b13f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-//The space shouldn't be removed. This is a STRUCT
-struct ALIGN_TYPE(16) StructName;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp
deleted file mode 100644
index 38ded76c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-if (Application.platform == RuntimePlatform.LinuxEditor)
-{
-    return new ProcessStartInfo("smthg")
-    {
-        Arguments = string.Format ("-9 --ss -S aa \"{0}\"", file),
-        WorkingDirectory = Directory.GetCurrentDirectory(),
-        UseShellExecute = false,
-        CreateNoWindow = true
-    };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp
deleted file mode 100644
index 278cd1a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// This should not be screwing with the trailing backslash and indentation of contents!

-// unless it's on the first line where it's controlled by sp_before_nl_cont which we have set on add.

-// Devs should expect misalignment of the nl_cont tokens because we're not messing with the nl_cont from the define body.

-

-#define MY_DEFINE(param1, param2)\

-	my_long_foo_function(param1);\

-	bar(param2);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp
deleted file mode 100644
index 2f3ad2a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Change in Configuration\UnityConfigure.h:

-

-    #define FOO_MACRO 0 /////@TODO: COMMENT?????

-    // ^^^ space removed after 0

-

-// Foo\Bar\Baz\Fizz\Test.cpp

-

-    #define BAR_MACRO   FOO_BAR_MACRO //FOO_BAR_BAZ_NONE

-    // ^^^ space removed after _MACRO

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp
deleted file mode 100644
index 59635c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Runtime\Allocator\BucketAllocator.cpp

-

-void foo()

-{

-    void* p1 = new(ptr) Block(bucketsSize);

-    // becomes...

-    void* p1 = new(ptr)Block(bucketsSize);

-    // missing space after ')'

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-auto c = a < b >> 1;

-auto c = a < b;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp
deleted file mode 100644
index 2f743294..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace dudeNamespace { class ForwardFooClass; }

-

-namespace dudeNamespace

-{ class ForwardFooClass; }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp
deleted file mode 100644
index c898df76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Asm blocks have their own special indentation where lables must remain at indent 0 relative to __asm__ block.

-// They few ways of being opened and closed depending on the compiler.

-// For now, we can at least detect and ignore the contents, including alignment.

-

-// Workaround: can always fall back on disable/enable_processing_cmt.

-

-void foo()

-{

-	int head, bar;

-	__asm__ __volatile__

-	(

-		"movq %0,%%xmm0\n\t"	/* asm template */

-	"0:\n\t"

-		"bar	%0, [%4]\n\t"	// in template

-	"1:\n\t"

-		: "=a", (bar)

-		: "=&b", (&head), "+m", (bar)

-		: "cc"

-	);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp
deleted file mode 100644
index 0261a306..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Fix doxygen support to include member groups

-

-// See http://www.stack.nl/~dimitri/doxygen/manual/grouping.html#memgroup

-

-// Note that the spec says three slashes, but their example has only two slashes.

-

-// Once this is done, we can try turning on sp_cmt_cpp_start in Uncrustify.Common-CStyle.cfg.

-

-/// Bucket allocator is used for allocations up to 64 bytes of memory.

-/// It is represented by 4 blocks of a fixed-size "buckets" (for allocations of 16/32/48/64 bytes of memory).

-/// Allocation is lockless, blocks are only growable.

-class Class

-{

-public:

-	///@{ Doxygen group 1

-	virtual void*  Foo();

-	virtual void*  Bar();

-	///@}

-

-	//@{ Doxygen group 2

-	virtual void*  Foo();

-	virtual void*  Bar();

-	//@}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp
deleted file mode 100644
index ac2184f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Extern "C" blocks need an alignment option somehow. I can do a "set NAMESPACE extern" in the cfg but that will probably screw other stuff up.

-

-// See External\Audio\NativePluginDemo\NativeCode\TeleportLib.h for an example. Yeah it's in external (so have to force-format it) but it's a good case.

-

-// (Actually it's in https://bitbucket.org/Unity-Technologies/nativeaudioplugins, but just published here to external)

-

-extern "C"

-{

-typedef EXPORT_API int (*Foo)(int arg);

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp
deleted file mode 100644
index 7353e915..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Can't set sp_inside_braces_struct=add otherwise Uncrustify starts applying it to initializers combined with old-C-style struct usage.

-

-struct in_addr addr = {0};

-// ... --> ...

-struct in_addr addr = { 0 };

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp
deleted file mode 100644
index 8a1aab54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Hi,

-// When using "space only" and "indent continue", I notice a wrong indentation in C language (at least)

-// function call when the retrun value is assigned to a variable and the call is split in two or more line.

-// In that case the indent is twice the indent set in "indent_continue"

-// This only appears when "indent_with_tabs" is set to 0 "space only" and 1 

-// "indent with tabs to brace level, align with spaces"

-// Version tested:

-// 0.59: good indentation

-// 0.60: wrong indentation

-// master (sha1 fc5228e): wrong indentation

-// Here are some details about thats issue:

-// orignal code

-// The long line are manually split and not indented to test uncrustify indent

-

-int main (int argc, char *argv[])

-{

-  double a_very_long_variable = test (foobar1, foobar2, foobar3, foobar4,

-  foobar5, foobar6);

-

-  double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +

-  asdfasdfasdf - asdfasdf + 56598;

-

-  testadsfa (dfasdf, fdssaf, dsfasdf, sadfa, sadfas, fsadfa,

-  aaafsdfa, afsd, asfdas, asdfa, asfasdfa, afsda, asfdasfds, asdfasf);

-

-  return 0;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp
deleted file mode 100644
index 770bf0c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// MIDL_INTERFACE includes 'class' in its definition but is not tokenised as such

-// A pretty common pattern would be nice to have proper formatting.

-

-EXTERN_C const IID IID_IFileDialogEvents;

-

-MIDL_INTERFACE("973510db-7d7f-452b-8975-74a85828d354")

-IFileDialogEvents : public IUnknown

-{

-public:

-	virtual HRESULT STDMETHODCALLTYPE OnStuff(

-		/* [in] */ __RPC__in_opt IFileDialog *pfd,

-		/* [in] */ __RPC__in_opt IShellItem *psi,

-		/* [out] */ __RPC__out FDE_SHAREVIOLATION_RESPONSE *pGoodResponse,

-		/* [out] */ __RPC__out FDE_OVERWRITE_RESPONSE *pBadResponse) = 0;

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp
deleted file mode 100644
index 7f042642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// It is deleting the space after the pointer marker
-void foo()
-{
-    extern void BillboardRenderer_RenderMultiple(const RenderBatchedData& renderData, ShaderChannelMask channels);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp
deleted file mode 100644
index 0c40e831..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-floatNx3 randomRotationMatrices[3];
-if (rotationRandomnessX > epsilon() || rotationRandomnessY > epsilon())
-{
-// Parameters are being double indented.
-    floatNx3 rotationEuler = floatNx3(
-        (GenerateRandom(randomSeed + intN(kParticleSystemExternalForcesRotationRandomnessXId)) * 2 - 1) * rotationRandomnessX,
-        (GenerateRandom(randomSeed + intN(kParticleSystemExternalForcesRotationRandomnessYId)) * 2 - 1) * rotationRandomnessY,
-        floatN(ZERO));
-    eulerToMatrix(rotationEuler, randomRotationMatrices);
-
-    toForce = mul(randomRotationMatrices, toForce);
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp
deleted file mode 100644
index 0f177fdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// I want to keeep the function call indented
-Thingy
-    .Select()
-    .ToList();
-
-// it works with a var
-var x = Thingy
-    .Select()
-    .ToList();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp
deleted file mode 100644
index 97940716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// First: scan more FAKE_FUNCTION diffs and see how common this problem is.

-

-// The & should be attached to RefType because it's in a function prototype. Most likely being detected as ARITH.

-

-// We need to figure out how to support this with some setting in our cpp cfg for uncrustify.

-

-FAKE_FUNCTION(Boo, RefType& (void));

-FAKE_FUNCTION(Foo, (MyAwesomeType* (void)));

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp
deleted file mode 100644
index a20f4c43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#if DOXYGEN

-class Class

-#else

-struct Struct

-#endif

-{

-	UInt32	m_myAwesomeMember1 			: kEnumValue

-	UInt32	m_myAwesomeMember11 		: kEnumValue

-	UInt32	m_myAwesomeMember111 		: 1;

-	UInt32	m_myAwesomeMember1111		: 1;

-	UInt32	m_myAwesomeMember11111		: 1;

-	UInt32	m_myAwesomeMember111111 	: 1;

-	UInt32	m_myAwesomeMember1111111 	: 1;

-	UInt32	m_myAwesomeMember11111111 	: kEnumValue

-	UInt32	m_myAwesomeMember11111111 	: kEnumValue

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp
deleted file mode 100644
index e7d9de6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp
+++ /dev/null
@@ -1 +0,0 @@
-typedef HRESULT (WINAPI *Foo)(const void* pData, SIZE_T size, UINT flags, const char* szStr, D3D10BlobHack** ppBlob);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp
deleted file mode 100644
index ef5fe7cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//It is applying double indentation
-m_ApplicationView = AppC::ApplicationView::GetForCurrentView();
-m_ViewConsolidateEvtToken = m_ApplicationView->Consolidated +=
-    ref new AppC::TypedEventHandler<AppC::ApplicationView^, AppC::ApplicationViewConsolidatedEventArgs^>(this, &FrameworkView::InternalOnViewConsolidated);
-
-m_WindowActivatedEvtToken = m_CoreWindow->Activated +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::WindowActivatedEventArgs^>(this, &FrameworkView::InternalOnWindowActivated);
-
-m_SizeChangedEvtToken = m_CoreWindow->SizeChanged +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::WindowSizeChangedEventArgs^>(this, &FrameworkView::InternalOnWindowSizeChanged);
-
-m_VisibilityChangedEvtToken = m_CoreWindow->VisibilityChanged +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::VisibilityChangedEventArgs^>(this, &FrameworkView::InternalOnWindowVisibilityChanged);
-
-m_WindowClosedEvtToken = m_CoreWindow->Closed +=
-    ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::CoreWindowEventArgs^>(this, &FrameworkView::InternalOnWindowClosed);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp
deleted file mode 100644
index 7c64f76a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Pointer mark should be formatted (WINAPI* SetXX)
-typedef DWORD (WINAPI *SetDllDirectory) (LPCSTR);
-// Pointer mark should be formatted (EXCEPTION_POINTERS* pExt)
-static LONG WINAPI CustomUnhandledExceptionFilter(EXCEPTION_POINTERS * pExInfo)
-{
-    if (EXCEPTION_BREAKPOINT == pExInfo->ExceptionRecord->ExceptionCode) // Breakpoint. Don't treat this as a normal crash.
-        return EXCEPTION_CONTINUE_SEARCH;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp
deleted file mode 100644
index a8c5f2df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-struct bar

-{

-    void (Namespace::*method)(Class& param);

-};

-

-void Class::Foo(void (*callback)(const Class& entry))

-{

-}

-

-void foo()

-{

-    int a = 1;  // if you comment this out, the bug stops reproducing

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp
deleted file mode 100644
index bde48ee7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void (*foo)(int);

-static bar(void (*foo)(int))

-{

-}

-

-bool (*comp_func)(const TypeA*const a, const TypeB& value) = NULL;

-static foo(bool (*comp_func)(const TypeA*const a, const TypeB& value));

-static foo(bool (*comp_func)(const TypeA*const a, const TypeB& value) = NULL)

-{

-}

-

-void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const TypeA* lhs, const TypeB& rhs));

-void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const TypeA* lhs, const TypeB& rhs) = NULL)

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp
deleted file mode 100644
index ea406fbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp
+++ /dev/null
@@ -1 +0,0 @@
-typedef std::pair<Type* const, TypeB> Object;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp
deleted file mode 100644
index 991d2631..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void foo()

-{

-    int error = 0;

-#if defined(SUPPORT_FEATURE)

-    error = feature_bar();

-#else // feature not supported

-    // we call bar otherwise

-    error = bar();

-#endif // SUPPORT_FEATURE

-    // continue with function logic

-    if (error != 0)

-    {

-#if 0 // TODO: this is disabled

-        // call final bar

-        error_bar(error);

-#endif

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp
deleted file mode 100644
index 658fba68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend std::ostream& operator<<(std::ostream& os, const ScriptingObjectPtr& o);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp
deleted file mode 100644
index 4b8d1d59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-extern "C" void __declspec(dllexport) GetAccountNameAndDomain(HWND /*hwndParent*/, int string_size, TCHAR * variables, stack_t** stacktop, extra_parameters* /*extra*/)

-{

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp
deleted file mode 100644
index b9ced773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-MergeJSFiles(new string[] {
-    GetDecompressor(),
-    Paths.Combine(buildToolsDir, "UnityConfig"),
-    Paths.Combine(args.stagingAreaData, kOutputFileLoaderFileName),
-}, unityLoader
-);
-
-
-throw new System.Exception(
-    "'Fast Rebuild' option requires prebuilt JavaScript version of Unity engine. The following files are missing: "
-    + (!File.Exists(UnityNativeJs) ? "\n" + UnityNativeJs : "")
-    + (!File.Exists(UnityNativeJs + ".mem") ? "\n" + UnityNativeJs + ".mem" : "")
-);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp
deleted file mode 100644
index b6aa5bd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-A(B(C(
-    D(a |
-        b | c))));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp
deleted file mode 100755
index 5da60d3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// It shouldn't add a space after Unity::Type
-static Object* Produce(const Unity::Type* type, InstanceID instanceID = InstanceID_None, MemLabelId = kMemBaseObject, ObjectCreationMode mode = kCreateObjectDefault);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp
deleted file mode 100644
index a6cf3fc5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void Foo1(BarType& x, void BarFunc());
-
-void Bar()
-{
-	void BarFunc2(BarType& x);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp
deleted file mode 100644
index 1fd5c1fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void Foo(int value)

-{

-    m_Foo[0].prop

-        = m_Foo[1].prop

-            = m_Foo[2].prop

-                = m_Foo[3].prop

-                    = m_Foo[4].prop

-                        = m_Foo[5].prop = value;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp
deleted file mode 100644
index ffa60026..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Regression 1 FAKE_METHOD expands to a function prototype. Could possibly use PROTO_WRAP like for FAKE_FUNCTION

-class Foo

-{

-    FAKE_FUNCTION(Bar, GetBarInfo, const BarInfo &());

-    FAKE_METHOD(Bar, GetBarInfo, const BarInfo &());

-    FAKE_FUNCTION_WITH_LOCAL_NAME(FakeGetCommonScriptingClasses, GetCommonScriptingClasses, const CommonScriptingClasses &());

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp
deleted file mode 100644
index 9151231a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void UNITY_INTERFACE_API XREnvironment::DepthSetNumberOfPointsImpl(

-    IUnityXRDepthDataAllocator* allocator,

-    size_t numPoints)

-{

-}

-

-UnityXRRaycastHit* (UNITY_INTERFACE_API* Raycast_SetNumberOfHits)(

-        IUnityXRRaycastAllocator* allocator,

-        size_t numHits);

-		
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp
deleted file mode 100644
index 701b55b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#if UNITY_DEFER_GRAPHICS_JOBS_SCHEDULE
-void GfxDevice::ScheduleAsyncJob(AsyncCommandJobFunc* jobFunc, GfxDeviceAsyncCommand* cmd, const JobFence& depends, JobBatchDispatcher& dispatcher)
-#else
-JobFence& GfxDevice::ScheduleAsyncJob(AsyncCommandJobFunc* jobFunc, GfxDeviceAsyncCommand* cmd, const JobFence& depends, JobBatchDispatcher& dispatcher)
-#endif // #if UNITY_DEFER_GRAPHICS_JOBS_SCHEDULE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp
deleted file mode 100644
index c4005d7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-class function_ref
-{
-public:
-    template<typename CallableT>
-    function_ref(CallableT &&t) noexcept
-        : m_Ptr((void *)std::addressof(t))
-        , m_ErasedFn([](void *ptr, Args... args) -> ReturnValue
-        {
-            // Type erasure lambda: cast ptr back to original type and dispatch the call
-            return (*reinterpret_cast<std::add_pointer_t<CallableT>>(ptr))(std::forward<Args>(args)...);
-        })
-    {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp
deleted file mode 100644
index f6dba01b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// make sure that we ignore sp_inside_angle=remove if it will cause a digraph to be created

-

-ops.pProgressCallback = reinterpret_cast<      ::ProgressCallback*    >(   progressCallback);

-ops.pProgressCallback = reinterpret_cast< ::ProgressCallback*>(progressCallback);

-ops.pProgressCallback = reinterpret_cast<::ProgressCallback*>(progressCallback);

-ops.pProgressCallback = reinterpret_cast<ProgressCallback*>(progressCallback);

-ops.pProgressCallback = reinterpret_cast<  ProgressCallback*>(progressCallback);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp
deleted file mode 100644
index 3c232dec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ctest4 */
-fm_status fm2000EventHandlingInitialize(fm_int sw);
-fm_status fm2000MacTableOverflowStart(fm_int sw);
-fm_bool fm2000ProcessMATableEntry(                fm_mac_table_work_list *pWork,
-                                                  fm_int sw,
-                                                  fm_int  index,
-                                                  fm_thread *   event_handler,
-                                                  fm_uint32 *    numUpdates,
-                                                  fm_event **event);
-void foo()
-{
-      Logger log = new Logger();
-      Logger log= new Logger( );
- 
-      log.foo.bar    = 5;
-      log.narf.sweat = "cat";
-for (i = 0; i<5; i++) bar(i);
-}
-int this_works(int x);
-int bug(int); // BUG: left-aligned
-typedef int fooman;
- enum FLAGS
-         {
-   FLAGS_decimal  = 1,       // decimal
-  FLAGS_unsigned = 2,       // u or U suffix
- FLAGS_long     = 4,       // l or L suffix
-         };
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp
deleted file mode 100644
index 0ba91720..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-\
-#define CTOR(i, _) : \
- T(X()), \
-    y() \
-{ }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp
deleted file mode 100644
index 2e55d59d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class X16
-{
-X16() = delete;
-public:
-void z(int x = 0);
-virtual void f(int x, int y) = 0;
-int hhi = 9;
-void g(int x = 0);
-int i = 9;
-void x(int ggs = 0);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp
deleted file mode 100644
index 29a7a23a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/** First, the typedefs */
-typedef int MY_INT;
-typedef int * MY_INTP;
-typedef int & MY_INTR;
-typedef CFoo& foo_ref_t;
-typedef int(*foo_t)(void *bar);
-typedef const char *(*somefunc_t)(void *barstool);
-
-/* Now, the types */
-struct foo1 {
- unsigned int d_ino;
- const char *d_reclen;
- unsigned short d_namlen;
- char d_name[1];
- CFoo&fref;
-};
-
-struct foo { int a; char *b };
-
-static   int idx;
-static   const char **tmp;
- CFoo&fref;
-
-static   char buf[64];
-static unsigned long how_long;
-// comment
-static   int **tmp;
-static   char buf[64];
-
-
-void bar(int someval,
-         void *puser,
-         const char *filename,
-         struct willy *the_list,
-         int list_len)
-{
-   int idx;
-   const char **tmp;
-   char buf[64];
-   CFoo&fref;
-
-   unsigned long how_long;
-
-   return(-1);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp
deleted file mode 100644
index f47f0c80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-enum foo // comment
-{
-  long_enum_value, // these comments should be aligned
-  another_value, // with each other, but not
-  shorter, // with the first line
-}; // this comment should start a new group
-void bar(); // this one should align with the previous line
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp
deleted file mode 100644
index 0c816099..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-const int *ptr const = 0;

-    virtual void f1()= 0;

-    virtual void f2()= 0;

-    virtual void f3() const = 0;

-    virtual void f4() const = 0;

-      virtual void f5() = 0;

-       virtual void f6()= 0;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
deleted file mode 100644
index 4b325b1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define MEM_ASSERT1(x) if (!(x)) *  (volatile int *)0 = 1
-#define MEM_ASSERT2(x) if (!(x))*(volatile int*)0 = 1
-#define MEM_ASSERT3(x) if (!(x)) *  (volatile int *)0 = 1;
-#define MEM_ASSERT4(x) if (!(x))*(volatile int*)0 = 1;
-#define MEM_ASSERT5(x) if (!(x)) { *  (volatile int *)0 = 1; }
-#define MEM_ASSERT6(x) if (!(x)) { *(volatile int*)0 = 1; }
-
-#define FOO1(x) while (!(x)) { *  (volatile int*)0 = 1; }
-#define FOO2(x) while (!(x)) *  (volatile int*)0 = 1;
-#define FOO3(x) { *  (volatile int*)0 = 1; }
-#define FOO4(x) *  (volatile int*)0 = 1;
-#define FOO5(x) for(;;) (!(x)) { *  (volatile int*)0 = 1; }
-#define FOO6(x) for(;;) (!(x)) *  (volatile int*)0 = 1;
-#define FOO7(x) do { *  (volatile int*)0 = 1; } while (false);
-
-void foo1(int x) {
-    if (!(x)) *  (volatile int *)0 = 1;
-}
-
-void foo2(int x) {
-    if (!(x))*(volatile int*)0 = 1;
-}
-
-void foo3(int x) {
-    if (!(x)) { *  (volatile int *)0 = 1; }
-}
-
-void foo4(int x) {
-    if (!(x)) { *(volatile int*)0 = 1; }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp
deleted file mode 100644
index 2be3c8e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class foo : public my_Class
-{
-    void bar_c(int tttt, int uu, int abc, int defxx)   : tttt(4444)
-, uu(22) , abc(333) , defxx(55555)
-    {}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp
deleted file mode 100644
index d47e77bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//---------------------------------------------------------------------------

-//    Statics                                                               |

-//---------------------------------------------------------------------------

-void CTdrFile::SetDistanceMode( TDistMode dm )   {   CTdrFile::ms_DistMode = dm;         }

-TDistMode CTdrFile::GetDistanceMode( void )           {   return CTdrFile::ms_DistMode;      }

-String CTdrFile::GetDistanceModeUnits( void )      {   return ( CTdrFile::GetDistanceMode() == dmKM ) ? "km" : "Miles";   }

-void CTdrFile::SetBSTCompensation( bool bUseBST ){   ms_bCompBST = bUseBST;              }

-void CTdrFile::SetFactoryMode( bool bFactory )   {   ms_bFactory = bFactory;             }

-bool CTdrFile::GetFactoryMode( void )            {   return ms_bFactory;                 }

-

-unsigned int CAgentCharacter::iReferenceCount = 0;

-IAgentEx* CAgentCharacter::pAgentEx = NULL;

-CAgentNotifySink* CAgentCharacter::pSink = NULL;

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp
deleted file mode 100644
index 1a22f6d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-struct TelegramIndex
-{
-TelegramIndex(const char* pN, unsigned long nI) :
-pTelName(pN),
-nTelIndex(n)
-{
-}
-
-~TelegramIndex()
-{
-}
-
-const char* const pTelName;
-unsigned long nTelIndex;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp
deleted file mode 100644
index c0c066b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-std::string foo(struct tm* local) {
-    std::stringstream timestamp;
-    timestamp <<
-        (local->tm_year + 1900) << "." <<
-        (local->tm_mon + 1) << "." <<
-        local->tm_mday << "-" <<
-        local->tm_hour << "." <<
-        local->tm_min << "." <<
-        local->tm_sec;
-    return timestamp.str();
-}
-
-std::string foo2(struct tm* local) {
-    std::stringstream timestamp;
-    int year = local->tm_year + 1900;
-    int mon = local->tm_mon + 1;
-    timestamp <<
-        year << "." <<
-        mon << "." <<
-        local->tm_mday << "-" <<
-        local->tm_hour << "." <<
-        local->tm_min << "." <<
-        local->tm_sec;
-    return timestamp.str();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp
deleted file mode 100644
index de21686c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-class B
-{
-public:
-B() = default;
-virtual ~B() = default;
-};
-
-class D1 : public B
-{
-public:
-D1() = default;
-~D1() = default;
-D1(const D1&) = delete;
-D1(D1&&) = delete;
-D1& operator=(const D1&) = delete;
-D1& operator=(const D1&&) = delete;
-};
-
-class D2 : public B
-{
-public:
-D2() = default;
-~D2() override = default;
-D2(const D2&) = delete;
-D2(D2&&) = delete;
-D2& operator=(const D2&) = delete;
-D2& operator=(D2&&) = delete;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp
deleted file mode 100644
index c27ed9d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void foo()
-{
-abc(1,2,3);
-abc(10,20,30);
-abc(100,200,300);
-cab(3,2,1,0);
-brat("foo",2000,3000);
-brat("question",2,-42);
-brat("a",-22, 1);
-while (1)
-{
-brat("foo",2000,3000);
-brat("question",2,-42);
-brat("a",-22, 1);
-}
-brat("foo",2000,3000);
-brat("a",-22, 1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp
deleted file mode 100644
index a90155fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class SomeClass
-{
-    public:
-        // Short parameters
-        TYPE_EXPORT method1(int     a,
-                                     float      b);
-
-        TYPE_EXPORT method2(int&     d,
-                                     float      e);
-
-        TYPE_EXPORT method3(int*     f,
-                   float      g);
-
-        // Parameters with '&' and '*'
-        TYPE_EXPORT method4(int     a);
-        TYPE_EXPORT method5(int         & a);
-        TYPE_EXPORT method6(int    *     a);
-
-        TYPE_EXPORT method7(float     a);
-        TYPE_EXPORT method8(float         & a);
-        TYPE_EXPORT method9(float    * a);
-
-        // Single short and long parameters
-        void method10(int     a);
-        void method11(float         & a);
-        void method12(SomeLongNamespace::SomeLongType       long_parameter_name);
-        void method13(double    * a);
-        void method14(SomeLongType       long_parameter_name);
-
-        // Long parameters
-        void method20(int           * int_param,
-                             SomeLongNamespace::SomeLongType       long_parameter_name,
-                             float  & float_param);
-
-        // Possible bug: different aligning in method21 and method22
-        // align_func_params_span = 1, align_func_params_thresh = 8
-        void method21(SomeLoooooooooooooongType long_param_1,
-            const string& string_param_1,
-                    const TimePoint& time_param,
-            double  double_param_1,
-                    double    double_param_2,
-                const string& string_param_2,
-                  SomeLoooooooooooooongType    long_param_2 );
-        void method22(SomeLoooooooooooooongType long_param_1,
-            const string& string_param_1,
-            double  double_param_1,
-                    double    double_param_2,
-                              const TimePoint& time_param,
-                const string& string_param_2,
-                  SomeLoooooooooooooongType    long_param_2 );
-
-        void method23(int int_param,
-        int * int_ptr_param,
-        float float_param,
-        float & float_ref_param,
-                             SomeLongNamespace::SomeLongType       long_parameter_name,
-           int   * other_int_param,
-                       SomeLooooongType       long_parameter_name,
-                 SomeLoooooooooongType looong_parameter_name,
-                      SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name,
-        int   * int_ptr_param,
-        float float_param,
-        float & float_ref_param,
-        double    & double_param,
-                             SomeLongNamespace::SomeLongType       long_parameter_name,
-                             int * other_int_param);
-
-        // Don't align several parameters in one line
-        void method30(int*     f, char foo,
-                   float      g);
-
-        // Short parameters in method definition
-        void method40(int     a,
-                                     float      b)
-                                     {
-                                        int c;
-
-                                        if ( true ) callProc;
-                                        // do stuff.
-                                    }
-
-        // Long parameters in method definition
-        void method50(int         int_param,
-                             SomeLongNamespace::OtherLongNamespace::SomeLongType       long_parameter_name,
-                             float         float_param,
-                             double double_param,
-                             const string & string_param)
-                             {
-                             doSomething();
-                             }
-
-        void method51(
-        int         int_param,
-                             SomeLongNamespace::OtherLongNamespace::SomeLongType       long_parameter_name,
-                             float         float_param,
-                             double double_param,
-                             const string & string_param)
-                             {
-                             doSomething();
-                             }
-        void increasing_length(
-        int         int_param,
-                             float         float_param,
-                             double double_param,
-                             ah_long_t & string_param,
-                             very_long_type t_param,
-                             even_longer_type l_param)
-                             {
-                             doSomething();
-                             }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp
deleted file mode 100644
index df6b4dca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-class AlignFuncProtoTest {
-  public:
-  void test1();
-  void test2();
-            SomeLongType findSomeLongType();
-  void* test3();
-  void test4(){ a=1;}
-  double test5();
-  void test6();
-            SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType();
-  void test7();
-  void test8();
-  void test9();
-                     SomeLongNamespace::SomeLongType       long_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp
deleted file mode 100644
index b0960a11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-class AlignFuncProtoTest {
-  public:
-  virtual void test1(std::wstring & name, std::pair<Space1::Space2::SomeType, Space1::Space2::otherType> param1) = 0;
-  virtual SomeLongType findSomeLongType()= 0;
-  virtual Some::Type test2() = 0;
-  virtual SomeNameSpace::TypeA test3()= 0;
-  virtual SomeNameSpace::SubNameSpace1::TypeA test4()= 0;
-  virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::TypeB test5()= 0;
-  virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::TypeC test6()= 0;
-  virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::TypeD test7()= 0;
-  double test5();
-  void test6();
-  SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType();
-  void test7();
-  void test8();
-  void test9();
-                     SomeLongNamespace::SomeLongType       long_var;
-  SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::SubNameSpace5::TypeE test7();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp
deleted file mode 100644
index 3cf7a744..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <iostream>
-#define MACRO(x) x
-int main()
-{
- int X[1];
- MACRO(std::cout << X
- << X[0]);
- std::cout << X
- << X;
- std::cout2 << X
- << X;
- std::cout << X
- << X[0];
- std::cout <<
-X <<
-Y;
- std::cout
-<< X
-<< Y;
- std::cout
-<<
-X
-<<
-Y;
-}
-
-#define A_LONG_MACRO_NAME(x) x
-
-void f() {
-        std::cout << "Hello, "
-             << "World!"
-          << std::endl;
-        A_LONG_MACRO_NAME(std::cout << "Hello, "
-                           << "World!"
-                       << std::endl);
-        A_LONG_MACRO_NAME(
-                std::cout << "Hello, "
-                << "World!"
-                << std::endl);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp
deleted file mode 100644
index c90ae71f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-void g()
-{
-    RLOGD(m_log)
-        << "str1"
-        << var;
-
-    if (something)
-        cout << "blah";
-
-}
-
-void f()
-{
-    cout << something(
-        arg);
-    cout
-        << "something";
-    cout <<
-        "something";
-
-    RLOGD(m_log)
-        << "WriteReqSize()";
-
-    RLOGD(m_log) <<
-        base::sprintfT(
-            "something %u ",
-            m_pendingAccepts);
-
-    RLOGDD(m_log) << sprintfT(
-        "something id=%u",
-        newSocket->GetId());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp
deleted file mode 100644
index 43a2a70f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace A
-{
-namespace B
-{
-namespace C
-{
-
-
-struct D
-{
-	int a; // a.
-	int b;
-	int c;
-}; // struct D
-
-
-} // namespace C
-
-
-struct E {};
-
-
-} // namespace B
-
-
-struct F {};
-
-
-} // namespace C
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp
deleted file mode 100644
index 3942f227..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-void testShortTypes()
-{
-// No stars
-float   a;
-double       b;
-
-// All stars
-float& a;
-double&      b;
-
-float * a;
-double    *      b;
-
-float &a;
-double       &b;
-
-// One star before
-double&       a;
-float b;
-
-double        &    a;
-float b;
-
-double            &a;
-float b;
-
-// One star after
-float b;
-double&       a;
-
-float b;
-double        &    a;
-
-float b;
-double            &a;
-}
-
-void testLongTypes()
-{
-int     int_var;
-int   * int_ptr_var;
-int    *int_ptr_var;
-float float_var;
-float   &float_ref_var;
-float & float_ref_var;
-double    &     double_var;
-long_type little_long_var;
-                     SomeLongNamespace::SomeLongType       long_var;
-   int   *  other_int_var;
-               SomeLooooongType       long_var;
-         SomeLoooooooooongType looong_var;
-                     int     int_var;
-              SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_var;
-int   * int_ptr_var;
-float float_var;
-float & float_ref_var;
-double    &     double_var;
-                     SomeLongNamespace::SomeLongType       long_var;
-float float_var;
-    int *                             other_int_var;
-               int                               other_int_var;
-                     int                              *other_int_var;
- int&                              other_int_var;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp
deleted file mode 100644
index fcaf1392..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// how to use digraps:
-// https://en.wikipedia.org/wiki/Digraphs_and_trigraphs
-
-int main(int argc, char *argv[]) <% // {
-int array<:10:>;                    // int array[10];
-%>                                  // }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp
deleted file mode 100644
index 0cf8426d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-enum {
-  E11=0,
-  E12=1,
-  E13=2
-};
-
-enum Enum1 {
-  E21=0,
-  E22=1,
-  E23=2
-};
-
-enum Enum2:int {
-  E31=0,
-  E32=1,
-  E33=2
-};
-
-enum Enum3
-:int {
-  E41=0,
-  E42=1,
-  E43=2
-};
-
-enum:int {
-  E51=0,
-  E52=1,
-  E53=2
-};
-
-enum
-:int {
-  E61=0,
-  E62=1,
-  E63=2
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp
deleted file mode 100644
index 744b3404..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-void asd(void)
-{
-   a < up_lim() ? do_hi() : do_low;
-   a[ a<b>c] = d;
-}
-
-[[nodiscard]] inline static CFErrorRef _Nullable CreateErrorIfError(CFStringRef const inDomain, CFIndex const inCode, CFDictionaryRef const inInformation) {
-[[maybe_unused]] auto const [iterator, inserted]{ super_type::insert(ioFileReference) };
-if (inCode == 0) {
-return nullptr;
-}
-return ::CFErrorCreate(kCFAllocatorDefault, inDomain, inCode, inInformation);
-}
-
-[[gnu::always_inline]] [[gnu::hot]] [[gnu::const]] [[nodiscard]]
-inline int f();
-[[gnu::always_inline, gnu::const, gnu::hot, nodiscard]]
-int f();
-[[using gnu : const, always_inline, hot]] [[nodiscard]]
-int f[[gnu::always_inline]]();
-
-int f(int i) [[expects: i > 0]] [[ensures audit x: x < 1]];
-
-void f() {
-int i [[cats::meow([[]])]];
-int x [[unused]] = f();
-}
-
-int f(int i) [[deprecated]] {
-switch(i) {
-case 1: [[fallthrough]];
-[[likely]] case 2: return 1;
-}
-return 2;
-}
-
-[[
-unused, deprecated("keeping for reference only")
-]]
-void f()
-{
-}
-
-[[noreturn]] void f() [[deprecated("because")]] {
-throw "error";
-}
-
-void print2(int * [[carries_dependency]] val)
-{
-std::cout<<*p<<std::endl;
-}
-
-class X {
-public:
-int v() const { return x; }
-int g() [[expects: v() > 0]];
-private:
-int k() [[expects: x > 0]];
-int x;
-};
-
-class [[foo, bar("baz")]] /**/ Y :private Foo, Bar {
-public:
-int v(int &x) { return x; }
-};
-
-class
-[[foo]]
-[[bar("baz")]]
-Z:Foo, public Bar {
-public:
-int v(int * x) { return *x; }
-};
-
-int g(int* p) [[ensures: p != nullptr]]
-{
-*p = 42;
-}
-
-bool meow(const int&) { return true; }
-void i(int& x) [[ensures: meow(x)]]
-{
-++x;
-}
-
-enum Enum {
-a, b };
-enum class [[foo]] Enum {
-a, b };
-enum struct [[foo]] /**/ [[bar("baz")]] Enum {
-a, b };
-enum [[foo]]
-Enum {
-a, b };
-enum class [[foo]] //
-[[bar("baz")]] Enum {
-a, b };
-enum struct //
-[[bar("baz")]] Enum {
-a, b };
-enum
-[[foo]] [[bar("baz")]] /**/ Enum {
-a, b };
-enum class /**/ [[foo]] [[bar("baz")]]
-Enum {
-a, b };
-enum //
-struct
-[[foo]]
-[[bar("baz")]]
-Enum {
-a, b };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h
deleted file mode 100644
index 7a90197c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-2) There seems to be a problem handling .h-files compared to .cpp-files.
-The following problem only occurs in header-files, in source-files the
-output is as desired.
-*/
-
-static inline void foo()
-{
-//BEFORE:
-if (cond) callFunc();
-// DESIRED:
-if (cond) {
-  callFunc();
-}
-// AFTER:
-if (cond) {callFunc();}
-
-
-/*
-3) The spacing around pointer stars is not always maintained as desired.
-*/
-//BEFORE:
-  Buffer<T>* buffer;
-//AFTER:
-  Buffer<T>*buffer;
-
-
-/*
-4) Inside of casts the types are not formatted as outside.
-*/
-//BEFORE:
-T* t = dynamic_cast<T*>(obj);
-//AFTER:
-T* t = dynamic_cast<T *>(obj);
-
-/*
-5) Inside some template-stuff the spacing goes weird. Multiple spaces
-are inserted, although the configuration (should) say otherwise.
-*/
-//BEFORE:
-for (std::map<Key, Value*>::iterator it = map.begin(); it != map.end(); it++) {
-   bar(it);
-}
-//AFTER:
-for (std::map < Key, Value * > ::iterator it = map.begin(); it != map.end(); it++) {
-   bar(it);
-}
-   }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp
deleted file mode 100644
index b593255b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-class C
-{
-public:
-   size_t f1 : 1;
-   size_t f1:1;
-   size_t f2 : sizeof(size_t) - 1;
-
-Q_SIGNALS:
-   void somesignal();
-};
-
-struct S
-{
-private:
-   size_t f1 : 1;
-   size_t f1:1;
-   size_t f2 : sizeof(size_t) - 1;
-
-Q_SIGNALS:
-   void somesignal();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp
deleted file mode 100644
index 9c7ac70b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-__block __weak void (^ weak_recurseTreeNodes)(int a);
-void (^ strong_recurseTreeNodes)(int a) = ^ (int a) {
-};
-
-the result file:
-Foo^ foo = dynamic_cast<Bar^>(bar);
-Foo* foo = dynamic_cast<Bar*>(bar);
-x = a ^ b;
-int main(Platform::Array<Platform::String^>^ /*args*/)
-{
-}
-
-void (*fun_ptr)(int) = &fun;
-
-typedef void (*foo)(void);
-void (*foo)(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp
deleted file mode 100644
index 7ee7e7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// the file is UTF-8 Unicode (with BOM)
-// Euro character
-€;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp
deleted file mode 100644
index 30d4cb29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-bool foo(char c)
-{
-   if (c == 'a')
-   {
-      return true;
-   }
-   else
-   {
-      return false;
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp
deleted file mode 100644
index ef8b96ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int main()
-{
-	int a0[][] = {{  1  }};
-	unknown_type b0 = {{  2  }};
-	auto c0 = unknown_type  {{  3  }};
-	auto d0 = func( {{  3  }}  );
-	auto e0 = func( unknown_type  {{  3  }}  );
-
-	int a1[][] = {  {1}  };
-	unknown_type b1 = {  {2}  };
-	auto c1 = unknown_type{  {3}  };
-	auto d1 = func({  {3}  });
-	auto e1 = func(unknown_type{  {3}  });
-
-	int a2[][] = {{1}};
-	unknown_type b2 = {{2}};
-	auto c2 = unknown_type{{3}};
-	auto d2 = func({{3}});
-	auto e2 = func(unknown_type{{3}});
-
-	return 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp
deleted file mode 100644
index e245f34c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-#include <vector>
-#include <algorithm>
-
-using some_type = int;
-namespace Ns {
-using some_type = int;
-}
-
-class BracedInitListBase {
-public:
-BracedInitListBase()
-	: a{int{1}},
-	b(int(some_type(1))),
-	c(int{some_type(1)}),
-	d{int(some_type(1))},
-	e{some_type{some_type{a}}}
-{
-}
-
-virtual int getA() const {
-	return a;
-}
-private:
-int a{};
-int b{1};
-int c = {1};
-int d = int{1};
-some_type e{1};
-some_type f = {1};
-some_type g = some_type{1};
-std::vector<some_type> h{some_type{4}, 5};
-::std::vector<some_type> i = ::std::vector<some_type>{4, some_type{5}};
-some_type j = ::std::vector<some_type>{4, some_type{5}}[1];
-some_type k[2]{1, 2};
-some_type l[2] = {1, 2};
-
-union SomeUnion {
-int a;
-some_type b{};
-};
-};
-
-class BracedInitListDerived : public BracedInitListBase {
-public:
-int getA() const override {
-	return BracedInitListBase::getA();
-}
-};
-
-some_type inc(some_type a)
-{
-	return some_type{++a};
-}
-
-some_type sum(some_type a, some_type b = some_type{1})
-{
-	return a + inc(some_type{b - some_type{1}});
-}
-
-void braced_init_list_int()
-{
-	{
-		int a{};
-		int b = {};
-		int c = int{};
-		int d = int{int{}};
-		int{};
-		int{int{}};
-	}
-	{
-		int a{1};
-		int b = {1};
-		int c = int{1};
-		int d = int{int{1}};
-		int{1};
-		int{int{1}};
-	}
-}
-
-void braced_init_list_some_type()
-{
-	{
-		some_type a{};
-		some_type b = {};
-		some_type c = some_type{};
-		some_type d = some_type{some_type{}};
-		some_type{};
-		some_type{some_type{}};
-	}
-	{
-		some_type a{1};
-		some_type b = {1};
-		some_type c = some_type{1};
-		some_type d = some_type{some_type{1}};
-		some_type{1};
-		some_type{some_type{1}};
-	}
-	{
-		::some_type a{1};
-		::some_type b = {1};
-		::some_type c = ::some_type{1};
-		::some_type d = ::some_type{::some_type{1}};
-		::some_type{1};
-		::some_type{::some_type{1}};
-	}
-	{
-		Ns::some_type a{1};
-		Ns::some_type b = {1};
-		Ns::some_type c = Ns::some_type{1};
-		Ns::some_type d = Ns::some_type{Ns::some_type{1}};
-		Ns::some_type{1};
-		Ns::some_type{Ns::some_type{1}};
-	}
-	{
-		::Ns::some_type a{1};
-		::Ns::some_type b = {1};
-		::Ns::some_type c = ::Ns::some_type{1};
-		::Ns::some_type d = ::Ns::some_type{::Ns::some_type{1}};
-		::Ns::some_type{1};
-		::Ns::some_type{::Ns::some_type{1}};
-	}
-}
-
-void braced_init_list_some_type_auto()
-{
-	{
-		auto b = some_type{};
-		auto c = some_type{some_type{}};
-	}
-	{
-		auto a = {1};
-		auto b = some_type{1};
-		auto c = some_type{some_type{1}};
-	}
-	{
-		auto b = ::some_type{1};
-		auto c = ::some_type{::some_type{1}};
-	}
-	{
-		auto b = Ns::some_type{1};
-		auto c = Ns::some_type{Ns::some_type{1}};
-	}
-	{
-		auto b = ::Ns::some_type{1};
-		auto c = ::Ns::some_type{::Ns::some_type{1}};
-	}
-}
-
-void braced_init_list_function_call()
-{
-	{
-		some_type a{sum(some_type{}, some_type{})};
-		some_type b = sum(some_type{}, some_type{});
-		some_type c = some_type{sum(some_type{}, some_type{})};
-		some_type{sum(some_type{}, some_type{})};
-		some_type{some_type{sum(some_type{}, some_type{})}};
-	}
-	{
-		some_type a{sum(some_type{1}, some_type{1})};
-		some_type b = sum(some_type{1}, some_type{1});
-		some_type c = some_type{sum(some_type{1}, some_type{1})};
-		some_type{sum(some_type{a}, some_type{b})};
-		some_type{some_type{sum(some_type{a}, some_type{b})}};
-	}
-	{
-		::some_type a{sum(::some_type{1}, ::some_type{1})};
-		::some_type b = sum(::some_type{1}, ::some_type{1});
-		::some_type c = ::some_type{sum(::some_type{1}, ::some_type{1})};
-		::some_type{sum(::some_type{a}, ::some_type{b})};
-		::some_type{::some_type{sum(::some_type{a}, ::some_type{b})}};
-	}
-	{
-		Ns::some_type a{sum(Ns::some_type{1}, Ns::some_type{1})};
-		Ns::some_type b = sum(Ns::some_type{1}, Ns::some_type{1});
-		Ns::some_type c = Ns::some_type{sum(Ns::some_type{1}, Ns::some_type{1})};
-		Ns::some_type{sum(Ns::some_type{a}, Ns::some_type{b})};
-		Ns::some_type{Ns::some_type{sum(Ns::some_type{a}, Ns::some_type{b})}};
-	}
-	{
-		::Ns::some_type a{sum(::Ns::some_type{1}, ::Ns::some_type{1})};
-		::Ns::some_type b = sum(::Ns::some_type{1}, ::Ns::some_type{1});
-		::Ns::some_type c = ::Ns::some_type{sum(::Ns::some_type{1}, ::Ns::some_type{1})};
-		::Ns::some_type{sum(::Ns::some_type{a}, ::Ns::some_type{b})};
-		::Ns::some_type{::Ns::some_type{sum(::Ns::some_type{a}, ::Ns::some_type{b})}};
-	}
-}
-
-void braced_init_list_function_call_newline()
-{
-	{
-		some_type a{
-			sum(some_type{},
-				some_type{}
-				)
-		};
-		some_type b = sum(
-			some_type{}, some_type{});
-		some_type c = some_type{
-			sum(
-				some_type{}, some_type{})};
-		some_type
-		{sum
-			 (some_type{},
-			 some_type{}
-			 )
-		};
-		some_type
-		{some_type{sum
-			           (some_type{}, some_type{})}};
-	}
-}
-
-void braced_init_list_array()
-{
-	{
-		some_type a[]{};
-		some_type b[] = {};
-		some_type c[] = {{}, {}};
-	}
-	{
-		some_type a[]{1, 2};
-		some_type b[] = {1, 2};
-		some_type c[] = {some_type{1}, some_type{2}};
-	}
-}
-
-void braced_init_list_template()
-{
-	{
-		std::vector<some_type> a{};
-		std::vector<some_type> b = {};
-		std::vector<some_type> c = {{}, {}};
-		std::vector<some_type> d = std::vector<some_type>{};
-		std::vector<some_type> e = std::vector<some_type>{{}, {}};
-		std::vector<some_type> f = std::vector<some_type>{some_type{}, some_type{}};
-		std::vector<some_type>{};
-		std::vector<some_type>{{}, {}};
-		std::vector<some_type>{some_type{}, some_type{}};
-	}
-	{
-		std::vector<some_type> a{1, 2};
-		std::vector<some_type> b = {1, 2};
-		std::vector<some_type> c = std::vector<some_type>{1, 2};
-		std::vector<some_type> d = std::vector<some_type>{some_type{1}, some_type{2}};
-		std::vector<some_type>{1, 2};
-		std::vector<some_type>{some_type{1}, some_type{2}};
-	}
-}
-
-void braced_init_list_lambda()
-{
-	std::vector<some_type> a{1, 2};
-	some_type b{2};
-
-	auto c = []{return true;};
-	auto d = [](){return true;};
-
-	std::find_if(a.begin(), a.end(), [&b](const some_type &v){return v == b;});
-	std::find_if(a.begin(), a.end(), [](const some_type &v){some_type b{2}; return v == b;});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp
deleted file mode 100644
index bfd5ef86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <algorithm>
-#include <type_traits>
-
-template<typename Arg, typename ... Args, typename std::enable_if <!std::is_same<Arg, decltype (std::make_index_sequence<5> { })>::value, int>::type = 0>
-void foo(Arg &&arg, Args && ... args)
-{
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp
deleted file mode 100644
index ca99edc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-char *array_assign[2][4]=

-{

-	{

-		// foo

-		{"foo"},

-		{"foo@1"},{"foo@2"},{"foo@3"}

-	},

-	{

-		// bar

-		{"bar"},

-		{"bar@1"},{"bar@2"},{"bar@3"}

-	}

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp
deleted file mode 100644
index 583c7fa1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class Parser::ParserPrivate { };
-
-template <typename T> class to { };
-
-my $all = { };
-
-enum FocusEffect { };
-
-struct error { };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp
deleted file mode 100644
index b0ce9a06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-template< >
-struct Bar< false > : Foo
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp
deleted file mode 100644
index 713018e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-template< class B1 = void, class B2 = void >
-struct conjunction : bool_constant<B1::value1      &&  B2::value2>
-{
-};
-template< class B1 = void, class B2 = void >
-struct conjunction : bool_constant<B1::value1&&B2::value2>
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp
deleted file mode 100644
index 7495b93d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-class Foo
-{
-public:
-	Foo(
-		int x_,
-		int y_
-	) : x(x_), y(y_)
-	{
-	}
-private:
-	int x;
-	int y;
-};
-
-class Bar
-{
-public:
-	// Splits 3,5 onto newlines
-	Bar() : Bar(3, 5)
-	{
-	}
-
-	// No split here
-	Bar(
-		int x,
-		int y
-	) : foo(x, y)
-	{
-	}
-
-	Foo foo;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp
deleted file mode 100644
index 3287be1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int main()
-{
-        int  b = 3;
-        int* p = &b;
-
-        // Should stay as b * *p
-        int a = b * *p;
-
-        // Correctly formats as a * b;
-        int c = b*a;
-
-        // Correctly formats as d = *p;
-        int d = * p;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp
deleted file mode 100644
index 01a457d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend void ::test::swap< >(future< T >&, future< T >&);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp
deleted file mode 100644
index ec80e915..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void HouseNumberData(Translation const & trans  = Translation { }, Orientation const & orient = Orientation { },  CategoryIds const & cats   = CategoryIds(), std::string const & txt    = std::string { }, bool  active = false);
-           
-void HouseNumberData(Translation const & trans______________, Orientation const & orient______________________,  CategoryIds const & cats_____________________, std::string const & txt___________________, bool active_________);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp
deleted file mode 100644
index 5ccafd2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-int * fn1();
-mytype * fn2();
-myttype<float> * fn3();
-myttype<float> * myclass::fn4();
-myttype * myclass::fn5();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp
deleted file mode 100644
index 80078efe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int variable1 = items_array[index<int>()];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp
deleted file mode 100644
index 74fbc8e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// No extra line added
-void test1()
-{
-	if ( i == 10 )
-		i++;
-}
-
-// No extra line added
-void test2()
-{
-	if ( i == 10 )
-	{
-		i++;
-	}
-}
-
-// No extra line added
-void test3()
-{
-	if ( i == 10 )
-	{
-		if ( j == 10 )
-		{
-			i++;
-		}
-	}
-}
-
-// No extra line added
-void test4()
-{
-	if ( i == 10 )
-	{
-		if ( j == 10 )
-			i++;
-	}
-}
-
-// Extra line added (after Uncrustify)
-void test5()
-{
-	if ( i == 10 )
-		if ( j == 10 )
-		{
-			i++;
-		}
-}
-
-// Extra line added (after Uncrustify)
-void test6()
-{
-	if ( i == 10 )
-		if ( j == 10 )
-			i++;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp
deleted file mode 100644
index 573a9810..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int foo()
-   {
-   const std::map<std::string, int> bar =
-      {
-         { "abcXYZ", -13 },
-      };
-   return 5;
-   }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp
deleted file mode 100644
index e6537641..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-::std::vector<int> & foo();
-std::vector<int> & bar();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp
deleted file mode 100644
index 9ee98743..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <iostream>
-
-template<size_t T>
-class MyFoo
-{
-public:
-   MyFoo()
-   {
-      std::cout << T << std::endl;
-   }
-};
-
-int main()
-{
-   const size_t mySize = INT8_MAX* 2;
-   MyFoo<mySize * 2> foo1;
-   MyFoo<mySize/2> foo2;
-   MyFoo<2*mySize> foo1;
-   MyFoo<2/mySize> foo2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp
deleted file mode 100644
index 369b70f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ABC 123 // Start trailing comment..
-                // ..end with aligned comment.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp
deleted file mode 100644
index 47463232..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-void a()
-{
-               if((tmp == nullptr) ||
-                        ((tmp->type != CT_NUMBER) &&
-                         (tmp->type != CT_SIZEOF) &&
-                         !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-                        (tmp->type == CT_NEWLINE)
-                        )
-               {
-                  set_chunk_type(next, CT_LABEL_COLON);
-               }
-else if ((tmp == nullptr) ||
-                        ((tmp->type != CT_NUMBER) &&
-                         (tmp->type != CT_SIZEOF) &&
-                         !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-                        (tmp->type == CT_NEWLINE)
-                        )
-               {
-                  set_chunk_type(next, CT_LABEL_COLON);
-               }
-
-
-   if                 ((tmp == nullptr) ||
-       ((tmp->type != CT_NUMBER) &&
-        (tmp->type != CT_SIZEOF) &&
-        !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-          (tmp->type == CT_NEWLINE))
-   {
-      set_chunk_type(next, CT_LABEL_COLON);
-   }
-
-   if                 ((tmp == nullptr) ||
-       ((tmp->type != CT_NUMBER) &&
-        (tmp->type != CT_SIZEOF) &&
-        !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-          (tmp->type == CT_NEWLINE)
-
-)
-   {
-      set_chunk_type(next, CT_LABEL_COLON);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp
deleted file mode 100644
index e92da160..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void Class1::Func(void)
-{
-        while (Next()) ;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp
deleted file mode 100644
index 8dc7a9d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-template<typename T1>
-class Class1
-{
-public:
-    status.time_count = duration_cast<::milliseconds>
-        (steady_clock::now().time_since_epoch()).count();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp
deleted file mode 100644
index 535c3be7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Use case from issue #1161
-class test
-{
-   // comment 1 (gets methods)
-   public:
-   // get 1
-   int get1();
-   // get 2
-   int get2();
-
-
-
-
-                          // comment 2 (sets methods)
-                          public:
-                          // set 1
-                          int set1();
-                          // set2
-                          int set2();
-
-};
-
-// Use cases from issue #2704
-class Foo
-{
-public:
-    /// @name Constructors
-    /// @{
-
-        Foo(int value) : value_(value)
-        {}
-
-            /// @}
-
-private:
-    int value_;
-};
-
-class Bar
-{
-public:
-            /*!
-             * @name Constructors
-             * @{
-             */
-
-        Bar(int value) : value_(value)
-        {}
-
-    /*! @} */
-
-private:
-    int value_;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp
deleted file mode 100644
index aa56008a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-class MyClass
-{
-   public:
-   virtual void f1ooooooooooooooo(const int bar);
-   virtual void f2oooooooooooooooo(const int bar);
-   virtual void f3ooooooooooooooooo(const int bar);
-   virtual void f4oooooooooooooooooo(const int bar);
-   virtual void f5ooooooooooooooooooo(const int bar);
-};
-
-virtual void f1oooooooooooooooooo(const int bar);
-virtual void f2ooooooooooooooooooo(const int bar);
-virtual void f3oooooooooooooooooooo(const int bar);
-virtual void f4ooooooooooooooooooooo(const int bar);
-virtual void f5oooooooooooooooooooooo(const int bar);
-
-void foo()
-{
-   std::string s1 = "f1oooooooooooooooooooooooo";
-   std::string s2 = "f2ooooooooooooooooooooooooo";
-   std::string s3 = "f3oooooooooooooooooooooooooo";
-   std::string s4 = "f4ooooooooooooooooooooooooooo";
-   std::string s5 = "f5oooooooooooooooooooooooooooo";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp
deleted file mode 100644
index 35dd772f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template<class CLASS_PARAMETER_0, class CLASS_PARAMETER_1, class CLASS_PARAMETER_2, class CLASS_PARAMETER_3, class CLASS_PARAMETER_4, class CLASS_PARAMETER_5>
-class MyTemplateClass
-{
-public:
-   MyTemplateClass<my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type> foo();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp
deleted file mode 100644
index b9ff78a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp
+++ /dev/null
@@ -1 +0,0 @@
-namespace dudeNamespace { class ForwardFooClass; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp
deleted file mode 100644
index 8acaaed2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-void foo()
-{
-    int head, bar;
-    __asm__ __volatile__
-    (
-        "movq %0,%%xmm0\n\t"    /* asm template */
-    "0:\n\t"
-        "bar\t%0, [%4]\n\t" // in template
-    "1:\n\t"
-        : "=a", (bar)
-        : "=&b", (&head), "+m", (bar)
-        : "cc"
-    );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp
deleted file mode 100644
index 975dc82c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-friend class :: GameObject;
-void GameObject :: Foo();
-
-auto x = :: GlobalFunc();
-
-friend void ::testing::  PrintDebugInformationForFakesInUse();
-
-template<class TransferFunction>
-void ::DateTime :: Transfer(TransferFunction & transfer)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp
deleted file mode 100644
index 94444cf9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend std::ostream& operator<<(std::ostream& os, const ScriptingObjectPtr& o);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp
deleted file mode 100644
index 42663477..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-extern "C" void __declspec(dllexport) GetAccountNameAndDomain(HWND /*hwndParent*/, int string_size, TCHAR * variables, stack_t** stacktop, extra_parameters* /*extra*/)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp
deleted file mode 100644
index 699025fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-int main()
-{
-  auto lambda2 = [&]()
-    {
-        code();
-    };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp
deleted file mode 100644
index 080c9233..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-dookie::wookie << "asd"
-          << "bag"
-                      << "sag";
-
-typedef enum
-{
-        A = 0,
-        B = 1 << 0,
-        C = 1 << 1
-};
-
-enum
-{
-        A = 0,
-        B = 1 << 0,
-        C = 1 << 1
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp
deleted file mode 100644
index c381f91c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <utility>
-
-template <typename Fun, typename ... Args>
-inline decltype(auto) Invoke(Fun&& f, Args&&... args)
-  noexcept(noexcept(std::forward<Fun>(f)(std::forward<Args>(args) ...)))
-{ return std::forward<Fun>(f)(std::forward<Args>(args) ...); }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp
deleted file mode 100644
index 5df154f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-        for (i = 0; i < 10; i++)
-        {
-                b = i + 1;
-        }
-        for (;;)
-        {
-                b = b + 1;
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp
deleted file mode 100644
index 04b4cd8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-/* *INDENT-OFF* */
-printf("Hello World!\n"); 
-
-
-//test
-/* *INDENT-ON* */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp
deleted file mode 100644
index 680d6d51..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-double t               = 111; 
-double t1                         = 222; 
-double t123 = 333;
-
-
-auto f = [](double x) -> double
-         {
-             double t                          = 1111;
-             double t1              = 1222;
-             double t123 = 1333;
-         };
-
-
-std::transform(v1.begin(), v1.end(), v2.begin(),
-               [](double x) -> double
-               {
-                   double t = 2111;
-                   double t1                       = 2222;
-                   double t123            = 2333;
-               }; );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h
deleted file mode 100644
index 21fe1c44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h
+++ /dev/null
@@ -1,10 +0,0 @@
-typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type dummy(const std::function<T*(const S&)>& pFunc, const QVector<S>& pItems)
-{
-	return QVector<T>();
-}
-
-
-typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type filter(const std::function<bool(const T&)>& pFunc, const QVector<T>& pItems)
-{
-	return QVector<T>();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp
deleted file mode 100644
index aa1938e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-uint8_t a[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t b[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t c[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t d[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t e[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-uint8_t f[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp
deleted file mode 100644
index 00694ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-Type tmp = call_function(getObj().x,
-                getObj().y,
-        getObj().z,
-                                     getObj().w);
-getObj().result = tmp;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp
deleted file mode 100644
index 9b001a44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Constants
-{
-double PI = 3.14;
-}
-int factor = 41;
-double result = Constants::PI * factor;
-
-return Constants::PI * factor;
-
-void func(int value) {
-    return SomeClass(value, Constants::PI * value);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp
deleted file mode 100644
index 71f67f75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int main()
-{
-float x;
-float y;
-float result(1 + x*y);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp
deleted file mode 100644
index 575a21c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void set();
-vector<int> get();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp
deleted file mode 100644
index d560522b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-struct A;
-struct B;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp
deleted file mode 100755
index d7fcf753..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-struct foobar {
-    char *foobarz() { return "foobar"; }
-    char *foo_bar() { return "foo_bar"; }
-
-    int foo;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp
deleted file mode 100644
index 5170b9a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <type_traits>
-
-template <
-    typename... Args,
-    typename E = typename std::enable_if<(sizeof...(Args) >= 1), bool>::type
->
-void fun1(Args&& ...args)
-{
-}
-
-template <
-    typename... Args,
-    typename E = typename std::enable_if<(sizeof...(Args) > 1), bool>::type
->
-void fun2(Args&& ...args)
-{
-}
-
-template <
-    typename... Args,
-    typename E = typename std::enable_if<(sizeof...(Args) < 3), bool>::type
->
-void fun3(Args&& ...args)
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp
deleted file mode 100644
index 9e4e47d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-decltype(i * d) prod = i * d;
-decltype(i + d) sum;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp
deleted file mode 100644
index 4ab5eea8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Foo()
-noexcept ()
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp
deleted file mode 100644
index 795bb572..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-using value_type = int;
-using reference = value_type &;
-using const_reference = const value_type &;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp
deleted file mode 100644
index 2d5d1204..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <string>
-
-std::string foo()
-{
-   return std::string{"abc"};
-}
-int main()
-{
-   const std::string&& name1 = foo();
-   std::string&& name2 = foo();
-
-   const auto&& name3 = foo();
-   auto&& name4 = foo();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp
deleted file mode 100644
index a1adcf5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class X14
-{
-public:
-X14();
-~X14() = default;
-X14(const X14& rhs) = default;
-X14& operator=(const X14& rhs) = default;
-X14(X14&& rhs) = delete;
-X14& operator=(X14&& rhs) = delete;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp
deleted file mode 100644
index b324fbda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-int main()
-{
-
-for(int f=0; f < 1; f++)
-{
-	auto a = int{1};
-}
-
-return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp
deleted file mode 100644
index b0f35107..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-for(int f=0; f<(Element::nf)*2; f++)
-{
-	if (f%2==1) p = p-1;
-	{
-		this->pInterpolation[i]=p;
-		this->cInterpolation[i]=0.;
-		this->dofInterpolation[i]=e+f;
-		this->coefInterpolation[i]=1.;
-		i++;
-		p++;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp
deleted file mode 100644
index 29cc2774..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp
+++ /dev/null
@@ -1 +0,0 @@
-while (*p++ = ' ') ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp
deleted file mode 100644
index 78958bb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#if _MSC_VER < 1300
-#define __func__    "???"
-#else  /* comment 1 */
-#define __func__    __FUNCTION__
-#endif  /* comment 2 */
-
-#if _MSC_VER < 1300
-#define __func__    "???"
-#else  // comment 1
-#define __func__    __FUNCTION__
-#endif  // comment 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp
deleted file mode 100644
index 14a85090..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class __attribute__ ((visibility ("default"))) Test
-{
-public:
-Test() : member1(), member2()
-{
-}
-
-private:
-int member1;
-int member2;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp
deleted file mode 100644
index f9768c40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void main()
-{
-    if (foo()) { bar(); }
-    else if (baz({ rick, morty })) { anime(); }
-    else if (a) while (true) { amime2(); }
-    else if (b) do { amime3(); } while(false);
-    else if (c) for(;;) { amime5(); }
-    else if (d) while(true) {}
-    else if (e) do {} while(false);
-    else if (f) for(;;) {}
-    else { amime6(); }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp
deleted file mode 100644
index 26444ad3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-class CMyClass
-{
-	CMyClass( int a = 0, int b = 0 );
-};
-
-class CMyClass2
-{
-	CMyClass2( int a = 0, int b = 0 );
-	CMyClass2( int a = 0 );
-};
-
-class CMyClass3
-{
-	CMyClass3( int a, int b = 0 );
-	CMyClass3( int a = 0 );
-};
-
-class CMyClass4
-{
-	CMyClass4( int a = 0, int b = 0 );
-	CMyClass4( short aa = 0, char * p = 0 );
-};
-
-class CMyClass5
-{
-	CMyClass5() = default;
-	CMyClass5( int a = 0, int b = 0 );
-	CMyClass5( short aa = 0, char * p = 0 );
-};
-
-class CMyClass6
-{
-	CMyClass6( const CMyClass6& ) = default;
-	CMyClass6( int a = 0, int b = 0 );
-	CMyClass6( short aa = 0, char * p = 0 );
-};
-
-class CMyClass7
-{
-	virtual void foo( const void* p = nullptr ) = 0;
-	CMyClass7( int a = 0, int b = 0 );
-	CMyClass7( short aa = 0, char * p = 0 );
-};
-
-class CMyClass8
-{
-	CMyClass8( int a = 0, int b = 0 );
-	CMyClass8( short aa = 0, char * p = 0 );
-	virtual void foo( const void* p = nullptr ) = 0;
-};
-
-class CMyClass9
-{
-	CMyClass9( int a = 0, int b = 0 );
-	CMyClass9( short aa = 0, char * p = 0 );
-	virtual void foo( const void* = nullptr ) = 0;
-};
-
-class CMyClassA
-{
-	CMyClassA( int a = 0, int b = 0 );
-	CMyClassA( short aa = 0, char * p = 0 );
-	virtual void foo( const void* /* p */ = nullptr ) = 0;
-};
-
-class CMyClassB
-{
-	CMyClassB( int a = 0, int b = 0 );
-	CMyClassB( short aa = 0, char * p = 0 );
-	virtual void foo( const void* /* p */ = NULL ) = 0;
-};
-
-#define UNUSED(x)
-
-class CMyClassC
-{
-	CMyClassC( int a = 0, int b = 0 );
-	CMyClassC( short aa = 0, char * p = 0 );
-	virtual void foo( const void* UNUSED(p) = NULL ) = 0;
-};
-
-class CMyClassD
-{
-	CMyClassD( int a = 0, int b = 0 );
-	CMyClassD( short aa = 0, char * p = 0 );
-	virtual void foo( const std::string s = "" ) = 0;
-};
-
-class CMyClassE
-{
-	CMyClassE( int a = 0, int b = 0 );
-	CMyClassE( short aa = 0, char * p = 0 );
-	virtual void foo( const std::string s = std::string() ) = 0;
-};
-
-class CMyClassF
-{
-	CMyClassF( int a = 0, int b = 0 );
-	CMyClassF( short aa = 0, char * p = 0 );
-	virtual void foo( const CString& s = _T( "" ) ) = 0;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp
deleted file mode 100644
index 92731c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void
-h1(const int a)
-{
-   switch (a)
-   {
-      case 1: {callFunction(a); break;}
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp
deleted file mode 100644
index d19718f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace A {
-namespace S {
-class C
-{
-};
-}  // namespace S
-}; // namespace A
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp
deleted file mode 100644
index 9da12944..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-void f();
-namespace A {
-void f2();
-namespace S {
-void f3();
-class C
-{
-};
-void f4();
-} // namespace S
-void f5();
-} // namespace A
-void f6();
-namespace E
-{
-void f7();
-class D
-{
-};;
-void f9();
-};
-void f10();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp
deleted file mode 100644
index 1339ede1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-inline T* * someFunc(foo** p, bar&& q)
-{
-}
-
-inline T && someFunc(foo * *p, bar && q)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp
deleted file mode 100644
index 753d9519..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// comment
- void
-func( dbgTrace, (void) );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp
deleted file mode 100644
index 03c4a828..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-//comment
-void argvInter( int argc, char* argv[], Config * config );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp
deleted file mode 100644
index 4c582e86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-   TestId::TestId( char* name ) :
-      n_( ( char* )name )
-   {
-      n_( (char*)name );
-   }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp
deleted file mode 100644
index 4865da64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-void Tst::test( Msg* message_p )
- {
- switch (message_p)
- {
- case A:
- {
- const table* entry2 = findMsg( message_p );
- table* entry3 = findMsg( message_p );
- }
- break;
-
- case B:
- const table* entry2 = findMsg( message_p );
- table* entry3 = findMsg( message_p );
- break;
-
- default:
- break;
- }
- }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp
deleted file mode 100644
index 382beced..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void baz()
-{
-        foobar= bar[a + b + (c
-        + d)];
-
-        foobar = bar(a + b + (c +
-        + d));
-
-        foo = bar[a] + b + qux(c +
-        + d);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp
deleted file mode 100644
index f356c302..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void f()
-{
-toto
-foo1(int);    
-toto
-foo2(bar);
-int
-foo3;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp
deleted file mode 100644
index 38253f15..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-void foo(void)
-{
-int a = 0, b = 0;
-char chvar = 0, var = 0;
-
-a = 0;
-b = 0;
-chvar = 0;
-var = 0;
-}
-
-void bar(void)
-{
-int a = 0;
-int b = 0;
-char chvar = 0;
-char var = 0;
-
-a = 0;
-b = 0;
-chvar = 0;
-var = 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp
deleted file mode 100644
index e110d383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-static inline auto myFunc(MyType const& myValue)
-->std::string
-
-static inline std::string myFunc(MyType const& myValue)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp
deleted file mode 100644
index 5b672b47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-typedef void (*func)();
-typedef void (__stdcall *func)();
-
-class CDataObject : public IDataObject
-{
-public:
-    // IUnknown members
-    HRESULT __stdcall QueryInterface(REFIID iid, void ** ppvObject);
-    ULONG __stdcall AddRef(void);
-    ULONG __stdcall Release(void);
-
-    // IDataObject members
-    HRESULT __stdcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __stdcall GetDataHere(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __stdcall QueryGetData(FORMATETC *pFormatEtc);
-    HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC *pFormatEct,  FORMATETC *pFormatEtcOut);
-    HRESULT __stdcall SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease);
-    HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc);
-    HRESULT __stdcall DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *, DWORD *);
-    HRESULT __stdcall DUnadvise(DWORD dwConnection);
-    HRESULT __stdcall EnumDAdvise(IEnumSTATDATA **ppEnumAdvise);
-
-    // exercise others
-    HRESULT __cdecl GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __clrcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __fastcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __thiscall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-    HRESULT __vectorcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp
deleted file mode 100644
index febbf7b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-__attribute__((visibility ("default"))) NSString* i;
-extern "C" NSString* i;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp
deleted file mode 100644
index 55e3e309..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class test_Dummy
-    : public QObject
-{
-    Q_OBJECT
-    test_Dummy* settings = nullptr;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp
deleted file mode 100644
index b36e182a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-int a ()
-{
-  double a_very_long_variable = test (foobar1,
-  foobar5);
-
-  double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-  asdfasdfasdf - asdfasdf + 56598;
-
-  a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-  asdfasdfasdf - asdfasdf + 56598;
-
-  testadsfa (dfasdf,
-  aaafsdfa);
-
-  return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp
deleted file mode 100644
index 1bf853d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- *
- **Some comment
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp
deleted file mode 100644
index 8baaeb1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-A( b, c, d);
-connect(&mapper, SIGNAL(mapped(Q1 &)), this, SLOT(onSomeEvent(const Q2 &)));
-connect(&mapper,
-      SIGNAL(mapped(Q1 &)),
-      this,
-      SLOT(onSomeEvent(const Q2 &)));
-A( b, c, d);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp
deleted file mode 100644
index 230b96b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp
+++ /dev/null
@@ -1 +0,0 @@
-class NewClass: public OldClass/*somecomment*/, public SomeClass;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp
deleted file mode 100644
index f8b0f8a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-///foo
-///<foo
-//!foo
-//!<foo
-
-//@{
-//@}
-
-///@{
-///@}
-
-//!@{
-//!@}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp
deleted file mode 100644
index 869320c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define SOME_MACRO TemplateClass<T>
-int i;
-#if defined(_MSC_VER)
-    #if _MSC_VER < 1300
-        #define __func__ "unknown function"
-    #else
-        #define __func__ __FUNCTION__
-    #endif /* _MSC_VER < 1300 */
-#endif /* defined(_MSC_VER) */
-
-#define bug_demo        (1 > 2) ? (1 : 2)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp
deleted file mode 100644
index 148201b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-bool dllInit = 
-    []()
-//34567890
-{
-}();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp
deleted file mode 100644
index 00adec83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-bool test()
-{
-    if ( true )
-    {
-        i = 10;
-    }
-    else
-        if ( true )
-        {
-            i = 10;
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp
deleted file mode 100644
index e9229a8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-//3456789=123456789=123456789=123456789=123456789=123456789=12
-std::map<int, std::string> FOO::foo(int key, std::string value)
-{
-    return std::map<int, std::string>(key, value);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h
deleted file mode 100644
index ea503b10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//3456789=123456789=123456789=123456789=123456789=123456789=12
-std::map<int, std::string> FOO::foo(int key, std::string value);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h
deleted file mode 100644
index 8ff7bfca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define FOO_MAX 10
-
-bool foo[FOO_MAX];
-
-void
-foo_bar( int a,
-           int* b,
-             bool foo[FOO_MAX] );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp
deleted file mode 100644
index 512d2e45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-enum {
-    item1=123,
-    item2 // comment 2
-}
-
-enum
-{
-    item3,
-    item4, // comment 4
-}
-enum { x, y };
-enum { x, y=0 };
-enum { x, y=0 /*comment*/ };
-enum { x, y,};
-enum { x, y=0,};
-enum { x, y=0,/*comment*/ };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp
deleted file mode 100644
index eb51f587..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// unc_add_option("sp_cond_colon", UO_sp_cond_colon, AT_IARF,
-//                "Add or remove space around the ':' in 'b ? t : f'");
-// unc_add_option("sp_cond_question", UO_sp_cond_question, AT_IARF,
-//                "Add or remove space around the '?' in 'b ? t : f'");
-
-
-void detect_options(void)
-{
-	detect_space_options();
-}
-
-int i = 0;
-
-//a
-void a(){ return 0; }
-
-//0
-/*b*/
-void b(){ return 0; }
-
-/*0*/
-//c
-void c(){ return 0; }
-
-
-//d
-//d
-//d
-void d(){ return 0; }
-
-//0
-
-//h
-//h
-void h(){ return 0; }
-
-/*0*/
-/*e*/
-void e(){ return 0; }
-
-void f(){ return 0; }
-
-int i = 0;
-void g(){ return 0; }
-
-void i(){ return 0; }
-void j(){ return 0; }
-void k(){ return 0; }
-
-//0
-
-void l(){ return 0; }
-
-/*
- * 0
- */
-
-void m(){ return 0; }
-
-/*
- * n
- * n
- * n
- */
-void n(){ return 0; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp
deleted file mode 100644
index 06da6b3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-int main()
-{
-	// Newline inserted between '}' and ')'
-	v.push_back({ 2, 3.0 });
-        v.push_back({ 2, 3.0 }
-                    );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp
deleted file mode 100644
index e86698fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp
+++ /dev/null
@@ -1 +0,0 @@
-struct A {int a;};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp
deleted file mode 100644
index bc7e687f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-class STDMETHOD
-{
-STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp
deleted file mode 100644
index ea141156..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-class ATL_NO_VTABLE CProxy :
-    public ATL::CComCoClass<CProxy, &CLSID_Proxy>
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp
deleted file mode 100644
index 294e3afb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int main()
-{
-    int foo = 42;
-    switch (foo) {
-    case  1:
-        std::cout << "1" << std::endl;
-        break;
-    case                 2:
-        std::cout << "2" << std::endl;
-        break;
-    default:
-        std::cout << "Neither 1 nor 2." << std::endl;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp
deleted file mode 100644
index eda9b0dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace shark {
-    template<class Closure>
-    struct indexed_iterator {
-        typedef typename boost::mpl::if_<
-                boost::is_const<
-                    Closure
-                >,
-                typename Closure::const_reference,
-                typename Closure::reference
-        >::type reference;
-    };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp
deleted file mode 100644
index b3b51488..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-if(X == Y) X = Z;
-if(Y == Z)
-    Y = X;
-
-for (i=0; i<5; i++) foo(i);
-for (i=0; i<5; i++)
-    foo(i);
-
-while (i<5) foo(i++);
-while (i<5)
-    foo(i++);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp
deleted file mode 100644
index 647570f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class settings final
-{
-public:
-settings();
-~settings(  );
-settings(const settings&);
-settings & operator=(const settings&);
-void set_something(const std::string& p_settings_name);
-void set_another_setting(const std::string& p_settings_name);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp
deleted file mode 100644
index 857d48f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-QString fileName = QFileDialog::getOpenFileName(this,
-tr("Choose Configuration File"), ui->leStrategyFile->text(),
-tr("Configuration Files (*.cfg);; All Files (*.*)"), 0);
-
-pSettings = new QSettings(QCoreApplication::applicationDirPath() + "/" +
-QCoreApplication::applicationName() + ".ini",
-QSettings::IniFormat);
-}
-int a ()
-{
-  double a_very_long_variable = test (foobar1,
-  foobar5);
-
-  double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-  asdfasdfasdf - asdfasdf + 56598;
-
-  a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-  asdfasdfasdf - asdfasdf + 56598;
-
-  testadsfa (dfasdf,
-  aaafsdfa);
-  return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp
deleted file mode 100644
index 2a4e6b8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-        connect( timer, SIGNAL( timeout( ) ), this, SLOT( timeoutImage( ) ) );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp
deleted file mode 100644
index 3c5951a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-0B8h
-__asm
-{
-        mov al, 0B8h
-   mov al, 2
-   mov dx, 0xD007
-   out dx, al
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp
deleted file mode 100644
index 3b4de434..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-template<typename       TType>
-class TTypeSpecialization1<TType>
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp
deleted file mode 100644
index d0773475..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-EXEC SQL BEGIN DECLARE SECTION;
-    static char    *tbuf;
-EXEC SQL END DECLARE SECTION;
-
-void myfunc1()
-{
-    exec sql execute immediate :tbuf;
-}
-
-void myfunc2()
-{
-    EXEC SQL EXECUTE IMMEDIATE :tbuf;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp
deleted file mode 100644
index 5a0704de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-char *array_assign[2][4]=
-{
-    {
-        // foo
-        {"foo"},
-        {"foo@1"},{"foo@2"},{"foo@3"}
-    },
-    {
-        // bar
-        {"bar"},
-        {"bar@1"},{"bar@2"},{"bar@3"}
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp
deleted file mode 100644
index 7b93e223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-enum { // Keep this line as it is. It's a regression test for checking pc->prev->prev-> on CT_BRACE_OPEN.
-  kEnumValue = 5,
-};
-
-struct foo
-{
-  int bar : kEnumValue;
-  int pad : 3;
-};
-
-class cls
-{
-  int bar : kEnumValue;
-  int pad : 3;
-
-  void func()
-  {
-    goto end;
-    bar = 1;
-    end:
-    pad = 2;
-  }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp
deleted file mode 100644
index 3ef21f1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void Foo::doo()
-{
-    m_stackCache[m_currentStackNr]->operator [](0) = new QStandardItem(QString::number(m_currentStackNr));
-    m_stackCache[m_currentStackNr]->operator [](1) = new QStandardItem(tr("OK"));
-    m_stackCache[m_currentStackNr]->operator [](2) = new QStandardItem("0");
-    m_stackCache[m_currentStackNr]->operator [](3) = new QStandardItem("0");
-    m_stackCache[m_currentStackNr]->operator [](4) = new QStandardItem();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp
deleted file mode 100644
index 88f77e34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "child.h"
-int main(int argc, char*argv[]) {
-    (void)argc;
-    (void)argv;
-    Child child;
-    for (auto &attribute : * child.GetAttributes()) {
-        std::cout << attribute << std::endl;
-    }
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp
deleted file mode 100644
index f89b6416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp
+++ /dev/null
@@ -1 +0,0 @@
-friend class ::MultiLabelMeshPipeline;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp
deleted file mode 100644
index 2a473bc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-void test()
-{
-    switch ( n )
-    {
-        case 1:
-            std::cout << "1";
-            break;
-
-        case 2:
-            {
-                std::cout << "2";
-            }
-            break;
-
-        case 3:
-            { std::cout << "3"; }
-            break;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp
deleted file mode 100644
index 00adec83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-bool test()
-{
-    if ( true )
-    {
-        i = 10;
-    }
-    else
-        if ( true )
-        {
-            i = 10;
-        }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h
deleted file mode 100644
index 8f1fc31f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h
+++ /dev/null
@@ -1,4 +0,0 @@
-void foo()

-{

-    return [=](T* t) {  };

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp
deleted file mode 100644
index 0f9e8155..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-struct S { static if (false) void bar() { }; }
-
-struct S { static if (false) { void bar() { }; } }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp
deleted file mode 100644
index b0b77452..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int a()
-{
-    for(QStringList::const_iterator codesIt = _codes.constBegin(); codesIt != _codes.constEnd(); ++codesIt) {
-        if(     // Current codes enough to compare:
-                ( ( *codesIt ).size() <= strId ) ||
-                // Character on this slot was not readable:
-                ( ( *codesIt ).at( strId ) == m_wildcard ) ||
-                // This character is matching:
-                ( code.at( strId ) == ( *codesIt ).at( strId ) ) ) {
-            // Ignore this slot:
-            continue;
-            }
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp
deleted file mode 100644
index 07cc31fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void Test::init()
-{
-    connect( m_ppcCom,
-        SIGNAL( sigReceivedBundle(QString) ),
-        SLOT( doProcessBundle(QString) ) );
-    connect( m_ppcCom,
-        SIGNAL( sigReceivedBundle          ),
-        SLOT( doProcessBundle ) );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp
deleted file mode 100644
index 6777bfa5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-static void h()
-{
-   typedef int           IntGroup;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp
deleted file mode 100644
index d3f89db7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void a()
-{
-    int i = 0;
-    int h = 0h;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp
deleted file mode 100644
index 270f0695..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-a::b c()
-{
-mapped_file_source abc((int) CW1A(sTemp));
-mapped_file_source abc((int) ::CW2A(sTemp));
-mapped_file_source abc((int) A::CW3A(sTemp));
-}
-
-boost::iostreams::mapped_file_source pdf((LPSTR) ATL::CW2A(sTemp));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp
deleted file mode 100644
index d2878656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Test1 { namespace Test {
-
-CodeConstructor::CodeConstructor()
-{
-}
-
-CodeConstructor::getSomething()
-{
-    return 0;
-}
-
-}}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h
deleted file mode 100644
index b13997a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-void function(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp
deleted file mode 100644
index 2a5d64a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-template< class T, unsigned N = 0 >
-constexpr unsigned long extent_v = extent< T, N >::value;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp
deleted file mode 100644
index 08f7888e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    // test if no split is possible
-    aaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccddddddddddddd;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp
deleted file mode 100644
index 4666e464..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int&aa(int&x,int&b);   // Sp Before Byref Func, Sp After Byref Func, Sp Before Byref, Sp After Byref
-int aa(int&x,int&)     // Sp Before Byref, Sp Before Unnamed Byref, Sp After Byref
-{
-	b = aa(x,b);
-	c = aa(&y,&d);     // Sp Addr
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp
deleted file mode 100644
index 28da2d74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-void test(void) {
-	auto const ic = 1;
-	auto iv = 1;
-	auto const & ric = ic;
-	auto & riv = iv;
-	const auto & ric2 = ic;
-	if (auto const & r(ric); r > 0) {
-	}
-	if (auto & r(riv); r > 0) {
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp
deleted file mode 100644
index 85669bc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-bool foo(int & idx)
-{
-   if (idx < m_count)
-   {
-      idx++;
-      return m_bool[idx-1];
-   }
-   return false;
-}
-
-class Foo {
-public:
-   Foo();
-   Foo(const Foo& f);
-};
-
-class NS::Foo {
-public:
-Foo(Bar & b);
-};
-
-template<  class T >  class ListManager
-{
-protected:
-   T head;
-
-public:
-   ListManager()
-   {
-      head.next = head.prev = &head;
-   }
-
-   ListManager(const ListManager& ref)
-   {
-      head.next = head.prev = &head;
-   }
-}
-
-const Foo & Foo::operator ==(Foo& me){
-   ::sockaddr* ptr = (::sockaddr*)&host;
-   return me;
-}
-
-MyType& MyClass::myMethode() {
-  const MyType& t = getSomewhere();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp
deleted file mode 100644
index 11f92ee3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-void bar()
-{
-	foo(42, {1, 2, 3, 4});
-	foo(42,
-	    {1, 2, 3, 4});
-
-	foo(42, vector{1, 2, 3, 4});
-	foo(42,
-	    vector{1, 2, 3, 4});
-	foo(42, vector
-	    {1, 2, 3, 4});
-
-	foo(42, vector<int>{1, 2, 3, 4});
-	foo(42,
-	    vector<int>{1, 2, 3, 4});
-	foo(42, vector<int>
-	    {1, 2, 3, 4});
-	foo(42, vector
-	    <int>{1, 2, 3, 4});
-
-	foo(42, decltype(something){1, 2, 3, 4});
-	foo(42,
-	    decltype(something){1, 2, 3, 4});
-	foo(42, decltype(something)
-	    {1, 2, 3, 4});
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp
deleted file mode 100644
index 421ff658..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-int SomeClass::method()
-{
-  switch (1) {
-  case 0:
-  {
-    double v;
-    break;
-  }
-
-  case 1:
-  {
-    double v;
-    v = this->mat.operator()(0, 0);
-    break;
-  }
-
-  case 2:
-  {
-    foo();
-  }
-  }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp
deleted file mode 100644
index d558e7f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    a = ( int)5.6;
-    b = int (5.6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp
deleted file mode 100644
index 0bcab0d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void f()
-{
-    uint32 x = (uint8)b;
-    uint32 x = (uint16)f(a, b);
-    uint32 x = (uint32)std::distance(a, b);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h
deleted file mode 100644
index ea539afa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h
+++ /dev/null
@@ -1,11 +0,0 @@
-class C
-{
-public:
-A* B;
-C& D;
-const C& D;
-static C& D;
-public C& D;
-E=c& D;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp
deleted file mode 100644
index 05eb69cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-template<class T>
-class TestTemp  
-{
-public:
-    TestTemp();
-    void SetValue( T obj_i );
-    T Getalue();
-private:
-    T m_Obj;
-};
-
-template <class T>
-TestTemp<T>::TestTemp()
-{
-}
-template <class T>
-void TestTemp<T>::SetValue( T obj_i )
-{
-}
- 
-template <class T>
-T TestTemp<T>::Getalue()
-{
-    return m_Obj;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp
deleted file mode 100644
index af06e31a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-
-class Foo : public Bar
-{
-
-};
-
-#define CTOR(i, _) : T(X()), \
-    y() \
-{ }
-
-class Foo2 :
-public Bar
-{
-
-};
-
-class GLOX_API ClientBase : public Class, public OtherClass,
-        public ThridClass, public ForthClass
-	{
-public:
-         ClientBase(const ClientBase & f){
-            // do something
-         }
-	};
-
-ClientBase :: ClientBase (const std::string& ns,
-   const std::string& ns1,
-   const std::string& ns2)
-{
-
-}
-
-Foo::Foo(int bar) : someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) : someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-: someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-someVar(bar), othervar(0)
-{
-}
-
-Foo::Foo(int bar) :
-someVar(bar),
-   othervar(0)
-{
-}
-
-Foo::Foo(int bar)
-: someVar(bar),
-   othervar(0)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h
deleted file mode 100644
index 0048604d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _FOO_BAR_H_INCLUDED_
-#define _FOO_BAR_H_INCLUDED_
-
-class CFooBarDlg : public CDialog
-{
-// Construction
-public:
-   CFooBarDlg(CFooBar *pDataMan,
-              CWnd* pParent = NULL );
-   virtual ~CFooBarDlg();
-
-   void Initialize( BYTE nDelay=100 );
-
-   UINT GetCount() { return (m_nCount); }
-
-   void SetCount(int count=1)
-   {
-      if ((count > 0) && (count < MAX_COUNT))
-      {
-         m_nCount = count;
-      }
-   };
-
-   // Dialog Data
-   //{{AFX_DATA(CATCSMgrDlg)
-   enum { IDD = IDD_ATCS_MGR_DLG };
-   //}}AFX_DATA
-
-protected:
-   int   m_nCount;
-
-// Overrides
-   // ClassWizard generated virtual function overrides
-   //{{AFX_VIRTUAL(CATCSMgrDlg)
-protected:
-   virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-   //}}AFX_VIRTUAL
-
-// Implementation
-
-   // Generated message map functions
-   //{{AFX_MSG(CATCSMgrDlg)
-   virtual BOOL OnInitDialog();
-   afx_msg void OnTimer(UINT nIDEvent);
-   afx_msg void OnBtnSendFooBar();
-   afx_msg void OnSelchangeFooBarCombo();
-   //}}AFX_MSG
-   DECLARE_MESSAGE_MAP()
-};
-
-#endif   /* _FOO_BAR_H_INCLUDED_ */
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp
deleted file mode 100644
index 8885e36b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "foo.h"
-
-//
-// plshade z xmin xmax ymin ymax \
-// sh_min sh_max sh_cmap sh_color sh_width \
-// min_col min_wid max_col max_wid \
-rect [[pltr x y] | NULL ] [wrap]
-//--------------------------------------------------------------------------
-
-void foo()
-{
-   // plshade z xmin xmax ymin ymax \
-     // sh_min sh_max sh_cmap sh_color sh_width \
-       // min_col min_wid max_col max_wid \
-      rect [[pltr x y] | NULL ] [wrap]
-    //--------------------------------------------------------------------------
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp
deleted file mode 100644
index adb5a6ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-typedef enum stuff
-{
-Value1 = 0x00000400 , // Just a comment for the value
-Value2 = 0x00000800 , // A much longer comment that needs to be truncated to fit within a set character width. In this case, its 80 characters so two truncates are required.
-} JustAnEnum;
-
-// this is another comment that is meant to exceed the code width so that it can be wrapped
-// and combined to see how that works.
-
-/* this is another comment that is meant to exceed the code width so that it can be wrapped
- * and combined to see how that works. */
-
-/* Line A */
-
-/* Line 1 */
-/* line 2 */
-/* line 3 */
-/* line 4 */
-
-int cnt;    /* This is a counter variable with a long comment. this should cause the comment to be wrapped. */
-
-/**
- * Multi-line comment
- */
-void foo(void)
-{
-/**
- * Multi-line comment
- */
-   int idx;
-   /**
-    * Multi-line comment
-    */
-}
-
-/* Start Change #95 */
-/*INITIALIZE Variable(contExtnElgInd); /# Change #61 #/ */
-/*/# Start Change #35 #/ */
-
-/**
- * OneBigWordThatCannotBeSplitYetExceedsTheCommentWidthSettingSoThatWrappingShouldBeAttempted.
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp
deleted file mode 100644
index e56aec25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-foo();
-// test \
-blah();
-bar();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
deleted file mode 100644
index 32ff32d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void f() {
-	/* Comment with <TAB>	here
-	 * and	here again
-	 */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp
deleted file mode 100644
index 542a0fd2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace {
-
-   /* If we're in the middle of the original line, copy the string
-   only up to the cursor position into buf, so tab completion
-   will result in buf's containing only the tab-completed
-   path/filename. */
-
-  class Test {
-
-    Test() {}
-    ~Test() {}
-
-    /** Call this method to
-            run the test
-
-	\param n test number
-	\returns the test result
-    */
-    bool Run(int n);
-
-    /** Call this method to
-        stop the test
-
-    \param n test number
-    \returns the test result
-    */
-    bool Run(int n);
-
-  };
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h
deleted file mode 100644
index 25253f09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h
+++ /dev/null
@@ -1,8 +0,0 @@
-class MyClass : public BaseClass
-{
-	//@{ BaseClass interface
-#if VERY_LONG_AND_COMPLICATED_DEFINE
-	void foo();
-#endif // VERY_LONG_AND_COMPLICATED_DEFINE
-	//@}
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp
deleted file mode 100644
index a5ae87d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <string>
-
-class CFoo
-{
-CFoo(int arg);
-CFoo(char arg) {
-}
-~CFoo();
-int foo1(int arg);
-int foo2();
-int foo3(char ch, int xx)
-{
-}
-};
-
-CFoo::CFoo(int arg) {
-}
-
-CFoo::~CFoo() {
-}
-
-int CFoo::foo1(int arg, int arg2)
-{
-}
-
-int CFoo::foo2()
-{
-}
-
-int CFoo::operator +()
-{
-}
-
-map<string, int> func()
-{
-  // some codes
-}
-
-int some_func(void)
-{
-}
-
-class some_class_declaration;
-
-int some_func_declaration();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp
deleted file mode 100644
index 121ea044..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-class X
-{
-    struct Zone
-    {
-        //    int a;
-        //    int b;
-        int c;
-        int d;
-        double e;
-        inline Zone(int _c) : c(_c)
-        { }                                     // constructor for zone search
-
-        inline Zone(
-            //int _a,
-            //int _b,
-            int _c,
-            int _d, double _e) :
-            //a(_a),
-            //b(_b),
-            c(_c),
-            d(_d),
-            e(_e)
-        { }
-    };
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp
deleted file mode 100644
index 73dab5ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-
-void function()
-{
-    printf( "Hello World\n" );
-        /*
- output_comment_multi_simple to test replacement of \r\n to \n keep the 
- following \r:

- //test
-        /// Another comment
-//end test
-*/
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp
deleted file mode 100644
index 403bf773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-template <class T>
-inline void
-x3(T & a, T & b, T & c)
-{
-    T temp;
-    if (b < a)
-    {
-        if (c < a)
-        {                       // b , c < a
-            if (b < c)
-            {                   // b < c < a
-                temp = a;
-                a = b;
-                b = c;
-                c = temp;
-            }
-            else
-            {                   // c <=b < a
-                std::swap(c, a);
-            }
-        }
-        else
-        {                       // b < a <=c
-                                // second line of comment
-            std::swap(a, b);
-        }
-    }
-    0;
-    0;
-    0;
-    if (1)                      // always
-        do_something();
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp
deleted file mode 100644
index f0d1773d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-void GetFoo(void) 
-const
- { return (m_Foo); }
-
-int GetFoo(void)
- throw (std::bad_alloc)
- { return (m_Foo); }
-
-class foo{
-  void bar(void)
-    const;
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp
deleted file mode 100644
index 6c0706e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class foo
-{
-   void bar_c(int t, int u)
-      : t(222)
-      , u(88)
-   {
-      // code
-   }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp
deleted file mode 100644
index 46abf36a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-IMPLEMENT_DYNAMIC(CPropertiesDlg, CDialog)
-CPropertiesDlg::CPropertiesDlg( CPtcMsgSimControlModule *pcmPtcMsg,
-                                CWnd* pParent /*=NULL*/):
-   CDialog( CPropertiesDlg::IDD, pParent ),
-   m_pspRouter( pcmPtcMsg ),
-   m_pspScm( pcmPtcMsg )
-{
-   m_pcmPtcMsg = pcmPtcMsg;
-}
-
-CPropertiesDlg::~CPropertiesDlg()
-{
-}
-
-void CPropertiesDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-}
-
-CFooBar::CFooBar(CWnd* pParent /*=NULL*/)
-	: CDialog(CFooBar::IDD, pParent),
-   m_parent(pParent)
-{
-	//{{AFX_DATA_INIT(CRouterBrowser)
-	//}}AFX_DATA_INIT
-
-   m_nFoo = 0;
-   m_nBar = 0;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp
deleted file mode 100644
index 27b52dac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-template< class T >
-operator T*() const
-{
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp
deleted file mode 100644
index c3c9366d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void foo()
-{
-   cout.setf(ios::showpoint);
-   cout.setf(ios::floatfield,ios::fixed);
-
-   what.the.hell.cout << "hello"
-      << "world!"
-      << "This"
-      << "is a"
-      << "test!";
-
-   *aaaaaa = (bbbbb(cccccPtr->ddd) & YYYYYYYYYYYYYYYYYYYYYYYY) |
-             ((bbbbb(cccccPtr->nnnnnnnn) << ZZZZZZZZZZZZZZZZZZZZZZZZZZZ)
-             & WWWWWWWWWWWWWWWWWWWWWWWWWW) | ((bbbbb(cccccPtr->hhhhhhhhhhhhhh)
-                       << FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-             & EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp
deleted file mode 100644
index ba463284..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-bool CompareGenomeByFeatureResults::clickOnLink(std::string const& inLink) {
-   auto const[sequence, type, firstPosition, lastPosition] = parseLink(inLink);
-   if (sequence.empty()) {
-      return true;
-   }
-   return showFeature(statistics.nameDocumentA, type, firstPosition, lastPosition);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp
deleted file mode 100644
index cec9beb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-void Test(X&& val1, Y* val2);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp
deleted file mode 100644
index 2551d8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-int foo()
-{
-   TextBody textbody(GetBody().GetText());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp
deleted file mode 100644
index 422cb1bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-BEGIN_MESSAGE_MAP(CUSB2_camera_developementDlg, CDialog)
-ON_COMMAND(IDC_ESCAPE, On_Escape)
-ON_COMMAND(IDC_8_BIT, On_8_Bit)
-ON_COMMAND(IDC_14_BIT, On_14_Bit)
-ON_COMMAND(IDC_ACQUIRE, On_Acquire)
-ON_COMMAND(IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages)
-ON_COMMAND(IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages)
-ON_WM_PAINT()
-ON_WM_QUERYDRAGICON()
-ON_WM_CTLCOLOR()
-END_MESSAGE_MAP()
-
-namespace one
-{
-    namespace two
-    {
-        int Func(int a,
-                 int b)
-        {
-            return a + b;
-        }
-    }
-}
-
-using namespace one::two;
-
-void Func2(int c,
-           int d)
-{
-}
-
-int main()
-{
-    int a;
-
-    switch (a)
-    {
-        case 0:
-            Func2(1, Func(1, 2));
-            Func2(1, one::two::Func(1, 2));
-            break;
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp
deleted file mode 100644
index 1544fd74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-void className::set(const objectName& obj)
-{
-   statement1();
-MACRO_BEGIN_STUFF(param)
-DOSTUFF(params)
-MACRO_ELSE_STUFF()
-DOMORESTUFF(moreparams)
-junk = 1;
-MACRO2_BEGIN_STUFF
-junk += 3;
-MACRO2_ELSE_STUFF
-junk += 4;
-MACRO2_END_STUFF
-DOLASTSTUFF(lastparams)
-MACRO_END_STUFF()
-   statement2();
-}
-
-
-MACRO2_BEGIN_STUFF
-   // comment
-MACRO2_ELSE_STUFF
-   /* Comment */
-MACRO2_END_STUFF
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp
deleted file mode 100644
index 69e924ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-        #define EXTRACTX360ACHIEVEMENT  X360Achievement_INTERNAL& mapping = ExtractMonoObjectData<X360Achievement_INTERNAL>(self); /*huh?*/ \

-								        const XACHIEVEMENT_DETAILS* achievement = xenon::Achievements::GetDetails(mapping.m_index);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp
deleted file mode 100644
index fff916e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-
-void x(int **d) {
-delete *d;
-}
-
-void x(int& d) {
-delete &d;
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp
deleted file mode 100644
index abfb70c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-myNewValue = something[arrayNumber] *someOtherValue;
-myNewValue = multidimentional[arrayNumber][anotherNumber] *someOtherValue;
-myNewValue = noArrayVariableWorksFine * someOtherValue;
-
-
-int func(int * thingy,
-volatile int *arrayThingy[NUMBER]);
-
-int func(int * thingy,
-volatile int *arrayThingy[NUMBER][anotherNumber]);
-
-int func(int * thingy,
-volatile int *noArrayThingyWorksFine);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp
deleted file mode 100644
index 57cfddf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-x = reinterpret_cast< ::Symbol*>();

-

-int b() {

-    char f <: 32 :> = <% 0 %>;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp
deleted file mode 100644
index cb9fc307..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <stdio.h>
-
-// this macro should NOT be modified ...
-#define CHK(...)   \
-  do               \
-  {                \
-      a+=1;        \
-        a=b=0;     \
-          c<<1;    \
-  } while (0+0)
-
-
-// ... whereas this should be indented and formatted
-int main()
-{
-	int a,b,c=0;
-	if (a<c)
-	{
-	c+=1;
-	}
-	a=b=0;
-	c<<1;
-	CHK;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp
deleted file mode 100644
index fd622c3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void f() {

-	 			auto x = "	test\t 	 	 		...   ???";

-// *INDENT-OFF*

-	 			auto x = "	test\t 	 	 		...   ???";

-// *INDENT-ON*

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp
deleted file mode 100644
index a0a58f85..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define inline_2 __forceinline

-#define inline(i) inline_##i

-#define foo(x) inline(2) x()

-#define PLD(reg,offset)    pld    [reg, offset]  \

-	pld    [reg, offset] \

-	pld     [reg, offset]

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
deleted file mode 100644
index 8753aee2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class A

-{

-   void func1(){

-      // comment

-      }

-   void func2(){auto result = 1 + 2 + 3 + 4;}

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp
deleted file mode 100644
index 4e228311..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void foo()
-{
-  transform << 0, 1, 0, 0,
-    1, 0, 0, 0,
-                   0, 0, 1, 0,
-               0, 0, 0, 1;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp
deleted file mode 100644
index 7f87591e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-   enum
-     class
-       angle_state_e 
-  : 
- unsigned
-int {
-      NONE=0, OPEN=1, //'<' found
-CLOSE            =    2   ,         //'>' found
-};
-
-// align.cpp
-enum class comment_align_e : unsigned int
-{
-   REGULAR,
-   BRACE,
-   ENDIF,
-};
-
-// chunk_list.h
-enum class scope_e : unsigned int
-{
-   ALL,      /**< search in all kind of chunks */
-   PREPROC,  /**< search only in preprocessor chunks */
-};
-
-// chunk_list.cpp
-enum class direction_e : unsigned int
-{
-   FORWARD,
-   BACKWARD
-};
-
-// combine.cpp
-{
-   enum class angle_state_e : unsigned int
-   {
-      NONE  = 0,
-      OPEN  = 1, // '<' found
-      CLOSE = 2, // '>' found
-   };
-}
-
-// indent.cpp
-enum class align_mode_e : unsigned int
-{
-   SHIFT,     /* shift relative to the current column */
-   KEEP_ABS,  /* try to keep the original absolute column */
-   KEEP_REL,  /* try to keep the original gap */
-};
-
-// align_stack.h
-{
-   enum StarStyle
-   {
-      SS_IGNORE,  // don't look for prev stars
-      SS_INCLUDE, // include prev * before add
-      SS_DANGLE   // include prev * after add
-   };
-}
-
-// log_levels.h
-enum log_sev_t
-{
-   LSYS      = 0,
-   LERR      = 1,
-   LWARN     = 2,
-   LNOTE     = 3,
-   LINFO     = 4,
-   LDATA     = 5,
-
-   LFILELIST = 8,  /* Files in the file list file */
-   LLINEENDS = 9,  /* Show which line endings are used */
-   LCASTS    = 10, /* align casts */
-   LALBR     = 11, /* align braces */
-   LALTD     = 12, /* Align Typedef */
-   LALPP     = 13, /* align #define */
-   LALPROTO  = 14, /* align prototype */
-   LALNLC    = 15, /* align backslash-newline */
-   LALTC     = 16, /* align trailing comments */
-   LALADD    = 17, /* align add */
-   LALASS    = 18, /* align assign */
-   LFVD      = 19, /* fix_var_def */
-   LFVD2     = 20, /* fix_var_def-2 */
-   LINDENT   = 21, /* indent_text */
-   LINDENT2  = 22, /* indent_text tab level */
-   LINDPSE   = 23, /* indent_text stack */
-   LINDPC    = 24, /* indent play-by-play */
-   LNEWLINE  = 25, /* newlines */
-   LPF       = 26, /* Parse Frame */
-   LSTMT     = 27, /* Marking statements/expressions */
-   LTOK      = 28, /* Tokenize */
-   LALRC     = 29, /* align right comment */
-   LCMTIND   = 30, /* Comment Indent */
-   LINDLINE  = 31, /* indent line */
-   LSIB      = 32, /* Scan IB */
-   LRETURN   = 33, /* add/remove parens for return */
-   LBRDEL    = 34, /* brace removal */
-   LFCN      = 35, /* function detection */
-   LFCNP     = 36, /* function parameters */
-   LPCU      = 37, /* parse cleanup */
-   LDYNKW    = 38, /* dynamic keywords */
-   LOUTIND   = 39, /* output indent */
-   LBCSAFTER = 40, /* Brace cleanup stack - after each token */
-   LBCSPOP   = 41, /* Brace cleanup stack - log pops */
-   LBCSPUSH  = 42, /* Brace cleanup stack - log push */
-   LBCSSWAP  = 43, /* Brace cleanup stack - log swaps */
-   LFTOR     = 44, /* Class Ctor or Dtor */
-   LAS       = 45, /* align_stack */
-   LPPIS     = 46, /* Preprocessor Indent and Space */
-   LTYPEDEF  = 47, /* Typedef and function types */
-   LVARDEF   = 48, /* Variable def marking */
-   LDEFVAL   = 49, /* define values */
-   LPVSEMI   = 50, /* Pawn: virtual semicolons */
-   LPFUNC    = 51, /* Pawn: function recognition */
-   LSPLIT    = 52, /* Line splitting */
-   LFTYPE    = 53, /* Function type detection */
-   LTEMPL    = 54, /* Template detection */
-   LPARADD   = 55, /* adding parens in if/while */
-   LPARADD2  = 56, /* adding parens in if/while - details */
-   LBLANKD   = 57, /* blank line details */
-   LTEMPFUNC = 58, /* Template function detection */
-   LSCANSEMI = 59, /* scan semi colon removal */
-   LDELSEMI  = 60, /* Removing semicolons */
-   LFPARAM   = 61, /* Testing for a full parameter */
-   LNL1LINE  = 62, /* NL check for 1 liners */
-   LPFCHK    = 63, /* Parse Frame check fcn call */
-   LAVDB     = 64, /* align var def braces */
-   LSORT     = 65, /* Sorting */
-   LSPACE    = 66, /* Space */
-   LALIGN    = 67, /* align */
-   LALAGAIN  = 68, /* align again */
-   LOPERATOR = 69, /* operator */
-   LASFCP    = 70, /* Align Same Function Call Params */
-   LINDLINED = 71, /* indent line details */
-   LBCTRL    = 72, /* beautifier control */
-   LRMRETURN = 73, /* remove 'return;' */
-   LPPIF     = 74, /* #if/#else/#endif pair processing */
-   LMCB      = 75, /* mod_case_brace */
-   LBRCH     = 76, /* if brace chain */
-   LFCNR     = 77, /* function return type */
-   LOCCLASS  = 78, /* OC Class stuff */
-   LOCMSG    = 79, /* OC Message stuff */
-   LBLANK    = 80, /* Blank Lines */
-   LOBJCWORD = 81, /* Convert keyword to CT_WORD in certain circumstances */
-   LCHANGE   = 82, /* something changed */
-   LCONTTEXT = 83, /* comment cont_text set */
-   LANNOT    = 84, /* Java annotation */
-   LOCBLK    = 85, /* OC Block stuff */
-   LFLPAREN  = 86, /* Flag paren */
-   LOCMSGD   = 87, /* OC Message declaration */
-   LINDENTAG = 88, /* indent again */
-   LNFD      = 89, /* newline-function-def */
-   LJDBI     = 90, /* Java Double Brace Init */
-   LSETPAR   = 91, /* set_chunk_parent() */
-   LSETTYP   = 92, /* set_chunk_type() */
-   LSETFLG   = 93, /* set_chunk_flags() */
-   LNLFUNCT  = 94, /* newlines before function */
-   LCHUNK    = 95, /* Add or del chunk */
-   LGUY98    = 98, /* for guy-test */
-   LGUY      = 99, /* for guy-test */
-};
-
-// options.h
-enum argtype_e
-{
-   AT_BOOL,    /**< true / false */
-   AT_IARF,    /**< Ignore / Add / Remove / Force */
-   AT_NUM,     /**< Number */
-   AT_LINE,    /**< Line Endings */
-   AT_POS,     /**< start/end or Trail/Lead */
-   AT_STRING,  /**< string value */
-   AT_UNUM,    /**< unsigned Number */
-};
-
-enum argval_t
-{
-   AV_IGNORE      = 0,
-   AV_ADD         = 1,
-   AV_REMOVE      = 2,
-   AV_FORCE       = 3, /**< remove + add */
-   AV_NOT_DEFINED = 4  /* to be used with QT, SIGNAL SLOT macros */
-};
-
-enum lineends_e
-{
-   LE_LF,      /* "\n"   */
-   LE_CRLF,    /* "\r\n" */
-   LE_CR,      /* "\r"   */
-
-   LE_AUTO,    /* keep last */
-};
-
-enum tokenpos_e
-{
-   TP_IGNORE      = 0,     /* don't change it */
-   TP_BREAK       = 1,     /* add a newline before or after the if not present */
-   TP_FORCE       = 2,     /* force a newline on one side and not the other */
-   TP_LEAD        = 4,     /* at the start of a line or leading if wrapped line */
-   TP_LEAD_BREAK  = (TP_LEAD | TP_BREAK),
-   TP_LEAD_FORCE  = (TP_LEAD | TP_FORCE),
-   TP_TRAIL       = 8,     /* at the end of a line or trailing if wrapped line */
-   TP_TRAIL_BREAK = (TP_TRAIL | TP_BREAK),
-   TP_TRAIL_FORCE = (TP_TRAIL | TP_FORCE),
-   TP_JOIN        = 16,    /* remove newlines on both sides */
-};
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h
deleted file mode 100644
index 2ba9933f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h
+++ /dev/null
@@ -1,21 +0,0 @@
-enum class A
-{
-a,
-b
-}
-
-enum struct D
-{
-a,
-b
-}
-
-class B {
-private:
-   int x;
-}
-enum C
-{
-a,
-b
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h
deleted file mode 100644
index 42ce2c53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-void function(int a, int b, int c);
-
-enum Test {
-	A,   B
-	, C,
-	D, E
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp
deleted file mode 100644
index 736e6718..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-enum class Eee
-{
-    Foo,
-    AnotherFoo, // comment
-    Bar,
-    DifferentBar
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp
deleted file mode 100644
index 8bde6273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-enum MyEnum {
-    kOne   = 0,
-    kTwo   = 1 << 0,
-    kThree = 1 << 1,
-    kFour  = 1 << 2
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp
deleted file mode 100644
index 7f29676e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
- #include <iostream>
-
-
-void foo()
-{
-   char *buf;
-   try {
-      buf = new unsigned char[1024];
-      if( buf == 0 )
-         throw "Out of memory";
-   }
-   catch( char * str )  {
-      cout << "Exception: " << str << '\n';
-   }
-}
-
-void bar()
-{
-   char *buf;
-
-   try
-      {
-      buf = new unsigned char[1024];
-      if( buf == 0 )
-         throw "Out of memory";
-   }
-   catch( char * str )
-   {
-      cout << "Exception: " << str << '\n';
-   }
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h
deleted file mode 100644
index e4943e50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef cRecordMarking_HEADER
-#define cRecordMarking_HEADER
-
-#include "DIS/cPduSnapshot.h"
-
-typedef void* disConnectionH;
-
-#ifdef __cplusplus
-extern "C"
-#endif
-{
-	
-	disConnectionH createDisConnection();
-	
-	void setAddressAndPort_DisConnect(disConnectionH record, const char *addr);
-	
-    /* Open network connection */
-    int open_DisConnect(disConnectionH record);
-	
-    /* Close network connection */
-    void close_DisConnect(disConnectionH record);
-
-	/* Send one pdu */
-    int sendPdu_DisConnect(disConnectionH record, pduSnapshotH pdu);
-	
-    /* Receive one pdu */
-    int recvPdu_DisConnect(disConnectionH record, pduSnapshotH pdu);
-	
-	void FreeDisConnection(disConnectionH connection);
-	
-}
-#endif
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp
deleted file mode 100644
index 24e90a37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void foo();
-// hello
-extern "C"
-BAR_EXPORT
-void bar()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp
deleted file mode 100644
index 0a729f01..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
-   a
-   b
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp
deleted file mode 100644
index 0014b110..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()
-{
-while (a < b && c > d)
-i++;
-
-for  (  ;a < b && c > d; )
-i++;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp
deleted file mode 100644
index c62548f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-void foo()
-{
-	for (auto const& item : list)
-		bar(item);
-	for (const auto& item : list)
-		bar(item);
-	for (auto& item : list)
-		bar(item);
-
-	auto* var = bar();
-	auto& var = bar();
-	auto var = bar();
-	auto const* var = bar();
-	auto const& var = bar();
-	auto const var = bar();
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp
deleted file mode 100644
index 7685f614..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()
-{
-for(std::map<std::string, std::string>::iterator it=m_stat_http_conn_total.m_stat_response_codes.begin(); it!=m_stat_http_conn_total.m_stat_response_codes.end(); ++i) 
-{
-bar(it);
-}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp
deleted file mode 100644
index cbfacf62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-for(int i = 1,
-    j = 2,
-    k = 3,
-    ; (i != 1
-    && j != 2
-    && k != 2)
-    ; i++, j++, k++ )
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp
deleted file mode 100644
index cfbe7963..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void foo()

-{

-	for_each(it.begin(), it.end(), func);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp
deleted file mode 100644
index 1b073b45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class foo
-{
-friend void bar();
-friend void none();
-template <typename T> friend vector<T> vec();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm
deleted file mode 100644
index 16f98ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-    if(progress <= 0)

-    {

-        [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,

-                                                           NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];

-    }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp
deleted file mode 100644
index 6467560f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-void f()
-{
-    auto x = func1(
-        arg,
-        arg);
-}
-
-void f()
-{
-    return func2(
-        arg,
-        arg);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp
deleted file mode 100644
index 7e2f3931..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void f()
-{
-    m_complete.back().m_replicas.clear();
-
-    m_complete.back().m_replicas.push_back(serverId);
-    m_pending.front().m_replicas.erase(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp
deleted file mode 100644
index 64a11509..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Reverse the bytes in 32-bit chunks.
- */
-void MD5::reverse_u32(UINT8 *buf, int n_u32)
-{
-   UINT8 tmp;
-}
-
-MD5::MD5()
-{
-   m_buf[0] = 0x01020304;
-}
-
-class AlignStack
-{
-public:
-   bool m_skip_first;
-   AlignStack()
-   {
-   }
-   ~ AlignStack()
-   {
-   }
-   void End()
-   {
-   }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h
deleted file mode 100644
index 168b0b3d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h
+++ /dev/null
@@ -1,16 +0,0 @@
-void MD5::reverse_u32(UINT8 *buf, int n_u32);
-
-MD5::MD5();
-
-class AlignStack
-{
-public:
-   bool m_skip_first;
-
-   AlignStack();
-
-
-   ~ AlignStack();
-
-   void End();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp
deleted file mode 100644
index 24b187c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-typedef short (* hello1) (char         coolParam,
-               ushort *,
-               unsigned int anotherone);
-
-short (* hello2)(char         coolParam,
-               ulong *,
-	uchar,
-               unsigned int anotherone);
-
-short hello3 (char         coolParam,
-               ushort *,
-               unsigned int anotherone);
-
-void x (custom_t * e, void (*funcptr) );
-void x (custom_t * e, void (*funcptr)[] );
-void x (custom_t * e, void (*funcptr)(int, int) );
-void x (custom_t * e, void (*funcptr)(int, int)[] );
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp
deleted file mode 100644
index 8c62d49b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-uint32_t foo ( uint8_t param1
-               , some_datatype param2
-               , datatype param3
-               , another_datatype *param4
-               , uint16_t param5
-               , uint32_t *param6
-               );
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp
deleted file mode 100644
index 7f5e05c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-int &Function()
-{
-static int x;
-return (x);
-}
-
-void foo1(int param1, int param2, char *param2);
-
-void foo2(int param1,
-          int param2,
-          char *param2);
-
-void foo3(int param1,
-          int param2,                                        // comment
-          char *param2
-          );
-
-struct whoopee *foo4(int param1, int param2, char *param2    /* comment */);
-
-const struct snickers *
-foo5(int param1, int param2, char *param2);
-
-
-void foo(int param1, int param2, char *param2)
-{
-   printf("boo!\n");
-}
-
-int classname::method();
-
-int classname::method()
-{
-   foo();
-}
-
-int
-classname::method2();
-
-int
-classname::method2()
-{
-   foo2();
-}
-
-const int& className::method1(void) const
-{
-    // stuff
-}
-
-const longtypename& className::method2(void) const
-{
-    // stuff
-}
-
-int &foo();
-
-int &foo()
-{
-   list_for_each(a,b) {
-      bar(a);
-   }
-   return nuts;
-}
-
-void Foo::bar() {}
-
-Foo::Foo() {}
-
-Foo::~Foo() {}
-
-void func(void)
-{
-Directory dir("arg");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp
deleted file mode 100644
index 5d2ff4fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void foo(int  *  (*f)(int));
-void foo(int  &  (*f)(int));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp
deleted file mode 100644
index b188c210..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void f(int i)
-{
-	switch(i)
-	{
-	case 1 ... 2:
-	{
-		break;
-	}
-	case 3 ... 5:
-		break;
-
-	default:
-		break
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp
deleted file mode 100644
index feb059d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class \u005FClass // underscore character
-{
-};
-
-int main()
-{
-   string IdentifierContainingTwoUCNCharacters\u1234\U00001234 = "\u005FClass";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp
deleted file mode 100644
index 0f50d182..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define x struct z

-#define max(a, b) ((a) > (b) ? (a) : (b))

-

-void f()

-{

-    goto p;

-p:

-    goto q;

-q:

-    goto p;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp
deleted file mode 100644
index 06680c0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// there should be no break ups caused by suffix or separator
-auto n2 = 1'000;
-auto m1 = 0b0010'1010LL;
-auto m2 = 0xfa'afUll;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp
deleted file mode 100644
index c3123b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <functional>
-
-int main()
-{
-    typedef std::function<void ()> C;
-    C callback =
-        [] ()
-        {
-            C f([]()
-            {
-                int i;
-            });
-        };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp
deleted file mode 100644
index 1a959d34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int main()
-{
-	if(true) {return 1;}
-	else if(true) {return 1;}
-	else {return 1;}
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp
deleted file mode 100644
index 0c8e1c92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <vector>
-std::vector<int> f()
-{;
-return std::vector<int>{1};
-};
-
-int main()
-{;
-    return f()[0];;;;;
-};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp
deleted file mode 100644
index d4d05106..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Do not add a new line because of the vbrace close that is above col 25
-// after return 1;
-int main()
-{
-	if(1)
-		return 1;
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp
deleted file mode 100644
index e4005841..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp
+++ /dev/null
@@ -1 +0,0 @@
-auto p = std::make_pair(r * cos(a), r * sin(a));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp
deleted file mode 100644
index 912488b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp
+++ /dev/null
@@ -1 +0,0 @@
-A a = {this->r * cos(b)};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp
deleted file mode 100644
index d3e79ff6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void f()
-{
-	int i = A::B::C::bar();
-	int ii = A::B::C::bar();
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp
deleted file mode 100644
index 1470d613..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-void f()
-{
-int i = A::B::C::bar();
-int ii = A::B::C::bar();
-}
-
-int A::foo()
-{
-return 1;
-}
-int A::B::foo()
-{
-return A::foo();
-}
-int A::B::C::foo()
-{
-return A::B::foo();
-}
-int A::B::C::D::foo()
-{
-return A::B::C::foo();
-}
-int A::B::C::D::E::foo()
-{
-return A::B::C::D::foo();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp
deleted file mode 100644
index dda01437..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void myClass::foo() {
-	int bar;
-	std::string str;
-	DbConfig::configuredDatabase()->apply(db);
-	std::string str2;
-
-	std::string str2;
-	f();
-	DbConfig::configuredDatabase()->apply(db);
-	int bar;
-	std::string str;
-
-	std::string str2;
-	f();
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp
deleted file mode 100644
index 2c33ec58..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void FuncA(void)
-{
-}
-
-void FuncB(void)
-{
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp
deleted file mode 100644
index 5cb66589..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace ns1 {
-namespace ns2 {
-
-  #define SOME_MACRO() \
-	if(true) { \
-	}
-
-}
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp
deleted file mode 100644
index 1901e3db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace
-{
-void f(){
-};
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp
deleted file mode 100644
index 7fa82285..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void f(int a, int b);
-
-void g()
-{
-	f(1, 2);
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp
deleted file mode 100644
index fd27cf6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-/* *INDENT-OFF* */
-enum E_SUNSENSOR {
-    EXAMPLE1,
-    EXAMPLE2,
-    SN005
-};
-/* *INDENT-ON* */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp
deleted file mode 100644
index 8011f572..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void f()
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp
deleted file mode 100644
index 4d95c7ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#define concat0(a0,a1) a0  ??=??=a1 // trigraph ##
-#define concat1(a0,a1) a0  %:%:a1   // digraph ##
-
-
-#define STRINGIFY0(s) ??=  s  // trigraph #
-#define STRINGIFY1(s) %:  s   // digraph #
-
-#define msg0(x) printf("%c: %d\n", ??=@  x, x) // trigraph #@
-#define msg1(x) printf("%c: %d\n", %:@  x, x)  // digraph #@
-
-// trigraph {
-void x() ??<
-
-    // trigraph []
-    char a  ??(??) = "a";
-    // diigraph []
-    char b  <::> = "b";
-
-    bool f, g, h;
-    f = g = h = true;
-
-    // trigraph ||
-    f = g  ??!??! h;
-    // trigraph |=
-    f  ??!= g;
-    // trigraph |
-    f = g  ??! h;
-    // trigraph ^=
-    f  ??'= g;
-    // trigraph ^
-    f = g  ??' h;
-
-    // trigraph [, ]
-    int m ??(5??);
-    // digraph [, ]
-    int n <:5:>;
-
-// trigraph }
-return; ??>
-
-// digraph {, }
-int y() <%  return 1; %>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp
deleted file mode 100644
index 76f37f92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-int foo()
-{
-        if constexpr (a == 0) {
-                return 1;
-        }
-        return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp
deleted file mode 100644
index b544f2bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-int foo() {
-	if ( a )
-		return 1;
-	else if ( b )
-		return 2;
-
-	if ( a )
-		return 3;
-	else if ( b )
-		return 4;
-	else {
-		a = 5;
-		return 5;
-	}
-
-	if ( a )
-		return 6;
-	else
-		return 7;
-
-	if ( a )
-		return 8;
-
-	if ( b ) {
-		return 9;
-	}
-
-	if ( b ) {
-		{ b = 5; }
-		return 9;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp
deleted file mode 100644
index 032f74ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-static constexpr int test{
-	if constexpr (condition_1)
-		return 1;
-	else if constexpr (condition_2)
-		return 2;
-	else
-		return 3;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp
deleted file mode 100644
index 52f508f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-if (true)				// indent_relative_single_line_comments = false

-	return;

-if ( foo ) { // true

-	bar(1);  // action 1

-} else {     // false

-	bar(2);  // action 2

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp
deleted file mode 100644
index 56633d0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp
+++ /dev/null
@@ -1,1084 +0,0 @@
-/**
- * @file indent.cpp
- * Does all the indenting stuff.
- *
- * $Id: indent.cpp 548 2006-10-21 02:31:55Z bengardner $
- */
-#include "uncrustify_types.h"
-#include "chunk_list.h"
-#include "prototypes.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cerrno>
-#include <cctype>
-
-
-/**
- * General indenting approach:
- * Indenting levels are put into a stack.
- *
- * The stack entries contain:
- *  - opening type
- *  - brace column
- *  - continuation column
- *
- * Items that start a new stack item:
- *  - preprocessor (new parse frame)
- *  - Brace Open (Virtual brace also)
- *  - Paren, Square, Angle open
- *  - Assignments
- *  - C++ '<<' operator (ie, cout << "blah")
- *  - case
- *  - class colon
- *  - return
- *  - types
- *  - any other continued statement
- *
- * Note that the column of items marked 'PCF_WAS_ALIGNED' is not changed.
- *
- * For an open brace:
- *  - indent increases by indent_columns
- *  - if part of if/else/do/while/switch/etc, an extra indent may be applied
- *  - if in a paren, then cont-col is set to column + 1, ie "({ some code })"
- *
- * Open paren/square/angle:
- * cont-col is set to the column of the item after the open paren, unless
- * followed by a newline, then it is set to (brace-col + indent_columns).
- * Examples:
- *    a_really_long_funcion_name(
- *       param1, param2);
- *    a_really_long_funcion_name(param1,
- *                               param2);
- *
- * Assignments:
- * Assignments are continued aligned with the first item after the assignment,
- * unless the assign is followed by a newline.
- * Examples:
- *    some.variable = asdf + asdf +
- *                    asdf;
- *    some.variable =
- *       asdf + asdf + asdf;
- *
- * C++ << operator:
- * Handled the same as assignment.
- * Examples:
- *    cout << "this is test number: "
- *         << test_number;
- *
- * case:
- * Started with case or default.
- * Terminated with close brace at level or another case or default.
- * Special indenting according to various rules.
- *  - indent of case label
- *  - indent of case body
- *  - how to handle optional braces
- * Examples:
- * {
- * case x: {
- *    a++;
- *    break;
- *    }
- * case y:
- *    b--;
- *    break;
- * default:
- *    c++;
- *    break;
- * }
- *
- * Class colon:
- * Indent continuation by indent_columns:
- * class my_class :
- *    baseclass1,
- *    baseclass2
- * {
- *
- * Return: same as assignemts
- * If the return statement is not fully paren'd, then the indent continues at
- * the column of the item after the return. If it is paren'd, then the paren
- * rules apply.
- * return somevalue +
- *        othervalue;
- *
- * Type: pretty much the same as assignments
- * Examples:
- * int foo,
- *     bar,
- *     baz;
- *
- * Any other continued item:
- * There shouldn't be anything not covered by the above cases, but any other
- * continued item is indented by indent_columns:
- * Example:
- * somereallycrazylongname.with[lotsoflongstuff].
- *    thatreallyannoysme.whenIhavetomaintain[thecode] = 3;
- */
-
-static void indent_comment(chunk_t *pc, int col);
-
-
-void indent_to_column(chunk_t *pc, int column)
-{
-   if (column < pc->column)
-   {
-      column = pc->column;
-   }
-   reindent_line(pc, column);
-}
-
-/**
- * Changes the initial indent for a line to the given column
- *
- * @param pc      The chunk at the start of the line
- * @param column  The desired column
- */
-void reindent_line(chunk_t *pc, int column)
-{
-   int col_delta;
-   int min_col;
-
-   LOG_FMT(LINDLINE, "%s: %d] col %d on %.*s [%s] => %d\n",
-           __func__, pc->orig_line, pc->column, pc->len, pc->str,
-           get_token_name(pc->type), column);
-
-   if (column == pc->column)
-   {
-      return;
-   }
-   col_delta  = column - pc->column;
-   pc->column = column;
-   min_col    = pc->column;
-
-   do
-   {
-      min_col += pc->len;
-      pc       = chunk_get_next(pc);
-      if (pc != NULL)
-      {
-         if (chunk_is_comment(pc))
-         {
-            pc->column = pc->orig_col;
-            if (pc->column < min_col)
-            {
-               pc->column = min_col + 1;
-            }
-            LOG_FMT(LINDLINE, "%s: set comment on line %d to col %d (orig %d)\n",
-                    __func__, pc->orig_line, pc->column, pc->orig_col);
-         }
-         else
-         {
-            pc->column += col_delta;
-            if (pc->column < min_col)
-            {
-               pc->column = min_col;
-            }
-         }
-      }
-   } while ((pc != NULL) && (pc->nl_count == 0));
-}
-
-
-/**
- * Starts a new entry
- *
- * @param frm  The parse frame
- * @param pc   The chunk causing the push
- */
-static void indent_pse_push(struct parse_frame& frm, chunk_t *pc)
-{
-   static int ref = 0;
-
-   /* check the stack depth */
-   if (frm.pse_tos < (int)ARRAY_SIZE(frm.pse))
-   {
-      /* Bump up the index and initialize it */
-      frm.pse_tos++;
-      memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos]));
-
-      LOG_FMT(LINDPSE, "%4d] OPEN  [%d,%s] level=%d\n",
-              pc->orig_line, frm.pse_tos, get_token_name(pc->type), pc->level);
-
-      frm.pse[frm.pse_tos].type       = pc->type;
-      frm.pse[frm.pse_tos].level      = pc->level;
-      frm.pse[frm.pse_tos].open_line  = pc->orig_line;
-      frm.pse[frm.pse_tos].ref        = ++ref;
-      frm.pse[frm.pse_tos].in_preproc = (pc->flags & PCF_IN_PREPROC) != 0;
-   }
-}
-
-
-/**
- * Removes the top entry
- *
- * @param frm  The parse frame
- * @param pc   The chunk causing the push
- */
-static void indent_pse_pop(struct parse_frame& frm, chunk_t *pc)
-{
-   /* Bump up the index and initialize it */
-   if (frm.pse_tos > 0)
-   {
-      if (pc != NULL)
-      {
-         LOG_FMT(LINDPSE, "%4d] CLOSE [%d,%s] on %s, started on line %d, level=%d/%d\n",
-                 pc->orig_line, frm.pse_tos,
-                 get_token_name(frm.pse[frm.pse_tos].type),
-                 get_token_name(pc->type),
-                 frm.pse[frm.pse_tos].open_line,
-                 frm.pse[frm.pse_tos].level,
-                 pc->level);
-      }
-      else
-      {
-         LOG_FMT(LINDPSE, " EOF] CLOSE [%d,%s], started on line %d\n",
-                 frm.pse_tos, get_token_name(frm.pse[frm.pse_tos].type),
-                 frm.pse[frm.pse_tos].open_line);
-      }
-      frm.pse_tos--;
-   }
-}
-
-
-static int token_indent(c_token_t type)
-{
-   switch (type)
-   {
-   case CT_IF:
-   case CT_DO:
-      return(3);
-
-   case CT_FOR:
-   case CT_ELSE:  // wacky, but that's what is wanted
-      return(4);
-
-   case CT_WHILE:
-      return(6);
-
-   case CT_SWITCH:
-      return(7);
-
-   case CT_ELSEIF:
-      return(8);
-
-   default:
-      return(0); //cpd.settings[UO_indent_braces].n;
-   }
-}
-
-
-/**
- * Change the top-level indentation only by changing the column member in
- * the chunk structures.
- * The level indicator must already be set.
- */
-void indent_text(void)
-{
-   chunk_t            *pc;
-   chunk_t            *next;
-   chunk_t            *prev       = NULL;
-   bool               did_newline = true;
-   int                idx;
-   int                vardefcol   = 0;
-   int                indent_size = cpd.settings[UO_indent_columns].n;
-   int                tmp;
-   struct parse_frame frm;
-   bool               in_preproc = false, was_preproc = false;
-   int                indent_column;
-   int                cout_col            = 0; // for aligning << stuff
-   int                cout_level          = 0; // for aligning << stuff
-   int                parent_token_indent = 0;
-
-   memset(&frm, 0, sizeof(frm));
-
-   /* dummy top-level entry */
-   frm.pse[0].indent     = 1;
-   frm.pse[0].indent_tmp = 1;
-   frm.pse[0].type       = CT_EOF;
-
-   pc = chunk_get_head();
-   while (pc != NULL)
-   {
-      /* Handle proprocessor transitions */
-      was_preproc = in_preproc;
-      in_preproc  = (pc->flags & PCF_IN_PREPROC) != 0;
-
-      if (cpd.settings[UO_indent_brace_parent].b)
-      {
-         parent_token_indent = token_indent(pc->parent_type);
-      }
-
-      /* Clean up after a #define */
-      if (!in_preproc)
-      {
-         while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
-         {
-            indent_pse_pop(frm, pc);
-         }
-      }
-      else
-      {
-         pf_check(&frm, pc);
-
-         if (!was_preproc)
-         {
-            /* Transition into a preproc by creating a dummy indent */
-            frm.level++;
-            indent_pse_push(frm, pc);
-
-            frm.pse[frm.pse_tos].indent     = 1 + indent_size;
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-         }
-      }
-
-      if ((cout_col > 0) &&
-          (chunk_is_semicolon(pc) ||
-           (pc->level < cout_level)))
-      {
-         cout_col   = 0;
-         cout_level = 0;
-      }
-
-      /**
-       * Handle non-brace closures
-       */
-
-      int old_pse_tos;
-      do
-      {
-         old_pse_tos = frm.pse_tos;
-
-         /* End anything that drops a level
-          * REVISIT: not sure about the preproc check
-          */
-         if (!chunk_is_newline(pc) &&
-             !chunk_is_comment(pc) &&
-             ((pc->flags & PCF_IN_PREPROC) == 0) &&
-             (frm.pse[frm.pse_tos].level > pc->level))
-         {
-            indent_pse_pop(frm, pc);
-         }
-
-         if (frm.pse[frm.pse_tos].level == pc->level)
-         {
-            /* process virtual braces closes (no text output) */
-            if ((pc->type == CT_VBRACE_CLOSE) &&
-                (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN))
-            {
-               indent_pse_pop(frm, pc);
-               frm.level--;
-               pc = chunk_get_next(pc);
-            }
-
-            /* End any assign operations with a semicolon on the same level */
-            if ((frm.pse[frm.pse_tos].type == CT_ASSIGN) &&
-                (chunk_is_semicolon(pc) ||
-                 (pc->type == CT_COMMA) ||
-                 (pc->type == CT_BRACE_OPEN)))
-            {
-               indent_pse_pop(frm, pc);
-            }
-
-            /* End any CPP class colon crap */
-            if ((frm.pse[frm.pse_tos].type == CT_CLASS_COLON) &&
-                ((pc->type == CT_BRACE_OPEN) ||
-                 chunk_is_semicolon(pc)))
-            {
-               indent_pse_pop(frm, pc);
-            }
-
-            /* a case is ended with another case or a close brace */
-            if ((frm.pse[frm.pse_tos].type == CT_CASE) &&
-                ((pc->type == CT_BRACE_CLOSE) ||
-                 (pc->type == CT_CASE)))
-            {
-               indent_pse_pop(frm, pc);
-            }
-
-            /* a return is ended with a semicolon */
-            if ((frm.pse[frm.pse_tos].type == CT_RETURN) &&
-                chunk_is_semicolon(pc))
-            {
-               indent_pse_pop(frm, pc);
-            }
-
-            /* Close out parens and squares */
-            if ((frm.pse[frm.pse_tos].type == (pc->type - 1)) &&
-                ((pc->type == CT_PAREN_CLOSE) ||
-                 (pc->type == CT_SPAREN_CLOSE) ||
-                 (pc->type == CT_FPAREN_CLOSE) ||
-                 (pc->type == CT_SQUARE_CLOSE) ||
-                 (pc->type == CT_ANGLE_CLOSE)))
-            {
-               indent_pse_pop(frm, pc);
-               frm.paren_count--;
-            }
-         }
-      } while (old_pse_tos > frm.pse_tos);
-
-      /* Grab a copy of the current indent */
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
-
-      if (!chunk_is_newline(pc) && !chunk_is_comment(pc))
-      {
-         LOG_FMT(LINDPC, " -=[ %.*s ]=- top=%d %s %d/%d\n",
-                 pc->len, pc->str,
-                 frm.pse_tos,
-                 get_token_name(frm.pse[frm.pse_tos].type),
-                 frm.pse[frm.pse_tos].indent_tmp,
-                 frm.pse[frm.pse_tos].indent);
-      }
-
-      /**
-       * Handle stuff that can affect the current indent:
-       *  - brace close
-       *  - vbrace open
-       *  - brace open
-       *  - case         (immediate)
-       *  - labels       (immediate)
-       *  - class colons (immediate)
-       *
-       * And some stuff that can't
-       *  - open paren
-       *  - open square
-       *  - assignment
-       *  - return
-       */
-
-      if (pc->type == CT_BRACE_CLOSE)
-      {
-         if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN)
-         {
-            indent_pse_pop(frm, pc);
-            frm.level--;
-
-            /* Update the indent_column if needed */
-            if (!cpd.settings[UO_indent_braces].b &&
-                (parent_token_indent == 0))
-            {
-               indent_column = frm.pse[frm.pse_tos].indent_tmp;
-            }
-
-            if ((pc->parent_type == CT_IF) ||
-                (pc->parent_type == CT_ELSE) ||
-                (pc->parent_type == CT_ELSEIF) ||
-                (pc->parent_type == CT_DO) ||
-                (pc->parent_type == CT_WHILE) ||
-                (pc->parent_type == CT_SWITCH) ||
-                (pc->parent_type == CT_FOR))
-            {
-               indent_column += cpd.settings[UO_indent_brace].n;
-            }
-         }
-      }
-      else if (pc->type == CT_VBRACE_OPEN)
-      {
-         frm.level++;
-         indent_pse_push(frm, pc);
-
-         frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + indent_size;
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-
-         /* Always indent on virtual braces */
-         indent_column = frm.pse[frm.pse_tos].indent_tmp;
-      }
-      else if (pc->type == CT_BRACE_OPEN)
-      {
-         frm.level++;
-         indent_pse_push(frm, pc);
-
-         if (frm.paren_count != 0)
-         {
-            /* We are inside ({ ... }) -- indent one tab from the paren */
-            frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-         }
-         else
-         {
-            /* Use the prev indent level + indent_size. */
-            frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
-
-            /* If this brace is part of a statement, bump it out by indent_brace */
-            if ((pc->parent_type == CT_IF) ||
-                (pc->parent_type == CT_ELSE) ||
-                (pc->parent_type == CT_ELSEIF) ||
-                (pc->parent_type == CT_DO) ||
-                (pc->parent_type == CT_WHILE) ||
-                (pc->parent_type == CT_SWITCH) ||
-                (pc->parent_type == CT_FOR))
-            {
-               if (parent_token_indent != 0)
-               {
-                  frm.pse[frm.pse_tos].indent += parent_token_indent - indent_size;
-               }
-               else
-               {
-                  frm.pse[frm.pse_tos].indent += cpd.settings[UO_indent_brace].n;
-                  indent_column += cpd.settings[UO_indent_brace].n;
-               }
-            }
-            else if (pc->parent_type == CT_CASE)
-            {
-               /* The indent_case_brace setting affects the parent CT_CASE */
-               frm.pse[frm.pse_tos].indent_tmp += cpd.settings[UO_indent_case_brace].n;
-               frm.pse[frm.pse_tos].indent     += cpd.settings[UO_indent_case_brace].n;
-            }
-            else if ((pc->parent_type == CT_CLASS) && !cpd.settings[UO_indent_class].b)
-            {
-               frm.pse[frm.pse_tos].indent -= indent_size;
-            }
-            else if ((pc->parent_type == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
-            {
-               frm.pse[frm.pse_tos].indent -= indent_size;
-            }
-         }
-
-         if ((pc->flags & PCF_DONT_INDENT) != 0)
-         {
-            frm.pse[frm.pse_tos].indent = pc->column;
-            indent_column = pc->column;
-         }
-         else
-         {
-            /**
-             * If there isn't a newline between the open brace and the next
-             * item, just indent to wherever the next token is.
-             * This covers this sort of stuff:
-             * { a++;
-             *   b--; };
-             */
-            next = chunk_get_next_ncnnl(pc);
-            if (!chunk_is_newline_between(pc, next))
-            {
-               frm.pse[frm.pse_tos].indent = next->column;
-            }
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-            frm.pse[frm.pse_tos].open_line  = pc->orig_line;
-
-            /* Update the indent_column if needed */
-            if (cpd.settings[UO_indent_braces].n ||
-                (parent_token_indent != 0))
-            {
-               indent_column = frm.pse[frm.pse_tos].indent_tmp;
-            }
-         }
-      }
-      else if (pc->type == CT_CASE)
-      {
-         /* Start a case - indent UO_indent_switch_case from the switch level */
-         tmp = frm.pse[frm.pse_tos].indent + cpd.settings[UO_indent_switch_case].n;
-
-         indent_pse_push(frm, pc);
-
-         frm.pse[frm.pse_tos].indent     = tmp;
-         frm.pse[frm.pse_tos].indent_tmp = tmp - indent_size;
-
-         /* Always set on case statements */
-         indent_column = frm.pse[frm.pse_tos].indent_tmp;
-      }
-      else if (pc->type == CT_LABEL)
-      {
-         /* Labels get sent to the left or backed up */
-         if (cpd.settings[UO_indent_label].n > 0)
-         {
-            indent_column = cpd.settings[UO_indent_label].n;
-         }
-         else
-         {
-            indent_column = frm.pse[frm.pse_tos].indent +
-                            cpd.settings[UO_indent_label].n;
-         }
-      }
-      else if (pc->type == CT_CLASS_COLON)
-      {
-         /* just indent one level */
-         indent_pse_push(frm, pc);
-         frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-
-         indent_column = frm.pse[frm.pse_tos].indent_tmp;
-
-         if (cpd.settings[UO_indent_class_colon].b)
-         {
-            prev = chunk_get_prev(pc);
-            if (chunk_is_newline(prev))
-            {
-               frm.pse[frm.pse_tos].indent += 2;
-               /* don't change indent of current line */
-            }
-         }
-      }
-      else if ((pc->type == CT_PAREN_OPEN) ||
-               (pc->type == CT_SPAREN_OPEN) ||
-               (pc->type == CT_FPAREN_OPEN) ||
-               (pc->type == CT_SQUARE_OPEN) ||
-               (pc->type == CT_ANGLE_OPEN))
-      {
-         /* Open parens and squares - never update indent_column */
-         indent_pse_push(frm, pc);
-         frm.pse[frm.pse_tos].indent = pc->column + pc->len;
-
-         if (cpd.settings[UO_indent_func_call_param].b &&
-             (pc->type == CT_FPAREN_OPEN) &&
-             (pc->parent_type == CT_FUNC_CALL))
-         {
-            frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
-         }
-
-         if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) ||
-             (chunk_is_str(pc, "[", 1) && !cpd.settings[UO_indent_square_nl].b))
-         {
-            next = chunk_get_next_nc(pc);
-            if (chunk_is_newline(next))
-            {
-               int sub = 1;
-               if (frm.pse[frm.pse_tos - 1].type == CT_ASSIGN)
-               {
-                  sub = 2;
-               }
-               frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - sub].indent + indent_size;
-            }
-         }
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-         frm.paren_count++;
-      }
-      else if (pc->type == CT_ASSIGN)
-      {
-         /**
-          * if there is a newline after the '=', just indent one level,
-          * otherwise align on the '='.
-          * Never update indent_column.
-          */
-         next = chunk_get_next(pc);
-         if (next != NULL)
-         {
-            indent_pse_push(frm, pc);
-            if (chunk_is_newline(next))
-            {
-               frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-            }
-            else
-            {
-               frm.pse[frm.pse_tos].indent = pc->column + pc->len + 1;
-            }
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-         }
-      }
-      else if (pc->type == CT_RETURN)
-      {
-         /* don't count returns inside a () or [] */
-         if (pc->level == pc->brace_level)
-         {
-            indent_pse_push(frm, pc);
-            frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + pc->len + 1;
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos - 1].indent;
-         }
-      }
-      else if (chunk_is_str(pc, "<<", 2))
-      {
-         if (cout_col == 0)
-         {
-            cout_col   = pc->column;
-            cout_level = pc->level;
-         }
-      }
-      else
-      {
-         /* anything else? */
-      }
-
-
-      /**
-       * Indent the line if needed
-       */
-      if (did_newline && !chunk_is_newline(pc) && (pc->len != 0))
-      {
-         /**
-          * Check for special continuations.
-          * Note that some of these could be done as a stack item like
-          * everything else
-          */
-
-         prev = chunk_get_prev_ncnnl(pc);
-         if ((pc->type == CT_MEMBER) ||
-             (pc->type == CT_DC_MEMBER) ||
-             ((prev != NULL) &&
-              ((prev->type == CT_MEMBER) ||
-               (prev->type == CT_DC_MEMBER))))
-         {
-            tmp = cpd.settings[UO_indent_member].n + indent_column;
-            LOG_FMT(LINDENT, "%s: %d] member => %d\n",
-                    __func__, pc->orig_line, tmp);
-            reindent_line(pc, tmp);
-         }
-         else if (chunk_is_str(pc, "<<", 2) && (cout_col > 0))
-         {
-            LOG_FMT(LINDENT, "%s: %d] cout_col => %d\n",
-                    __func__, pc->orig_line, cout_col);
-            reindent_line(pc, cout_col);
-         }
-         else if ((vardefcol > 0) &&
-                  (pc->type == CT_WORD) &&
-                  ((pc->flags & PCF_VAR_DEF) != 0) &&
-                  (prev != NULL) && (prev->type == CT_COMMA))
-         {
-            LOG_FMT(LINDENT, "%s: %d] Vardefcol => %d\n",
-                    __func__, pc->orig_line, vardefcol);
-            reindent_line(pc, vardefcol);
-         }
-         else if ((pc->type == CT_STRING) && (prev->type == CT_STRING) &&
-                  cpd.settings[UO_indent_align_string].b)
-         {
-            LOG_FMT(LINDENT, "%s: %d] String => %d\n",
-                    __func__, pc->orig_line, prev->column);
-            reindent_line(pc, prev->column);
-         }
-         else if (chunk_is_comment(pc))
-         {
-            LOG_FMT(LINDENT, "%s: %d] comment => %d\n",
-                    __func__, pc->orig_line, frm.pse[frm.pse_tos].indent_tmp);
-            indent_comment(pc, frm.pse[frm.pse_tos].indent_tmp);
-         }
-         else if (pc->type == CT_PREPROC)
-         {
-            /* Preprocs are always in column 1. See indent_preproc() */
-            if (pc->column != 1)
-            {
-               reindent_line(pc, 1);
-            }
-         }
-         else
-         {
-            if (pc->column != indent_column)
-            {
-               LOG_FMT(LINDENT, "%s: %d] indent => %d [%.*s]\n",
-                       __func__, pc->orig_line, indent_column, pc->len, pc->str);
-               reindent_line(pc, indent_column);
-            }
-         }
-         did_newline = false;
-      }
-
-      /**
-       * Handle variable definition continuation indenting
-       */
-      if ((pc->type == CT_WORD) &&
-          ((pc->flags & PCF_IN_FCN_DEF) == 0) &&
-          ((pc->flags & PCF_VAR_1ST_DEF) == PCF_VAR_1ST_DEF))
-      {
-         vardefcol = pc->column;
-      }
-      if (chunk_is_semicolon(pc) ||
-          ((pc->type == CT_BRACE_OPEN) && (pc->parent_type == CT_FUNCTION)))
-      {
-         vardefcol = 0;
-      }
-
-      /* if we hit a newline, reset indent_tmp */
-      if (chunk_is_newline(pc) ||
-          (pc->type == CT_COMMENT_MULTI) ||
-          (pc->type == CT_COMMENT_CPP))
-      {
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-
-         /**
-          * Handle the case of a multi-line #define w/o anything on the
-          * first line (indent_tmp will be 1 or 0)
-          */
-         if ((pc->type == CT_NL_CONT) &&
-             (frm.pse[frm.pse_tos].indent_tmp <= indent_size))
-         {
-            frm.pse[frm.pse_tos].indent_tmp = indent_size + 1;
-         }
-
-         /* Get ready to indent the next item */
-         did_newline = true;
-      }
-
-      if (!chunk_is_comment(pc) && !chunk_is_newline(pc))
-      {
-         prev = pc;
-      }
-      pc = chunk_get_next(pc);
-   }
-
-   /* Throw out any stuff inside a preprocessor - no need to warn */
-   while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
-   {
-      indent_pse_pop(frm, pc);
-   }
-
-   for (idx = 1; idx <= frm.pse_tos; idx++)
-   {
-      LOG_FMT(LWARN, "%s:%d Unmatched %s\n",
-              cpd.filename, frm.pse[idx].open_line,
-              get_token_name(frm.pse[idx].type));
-      cpd.error_count++;
-   }
-}
-
-/**
- * returns true if forward scan reveals only single newlines or comments
- * stops when hits code
- * false if next thing hit is a closing brace, also if 2 newlines in a row
- */
-
-
-static bool single_line_comment_indent_rule_applies(chunk_t *start)
-{
-   chunk_t *pc      = start;
-   int     nl_count = 0;
-   if (!chunk_is_single_line_comment(pc))
-   {
-      return(false);
-   }
-   /* scan forward, if only single newlines and comments before next line of code, we want to apply */
-   while ((pc = chunk_get_next(pc)) != NULL)
-   {
-      if (chunk_is_newline(pc))
-      {
-         if (nl_count > 0 || pc->nl_count > 1)
-         {
-            return(false);
-         }
-
-         nl_count++;
-      }
-      else
-      {
-         nl_count = 0;
-         if (!chunk_is_single_line_comment(pc))
-         {
-            /* here we check for things to run into that we wouldn't want to indent the comment for */
-            /* for example, non-single line comment, closing brace */
-            if (chunk_is_comment(pc) || chunk_is_closing_brace(pc))
-            {
-               return(false);
-            }
-
-            return(true);
-         }
-      }
-   }
-
-   return(false);
-}
-
-/**
- * REVISIT: This needs to be re-checked, maybe cleaned up
- *
- * Indents comments in a (hopefully) smart manner.
- *
- * There are two type of comments that get indented:
- *  - stand alone (ie, no tokens on the line before the comment)
- *  - trailing comments (last token on the line apart from a linefeed)
- *    + note that a stand-alone comment is a special case of a trailing
- *
- * The stand alone comments will get indented in one of three ways:
- *  - column 1:
- *    + There is an empty line before the comment AND the indent level is 0
- *    + The comment was originally in column 1
- *
- *  - Same column as trailing comment on previous line (ie, aligned)
- *    + if originally within TBD (3) columns of the previous comment
- *
- *  - syntax indent level
- *    + doesn't fit in the previous categories
- *
- * Options modify this behavior:
- *  - keep original column (don't move the comment, if possible)
- *  - keep relative column (move out the same amount as first item on line)
- *  - fix trailing comment in column TBD
- *
- * @param pc   The comment, which is the first item on a line
- * @param col  The column if this is to be put at indent level
- */
-static void indent_comment(chunk_t *pc, int col)
-{
-   chunk_t *nl;
-   chunk_t *prev;
-
-   LOG_FMT(LCMTIND, "%s: line %d, col %d, level %d: ", __func__,
-           pc->orig_line, pc->orig_col, pc->level);
-
-   /* force column 1 comment to column 1 if not changing them */
-   if ((pc->orig_col == 1) && !cpd.settings[UO_indent_col1_comment].b)
-   {
-      LOG_FMT(LCMTIND, "rule 1 - keep in col 1\n");
-      pc->column = 1;
-      return;
-   }
-
-   nl = chunk_get_prev(pc);
-
-   /* outside of any expression or statement? */
-   if (pc->level == 0)
-   {
-      if ((nl != NULL) && (nl->nl_count > 1))
-      {
-         LOG_FMT(LCMTIND, "rule 2 - level 0, nl before\n");
-         pc->column = 1;
-         return;
-      }
-   }
-
-   prev = chunk_get_prev(nl);
-   if (chunk_is_comment(prev) && (nl->nl_count == 1))
-   {
-      int coldiff = prev->orig_col - pc->orig_col;
-
-      if ((coldiff <= 3) && (coldiff >= -3))
-      {
-         pc->column = prev->column;
-         LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %d\n",
-                 coldiff, pc->column);
-         return;
-      }
-   }
-   /* check if special single line comment rule applies */
-   if (cpd.settings[UO_indent_sing_line_comments].n > 0 && single_line_comment_indent_rule_applies(pc))
-   {
-      pc->column = col + cpd.settings[UO_indent_sing_line_comments].n;
-      LOG_FMT(LCMTIND, "rule 4 - single line comment indent, now in %d\n", pc->column);
-      return;
-   }
-   LOG_FMT(LCMTIND, "rule 5 - fall-through, stay in %d\n", col);
-
-   pc->column = col;
-}
-
-
-/**
- * Put spaces on either side of the preproc (#) symbol.
- * This is done by pointing pc->str into pp_str and adjusting the
- * length.
- */
-void indent_preproc(void)
-{
-   chunk_t *pc;
-   chunk_t *next;
-   int     pp_level;
-   int     pp_level_sub = 0;
-   int     tmp;
-
-   /* Define a string of 16 spaces + # + 16 spaces */
-   static const char *pp_str  = "                #                ";
-   static const char *alt_str = "                %:                ";
-
-   /* Scan to see if the whole file is covered by one #ifdef */
-   int stage = 0;
-
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_comment(pc) || chunk_is_newline(pc))
-      {
-         continue;
-      }
-
-      if (stage == 0)
-      {
-         /* Check the first PP, make sure it is an #if type */
-         if (pc->type != CT_PREPROC)
-         {
-            break;
-         }
-         next = chunk_get_next(pc);
-         if ((next == NULL) || (next->type != CT_PP_IF))
-         {
-            break;
-         }
-         stage = 1;
-      }
-      else if (stage == 1)
-      {
-         /* Scan until a PP at level 0 is found - the close to the #if */
-         if ((pc->type == CT_PREPROC) &&
-             (pc->pp_level == 0))
-         {
-            stage = 2;
-         }
-         continue;
-      }
-      else if (stage == 2)
-      {
-         /* We should only see the rest of the preprocessor */
-         if ((pc->type == CT_PREPROC) ||
-             ((pc->flags & PCF_IN_PREPROC) == 0))
-         {
-            stage = 0;
-            break;
-         }
-      }
-   }
-
-   if (stage == 2)
-   {
-      LOG_FMT(LINFO, "The whole file is covered by a #IF\n");
-      pp_level_sub = 1;
-   }
-
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-   {
-      if (pc->type != CT_PREPROC)
-      {
-         continue;
-      }
-
-      if (pc->column != 1)
-      {
-         /* Don't handle preprocessors that aren't in column 1 */
-         LOG_FMT(LINFO, "%s: Line %d doesn't start in column 1 (%d)\n",
-                 __func__, pc->orig_line, pc->column);
-         continue;
-      }
-
-      /* point into pp_str */
-      if (pc->len == 2)
-      {
-         /* alternate token crap */
-         pc->str = &alt_str[16];
-      }
-      else
-      {
-         pc->str = &pp_str[16];
-      }
-
-      pp_level = pc->pp_level - pp_level_sub;
-      if (pp_level < 0)
-      {
-         pp_level = 0;
-      }
-      else if (pp_level > 16)
-      {
-         pp_level = 16;
-      }
-
-      /* Note that the indent is removed by default */
-      if ((cpd.settings[UO_pp_indent].a & AV_ADD) != 0)
-      {
-         /* Need to add some spaces */
-         pc->str -= pp_level;
-         pc->len += pp_level;
-      }
-      else if (cpd.settings[UO_pp_indent].a == AV_IGNORE)
-      {
-         tmp      = (pc->orig_col <= 16) ? pc->orig_col - 1 : 16;
-         pc->str -= tmp;
-         pc->len += tmp;
-      }
-
-      /* Add spacing by adjusting the length */
-      if ((cpd.settings[UO_pp_space].a & AV_ADD) != 0)
-      {
-         pc->len += pp_level;
-      }
-
-      next = chunk_get_next(pc);
-      if (next != NULL)
-      {
-         reindent_line(next, pc->len + 1);
-      }
-
-      LOG_FMT(LPPIS, "%s: Indent line %d to %d (len %d, next->col %d)\n",
-              __func__, pc->orig_line, pp_level, pc->len, next->column);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp
deleted file mode 100644
index 6cd779a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-(tmp
-            ? chunk_is_newline(tmp)
-? "newline"
-		: chunk_is_comment(tmp)
-                          ? "comment"
-						     : "other"
-						                    : chunk_is_newline(tmp)
-          ? "newline"
-                                                      : chunk_is_comment(tmp)
-                ? "comment"
-                                : "other");
-
-a
-? b
-    + c
-  : d
-    + e;
-
-    return
-    outerFlag
-                    ? RadioButton
-        : innerFlag
-  ? Badge
-                                    : nil;
-
-x = outerFlag
-                                ? RadioButton(
-              arg1
-        )
-    : Checkbutton
-  .arg2;
-
-    Builder
-    .child(
-      outerFlag
-      ? RadioButton(
-        buttonArg
-      )
-      : innerFlag
-        ? Badge
-          .component(
-        LabelText)
-        : nil
-    );
-
-
-accessoryType
-      ? ConKSC1{}
-    : flag == false
-        ? ConKSC2{}
-        .build()
-  : flag == true
-      ? ConKSC3{}
-      .build()
-  : ConKSC4{}
-  .build();
-
-options.meta == nil
-    ? metaCmpnt
-    :  CBuilder()
-.spacing(4)
-    .subCmpnt(
-  CBuilder()
-        .build());
-
-options.meta == nil
-    ? CBuilder()
-  .spacing(4)
-.subCmpnt(
-    CBuilder()
-.build()
-)
-: Builder
-      .spacing;
-
-      options == nil ? CBuilder()
-  .spacing(6)
-: Builder
-      .spacing;
-
-      options == nil ? CBuilder()
-  .spacing(6) : Builder
-      .spacing;
-
-flag
-       ? isChild
-    ? TypeBack
-: TypeCancel
-       : nil;
-
-
-func something() {
-  if (flag) {
-    x == flag
-    ? Builder
-          .spacing
-      : Builder
-      .spacing;
-  }
-}
-
-
-flag1
-?   ( flag2
-          ? ( flag3
-    ?   result1
-      :  result2 )
-    :   ( result3  )
-  )
-    :  (  flag5
-    ? ( flag
-            ? result4
-        : result5)
-    :   (  flag6
-      ? result6
-        : ( result7   )
-        )
-        );
-
-
-flag1
-?   result1
-            :  (
-              flag5
-    );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp
deleted file mode 100644
index 78a924f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-struct S
-{
-int one, two;
-S(int i = 1)
-{
-one = i;
-two = i + i;
-}
-bool check() const
-{
-return one == 1;
-}
-};
-
-struct S
-{
-enum {
-twentythree = 23,
-fortytwoseven = 427
-};
-int one, two;
-S(int i = 1)
-{
-one = i;
-two = i + i;
-}
-bool check() const
-{
-return one == 1;
-}
-};
-
-static  uint jhash(K x)
-    {
-        ubyte *k;
-        uint  a,
-              b,
-              c;
-
-        uint  
-a,
-              b,
-              c;
-
-        len = x.length;
-}
-
-const char *token_names[] =
-{
-   [CT_POUND]   = "POUND",
-   [CT_PREPROC] = "PREPROC",
-};
-
-struct whoopee *
-foo4(
-   int param1,
-   int param2,
-   char *param2
-   );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp
deleted file mode 100644
index 79a7ad65..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-struct X {
-void operator-(int);
-void operator+(int);
-void operator()();
-};
-/* *INDENT-OFF* */
-  struct Y {
-    void operator-(int){}
-
-
-   void operator+(int){}  \
-    void operator()(){}
-
-     void func() {
-	 			auto x = "	test\t 	 	 		...   ???";}
-  };
-/* *INDENT-ON* */
-struct Y {
-void operator-(int){}
-void operator+(int){}
-void operator()(){}
-     void func() {
-	 			auto x = "	test\t 	 	 		...   ???";}
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp
deleted file mode 100644
index a8c4a514..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-int a ()
-{
-  double a_very_long_variable = test (foobar1,
-  foobar5);
-//3456789=123456789=123456789=123456789=
-
-  double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-  asdfasdfasdf - asdfasdf + 56598;
-//3456789=123456789=123456789=123456789=
-
-  a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
-  asdfasdfasdf - asdfasdf + 56598;
-//3456789=123456789=123456789=123456789=
-
-  testadsfa (dfasdf,
-  aaafsdfa);
-//3456789=123456789=123456789=123456789=
-
-  return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h
deleted file mode 100644
index c5b39b37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-class MyClass
-{
-public:
-
-struct something
-{
-int one;
-int two;
-}
-
-MyClass()
-{
-}
-
-void oneFunction()
-{
-if (1 == 0)
-{
-instructions;
-}
-}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp
deleted file mode 100644
index d417b5be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <string>
-
-extern char* externBufferWithAVeryLongName;
-extern unsigned int externBufferSizeWithLongName;
-
-std::string foo()
-{
-    return std::string{ externBufferWithAVeryLongName
-        , externBufferSizeWithLongName };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp
deleted file mode 100644
index 8e01afc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <string>
-
-extern char* externBufferWithAVeryLongName;
-extern unsigned int externBufferSizeWithLongName;
-
-std::string foo{ externBufferWithAVeryLongName
-    , externBufferSizeWithLongName };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp
deleted file mode 100644
index 7ddfacbf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// First comment
- // Second comment
-
- // First comment
-// Second comment
-
-// Issue #1134
-class MyClass : public BaseClass
-{
-    //@{ BaseClass interface
-#if VERY_LONG_AND_COMPLICATED_DEFINE
-    void foo();
-#endif // VERY_LONG_AND_COMPLICATED_DEFINE
-    //@}
-};
-
-// Issue #1287
-void foo()
-{
-#if defined(SUPPORT_FEATURE)
-    bar();
-#endif // SUPPORT_FEATURE
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#if defined(SUPPORT_FEATURE)
-    bar();
-#endif // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#   if defined(SUPPORT_FEATURE)
-    bar();
-#   endif // SUPPORT_FEATURE
-           // SUPPORT_FEATURE
-    // Handle error
-    // Handle error
-    if (error != 0)
-    {
-    }
-
-#   if defined(SUPPORT_FEATURE)
-    bar();
-#   endif // SUPPORT_FEATURE
-         // SUPPORT_FEATURE
-     // Handle error
-   // Handle error
-    if (error != 0)
-    {
-    }
-
-    #if defined(SUPPORT_FEATURE)
-    bar();
-    #endif /* SUPPORT_FEATURE
-            SUPPORT_FEATURE */
-   // Handle error
-     // Handle error
-    if (error != 0)
-    {
-    }
-}
-
-// ----- Some namespace scope --------------------------------------------------
-// ----- FooNamespace scope ----------------------------------------------------
-namespace FooNamespace
-{
-// ----- Some classes scope ----------------------------------------------------
-// ----- FooClass scope --------------------------------------------------------
-class FooClass
-{
-    using FooUsing = FooTemplate<
-        param1,
-        param2
-    >; // FooTemplate
-    // Foo description
-    void foo()
-    {
-        if (a == b)
-        {
-// Col1 comment
- // Col1 comment
- // Col1 comment
-             // Baz description
-            baz(); // Baz trailing comment begin
-                     // Baz trailing comment ...
-                       // Baz trailing comment end
-        } // if (a == b)
-       // Bar description begin
-         // Bar description ...
-      // Bar description end
-        bar(
-            a,
-            b
-        ); // bar trailing comment begin
-           // bar trailing comment ...
-          // Baz trailing comment end
-        /*! Baz description begin
-           *Baz description ...
-            * Baz description end */
-        baz(a,
-        b); /* Baz trailing comment begin
-               Baz trailing comment ...
-             Baz trailing comment end */
-        // Bar description
-        bar(); // bar trailing comment begin
-             // bar trailing comment ...
-             // Baz trailing comment end
-
-        // Baz description
-        baz();
-    }
-    void bar();
-    // Many methods
-    void baz();
-}; // FooClass
-// ----- FooClass scope --------------------------------------------------------
-
-// Many classes
-  // Many classes
-  // Many classes
-
-class BazClass
-{
-    void foo();
-
-// Many methods
-  // Many methods
-  // Many methods
-
-// Overrides
-  // Overrides
-  //Overrides
-protected:
-    // Bar description
-    void baz();
-    //Overrides
-}; // BazClass trailing comment begin
-  // BazClass trailing comment ...
- // BazClass trailing comment end
-// ----- Some classes scope ----------------------------------------------------
-} // FooNamespace trailing comment begin
- // FooNamespace trailing comment end
-// ----- FooNamespace scope ----------------------------------------------------
-// BarNamespace description
-namespace BarNamespace
-{
-} // namespace BarNamespace
-// ----- Some namespace scope --------------------------------------------------
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp
deleted file mode 100644
index d9fefe24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-struct MyClass : public Foo,
-                 private Bar {
-  MyClass(int a, int b, int c)
-	 : m_a(a), m_b(b),
-   m_c(c) {}
-private :
-  int m_a, m_b, m_c;
-};
-
-struct TheirClass
-: public Foo,
-private Bar {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp
deleted file mode 100644
index 4fbd1b4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-Foo::Foo() :
-    Base(12),
-    mValue(24) {
-    func();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h
deleted file mode 100644
index f97bd324..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace ns1 {
-
-   void bar1(void);
-
-   class foo1
-   {
-      int i1;
-   };
-}
-
-namespace ns2
-{
-
-   void bar2(void);
-
-   class foo2
-   {
-      int i2;
-   };
-}
-
-namespace
-{
-
-   void bar3(void);
-   class foo3
-   {
-      int i3;
-   };
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h
deleted file mode 100644
index db2ce47d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace ns1 {
-namespace ns2 {
-namespace ns3{
-
-	using namespace foo::os;
-
-   class foo2
-   {
-      int i2;
-   };
-	}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h
deleted file mode 100644
index 97d57444..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h
+++ /dev/null
@@ -1,100 +0,0 @@
-namespace ns1 {
-	namespace ns2 {
-		namespace ns3 {
-			void a();
-		}
-	}
-}
-
-extern "C" {
-	namespace ns1 {
-		namespace ns2 {
-			namespace ns3 {
-				void b();
-			}
-		}
-	}
-}
-
-namespace ns1 {
-	extern "C" {
-		namespace ns2 {
-			namespace ns3 {
-				void c();
-			}
-		}
-	}
-}
-
-namespace ns1 {
-	namespace ns2 {
-		extern "C" {
-			namespace ns3 {
-				void d();
-			}
-		}
-	}
-}
-
-namespace ns1 {
-	namespace ns2 {
-		namespace ns3 {
-			extern "C" {
-				void e();
-			}
-		}
-	}
-}
-
-#define M1(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-		namespace ns2 { \
-			namespace ns3 { \
-				void f(); \
-			} \
-		} \
-	}
-
-#define M2(ns1, ns2, ns3, f) \
-	extern "C" { \
-		namespace ns1 { \
-			namespace ns2 { \
-				namespace ns3 { \
-					void b(); \
-				} \
-			} \
-		} \
-	}
-
-#define M3(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-		extern "C" { \
-			namespace ns2 { \
-				namespace ns3 { \
-					void c(); \
-				} \
-			} \
-		} \
-	}
-
-#define M4(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-		namespace ns2 { \
-			extern "C" { \
-				namespace ns3 { \
-					void d(); \
-				} \
-			} \
-		} \
-	}
-
-#define M5(ns1, ns2, ns3, f) \
-	namespace ns1 { \
-		namespace ns2 { \
-			namespace ns3 { \
-				extern "C" { \
-					void e(); \
-				} \
-			} \
-		} \
-	}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp
deleted file mode 100644
index 58e24797..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-int foo1()
-{
-	return std::pair<int, int>{
-		1, 2
-		}.first;
-}
-
-int foo2()
-{
-	return
-	 int{3} & 2;
-}
-
-int foo3()
-{
-	constexpr static int x = 3;
-	return
-	 decltype(x){x} & 2;
-}
-
-int foo4()
-{
-	return
-	new Type();
-}
-
-int foo5()
-{
-	return
-	veryLongMethodCall(
-		arg1,
-		longMethodCall(
-			methodCall(
-				arg2, arg3
-			), arg4
-		)
-	);
-}
-
-int foo6()
-{
-   auto my_lambda = [] ()
-   {
-      return 1 +
-             2 +
-             3;
-
-   };
-}
-
-template<typename U>
-U *
-find(const std::string &name = "") const
-{
-    return find<U>([&name] (auto *pComposite)
-                   {
-                       return name.empty() ||
-                              pComposite->getName() == name;
-                   });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp
deleted file mode 100644
index c194141b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-extern int select(int __nfds, fd_set * __restrict __readfds,
-                  fd_set  *  __restrict  __writefds,
-                  fd_set *  __restrict  __exceptfds,
-                   struct  timeval * __restrict __timeout);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp
deleted file mode 100644
index 96b38fba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-SomeClass::SomeClass()

-{

-    SomeFunction

-    (

-        aTest,

-        aResult

-    );

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp
deleted file mode 100644
index ff8c3e44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class SomeClass {

-public:

-void SomeFunction

-(

-    int const aTest,

-    int const aResult

-);

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp
deleted file mode 100644
index 703e0422..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-class SomeClass

-{

-public:

-void SomeFunction

-(

-    int const aTest,

-    int const aResult

-)

-{

-    DoSomeStuff();

-}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp
deleted file mode 100644
index 54684fa7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// We want simple 4-space indentation for each nesting "level".
-
-// cannot find a way to tell uncrustify to indent the line with parenthesis
-int case2() {
-
-    if (condition) {
-        // some code here
-    }
-
-    std::out <<
-       "hello " << "world " <<
-     (who ? "and " : "or ") <<
-			"all " <<
-  "others" << ";" << std::endl;
-
-    // and
-
-    if (condition) {
-        // some code here
-    }
-
-    std::out <<
-       "hello " << "world " <<
-     ("and ") <<
-        "all " <<
-      "others" << ";" << std::endl;
-
-	if (cond)
-			std::out << "hi";
-
-if (cond)
-std::out
-<< "hi"
-<< "and"
-<< "more"
-;
-
-switch (var) {
-		case 0:
-log() << 5
-<< 5;
-		break;
-}
-
-#if 0
-	out
-	<< 5;
-#endif
-
- return log
-        >> var
-        >> second
- ;
-}
-
-
-// uncrustify aligns (with the << on the first line) instead of indenting
-void case3()
-{
-
-    if (condition1) {
-
-        if (condition2) {
-
-    std::out << "hello "
-			<< "world "
-      << (who ? "and " : "or ")
-       << "all "
-          << "others" << ";" << std::endl;
-
-        }
-    }
-
-    // this often works better, but has problems with parentheses:
-
-    if (condition1) {
-        if (condition2) {
-    std::out << "hello " <<
-         "world " <<
-     (who ? "and " : "or ") <<
-    "all " <<
-   "others" << ";" << std::endl;
-		}
-	}
-}
-
-// uncrustify does not indent >> at all!
-void case4()
-{
-    if (condition) {
-        // some code here
-    }
-
-    std::in >> a
-		>> b
-      >> (who ? c : d) >>
-    >> e;
-
-    // and
-
-    if (condition1) {
-
-        if (condition2) {
-    std::in >> a >>
-     b >>
-       (who ? c : d) >>
-   e;
-		}
-	}
-}
-
-void foo() {
-
-	if (head())
-		os << "HEAD,";
-	else
-	if (tail())
-		os << "TAIL,";
-
-	if (a >= 0 &&
-		b <= 0)
-			cerr << "it is";
-}
-
-int list[] = {
-	1,
-2,
-	1 << 5,
-	1 << 6
-};
-
-void check() {
-	ostream &os = Comment(1) << "error: " << workerName <<
-		" terminated by signal " << WTERMSIG(exitStatus);
-
-	return theAddr.addrN().family() == AF_INET6 ?
-		(theAddr.octet(idx * 2) << 8) + theAddr.octet(idx * 2 + 1) :
-		theAddr.octet(idx);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp
deleted file mode 100644
index 1b76e218..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Example for not indenting preprocesser statements inside switch statements

-switch(...)

-{

-case 1:

-case 2:

-{

-int v;

-...

-}

-break;

-

-#if (USE_FIVE)

-case 3:

-doFive();

-break;

-#endif

-

-default:

-break;

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp
deleted file mode 100644
index 394cfb63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void function(){
-int n;
-float f;
-anotherFunction();
-char foo;
-somethingelse();
-} 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp
deleted file mode 100644
index d273ae52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-int 
-a, b, c;
-
-int d, 
-e, f;
-
-void bar(void)
-{
-   struct foobar
-a = { 'x', 0 };
-   struct foobar
-b = { 'y', 2 },
-c = { 'z', 4 };
-   struct foobar d = { 'y', 2 },
-e = { 'z', 4 };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp
deleted file mode 100644
index 70451ac4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp
+++ /dev/null
@@ -1 +0,0 @@
-auto x = foo{0}();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h
deleted file mode 100644
index ff1dcc9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h
+++ /dev/null
@@ -1,22 +0,0 @@
-struct file_lang languages[] =
-{
-   { ".c", "C", LANG_C },
-   { ".cpp", "CPP", LANG_CPP },
-   { ".d", "D", LANG_D },
-   { ".cs", "CS", LANG_CS },
-   { ".vala", "VALA", LANG_VALA },
-   { ".java", "JAVA", LANG_JAVA },
-   { ".pawn", "PAWN", LANG_PAWN },
-   { ".p", "", LANG_PAWN },
-   { ".sma", "", LANG_PAWN },
-   { ".inl", "", LANG_PAWN },
-   { ".h", "", LANG_CPP },
-   { ".cxx", "", LANG_CPP },
-   { ".hpp", "", LANG_CPP },
-   { ".hxx", "", LANG_CPP },
-   { ".cc", "", LANG_CPP },
-   { ".di", "", LANG_D },
-   { ".m", "OC", LANG_OC },
-   { ".sqc", "", LANG_C }, // embedded SQL
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp
deleted file mode 100644
index 83188d77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-MyClass::MyClass(Type *var1, Type *var2) :
-    BaseClass(parent)
-  , mVar1(var1)
-  , mVar2(var2) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp
deleted file mode 100644
index bc039e18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "sdkconfig.h"
-
-#include <fs/nvs_storage.hpp>
-#include <network/interface.hpp>
-
-extern "C" void app_main (void) {
-  fs::nvs_storage ::initialize ();
-  network::interface ::initialize ();
-}
-
-#include "sdkconfig.h"
-#include "esp_wifi.h"
-#include "network/interface.hpp"
-
-
-using namespace network;
-void interface ::initialize () {
-  tcpip_adapter_init ();
-}
-
-// ----------------------------------------
-
-namespace A {
-    class interface {
-    public:
-        interface() {
-        }
-
-        ~interface() {
-        }
-
-        void foo() {}
-    };
-}
-
-namespace B {
-    class interface {
-    public:
-        interface();
-        ~interface();
-        void foo();
-    };
-
-    inline interface :: interface() {}
-    inline interface :: ~interface() {}
-    inline void interface :: foo() {}
-}
-
-namespace C {
-    class interface {
-    public:
-        interface();
-        ~interface();
-        void foo();
-    };
-
-    interface :: interface() {}
-    interface :: ~interface() {}
-    void interface :: foo() {}
-}
-
-interface :: external_iterface;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp
deleted file mode 100644
index e3be4d50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#define WARN_IF(EXP) \ 
-             do { if (EXP) \ 
-       fprintf (stderr, "Warning: " #EXP "\n"); } \ 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp
deleted file mode 100644
index 4eea46e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-using x = Foo::foo_t;
-
-using a1 = decltype( &Foo::operator() );
-using a2 = Bar<decltype( &Foo::operator() )>;
-
-using b1 = decltype( *Foo::y );
-using b2 = Bar<decltype( *Foo::y )>;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp
deleted file mode 100644
index c12b83d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-using a1 = decltype(bar());
-using b1 = decltype(bar<int>());
-using c1 = decltype(foo::bar<int>());
-using d1 = decltype(*(bar<int>()));
-using e1 = decltype(*(foo::bar<int>()));
-
-using a2 = decltype(  bar  (  )  );
-using b2 = decltype(  bar  <  int  >  (  )  );
-using c2 = decltype(  foo::bar  <  int  >  (  )  );
-using d2 = decltype(  *(  bar  <  int  >  (  )  )  );
-using e2 = decltype(  *(  foo::bar  <  int  >  (  )  )  );
-
-using a3 = decltype(  bar  (  0  )  );
-using b3 = decltype(  bar  <  int  >  (  0  )  );
-using c3 = decltype(  foo::bar  <  int  >  (  0  )  );
-using d3 = decltype(  *(  bar  <  int  >  (  0  )  )  );
-using e3 = decltype(  *(  foo::bar  <  int  >  (  0  )  )  );
-
-using x1 = decltype((0));
-using x2 = decltype(  (  0  )  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp
deleted file mode 100644
index 2923a4a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void foo1(int(&x)[2]);
-void foo2(  int  (  &  x  )  [  2  ]  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp
deleted file mode 100644
index 4c819605..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-
-decltype  (x)  y;
-decltype  (x)  z = 5;
-
-decltype  (char{5})  a = 'a';
-
-using x_t = decltype  (x)  ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp
deleted file mode 100644
index 187065d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-void foo()
-{
-	int a;
-	vector<unsigned> b;
-	long c;
-	decltype(a) d;
-}
-
-void bar()
-{
-	int a;
-	std::vector<unsigned> b;
-	long c;
-	decltype(a) d;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp
deleted file mode 100644
index 9682da68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace foo
-{
-long_type_name_t &foo1();
-foo_t &foo2();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp
deleted file mode 100644
index 4e5685a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Don't break a prototype followed by a one-liner
-class foo1
-{
-foo1();
-foo1(int) {}
-int bar();
-int bar(int) { return 0; }
-foo1(long);
-foo1(short) {}
-int x;
-};
-
-// Don't break a one-liner followed by a prototype
-class foo2
-{
-foo2(int) {}
-foo2();
-int bar(int) { return 0; }
-int bar();
-foo2(short) {}
-foo2(long);
-int x;
-};
-
-// Do break a prototype followed by a multi-line definition
-class foo3
-{
-foo3();
-foo3(int)
-{
-	x = 0;
-}
-int bar();
-int bar(int)
-{
-	return 0;
-}
-foo3(long);
-foo3(short)
-{
-	x = 0;
-}
-int x;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp
deleted file mode 100644
index aa324f2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-int bar;
-// blank line should be inserted before this comment
-vector<int> foo()
-{
-	return {};
-}
-// blank line should be inserted before this comment, not after
-template<>
-volatile
-int x::
-foo()
-{
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp
deleted file mode 100644
index 39b9446d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-extern int foo();
-extern int foo(size_t);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp
deleted file mode 100644
index 8c582cf9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-if(x)[[likely]]{}
-if(x)
-[[unlikely]]
-{}
-
-g();
-
-if(x)[[likely]]l();
-if(x)
-[[unlikely]]
-l();
-
-g();
-
-if(x)
-[[unlikely]]
-l1();
-else
-l2();
-
-g();
-
-if(x)
-#if __has_cpp_attribute(likely)
-[[likely]]
-#endif
-	return false;
-else
-	return true;
-
-g();
-
-while(true)[[likely]]{break;}
-while(true)
-[[unlikely]]
-{break;}
-
-g();
-
-if(x)
-	[[likely]]
-{
-	if(y)
-		[[likely]]
-	{}
-}
-
-g();
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp
deleted file mode 100644
index 8c582cf9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-if(x)[[likely]]{}
-if(x)
-[[unlikely]]
-{}
-
-g();
-
-if(x)[[likely]]l();
-if(x)
-[[unlikely]]
-l();
-
-g();
-
-if(x)
-[[unlikely]]
-l1();
-else
-l2();
-
-g();
-
-if(x)
-#if __has_cpp_attribute(likely)
-[[likely]]
-#endif
-	return false;
-else
-	return true;
-
-g();
-
-while(true)[[likely]]{break;}
-while(true)
-[[unlikely]]
-{break;}
-
-g();
-
-if(x)
-	[[likely]]
-{
-	if(y)
-		[[likely]]
-	{}
-}
-
-g();
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp
deleted file mode 100644
index a1ebb1a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace
-{
-
-void g(int a1234567890123456, int b1234567890123456, int c1234567890123456)
-{
-}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp
deleted file mode 100644
index 5725d3d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace
-{
-
-int f = 0;
-
-}
-
-void g(int a1234567890123456, int b1234567890123456, int c1234567890123456)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp
deleted file mode 100644
index 5834e4b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-void child() {
- static_cast< id<Mountable >> ( object);
-}
-
-assert(x<0 && y>=3);
-assert(y <0&&z> 2);
-assert(a>>1);
-
-std::unique_ptr<Interface< T >> GetProjectionAdapter(const std::string& model_name);
-
-auto c = a< b>>c;
-auto c = a << b >>c;
-
-if (Something<a> == c) {
-}
-
-if (id< Something<a >> == c) {
-}
-
-const std::vector< Eigen::Matrix<T, A, B >> & P_c;
-
-const unsigned int wl = w>> lvl;
-
-using Poly = Model<P, Poly<Dx,Dy, Dz>>;
-
-void Compute(
-    Image<E::Matrix< SType, Dim,Int >> const& src,
-    Image< E::Matrix<  TType,Dim, std::string> >& dst);
-
-Opt<std::vector < std::unordered_set<FrameId> >> partition;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp
deleted file mode 100644
index 6e007772..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-obj.AddObject(Object::UniqueName(), 10, [this] {
-    holder.Access([this](const auto &info) {
-    if (IsGood(info)) {
-        Add(info);
-    }
-});
-});
-
-obj.AddObject(
-    Object::UniqueName(),
-    10,
-    [this] {
-    holder.Access([this](const auto &info) {
-    if (IsGood(info)) {
-        Add(info);
-    }
-});
-}
-);
-
-{
-    obj.AddObject(Object::UniqueName(), 10, [this] {
-        holder.Access([this](const auto &info) {
-        if (IsGood(info)) {
-            Add(info);
-        }
-    });
-    });
-
-    obj.AddObject(
-        Object::UniqueName(),
-        10,
-        [this] {
-        holder.Access([this](const auto &info) {
-        if (IsGood(info)) {
-            Add(info);
-        }
-    });
-    }
-    );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp
deleted file mode 100644
index fcdcc715..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// Singular with various newline formats
-auto f = [] -> void {
-    return;
-};
-
-auto f = [] -> void {
-    return;
-}();
-
-auto f = [] -> void
-{
-    return;
-}();
-
-auto f = 
-[] -> void {
-    return;
-};
-
-auto f = 
-[] -> void
-{
-    return;
-};
-
-auto f
-    = [] -> void {
-        int i = 0;
-        return;
-    };
-
-auto f
-    = []
-      {
-          int i = 0;
-          return;
-      };
-
-// Nested lambda
-auto f = [] {
-    auto g = [] {
-        auto h = [] {
-            return;
-        };
-        return;
-    };
-    return;
-};
-
-auto f = [] {
-    auto g = []
-    {
-        auto h = [] {
-            return;
-        };
-        return;
-    };
-    return;
-};
-
-auto f = []
-{
-    auto g = [] {
-        auto h = []
-        {
-            return;
-        };
-        return;
-    };
-    return;
-};
-
-// Nested lambda within functions
-Func(
-    [] { return; },
-    [] { return; }
-);
-
-Func([] { return; },
-    [] { return; }
-);
-
-Func([] { return; },
-    [] { return; }
-)();
-
-Func([] { return; },
-    [] { return; })();
-
-Func([] { return; },
-    [] { return; });
-
-A(
-        B([] (const std::string &s) -> bool {
-            s = "hello";
-            return true;
-            }), 1
-        );
-
-A(
-        B(
-            [] (const std::string &s) -> bool {
-            s = "hello";
-            return true;
-            }
-            ), 1
-        );
-
-// Inside scope
-{
-    std::thread([](const char *c) {
-            std::cout << c << std::endl;
-        }).detach();
-
-    std::thread(
-            [](const char *c) {
-            std::cout << c << std::endl;
-        }
-        ).detach();
-
-    auto f = [&](int a) {
-            return b;
-        };
-
-    auto f = [&](int a)
-    {
-            return b;
-        };
-}
-
-Func(std::count_if(v.begin(), v.end(), [&](const auto &a) {
-            return a == 3;
-    }));
-
-Func(
-        std::count_if(v.begin(), v.end(), [&](const auto &a)
-            {
-            return a == 3;
-    }));
-
-Func(
-        std::count_if(v.begin(), v.end(), [&](const auto &a) {
-            return a == 3;
-    }));
-
-Func(
-        std::count_if(v.begin(), v.end(), [&](const auto &a) {
-            return a == 3;
-    })
-    );
-
-// Test case from issue #3116
-const auto compare = [] (const auto i, const auto j)
-{
-    return i >= j;
-};
-
-std::sort(
-    vector.begin(),
-    vector.end(),
-    [] (const auto i, const auto j)
-{
-    return i >= j;
-}
-);
-
-// Test case from issue #3116
-if(isWidgetOfCurrentRow)
-{
-    it = std::find_if(
-            reloaded.begin(),
-            reloaded.end(),
-            [&rowGuid](const auto& device)
-            {
-            return (device.thingGUID == rowGuid && !device.isWidget);
-            }
-            );
-}
-else
-{
-    it = std::find_if(
-            reloaded.begin(),
-            reloaded.end(),
-            [&rowGuid](const auto& device)
-            {
-            return device.thingGUID == rowGuid;
-            }
-            );
-}
-
-// Test case from issue 1296 and some variants
-obj->Func([&](int a)
-        {
-        return b;
-        });
-
-obj->Func([] -> int
-        {
-        return b;
-        });
-
-obj->Func([]
-        {
-        return b;
-        }
-        );
-
-obj->Func(
-        Func([]
-        {
-        return b;
-        })
-        );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp
deleted file mode 100644
index d203e398..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#define MACRO(templ_type) template <typename T> class Abc<templ_type<T> > { }
-
-template<typename T> class Foo<Bar<T> > { };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp
deleted file mode 100644
index cfbe7963..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void foo()

-{

-	for_each(it.begin(), it.end(), func);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp
deleted file mode 100644
index 0c289a8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-CGPathMoveToPoint   (bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale -3, aPoint.y - aLength+1 +4);

-CGPathAddLineToPoint(bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale   , aPoint.y - aLength+1   );

-CGPathAddLineToPoint(bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale +3, aPoint.y - aLength+1 +4);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp
deleted file mode 100644
index 96e910ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-class A {

-// crash (two parameter, 2nd string parameter has space)

-void check( const QObject* object, const QStringList& strList=QStringList(QString(QLatin1String("one two"))));

-// no crash (two parameter, 2nd string parameter has no space)

-void check( const QObject* object, const QStringList& strList= QStringList(QString(QLatin1String("one"))));

-// no crash (removed QLatin1String)

-void check( const QObject* object, const QStringList& strList =QStringList(QString(("one two"))));

-// no crash (removed QString(QLatin1String))

-void check( const QObject* object, const QStringList& strList = QStringList());

-// no crash (removed 1st parameter only)

-void check( const QStringList& strList = QStringList(QString(QLatin1String("one two"))) );

-};

-int A=5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-auto c = a < b >> 1;

-auto c = a < b;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp
deleted file mode 100644
index e99742ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-template < typename TImage >
-class MorphologicalContourInterpolator:
-  public ImageToImageFilter< TImage, TImage >
-{
-  template < typename T >
-  friend class MorphologicalContourInterpolatorParallelInvoker;
-  friend class ::MultiLabelMeshPipeline;
-
-public:
-  /** Standard class typedefs. */
-  typedef MorphologicalContourInterpolator Self;
-
-protected:
-  MorphologicalContourInterpolator();
-  ~MorphologicalContourInterpolator() {}
-  typename TImage::PixelType m_Label;
-  int                        m_Axis;
-  bool                       m_HeuristicAlignment;
-
-private:
-  MorphologicalContourInterpolator( const Self& ) ITK_DELETE_FUNCTION;
-  void
-  operator=( const Self& ) ITK_DELETE_FUNCTION;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp
deleted file mode 100644
index 6d8dde90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-class
-MyClass
-{
-public:
-   void f123(MyType1 AAAAAAAAAAAAAA, MyType2 BBBBBBBBBBBB, int XXXXXXXXXXXXXXX);
-   void foo(::some::very::looong::_and::complicated::name::MyType& a, ::some::very::looong::_and::complicated::name::MyType& b,
-      some::very::looong::_and::complicated::name::MyType& c);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp
deleted file mode 100644
index e57868e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <string>
-
-class CFoo
-{
-int foo1(int arg);
-int foo2();
-int foo3(char ch, int xx)
-{
-}
-};
-
-int CFoo::foo1(int arg, int arg2)
-{
-}
-
-int CFoo::foo2()
-{
-}
-
-int CFoo::operator +()
-{
-}
-
-map<string, int> func()
-{
-  // some codes
-}
-
-int some_func(void)
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp
deleted file mode 100644
index d167cc1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <string>
-
-namespace bar
-{
-
-class CFoo
-{
-int foo1(int arg);
-private:
-int foo2()
-{
-}
-};
-
-int CFoo::foo1(int arg, char arg2)
-{
-}
-
-int CFoo::foo2()
-{
-}
-
-int CFoo::operator +()
-{
-}
-
-map<string, int> func()
-{
-  // some codes
-}
-
-int some_func(void)
-{
-}
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp
deleted file mode 100644
index bdc499a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-void f1()
-{
-    auto a =
-    [=](int *a, Something & b)
-    {
-        std::cout << "blah: " << *a;
-    };
-}
-
-void f1a()
-{
-    std::for_each(a, b,
-                  [](Something & b)
-                  {
-                      std::cout << "blah: " << *a;
-                  });
-}
-
-void f1b()
-{
-    std::for_each(a, b,
-                  [](int & b) -> foo
-                  {
-                      b += 3;
-                      return b;
-                  });
-}
-
-void f2()
-{
-    Invoke(a, b,
-           [&one, two](int *a, Something & b)
-           {
-               std::cout << "blah: " << *a;
-           });
-}
-
-void f3a()
-{
-   auto a = []  {};
-   auto b = []{return true;};
-}
-
-void f3b()
-{
-   Invoke(a, b,
-          [&one, two]
-          {
-             std::cout << "blah: " << one << two;
-          });
-}
-
-void f3c()
-{
-   int a[]{};
-}
-
-void g1()
-{
-   auto a = [ = ](int* a, Something &b)  { std::cout << "blah: " << *a; };
-}
-
-void g1a()
-{
-   std::for_each(a, b, [](Something& b){std::cout<<"blah: "<<* a;});
-}
-
-void g1b()
-{
-   std::for_each(a, b, []  (int& b)->foo{ b+=3; return(b); });
-}
-
-void g2()
-{
-   Invoke(a, b,
-          [&one, two]  (int *a, Something&b){ std::cout << "blah: " << *a; });
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp
deleted file mode 100644
index d641c281..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-void f1()
-{
-    auto a =
-    [=](int *a, Something & b)
-    {
-        std::cout << "blah: " << *a;
-    };
-}
-
-void f1a()
-{
-    std::for_each(a, b,
-                  [](Something & b)
-        {
-                      std::cout << "blah: " << *a;
-        }
-    );
-}
-
-void f1b()
-{
-    std::for_each(a, b,
-                  [](int & b) -> foo
-                      {
-                      b += 3;
-                      return b;
-                      }
-    );
-}
-
-void f2()
-{
-    Invoke(a, b,
-           [&one, two](int *a, Something & b)
-           {
-               std::cout << "blah: " << *a;
-           }
-    );
-}
-
-void f3a()
-{
-   auto a = [] {};
-   auto b = []{return true;};
-}
-
-void f3b()
-{
-   Invoke(a, b,
-          [&one, two]
-          {
-             std::cout << "blah: " << one << two;
-          }
-   );
-}
-
-void f3c()
-{
-   int a[]{};
-}
-
-void g1()
-{
-   auto a = [ = ](int* a, Something &b) { std::cout << "blah: " << *a; };
-}
-
-void g1a()
-{
-   std::for_each(a, b, [](Something& b){std::cout<<"blah: "<<* a;});
-}
-
-void g1b()
-{
-   std::for_each(a, b, [] (int& b)->foo{ b+=3; return(b); });
-}
-
-void g2()
-{
-   Invoke(a, b,
-          [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp
deleted file mode 100644
index da3db41f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-template<typename T, typename U>
-auto add(T t, U u) -> decltype(t + u) {return t + u;}
-
-int main()
-{
-	auto f1 = [&]() {   return 1;   };
-	auto f2 = [&]() -> decltype(auto) {   return 2;   };
-	string s1{   'a', 'b'   };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp
deleted file mode 100644
index c740c4bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void bar();
-
-struct foo
-{
-	foo() { []{ bar(); }(); }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp
deleted file mode 100644
index 543290fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-void f(){
-	int i = 0;
-	const auto j = [](int k){
-			       return k+2;
-		       }
-	                       (i);
-
-	const auto l = ([](int k){
-		return k+2;
-	})
-	                       (i);
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp
deleted file mode 100644
index 608952c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int main ()
{
   a    = 5;
   bbbb = 6.0;
   int a      = 5;
   float bbbb = 6.0;

   bbbb = 1.0
}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp
deleted file mode 100644
index cdbf7653..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int main ()
-{
-   a    = 5;
-   bbbb = 6.0;
-   int a      = 5;
-   float bbbb = 6.0;
-
-   bbbb = 1.0
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp
deleted file mode 100644
index 20fa083a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int main ()

-{

-   a    = 5;

-   bbbb = 6.0;

-   int a      = 5;

-   float bbbb = 6.0;

-

-   bbbb = 1.0

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp
deleted file mode 100644
index a7638876..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-namespace a::b 
-{
-void foo::bar(int xx)
-{
-switch(xx)
-{
-
-case 1:
-	// filler
-	while (true) 
-{
-if (something)
-{
-do_something();
-
-
-
-}
-else if (something_else)
-{
-do_something_else();
-}
-else
-{
-dont_do_anything();
-break;
-}
-
-}
-break;
-
-case 2:
-  handle_two();
-
-default:
-  handle_the_rest();
-  break;
-}
-}
-
-class long_class
-{
-private:
-
-int m_a;
-int m_name;
-
-public:
-long_class(int a) {}
-
-void f1() {}  
-
-void f2() {}
-
-void f3() {}
-
-};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp
deleted file mode 100644
index 89fe4435..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace boo3 {

-int Fun1()

-{

-	return 42;

-}

-}

-

-namespace boo4 {

- int Fun2()

- {

- 	int a = 7;

- 	int b = 8;

- 	return a+b;

- }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp
deleted file mode 100644
index c27c6b5d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#if (WINVER < 0x0601)

-#endif
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp
deleted file mode 100644
index 8a73b431..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/* Not detected as a prototype? Spacing wrong. */
-static struct my_entry *get_first_entry(const CHAR *blah);
-static CFooo::entry *get_next_entry(const CHAR *blah);
-static struct my_entry *get_next_entry(const CHAR *blah);
-
-/* Not handling prototype params: */
-typedef void (*function_name)(my_t * p_my, int foo);
-typedef void (*function_name)(my_t * , int );
-
-typedef enum
-{
-   one = 1,
-   three = 3,
-   five_hundred = 5,
-   a_really_really_big_number = 6,
-   two = 7,
-   a_really_really_really_big_number = 8,
-}yuck_t;
-
-const char *names[] =
-{
-   one                               = "one",
-   three                             = "three",
-   five_hundred                      = "five_hundred",
-   a_really_really_big_number        = "a_really_really_big_number",
-   two                               = "two",
-   a_really_really_really_big_number = "a_really_really_really_big_number",
-};
-
-bool foo(char c)
-{
-   xWindow *pWindow = ::RelatedWindow();
-
-   /* space between ] and ( */
-   function_list[idx](param);
-
-   /* Indenting with multiple members: */
-   sass.asdfvas->asdfasd[asdfasdf].
-       asdfasdf = 5;
-
-   ::asdasda::adasd::
-       asdfasdf = 5;
-
-   dookie::wookie << "asd"
-      << "bag"
-      << "sag";
-
-   sp_sign = 4 - - 5;
-sp_sign = -sp_sign;
-sp_sign = 4 + + 7;
-sp_sign = + sp_sign;
-sp_sign = 4 + + sp_sign;
-}
-
-#ifndef abc
-
-#define abc 123 /* some comment */
-
-#endif /* another comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp
deleted file mode 100644
index f1be4478..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-I tried to modify the spaces when using casts like static_cast etc. by
-using sp_before_angle, sp_after_angle and sp_inside_angle. Even setting
-all of those options to remove results in the following:
-*/
-
-myvar = dynamic_cast < MyClass<T>* > (other);
-// expected:
-//myvar = dynamic_cast<MyClass<T>*>(other);
-
-/*
-Sometime pointers and references are still not detected correctly in
-special cases - i guess.
-*/
-//When using "sp_before_ptr_star = remove" the result is:
-typedef std::list<StreamedData *>::iterator iterator;
-//typedef std::list<StreamedData *>::iterator iterator;
-//------------------------------^ This space show not be there
-
-typedef void (T::*Routine)(void);
-
-//Similar with "sp_before_byref = remove":
-unsigned long allocate(unsigned long size, void* & p);
-//unsigned long allocate(unsigned long size, void* & p);
-//------------------------------------------------^ The same here
-
-void foo(void)
-{
-   List<byte>bob = new List<byte> ();
-
-   /* Align assignments */
-   align_assign(chunk_get_head(),
-                cpd.settings[UO_align_assign_span].n,
-                cpd.settings[UO_align_assign_thresh].n);
-}
-
-Args::Args(int argc, char **argv)
-{
-   m_count = argc;
-   m_values = argv;
-   int len = (argc >> 3) + 1;
-   m_used = new UINT8[len];
-   if (m_used != NULL)
-   {
-      memset(m_used, 0, len);
-   }
-}
-
-void Args(int argc, char **argv)
-{
-   m_count = argc;
-   m_values = argv;
-   int len = (argc >> 3) + 1;
-   m_used = new UINT8[len];
-   if (m_used != NULL)
-   {
-      memset(m_used, 0, len);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp
deleted file mode 100644
index c7c10d6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// When constructing an object there should not be any space between the & and the variable name:
-
-MyClass my1(foo,& bar);
-MyClass my2(foo, bar);
-MyClass my3(foo, bar + 3);
-MyClass my4(42);
-MyClass my5(foo(), bar);
-MyClass my6(int foo, int& bar);
-MyClass my7(const int foo, int& bar);
-
-
-//When using references inside of casts there is also an additional space after the &:
-
-MyClass& myInst = static_cast<MyClass& >(otherInst);
-
-
-// When using the qt-specific signals and slots the pointer star is separated from the type with a space:
-
-connect(&mapper, SIGNAL(mapped(QWidget *)), this, SLOT(onSomeEvent(QWidget*)));
-
-extern int select(int __nfds, fd_set * __restrict __readfds,
-                  fd_set  *  __restrict  __writefds,
-                  fd_set *  __restrict  __exceptfds,
-                   struct  timeval * __restrict __timeout);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp
deleted file mode 100644
index 725fa160..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-struct X {
- void operator deleteme(void*);
- void deallocate(int*p){
-  operator delete((void*)p);
-  delete((void*)q);
- } 
-};
-
-int f(bool b) {
-typedef int mytype;
-if (b)
-return int(42.0);
-else
-return mytype(42.0);
-}
-
-struct X {
-double f(int n)
-{
-return double(n);
-}
-};
-
-inline value_type operator () () const
-     {
-         return (double(rnd32()) * (0.5 / 0x80000000));
-     }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp
deleted file mode 100644
index 570a4a76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-typedef std::list<StreamedData*>::iterator iterator;
-double foo()
-{
- if (a<bar()> c)
-{
-throw int();
-return(double());
-}
- call_a_function(42,
-                   double(-1),
-                    "charray");
-return(foo(n));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp
deleted file mode 100644
index 95cc0383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <vector>
-void f(std::vector<int> * vip, std::vector<int> & vir);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp
deleted file mode 100644
index eb949c45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ComponentSpec {
-void build(Context c)
-{
-	if (index == NSNotFound) {
-		return;
-	}
-
-	invokeUpdateInvitees(c, invitees);
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp
deleted file mode 100644
index ca3105da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void a()
-{
-    return;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp
deleted file mode 100644
index 213393b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-Foo^ foo = dynamic_cast<Bar^>(bar);
-Foo* foo = dynamic_cast<Bar*>(bar);
-x = a^b;
-
-int main(Platform::Array<Platform::String^>^ /*args*/)
-{
-}
-
-Platform::Array<unsigned char>^ a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp
deleted file mode 100644
index df5f3a84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-void func_a ( int a, string b, char c );
-
-void func_b ( int a,
-              string b, char c );
-
-void func_c ( int a, string b, char c
-              );
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb, char cccccccccccccccccc );
-
-void func_a ( int a, string b, char c )
-{
-	return;
-}
-
-void func_b ( int a,
-              string b, char c )
-{
-	return;
-}
-
-void func_c ( int a, string b, char c
-              )
-{
-	return;
-}
-
-void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb, char cccccccccccccccccc )
-{
-	return;
-}
-
-void func_call()
-{
-  func_a ( 1, 2, 3);
-  func_b ( 4,
-           5, 6 );
-  func_c ( 7, 8, 9
-         );
-  
-  func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb", "cccccccccccccccccccccc" );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp
deleted file mode 100644
index cf6f921e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace hw { namespace stm32 {
-
-class RTC {
-};
-
-}} // namespace hw::stm32
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp
deleted file mode 100644
index 828215e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-Foo* foo = new Foo(a,v);
-
-Foo* foo = new(ptr,std::nothrow)Foo[];
-Foo* foo = new(ptr)Foo();
-Foo* foo = new(FOO(ptr))Foo();
-
-Foo* foo = new  (  ptr,std::nothrow  )  Foo[];
-Foo* foo = new  (  ptr  )  Foo();
-Foo* foo = new  (  FOO(ptr)  )  Foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h
deleted file mode 100644
index 128974b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef NL_CLASS_H_INCLUDED
-#define NL_CLASS_H_INCLUDED
-
-#include <string>
-
-namespace example {
-
-class IStreamable;
-class InStream;
-class OutStream;
-
-/**
- * Timestamp is a timestamp with nanosecond resolution.
- */
-class Inher
-  : public IStreamable
-{
-
-public:
-  Inher();
-  virtual ~Inher();
-
-};
-
-/**
- * Timestamp is a timestamp with nanosecond resolution.
- */
-class Inher2
-  : public IStreamable {
-
-public:
-
-  Inher2();
-  Inher2(long sec, unsigned long nsec);
-
-};
-
-class Simple {
-
-public:
-
-  Simple();
-  virtual ~Simple();
-
-};
-
-class Simple2
-{
-
-public:
-
-  Simple2();
-  virtual ~Simple2();
-
-};
-
-} // namespace
-
-#endif   // NL_CLASS_H_INCLUDED
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h
deleted file mode 100644
index a436fcb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace ns1 {
-
-   void *foo(void);
-   void bar(void);
-
-}
-
-namespace ns2
-{
-
-   void *foo(void);
-   void bar(void);
-
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
deleted file mode 100644
index cf3325f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int q[] = { 3, 4 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h
deleted file mode 100644
index fb77edf1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h
+++ /dev/null
@@ -1,95 +0,0 @@
-namespace A {
-namespace S {
-class C
-{
-public:
-    virtual ~C()
-    {
-    }
-
-    virtual void addSearch(const int &col) = 0;
-
-    virtual void removeSearch(int id) = 0;
-};
-} // namespace S
-} // namespace A
-
-namespace B {
-// This is a comment!
-class D
-{
-public:
-    D();
-};
-} // namespace B
-
-// This is also a comment!
-class E
-{
-public:
-    E();
-};
-namespace F {
-}
-void foo();
-class G
-{
-};
-void bar();
-
-void foo2();
-namespace E
-{
-}
-void bar2();
-
-void foo3();
-namespace F
-{
-}
-
-void bar3();
-
-void foo4();
-class I
-{
-};
-using namespace F;
-namespace M
-{
-void bar4();
-/* multiline test comment
-   before class */
-template<typename ... Args>
-// test comment between template specification and associated class
-class H
-{
-    // nested class
-template<typename ...>
-friend class I;
-friend class J;
-    // nested class K
-template<typename T>
-class K
-{
-        // double-nested class L
-class L { };
-};
-};
-}
-
-class AA;
-class AB;
-
-namespace BA
-{
-class BB;
-class BC;
-
-class BD
-{
-public:
-  friend class BE;
-  BD();
-};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp
deleted file mode 100644
index c7cab4c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-lass A
-{
-	void f0(void);
-	template<typename T, typename U>
-	void g(T s, U t)
-	{
-		return;
-	}
-	void f1(void);
-	template
-	<typename T,
-	 typename U>
-	void h(T s, U t)
-	{
-		return;
-	}
-	void f2(void);
-	template
-	<typename T,
-	 typename U>
-	void
-	i(T s, U t)
-	{
-		return;
-	}
-	void f3(void);
-	template
-	<typename T,
-	 typename U>
-	void
-	j
-	        (T s, U t)
-	{
-		return;
-	}
-	void f4(void);
-	template
-	<typename T,
-	 typename U>
-	void
-	k
-	(
-		T s, U t)
-	{
-		return;
-	}
-	void f5(void);
-	template
-	<typename T,
-	 typename U>
-	void
-	l
-	(
-		T s,
-		U t
-	)
-	{
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp
deleted file mode 100644
index b698546a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-
-SHOW_VAR status_vars[]= { { "Aborted_clients", (char *)&aborted_threads,
-SHOW_LONGLONG, } };
-
-SHOW_VAR status_vars[]= 
-{ 
-{ "Aborted_clients", (char *)&aborted_threads,
-SHOW_LONGLONG, } 
-};
-
-SHOW_VAR status_vars[]= 
-{ 
-{ 
-"Aborted_clients", (char *)&aborted_threads,
-SHOW_LONGLONG, 
-} 
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void f(){}
-void f()
-{}
-
-void f()const{}
-void f()const
-{}
-
-void f()noexcept(){}
-void f()noexcept()
-{}
-
-void f()/**/{}
-void f()/**/
-{}
-void f()//
-{}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void f(){}
-void f()
-{}
-
-void f()const{}
-void f()const
-{}
-
-void f()noexcept(){}
-void f()noexcept()
-{}
-
-void f()/**/{}
-void f()/**/
-{}
-void f()//
-{}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void f(){}
-void f()
-{}
-
-void f()const{}
-void f()const
-{}
-
-void f()noexcept(){}
-void f()noexcept()
-{}
-
-void f()/**/{}
-void f()/**/
-{}
-void f()//
-{}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void f(){}
-void f()
-{}
-
-void f()const{}
-void f()const
-{}
-
-void f()noexcept(){}
-void f()noexcept()
-{}
-
-void f()/**/{}
-void f()/**/
-{}
-void f()//
-{}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp
deleted file mode 100644
index 382d2815..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp
+++ /dev/null
@@ -1 +0,0 @@
-for (int i = 0; i < 10; ++i) i++;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp
deleted file mode 100644
index e27d7e55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-class BSRRE1D_file : PhysicalFile
-{
-   int getFoo() { return(m_foo); }
-   void setFoo(int foo) { m_foo = foo; }
-   public BSRRE1D_file()
-   {
-       this.addFormatName("BSRRE1DF");
-   }
-private int m_foo;
-   public void xxx()
-   {
-       ahoj();
-   } // comment
-   public void yyy()
-   {
-       ahoj();
-   }
-   /* comment 2 */
-   public void xxx()
-   {
-       ahoj();
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp
deleted file mode 100644
index 96cd4826..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-methodCall([] {
-                             Log();
-                           });
-
-funcCall(match ( [ & ]( const ContentProps &props)  {
-        return PairingCmpnt()
-      }));
-
-match( [ & ]( const ContentProps &props)  {
-        return PairingCmpnt()
-      });
-
-
-outerMethodCall(methodCall(^{
-  // action
-}, x)
-);
-
-outerMethodCall(x, methodCall(^{
-  // action
-}, y));
-
-options({
-          .cornerRadius = CGFLOAT_MAX,
-        });
-
-mapToPtr([&](const LeftAddOn::Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr(x, [&](const Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr([&](const Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-});
-
-methodCall(arg1, arg2,
-arg3);
-
-methodCall(arg1, arg2, arg3);
-
-methodCall(arg1, []{
-              variant.action.send(Cmpnt);
-      }, arg3);
-
-methodCall(arg1, {
-              .x = 10,
-      }, arg3);
-
-methodCall({
-              .x = 10,
-      }, arg3);
-
-methodCall(arg1, {
-              .x = 10,
-      });
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp
deleted file mode 100644
index 6678ee18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-SomeFunction

-(

-);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp
deleted file mode 100644
index 309a65a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-SomeFunction(

-	someVar,

-	someOtherVar,

-	);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp
deleted file mode 100644
index 6678ee18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-SomeFunction

-(

-);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp
deleted file mode 100644
index 91a7184f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-void bla ( );
-void ble
-( 
-int a, 
-char b 
-);
-void ble2 ( int a, char b );
-
-
-void bla() 
-{  
-} 
-
-void bla2
-(
-) 
-{  
-} 
- 
-void ble( int a, char b ) 
-{ 
-}
-  
-void ble2
-( 
-int a,
-char b 
-) 
-{ 
-} 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp
deleted file mode 100644
index f1ba8607..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-void LocalClass::LocalClass()

-{

-	int Function

-		(

-		)

-	{

-		return 0;

-	}

-

-	int Function(

-		)

-	{

-		return 0;

-	}

-

-	int Function

-		()

-	{

-		return 0;

-	}

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp
deleted file mode 100644
index 19965aac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int Function

-	(

-	);

-

-int Function(

-	);

-

-int Function

-	();
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp
deleted file mode 100644
index d221e974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void A::f()
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp
deleted file mode 100644
index 26e49663..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-
-//zero
-// one
-//  two
-//   three
-void foo(void);
-
-struct A
-{
-public:
-long_complicated_type f();
-A& operator+(const A& other);
-};
-
-A& A::operator+(const A& other)
-{}
-
-B
-operator+(const B& other)
-{}
-
-B foo(const B& other)
-{}
-
-class A
-{
-public:
-explicit A(int);
-int aFunct() { return a; }
-int bFunc();
-};
-
-// Another file
-int
-A::bFunc()
-{
-// some code
-}
-
-template<typename T>
-typename Foo<T>::Type Foo<T>::Func()
-{
-}
-
-void Foo::bar() {}
-
-namespace foo {
-Foo::Foo() {}
-}
-
-Foo::~Foo() {}
-
-class Object
-{
-	~Object(void);
-};
-
-template <class T> 
-void SampleClassTemplate<T>::connect()
-{
-}
-
-template <>
-inline void bar<MyType>(MyType r)
-{
-    foo(r);
-}
-
-template <T>
-inline void baz<>(T r)
-{
-    foo(r);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp
deleted file mode 100644
index 4bdcb394..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace cats
-{ // rule
-
-
-int count;
-void meow();
-
-
-}
-
-namespace dogs { // drool
-
-
-int count;
-void bark();
-
-
-}
-
-namespace pigs {
-
-
-int count;
-void oink();
-
-
-}
-
-namespace owls
-{
-
-
-int count;
-void hoot();
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp
deleted file mode 100644
index c87e6e68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//regular function
-void func0()
-{
-
-
-
-
-	return;
-}
-// ========================================================================
-//member function
-void cls::func1()
-{
-
-
-
-
-	return;
-}
-// ========================================================================
-//lambda function
-const auto l = [](){
-
-
-
-
-	return 1;
-};
-// ========================================================================
-//regular function in class
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-
-
-
-
-	return;
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class
-
-// ========================================================================
-//lambda function in class
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-
-
-
-
-	return 1;
-};
-
-
-
-
-}
-// ========================================================================
-//regular function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-public:
-
-
-
-
-void func0()
-{
-
-
-
-
-	return;
-}
-
-
-
-
-}
-
-
-
-
-}
-// ========================================================================
-//member function in class in namespace
-
-// ========================================================================
-//lambda function in class in namespace
-namespace ns
-{
-
-
-
-
-class cls
-{
-pubic:
-
-
-
-
-const auto l = [](){
-
-
-
-
-	return 1;
-};
-
-
-
-
-}
-
-
-
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp
deleted file mode 100644
index e6ea9116..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp
+++ /dev/null
@@ -1 +0,0 @@
-foo()noexcept;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp
deleted file mode 100644
index a9c65439..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int ff()
-{
-	// not a lambda fcn so don't surround "->" by spaces
-	f()[0]->size();
-	if(true) {
-		return 1;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp
deleted file mode 100644
index 4b79ca9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class Foo
-{
-bool operator ==( const Foo & other ) const;
-Bar & operator * ( ) const;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp
deleted file mode 100644
index 6f2a7f03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-
-struct bar;
-struct foo
-{
-operator bar*();
-auto operator <=> (const foo& rhs) const = default;
-};
-
-class Foo {
-   Foo operator+ (const Foo& rhs) const;
-
-   const Foo& operator ==(Foo& me);
-
-   bool operator> (const Foo& rhs) const;
-
-   InStream& operator << (InStream& in);
-}
-
-const Foo& Foo::operator ==(Foo& me)
-{
-}
-
-Foo Foo::operator+ (const Foo& rhs) const
-{
-}
-
-bool Foo::operator> (const Foo& rhs) const
-{
-}
-
-class Example
-{
-   char m_array[256];
-
-   Example & operator=(const Example &rhs);
-   Example & operator+=(const Example &rhs);
-   const Example operator+(const Example &other) const;
-   bool operator==(const Example &other) const;
-   bool operator!=(const Example &other) const;
-   Example operator+ (const Example & x, const Example & y);
-   Example operator* (const Example & x, const Example & y);
-
-   double& operator() (int row, int col);
-   double  operator() (int row, int col) const;
-   void operator++ ();
-   int& operator*  ();
-   Example& operator++ ();    // prefix ++
-   Example  operator++ (int); // postfix ++
-
-   bool operator < (const Example& lhs, const Example& rhs) const;
-
-   int operator()(int index)
-   {
-      i = ~ ~3;
-      return index + 1;
-   }
-
-   char& operator[](unsigned i)
-   {
-      return m_array[i & 0xff];
-   }
-}
-   bool Example::operator==(const Example &other) const
-   {
-      /*TODO: compare something? */
-      return false;
-   }
-   bool Example::operator!=(const Example &other) const
-   {
-      return ! operator ==(other);
-   }
-
-
-void a() {
-Op op = &X::operator==;
-if (!A)
-if (op != &X::operator==)
-A(1) = a;
-if (!A) {
-if (op != &X::operator==)
-A(1) = a;
-}
-}
-
-void *operator new(std::size_t) throw(std::bad_alloc);
-void *operator new[ ](std::size_t) throw(std::bad_alloc);
-void operator delete(void *) throw();
-void operator delete[ ](void *) throw();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp
deleted file mode 100644
index b14935ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* A collection of all the different known operator prototypes in C++ */
-
-// arithmetic operators
-Type1  operator + (const Type1& a);                        // +a
-Type1  operator + (const Type1& a, const Type2& b);        // a + b
-Type1& operator ++(Type1& a);                              // ++a
-Type1  operator ++(Type1& a, int);                         // a++
-Type1& operator +=(Type1& a, const Type1& b);              // a += b
-Type1  operator - (const Type1& a);                        // -a
-Type1& operator --(Type1& a);                              // --a
-Type1  operator --(Type1& a, int);                         // a--
-Type1& operator -=(Type1& a, const Type1& b);              // a -= b
-Type1  operator * (const Type1& a, const Type1& b);        // a * b
-Type1& operator *=(Type1& a, const Type1& b);              // a *= b
-Type1  operator / (const Type1& a, const Type1& b);        // a / b
-Type1& operator /=(Type1& a, const Type1& b);              // a /= b
-Type1  operator % (const Type1& a, const Type1& b);        // a % b
-Type1& operator %=(Type1& a, const Type1& b);              // a %= b
-
-// comparison operators
-bool operator <  (const Type1& a, const Type1& b);         // a < b
-bool operator <= (const Type1& a, const Type1& b);         // a <= b
-bool operator >  (const Type1& a, const Type1& b);         // a > b
-bool operator >= (const Type1& a, const Type1& b);         // a >= b
-bool operator != (const Type1& a, const Type1& b);         // a != b
-bool operator == (const Type1& a, const Type1& b);         // a == b
-bool operator <=>(const Type1& a, const Type1& b);         // a <=> b
-
-// logical operators
-bool operator ! (const Type1& a);                          // !a
-bool operator &&(const Type1& a, const Type1& b);          // a && b
-bool operator ||(const Type1& a, const Type1& b);          // a || b
-
-// bitwise operators
-Type1  operator << (const Type1& a, const Type1& b);       // a << b
-Type1& operator <<=(Type1& a, const Type1& b);             // a <<= b
-Type1  operator >> (const Type1& a, const Type1& b);       // a >> b
-Type1& operator >>=(Type1& a, const Type1& b);             // a >>= b
-Type1  operator ~  (const Type1& a);                       // ~a
-Type1  operator &  (const Type1& a, const Type1& b);       // a & b
-Type1& operator &= (Type1& a, const Type1& b);             // a &= b
-Type1  operator |  (const Type1& a, const Type1& b);       // a | b
-Type1& operator |= (Type1& a, const Type1& b);             // a |= b
-Type1  operator ^  (const Type1& a, const Type1& b);       // a ^ b
-Type1& operator ^= (Type1& a, const Type1& b);             // a ^= b
-
-// other operators
-Type1& Type1::operator = (const Type1& b);                 // a = b
-void operator()(Type1& a);                                 // a()
-const Type2& operator[](const Type1& a, const Type1& b);   // a[b]
-Type2& operator*(const Type1& a);                          // *a
-Type2* operator&(const Type1& a);                          // &a
-Type2* Type1::operator->();                                // a->b
-Type1::operator type();                                    // (type)a
-Type2& operator ,(const Type1& a, Type2& b);               // a, b
-void *Type1::operator new(size_t x);                       // new Type1
-void *Type1::operator new[](size_t x);                     // new Type1[n]
-void *Type1::operator delete(size_t x);                    // delete a
-void *Type1::operator delete[](size_t x);                  // delete [] a
-
-// Misc examples
-int& operator*  ();
-Foo::operator const char *();
-Foo::operator const Bar&();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp
deleted file mode 100644
index 0dac74c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-int b()
-{
-   int abcde=		13;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp
deleted file mode 100644
index 4563c43b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp
+++ /dev/null
@@ -1,657 +0,0 @@
-/**
- * @file output.cpp
- * Does all the output & comment formatting.
- *
- * $Id: output.cpp 510 2006-09-20 01:14:56Z bengardner $
- */
-
-#include "uncrustify_types.h"
-#include "prototypes.h"
-#include "chunk_list.h"
-#include <cstring>
-#include <cstdlib>
-
-
-
-void add_char(char ch)
-{
-   /* convert a newline into the LF/CRLF/CR sequence */
-   if (ch == '\n')
-   {
-      fputs(cpd.newline, cpd.fout);
-      cpd.column      = 1;
-      cpd.did_newline = 1;
-   }
-   else
-   {
-      fputc(ch, cpd.fout);
-      if (ch == '\t')
-      {
-         cpd.column = next_tab_column(cpd.column);
-      }
-      else
-      {
-         cpd.column++;
-      }
-   }
-}
-
-void add_text(const char *text)
-{
-   char ch;
-
-   while ((ch = *text) != 0)
-   {
-      text++;
-      add_char(ch);
-   }
-}
-
-void add_text_len(const char *text, int len)
-{
-   while (len-- > 0)
-   {
-      add_char(*text);
-      text++;
-   }
-}
-
-
-/**
- * Advance to a specific column
- * cpd.column is the current column
- *
- * @param column  The column to advance to
- */
-void output_to_column(int column, bool allow_tabs)
-{
-   int nc;
-
-   cpd.did_newline = 0;
-   if (allow_tabs)
-   {
-      /* tab out as far as possible and then use spaces */
-      while ((nc = next_tab_column(cpd.column)) <= column)
-      {
-         add_text("\t");
-      }
-   }
-   /* space out the final bit */
-   while (cpd.column < column)
-   {
-      add_text(" ");
-   }
-}
-
-void output_indent(int column, int brace_col)
-{
-   if ((cpd.column == 1) && (cpd.settings[UO_indent_with_tabs].n != 0))
-   {
-      if (cpd.settings[UO_indent_with_tabs].n == 2)
-      {
-         brace_col = column;
-      }
-
-      /* tab out as far as possible and then use spaces */
-      int nc;
-      while ((nc = next_tab_column(cpd.column)) <= brace_col)
-      {
-         add_text("\t");
-      }
-   }
-
-   /* space out the rest */
-   while (cpd.column < column)
-   {
-      add_text(" ");
-   }
-}
-
-
-
-void output_parsed(FILE *pfile)
-{
-   chunk_t *pc;
-   int     cnt;
-
-   output_options(pfile);
-   output_defines(pfile);
-   output_types(pfile);
-
-   fprintf(pfile, "-=====-\n");
-   fprintf(pfile, "Line      Tag          Parent     Columns  Br/Lvl/pp Flg Nl  Text");
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-   {
-      fprintf(pfile, "\n%3d> %13.13s[%13.13s][%2d/%2d/%2d][%d/%d/%d][%6x][%d-%d]",
-              pc->orig_line, get_token_name(pc->type),
-              get_token_name(pc->parent_type),
-              pc->column, pc->orig_col, pc->orig_col_end,
-              pc->brace_level, pc->level, pc->pp_level,
-              pc->flags, pc->nl_count, pc->after_tab);
-
-      if ((pc->type != CT_NEWLINE) && (pc->len != 0))
-      {
-         for (cnt = 0; cnt < pc->column; cnt++)
-         {
-            fprintf(pfile, " ");
-         }
-         fprintf(pfile, "%.*s", pc->len, pc->str);
-      }
-   }
-   fprintf(pfile, "\n-=====-\n");
-   fflush(pfile);
-}
-
-void output_options(FILE *pfile)
-{
-   int idx;
-   const option_map_value *ptr;
-
-   fprintf(pfile, "-== Options ==-\n");
-   for (idx = 0; idx < UO_option_count; idx++)
-   {
-      ptr = get_option_name(idx);
-      if (ptr != NULL)
-      {
-         if (ptr->type == AT_BOOL)
-         {
-            fprintf(pfile, "%3d) %32s = %s\n",
-                    ptr->id, ptr->name,
-                    cpd.settings[ptr->id].b ? "True" : "False");
-         }
-         else if (ptr->type == AT_IARF)
-         {
-            fprintf(pfile, "%3d) %32s = %s\n",
-                    ptr->id, ptr->name,
-                    (cpd.settings[ptr->id].a == AV_ADD) ? "Add" :
-                    (cpd.settings[ptr->id].a == AV_REMOVE) ? "Remove" :
-                    (cpd.settings[ptr->id].a == AV_FORCE) ? "Force" : "Ignore");
-         }
-         else if (ptr->type == AT_LINE)
-         {
-            fprintf(pfile, "%3d) %32s = %s\n",
-                    ptr->id, ptr->name,
-                    (cpd.settings[ptr->id].le == LE_AUTO) ? "Auto" :
-                    (cpd.settings[ptr->id].le == LE_LF) ? "LF" :
-                    (cpd.settings[ptr->id].le == LE_CRLF) ? "CRLF" :
-                    (cpd.settings[ptr->id].le == LE_CR) ? "CR" : "???");
-         }
-         else  /* AT_NUM */
-         {
-            fprintf(pfile, "%3d) %32s = %d\n",
-                    ptr->id, ptr->name, cpd.settings[ptr->id].n);
-         }
-      }
-   }
-}
-
-/**
- * This renders the chunk list to a file.
- */
-void output_text(FILE *pfile)
-{
-   chunk_t *pc;
-   chunk_t *prev;
-   int     cnt;
-   int     lvlcol;
-   bool    allow_tabs;
-
-   cpd.fout = pfile;
-
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-   {
-      if (pc->type == CT_NEWLINE)
-      {
-         for (cnt = 0; cnt < pc->nl_count; cnt++)
-         {
-            add_char('\n');
-         }
-         cpd.did_newline = 1;
-         cpd.column      = 1;
-         LOG_FMT(LOUTIND, " xx\n");
-      }
-      else if (pc->type == CT_COMMENT_MULTI)
-      {
-         output_comment_multi(pc);
-      }
-      else if (pc->type == CT_COMMENT_CPP)
-      {
-         pc = output_comment_cpp(pc);
-      }
-      else if (pc->len == 0)
-      {
-         /* don't do anything for non-visible stuff */
-         LOG_FMT(LOUTIND, " <%d> -", pc->column);
-      }
-      else
-      {
-         /* indent to the 'level' first */
-         if (cpd.did_newline)
-         {
-            if (cpd.settings[UO_indent_with_tabs].n == 1)
-            {
-               lvlcol = 1 + (pc->brace_level * cpd.settings[UO_indent_columns].n);
-               if ((pc->column >= lvlcol) && (lvlcol > 1))
-               {
-                  output_to_column(lvlcol, true);
-               }
-            }
-            allow_tabs = (cpd.settings[UO_indent_with_tabs].n == 2) ||
-                         (chunk_is_comment(pc) &&
-                          (cpd.settings[UO_indent_with_tabs].n != 0));
-
-            LOG_FMT(LOUTIND, "  %d> col %d/%d - ", pc->orig_line, pc->column, cpd.column);
-         }
-         else
-         {
-            /* not the first item on a line */
-            if (cpd.settings[UO_align_keep_tabs].b)
-            {
-               allow_tabs = pc->after_tab;
-            }
-            else
-            {
-               prev       = chunk_get_prev(pc);
-               allow_tabs = (cpd.settings[UO_align_with_tabs].b &&
-                             ((pc->flags & PCF_WAS_ALIGNED) != 0) &&
-                             (((pc->column - 1) % cpd.settings[UO_output_tab_size].n) == 0) &&
-                             ((prev->column + prev->len + 1) != pc->column));
-            }
-            LOG_FMT(LOUTIND, " %d -", pc->column);
-         }
-
-         output_to_column(pc->column, allow_tabs);
-         add_text_len(pc->str, pc->len);
-         cpd.did_newline = chunk_is_newline(pc);
-      }
-   }
-}
-
-
-/**
- * Given a multi-line comemnt block that starts in column X, figure out how
- * much subsequent lines should be indented.
- *
- * The answer is either 0 or 1.
- *
- * The decision is based on:
- *  - the first line length
- *  - the second line leader length
- *  - the last line length
- *
- * If the first and last line are the same length and don't contain any alnum
- * chars and (the first line len > 2 or the second leader is the same as the
- * first line length), then the indent is 0.
- *
- * If the leader on the second line is 1 wide or missing, then the indent is 1.
- *
- * Otherwise, the indent is 0.
- *
- * @param str       The comment string
- * @param len       Length of the comment
- * @param start_col Starting column
- * @return 0 or 1
- */
-static int calculate_comment_body_indent(const char *str, int len, int start_col)
-{
-   int idx       = 0;
-   int first_len = 0;
-   int last_len  = 0;
-   int width     = 0;
-
-   /* find the last line length */
-   for (idx = len - 1; idx > 0; idx--)
-   {
-      if ((str[idx] == '\n') || (str[idx] == '\r'))
-      {
-         idx++;
-         while ((idx < len) && ((str[idx] == ' ') || (str[idx] == '\t')))
-         {
-            idx++;
-         }
-         last_len = len - idx;
-         break;
-      }
-   }
-
-   /* find the first line length */
-   for (idx = 0; idx < len; idx++)
-   {
-      if ((str[idx] == '\n') || (str[idx] == '\r'))
-      {
-         first_len = idx;
-         while ((str[first_len - 1] == ' ') || (str[first_len - 1] == '\t'))
-         {
-            first_len--;
-         }
-
-         /* handle DOS endings */
-         if ((str[idx] == '\r') && (str[idx + 1] == '\n'))
-         {
-            idx++;
-         }
-         idx++;
-         break;
-      }
-   }
-
-   /* Scan the second line */
-   width = 0;
-   for ( /* nada */; idx < len; idx++)
-   {
-      if ((str[idx] == ' ') || (str[idx] == '\t'))
-      {
-         if (width > 0)
-         {
-            break;
-         }
-         continue;
-      }
-      if ((str[idx] == '\n') || (str[idx] == '\r'))
-      {
-         /* Done with second line */
-         break;
-      }
-
-      /* Count the leading chars */
-      if ((str[idx] == '*') ||
-          (str[idx] == '|') ||
-          (str[idx] == '\\') ||
-          (str[idx] == '#') ||
-          (str[idx] == '+'))
-      {
-         width++;
-      }
-      else
-      {
-         break;
-      }
-   }
-
-   //LOG_FMT(LSYS, "%s: first=%d last=%d width=%d\n", __func__, first_len, last_len, width);
-
-   /*TODO: make the first_len minimum (4) configurable? */
-   if ((first_len == last_len) && ((first_len > 4) || first_len == width))
-   {
-      return(0);
-   }
-
-   return((width == 2) ? 0 : 1);
-}
-
-/**
- * Outputs the CPP comment at pc.
- * CPP comment combining is done here
- *
- * @return the last chunk output'd
- */
-chunk_t *output_comment_cpp(chunk_t *first)
-{
-   int col    = first->column;
-   int col_br = 1 + (first->brace_level * cpd.settings[UO_indent_columns].n);
-
-   /* Make sure we have at least one space past the last token */
-   if (first->parent_type == CT_COMMENT_END)
-   {
-      chunk_t *prev = chunk_get_prev(first);
-      if (prev != NULL)
-      {
-         int col_min = prev->column + prev->len + 1;
-         if (col < col_min)
-         {
-            col = col_min;
-         }
-      }
-   }
-
-   /* Bump out to the column */
-   output_indent(col, col_br);
-
-   if (!cpd.settings[UO_cmt_cpp_to_c].b)
-   {
-      add_text_len(first->str, first->len);
-      return(first);
-   }
-
-   /* If we are grouping, see if there is something to group */
-   bool combined = false;
-   if (cpd.settings[UO_cmt_cpp_group].b)
-   {
-      /* next is a newline by definition */
-      chunk_t *next = chunk_get_next(first);
-      if ((next != NULL) && (next->nl_count == 1))
-      {
-         next = chunk_get_next(next);
-
-         /**
-          * Only combine the next comment if they are both at indent level or
-          * the second one is NOT at indent or less
-          *
-          * A trailing comment cannot be combined with a comment at indent
-          * level or less
-          */
-         if ((next != NULL) &&
-             (next->type == CT_COMMENT_CPP) &&
-             (((next->column == 1) && (first->column == 1)) ||
-              ((next->column == col_br) && (first->column == col_br)) ||
-              ((next->column > col_br) && (first->parent_type == CT_COMMENT_END))))
-         {
-            combined = true;
-         }
-      }
-   }
-
-   if (!combined)
-   {
-      /* nothing to group: just output a single line */
-      add_text_len("/*", 2);
-      if ((first->str[2] != ' ') && (first->str[2] != '\t'))
-      {
-         add_char(' ');
-      }
-      add_text_len(&first->str[2], first->len - 2);
-      add_text_len(" */", 3);
-      return(first);
-   }
-
-   chunk_t *pc   = first;
-   chunk_t *last = first;
-
-   /* Output the first line */
-   add_text_len("/*", 2);
-   if (combined && cpd.settings[UO_cmt_cpp_nl_start].b)
-   {
-      /* I suppose someone more clever could do this without a goto or
-       * repeating too much code...
-       */
-      goto cpp_newline;
-   }
-   goto cpp_addline;
-
-   /* Output combined lines */
-   while ((pc = chunk_get_next(pc)) != NULL)
-   {
-      if ((pc->type == CT_NEWLINE) && (pc->nl_count == 1))
-      {
-         continue;
-      }
-      if (pc->type != CT_COMMENT_CPP)
-      {
-         break;
-      }
-      if (((pc->column == 1) && (first->column == 1)) ||
-          ((pc->column == col_br) && (first->column == col_br)) ||
-          ((pc->column > col_br) && (first->parent_type == CT_COMMENT_END)))
-      {
-         last = pc;
-cpp_newline:
-         add_char('\n');
-         output_indent(col, col_br);
-         add_char(' ');
-         add_char(cpd.settings[UO_cmt_star_cont].b ? '*' : ' ');
-cpp_addline:
-         if ((pc->str[2] != ' ') && (pc->str[2] != '\t'))
-         {
-            add_char(' ');
-         }
-         add_text_len(&pc->str[2], pc->len - 2);
-      }
-   }
-
-   if (cpd.settings[UO_cmt_cpp_nl_end].b)
-   {
-      add_char('\n');
-      output_indent(col, col_br);
-   }
-   add_text_len(" */", 3);
-   return(last);
-}
-
-void output_comment_multi(chunk_t *pc)
-{
-   int        cmt_col = pc->column;
-   const char *cmt_str;
-   int        remaining;
-   char       ch;
-   chunk_t    *prev;
-   char       line[1024];
-   int        line_len;
-   int        line_count = 0;
-   int        ccol;
-   int        col_diff = 0;
-   int        xtra     = 1;
-
-   prev = chunk_get_prev(pc);
-   if ((prev != NULL) && (prev->type != CT_NEWLINE))
-   {
-      cmt_col = pc->orig_col;
-   }
-   else
-   {
-      col_diff = pc->orig_col - pc->column;
-   }
-
-   //   fprintf(stderr, "Indenting1 line %d to col %d (orig=%d) col_diff=%d\n",
-   //           pc->orig_line, cmt_col, pc->orig_col, col_diff);
-
-   xtra = calculate_comment_body_indent(pc->str, pc->len, pc->column);
-
-   ccol      = 1;
-   remaining = pc->len;
-   cmt_str   = pc->str;
-   line_len  = 0;
-   while (remaining > 0)
-   {
-      ch = *cmt_str;
-      cmt_str++;
-      remaining--;
-
-      /* handle the CRLF and CR endings. convert both to LF */
-      if (ch == '\r')
-      {
-         ch = '\n';
-         if (*cmt_str == '\n')
-         {
-            cmt_str++;
-            remaining--;
-         }
-      }
-
-      /* Find the start column */
-      if (line_len == 0)
-      {
-         if (ch == ' ')
-         {
-            ccol++;
-            continue;
-         }
-         else if (ch == '\t')
-         {
-            ccol = calc_next_tab_column(ccol, cpd.settings[UO_input_tab_size].n);
-            continue;
-         }
-         else
-         {
-            //fprintf(stderr, "%d] Text starts in col %d\n", line_count, ccol);
-         }
-      }
-
-      line[line_len++] = ch;
-
-      /* If we just hit an end of line OR we just hit end-of-comment... */
-      if ((ch == '\n') || (remaining == 0))
-      {
-         line_count++;
-
-         /* strip trailing tabs and spaces before the newline */
-         if (ch == '\n')
-         {
-            line_len--;
-            while ((line_len > 0) &&
-                   ((line[line_len - 1] == ' ') ||
-                    (line[line_len - 1] == '\t')))
-            {
-               line_len--;
-            }
-            line[line_len++] = ch;
-         }
-         line[line_len] = 0;
-
-         if (line_count == 1)
-         {
-            /* this is the first line - add unchanged */
-
-            /*TODO: need to support indent_with_tabs mode 1 */
-            output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b);
-            add_text_len(line, line_len);
-         }
-         else
-         {
-            /* This is not the first line, so we need to indent to the
-             * correct column.
-             */
-            ccol -= col_diff;
-            if (ccol < cmt_col)
-            {
-               ccol = cmt_col;
-            }
-
-            if (line[0] == '\n')
-            {
-               /* Emtpy line - just a '\n' */
-               if (cpd.settings[UO_cmt_star_cont].b)
-               {
-                  output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b);
-                  add_text((xtra == 1) ? " *" : "*");
-               }
-               add_char('\n');
-            }
-            else
-            {
-               /* If this doesn't start with a '*' or '|' */
-               if ((line[0] != '*') && (line[0] != '|') && (line[0] != '#') &&
-                   (line[0] != '\\') && (line[0] != '+'))
-               {
-                  output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b);
-                  if (cpd.settings[UO_cmt_star_cont].b)
-                  {
-                     add_text((xtra == 1) ? " * " : "*  ");
-                  }
-                  else
-                  {
-                     add_text("   ");
-                  }
-                  output_to_column(ccol, cpd.settings[UO_indent_with_tabs].b);
-               }
-               else
-               {
-                  output_to_column(cmt_col + xtra, cpd.settings[UO_indent_with_tabs].b);
-               }
-               add_text_len(line, line_len);
-            }
-         }
-         line_len = 0;
-         ccol     = 1;
-      }
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp
deleted file mode 100644
index 537454b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-struct A
-{
-	virtual void foo();
-	virtual void bar() = 0;
-	virtual void baz() const {
-	}
-};
-
-struct B : public A
-{
-	virtual void foo() override;
-	void bar() override {
-	}
-	void baz() const override {
-	}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp
deleted file mode 100644
index 6d734b1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-template<typename...A, int...B>
-struct foo1:foo1<A..., (sizeof...(A)+B)...>
-{
-	foo1() {
-		int x = sizeof...(A);
-	}
-};
-
-template<int...X> int bar1()
-{
-	auto s = sizeof...(X);
-	chomp(X)...;
-	return X+...;
-}
-
-template<class R, typename...Args>
-void call1v(R(*fp)(Args...));
-
-template<class R, typename...Args>
-void call1p(R(*fp)(Args*...));
-
-template<class R, typename...Args>
-void call1r(R(*fp)(Args&&...));
-
-template<class R, typename...Args>
-struct invoke1v : invoke<R(*)(Args...)>
-{
-};
-
-template<class R, typename...Args>
-struct invoke1p : invoke<R(*)(Args*...)>
-{
-};
-
-template<class R, typename...Args>
-struct invoke1r : invoke<R(*)(Args&&...)>
-{
-};
-
-template  <  typename  ...  A  , int  ...  B  >
-struct foo2  :  foo2  <  A  ...  , (  sizeof  ...  (  A  )  +  B  )  ...  >
-{
-	foo2() {
-		int x = sizeof  ...  (  A  );
-	}
-};
-
-template  <  int  ...  X  > int bar2()
-{
-	auto s = sizeof  ...  (  X  );
-	chomp(  X  )  ...;
-	return X  +  ...;
-}
-
-template  <  class R  , typename  ...  Args  >
-void call2v(  R  (  *fp  )  (  Args  ...  )  );
-
-template  <  class R  , typename  ...  Args  >
-void call2p(  R  (  *fp  )  (  Args  *  ...  )  );
-
-template  <  class R  , typename  ...  Args  >
-void call2r(  R  (  *fp  )  (  Args  &&  ...  )  );
-
-template  <  class R  , typename  ...  Args  >
-struct invoke2v  :  invoke  <  R  (  *  )  (  Args  ...  )  >
-{
-};
-
-template  <  class R  , typename  ...  Args  >
-struct invoke2p  :  invoke  <  R  (  *  )  (  Args  *  ...  )  >
-{
-};
-
-template  <  class R  , typename  ...  Args  >
-struct invoke2r  :  invoke  <  R  (  *  )  (  Args  &&  ...  )  >
-{
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp
deleted file mode 100644
index 8d9e222e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp
+++ /dev/null
@@ -1 +0,0 @@
-//! test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h
deleted file mode 100644
index ef01470e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <type_traits>

-

-template<typename U, typename V, typename = std::enable_if_t<!std::is_convertible<U, V>::value && !std::is_same<U, V>::value>>

-void foo(U &&u, V &&v)

-{

-

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp
deleted file mode 100644
index 4d55a541..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-void foo()
-{
-	// Ensure non-shift operators aren't changed
-	x = 1 +
-	    2;
-	x = 1
-	    + 2;
-	x = 1 + 2;
-
-	// Test position of shift operator
-	cout << x
-	     << y;
-	cout << x <<
-	        y;
-	cout << x << y;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp
deleted file mode 100644
index 8ec5657f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#define outpsize
-#define some(f)\
-foo(f)
-
-class CRC
-{
-public:
-int foo;
-// Initial CRC Start Value
- #define 24BITCRC ((ULONG) 0x00864CFB) // This line is not aligned with the other lines
-char ch;
-#define MULTI LINE DEFINE \
- in column 0 \
-that spans
-//// Operations ////
-public:
-...
-}
-
-{
-#if defined(WIN32)
-	SYSTEMTIME st;
-	DWORD ThreadId;
-#else
-	struct timeval mytv;
-	struct tm *mytm;
-	pid_t ProcessId;
-#endif
-
-#if SOME COND
-	(void)loop;
-#endif
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp
deleted file mode 100644
index 75b3c46d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-int main(int argc, char** argv)
-{
-#ifdef DEBUG
-#define FORMAT "argc=%d\n"
-std::printf(FORMAT,argc);
-#undef FORMAT
-#endif DEBUG
-#ifdef _OPENMP
-#pragma omp parallel
-{
-printf("Hello from thread!\n");
-}
-#endif
-
-#pragma CoverageScanner(cov-off)
-__pragma ( CoverageScanner(cov-off) )
-_Pragma ( CoverageScanner(cov-off) )
-
-return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp
deleted file mode 100644
index 86ed0a8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Example for preprocessor statement in a function definition

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_brace	  = false	  to override preprocessor indent for braces

-MyClass::MyClass()

-{

-	if(isSomething)

-	{

-		DoSomething();

-	}

-

-#if (USE_FIVE)

-		{

-			DoSomethingAlso();

-		}

-#endif

-

-#if (USE_SIX)

-		{

-			Six mySix;

-			DoSomethingWithSix(mySix);

-		}

-#endif

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp
deleted file mode 100644
index da61641a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Example for case in a preprocesser statement

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_case	  = false	  to override preprocessor indent for case blocks

-switch(...)

-{

-case 1:

-case 2:

-{

-	int v;

-	...

-}

-break;

-

-#if (USE_FIVE)

-	case 3:

-		doFive();

-		break;

-#endif

-

-default:

-	break;

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp
deleted file mode 100644
index 76cfc4bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Example for extern "C" blocks inside preprocessor statements

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_extern	  = false	  to override preprocessor indent for braces

-int x = 1;

-#ifdef __cplusplus

-	extern "C" {

-

-	void some_c_function

-	(

-		void

-	);

-    }

-#endif
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp
deleted file mode 100644
index 7a0bcecf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// Example of function definitions inside of preprocessor statements

-// Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_func_def = false	  to override preprocessor indent for function definitions

-int x = 1;

-#if (USE_AWESOME_FUNCTIONS)

-	void MyClass::SomeAwesomeFunction()

-	{

-		DoSomethingInAFunction();

-	}

-#endif
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp
deleted file mode 100644
index 98418c46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define CTOR(i, _) : \
- T(X()), \
-/*
- * multi
- */ \
-\
-    y() \
-{ }
-main()
-{ }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp
deleted file mode 100644
index 35e8bea3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-WRAP_FUNCTION(Foo, Bar& (void));
-WRAP_FUNCTION(Foo, Bar* (void));
-WRAP_FUNCTION(Foo, (Bar& (void)));
-WRAP_FUNCTION(Foo, (Bar* (void)));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp
deleted file mode 100644
index ff0ab369..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-int dx = m_ClipBox.GetWidth() * GetZoom();
-
-m_ClipBox.m_Pos.y = PaintClipBox.y * GetZoom();
-
-int* i;
-char*i;
-
-int MyFunc(std::string& s, char*) {
-char *c = const_cast<char*>(s.c_str());
-}
-
-int YerFunc(std::string& s, char**) {
-char **c;
-int a = b[0] * c;
-}
-
-int*X(int *i, int*);
-
-int *i = &a;
-int *i = *b;
-int *i = &*c;
-
-int *Aclass::X(int* i, int *);
-
-class Aclass {
-int *X(int* i, int *);
-}
-extern "C" {
-int foo1(int *a);
-int foo2(sometype *a);
-}
-int bar1(int *a);
-int bar2(sometype *a);
-
-struct X
-{
-int   *  a; // 3:5
-
-int f()
-{
-return  *  b ; // 7:8
-}
-int g()
-{
-return  *  c ;  // 11:8
-}
-};
-
-int *const i;
-int *static i;
-
-static auto Func1(Model *model) -> Color*;
-static auto Func1(Model *model) -> Color* {
-  return nullptr;
-}
-
-auto Func2(Model *model) -> Color* const;
-auto Func2(Model *model) -> Color* const {
-  return nullptr;
-}
-
-auto Func3(Model *model) -> Color**;
-auto Func3(Model *model) -> Color** {
-  return nullptr;
-}
-
-auto Func4(Model *model) -> Color** const;
-auto Func4(Model *model) -> Color** const {
-  return nullptr;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp
deleted file mode 100644
index e318c1aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-class Foo: public QObject
-{
-Q_OBJECT
-
-private slots:
-void mySlot() {}
-
-public slots:
-void publicSlot();
-
-signals:
-void somesignal();
-
-};
-
-class foo{bool b;public:int i;};class bar:public
-foo{void*p;protected:double d;enum e{A,B};private:};
-
-class Foo1: public QObject
-{
-Q_OBJECT
-
-private Q_SLOTS:
-void mySlot();
-
-public Q_SLOTS:
-void publicSlot();
-
-Q_SIGNALS:
-void somesignal();
-};
-
-class foo1{bool b;public:int i;};class bar:public
-foo1{void*p;protected:double d;};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp
deleted file mode 100644
index 5037d792..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo()

-{

-	QObject::connect (m_NetworkReply,

-					  SIGNAL (error(QNetworkReply::NetworkError)),

-					  this,

-					  SLOT (NetworkReplyError(QNetworkReply::NetworkError)));

-	QObject::connect (m_NetworkReply,

-					  SIGNAL (uploadProgress(qint64, qint64)),

-					  this,

-					  SLOT (NetworkReplyUploadProgress(qint64, qint64)));

-	connect(&m_SendReportThread, SIGNAL(ProgressChanged(size_t, size_t)),

-		SLOT(OnReportProgressChanged(size_t, size_t)));

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp
deleted file mode 100644
index 28447084..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-   int foo1;
-   #pragma region something
-   int foo2 = 2;
-  #pragma endregion
-  int foo()
-  {
-
-   #pragma region something else
-   int foo3 = 3;
-   #pragma region nested
-   int foo4 = 0;
-  #pragma endregion
-   int foo5 = 0;
-  #pragma endregion
-  }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp
deleted file mode 100644
index cf86baeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-int foo1()
-{
-	// should not have newline before '.'
-	return std::pair<int, int>{1, 2}.first;
-}
-
-int foo2()
-{
-	// should be ARITH, not ADDR
-	return int{3} & 2;
-}
-
-int foo3()
-{
-	// should be ARITH, not ADDR
-	constexpr static int x = 3;
-	return decltype(x){x} & 2;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp
deleted file mode 100644
index f58dfee5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-inline static std::tuple<bool, std::string> foo(void) {
-// should remain a one liner
-return{true, ""s};
-}
-inline static std::tuple<bool, std::string, std::string> foo(void) {
-if (condition) {
-// should remain a one liner
-return{true, ""s, ""s};
-}
-// should remain a one liner
-return{false, ""s, ""s};
-}
-inline static std::tuple<bool, std::string> foo(void) {
-// should indent one level
-return{
-true, ""s
-};
-}
-inline static std::tuple<bool, std::string> foo(void) {
-// should indent one level on new line
-return
-{ true, ""s };
-}
-inline static std::tuple<bool, std::string> foo(void) {
-// should indent one level for braces and another level for values
-return
-{
-true, ""s
-};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp
deleted file mode 100644
index 85ab1a70..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#define foo1(x) { return  x; }
-#define foo2(x) { return(x); }
-#define foo3(x) { return  (x); }
-#define foo4(x) { return{x}; }
-#define foo5(x) { return  {x}; }
-
-#define case1(x) return  x
-#define case2(x) return(x)
-#define case3(x) return  (x)
-#define case4(x) return{x}
-#define case5(x) return  {x}
-
-void foo(int x)
-{
-	switch (x)
-	{
-	case 1:
-		return  1;
-	case 2:
-		return(2);
-	case 3:
-		return  (3);
-	case 4:
-		return{4};
-	case 5:
-		return  {5};
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp
deleted file mode 100644
index add2fc4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-CFoo::CFoo(const DWORD something, const RECT& positionRect, const UINT aNumber, bool thisIsReadOnly, const CString& windowTitle, CInfo *pStructInfo, int widthOfSomething) : CSuperFoo(something, positionRect, aNumber, 
-thisIsReadOnly, windowTitle), m_pInfo(pInfo), m_width(widthOfSomething)
-{
-}
-
-// this_comment_has_a_first_word_that_is_too_long_to_fit_into_a_line_without_wrapping and should not start with a blank comment line.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
deleted file mode 100644
index a344480b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-std::string StrGet()
-{
-	return IsConnected() ? "Connected" : {};
-}
-
-std::string StrGet2()
-{
-	return !IsConnected() ? {} : "Connected";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp
deleted file mode 100644
index 52796f75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-static int foo(int bar);
-
-static int foo(int bar)
-{
-   for (;;)
-   {
-      break;
-   };;
-   if (a)
-   {
-      foo();;
-   };
-
-   if (b)
-      if (c)
-        bar();
-      else
-         ;
-
-   else
-   {
-      foo();;;;;
-   };
-   switch (a)
-   {
-   case 1: break;
-   case 2: break;
-   default: break;;
-   };;
-   while (b-->0)
-   {
-      bar();;
-   };
-   do
-   {
-      bar();
-   } while (b-->0  );
-};
-
-enum FPP {
-   FPP_ONE = 1,
-   FPP_TWO = 2,
-};;
-
-struct narg {
-   int abc;  ;  ;
-   char def;  ;   ;
-   ;
-   ;const char *ghi;
-};
-
-class CFooRun {
-   long stick();
-   int bar() { m_ick++; };
-
-   CFooRun();;
-   ~CFooRun() {};
-};
-
-void f()
-{
-             if (tmp[0] == "disk")
-             {
-                 tmp = split (tmp[1], ",");
-                DiskEntry entry = { tmp[0], tmp[2],
-                                    stxxl::int64 (str2int (tmp[1])) *
-                                    stxxl::int64 (1024 * 1024) };
-                 disks_props.push_back (entry);
-             }
-}
-
-template < class > struct type;
-
-template < class T >
-class X {
-  typedef type < T > base ;
-  void f () {
-    ( base :: operator * () ) ;;
-  };
-};
-
-namespace N
-{
-class C
-{
-#define NOP(x) { }
-};
-}
-
-namespace N
-{
-   class C
-   {
-   };
-}
-
-void deallocate2(S **s_ptr)
-{
-    {
-       void *stopper_for_apply = (int[]){0};
-       void **list_for_apply = (void *[]){(*s_ptr)->arr, *s_ptr, stopper_for_apply};
-       for (int i = 0; list_for_apply[i] != stopper_for_apply; i++) {
-          saferFree((void *) & (list_for_apply[i]));
-          }
-           };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp
deleted file mode 100644
index 97dfe0cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-void log_fmt( log_sev_t sev,  const char *fmt,... ) __attribute__((format(printf, 2, 3)));
-
-#define LOG_FMT(sev, args...)                           \
-   do { if (log_sev_on(sev)) { log_fmt(sev, ## args); } } while (0)
-
-void foo()
-{
-try {}
-catch (...) // <== HERE
-{}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp
deleted file mode 100644
index 69f877ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void CMyClass::myFunction()
-{
-CMyReferencePointer & tmpPointer = (CMyReferencePointer & )getMyValue();
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h
deleted file mode 100644
index 58921bc5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#undef dot
-#undef cross
-
-extern "C" {
-#include "data_types.h"
-}
- vec_   operator+(const vec_&, const vec_&);          /* v = v1 + v2   */
- vec_   operator-(const vec_&, const vec_&);          /* v = v1 - v2    */
- mat_   operator+(const mat_&, const mat_&);          /* m = m1 + m2    */
- mat_   operator-(const mat_&, const mat_&);          /* m = m1 - m2    */
- vec_&  operator+=(vec_&, const vec_&);               /* v += v2    */
- mat_&  operator+=(mat_&, const mat_&);               /* m += m2    */
- vec_&  operator-=(vec_&, const vec_&);               /* v -= v2    */
- mat_&  operator-=(mat_&, const mat_&);               /* m -= m2    */
- vec_   operator*(double, const vec_&);               /* v = a * v1     */
- mat_   operator*(double, const mat_&);               /* m = a * m1     */
- vec_   operator*(const vec_&, double);               /* v = v1 * a    */
- mat_   operator*(const mat_&, double);               /* m = m1 * a    */
- vec_   operator/(const vec_&, double);               /* v = v1 / a    */
- mat_   operator/(const mat_&, double);               /* m = m1 / a  */
- vec_   operator*=(vec_&, const double a);            /* v *= a     */
- vec_   operator/=(vec_&, const double a);            /* v /= a       */
- vec_   operator*(const mat_&, const vec_&);          /* v = m1 * v1  */
- mat_   operator*(const mat_&, const mat_&);          /* m = m1 * m2  */
- quat_  operator*(const quat_&, const quat_&);        /* q = q1 * q2  */
- quat_  operator*(double, const quat_&);              /* q = a * q1  */
- quat_  operator*(const quat_&, double);              /* q = q1 * a  */
- quat_  operator/(const quat_&, double);              /* q = q1 / a  */
- vec_   operator-(const vec_&);                       /* v = - v1    */
- vec_   operator+(const vec_&);                       /* v = + v1    */
- mat_   operator-(const mat_&);                       /* m = - m1    */
- mat_   operator+(const mat_&);                       /* m = + m1    */
- quat_  operator+(const quat_&);                      /* q = + q    */
- quat_  operator-(const quat_&);                      /* q = - q    */
- quat_& operator*=(quat_&, const quat_&);             /* q1 *= q2;  */
- quat_& operator+=(quat_&, const quat_&);             /* q1 += q2;  */
- quat_& operator*=(quat_&, const double a);           /* q1 *= a;   */
- quat_  operator+(const quat_& q1, const quat_& q2);  /* q3  = q1 + q2  */
- vec_   unit(const vec_&);                            /* unitize vec    */
- quat_  unit(const quat_&);                           /* unitize quat   */
- mat_   trans(const mat_&);                           /* transpose matrix  */
- quat_  trans(const quat_&);                          /* transpose quat   */
- double dot(const vec_, const vec_);	     	      /* vector dot product  */
- vec_   cross(const vec_, const vec_);              /* vector cross product  */
-
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp
deleted file mode 100644
index c7ba93cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//test.cpp
-void test_fun(std::size_t a,
-           std ::  size_t /* b */);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp
deleted file mode 100644
index 15ee8e79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "bar.h"
-
-class Foo : public Bar {
-    int foo(int bar) const {
-        while (true) {
-            baz(&operator[](bar));
-        }
-    }
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp
deleted file mode 100644
index 0c1d5fc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.temp.test;
-
-public class Database
-{
-    private Database(String fileName) 
-    {
-        readConfig(fileName, "asdfasdf", 1);
-        readConfig(ame, "aasdf", 1);
-
-        Database::readConfig(fileName, "asdfasdf", 1);
-        Database::readConfig(ame, "aasdf", 1);
-
-        ::readConfig(fileName, "asdfasdf", 1);
-        ::readConfig(ame, "aasdf", 1);
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp
deleted file mode 100644
index 3f5a98d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-class A : public B
-{
-A& operator=(const A& other){
-if (this == &other)return *this;
-B::operator=(other);
-if (this == &other)return *this;
-B::opera(other);
-copy(other);
-return *this;
-}
-
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp
deleted file mode 100644
index 8eba4d1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <utility>
-
-std::pair<int, int> make_pair(int first, int second)
-{
-    return {first, second};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp
deleted file mode 100644
index 1fc0ded8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-typedef boost::shared_ptr < RatherLongClassName > sp_RatherLongClassName_t;
-int main()
-{
-    int argument = 1;
-    sp_RatherLongClassName_t ratherLongVariableName1(new RatherLongClassName(argument,
-    argument, argument));
-
-    int the_result = a_very_long_function_name_taking_most_of_the_line(argument,
-    argument, argument);
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h
deleted file mode 100644
index 29c52879..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace ns {
-
-template<typename T, template<typename> class TOtherClass> class Example
-{
-  int foo;
-}
-
-}
-
-template<class T> class Example
-{
-	
-  T getValue() const;
-
-  /** A pointer to a T returning function in the software environment */
-  T (FunctionProvider::*pF)();
-
-};
-
-
-#if !defined(EVERYTHING_OK)
-#error Define EVERYTHING_OK if you would like to compile your code \
-or not if you would like to stop!
-#endif
-
-
-template <class V>
-class Example
-{
-	
-	Vector2<V>()
-		: x(1),
-			y(1)
-	{}
-	
-	Vector2<double>()
-		: x(1.0),
-			y(1.0)
-	{}
-
-	Vector2<float>()
-		: x(1.0f),
-			y(1.0f)
-	{}
-
-	V x;
-	V y;
-
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp
deleted file mode 100644
index 7710171e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-template <typename T>
-struct foo {};
-
-Q_DECLARE_METATYPE(foo<int>  )
-
-int bar(foo<int>  );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp
deleted file mode 100644
index caea467a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-struct MyClass : public Foo {
-  MyClass(int a,
-          int b,
-          int c)
-      : m_a(a), m_b(b), m_c(c) {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp
deleted file mode 100644
index 18448555..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int x;
-char y;
-auto x1 = decltype(x)  {0};
-auto y1 = decltype(y)  {'a'};
-
-unsigned rows;
-for (auto row = decltype(rows){0}; row < rows; ++row) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp
deleted file mode 100644
index 6f235d22..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-static int x1;
-unsigned long int y1 = (unsigned short)0;
-const int foo1(int x);
-
-foo((const int*)0);
-static_cast<long long>(0);
-
-static  int  x2;
-unsigned  long  int  y2  =  (  unsigned  short  )  0  ;
-const  int  foo2  (  int  x  );
-
-foo  (  (  const  int  *  )  0  );
-static_cast  <  long  long  >  (  0  )  ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp
deleted file mode 100644
index 911aa53b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void foo()
-{
-  bar<T> ();
-  bar<T>(a);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp
deleted file mode 100644
index ab2096c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-int i = 0 + 3 - 4 * 3 % 3;
-int ii = 0+3-4*3%3;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp
deleted file mode 100644
index dc5f5e8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void MainWindow::createView()
-{
-   a = B((c) + (d));
-   a = B( (c) + (d));
-   a = B( (c) + (d) );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp
deleted file mode 100644
index 7dd9c14a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-const Foo & Foo::operator ==(Foo& me){
-   ::sockaddr* ptr = (::sockaddr*)&host;
-   return me;
-}
-
-MyType& MyClass::myMethode() {
-  const MyType& t = getSomewhere();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp
deleted file mode 100644
index 796522c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-struct MyClass : public Foo {
-  MyClass(int a, int b, int c) :
-      m_a(a), m_b(b), m_c(c) {}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
deleted file mode 100644
index 45ffb335..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/* leading cmt */ int w;
-int y;/* embedded cmt */int z;
-// whole cpp cmt
-int x; // trailing cpp cmt
-/* whole c cmt */
-int x; /* trailing c cmt */
-struct foo { // trailing cmt
-  int x; // trailing cmt
-  // whole cmt
-  int a;     /* emb cmt */ int b;    // trailing cmt
-}; // trailing cmt
-int a;/* emb cmt */ int b;// trailing cmt
-  
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp
deleted file mode 100644
index bb730d61..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-template<std::size_t _N, typename _Type, _Type... _Nums>
-std::array<uint8_t, _N - 1> constexpr crypt_helper(uint8_t const inSeed, char const(&inString)[_N], std::integer_sequence<_Type, _Nums...>) {
-return {  {crypt(_Nums, inSeed, static_cast<uint8_t>(inString[_Nums]))...}  };
-}
-static std::array<double_t, Homology::kNumberOfStats> const m{  {
-0.3,
-0.6,
-1.0
-}  };
-static std::array<double_t, Homology::kNumberOfStats> const m = {
-0.3,
-0.6,
-1.0
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp
deleted file mode 100644
index 7b4bdc5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int foo()
-{
-try { foo(bar); } catch (int *e) { return 0; }
-
-if (false) try { throw int(); } catch(...){}
-
-return 1;
-}	
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp
deleted file mode 100644
index b70ef6b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//BEGIN real region
-
-int foo()
-{
-    int x = 0; // BEGIN not-region
-    return x;  //END not-region
-}
-
-// END real region
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc
deleted file mode 100644
index 6a9b203b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc
+++ /dev/null
@@ -1,3 +0,0 @@
-int main() {
-    return 0; //Just return from the function.
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp
deleted file mode 100644
index 83c60dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class STDMETHOD
-{
-   STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
-   STDMETHOD(GetValues) (BSTR bsName, REFDATA** pData);
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
deleted file mode 100644
index e25d0496..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-void test()
-{
-	[]{}();
-	[]{ foo(); }();
-	[x]{ foo(x); }();
-	[](int x){ foo(x); }(42);
-	[y](int x){ foo(x, y); }(42);
-	bar([]{ return 1; }());
-	bar([]{ return foo(); }());
-	bar([x]{ return foo(x); }(42));
-	bar([](int x){ return foo(x); }(42));
-	bar([y](int x){ return foo(x, y); }(42));
-
-	[]  {}  ();
-	[]  { foo(); }  ();
-	[x]  { foo(x); }  ();
-	[]  (int x){ foo(x); }  (42);
-	[y]  (int x){ foo(x, y); }  (42);
-	bar([]  { return 1; }  ());
-	bar([]  { return foo(); }  ());
-	bar([x]  { return foo(x); }  (42));
-	bar([]  (int x){ return foo(x); }  (42));
-	bar([y]  (int x){ return foo(x, y); }  (42));
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp
deleted file mode 100644
index 3e2f7e47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define foo(expr) (expr)
-using x = decltype          foo(int);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp
deleted file mode 100644
index 20dac444..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-enum Enum1:int {
-  E31=0,
-  E32=1,
-  E33=2
-};
-enum Enum2 : int {
-  E31=0,
-  E32=1,
-  E33=2
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp
deleted file mode 100644
index 90798ef9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-BEGIN_MESSAGE_MAP(CUSB2_camera_developementDlg, CDialog)
-ON_COMMAND(IDC_ESCAPE, On_Escape)
-ON_COMMAND(IDC_8_BIT, On_8_Bit)
-ON_COMMAND(IDC_14_BIT, On_14_Bit)
-ON_COMMAND(IDC_ACQUIRE, On_Acquire)
-ON_COMMAND(IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages)
-ON_COMMAND(IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages)
-ON_WM_PAINT()
-ON_WM_QUERYDRAGICON()
-ON_WM_CTLCOLOR()
-END_MESSAGE_MAP()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp
deleted file mode 100644
index e9b0c428..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-a( , 1);
-typedef SLIST_HEAD( , foo) foo_list_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
deleted file mode 100644
index fff4aff4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-void foo()

-{

-	if (data)	go = new ClassA();

-	else		go = new ClassB();

-

-	if (evt.alt)		modifiers += "Alt+";

-	if (evt.command)	modifiers += "Cmd+";

-	if (evt.control)	modifiers += "Ctrl+";

-	if (evt.shift)		modifiers += "Shift+";

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp
deleted file mode 100644
index f45f1a9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-void foo()
-{
-   throw(x);
-   throw   (y);
-   throw (z);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp
deleted file mode 100644
index 30e058e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-int  foo1()
-{
-}
-
-int*  foo2()
-{
-}
-
-int&  foo3()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp
deleted file mode 100644
index 42699d1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#if defined(A)
-
-// Comment
-extern int ax;
-void fa();
-
-#elif defined(B)
-
-extern int bx;
-void fb();
-
-#else
-
-extern int cx;
-void fc();
-
-#endif
-
-int foo()
-{
-#if defined(A)
-
-    int a = ax;
-
-#elif defined(B)
-
-    // Comment
-    int b = bx;
-
-#else
-
-    int c = cx;
-
-#endif
-#if defined(A)
-    return a;
-#elif defined(B)
-    return b;
-#else
-    // Comment
-    return c;
-#endif
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h
deleted file mode 100644
index 8121fef1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef AKONADISERVER_H
-#define AKONADISERVER_H
-
-#include <QtCore/QPointer>
-#include <QtCore/QVector>
-
-#include <QtNetwork/QLocalServer>
-
-class QProcess;
-
-namespace Akonadi {
-namespace Server {
-
-class AkonadiServer : public QLocalServer
-{
-    Q_OBJECT
-
-public:
-    ~AkonadiServer();
-    static AkonadiServer *instance();
-};
-
-} // namespace Server
-} // namespace Akonadi
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp
deleted file mode 100644
index a2353599..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// test for bug # 633
-typedef void (*func)();
-typedef void (__stdcall *func)();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp
deleted file mode 100644
index 3534461b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void f() {
-	 			auto x = "	test\t 	 	 		...   ???";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp
deleted file mode 100644
index 1cfea449..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-void foo()
-{
-   BSTR test = L"SID";
-   CHAR s[]  = "This is a \"test\"";
-   CHAR ch   = 'a';
-}
-
-
-/* The 'u8', 'u', and 'U' prefixes */
-const char     *s1 = u8"I'm a UTF-8 string.";
-const char16_t *s2 = u"This is a UTF-16 string.";
-const char32_t *s3 = U"This is a UTF-32 string.";
-
-const char c1 = u8'1';
-const char16_t c2 = u'2';
-const char32_t c3 = U'4';
-const wchar_t c4 = L'w';
-const char16_t u = u'\u007f';
-
-/* The 'R' and 'R"delim(' prefixes */
-const char    *r1 = R"(Xhe String Data \ Stuff " )";
-const char    *r2 = R"delimiter(The String Data \ Stuff ")delimiter";
-
-/* Multiline string */
-auto foo = R"FOO"(
- some
- text
- and
- more
- text
-)FOO"";
-
-/* Combo */
-const char     *c1 = u8R"XXX(I'm a "raw UTF-8" string.)XXX";
-const char16_t *c2 = uR"*(This is a "raw UTF-16" string.)*";
-const char32_t *c3 = UR"(This is a "raw UTF-32" string.)";
-
-/* user-defined */
-OutputType operator "" _Suffix(unsigned long long);
-OutputType operator "" _Suffix(long double);
-
-OutputType some_variable    = 1234_Suffix;   // uses the first function
-OutputType another_variable = 3.1416_Suffix; // uses the second function
-
-OutputType operator "" _Suffix(const char * string_values, size_t num_chars);
-OutputType operator "" _Suffix(const wchar_t * string_values, size_t num_chars);
-OutputType operator "" _Suffix(const char16_t * string_values, size_t num_chars);
-OutputType operator "" _Suffix(const char32_t * string_values, size_t num_chars);
-
-OutputType some_variable = "1234"_Suffix;      //Calls the const char * version
-OutputType some_variable = u8"1234"_Suffix;    //Calls the const char * version
-OutputType some_variable = L"1234"_Suffix;     //Calls the const wchar_t * version
-OutputType some_variable = u"1234"_Suffix;     //Calls the const char16_t * version
-OutputType some_variable = U"1234"_Suffix;     //Calls the const char32_t * version
-
-/* Some stuff that should NOT be detected as a C++0x  user-defined literal */
-sscanf(text, "%"SCNx64, &val);
-printf("Val=%"PRIx64"\n", val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp
deleted file mode 100644
index 474aba08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-/* test of
- * indent_with_tabs = 0
- * indent_columns   = 11
- * the source has many <TAB>
- */
-{
-	 int a;
-		   int b;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp
deleted file mode 100644
index dc7a65c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-/* test of
- * indent_with_tabs = 1
- * indent_columns   = 11
- * the source has NO <TAB>
- */
-{
-        int x;
-           int y;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h
deleted file mode 100644
index 0f102244..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h
+++ /dev/null
@@ -1,16 +0,0 @@
-template<typename T, template<typename> class SpecialClass>
-class Example
-{
-  // Copy constructor with other variants of Example
-  template<template<typename> class OtherSpecialClass>
-  Example(const Example<T, OtherSpecialClass>& other)
-  {
-    // do something useful here
-  }
-
-  /** The normal member var based on the template arguments */
-  SpecialClass<T> memberVar;
-
-};
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp
deleted file mode 100644
index 137205d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-#include <list>
-#include <map>
-#include <vector>
-
-#define MACRO(T) f<T>()
-
-class MyClass
-{
-public:
-  std::map < int, bool > someData;
-  std::map < int, std::list < bool > > otherData;
-};
-
-void foo()
-{
-   List < byte >bob = new List<byte> ();
-
-}
-
-A<B> foo;
-A<B,C> bar;
-A<B*> baz;
-A<B<C> > bay;
-
-void asd(void)
-{
-A<B> foo;
-A<B,C> bar;
-A<B*> baz;
-A<B<C> > bay;
-   if (a < b && b > c)
-   {
-      a = b < c > 0;
-   }
-   if (a < bar() > c)
-   {
-   }
-   a < up_lim() ? do_hi() : do_low;
-   a[ a<b>c] = d;
-}
-
-template<typename T> class MyClass
-{
-
-}
-
-  template<typename T>
-  class MyClass
-  {
-  }
-
-  template<typename A, typename B, typename C> class MyClass : myvar(0),
-     myvar2(0)
-  {
-
-  }
-
-  template<typename A, typename B, typename C> class MyClass
-     : myvar(0),
-     myvar2(0)
-  {
-
-  }
-
-
-static int max_value()
-   {
-       return (std :: numeric_limits  <int >:: max ) ();
-   }
-
-template < class Config_    >
-priority_queue < Config_ >   ::   ~  priority_queue ()  {
-
- }
-
-template<class T>
-T test(T a) {
-return a;
-}
-
-int main() {
-int k,j;
-h g<int>;
-k=test<int>(j);
-return 0;
-}
-
-template<typename T, template<typename, unsigned int, unsigned int> class ConcreteStorageClass>
-class RotationMatrix
-  : public StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>
-{
-
-public:
-
-  RotationMatrix()
-    : StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>()
-  {
-  	// do some initialization
-  }
-
-  void assign(const OtherClass<T, 3, 3 >& other)
-  {
-    // do something
-  }
-
-};
-
-int main()
-{
-  MyClass<double, 3, 3, MyStorage> foo;
-}
-
-template< typename CharT, int N, typename Traits >
-inline std::basic_ostream<CharT,Traits>& FWStreamOut(std::basic_ostream<CharT,Traits> &os,
- const W::S<CharT,N,Traits> &s)
-     {
-           return operator<< <CharT, N, Traits, char, std::char_traits<char> >( os, s );
-     }
-
-struct foo {
-type1 < int  & > bar;
-};
-struct foo {
-type1 < int  const > bar;
-};
-
-
-template <int i> void f();
-template <int i> void g() {
-f<i-1>();
-f< i >();
-f<i+1>();
-f<bar()>();
-}
-void h() { g<42>(); }
-
-#include <vector>
-std::vector<int> A(2);
-std::vector<int> B;
-std::vector<int>C(2);
-std::vector<int>D;
-
-template<class T>struct X{template<class U>void operator()(U);};
-
-template<class T>class Y{template<class V>void f(V);};
-
-void (* foobar)(void) = NULL;
-std::vector<void (*)(void)> functions;
-
-#define MACRO( a ) a
-template < typename = int > class X ;
-MACRO ( void f ( X < > & x ) ) ;
-void g ( X < > & x ) ;
-
-#include <vector>
-typedef std::vector<std::vector<int> > Table;  // OK
-typedef std::vector<std::vector<bool>> Flags;  // Error
-
-void func(List<B>= default_val1);
-void func(List<List<B>>= default_val2);
-
-BLAH<(3.14 >= 42)> blah;
-bool X = j<3>>1;
-
-void foo()
-{
-  A<(X>Y)> a;
-  a = static_cast<List<B>>(ld);
-}
-
-template<int i> class X { /* ... */ };
-X< 1>2 > x1;    // Syntax error.
-X<(1>2)> x2;    // Okay.
-
-template<class T> class Y { /* ... */ };
-Y<X<1>> x3;     // Okay, same as "Y<X<1> > x3;".
-Y<X<(6>>1)>> x4;
-
-
-template <typename T>
-int
-myFunc1(typename T::Subtype val);
-
-int
-myFunc2(T::Subtype val);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp
deleted file mode 100644
index 46d41560..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-void f()
-{
-call_a_function(42,
-double(-1),
-"charray");
-call_a_function(42,
-double(-1),
-"charray"
-);
-call_a_function(
-42,
-double(-1),
-"charray"
-);
-call_a_template_function<int,
-int,
-int>
-(42);
-call_a_template_function<int,
-int,
-int
->
-(42);
-call_a_template_function<int,
-int,
-int>(42);
-call_a_template_function<int,
-int,
-int>(
-42
-);
-call_a_template_function<
-int,
-int,
-int
->
-(42);
-}
-template<class T,
-class U>
-class W;
-template<class T,
-class U
->
-class X;
-template<
-class T,
-class U>
-class Y;
-template<
-class T,
-class U
->
-class Z;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp
deleted file mode 100644
index 55b11d26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-template <bool a>
-struct T {
-        typedef int result;
-};
-template <bool a, bool b>
-struct X {
-        typedef typename T<a || b>::result result;
-};
-
-template <class T>
-class new_alloc {
-public:
-    void deallocate (int* p, int /*num*/)
-    {
-        T::operator delete((void *)p);
-    }
-};
-
-void test(void)
-{
-return x != 0
-&& x >= 1
-&& x < 2
-&& y >= 3
-&& y < 4;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp
deleted file mode 100644
index 10b96e4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#define FOO(X) \
-template <unsigned _blk_sz, typename _run_type, class __pos_type> \
-inline X<_blk_sz, _run_type, __pos_type> operator - ( \
-const X<_blk_sz, _run_type, __pos_type> & a, \
-typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \
-{ \
-return X<_blk_sz, _run_type, __pos_type>(a.array, a.pos - off); \
-} \
-template <unsigned _blk_sz, typename _run_type, class __pos_type> \
-inline X<_blk_sz, _run_type, __pos_type> & operator -= ( \
-X < _blk_sz, _run_type, __pos_type > & a, \
-typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \
-{ \
-a.pos -= off; \
-return a; \
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp
deleted file mode 100644
index 6f49594d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-void func() { }
-
-// **ABC**
-void func() { }
-// *INDENT-ON*
-
-void func() { }
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the following form:
- * \verbatim
-
-   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
-
-   where a, b, c, d, and e are real coefficients
-
- * \endverbatim
- *
- * This object's tolerance defines a threshold for root solutions above which iterative methods will be employed to achieve the desired accuracy
- *
- * \verbatim - this should cause the following line to not wrap due to cmt_width
- * Upon success, the roots array contains the solution to the polynomial p(x) = 0
- * \endverbatim
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-int solve(double a,
-                    double b,
-                 double c,
-                 double d,
-                     double e,
-              std::complex<double> roots[4]);
-
-/**
- * Function to solve for roots of a generic quartic polynomial of the following form:
- *
-
-   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
-   where a, b, c, d, and e are real coefficients
- *
- * Upon success, root1, root2, root3, and root4 contain the solution to the polynomial p(x) = 0
- * + Return value on output:
- * - 0, if an error occurs (invalid coefficients)
- * - 1, if all roots are real
- * - 2, if two roots are real and two roots are complex conjugates
- * - 3, if the roots are two pairs of complex conjugates
- */
-/* **ABC** */
-              int solve(double a,
-    double b,
-                  double c,
-            double d,
-            double e,
-                     std::complex<double> &root1,
-                  std::complex<double> &root2,
-            std::complex<double> &root3,
-        std::complex<double> &root4);
-/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp
deleted file mode 100644
index 6b4a0a39..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void func() { }
-
-// *INDENT-OFF*
-void func() { }
-// ??DEF??
-
-void func() { }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp
deleted file mode 100644
index de061955..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-auto f0(int a, int b)  ->  int;
-
-struct Foo
-{
-	auto f01()  ->  bool;
-	auto f02() noexcept  ->  bool;
-	auto f03() noexcept(true)  ->  bool;
-	auto f04() noexcept(false)  ->  bool;
-	auto f05() noexcept  ->  bool = delete;
-	auto f06() noexcept(true)  ->  bool = delete;
-	auto f07() noexcept(false)  ->  bool = delete;
-
-	auto f11() const  ->  bool;
-	auto f12() const noexcept  ->  bool;
-	auto f13() const noexcept(true)  ->  bool;
-	auto f14() const noexcept(false)  ->  bool;
-	auto f15() const noexcept  ->  bool = delete;
-	auto f16() const noexcept(true)  ->  bool = delete;
-	auto f17() const noexcept(false)  ->  bool = delete;
-
-	auto f21() throw()  ->  bool;
-	auto f22() throw()  ->  bool = delete;
-	auto f23() const throw()  ->  bool;
-	auto f24() const throw()  ->  bool = delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*)  ->  result_t{ return magic; }) {}
-};
-
-void foo()
-{
-	auto l = [](int n)  ->  x_t{ return n + 5; };
-	x([](int n)  ->  x_t{ return n + 5; });
-}
-
-static auto f25()  ->  bool {
-	return true;
-}
-
-static auto f26() const noexcept(true)  ->  bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp
deleted file mode 100644
index 447f3cbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-int foo()
-{
-try { foo(bar); } catch (int *e) { return 0; }
-
-if (false) try { throw int(); } catch(...){}
-
-if (a) { return 1; } else { return 0; }
-return 1;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp
deleted file mode 100644
index 53e74de2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Uncrustify does not process the intention of an using alias,
-// unknown_kw will therefore no be parsed as known keyword
-using unknown_kw = int;
-
-int main()
-{
-	// 'int' is a known c++ keyword
-	auto a0 = int  {  1  };
-	auto b0 = unknown_kw  {  2  };
-	auto c0 = ::unknown_kw  {  3  };
-	auto d0 = (int) unknown_kw  {  4  };
-	auto e0 = (int) ::unknown_kw  {  5  };
-	auto f0 = static_cast<int>(unknown_kw  {  6  });
-	auto g0 = static_cast<int>(::unknown_kw  {  7  });
-
-	auto a1 = int{1};
-	auto b1 = unknown_kw{2};
-	auto c1 = ::unknown_kw{3};
-	auto d1 = (int) unknown_kw{4};
-	auto e1 = (int) ::unknown_kw{5};
-	auto f1 = static_cast<int>(unknown_kw{6});
-	auto g1 = static_cast<int>(::unknown_kw{7});
-
-
-
-	auto a2 = int
-
-	{1};
-	auto b2 = unknown_kw
-
-	{2};
-	auto c2 = ::unknown_kw
-
-	{3};
-	auto d2 = (int) unknown_kw
-
-	{4};
-	auto e2 = (int) ::unknown_kw
-
-	{5};
-	auto f2 = static_cast<int>(unknown_kw
-
-	                           {6});
-	auto g2 = static_cast<int>(::unknown_kw
-
-	                           {7});
-
-
-
-	auto a1 = int{
-
-		1
-
-	};
-	auto b1 = unknown_kw{
-
-		2
-
-	};
-	auto c1 = ::unknown_kw {
-
-		3
-
-	};
-	auto d1 = (int) unknown_kw {
-
-		4
-
-	};
-	auto e1 = (int) ::unknown_kw {
-
-		5
-
-	};
-	auto f1 = static_cast<int>(unknown_kw {
-
-		6
-
-	});
-	auto g1 = static_cast<int>(::unknown_kw {
-
-		7
-
-	});
-
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp
deleted file mode 100644
index 37a131e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void whatever() {
-   SomeStruct a = SomeStruct{1, 2, 3};
-
-   someFuncCall(SomeStruct{4, 5, 6});
- }
-
-namespace foo {
-  int bar();
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp
deleted file mode 100644
index 82854287..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define UNC_DECLARE_FLAGS(flag_type, enum_type) \
-   using flag_type = flags<enum_type>
-
-#define UNC_DECLARE_OPERATORS_FOR_FLAGS(flag_type)                        \
-   inline flag_type operator&(flag_type::enum_t f1, flag_type::enum_t f2) \
-   { return(flag_type { f1 } & f2); }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp
deleted file mode 100644
index 0cca962b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#define A                   -3
-#define B            163
-#define C     2
-
-void foo()
-{
-    const std::string   &targetName1         = pEntry->getTargetName();

-    const Point3d_t      currentPosition1 = pSatOrbit->GetPositionAtTime(jdNow);

-}
-
-void foo2()
-{
-    const std::string  ** targetName2 = pEntry->getTargetName();

-    const Point3d_t       currentPosition2 = pSatOrbit->GetPositionAtTime(jdNow);

-}
-
-void foo2()
-{
-    const std::string**     targetName3 = pEntry->getTargetName();

-    const Point3d_t       currentPosition3 = pSatOrbit->GetPositionAtTime(jdNow);

-}
-
-typedef int     MY_INT;
-typedef int    *MY_INTP;
-typedef int   (*foo_t)(void *bar);
-typedef int   (*somefunc_t)(void *barstool);
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h
deleted file mode 100644
index f522097c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h
+++ /dev/null
@@ -1,10 +0,0 @@
-template<int __i, int... _Indexes, typename _IdxHolder, typename...
-_Elements>
-struct __index_holder_impl<__i, __index_holder<_Indexes...>,
-_IdxHolder, _Elements...>
-{
-typedef typename __index_holder_impl<__i + 1,
-__index_holder<_Indexes...,
-__i>,
-_Elements...>::type type;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp
deleted file mode 100644
index 99e01b6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-template<typename flt_t>
-template<typename gamma_t, typename gamma2_t, typename alpha_t, typename
-beta_t, typename tail_extrinsic_t, typename rec_tail_t>
-
-void turbo_dec_1_15<flt_t>::compute_tail(gamma_t const & gamma,
-gamma2_t const & gamma2,
-alpha_t const & alpha,
-beta_t const & beta,
-tail_extrinsic_t & tail_extrinsic,
-rec_tail_t const & rec_tail)
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/1822.cs
deleted file mode 100644
index a4269bd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/1822.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-                foreach (Cat c in * cats)
-                        System.Console.WriteLine(c.Name);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/615_nested-usings.cs
deleted file mode 100644
index 14a31507..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/615_nested-usings.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using (var x = X())
-using (var y = Y())
-{
-}
-
-using (var x = X())
-    using (var y = Y())
-    {
-    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/620_getset-brace.cs
deleted file mode 100644
index f6ee6342..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/620_getset-brace.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-class C

-{

-	float V {

-		get {

-			return _v; }

-		set { _v = value; } }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/621_this-spacing.cs
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/621_this-spacing.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-result = (Foo)this;

-result = (Foo)foo;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/625_where-constraints.cs
deleted file mode 100644
index 09274ab9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/625_where-constraints.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-interface D { } interface E { }

-

-class C<T1, T2, TX, T3, T4, T5>

-: IDisposable, IEnumerable<T1>

-	where T1 : class,D ,E ,new()

-		where T2 : IDictionary<D, Dictionary< string, float > >

-where TX : struct, IDisposable

-where T3: class

-					where T4: D where T5:E

-{

-    void F<T3, T4, T5, TX, T6>()  where T3 : D, new()

-    	where T4 : D

-	where T5: D

-	where TX : new()

-	where T6: D

-    {

-    }

-

-	class C2<T1, T2, TX, T3, T4, T5>

-: IDisposable, IEnumerable<T1>

-	where T1 : class,D ,E,new()

-		where T2 : IDictionary<D, Dictionary< string, float > >

-where TX : struct, IDisposable

-	where T3: class

-						where T4: D where T5:E

-	{

-	    void F2<T3, T4, T5, TX, T6>()

-	    	where T3 : D, new()

-	    	where T4 : D

-		where T5: D

-		where TX : new()

-		where T6: D

-	    {

-	    }

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
deleted file mode 100644
index 2e6d5a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-var dude = "Dude";

-var dude2 = new { Name = "Dude", Age = 30, };

-var dude3 = new { Name = "Dude", Age = 30, Kids = new { Name = "LittleDude" } };

-var dude4 = new { Name = "Dude", Age = 30, Kids = new[] { "LittleDude" } };

-var dude5 = new { Name = "Dude", Age = 30, Kids = new[] { new { Name = "LittleDude" } } };

-Action y = () => { };

-Func<int, float, bool> z = (a, b) => { var z = new { a, b }; return z == null; };

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/Issue_2705.cs
deleted file mode 100644
index 9a1b3172..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/Issue_2705.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-//example file
-public class A
-{
-public void A(string a)
-{
-	if (a == null)
-	{
-		return;
-	}
-
-	fixed(char* ptr = a)
-	{
-		 a = a + a;
-	}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11095.mm
deleted file mode 100755
index 34ed4050..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11095.mm
+++ /dev/null
@@ -1,19 +0,0 @@
-// Create oneliners
-
-extern "C" NSBundle*            UnityGetMetalBundle()       {
-    return _MetalBundle;
-}
-extern "C" MTLDeviceRef         UnityGetMetalDevice()       { return _MetalDevice; }
-extern "C" MTLCommandQueueRef   UnityGetMetalCommandQueue() { return ((UnityDisplaySurfaceMTL*)GetMainDisplaySurface())->commandQueue; }
-
-extern "C" EAGLContext*         UnityGetDataContextEAGL()   {
-    return _GlesContext;
-}
-
-// Keep oneliners
-
-extern "C" NSBundle*            UnityGetMetalBundle()       { return _MetalBundle; }
-extern "C" MTLDeviceRef         UnityGetMetalDevice()       { return _MetalDevice; }
-extern "C" MTLCommandQueueRef   UnityGetMetalCommandQueue() { return ((UnityDisplaySurfaceMTL*)GetMainDisplaySurface())->commandQueue; }
-
-extern "C" EAGLContext*         UnityGetDataContextEAGL()   { return _GlesContext; }
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11662.cs
deleted file mode 100755
index 9a49fdba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11662.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Unity
-{
-    public class Class
-    {
-        // doesn't work because ; gets removed but
-        public static readonly Class A = new Class() { name = "A", id = 1 };
-        // works and ; doesn't get removed
-        public static readonly Class B = new Class { name = "B", id = 2 };
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11993.cs
deleted file mode 100644
index 6bc6529a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11993.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Namespace

-{

-    public class Class

-    {

-        #if DEBUG

-        public statc foo()

-        {

-        }

-        #endif

-    }

-}

-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-12303.cs
deleted file mode 100755
index 01be8291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-12303.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-//This gets a double indentation
-devicePositions[device] = rect = new Rect(
-    Vector2.Lerp(rect.position, target.position, 0.1f),
-    Vector2.Lerp(rect.size, target.size, 0.1f));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1288.cs
deleted file mode 100644
index 70554a02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1288.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-public class Class

-{

-	public Foo GetFoo()

-	{

-		return new Foo

-			{

-				enabled = false,

-			};

-	}

-

-	public override Bar GetBar()

-	{

-		return new Bar()

-		{

-			m_Name = TestPropertyName

-		};

-		return new

-			AA();

-		return new AA<Type>

-			{

-

-			};

-	}

-

-	//It appears uncrustify is adding double-indentation no matter what, to the initializer block.

-	// Both of the above examples start out at a different level of indentation, and both get double-indented past original.

-}

-

-// The following code consolidates examples from the topic.

-class ObjInitializers

-{

-	class Cat

-	{

-		// Auto-implemented properties.

-		public int Age { get; set; }

-		public string Name { get; set; }

-	}

-

-	static void Main()

-	{

-		Cat cat = new Cat { Age = 10, Name = "Fluffy" };

-

-		List<Cat> cats = new List<Cat>

-			{

-				new Cat(){ Name = "Sylvester", Age=8 },

-				new Cat(){ Name = "Whiskers", Age=2 },

-				new Cat(){ Name = "Sasha", Age=14 }

-			};

-

-		List<Cat> moreCats = new List<Cat>

-	{

-		new Cat(){ Name = "Furrytail", Age=5 },

-		new Cat(){ Name = "Peaches", Age=4 },

-		null

-	};

-

-		// Display results.

-		System.Console.WriteLine(cat.Name);

-

-		foreach (Cat c in cats)

-			System.Console.WriteLine(c.Name);

-

-		foreach (Cat c in moreCats)

-			if (c != null)

-				System.Console.WriteLine(c.Name);

-			else

-				System.Console.WriteLine("List element has null value.");

-	}

-	// Output:

-	//Fluffy

-	//Sylvester

-	//Whiskers

-	//Sasha

-	//Furrytail

-	//Peaches

-	//List element has null value.

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1333.mm
deleted file mode 100644
index 5c91693c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1333.mm
+++ /dev/null
@@ -1,15 +0,0 @@
-// Test if Uncrustify properly handles `@synchronized` keyword for ObjC

-

-// In keywords.cpp there is no @synchronized keyword listed and from what I've seen synchronized is only regarded as a keyword in other languages

-// { "synchronized", CT_QUALIFIER, LANG_D | LANG_JAVA | LANG_ECMA },

-

-- (void)foo

-{

-    @synchronized(self)

-    {

-        if (bar)

-        {

-            bar = false;

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1338.cs
deleted file mode 100644
index d10b4893..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1338.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// *Single line functions*

-

-public class Class

-{

-    public string foo {get; set;}

-    public string foo { get; set; }

-

-    bool HasBar() {return m_HasBar != 0;}

-    bool HasBar() { return m_HasBar != 0; }

-

-    public Bar prop {get {return m_bar;} set {m_bar = value;}}

-    public Bar prop { get { return m_bar; } set { m_bar = value; } }

-

-// This seems to happen with no spaces on the interior. Opening brace doesn't get one, closing brace does.

-

-// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {1}). May need special support, or perhaps there's a bug..

-

-// *Initializers*

-

-// Not sure if this is what we want..

-

-    public void foo()

-    {

-        sas.Foo("bar", new Dictionary<string, object>(){ { "k1", "v1" }, { "k2", "v2" } });

-        // ... --> ...

-        sas.Foo("bar", new Dictionary<string, object>() { { "k3", "v3" }, { "k4", "v4" } });

-    }

-

-// Second line adds a space before the initializer {. Is that what we want for C#?

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1343.cs
deleted file mode 100644
index 852fe640..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1343.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Need to...

-

-// * Deal with the newline-after-opening and brace arrangement thing (eat_blanks_after_open_brace etc - see note in Uncrustify.Cpp.cfg)

-// * Terminate with //namespace if greater than x lines (like with #ifdef)

-

-namespace Unity

-{

-    public static void foo1()

-    {

-

-    }

-

-    public static void foo2()

-    {

-        

-    }

-

-    public static void foo3()

-    {

-        

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1345.cs
deleted file mode 100644
index e218e6a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1345.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-public class Class

-{

-    public void foo()

-    {

-        data.Sort(

-            delegate(InputData lhs, InputData rhs)

-            {

-                return lhs.m_Name.CompareTo(rhs.m_Name);

-            });

-    }

-}

-

-// Want the braces aligning with the delegate keyword.

-

-// Probably also an issue with lambda style delegates.
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-13955.cs
deleted file mode 100755
index 940aa89b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-13955.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-if (m_Preview.GetExpanded())
-{
-    m_EventSearchString = EditorGUI.TextField(searchRect, m_EventSearchString, Styles.toolbarSearchField);
-    if (GUILayout.Button(
-        GUIContent.none,
-        m_EventSearchString == string.Empty ? Styles.toolbarSearchFieldCancelEmpty : Styles.toolbarSearchFieldCancel))
-    {
-    }
-}
-
-// The closing parenthesis is being indented twice.
-bool success = GenerateSecondaryUVSet(
-    &mesh.vertices[0].x, mesh.vertices.size(),
-    &triUV[0].x, &triList[0], triSrcPoly.size() ? &triSrcPoly[0] : 0, triCount,
-    &outUV[0].x, param, errorBuffer, bufferSize
-);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-14131.cs
deleted file mode 100755
index c8c3c918..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-14131.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-
-class C
-{
-    public void S()
-    {
-        Action localMethod = () => {
-                SomeClass.OtherMethod(new Dictionary<string, string>
-                {
-                    {"a", "one"},
-                    {"b", "two"},
-                    {"c", "three"}
-                });
-            };            
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-17253.cs
deleted file mode 100644
index 7342d82c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-17253.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Extra test cases for  # 1257
-switch (sometext)
-{
-    case "a":
-        return 0;
-    case "b":
-        Console.WrieLine("hello world\n");
-        return 0;
-    case "c":
-    {
-        Console.WrieLine("hello world\n");
-        return 0;
-    }
-    case "d":
-        Console.WrieLine("hello world\n");
-
-        if (hello)
-            return 0;
-        else
-            return 1;
-
-    case "e":
-        Console.WrieLine("hello world\n");
-
-        if (hello)
-        {
-            int a;
-            int b;
-            return 0;
-        }
-
-    case "f":
-    {
-        return 0;
-    }
-    case "g":
-
-        return 0;
-
-    case "h":
-        for (i = 0; i < 10 i++)
-        {
-            a += i;
-            return 0;
-        }
-    case "i":
-
-        if (hello)
-        {
-            int a;
-            int b;
-            return 0;
-        }
-
-        return 1;
-    default:
-        return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18437.cs
deleted file mode 100644
index aab6c498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18437.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-private static Type[] GetAllVisualElementTypes()
-{
-    return typeof(VisualElement).Assembly.GetTypes()
-        .Where(t => t != typeof(VisualElement) &&
-                t != typeof(Panel) &&
-                !t.IsAbstract &&
-                !typeof(IMElement).IsAssignableFrom(t) &&
-                !typeof(IMContainer).IsAssignableFrom(t) &&
-                typeof(VisualElement).IsAssignableFrom(t)).ToArray();
-}
-
-// to this
-private static Type[] GetAllVisualElementAssetTypes()
-{
-    return typeof(VisualElement).Assembly.GetTypes()
-        .Where(t => t != typeof(VisualElement) &&
-            t != typeof(Panel) &&
-            !t.IsAbstract &&
-            !typeof(IMElement).IsAssignableFrom(t) &&
-            !typeof(IMContainer).IsAssignableFrom(t) &&
-            typeof(VisualElement).IsAssignableFrom(t)).ToArray();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18777.cs
deleted file mode 100644
index 198d5be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18777.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// I want to keeep the function call indented
-Thingy
-    .Select(x => x > 2)
-    .ToList();
-
-// it works with a var
-var x = Thingy
-    .Select(x => x > 2)
-    .ToList();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18780.cs
deleted file mode 100755
index 0eea713e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18780.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-// note that this only happens with positive int literals. if i use a float with a decimal, or 'c' or "abc" or whatever, or even `(-5)`, it's ok.
-5.Clamp(2, 10).ShouldBe(5);
-5.Clamp(-5, 10).ShouldBe(5);
-5.Clamp("a", 10).ShouldBe(5);
-
-"4".Clamp(2, 10).ShouldBe(5);
-(-5).Clamp(2, 10).ShouldBe(5);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18829.cs
deleted file mode 100755
index 62c9f8fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18829.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// It shouldn't detele the space after the tuple definition
-public static (bool updated, Warnings warnings) UpdateIncludesInFile(
-    string fileToUpdate, string oldIncludeFile, string newIncludeFile)
-{
-    // ...
-}
-
-// It shouldn't detele the space after the tuple definition
-public static (int, string) UpdateIncludesInFile(
-    string fileToUpdate, string oldIncludeFile, string newIncludeFile)
-{
-    // ...
-}
-
-// It shouldn't detele the space after the tuple definition and updated, warnings should be tokenized as types
-public static (updated, warnings) UpdateIncludesInFile(
-    string fileToUpdate, string oldIncludeFile, string newIncludeFile)
-{
-    // ...
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1919.cs
deleted file mode 100644
index 956fd0f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1919.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// this

-

-Func(

-    "stuff",

-    foo =>

-    {

-        bar();

-    });

-

-// formats to this

-    

-Func(

-    "stuff",

-    foo =>

-{

-    bar();

-});

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19644.cs
deleted file mode 100644
index da76bfbc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19644.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-//It deletes the space after {
-class Foo 
-{
-    extern internal bool canAccess { [NativeMethod(Name = "CanAccessFromScript")] get; }
-
-    extern public int subMeshCount { get; [NativeMethod(Name = "CanAccessFromScript")] set; } 
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1975.cs
deleted file mode 100644
index af678a93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1975.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// typeof(Dictionary<, >)

-

-// is getting changed to

-

-// typeof(Dictionary<, >)

-

-// (space added after comma)

-

-// Definitely not typical for C#. Needs special handling.

-

-public class Class

-{

-	public void foo(Type type)

-	{

-		if (type == typeof(List<>))

-		{

-		}

-		else if (type == typeof(Dictionary<,>))

-		{

-			var bar = typeof(Dictionary<,>).Bar();

-		}

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1977.cs
deleted file mode 100644
index e4b1b375..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1977.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// We specifically avoid our own tab-space in GenericFormat because of the @"" issue.

-// So we must rely on Uncrustify getting it right, and it nearly does - except for the

-// "Layout has changed, bail out now" where it does not replace the tab preceding the comment.

-

-namespace Namespace

-{

-	class Class

-	{

-		public void Foo()

-		{

-			if (bar)

-			{

-				//	Layout has changed, bail out now.

-				bar = false;

-			}

-		}

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1978.cs
deleted file mode 100644
index 14cbdc7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1978.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// `new[] {` on colors12345636 should have brace on following line

-

-namespace Namepsace

-{

-	internal static class Colors

-	{

-		static Color[] colors12345636 = new[] {

-											new Color(123/123f, 123/123f,   0/123f),

-											new Color(123/123f, 123/123f,   4/123f),

-											new Color(123/123f,  75/123f,  36/123f),

-											new Color(123/123f,  97/123f, 136/123f),

-											new Color(123/123f, 123/123f, 136/123f),

-											new Color( 13/123f, 123/123f, 136/123f),

-											new Color(  0/123f, 123/123f, 136/123f),

-											new Color(123/123f, 123/123f,   1/123f)};

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19895.cs
deleted file mode 100644
index a22c6fa8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19895.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using UnityEngine;
-using UnityEngine.Serialization;
-namespace UnityEngine.Experimental.Input
-{
-    public class ActionMap : ScriptableObject, IControlDomainSource
-    {
-        public List<InputControl> BuildControlsList()
-        {
-            ControlSetup controlsSetup = new ControlSetup();
-            for (int i = 0; i < actions.Count; i++)
-            {
-                var action = actions[i];
-// This line is kept with 71 spaces.
-                SupportedControl supportedControl = (SupportedControl)(typeof(SupportedControl)
-                                                                       .GetMethod("Get")
-                                                                       .MakeGenericMethod(actions[i].controlType)
-                                                                       .Invoke(null, new object[] { actions[i].name }));
-                action.controlIndex = controlsSetup.AddControl(supportedControl).index;
-            }
-            return controlsSetup.controls;
-        }
-    }
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2007.cs
deleted file mode 100644
index 2e9f163a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2007.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-public class MyGenericClass<T> where T:IComparable { }
-
-class MyClass<T, U>
-    where T : class
-    where U : struct
-{ }
-
-public class MyGenericClass<T> where T : IComparable, new()
-{
-    // The following line is not possible without new() constraint:
-    T item = new T();
-}
-
-interface IMyInterface
-{
-}
-
-class Dictionary<TKey, TVal>
-    where TKey : IComparable, IEnumerable
-    where TVal : IMyInterface
-{
-    public void Add(TKey key, TVal val)
-    {
-    }
-}
-
-class List<T>
-{
-    void Add<U>(List<U> items) where U: T { /*...*/ }
-    void Add<U>(List<U> items) where U : T { /*...*/ }
-}
-
-extern T GetNodeFromGuid<T>(Guid guid) where T : INode;
-extern T GetNodeFromGuid<T>(Guid guid) where T: INode;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2008.cs
deleted file mode 100644
index eeb649dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2008.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-Utils.Curve attribute = (Utils.Curve)base.attribute;

-Utils.Curve attribute = (Utils.Curve) base.attribute;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2020.cs
deleted file mode 100644
index 37d9ef23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2020.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// As discussed with unity updating the test case

-

-{

-    var a = @"asdasda";

-    

-    var d = 

-@"asdasda"; 

-

-   var d = 

-			@"asdasda";

-

-    var b = @"

-line1

-line2";

-

-    var c = Very(Long(Nested(Function(

-@"line1

-line2"))));

-

-var c = Very(Long(Nested(Function(

-			@"line1

-line2"))));

-

-    var c = Function(

-        hey,

-        you,

-@"line1

-line2", fubar,

-        hmm);

-

-var c = Function(

-        hey,

-        you,

-			@"line1

-line2", fubar,

-        hmm);

-

-    var c = Function(

-        hey,

-        you,

-@"line1

-line2",

-        fubar,

-        hmm);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2021.cs
deleted file mode 100644
index 2b08fafe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2021.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// updating the testcase for 1247 

-// concluded that we need to convert all the 4,3,2 liners to one liner based on the option

-int fun ()

-{ 

-return 0; 

-}

-

-int fun() {return 0; }

-

-int fun() {

-return 0; 

-}

-

-int fun() {

-return 0; }

-

-int fun()

-{return 0; }

-

-int fun() { return 0; 

-}

-

-int fun() 

-{

-return 0; }

-

-int fun() 

-{ return 0; 

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-21730.cs
deleted file mode 100644
index 6fcb8c16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-21730.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-private void Foo()

-{

-    Action<UnityPlayerBaseStartInfo, GraphicsTestRunConfiguration, Action<string, Bitmap, long>, RenderingBackend, DX11FeatureLevel? , string> playerRunnerImageCallback

-        = (playerStartInfo, description, incomingScreenshotCallback, configuration, dx11Featurelevel, graphicsDriverType) => incomingScreenshotCallback(filename, new Bitmap(1, 1), 42);

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2505.cs
deleted file mode 100644
index a17e6a5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2505.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-public class Class : Base

-{}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2506.cs
deleted file mode 100644
index 7bdbb81a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2506.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-public class Class

-{

-	public int property

-	{

-		get

-		{

-			return !IsModeActive(Mode.None)

-				&& !IsModeActive(Mode.Foo)

-				&& !IsModeActive(Mode.Bar);

-		}

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2684.cs
deleted file mode 100644
index 0c91b081..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2684.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-EditorApplication.CallDelayed(() => {
-    foreach (CollabToolbarWindow window in Resources.FindObjectsOfTypeAll<CollabToolbarWindow>())
-        window.Close();
-}, 1f);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2685.cs
deleted file mode 100644
index 4c11f20b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2685.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-func(a, b, c, d,
-    (float a, int b, Foo bar) =>
-        {
-            test();
-        });
-(float a, int b, Foo bar) =>
-    {
-        test();
-    });
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-29933.cs
deleted file mode 100644
index ed96bc87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-29933.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-void Foo1()

-{

-    switch (foo)

-    {

-        case 1:

-            _bar = new Bar(x, y,

-                z, a);

-            break;

-        case 2:

-            _bar = new Bar(x, y,

-            z, a);

-            break;

-        case 3:

-            _bar = foo.bar;

-            break;

-        case 4:

-            foo.bar = Bar.BarFunc(x, (x == y)

-                ? foo.x

-                : foo.y);

-            break;

-        case 5:

-            foo.bar = Bar.BarFunc(x, (x == y)

-            ? foo.x

-            : foo.y);

-            break;

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-30498_2.cs
deleted file mode 100644
index ba0d8515..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-30498_2.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-class Foo

-{

-    public static IEnumerable<NPath> RuntimeIncludes { get; }

-        = new[]

-        {

-        new NPath("Projects/PrecompiledHeaders")

-        };

-

-    void Foo(string file)

-    {

-        var type = Path.GetFileNameWithoutExtension(file);

-        switch (Path.GetExtension(file))

-        {

-            case ".cs":

-                resource = new Bar(string.Format("test output",

-                            type));

-                break;

-            case ".baz":

-                resource = new Baz(type,

-                        string.Format(@"test output

-with multiple

-lines

-",

-                            type));

-                break;

-        }

-    }

-}

-

-public class Bar

-{

-    private static FooBar Baz { get; }

-        = new FooBar()

-            .WithPath("foo/bar/baz")

-            .WithSource("qux/quux/quuz")

-            .WithPrebuiltReference(FooBar.Baz)

-            .WithBaz("2")

-            .Complete();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3083.cs
deleted file mode 100644
index 5209dc72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3083.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-class ClassWithCtorICall
-{
-    public ClassWithCtorICall()
-    {
-        DoICall();
-    }
-
-    //It shouldn't add an extra space before 0x1000
-    [MethodImpl((MethodImplOptions)0x1000)]
-    static extern void DoICall();
-
-    //It shouldn't add an extra space before 1000
-    [MethodImpl((MethodImplOptions)1000)]
-    static extern void DoICall();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-32658.cs
deleted file mode 100644
index 145da65f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-32658.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//TestCase-001

-internal struct MyStruct<T>

-    where T : struct, IPrepareFrameJob

-{

-}

-

-//TestCase-002

-class MyClass<T, U>

-    where T : class

-    where U : struct

-{

-}

-

-//TestCase-003

-interface IMyInterface

-{

-}

-

-class Dictionary<TKey, TVal>

-    where TKey : IComparable, IEnumerable

-    where TVal : IMyInterface

-{

-    public void Add(TKey key, TVal val) {}

-}

-

-long DeviceCommand<TCommand>(int deviceId, ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo;

-

-public virtual long OnDeviceCommand<TCommand>(ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo;

-

-long DeviceCommand<TCommand>(int deviceId, ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo

-

-public virtual long OnDeviceCommand<TCommand>(ref TCommand command)

-    where TCommand : struct, IInputDeviceCommandInfo

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3484.cs
deleted file mode 100644
index 1235aa91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3484.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// various combos from unity

-

-contents.Append( "#include \"{file.GetBoundPath ()}\"" );

-contents.Append( $"#include \"{file.GetBoundPath ()}\"" );

-contents.Append( $"#include \"{file.GetBoundPath ("abc def")}\"" );

-

-contents.Append(

-    $"#include \"{file.GetBoundPath()}\"");

-

-contents.Append( $@"#include

-""{file.GetBoundPath($@"abc 

- def")}""" );

-

-contents.Append(

-    $@"#include

-""{file.GetBoundPath(@"abc

-   def ghi")}""" );

-

-contents. Append( @"#include

-""{file.GetBoundPath ()}""" );

-

-// fun with nesting

-

-$@"{$"\\\"abc{$@" \""def\"" {"{ghi}"} {jkl} {{mno}}"}\\\""

-}".Dump();

-    

-$@"{$@"\""abc{$@" def {"{ghi}"}

-    {jkl} {{mno}}\"""}"

-}".Dump();

-

-// ensure we didn't break @for etc

-

-var @for = @base + @this - $@"{@while}"  ;

-

-// from roslyn's InterpolationTests.cs

-

-Console.WriteLine($"{number}");

-

-Console.WriteLine($"{number}{number}");

-Console.WriteLine($"Jenny don\'t change your number { number :###-####} { number :###-####}.");

-Console.WriteLine($"jenny { ((Func<int>)(() => { return number; })).Invoke() :(408) ###-####}");

-Console.WriteLine( $"{hello}, { world }." );

-

-Console.WriteLine( $@"{

-                            hello

-                    },

-{

-                    world }." );

-

-System.Console.Write($"{{ x }}");

-var s = $@"{$@""{1}""}";

-

-Console.WriteLine($"{ await hello }, { await world }!");

-

-Console.WriteLine($"X = { 123 , -(3+4) }.");

-

-var s1 = $"X = { 1 } ";

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-36862.cs
deleted file mode 100644
index cb3cb448..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-36862.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-public unsafe struct QueryKeyNameCommand : IInputDeviceCommandInfo

-{

-    public string ReadKeyName()

-    {

-        fixed(QueryKeyNameCommand* thisPtr = &this)

-        {

-            return StringHelpers.ReadStringFromBuffer(new IntPtr(thisPtr->nameBuffer), kMaxNameLength);

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-37241.cs
deleted file mode 100644
index b2097c4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-37241.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-public double TotalPurchases { get; set; }

-protected IEnumerable<string> Defines { get; } =

-TargetPlatformRules.Elements

-	.Append("LINUX")

-	.Append("_RAKNET_LIB");
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-40685.cs
deleted file mode 100644
index a2f37547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-40685.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace Namespace

-{

-    public static class Class

-    {

-        public static void Foo()

-        {

-            Tests = Bar(

-                A,

-                cp =>

-                cp.Foo(new Bar

-                {

-                    Identifier = "ID",

-                    PathToEmbed = "VAL"

-                })

-                .WithPrebuiltReference(Moq),

-                Core);

-

-            var Test = FooBar(

-                B,

-                cp => cp.WithB(Bar).WithSource("Path/File.ext"),

-                new[] {

-                    A,

-                    B,

-                    C

-                }

-            );

-        }

-    }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-58354.cs
deleted file mode 100644
index 6c77de40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-58354.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-public static class Extensions
-{
-    public static FluentXboxOneSdk VS2017(this FluentPlatform<XboxOnePlatform> _) => new FluentXboxOneSdk {MsvcVersion = new Version(15, 0)};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-9917.cs
deleted file mode 100755
index 5bd9dc64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-9917.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// 1. Formatting the first produces the second.
-
-namespace Unity.IL2CPP.IntegrationTests.ILTests.Tests
-{
-	public class GlobalsWithBoxOptimizationAndBrTrueOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrTrueOpcodeTest() : base(OpCodes.Brtrue) { } }
-	public class GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest() : base(OpCodes.Brtrue_S) { } }
-	public class GlobalsWithBoxOptimizationAndBrFalseOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrFalseOpcodeTest() : base(OpCodes.Brfalse) { } }
-	public class GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest() : base(OpCodes.Brfalse_S) { } }
-}
-
-// 2. And formatting this produces the third.
-
-namespace Unity.IL2CPP.IntegrationTests.ILTests.Tests
-{
-    public class GlobalsWithBoxOptimizationAndBrTrueOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrTrueOpcodeTest() : base(OpCodes.Brtrue) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest() : base(OpCodes.Brtrue_S) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrFalseOpcodeTest() : base(OpCodes.Brfalse) {}
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest : BoxTestsBase { public GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest() : base(OpCodes.Brfalse_S) {}
-    }
-}
-
-// 3. This doesn't changes when formatted.
-
-namespace Unity.IL2CPP.IntegrationTests.ILTests.Tests
-{
-    public class GlobalsWithBoxOptimizationAndBrTrueOpcodeTest : BoxTestsBase 
-    { 
-        public GlobalsWithBoxOptimizationAndBrTrueOpcodeTest() : base(OpCodes.Brtrue) { } 
-    }
-    public class GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest : BoxTestsBase 
-    { 
-        public GlobalsWithBoxOptimizationAndBrTrueSOpcodeTest() : base(OpCodes.Brtrue_S) { } 
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseOpcodeTest : BoxTestsBase 
-    { 
-        public GlobalsWithBoxOptimizationAndBrFalseOpcodeTest() : base(OpCodes.Brfalse) { } 
-    }
-    public class GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest : BoxTestsBase 
-    { 
-        public GlobalsWithBoxOptimizationAndBrFalseSOpcodeTest() : base(OpCodes.Brfalse_S) { } 
-    }
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/add-nl-before-namespace.cs
deleted file mode 100644
index 93a2cf04..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/add-nl-before-namespace.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace MyNamespace
-{
-namespace MyNamespace2
-{
-class A
-{
-}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/argtypes.mm
deleted file mode 100644
index fd2ff142..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/argtypes.mm
+++ /dev/null
@@ -1,3 +0,0 @@
-static void WriteArrayToDrag (NSArray* array, NSPasteboard* pboard, NSString* pboardType);

-static OSStatus FindProcess (const FSRef* appRef, ProcessSerialNumber *pPSN, NSString* application, bool permissiveSearching);

-NSString* MakeNSString(const std::string& string);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/asm.h.mm
deleted file mode 100644
index 97c0edd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/asm.h.mm
+++ /dev/null
@@ -1,21 +0,0 @@
-static inline void atomic_retain(volatile int *p)

-{

-#if defined(_MSC_VER)

-    _InterlockedIncrement ((LONG volatile *) p);

-#else

-    __asm__ (

-    "lock incl  %0\n\t"

-        : "+m" (*p)

-        :

-        : "cc", "memory"

-    );

-#endif

-}

-

-static inline void atomic_thread_fence (memory_order_release_t)

-{

-	__asm__ __volatile__

-	(

-		ASM_LWSYNC : : : "memory"

-    );

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1591.cs
deleted file mode 100644
index ac62df9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1591.cs
+++ /dev/null
@@ -1 +0,0 @@
-byte[] utf8Str = new byte[] { 197, 170, 110, 196, 173, 099, 197, 141, 100, 101, 204, 189 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1620.cs
deleted file mode 100644
index 0c9d4eb9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1620.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-new WaveformStreamer(s_sweepedClip, 0, s_sweepedClip.length, 1,

-    (streamer, floats, remaining) =>

-    {

-        return false;

-    }

-    );

-

-using System.Collections.Generic;

-

-class C

-{

-    public void S()

-    {

-        Action localMethod = () => {

-            SomeClass.OtherMethod(new Dictionary<string, string>

-{

-                {"a", "one"},

-                {"b", "two"},

-                {"c", "three"}

-            });

-        };

-		m_Mixers.Add(

-			new WeightInfo   

-			{  

-				parentMixer = parent,

-				mixer = node,

-				port = port,

-				modulate = (type == typeof(AnimationLayerMixerPlayable))

-			}

-		);

-    }

-}

-

-MergeJSFiles(new string[] {

-        GetDecompressor(),

-        Paths.Combine(buildToolsDir, "UnityConfig"),

-        Paths.Combine(args.stagingAreaData, kOutputFileLoaderFileName),

-    }, unityLoader

-);

-

-public void GeneratesCorrectVisualStudioProjectFile()

-{

-    GenerateProjectsAndCompareWithTemplates(

-        runInJam: InJamCreateTestProject,

-        generatedPath: TestRoot.Combine("Solution"),

-        templatesPath: "Tools/Unity.BuildSystem/Unity.BuildSystem.VisualStudio.Tests/Templates",

-        templates: new[] {

-        "TestProjectGeneration_CApplication.sln",

-        "Projects/TestProjectGeneration_CApplication.vcxproj",

-        "Projects/TestProjectGeneration_CApplication.vcxproj.filters"

-    });

-}

-

-public void GeneratesCorrectVisualStudioProjectFile()

-{

-    GenerateProjectsAndCompareWithTemplates(

-        runInJam: InJamCreateTestProject,

-        generatedPath: TestRoot.Combine("Solution"),

-        templatesPath: "Tools/Unity.BuildSystem/Unity.BuildSystem.VisualStudio.Tests/Templates",

-        templates: new[]

-    {

-        "TestProjectGeneration_CApplication.sln",

-        "Projects/TestProjectGeneration_CApplication.vcxproj",

-        "Projects/TestProjectGeneration_CApplication.vcxproj.filters"

-    }

-        );

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1637.cs
deleted file mode 100644
index 1f46d1bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1637.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-//Test Case-001

-inline double GetAudioBitrateForQuality(double f) { return (56000 + 200000 * (f)); }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1650.cs
deleted file mode 100644
index 5c52aece..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1650.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-public string Foo =>

-    "bar";

-public string Foo

-    => "bar";

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker

-    => _this.WithLinkerSetting(l => l.Flags = l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker =>

-    _this.WithLinkerSetting(l => l.Flags = l.Flags.Concat(flags));

-

-	public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker

-    => _this.WithLinkerSetting(

-        l => l.Flags = 

-			l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker => _this.WithLinkerSetting(

-    l => l.Flags = 

-		l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker

-    => _this.WithLinkerSetting(l => 

-	l.Flags = l.Flags.Concat(flags));

-

-public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags) where T : ObjectFileLinker =>

-    _this.WithLinkerSetting(l 

-	=> l.Flags = l.Flags.Concat(flags));

-

-var islands = EditorCompilationInterface.GetAllMonoIslands().Select(i => new Island

-{

-    MonoIsland = i,

-    Name = Path.GetFileNameWithoutExtension(i._output),

-    References = i._references.ToList()

-}).ToList();

-

-var projectEntries = islands.Select(i => string.Format(

-    DefaultSynchronizationSettings.SolutionProjectEntryTemplate,

-    SolutionGuid(i), _projectName, Path.GetFileName(ProjectFile(i)), ProjectGuid(i._output)

-    ));

-	

-	

-Func<IEnumerable<IMemberDefinition>, IEnumerable<IMemberDefinition>> filterMembersWithObsoleteAttr = members => members.Where(m =>

-    !m.IsRuntimeSpecialName

-    && !m.IsSpecialName

-    && !blackList.Contains(m.FullName)

-    && CheckCustomAttributes(m));	

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_600.cs
deleted file mode 100644
index 3d93d861..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_600.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-Vector2  ? a;
-Vector2 b;
-
-void G()
-{
-	int  ? x = true ? null : (int ?)2;
-	var q = x == null ? y : z;
-	var q2 = x == q ? y : z;
-	var q3 = x == null ? (y = new Y()) : z;
-	var q4 = x == q ? (y = new Y()) : z;
-
-	var q5 = x == null ? y = new Y() : z;
-	var q6 = x == q ? y = new Y() : z;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_620.cs
deleted file mode 100644
index f6ee6342..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_620.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-class C

-{

-	float V {

-		get {

-			return _v; }

-		set { _v = value; } }

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_679.cs
deleted file mode 100644
index 199ad7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_679.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using (var x = X())
-using (var y = Y())
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_935.cs
deleted file mode 100644
index d2c8ec95..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_935.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Syst;
-using System2;
-using System;
-
-using b.ddd.A;
-using b;
-using b.ddd;
-using b.fff;
-using b.eee;
-using b.a;
-using b.A;
-
-void foo();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/casting.mm
deleted file mode 100644
index c8022c7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/casting.mm
+++ /dev/null
@@ -1 +0,0 @@
-videoViewController.videoGravity = (NSString*)videoGravity;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/cmt_backslash_eol.cs
deleted file mode 100644
index e56aec25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/cmt_backslash_eol.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-foo();
-// test \
-blah();
-bar();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/definesalign.h.mm
deleted file mode 100644
index a249d1aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/definesalign.h.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-	#define SOUNDMANAGERWATCHDOG()\

-		SoundManagerWatchDog watchdog

-

-		#define CompileTimeAssert(expression, message) \

-			enum{ CT_ASSERT_HACK_JOIN(ct_assert_, __LINE__) = sizeof(CompileTimeAssertImpl<(expression)>) }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delegate.cs
deleted file mode 100644
index 3a4b103c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delegate.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-void foo()
-{
-obj.cb += () => { };
-
-funcwithverylongname(() =>
-{
-func();
-});
-}
-
-Func(
-    "stuff",
-    foo =>
-    {
-        bar();
-    });
-
-Func(
-    "stuff",
-    foo =>
-{
-    bar();
-});
-
-data.Sort(
-    delegate(InputData lhs, InputData rhs)
-{
-    return lhs.m_Name.CompareTo(rhs.m_Name);
-});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delete-space-oc.mm
deleted file mode 100644
index 66e24dc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delete-space-oc.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* EditorApplication */

-

-#include <string>

-

-#ifdef __OBJC__

-#import <Cocoa/Cocoa.h>

-

-class HierarchyState;

-@interface EditorApplication : NSObject

-{

-    IBOutlet id             m_MainWindow;

-    IBOutlet id             m_PaneController;

-    id                      m_RenderTimer;

-

-    IBOutlet id             m_CutItem;

-    IBOutlet id             m_CopyItem;

-    IBOutlet id             m_PasteItem;

-

-    IBOutlet id             m_DuplicateItem;

-    IBOutlet id             m_DeleteItem;

-

-    IBOutlet id             m_FrameSelectedItem;

-    IBOutlet id             m_FindItem;

-    IBOutlet id             m_SelectAllItem;

-}

-

-- (IBAction)SaveAssets:(id)sender;

-- (IBAction)CloseScene:(id)sender;

-- (IBAction)NewProject:(id)sender;

-- (IBAction)OpenProject:(id)sender;

-

-- (IBAction)SaveAsSceneToDisk:(id)sender;

-

-- (IBAction)EnterSerialNumber:(id)sender;

-- (IBAction)ReturnLicense:(id)sender;

-- (IBAction)CompileScene:(id)sender;

-- (IBAction)CompileSceneAutomatic:(id)sender;

-

-- (IBAction)saveDocument:(id)sender;

-

-- (IBAction)LoadSceneFromDisk:(id)sender;

-

-- (void)RemoveDisplayTimer;

-- (void)RegisterUpdateTimer:(int)frequency;

-

-- (void)refreshModifiedFile:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-- (void)closeFile:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-

-- (IBAction)ShowAboutDialog:(id)sender;

-- (IBAction)ShowPreferences:(id)sender;

-- (IBAction)ShowPackageManager:(id)sender;

-

-- (IBAction) delete:(id)sender;

-- (IBAction) copy:(id)action;

-- (IBAction)paste:(id)action;

-- (IBAction)duplicate:(id)action;

-- (IBAction)cut:(id)action;

-- (IBAction)selectAll:(id)action;

-- (IBAction)find:(id)action;

-- (IBAction)frameSelected:(id)action;

-- (IBAction)frameSelectedWithLock:(id)action;

-

-// Assetstore protocol handler and registration

-- (void)registerAssetStoreURLProtocol;

-- (void)getUrl:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-

-@end

-

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/exception-filters.cs
deleted file mode 100644
index 1e3abca3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/exception-filters.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-class Test
-{
-void TestExceptionFilter()
-{
-var when = new Object();
-try {
-  int i = 0;
-} catch (Exception e)
-{
-  int j = -1;
-}
-try {
-  int i = 0;
-} catch
-{
-  int j = -1;
-}
-try {
-  int i = 0;
-} catch when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)
-{
-  int j = -1;
-}
-try {
-  int a = (int)when.foo();
-} catch (Exception e)when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)
-{
-  string b = ((int)when.prop).ToString();
-}}}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/fncall_as_ctor_in_attr.cs
deleted file mode 100644
index cf52b46f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/fncall_as_ctor_in_attr.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-public class ClassName

-{

-	[Namespace.ClassName("Array")]

-	public int[] Array = { 10 };

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/func-param-wrap-oc.mm
deleted file mode 100644
index 16f98ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/func-param-wrap-oc.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-    if(progress <= 0)

-    {

-        [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,

-                                                           NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];

-    }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/generics.cs
deleted file mode 100644
index 7bbe04c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/generics.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-int foo() 
-{
-a.b<c, d>();
-a.b<c, e<d>>();
-a.b < c, d > ();
-a.b < c, e < d > > ();
-a.b < c, e < d > > ();
-
-return default (T);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/getset.cs
deleted file mode 100644
index 59aaa5bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/getset.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-public bool Enabled
-{
-get { return enabled; }
-}
-
-
-public bool Enabled
-{
-get
-{
-return enabled;
-}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/gs.cs
deleted file mode 100644
index 16adc604..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/gs.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-private string s = "";
-public int Amount
-{
-get
-{
-;
-}
-set
-{
-;
-}
-}
-public EventHandler MyCustomEventHandler
-{
-add
-{
-;
-}
-remove
-{
-;
-}
-}
-public this[string index]
-{
-get;
-set;
-}
-private string s2 = "";
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcolalign.cs
deleted file mode 100644
index d2e40c78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcolalign.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Unity

-{

-internal class Class

-{

-	public void Foo()

-	{

-		if (data)	go = new ClassA();

-		else		go = new ClassB();

-

-		if (evt.alt)		modifiers += "Alt+";

-		if (evt.command)	modifiers += "Cmd+";

-		if (evt.control)	modifiers += "Ctrl+";

-		if (evt.shift)		modifiers += "Shift+";

-	}

-}

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcomment.cs
deleted file mode 100644
index 6663a6ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcomment.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-#define RENDER_POINTS_USING_MESH
-
-namespace UnityEditor
-{
-    internal class CurveWrapper
-    {
-        private void DoIconAndName (Rect rect, AnimationWindowHierarchyNode node, bool selected, bool focused, float indent)
-        {
-            EditorGUIUtility.SetIconSize (new Vector2 (13, 13)); // If not set we see icons scaling down if text is being cropped
-        }
-        public void foo()
-        {
-            if (this)
-            {
-                if (b)
-                {
-                    // Now draw
-                    for (int i = 0; i < ticks.Length; i++)
-                    {
-                        ticksPos[i] /= axisUiScalars.y;
-                        if (ticksPos[i] < vRangeMin || ticksPos[i] > vRangeMax)
-                            continue;
-
-                        Vector2 pos = DrawingToViewTransformPoint(new Vector2(0, ticksPos[i]));
-                        // Important to take floor of positions of GUI stuff to get pixel correct alignment of
-                        // stuff drawn with both GUI and Handles/GL. Otherwise things are off by one pixel half the time.
-                        pos = new Vector2(pos.x, Mathf.Floor(pos.y));
-
-                        float uiValue = ticks[i];
-                        Rect labelRect;
-                        if (settings.vTickStyle.centerLabel)
-                            labelRect = new Rect(0, pos.y - 8, leftmargin - 4, 16);  // text expands to the left starting from where grid starts (leftmargin size must ensure text is visible)
-                        else
-                            labelRect = new Rect(0, pos.y - 13, labelSize, 16);     // text expands to the right starting from left side of window
-
-                        GUI.Label(labelRect, uiValue.ToString(format) + settings.vTickStyle.unit, ms_Styles.labelTickMarksY);
-                    }
-                }
-            }
-            // Cleanup
-            GUI.color = tempCol;
-
-            GUI.EndClip();
-        }
-    }
-} // namespace
-
-namespace UnityEditor
-{
-internal class TreeView
-{
-	public System.Action<int[]> selectionChangedCallback { get; set; }	// ids
-	public System.Action<int> itemDoubleClickedCallback { get; set; }	// id
-	public System.Action<int[], bool> dragEndedCallback { get; set; }	// dragged ids, if null then drag was not allowed, bool == true if dragging tree view items from own treeview, false if drag was started outside
-	public System.Action<int> contextClickItemCallback { get; set; }	// clicked item id
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/indent-multistring-coulmn1.cs
deleted file mode 100644
index 56bdf473..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/indent-multistring-coulmn1.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-//This
-var a = hello(
-    @"world"
-);
-
-//should stay the same.
-//But this
-var a = hello(
-    @"world
-");
-
-//should get formatted to this
-var a = hello(
-@"world
-");
- 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/inttypes.h.mm
deleted file mode 100644
index 6e093789..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/inttypes.h.mm
+++ /dev/null
@@ -1,3 +0,0 @@
-static int32_t level_and_name_to_system(SocketOptionLevel level, SocketOptionName name, int32_t *system_level, int32_t *system_name)

-

-WaitStatus SendTo (uint8_t address[ipv6AddressSize], uint32_t scope, uint16_t port, const uint8_t *data, int32_t count, os::SocketFlags flags, int32_t *len);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/logger.cs
deleted file mode 100644
index defede8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/logger.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {1}). May need special support, or perhaps there's a bug..

-// long comment line(s), such as here, might be too long to produce a correct LOG-file such as

-// with the use of option -L A

-// in such a case, the output of the log will be cut.

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mdarray_space.cs
deleted file mode 100644
index e5338c11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mdarray_space.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-int[,,] x;

-var y = new int[2,3];

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/misc-failures.cs
deleted file mode 100644
index 857c06f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/misc-failures.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-void Func()
-{
-    OtherFunc(
-@"multi
-line");
-}
-
-variablex = o.Func(
-    variabley);
-variablex = o.Func2(a, b,
-    variabley);
-o.Func(
-    variabley);
-o.Func2(a, b,
-    variabley);
-
-
-
-                AnimatorStateMachine rootStateMachine = syncedIndex == -1
-                                                        ? animatorController.layers[selectedLayerIndex].stateMachine
-                                                        : animatorController.layers[syncedIndex].stateMachine;
-
-
-            m_ActiveStateMachine = AnimatorControllerTool.tool ? m_Type == TransitionType.eAnyState ?
-                AnimatorControllerTool.tool.stateMachineGraph.rootStateMachine :
-                AnimatorControllerTool.tool.stateMachineGraph.activeStateMachine : null;
-
-	        public GUIStyle[] inSlots = {
-	            FindStyle("flow shader in 0"), FindStyle("flow shader in 1"), FindStyle("flow shader in 2"), FindStyle("flow shader in 3"), FindStyle("flow shader in 4"), FindStyle("flow shader in 5"),
-	        };
-
-
-	        public GUIStyle[] inSlots = { 1, 2, 3 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
deleted file mode 100644
index f8db4f0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// mod_full_brace_nl_block_rem_mlcond should block brace removal here
-if( a == true
-    && b == false )
-{
-	return 1;
-}
-else if( a == true
-         && b == false)
-{
-	return 2;
-}
-// except here as there are no parenthesis
-else
-{
-	return 3;
-}
-
-
-if( a == true;
-    b == true;
-    c == true)
-{
-	return 1;
-}
-
-for( a = true;
-     a < 9;
-     a++)
-{
-	return 1;
-}
-
-while( a == true
-       && b == true
-       && c == true)
-{
-	return 1;
-}
-
-using (Foo bar =
-	       new Foo())
-{
-	return 1;
-}
-
-
-
-// mod_full_brace_nl_block_rem_mlcond should not block brace removal here
-if( a == true && b == false )
-{
-	return 1;
-}
-else if( a == true && b == false)
-{
-	return 2;
-}
-else
-{
-	return 3;
-}
-
-
-if( a == true; b == true; c == true)
-{
-	return 1;
-}
-
-for( a = true; a < 9; a++)
-{
-	return 1;
-}
-
-while( a == true && b == true && c == true)
-{
-	return 1;
-}
-
-using (Foo bar = new Foo())
-{
-	return 1;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_paren_if_bool.cs
deleted file mode 100644
index 6bcd9201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_paren_if_bool.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-List<int> list = new List<int>();
-if (list.All(i0 => i1 > 5 && i2 < 9))
-{
-	return;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/new-constraint-paren-space.cs
deleted file mode 100644
index 209f2721..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/new-constraint-paren-space.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-// same as 10130-sp_between_new_paren.cs

-T F<T>() where T : new()

-{

-	return new         T();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/newlines.mm
deleted file mode 100644
index 31a46376..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/newlines.mm
+++ /dev/null
@@ -1,34 +0,0 @@
-NSString* GetXcodePath()

-{

-	return [[NSWorkspace sharedWorkspace]absolutePathForAppBundleWithIdentifier:kXCodeBundleId];

-}

-

-

-extern "C" EXPORTDLL void LaunchXCode()

-{

-	NSString* curApp = GetXcodePath();

-	[[NSWorkspace sharedWorkspace] launchApplication:curApp];

-	

-	NSArray *selectedApps =

-	[NSRunningApplication runningApplicationsWithBundleIdentifier:kXCodeBundleId];

-	

-	for (int i = 0; i < [selectedApps count]; i++)

-	{

-		NSRunningApplication *app = [selectedApps objectAtIndex:i];

-		int count = 0;

-		NSLog(@"Checking %@\n", app);

-		while (![app isFinishedLaunching] && count++ < 300)

-			[[NSRunLoop currentRunLoop] runUntilDate: [NSDate dateWithTimeIntervalSinceNow: 1.0f]];

-	}

-}

-

-

-NSString* MakeNSString (const std::string& string)

-{

-	return MakeNSString(string.c_str());

-}

-NSString* MakeNSString (const char* string)

-{

-	NSString* ret = string ? [NSString stringWithUTF8String:string] : nil;

-	return ret ? ret : @"";

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/nullable_prop.cs
deleted file mode 100644
index 21c4f7b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/nullable_prop.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-
-namespace Foo
-{
-
-public class Bar
-{
-public int? Val;
-
-public int? Prop
-{
-	get
-	{
-		return 1;
-	}
-}
-}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/objc.mm
deleted file mode 100644
index 7f0e706a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/objc.mm
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()

-{

-		if(key)

-			ret.key = [NSString stringWithCharacters:&key length:1];

-

-		[gUndoMenu->m_UndoItem setTitle:[NSString stringWithFormat:[NSString stringWithUTF8String:localizedUndo], undoName.c_str()]];

-		[gUndoMenu->m_RedoItem setTitle:[NSString stringWithFormat:[NSString stringWithUTF8String:localizedRedo], redoName.c_str()]];

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/oneline_property.cs
deleted file mode 100644
index 1d7a2c26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/oneline_property.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-public class Class
-{
-	public float prop { get; set; }
-	public float prop { get { return m; } }
-	public float prop { set { m = value; } }
-	public float prop { get { return m; } set { m = value; } }
-	internal int prop { get { return m; } }
-};
-public class Container { public int prop { get; set; } };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator-null-conditional.cs
deleted file mode 100644
index 530bdd27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator-null-conditional.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-public class test
-{
-public static void TestOfNullConditionalOperator()
-{
-string s="Test";
-if (s?.Length > 0)
-{
-s="Test";
-}
-if (System.Reflection.Assembly.GetEntryAssembly()?.GetName() != null)
-{
-s="Test";
-}}}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator_null-coalescing-assignment.cs
deleted file mode 100644
index 416e6afc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator_null-coalescing-assignment.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Program

-{

-public static void Main()

-{

-	var thing = new int?();

-	thing ??= new int?();

-}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/pp-ignore.mm
deleted file mode 100644
index 2673008c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/pp-ignore.mm
+++ /dev/null
@@ -1,29 +0,0 @@
-#define a	z	\

-			x

-

-#define a(b)	z	\

-				x

-

-#define ab(b)	z	\

-				x

-

-#define abc(b)	z	\

-				x

-

-#define abcd(b)	z	\

-				x

-

-

-#if FOO

-#	define D(a, ...) B(FOO(a, __LINE__, __VA_ARGS__))

-#	define C(msg)			\

-		PP_WRAP_CODE(		\

-			if (!msg)		\

-			{				\

-				BAR();		\

-				BARBAR();	\

-				BARBARBAR();\

-			})

-#else

-#	define C(msg, ...)		EMPTY

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/preserveTabs.cs
deleted file mode 100644
index c9583dcd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/preserveTabs.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-/// <summary>
-/// 	Event handler.
-/// </summary>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/property.cs
deleted file mode 100644
index 85e08bae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/property.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-#define X 1          // comment to check tokenizing of URL
-#property URL "http://www.google.com"
-#define Y 2          // comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/region.cs
deleted file mode 100644
index 4f8667f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/region.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-class X : Y {
-   int foo1;
-   #region something
-   int foo2 = 2;
-  #endregion
-  int foo()
-  {
-
-   #region something else
-   int foo3 = 3;
-   #region nested
-   int foo4 = 0;
-  #endregion
-   int foo5 = 0;
-  #endregion
-  }
-
-}
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/remove_semi.cs
deleted file mode 100644
index 2e6d5a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/remove_semi.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-var dude = "Dude";

-var dude2 = new { Name = "Dude", Age = 30, };

-var dude3 = new { Name = "Dude", Age = 30, Kids = new { Name = "LittleDude" } };

-var dude4 = new { Name = "Dude", Age = 30, Kids = new[] { "LittleDude" } };

-var dude5 = new { Name = "Dude", Age = 30, Kids = new[] { new { Name = "LittleDude" } } };

-Action y = () => { };

-Func<int, float, bool> z = (a, b) => { var z = new { a, b }; return z == null; };

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf607.cs
deleted file mode 100644
index f0617c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf607.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-int P {

-	get {

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf628.cs
deleted file mode 100644
index 803c9962..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf628.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-void foo()

-{

-obj.cb += () => { };

-func();

-obj.cb += (p0) => { };

-func();

-obj.cb += (p0, p1) => { };

-func();

-Action a = delegate { };

-func();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/simple.cs
deleted file mode 100644
index 30acd134..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/simple.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-class X : Y {
-bool Method (int argument_1, int argument_2)
-{
-   #region something
-   int foo = 0;
-  #endregion
-
-if (argument_1 == argument_2)
-throw new Exception (Locale.GetText ("They are equal!"));
-
-if (argument_1 < argument_2) {
-if (argument_1 * 3 > 4)
-return true;
-else
-return false;
-}
-
-//
-// This sample helps keep your sanity while using 8-spaces for tabs
-//
-VeryLongIdentifierWhichTakesManyArguments (
-Argument1,
-Argument2, Argument3,
-NestedCallHere (
-MoreNested));
-}
-
-bool MyProperty {
-get { return x; }
-
-set { x = value; }
-}
-
-void AnotherMethod ()
-{
-   Logger log = new Logger();
-   log.foo.bar = 5;
-   log.narf.sweat = "cat";
-
-if ((a + 5) != 4) {
-}
-
-while (blah) {
-if (a)
-continue;
-b++;
-}
-}
-}
-
-object lockA;
-object lockB;
-
-void Foo () {
-   lock (lockA) {
-      lock (lockB) {
-      }
-   }
-}
-
-void Bar () {
-   lock (lockB) {
-      lock (lockA) {
-      }
-   }
-}
-
-
-// class library
-class Blah {
-    Hashtable ht;
-    void Foo (int zzz, Entry blah) {
-       lock (ht) {
-           ht.Add (zzz, blah);
-       }
-    }
-
-    void Bar ()
-    {
-       lock (ht) {
-          foreach (Entry e in ht)
-             EachBar (e);
-       }
-    }
-
-    virtual void EachBar (Entry e)
-    {
-    }
-}
-
-// User
-class MyBlah {
-    byte[] box = new byte[6];
-
-    box[2] = 56;
-
-    void DoStuff ()
-    {
-       lock (this) {
-          int i = GetNumber ();
-          Entry e = GetEntry ();
-
-          Foo (i, e);
-       }
-    }
-
-    override void EachBar (Entry e)
-    {
-        lock (this) {
-           DoSomething (e);
-        }
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using.cs
deleted file mode 100644
index 881b4d5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// should be ddd, eee, fff
-using b.ddd;
-using b.fff;
-using b.eee;
-
-// should be aaa, ccc
-using ccc;
-using aaa;
-// should be just bbb
-using bbb;
-
-// should not change these, as it can't handle multi-line imports
-using mango.ccc;
-using mango.bbb,
-      mango.aaa;
-
-void foo();
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using_categ.cs
deleted file mode 100644
index 173e42bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using_categ.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Client.Common;
-using LeopotamGroup.Common;
-using LeopotamGroup.Serialization;
-using System;
-using UnityEngine.EventSystems;
-using UnityEngine.Events;
-using UnityEngine;
-
-using NameSpace;
-using NameSpacEveryday;
-using nameSpace;
-using Namespace;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sp_between_new_paren.cs
deleted file mode 100644
index f5d8381d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sp_between_new_paren.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-T F<T>() where T : new ()

-{

-	return new         T();

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/squeeze-paren-close-Option.cs
deleted file mode 100644
index 37203f4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/squeeze-paren-close-Option.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-bool success(GenerateSecondaryUVSet(test(

-    &mesh.vertices[0].x, mesh.vertices.size(),

-    &triUV[0].x, &triList[0], triSrcPoly.size() ? &triSrcPoly[0] : 0, triCount,

-    &outUV[0].x, param, errorBuffer, bufferSize

-    )

-));

-

-int m = aaaaaaaaaaabaaaaaaaaaa(caaaaaaaaaa(

-    eaaaaaaaaaa(gaaaaaaaaaaa(haaaaaaaaaaaaa(

-        iaaaaaaaaaaaaaaaaaaaaaa(kaaaaaaaaaaaaaaaaaaaa)

-        )

-        )

-    )

-    )

-);

-

-int m = aaaaaaaaaaabaaaaaaaaaa(caaaaaaaaaa(

-    eaaaaaaaaaa(gaaaaaaaaaaa(haaaaaaaaaaaaa(

-        iaaaaaaaaaaaaaaaaaaaaaa(kaaaaaaaaaaaaaaaaaaaa)

-        ))

-    ))

-);

-

-int m = aaaaaaaaaaabaaaaaaaaaa(

-    caaaaaaaaaa(

-        eaaaaaaaaaa(

-            gaaaaaaaaaaa(

-                haaaaaaaaaaaaa(

-                    iaaaaaaaaaaaaaaaaaaaaaa(kaaaaaaaaaaaaaaaaaaaa)

-                )

-            )

-        )

-    )

-);
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/string_multi.cs
deleted file mode 100644
index 9e715e51..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/string_multi.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-public class C
-{
-    public void F()
-    {
-        var x = @"
-abc";
-        var y = @"
-abc" + "def";
-        var z = "" +
-@"
-";
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/strings.cs
deleted file mode 100644
index 6794e762..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/strings.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-void foo()
-{
-   string s1 = L"C:\\foo\\bar";
-   string s2 = S"C:\\foo\\bar";
-   string s3 = "This is a \"test\"";
-   string s4 = "C:\\";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/tcf.cs
deleted file mode 100644
index f3ac3664..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/tcf.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-void foo()
-{
-try
-{
-;
-}
-catch (Exception e)
-{
-;
-}
-finally {
-;
-}
-bar();
-
-try
-{
-;
-}
-catch (Exception e)
-{
-;
-}
-catch (Exception e)
-{
-;
-}
-finally {
-;
-}
-bar();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/unsafe.cs
deleted file mode 100644
index 5dc90cb4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/unsafe.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Class1
-{
-   public unsafe bool GetValue ()
-       {
-           return true;
-       }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be.cs
deleted file mode 100644
index 13da3090..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be_no_bom.cs
deleted file mode 100644
index 33587b97..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le.cs
deleted file mode 100644
index 3f16b9d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le_no_bom.cs
deleted file mode 100644
index 4a7f9ccc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/var-member.cs
deleted file mode 100644
index 0f7ffb23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/var-member.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Foo.Man.Chu
-{
-   /// <summary>
-   /// Summary description for MainForm.
-   /// </summary>
-   public class MainForm : System.Windows.Forms.Form
-   {
-      #region Initialize the private properties
-      private System.Windows.Forms.MenuItem File;
-      private    System.Windows.Forms.MenuItem Exit;
-      private   System.Windows.Forms.Label label1;
-      private System.Windows.Forms.Label label2;
-      private Properties Prop;
-      private About      Abt;
-      public MainForm    mainform;
-      private   System.Windows.Forms.MenuItem menuItem1;
-      private  System.Windows.Forms.Timer timer1;
-      private     System.ComponentModel.IContainer components;
-      protected string   strTitle;
-      #endregion
-
-   }
-}
-   
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/verbatim_strings.cs
deleted file mode 100644
index 47c3ed4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/verbatim_strings.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-class Class
-{
-	public string s1 = "		Foo";
-	public string s2 = @"
-		Foo
-";
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/when.cs
deleted file mode 100644
index 2785b894..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/when.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-private static string GenerateHash()

-{

-	try {

-		int i = 0;

-	} catch when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)

-	{

-		int j = -1;

-	}

-	try {

-		int i = 0;

-	} catch (Exception e) when (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)

-	{

-		var when = DateTime.Now;

-		ulong kind = (ulong)(int)when.Kind;

-		return ((kind << 62) | (ulong)when.Ticks).ToString();

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/1438.d
deleted file mode 100644
index 10a43753..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/1438.d
+++ /dev/null
@@ -1 +0,0 @@
-invariant (1 <= day && day <= 31);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/HashMap.d
deleted file mode 100644
index 618b3e59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/HashMap.d
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*******************************************************************************
-
-        @file HashMap.d
-
-        This software is provided 'as-is', without any express or implied
-        warranty. In no event will the authors be held liable for damages
-        of any kind arising from the use of this software.
-
-        Permission is hereby granted to anyone to use this software for any
-        purpose, including commercial applications, and to alter it and/or
-        redistribute it freely, subject to the following restrictions:
-
-        1. The origin of this software must not be misrepresented; you must
-           not claim that you wrote the original software. If you use this
-           software in a product, an acknowledgment within documentation of
-           said product would be appreciated but is not required.
-
-        2. Altered source versions must be plainly marked as such, and must
-           not be misrepresented as being the original software.
-
-        3. This notice may not be removed or altered from any distribution
-           of the source.
-
-        4. Derivative works are permitted, but they must carry this notice
-           in full and credit the original source.
-
-
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-        Written by Doug Lea with assistance from members of JCP JSR-166
-        Expert Group and released to the public domain, as explained at
-        http://creativecommons.org/licenses/publicdomain
-
-        @version        Initial version, July 2004
-        @author         Doug Lea; ported/modified by Kris
-
-*******************************************************************************/
-
-module mango.cache.HashMap;
-
-/******************************************************************************
-
-******************************************************************************/
-
-extern (C)
-{
-        int memcmp (char *, char *, uint);
-}
-
-
-/**
- * A hash table supporting full concurrency of retrievals and
- * adjustable expected concurrency for updates. This class obeys the
- * same functional specification as {@link java.util.Hashtable}, and
- * includes versions of methods corresponding to each method of
- * <tt>Hashtable</tt>. However, even though all operations are
- * thread-safe, retrieval operations do <em>not</em> entail locking,
- * and there is <em>not</em> any support for locking the entire table
- * in a way that prevents all access.  This class is fully
- * interoperable with <tt>Hashtable</tt> in programs that rely on its
- * thread safety but not on its synchronization details.
- *
- * <p> Retrieval operations (including <tt>get</tt>) generally do not
- * block, so may overlap with update operations (including
- * <tt>put</tt> and <tt>remove</tt>). Retrievals reflect the results
- * of the most recently <em>completed</em> update operations holding
- * upon their onset.  For aggregate operations such as <tt>putAll</tt>
- * and <tt>clear</tt>, concurrent retrievals may reflect insertion or
- * removal of only some entries.  Similarly, Iterators and
- * Enumerations return elements reflecting the state of the hash table
- * at some point at or since the creation of the iterator/enumeration.
- * They do <em>not</em> throw
- * {@link ConcurrentModificationException}.  However, iterators are
- * designed to be used by only one thread at a time.
- *
- * <p> The allowed concurrency among update operations is guided by
- * the optional <tt>concurrencyLevel</tt> constructor argument
- * (default 16), which is used as a hint for internal sizing.  The
- * table is internally partitioned to try to permit the indicated
- * number of concurrent updates without contention. Because placement
- * in hash tables is essentially random, the actual concurrency will
- * vary.  Ideally, you should choose a value to accommodate as many
- * threads as will ever concurrently modify the table. Using a
- * significantly higher value than you need can waste space and time,
- * and a significantly lower value can lead to thread contention. But
- * overestimates and underestimates within an order of magnitude do
- * not usually have much noticeable impact. A value of one is
- * appropriate when it is known that only one thread will modify and
- * all others will only read. Also, resizing this or any other kind of
- * hash table is a relatively slow operation, so, when possible, it is
- * a good idea to provide estimates of expected table sizes in
- * constructors.
- *
- * <p>This class and its views and iterators implement all of the
- * <em>optional</em> methods of the {@link Map} and {@link Iterator}
- * interfaces.
- *
- * <p> Like {@link java.util.Hashtable} but unlike {@link
- * java.util.HashMap}, this class does NOT allow <tt>null</tt> to be
- * used as a key or value.
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../guide/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @since 1.5
- * @author Doug Lea
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- */
-
-class HashMap
-{
-    alias void[] K;
-    alias Object V;
-    alias jhash  hash;          // jhash, fnv, or walter
-
-    /*
-     * The basic strategy is to subdivide the table among Segments,
-     * each of which itself is a concurrently readable hash table.
-     */
-
-    /* ---------------- Constants -------------- */
-
-    /**
-     * The default initial number of table slots for this table.
-     * Used when not otherwise specified in constructor.
-     */
-    private const uint DEFAULT_INITIAL_CAPACITY = 16;
-
-    /**
-     * The maximum capacity, used if a higher value is implicitly
-     * specified by either of the constructors with arguments.  MUST
-     * be a power of two <= 1<<30 to ensure that entries are indexible
-     * using ints.
-     */
-    private const uint MAXIMUM_CAPACITY = 1 << 30;
-
-    /**
-     * The default load factor for this table.  Used when not
-     * otherwise specified in constructor.
-     */
-    private const float DEFAULT_LOAD_FACTOR = 0.75f;
-
-    /**
-     * The default number of concurrency control segments.
-     **/
-    private const uint DEFAULT_SEGMENTS = 16;
-
-    /**
-     * The maximum number of segments to allow; used to bound
-     * constructor arguments.
-     */
-    private const uint MAX_SEGMENTS = 1 << 16; // slightly conservative
-
-
-    /* ---------------- Fields -------------- */
-
-    /**
-     * Mask value for indexing into segments. The upper bits of a
-     * key's hash code are used to choose the segment.
-     **/
-    private final int segmentMask;
-
-    /**
-     * Shift value for indexing within segments.
-     **/
-    private final int segmentShift;
-
-    /**
-     * The segments, each of which is a specialized hash table
-     */
-    private final Segment[] segments;
-
-
-    /* ---------------- Small Utilities -------------- */
-
-    /**
-     * Returns a hash code for non-null Object x.
-     * Uses the same hash code spreader as most other java.util hash tables.
-     * @param x the object serving as a key
-     * @return the hash code
-     */
-    private static final uint walter(K x)
-    {
-        uint h = typeid(char[]).getHash (&x);
-        h += ~(h << 9);
-        h ^=  (h >>> 14);
-        h +=  (h << 4);
-        h ^=  (h >>> 10);
-        return h;
-    }
-
-    /**
-     * Returns a hash code for non-null Object x.
-     * uses the FNV hash function
-     * @param x the object serving as a key
-     * @return the hash code
-     */
-    private static final uint fnv(K x)
-    {
-        uint hash = 2_166_136_261;
-
-        foreach (ubyte c; cast(ubyte[]) x)
-                {
-                hash ^= c;
-                hash *= 16_777_619;
-                }
-        return hash;
-    }
-
-
-
-    /**
-    * hash() -- hash a variable-length key into a 32-bit value
-    *   k     : the key (the unaligned variable-length array of bytes)
-    *   len   : the length of the key, counting by bytes
-    *   level : can be any 4-byte value
-    * Returns a 32-bit value.  Every bit of the key affects every bit of
-    * the return value.  Every 1-bit and 2-bit delta achieves avalanche.
-    * About 36+6len instructions.
-    *
-    * The best hash table sizes are powers of 2.  There is no need to do
-    * mod a prime (mod is sooo slow!).  If you need less than 32 bits,
-    * use a bitmask.  For example, if you need only 10 bits, do
-    *   h = (h & hashmask(10));
-    * In which case, the hash table should have hashsize(10) elements.
-    *
-    * If you are hashing n strings (ub1 **)k, do it like this:
-    *   for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
-    *
-    * By Bob Jenkins, 1996.  bob_jenkins@burtleburtle.net.  You may use this
-    * code any way you wish, private, educational, or commercial.  It's free.
-    *
-    * See http://burlteburtle.net/bob/hash/evahash.html
-    * Use for hash table lookup, or anything where one collision in 2^32 is
-    * acceptable. Do NOT use for cryptographic purposes.
-    */
-
-    static final uint jhash (K x)
-    {
-        ubyte*  k;
-        uint    a,
-                b,
-                c,
-                len;
-
-        len = x.length;
-        k = cast(ubyte *) x;
-        a = b = 0x9e3779b9;
-
-        // the previous hash value
-        c = 0;
-
-        // handle most of the key
-        while (len >= 12)
-              {
-              a += *cast(uint *)(k+0);
-              b += *cast(uint *)(k+4);
-              c += *cast(uint *)(k+8);
-
-              a -= b; a -= c; a ^= (c>>13);
-              b -= c; b -= a; b ^= (a<<8);
-              c -= a; c -= b; c ^= (b>>13);
-              a -= b; a -= c; a ^= (c>>12);
-              b -= c; b -= a; b ^= (a<<16);
-              c -= a; c -= b; c ^= (b>>5);
-              a -= b; a -= c; a ^= (c>>3);
-              b -= c; b -= a; b ^= (a<<10);
-              c -= a; c -= b; c ^= (b>>15);
-              k += 12; len -= 12;
-              }
-
-        // handle the last 11 bytes
-        c += x.length;
-        switch (len)
-               {
-               case 11: c+=(cast(uint)k[10]<<24);
-               case 10: c+=(cast(uint)k[9]<<16);
-               case 9 : c+=(cast(uint)k[8]<<8);
-               case 8 : b+=(cast(uint)k[7]<<24);
-               case 7 : b+=(cast(uint)k[6]<<16);
-               case 6 : b+=(cast(uint)k[5]<<8);
-               case 5 : b+=k[4];
-               case 4 : a+=(cast(uint)k[3]<<24);
-               case 3 : a+=(cast(uint)k[2]<<16);
-               case 2 : a+=(cast(uint)k[1]<<8);
-               case 1 : a+=k[0];
-               default:
-               }
-
-        a -= b; a -= c; a ^= (c>>13);
-        b -= c; b -= a; b ^= (a<<8);
-        c -= a; c -= b; c ^= (b>>13);
-        a -= b; a -= c; a ^= (c>>12);
-        b -= c; b -= a; b ^= (a<<16);
-        c -= a; c -= b; c ^= (b>>5);
-        a -= b; a -= c; a ^= (c>>3);
-        b -= c; b -= a; b ^= (a<<10);
-        c -= a; c -= b; c ^= (b>>15);
-
-        return c;
-    }
-
-
-    /**
-     * Returns the segment that should be used for key with given hash
-     * @param hash the hash code for the key
-     * @return the segment
-     */
-    private final Segment segmentFor(uint hash)
-    {
-        return segments[(hash >>> segmentShift) & segmentMask];
-    }
-
-    /* ---------------- Inner Classes -------------- */
-
-    /**
-     * ConcurrentHashMap list entry. Note that this is never exported
-     * out as a user-visible Map.Entry.
-     *
-     * Because the value field is volatile, not final, it is legal wrt
-     * the Java Memory Model for an unsynchronized reader to see null
-     * instead of initial value when read via a data race.  Although a
-     * reordering leading to this is not likely to ever actually
-     * occur, the Segment.readValueUnderLock method is used as a
-     * backup in case a null (pre-initialized) value is ever seen in
-     * an unsynchronized access method.
-     */
-    private static class HashEntry
-    {
-        final K         key;
-        final uint      hash;
-        final V         value;
-        final HashEntry next;
-
-        this (K key, uint hash, HashEntry next, V value)
-        {
-            this.key = key;
-            this.hash = hash;
-            this.next = next;
-            this.value = value;
-        }
-    }
-
-    /**
-     * Segments are specialized versions of hash tables.  This
-     * subclasses from ReentrantLock opportunistically, just to
-     * simplify some locking and avoid separate construction.
-     **/
-    static class Segment
-    {
-        /*
-         * Segments maintain a table of entry lists that are ALWAYS
-         * kept in a consistent state, so can be read without locking.
-         * Next fields of nodes are immutable (final).  All list
-         * additions are performed at the front of each bin. This
-         * makes it easy to check changes, and also fast to traverse.
-         * When nodes would otherwise be changed, new nodes are
-         * created to replace them. This works well for hash tables
-         * since the bin lists tend to be short. (The average length
-         * is less than two for the default load factor threshold.)
-         *
-         * Read operations can thus proceed without locking, but rely
-         * on selected uses of volatiles to ensure that completed
-         * write operations performed by other threads are
-         * noticed. For most purposes, the "count" field, tracking the
-         * number of elements, serves as that volatile variable
-         * ensuring visibility.  This is convenient because this field
-         * needs to be read in many read operations anyway:
-         *
-         *   - All (unsynchronized) read operations must first read the
-         *     "count" field, and should not look at table entries if
-         *     it is 0.
-         *
-         *   - All (synchronized) write operations should write to
-         *     the "count" field after structurally changing any bin.
-         *     The operations must not take any action that could even
-         *     momentarily cause a concurrent read operation to see
-         *     inconsistent data. This is made easier by the nature of
-         *     the read operations in Map. For example, no operation
-         *     can reveal that the table has grown but the threshold
-         *     has not yet been updated, so there are no atomicity
-         *     requirements for this with respect to reads.
-         *
-         * As a guide, all critical volatile reads and writes to the
-         * count field are marked in code comments.
-         */
-
-        /**
-         * The number of elements in this segment's region.
-         **/
-        int count;
-
-        /**
-         * The table is rehashed when its size exceeds this threshold.
-         * (The value of this field is always (int)(capacity *
-         * loadFactor).)
-         */
-        int threshold;
-
-        /**
-         * The per-segment table. Declared as a raw type, casted
-         * to HashEntry<K,V> on each use.
-         */
-        HashEntry[] table;
-
-        /**
-         * The load factor for the hash table.  Even though this value
-         * is same for all segments, it is replicated to avoid needing
-         * links to outer object.
-         * @serial
-         */
-        final float loadFactor;
-
-        this (int initialCapacity, float lf)
-        {
-            loadFactor = lf;
-            setTable (new HashEntry[initialCapacity]);
-        }
-
-        /**
-         * Set table to new HashEntry array.
-         * Call only while holding lock or in constructor.
-         **/
-        private final void setTable (HashEntry[] newTable)
-        {
-            threshold = cast(int) (newTable.length * loadFactor);
-            volatile table = newTable;
-        }
-
-        /**
-         * Return properly casted first entry of bin for given hash
-         */
-        private final HashEntry getFirst (uint hash)
-        {
-            HashEntry[] tab;
-
-            volatile tab = table;
-            return tab [hash & (tab.length - 1)];
-        }
-
-        /**
-         * Return true if the two keys match
-         */
-        private static final bool matchKey (K a, K b)
-        {
-                if (a.length == b.length)
-                    return cast(bool) (memcmp (cast(char*) a, cast(char*) b, a.length) == 0);
-                return false;
-        }
-
-        /* Specialized implementations of map methods */
-
-        final V get (K key, uint hash)
-        {
-            int c;
-
-            // read-volatile
-            volatile c = count;
-            if (c)
-               {
-               HashEntry e = getFirst (hash);
-               while (e)
-                     {
-                     if (hash == e.hash && matchKey (key, e.key))
-                        {
-                        V v;
-                        volatile v = e.value;
-                        if (v)
-                            return v;
-
-                        synchronized (this)
-                                      return e.value;
-                        }
-                     e = e.next;
-                     }
-               }
-            return null;
-        }
-
-
-        final bool containsKey (K key, uint hash)
-        {
-            int c;
-
-            // read-volatile
-            volatile c = count;
-            if (c)
-               {
-               HashEntry e = getFirst (hash);
-               while (e)
-                     {
-                     if (e.hash == hash && matchKey (key, e.key))
-                         return true;
-                     e = e.next;
-                     }
-               }
-            return false;
-        }
-
-
-
-        final synchronized V replace (K key, uint hash, V newValue)
-        {
-                HashEntry e = getFirst(hash);
-                while (e && (e.hash != hash || !matchKey (key, e.key)))
-                       e = e.next;
-
-                V oldValue = null;
-                if (e)
-                    volatile
-                           {
-                           oldValue = e.value;
-                           e.value = newValue;
-                           }
-                return oldValue;
-        }
-
-
-        final synchronized V put (K key, uint hash, V value, bool onlyIfAbsent)
-        {
-                int c;
-
-                volatile c = count;
-                if (c++ > threshold)
-                    rehash();
-
-                HashEntry[] tab;
-                volatile tab = table;
-                uint index = hash & (tab.length - 1);
-                HashEntry first = tab[index];
-                HashEntry e = first;
-
-                while (e && (e.hash != hash || !matchKey (key, e.key)))
-                       e = e.next;
-
-                V oldValue;
-                if (e)
-                   {
-                   volatile oldValue = e.value;
-                   if (!onlyIfAbsent)
-                        volatile e.value = value;
-                   }
-                else
-                   {
-                   oldValue = null;
-                   tab[index] = new HashEntry (key, hash, first, value);
-
-                   // write-volatile
-                   volatile count = c;
-                   }
-                return oldValue;
-        }
-
-
-        private final void rehash ()
-        {
-            HashEntry[] oldTable;
-
-            volatile oldTable = table;
-            int oldCapacity = oldTable.length;
-            if (oldCapacity >= MAXIMUM_CAPACITY)
-                return;
-
-            /*
-             * Reclassify nodes in each list to new Map.  Because we are
-             * using power-of-two expansion, the elements from each bin
-             * must either stay at same index, or move with a power of two
-             * offset. We eliminate unnecessary node creation by catching
-             * cases where old nodes can be reused because their next
-             * fields won't change. Statistically, at the default
-             * threshold, only about one-sixth of them need cloning when
-             * a table doubles. The nodes they replace will be garbage
-             * collectable as soon as they are no longer referenced by any
-             * reader thread that may be in the midst of traversing table
-             * right now.
-             */
-
-            HashEntry[] newTable = new HashEntry[oldCapacity << 1];
-            threshold = cast(int) (newTable.length * loadFactor);
-            int sizeMask = newTable.length - 1;
-
-            for (int i = 0; i < oldCapacity ; ++i)
-                {
-                // We need to guarantee that any existing reads of old Map can
-                //  proceed. So we cannot yet null out each bin.
-                HashEntry e = oldTable[i];
-
-                if (e)
-                   {
-                   HashEntry next = e.next;
-                   uint idx = e.hash & sizeMask;
-
-                   //  Single node on list
-                   if (next is null)
-                       newTable[idx] = e;
-                   else
-                      {
-                      // Reuse trailing consecutive sequence at same slot
-                      HashEntry lastRun = e;
-                      int lastIdx = idx;
-                      for (HashEntry last=next; last; last = last.next)
-                          {
-                          uint k = last.hash & sizeMask;
-                          if (k != lastIdx)
-                             {
-                             lastIdx = k;
-                             lastRun = last;
-                             }
-                          }
-                      newTable[lastIdx] = lastRun;
-
-                      // Clone all remaining nodes
-                      for (HashEntry p = e; p !is lastRun; p = p.next)
-                          {
-                          uint k = p.hash & sizeMask;
-                          HashEntry n = newTable[k];
-                          newTable[k] = new HashEntry(p.key, p.hash, n, p.value);
-                          }
-                      }
-                   }
-                }
-            volatile table = newTable;
-        }
-
-        /**
-         * Remove; match on key only if value null, else match both.
-         */
-        final synchronized V remove (K key, uint hash, V value)
-        {
-                int c;
-                HashEntry[] tab;
-
-                volatile c = count - 1;
-                volatile tab = table;
-
-                uint index = hash & (tab.length - 1);
-                HashEntry first = tab[index];
-                HashEntry e = first;
-
-                while (e && (e.hash != hash || !matchKey (key, e.key)))
-                       e = e.next;
-
-                V oldValue = null;
-                if (e)
-                   {
-                   V v;
-                   volatile v = e.value;
-                   if (value is null || value == v)
-                      {
-                      oldValue = v;
-
-                      // All entries following removed node can stay
-                      // in list, but all preceding ones need to be
-                      // cloned.
-                      HashEntry newFirst = e.next;
-                      for (HashEntry p = first; p !is e; p = p.next)
-                           newFirst = new HashEntry (p.key, p.hash, newFirst, p.value);
-                      tab[index] = newFirst;
-
-                      // write-volatile
-                      volatile count = c;
-                      }
-                   }
-                return oldValue;
-        }
-
-
-        final synchronized void clear()
-        {
-            if (count)
-               {
-                   HashEntry[] tab;
-                   volatile tab = table;
-
-                   for (int i = 0; i < tab.length ; i++)
-                        tab[i] = null;
-
-                   // write-volatile
-                   volatile count = 0;
-               }
-        }
-    }
-
-
-
-    /* ---------------- Public operations -------------- */
-
-    /**
-     * Creates a new, empty map with the specified initial
-     * capacity and the specified load factor.
-     *
-     * @param initialCapacity the initial capacity. The implementation
-     * performs internal sizing to accommodate this many elements.
-     * @param loadFactor  the load factor threshold, used to control resizing.
-     * @param concurrencyLevel the estimated number of concurrently
-     * updating threads. The implementation performs internal sizing
-     * to try to accommodate this many threads.
-     * @throws IllegalArgumentException if the initial capacity is
-     * negative or the load factor or concurrencyLevel are
-     * nonpositive.
-     */
-    public this (uint initialCapacity, float loadFactor, uint concurrencyLevel)
-    {
-        assert (loadFactor > 0);
-
-        if (concurrencyLevel > MAX_SEGMENTS)
-            concurrencyLevel = MAX_SEGMENTS;
-
-        // Find power-of-two sizes best matching arguments
-        int sshift = 0;
-        int ssize = 1;
-        while (ssize < concurrencyLevel)
-              {
-              ++sshift;
-              ssize <<= 1;
-              }
-
-        segmentShift = 32 - sshift;
-        segmentMask = ssize - 1;
-        this.segments = new Segment[ssize];
-
-        if (initialCapacity > MAXIMUM_CAPACITY)
-            initialCapacity = MAXIMUM_CAPACITY;
-
-        int c = initialCapacity / ssize;
-        if (c * ssize < initialCapacity)
-            ++c;
-
-        int cap = 1;
-        while (cap < c)
-               cap <<= 1;
-
-        for (int i = 0; i < this.segments.length; ++i)
-             this.segments[i] = new Segment (cap, loadFactor);
-    }
-
-    /**
-     * Creates a new, empty map with the specified initial
-     * capacity,  and with default load factor and concurrencyLevel.
-     *
-     * @param initialCapacity The implementation performs internal
-     * sizing to accommodate this many elements.
-     * @throws IllegalArgumentException if the initial capacity of
-     * elements is negative.
-     */
-    public this (uint initialCapacity)
-    {
-        this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_SEGMENTS);
-    }
-
-    /**
-     * Creates a new, empty map with a default initial capacity,
-     * load factor, and concurrencyLevel.
-     */
-    public this ()
-    {
-        this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_SEGMENTS);
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped in this table.
-     *
-     * @param   key   a key in the table.
-     * @return  the value to which the key is mapped in this table;
-     *          <tt>null</tt> if the key is not mapped to any value in
-     *          this table.
-     * @throws  NullPointerException  if the key is
-     *               <tt>null</tt>.
-     */
-    public V get (K key)
-    {
-        uint hash = hash(key); // throws NullPointerException if key null
-        return segmentFor(hash).get(key, hash);
-    }
-
-    /**
-     * Tests if the specified object is a key in this table.
-     *
-     * @param   key   possible key.
-     * @return  <tt>true</tt> if and only if the specified object
-     *          is a key in this table, as determined by the
-     *          <tt>equals</tt> method; <tt>false</tt> otherwise.
-     * @throws  NullPointerException  if the key is
-     *               <tt>null</tt>.
-     */
-    public bool containsKey (K key)
-    {
-        uint hash = hash(key); // throws NullPointerException if key null
-        return segmentFor(hash).containsKey(key, hash);
-    }
-
-    /**
-     * Maps the specified <tt>key</tt> to the specified
-     * <tt>value</tt> in this table. Neither the key nor the
-     * value can be <tt>null</tt>.
-     *
-     * <p> The value can be retrieved by calling the <tt>get</tt> method
-     * with a key that is equal to the original key.
-     *
-     * @param      key     the table key.
-     * @param      value   the value.
-     * @return     the previous value of the specified key in this table,
-     *             or <tt>null</tt> if it did not have one.
-     * @throws  NullPointerException  if the key or value is
-     *               <tt>null</tt>.
-     */
-    public V put (K key, V value)
-    {
-        assert (value);
-
-        uint hash = hash(key);
-        return segmentFor(hash).put(key, hash, value, false);
-    }
-
-    /**
-     * If the specified key is not already associated
-     * with a value, associate it with the given value.
-     * This is equivalent to
-     * <pre>
-     *   if (!map.containsKey(key))
-     *      return map.put(key, value);
-     *   else
-     *      return map.get(key);
-     * </pre>
-     * Except that the action is performed atomically.
-     * @param key key with which the specified value is to be associated.
-     * @param value value to be associated with the specified key.
-     * @return previous value associated with specified key, or <tt>null</tt>
-     *         if there was no mapping for key.
-     * @throws NullPointerException if the specified key or value is
-     *            <tt>null</tt>.
-     */
-    public V putIfAbsent (K key, V value)
-    {
-        assert (value);
-
-        uint hash = hash(key);
-        return segmentFor(hash).put(key, hash, value, true);
-    }
-
-
-    /**
-     * Removes the key (and its corresponding value) from this
-     * table. This method does nothing if the key is not in the table.
-     *
-     * @param   key   the key that needs to be removed.
-     * @return  the value to which the key had been mapped in this table,
-     *          or <tt>null</tt> if the key did not have a mapping.
-     * @throws  NullPointerException  if the key is
-     *               <tt>null</tt>.
-     */
-    public V remove (K key)
-    {
-        uint hash = hash(key);
-        return segmentFor(hash).remove(key, hash, null);
-    }
-
-    /**
-     * Remove entry for key only if currently mapped to given value.
-     * Acts as
-     * <pre>
-     *  if (map.get(key).equals(value)) {
-     *     map.remove(key);
-     *     return true;
-     * } else return false;
-     * </pre>
-     * except that the action is performed atomically.
-     * @param key key with which the specified value is associated.
-     * @param value value associated with the specified key.
-     * @return true if the value was removed
-     * @throws NullPointerException if the specified key is
-     *            <tt>null</tt>.
-     */
-    public bool remove (K key, V value)
-    {
-        uint hash = hash(key);
-        return cast(bool) (segmentFor(hash).remove(key, hash, value) !is null);
-    }
-
-
-    /**
-     * Replace entry for key only if currently mapped to some value.
-     * Acts as
-     * <pre>
-     *  if ((map.containsKey(key)) {
-     *     return map.put(key, value);
-     * } else return null;
-     * </pre>
-     * except that the action is performed atomically.
-     * @param key key with which the specified value is associated.
-     * @param value value to be associated with the specified key.
-     * @return previous value associated with specified key, or <tt>null</tt>
-     *         if there was no mapping for key.
-     * @throws NullPointerException if the specified key or value is
-     *            <tt>null</tt>.
-     */
-    public V replace (K key, V value)
-    {
-        assert (value);
-
-        uint hash = hash(key);
-        return segmentFor(hash).replace(key, hash, value);
-    }
-
-
-    /**
-     * Removes all mappings from this map.
-     */
-    public void clear ()
-    {
-        for (int i = 0; i < segments.length; ++i)
-             segments[i].clear();
-    }
-
-
-    /**
-     * Returns an enumeration of the keys in this table.
-     *
-     * @return  an enumeration of the keys in this table.
-     * @see     #keySet
-     */
-    public KeyIterator keys ()
-    {
-        return new KeyIterator (this);
-    }
-
-    /**
-     * Returns an enumeration of the values in this table.
-     *
-     * @return  an enumeration of the values in this table.
-     * @see     #values
-     */
-    public ValueIterator elements ()
-    {
-        return new ValueIterator (this);
-    }
-
-        /**********************************************************************
-
-                Iterate over all keys in hashmap
-
-        **********************************************************************/
-
-        int opApply (int delegate(inout char[]) dg)
-        {
-                int result = 0;
-                KeyIterator iterator = keys ();
-
-                while (iterator.hasNext)
-                      {
-                      char[] ca = cast(char[]) iterator.next;
-                      if ((result = dg (ca)) != 0)
-                           break;
-                      }
-                return result;
-        }
-
-        /**********************************************************************
-
-                Iterate over all keys in hashmap
-
-        **********************************************************************/
-
-        int opApply (int delegate(inout char[], inout Object) dg)
-        {
-                int result = 0;
-                KeyIterator iterator = keys ();
-
-                while (iterator.hasNext)
-                      {
-                      HashEntry he = iterator.nextElement;
-                      char[] ca = cast(char[]) he.key;
-                      if ((result = dg (ca, he.value)) != 0)
-                           break;
-                      }
-                return result;
-        }
-
-
-    /* ---------------- Iterator Support -------------- */
-
-    abstract static class HashIterator
-    {
-        int nextSegmentIndex;
-        int nextTableIndex;
-        HashEntry[] currentTable;
-        HashEntry nextEntry;
-        HashEntry lastReturned;
-        HashMap   map;
-
-        this (HashMap map)
-        {
-            this.map = map;
-            nextSegmentIndex = map.segments.length - 1;
-            nextTableIndex = -1;
-            advance();
-        }
-
-        final void advance ()
-        {
-            if (nextEntry !is null && (nextEntry = nextEntry.next) !is null)
-                return;
-
-            while (nextTableIndex >= 0)
-                  {
-                  if ( (nextEntry = currentTable[nextTableIndex--]) !is null)
-                        return;
-                  }
-
-            while (nextSegmentIndex >= 0)
-                  {
-                  Segment seg = map.segments[nextSegmentIndex--];
-                  volatile if (seg.count)
-                     {
-                     currentTable = seg.table;
-                     for (int j = currentTable.length - 1; j >= 0; --j)
-                         {
-                         if ((nextEntry = currentTable[j]) !is null)
-                            {
-                            nextTableIndex = j - 1;
-                            return;
-                            }
-                         }
-                     }
-                  }
-        }
-
-        public bool hasNext ()
-        {
-            return cast(bool) (nextEntry !is null);
-        }
-
-        HashEntry nextElement ()
-        {
-            if (nextEntry is null)
-                throw new Exception ("no such element in HashMap");
-
-            lastReturned = nextEntry;
-            advance ();
-            return lastReturned;
-        }
-    }
-
-    static class KeyIterator : HashIterator
-    {
-        this (HashMap map) {super (map);}
-        public K next() { return super.nextElement().key; }
-    }
-
-    static class ValueIterator : HashIterator
-    {
-        this (HashMap map) {super (map);}
-        public V next() { volatile return super.nextElement().value; }
-    }
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/Lexer.d
deleted file mode 100644
index 004d9d8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/Lexer.d
+++ /dev/null
@@ -1,2335 +0,0 @@
-/+

-	Copyright (c) 1999-2006 by Digital Mars

-	All Rights Reserved

-	written by Walter Bright www.digitalmars.com	

-	License for redistribution is by either the Artistic License in artistic.txt, or the GNU General Public License in gnu.txt.

-	See the included readme.txt for details.

-	D Language conversion by: J Duncan

-+/

-

-/**

-	d language lexer 

-*/

-

-module dparser.Lexer;

-

-import dparser.Root;

-

-import dparser.Tokens;

-import dparser.Token;

-import dparser.Keyword;

-

-import dparser.Types;

-

-import dparser.Module;

-import dparser.Identifier;

-import dparser.unialpha;

-

-import dparser.OutBuffer;

-

-//private import std.ctype;

-//private import std.string;

-//import dwf.core.debugapi;

-

-int errno = 0;

-

-//#if _WIN32 && __DMC__

-// from \dm\src\include\setlocal.h

-//extern "C" char * __cdecl __locale_decpoint;

-char* __locale_decpoint;

-//#endif

-//const uint LS = 0x2028;	// UTF line separator

-//const uint PS = 0x2029;	// UTF paragraph separator

-

-//extern int isUniAlpha(unsigned u);

-//extern int HtmlNamedEntity(unsigned char *p, int length);

-

-/**

-	Lexer object

-*/

-

-class Lexer

-{

-   

-	static Identifier[char[]] 	stringtable;

-    static OutBuffer 		stringbuffer;

-    static Token*			freelist;

-

-    Token token;		// current token

-    Module mod;			// current module

-    Loc loc;			// for error messages

-    ubyte *base;		// pointer to start of buffer

-    ubyte *end;			// past end of buffer

-    ubyte *p;			// current character

-    int doDocComment;	// collect doc comment information

-    int anyToken;		// !=0 means seen at least one token

-    int commentToken;	// !=0 means comments are TOKcomment's

-

-

-    this( Module mod, ubyte* base, uint begoffset, uint endoffset, int doDocComment, int commentToken )

-	{

-	    if( stringbuffer is null )

-		    stringbuffer = new OutBuffer;

-	    loc = Loc(mod, 1);

-

-	    this.base 			= base;

-	    this.end  			= base + endoffset;

-	    this.p 				= base + begoffset;

-	    this.mod 			= mod;

-	    this.doDocComment	= doDocComment;

-	    this.commentToken	= commentToken;

-

-		/* 

-			If first line starts with '#!', ignore the line

-		*/

-

-		if( p[0] == '#' && p[1] =='!' )

-		{

-			p += 2;

-			while( true )

-			{   

-				ubyte c = *p;

-				switch( c )

-				{

-					case '\n':

-						p++;

-						break;

-

-					case '\r':

-						p++;

-						if( *p == '\n' )

-							p++;

-						break;

-

-					case 0:

-					case 0x1A:

-						break;

-

-					default:

-						if( c & 0x80 )

-						{   

-							uint u = decodeUTF();

-							if( u == PS || u == LS )

-								break;

-						}

-						p++;

-						continue;

-				}

-				break;

-			}

-

-			loc.linnum = 2;

-		}

-

-	}

-

-

-

-	// generate a unique identifier for this string

-    static Identifier idPool( in char[] str )

-    {

-//	    StringValue sv;

-//	    uint len = s.length;

-//	    StringValue sv = stringtable.update(s, len);

-//	    Identifier* id = cast(Identifier*) sv.ptrvalue;

-//	    if( id is null )

-	    if( (str in stringtable) == null )

-	    {

-			stringtable[str] = new Identifier( str, TOK.TOKidentifier );

-	    }

-	    return stringtable[str];

-	}

-

-    static void initKeywords()

-	{

-		// build character map

-	    cmtable_init();

-		

-		// create keyword tokens & identifiers

-		dparser.Keyword.initKeywords();

-

-		// create standard lexer tokens

-		dparser.Token.createLexerTokens();

-	}

-

-	// Combine two document comments into one.

-    static char[] combineComments( char[] c1, char[] c2 )

-	{

-	    char[] c = c2;

-	    if( c1.length )

-	    {

-			c = c1;

-			if( c2.length )

-			{

-				c = c1 ~ "\n" ~ c2;

-			}

-	    }

-	    return c;

-	}

-

-	// Decode UTF character. Issue error messages for invalid sequences. Return decoded character, advance p to last character in UTF sequence.

-	//! fix

-	uint decodeUTF()

-	{

-	    ubyte* s = p;

-	    ubyte  c = *s;

-

-	    assert( c & 0x80 );

-		if( !(c & 0x80) )

-			return c;

-

-		return cast(uint) 'X';

-	/*

-	    dchar u;

-	    uint len;

-

-

-

-	    // Check length of remaining string up to 6 UTF-8 characters

-	    for( len = 1; len < 6 && s[len]; len++ )

-	    {

-

-	    }

-			/+

-	    uint idx = 0;

-	    char* msg = utf_decodeChar( s, len, &idx, &u );

-	    p += idx - 1;

-	    if( msg )

-	    {

-			error(msg);

-	    }

-			+/

-	    return u;

-	*/

-	}

-

-	void error( ... )

-	{

-	    if( (mod !is null) && !global.gag )

-	    {

-			writefln( formatLoc( loc, _arguments, _argptr ) );

-			/*

-			char[] p = loc.toChars();

-			if( p.length )

-			    writef( "%s: ", p );

-		    writefx( stdout, _arguments, _argptr, 1 );

-			*/

-			if( global.errors >= global.max_errors )	// moderate blizzard of cascading messages

-		    	throw new Exception( "too many errors" );

-	    }

-

-	    global.errors++;

-	}

-

-	void errorLoc(Loc loc, ...)

-	{

-	    if( (mod !is null) && !global.gag )

-	    {

-			writefln( formatLoc( loc, _arguments, _argptr ) );

-			/*

-			char[] p = loc.toChars();

-			if( p.length )

-			    writef("%s: ", p);

-		    writefx(stdout, _arguments, _argptr, 1);

-			*/

-			if( global.errors >= 20 )	// moderate blizzard of cascading messages

-		    	throw new Exception( "too many errors" );

-	    }

-

-	    global.errors++;

-	}

-

-

-	TOK nextToken()

-	{

-	    if( token.next )

-	    {

-			Token* t = token.next;

-			memcpy( &token, t, Token.sizeof );

-//			t.next = freelist;

-//			freelist = t;

-	    }

-	    else

-	    {

-			scan( &token );

-	    }

-//	    token.print();

-	    return token.value;

-	}

-

-	Token* peek( inout Token ct )

-	{

-		Token* t;

-	    if( ct.next )

-			t = ct.next;

-	    else

-	    {

-			t = new Token;

-			scan( t );

-			t.next = null;

-			ct.next = t;

-	    }

-	    return t;

-	}

-

-	// Turn next token in buffer into a token.

-

-	void scan( Token* t )

-	{

-//		debug writefln("scan token");

-	    uint lastLine = loc.linnum;

-	    uint linnum;

-	    t.blockComment 	= null;

-	    t.lineComment 	= null;

-	    while( true )

-	    {

-			t.ptr = p;

-//			debug writefln( "    p = %d, *p = ", cast(uint)p, cast(char)*p );

-			switch( *p )

-			{

-			    case 0:

-			    case 0x1a:

-					t.value = TOK.TOKeof;			// end of file

-//					debug writefln( "    EOF" );

-					return;

-

-			    case ' ':

-			    case '\t':

-			    case '\v':

-			    case '\f':

-					p++;

-//					debug writefln( "    whitespace" );

-					continue;					// skip white space

-

-			    case '\r':

-//					debug writefln( "    cr" );

-					p++;

-					if( *p != '\n' )			// if CR stands by itself

-					    loc.linnum++;

-					continue;					// skip white space

-

-			    case '\n':

-//					debug writefln( "    nl" );

-					p++;

-					loc.linnum++;

-					continue;					// skip white space

-

-			    case '0':  	case '1':   case '2':   case '3':   case '4':

-			    case '5':  	case '6':   case '7':   case '8':   case '9':

-					t.value = number(t);

-					return;

-

-/* 

-	#if CSTRINGS

-			    case '\'':

-				t.value = charConstant(t, 0);

-				return;

-

-			    case '"':

-				t.value = stringConstant(t,0);

-				return;

-

-			    case 'l':

-			    case 'L':

-				if( p[1] == '\'')

-				{

-				    p++;

-				    t.value = charConstant(t, 1);

-				    return;

-				}

-				else if( p[1] == '"')

-				{

-				    p++;

-				    t.value = stringConstant(t, 1);

-				    return;

-				}

-	#else 

-*/

-			    case '\'':

-//					debug writefln( "    char" );

-					t.value = charConstant(t,0);

-					return;

-

-			    case 'r':

-//					debug writefln( "    wysiwyg" );

-					if( p[1] != '"')

-					    goto case_identifier;

-					p++;

-				    case '`':

-					t.value = wysiwygStringConstant(t, *p);

-					return;

-

-			    case 'x':

-//					debug writefln( "    hex string" );

-					if( p[1] != '"')

-					    goto case_identifier;

-					p++;

-					t.value = hexStringConstant(t);

-					return;

-

-

-			    case '"':

-//					debug writefln( "    string" );

-					t.value = escapeStringConstant( t, 0 );

-//					debug writefln( t.ustring );

-					return;

-

-			    case '\\':			// escaped string literal

-//					debug writefln( "    escaped string literal" );

-					uint c;

-					stringbuffer.offset = 0;

-					do

-					{

-					    p++;

-					    c = escapeSequence();

-					    stringbuffer.write(c);

-					} while (*p == '\\');

-//					t.len = stringbuffer.offset;

-//					stringbuffer.write(cast(byte)0);

-					t.ustring = stringbuffer.toString;

-//					memcpy( t.ustring.ptr, stringbuffer.data, stringbuffer.offset );

-					t.postfix = 0;

-					t.value = TOK.TOKstring;

-					return;

-

-			    case 'l':

-			    case 'L':

-//	#endif

-

-			    case 'a':  	case 'b':   case 'c':   case 'd':   case 'e':

-			    case 'f':  	case 'g':   case 'h':   case 'i':   case 'j':

-			    case 'k':  	            case 'm':   case 'n':   case 'o':

-			    case 'p':  	case 'q': /*case 'r':*/ case 's':   case 't':

-			    case 'u':  	case 'v':   case 'w': /*case 'x':*/ case 'y':

-			    case 'z':

-			    case 'A':  	case 'B':   case 'C':   case 'D':   case 'E':

-			    case 'F':  	case 'G':   case 'H':   case 'I':   case 'J':

-			    case 'K':  	            case 'M':   case 'N':   case 'O':

-			    case 'P':  	case 'Q':   case 'R':   case 'S':   case 'T':

-			    case 'U':  	case 'V':   case 'W':   case 'X':   case 'Y':

-			    case 'Z':

-			    case '_':

-			    case_identifier:

-			    {

-//					debug writefln( "    identifier" );

-					ubyte c;

-					do

-					{

-					    c = *++p;

-					} while( isidchar(c) || (c & 0x80 && isUniAlpha( decodeUTF())) );

-

-//					sv = stringtable.update((char *)t.ptr, p - t.ptr);

-					char[] tmp;

-					tmp.length = p - t.ptr;

-					memcpy( tmp.ptr, t.ptr, p - t.ptr );

-					Identifier id;

-					Identifier* pid = tmp in stringtable;

-					if( pid )

-					{

-						id = *pid;

-					}

-

-					if( id is null )

-					{

-						id = new Identifier( tmp, TOK.TOKidentifier );

-						stringtable[tmp] = id;

-					}

-

-					t.identifier = id;

-					t.value = cast(TOK) id.value;

-					anyToken = 1;

-

-					// if special identifier token

-					if( *t.ptr == '_')

-					{

-					    static char date[11+1];

-					    static char time[8+1];

-					    static char timestamp[24+1];

-

-					    if( !date[0] )	// lazy evaluation

-					    {

-					    	//!!

-					    	/+

-							time_t t;

-							char *p;

-							.time(&t);

-							p = ctime(&t);

-							assert(p);

-							sprintf(date.ptr, "%.6s %.4s", p + 4, p + 20);

-							sprintf(time.ptr, "%.8s", p + 11);

-							sprintf(timestamp.ptr, "%.24s", p);

-							+/

-					    }

-

-					    if( mod && id is Id.FILE )

-					    {

-							t.value = TOK.TOKstring;

-							if( loc.filename.length )

-								t.ustring = loc.filename;

-							else

-								t.ustring = mod.identifier.toChars();

-							goto Llen;

-					    }

-					    else if( mod && id == Id.LINE )

-					    {

-							t.value = TOK.TOKint64v;

-							t.uns64value = loc.linnum;

-					    }

-					    else if( id == Id.DATE )

-					    {

-							t.value = TOK.TOKstring;

-							//! t.ustring = date;

-							goto Llen;

-					    }

-					    else if( id == Id.TIME )

-					    {

-							t.value = TOK.TOKstring;

-							//! t.ustring = time;

-							goto Llen;

-					    }

-					    else if( id == Id.TIMESTAMP )

-					    {

-							t.value = TOK.TOKstring;

-							//! t.ustring = timestamp;

-					     Llen:

-							t.postfix = 0;

-//							t.len = strlen((char *)t.ustring);

-					    }

-					}

-					//printf("t.value = %d\n",t.value);

-					return;

-			    }

-

-				// comments

-			    case '/':

-					p++;

-					switch( *p )

-					{

-					    case '=':

-							p++;

-							t.value = TOK.TOKdivass;

-							return;

-

-					    case '*':	// '/*'

-							p++;

-							linnum = loc.linnum;

-							while( true )

-							{

-							    while( true )

-							    {

-									ubyte c = *p;

-									switch( c )

-									{

-									    case '/':

-											break;

-

-									    case '\n':

-											loc.linnum++;

-											p++;

-											continue;

-

-									    case '\r':

-											p++;

-											if( *p != '\n')

-											    loc.linnum++;

-											continue;

-

-									    case 0:

-									    case 0x1A:

-											error("unterminated /* */ comment");

-											p = end;

-											t.value = TOK.TOKeof;

-											return;

-

-									    default:

-											if( c & 0x80)

-											{   

-												uint u = decodeUTF();

-											    if( u == PS || u == LS )

-													loc.linnum++;

-											}

-											p++;

-											continue;

-									}

-									break;

-							    }

-							    p++;

-							    if( p[-2] == '*' && p - 3 != t.ptr )

-									break;

-							}

-							

-							if( commentToken )

-							{

-							    t.value = TOK.TOKcomment;

-							    return;

-							}

-							// if /** but not /**/

-							else  if( doDocComment && t.ptr[2] == '*' && p - 4 != t.ptr )

-							    getDocComment( t, lastLine == linnum );	//! ?

-							continue;

-

-					    case '/':		// do // style comments

-							linnum = loc.linnum;

-							while (1)

-							{  

-								ubyte c = *++p;

-							    switch (c)

-							    {

-									case '\n':

-									    break;

-					

-									case '\r':

-									    if( p[1] == '\n')

-										p++;

-									    break;

-					

-									case 0:

-									case 0x1a:

-									    if( commentToken )

-									    {

-											p = end;

-											t.value = TOK.TOKcomment;

-											return;

-									    }

-									    if( doDocComment && t.ptr[2] == '/' )

-											getDocComment( t, lastLine == linnum );

-									    p = end;

-									    t.value = TOK.TOKeof;

-									    return;

-					

-									default:

-									    if( c & 0x80)

-									    {

-											uint u = decodeUTF();

-											if( u == PS || u == LS)

-											    break;

-									    }

-									    continue;

-							    }

-							    break;

-							}

-

-							if( commentToken )

-							{

-							    p++;

-							    loc.linnum++;

-							    t.value = TOK.TOKcomment;

-							    return;

-							}

-							if( doDocComment && t.ptr[2] == '/' )

-							    getDocComment( t, lastLine == linnum );

-				

-							p++;

-							loc.linnum++;

-							continue;

-	

-					    case '+':

-						    {	int nest;

-								linnum = loc.linnum;

-								p++;

-								nest = 1;

-								while (1)

-								{

-									ubyte c = *p;

-								    switch (c)

-								    {

-										case '/':

-										    p++;

-										    if( *p == '+')

-										    {

-												p++;

-												nest++;

-										    }

-										    continue;

-						

-										case '+':

-										    p++;

-										    if( *p == '/')

-										    {

-												p++;

-												if( --nest == 0)

-												    break;

-										    }

-										    continue;

-						

-										case '\r':

-										    p++;

-										    if( *p != '\n')

-											loc.linnum++;

-										    continue;

-						

-										case '\n':

-										    loc.linnum++;

-										    p++;

-										    continue;

-						

-										case 0:

-										case 0x1A:

-										    error("unterminated /+ +/ comment");

-										    p = end;

-										    t.value = TOK.TOKeof;

-										    return;

-						

-										default:

-										    if( c & 0x80 )

-										    {

-												uint u = decodeUTF();

-												if( u == PS || u == LS)

-												    loc.linnum++;

-										    }

-										    p++;

-										    continue;

-								    }

-								    break;

-								}

-								if( commentToken )

-								{

-								    t.value = TOK.TOKcomment;

-								    return;

-								}

-								if( doDocComment && t.ptr[2] == '+' && p - 4 != t.ptr )

-								{  

-									// if /++ but not /++/

-								    getDocComment(t, lastLine == linnum);

-								}

-								continue;

-					    	}

-					    default:

-						    break;

-					}

-					t.value = TOK.TOKdiv;

-					return;

-

-			    case '.':

-					p++;

-					if( isdigit(*p))

-					{

-					    p--;

-					    t.value = inreal(t);

-					}

-					else if( p[0] == '.')

-					{

-					    if( p[1] == '.')

-					    {

-							p += 2;

-							t.value = TOK.TOKdotdotdot;

-					    }

-					    else

-					    {

-							p++;

-							t.value = TOK.TOKslice;

-					    }

-					}

-					else

-					    t.value = TOK.TOKdot;

-					return;

-

-			    case '&':

-					p++;

-					if( *p == '=')

-					{   

-						p++;

-					    t.value = TOK.TOKandass;

-					}

-					else if( *p == '&')

-					{   

-						p++;

-					    t.value = TOK.TOKandand;

-					}

-					else

-					    t.value = TOK.TOKand;

-					return;

-	

-				// |, ||, |=

-			    case '|':

-					p++;

-					if( *p == '=' )

-					{   p++;

-					    t.value = TOK.TOKorass;

-					}

-					else if( *p == '|')

-					{   p++;

-					    t.value = TOK.TOKoror;

-					}

-					else

-					    t.value = TOK.TOKor;

-					return;

-			

-				    case '-':

-					p++;

-					if( *p == '=')

-					{   p++;

-					    t.value = TOK.TOKminass;

-					}

-					else if( *p == '-')

-					{   p++;

-					    t.value = TOK.TOKminusminus;

-					}

-					else

-					    t.value = TOK.TOKmin;

-					return;

-

-				// +, +=, ++

-			    case '+':

-					p++;

-					if( *p == '=')

-					{   

-						p++;

-					    t.value = TOK.TOKaddass;		// +=

-					}

-					else if( *p == '+')

-					{   p++;

-					    t.value = TOK.TOKplusplus;			// ++

-					}

-					else

-					    t.value = TOK.TOKadd;				// +

-					return;

-

-				// <, <=, <<=, <<, <>=, <>

-			    case '<':

-					p++;

-					if( *p == '=')

-					{   p++;

-					    t.value = TOK.TOKle;			// <=

-					}

-					else if( *p == '<')

-					{   p++;

-					    if( *p == '=')

-					    {   p++;

-						t.value = TOK.TOKshlass;		// <<=

-					    }

-					    else

-						t.value = TOK.TOKshl;			// <<

-					}

-					else if( *p == '>')

-					{   p++;

-					    if( *p == '=')

-					    {   p++;

-						t.value = TOK.TOKleg;			// <>=

-					    }

-					    else

-						t.value = TOK.TOKlg;			// <>

-					}

-					else

-					    t.value = TOK.TOKlt;			// <

-					return;

-		

-				// >, >>, >>>, >=, >>=, >>>=

-			    case '>':

-					p++;

-					if( *p == '=')

-					{   p++;

-					    t.value = TOK.TOKge;			// >=

-					}

-					else if( *p == '>')

-					{   p++;

-					    if( *p == '=')

-					    {   p++;

-						t.value = TOK.TOKshrass;		// >>=

-					    }

-					    else if( *p == '>')

-					    {	p++;

-						if( *p == '=')

-						{   p++;

-						    t.value = TOK.TOKushrass;	// >>>=

-						}

-						else

-						    t.value = TOK.TOKushr;		// >>>

-					    }

-					    else

-						t.value = TOK.TOKshr;			// >>

-					}

-					else

-					    t.value = TOK.TOKgt;			// >

-					return;

-

-			    case '!':

-					p++;

-					if( *p == '=')

-					{   p++;

-					    if( *p == '=')

-					    {	

-							p++;

-							t.value = TOK.TOKnotidentity;	// !==

-					    }

-					    else

-						t.value = TOK.TOKnotequal;		// !=

-					}

-					else if( *p == '<')

-					{   

-						p++;

-					    if( *p == '>')

-					    {	

-							p++;

-							if( *p == '=')

-							{  

-							 	p++;

-						    	t.value = TOK.TOKunord; // !<>=

-							}

-							else

-						  	  t.value = TOK.TOKue;	// !<>

-					    }

-					    else if( *p == '=')

-					    {

-							p++;

-							t.value = TOK.TOKug;	// !<=

-					    }

-					    else

-							t.value = TOK.TOKuge;	// !<

-					}

-					else if( *p == '>')

-					{   p++;

-					    if( *p == '=')

-					    {

-							p++;

-							t.value = TOK.TOKul;	// !>=

-					    }

-					    else

-							t.value = TOK.TOKule;	// !>

-					}

-					else

-					    t.value = TOK.TOKnot;		// !

-					return;

-

-			    case '=':

-					p++;

-					if( *p == '=')

-					{   	

-						p++;

-					    if( *p == '=')

-					    {

-							p++;

-							t.value = TOK.TOKidentity;	// ===

-					    }

-					    else

-							t.value = TOK.TOKequal;		// ==

-					}

-					else

-					    t.value = TOK.TOKassign;		// =

-					return;

-

-				case '~':

-					p++;

-					if( *p == '=' )

-					{   

-						p++;

-						t.value = TOK.TOKcatass;		// ~=

-					}

-					else

-						t.value = TOK.TOKtilde;			// ~

-					return;

-

-		// SINGLE

-			    case '(': p++; t.value = TOK.TOKlparen; 	return;

-			    case ')': p++; t.value = TOK.TOKrparen; 	return;

-			    case '[': p++; t.value = TOK.TOKlbracket; 	return;

-			    case ']': p++; t.value = TOK.TOKrbracket; 	return;

-			    case '{': p++; t.value = TOK.TOKlcurly; 	return;

-			    case '}': p++; t.value = TOK.TOKrcurly; 	return;

-			    case '?': p++; t.value = TOK.TOKquestion; 	return;

-			    case ',': p++; t.value = TOK.TOKcomma; 		return;

-			    case ';': p++; t.value = TOK.TOKsemicolon; 	return;

-			    case ':': p++; t.value = TOK.TOKcolon; 		return;

-			    case '$': p++; t.value = TOK.TOKdollar; 	return;

-		// DOUBLE

-			    case '*': p++; if( *p == '=' ) { p++; t.value = TOK.TOKmulass; } else t.value = TOK.TOKmul; return;

-			    case '%': p++; if( *p == '=' ) { p++; t.value = TOK.TOKmodass; } else t.value = TOK.TOKmod; return;

-			    case '^': p++; if( *p == '=' ) { p++; t.value = TOK.TOKxorass; } else t.value = TOK.TOKxor; return;

-// removed 148	case '~': p++; if( *p == '=' ) { p++; t.value = TOK.TOKcatass; } else t.value = TOK.TOKtilde; return;

-

-

-			    case '#':

-					p++;

-					Pragma();

-					continue;

-		

-			    default:

-			    {	

-					debug writefln( "    default char" );

-					ubyte c = *p;

-					if( c & 0x80 )

-					{

-						uint u = decodeUTF();

-					    // Check for start of unicode identifier

-					    if( isUniAlpha(u) )

-							goto case_identifier;

-

-					    if( u == PS || u == LS )

-					    {

-							loc.linnum++;

-							p++;

-							continue;

-					    }

-					}

-					if( isprint(c))

-					    error("unsupported char '%s'", cast(char)c);

-					else

-					    error("unsupported char 0x%02x", cast(ubyte)c);

-					p++;

-					continue;

-			    }

-			}

-	    }

-	}

-

-

-

-	// Parse escape sequence.

-	uint escapeSequence()

-	{

-		uint c;

-	    int n;

-	    int ndigits;

-

-	    c = *p;

-	    switch ( c )

-	    {

-			case '\'':

-			case '"':

-			case '?':

-			case '\\':

-			Lconsume:

-				p++;

-				break;

-

-			case 'a':	c = 7;		goto Lconsume;

-			case 'b':	c = 8;		goto Lconsume;

-			case 'f':	c = 12;		goto Lconsume;

-			case 'n':	c = 10;		goto Lconsume;

-			case 'r':	c = 13;		goto Lconsume;

-			case 't':	c = 9;		goto Lconsume;

-			case 'v':	c = 11;		goto Lconsume;

-	

-			case 'u':

-				ndigits = 4;

-				goto Lhex;

-			case 'U':

-				ndigits = 8;

-				goto Lhex;

-			case 'x':

-				ndigits = 2;

-			Lhex:

-				p++;

-				c = *p;

-				if( ishex(c))

-				{   

-					uint v;

-				    n = 0;

-				    v = 0;

-				    while (1)

-				    {

-						if( isdigit(c))

-						    c -= '0';

-						else if( islower(c))

-						    c -= 'a' - 10;

-						else

-						    c -= 'A' - 10;

-						v = v * 16 + c;

-						c = *++p;

-						if( ++n == ndigits)

-						    break;

-						if( !ishex(c))

-						{   error("escape hex sequence has %d hex digits instead of %d", n, ndigits);

-						    break;

-						}

-				    }

-//!				    if( ndigits != 2 && !utf_isValidDchar(v))

-//!						error("invalid UTF character \\U%08x", v);

-				    c = v;

-				}

-				else

-				    error("undefined escape hex sequence \\%s\n",c);

-				break;

-

-			case '&':			// named character entity

-				for( ubyte *idstart = ++p; 1; p++ )

-				{

-				    switch( *p )

-				    {

-						case ';':

-							//!!!

-							/+

-						    c = HtmlNamedEntity(idstart, p - idstart);

-						    if( c == ~0 )

-						    {

-								error("unnamed character entity &%.*s;", p - idstart, idstart);

-								c = ' ';

-						    }

-

-						    p++;

-						    +/

-						    break;

-

-						default:

-						    if( isalpha(*p) || (p != idstart + 1 && isdigit(*p)))

-								continue;

-						    error("unterminated named entity");

-						    break;

-				    }

-				    break;

-				}

-				break;

-

-			case 0:

-			case 0x1a:			// end of file

-				c = '\\';

-				break;

-

-			default:

-				if( isoctal(c) )

-				{   

-					ubyte v;

-				    n = 0;

-				    do

-				    {

-						v = v * 8 + (c - '0');

-						c = *++p;

-				    } while (++n < 3 && isoctal(c));

-				    c = v;

-				}

-				else

-				    error("undefined escape sequence \\%s\n",c);

-				break;

-	    }

-	    return c;

-	}

-

-	/**************************************

-	 */

-

-	TOK wysiwygStringConstant( Token *t, int tc )

-	{

-		uint c;

-	    Loc start = loc;

-

-	    p++;

-	    stringbuffer.offset = 0;

-	    while (1)

-	    {

-			c = *p++;

-			switch( c )

-			{

-			    case '\n':

-					loc.linnum++;

-					break;

-

-			    case '\r':

-					if( *p == '\n')

-					    continue;	// ignore

-					c = '\n';	// treat EndOfLine as \n character

-					loc.linnum++;

-					break;

-

-			    case 0:

-			    case 0x1a:

-					error("unterminated string constant starting at %s", start.toChars());

-					t.ustring = "";

-					t.postfix = 0;

-					return TOK.TOKstring;

-

-			    case '"':

-			    case '`':

-				if( c == tc)

-				{

-//				    t.len = stringbuffer.offset;

-				    stringbuffer.write(cast(byte)0);

-				    t.ustring = stringbuffer.toString;

-//				    t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-//				    memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-				    stringPostfix(t);

-				    return TOK.TOKstring;

-				}

-				break;

-

-			    default:

-				if( c & 0x80)

-				{

-					p--;

-				    uint u = decodeUTF();

-				    p++;

-				    if( u == PS || u == LS)

-						loc.linnum++;

-				    stringbuffer.write(u);

-				    continue;

-				}

-				break;

-			}

-			stringbuffer.write(c);

-	    }

-	}

-

-	/**************************************

-	 * Lex hex strings:

-	 *	x"0A ae 34FE BD"

-	 */

-

-	TOK hexStringConstant(Token *t)

-	{

-		uint c;

-	    Loc start = loc;

-	    uint n = 0;

-	    uint v;

-	

-	    p++;

-	    stringbuffer.offset = 0;

-	    while (1)

-	    {

-			c = *p++;

-			switch (c)

-			{

-			    case ' ':

-			    case '\t':

-			    case '\v':

-			    case '\f':

-					continue;			// skip white space

-

-			    case '\r':

-					if( *p == '\n')

-					    continue;			// ignore

-				// Treat isolated '\r' as if it were a '\n'

-			    case '\n':

-					loc.linnum++;

-					continue;

-

-			    case 0:

-			    case 0x1a:

-					error("unterminated string constant starting at %s", start.toChars());

-					t.ustring = "";

-					t.postfix = 0;

-					return TOK.TOKstring;

-

-			    case '"':

-					if( n & 1 )

-					{

-						error("odd number (%d) of hex characters in hex string", n);

-					    stringbuffer.write(v);

-					}

-//				t.len = stringbuffer.offset;

-//				stringbuffer.write(cast(byte)0);

-					t.ustring = stringbuffer.toString;

-//				t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-//				memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-					stringPostfix(t);

-					return TOK.TOKstring;

-

-			    default:

-					if( c >= '0' && c <= '9')

-					    c -= '0';

-					else if( c >= 'a' && c <= 'f')

-					    c -= 'a' - 10;

-					else if( c >= 'A' && c <= 'F')

-					    c -= 'A' - 10;

-					else if( c & 0x80)

-					{   

-						p--;

-					    uint u = decodeUTF();

-					    p++;

-					    if( u == PS || u == LS)

-							loc.linnum++;

-					    else

-							error("non-hex character \\u%x", u);

-					}

-					else

-					    error("non-hex character '%s'", c);

-					if( n & 1)

-					{

-						v = (v << 4) | c;

-					    stringbuffer.write(v);

-					}

-					else

-					    v = c;

-					n++;

-					break;

-			}

-	    }

-	}

-

-	/**************************************

-	 */

-

-	TOK escapeStringConstant(Token *t, int wide)

-	{

-		uint c;

-	    Loc start = loc;

-	    p++;

-	    stringbuffer.offset = 0;

-	//    debug writefln( "escape string constant: %s", std.string.toString( cast(char*)p ) );

-	    while( 1 )

-	    {

-			c = *p++;

-			switch( c )

-			{

-			    case '\\':

-					switch (*p)

-					{

-					    case 'u':

-					    case 'U':

-					    case '&':

-							c = escapeSequence();

-							stringbuffer.write(c);

-							continue;

-	

-					    default:

-							c = escapeSequence();

-							break;

-					}

-					break;

-

-			    case '\n':

-					loc.linnum++;

-					break;

-

-			    case '\r':

-					if( *p == '\n')

-					    continue;	// ignore

-					c = '\n';	// treat EndOfLine as \n character

-					loc.linnum++;

-					break;

-

-			    case '"':

-//			    	writefln( "end of string: ", stringbuffer.toString );

-					t.ustring = stringbuffer.toString().dup;

-	//				t.len = stringbuffer.offset;

-	//				stringbuffer.write(cast(byte)0);

-	//				t.ustring = (ubyte *)mem.malloc(stringbuffer.offset);

-	//				memcpy(t.ustring, stringbuffer.data, stringbuffer.offset);

-					stringPostfix(t);

-					

-					return TOK.TOKstring;

-

-			    case 0:

-			    case 0x1a:

-					p--;

-					error("unterminated string constant starting at %s", start.toChars());

-					t.ustring = "";

-//					t.len = 0;

-					t.postfix = 0;

-					return TOK.TOKstring;

-

-			    default:

-					if( c & 0x80 )

-					{

-					    p--;

-					    c = decodeUTF();

-					    if( c == LS || c == PS )

-					    {

-							c = '\n';

-							loc.linnum++;

-					    }

-					    p++;

-					    stringbuffer.write(cast(char)c);

-					    continue;

-					}

-					break;

-			}

-			stringbuffer.write(cast(char)c);

-//			writefln( stringbuffer.toString );

-	    }

-	}

-

-	//**************************************

-	TOK charConstant(Token *t, int wide)

-	{

-		uint c;

-	    TOK tk = TOK.TOKcharv;

-	    //printf("Lexer.charConstant\n");

-	    p++;

-	    c = *p++;

-	    switch( c )

-	    {

-			case '\\':

-			    switch (*p)

-			    {

-					case 'u':

-					    t.uns64value = escapeSequence();

-					    tk = TOK.TOKwcharv;

-					    break;

-

-					case 'U':

-					case '&':

-					    t.uns64value = escapeSequence();

-					    tk = TOK.TOKdcharv;

-					    break;

-

-					default:

-					    t.uns64value = escapeSequence();

-					    break;

-			    }

-			    break;

-

-			case '\n':

-			L1:

-			    loc.linnum++;

-			case '\r':

-			case 0:

-			case 0x1a:

-			case '\'':

-			    error("unterminated character constant");

-			    return tk;

-

-			default:

-			    if( c & 0x80)

-			    {

-					p--;

-					c = decodeUTF();

-					p++;

-					if( c == LS || c == PS )

-					    goto L1;

-					if( c < 0xd800 || (c >= 0xe000 && c < 0xfffe))

-					    tk = TOK.TOKwcharv;

-					else

-					    tk = TOK.TOKdcharv;

-			    }

-			    t.uns64value = c;

-			    break;

-	    }

-

-	    if( *p != '\'' )

-	    {

-			error("unterminated character constant");

-			return tk;

-	    }

-	    p++;

-	    return tk;

-	}

-

-	// Get postfix of string literal.

-	void stringPostfix(Token *t)

-	{

-	    switch( *p )

-	    {

-			case 'c':

-			case 'w':

-			case 'd':

-			    t.postfix = *p;

-			    p++;

-			    break;

-

-			default:

-			    t.postfix = 0;

-			    break;

-	    }

-	}

-

-	/***************************************

-	 * Read \u or \U unicode sequence

-	 * Input:

-	 *	u	'u' or 'U'

-	 */

-	/*

-	uint Wchar(uint u)

-	{

-	    uint value;

-	    uint n;

-	    ubyte c;

-	    uint nchars;

-	

-	    nchars = (u == 'U') ? 8 : 4;

-	    value = 0;

-	    for (n = 0; 1; n++)

-	    {

-			++p;

-			if( n == nchars)

-			    break;

-			c = *p;

-			if( !ishex(c))

-			{

-				error("\\%s sequence must be followed by %d hex characters", u, nchars);

-			    break;

-			}

-			if( isdigit(c))

-			    c -= '0';

-			else if( islower(c))

-			    c -= 'a' - 10;

-			else

-			    c -= 'A' - 10;

-			value <<= 4;

-			value |= c;

-	    }

-	    return value;

-	}

-	*/

-

-	/**************************************

-	 * Read in a number.

-	 * If it's an integer, store it in tok.TKutok.Vlong.

-	 *	integers can be decimal, octal or hex

-	 *	Handle the suffixes U, UL, LU, L, etc.

-	 * If it's double, store it in tok.TKutok.Vdouble.

-	 * Returns:

-	 *	TKnum

-	 *	TKdouble,...

-	 */

-

-	TOK number(Token *t)

-	{

-	    //debug writefln("Lexer.number()");

-	    // We use a state machine to collect numbers

-	    enum STATE

-		{

-			STATE_initial,

-			STATE_0,

-			STATE_decimal,

-			STATE_octal,

-			STATE_octale,

-			STATE_hex,

-			STATE_binary,

-			STATE_hex0,

-			STATE_binary0,

-			STATE_hexh,

-			STATE_error

-		}

-

-	    enum FLAGS

-	    {

-			FLAGS_decimal  = 1,		// decimal

-			FLAGS_unsigned = 2,		// u or U suffix

-			FLAGS_long     = 4,		// l or L suffix

-	    }

-	    FLAGS flags = FLAGS.FLAGS_decimal;

-

-	    int i;

-	    TOK result;

-	    int base;

-	    stringbuffer.offset = 0;

-//		stringbuffer.data = null;

-	    STATE state = STATE.STATE_initial;

-	    ubyte* start = p;

-

-		TOK _isreal()

-		{

-			p = start;

-			return inreal(t);

-		}

-

-	    while( true )

-	    {

-			char c = cast(char)*p;

-			switch( state )

-			{

-			    case STATE.STATE_initial:		// opening state

-					if( c == '0' )

-					    state = STATE.STATE_0;

-					else

-					    state = STATE.STATE_decimal;

-					break;

-

-			    case STATE.STATE_0:

-					flags = cast(FLAGS) (flags & ~FLAGS.FLAGS_decimal);

-					switch (c)

-					{

-	//	#if ZEROH

-//					    case 'H':			// 0h

-//					    case 'h':

-//							goto hexh;

-	//	#endif

-					    case 'X':

-					    case 'x':

-							state = STATE.STATE_hex0;

-							break;

-

-					    case '.':

-							if( p[1] == '.')	// .. is a separate token

-							    goto done;

-					    case 'i':

-					    case 'f':

-					    case 'F':

-							goto _Real;

-	//	#if ZEROH

-//					    case 'E':

-//					    case 'e':

-//							goto case_hex;

-	//	#endif

-					    case 'B':

-					    case 'b':

-							state = STATE.STATE_binary0;

-							break;

-

-					    case '0': case '1': case '2': case '3':

-					    case '4': case '5': case '6': case '7':

-							state = STATE.STATE_octal;

-							break;

-

-	//	#if ZEROH

-//					    case '8': case '9': case 'A':

-//					    case 'C': case 'D': case 'F':

-//					    case 'a': case 'c': case 'd': case 'f':

-//						    case_hex:

-//							state = STATE.STATE_hexh;

-//							break;

-	//	#endif

-					    case '_':

-							state = STATE.STATE_octal;

-							p++;

-							continue;

-

-					    default:

-							goto done;

-					}

-					break;

-

-			    case STATE.STATE_decimal:		// reading decimal number

-

-					// if its not a digit - decimal complete or not a decimal

-					if( !isdigit( c ) )

-					{

-//						debug writefln( "\tnon-digit( %s )", c );

-		//	#if ZEROH

-//					    if( ishex(c) || c == 'H' || c == 'h' )

-//							goto hexh;

-		//	#endif

-						//! wtf ?

-						// ignore embedded _

-					    if( c == '_' )

-					    {

-							p++;

-							continue;

-					    }

-

-					    // check decimal point - make real

-					    if( c == '.' && p[1] != '.' )

-							goto _Real;

-

-						// check for mantra - make real

-					    if( c == 'i' || c == 'f' || c == 'F' || c == 'e' || c == 'E' )

-					    {

-					    _Real:	// It's a real number. Back up and rescan as a real

-							p = start;

-							return inreal(t);

-					    }

-

-					    goto done;

-					}

-					break;

-

-			    case STATE.STATE_hex0:		// reading hex number

-			    case STATE.STATE_hex:

-					if( !ishex(c) )

-					{

-					    if( c == '_')		// ignore embedded _

-					    {

-							p++;

-							continue;

-					    }

-					    if( c == '.' && p[1] != '.' )

-							goto _Real;

-					    if( c == 'P' || c == 'p' || c == 'i' )

-							goto _Real;

-					    if( state == STATE.STATE_hex0 )

-							error("Hex digit expected, not '%s'", c);

-					    goto done;

-					}

-					state = STATE.STATE_hex;

-					break;

-	

-		//	#if ZEROH

-//				    hexh:

-//						state = STATE.STATE_hexh;

-//

-//				    case STATE.STATE_hexh:		// parse numbers like 0FFh

-//						if( !ishex(c))

-//						{

-//						    if( c == 'H' || c == 'h')

-//						    {

-//								p++;

-//								base = 16;

-//								goto done;

-//						    }

-//						    else

-//						    {

-//								// Check for something like 1E3 or 0E24

-//								if( memchr(stringbuffer.data.ptr, 'E', stringbuffer.offset) || memchr( stringbuffer.data.ptr, 'e', stringbuffer.offset))

-//								    goto _Real;

-//								error("Hex digit expected, not '%s'", c);

-//								goto done;

-//						    }

-//						}

-//						break;

-	//		#endif

-

-				    case STATE.STATE_octal:			// reading octal number

-				    case STATE.STATE_octale:		// reading octal number with non-octal digits

-						if( !isoctal(c) )

-						{

-//				#if ZEROH

-//						    if( ishex(c) || c == 'H' || c == 'h' )

-//								goto hexh;

-//				#endif

-						    if( c == '_' )		// ignore embedded _

-						    {

-								p++;

-								continue;

-						    }

-						    if( c == '.' && p[1] != '.' )

-								goto _Real;

-						    if( c == 'i' )

-								goto _Real;

-						    if( isdigit(c) )

-								state = STATE.STATE_octale;

-						    else

-								goto done;

-						}

-						break;

-

-				    case STATE.STATE_binary0:		// starting binary number

-				    case STATE.STATE_binary:		// reading binary number

-						if( c != '0' && c != '1')

-						{

-	//			#if ZEROH

-//						    if( ishex(c) || c == 'H' || c == 'h' )

-//								goto hexh;

-	//			#endif

-						    if( c == '_' )		// ignore embedded _

-						    {

-								p++;

-								continue;

-						    }

-						    if( state == STATE.STATE_binary0 )

-						    {

-								error("binary digit expected");

-								state = STATE.STATE_error;

-								break;

-						    }

-						    else

-								goto done;

-						}

-						state = STATE.STATE_binary;

-						break;

-

-				    case STATE.STATE_error:		// for error recovery

-						if( !isdigit(c) )	// scan until non-digit

-						    goto done;

-						break;

-

-				    default:

-						assert(0);

-				}

-				stringbuffer.write(cast(char)c);

-				p++;

-		    }

-	done:

-	    stringbuffer.write( cast(char)0 );		// terminate string

-

-//		debug writefln( "\tdigit complete( %s )", stringbuffer.toString );

-

-	    if( state == STATE.STATE_octale )

-			error("Octal digit expected");

-

-		uinteger_t n;			// unsigned >=64 bit integer type

-

-	    if( stringbuffer.offset == 2 && ( state == STATE.STATE_decimal || state == STATE.STATE_0 ) )

-			n = stringbuffer.data[0] - '0';

-	    else

-	    {

-		// Convert string to integer

-			char* p = cast(char*)stringbuffer.data.ptr;

-			int r = 10;

-			int d;

-			if( *p == '0' )

-			{

-			    if( p[1] == 'x' || p[1] == 'X')

-				{ 

-					// "0x#"

-					p += 2; 

-					r = 16; 

-				}

-			    else if( p[1] == 'b' || p[1] == 'B')

-				{ 

-					// "0b#" - binary

-					p += 2; 

-					r = 2; 

-				}

-			    else if( isdigit(p[1]))

-				{ 

-					p += 1; 

-					r = 8; 

-				}

-			}

-

-			n = 0;

-

-			while( true )

-			{

-			    if( *p >= '0' && *p <= '9' )

-					d = *p - '0';

-			    else if( *p >= 'a' && *p <= 'z' )

-					d = *p - 'a' + 10;

-			    else if( *p >= 'A' && *p <= 'Z' )

-					d = *p - 'A' + 10;

-			    else

-					break;

-

-				if( d >= r )

-					break;

-			    

-				if( n * r + d < n)

-			    {

-					error( "integer overflow" );

-					break;

-			    }

-

-			    n = n * r + d;

-			    p++;

-			}

-

-			// if n needs more than 64 bits

-			if( n.sizeof > 8 && n > 0xffffffffffffffffL )

-			    error("integer overflow");

-	    }

-

-	    // Parse trailing 'u', 'U', 'l' or 'L' in any combination

-	    while( true )

-	    {

-			ubyte f;

-			switch( *p )

-			{

-				case 'U':

-			    case 'u':

-					f = FLAGS.FLAGS_unsigned;

-					goto L1;

-			    case 'L':

-			    case 'l':

-					f = FLAGS.FLAGS_long;

-			    L1:

-					p++;

-					if( flags & f )

-					    error("unrecognized token");

-					flags = cast(FLAGS) (flags | f);

-					continue;

-			    default:

-					break;

-			}

-			break;

-	    }

-

-	    switch ( flags )

-	    {

-			case 0:

-				/* Octal or Hexadecimal constant.

-				 * First that fits: int, uint, long, ulong

-				 */

-			    if( n & 0x8000000000000000L )

-				    result = TOK.TOKuns64v;

-			    else if( n & 0xffffffff00000000L )

-				    result = TOK.TOKint64v;

-			    else if( n & 0x80000000 )

-				    result = TOK.TOKuns32v;

-			    else

-				    result = TOK.TOKint32v;

-			    break;

-

-			case FLAGS.FLAGS_decimal:

-				/* First that fits: int, long, long long

-				 */

-			    if( n & 0x8000000000000000L )

-			    {

-					error("signed integer overflow");

-				    result = TOK.TOKuns64v;

-			    }

-			    else if( n & 0xffffffff80000000L )

-				    result = TOK.TOKint64v;

-			    else

-				    result = TOK.TOKint32v;

-			    break;

-

-			case FLAGS.FLAGS_unsigned:

-			case FLAGS.FLAGS_decimal | FLAGS.FLAGS_unsigned:

-				/* First that fits: uint, ulong

-				 */

-			    if( n & 0xffffffff00000000L )

-				    result = TOK.TOKuns64v;

-			    else

-				    result = TOK.TOKuns32v;

-			    break;

-

-			case FLAGS.FLAGS_decimal | FLAGS.FLAGS_long:

-			    if( n & 0x8000000000000000L )

-			    {

-					error("signed integer overflow");

-				    result = TOK.TOKuns64v;

-			    }

-			    else

-				    result = TOK.TOKint64v;

-			    break;

-

-			case FLAGS.FLAGS_long:

-			    if( n & 0x8000000000000000L )

-				    result = TOK.TOKuns64v;

-			    else

-				    result = TOK.TOKint64v;

-			    break;

-

-			case FLAGS.FLAGS_unsigned | FLAGS.FLAGS_long:

-			case FLAGS.FLAGS_decimal | FLAGS.FLAGS_unsigned | FLAGS.FLAGS_long:

-			    result = TOK.TOKuns64v;

-			    break;

-

-			default:

-				debug writefln("%x",flags);

-			    assert(0);

-	    }

-	    t.uns64value = n;

-	    return result;

-	}

-	

-	/**************************************

-	 * Read in characters, converting them to real.

-	 * Bugs:

-	 *	Exponent overflow not detected.

-	 *	Too much requested precision is not detected.

-	 */

-	

-	TOK inreal(Token *t)

-	{

-		int dblstate;

-	    uint c;

-	    char hex;			// is this a hexadecimal-floating-constant?

-	    TOK result;

-

-	    //printf("Lexer.inreal()\n");

-	    stringbuffer.offset = 0;

-	    dblstate = 0;

-	    hex = 0;

-	Lnext:

-	    while (1)

-	    {

-		// Get next char from input

-		c = *p++;

-		//printf("dblstate = %d, c = '%s'\n", dblstate, c);

-		while (1)

-		{

-		    switch (dblstate)

-		    {

-				case 0:			// opening state

-				    if( c == '0')

-						dblstate = 9;

-				    else if( c == '.')

-						dblstate = 3;

-				    else

-						dblstate = 1;

-				    break;

-	

-				case 9:

-				    dblstate = 1;

-				    if( c == 'X' || c == 'x')

-				    {

-						hex++;

-						break;

-				    }

-				case 1:			// digits to left of .

-				case 3:			// digits to right of .

-				case 7:			// continuing exponent digits

-				    if( !isdigit(c) && !(hex && isxdigit(c)))

-				    {

-						if( c == '_')

-						    goto Lnext;	// ignore embedded '_'

-						dblstate++;

-						continue;

-				    }

-				    break;

-

-				case 2:			// no more digits to left of .

-				    if( c == '.')

-				    {

-						dblstate++;

-						break;

-				    }

-				case 4:			// no more digits to right of .

-				    if( (c == 'E' || c == 'e') || hex && (c == 'P' || c == 'p'))

-				    {

-						dblstate = 5;

-						hex = 0;	// exponent is always decimal

-						break;

-				    }

-				    if( hex)

-						error("binary-exponent-part required");

-				    goto done;

-

-				case 5:			// looking immediately to right of E

-				    dblstate++;

-				    if( c == '-' || c == '+')

-					break;

-				case 6:			// 1st exponent digit expected

-				    if( !isdigit(c))

-					error("exponent expected");

-				    dblstate++;

-				    break;

-

-				case 8:			// past end of exponent digits

-				    goto done;

-		    }

-		    break;

-		}

-		stringbuffer.write(c);

-	    }

-	done:

-	    p--;

-

-	    stringbuffer.write(cast(byte)0);

-

-//	#if _WIN32 && __DMC__

-	    char *save = __locale_decpoint;

-	    __locale_decpoint = ".";

-//	#endif

-	    t.float80value = strtold(cast(char *)stringbuffer.data.ptr, null);

-	    errno = 0;

-	    switch( *p )

-	    {

-			case 'F':

-			case 'f':

-			    strtof(cast(char *)stringbuffer.data.ptr, null);

-			    result = TOK.TOKfloat32v;

-			    p++;

-			    break;

-

-			default:

-			    strtod(cast(char *)stringbuffer.data.ptr, null);

-			    result = TOK.TOKfloat64v;

-			    break;

-

-			case 'L':

-			case 'l':

-			    result = TOK.TOKfloat80v;

-			    p++;

-			    break;

-	    }

-	    if( *p == 'i' || *p == 'I')

-	    {

-			p++;

-			switch( result )

-			{

-			    case TOK.TOKfloat32v:

-					result = TOK.TOKimaginary32v;

-					break;

-			    case TOK.TOKfloat64v:

-					result = TOK.TOKimaginary64v;

-					break;

-			    case TOK.TOKfloat80v:

-					result = TOK.TOKimaginary80v;

-					break;

-			}

-	    }

-//	#if _WIN32 && __DMC__

-	    __locale_decpoint = save;

-//	#endif

-	    if( errno == ERANGE)

-			error("number is not representable");

-	    return result;

-	}

-

-

-

-

-	/*********************************************

-	 * Do pragma.

-	 * Currently, the only pragma supported is:

-	 *	#line linnum [filespec]

-	 */

-

-	void Pragma()

-	{

-	    Token tok;

-	    int linnum;

-	    char[] filespec;

-	    Loc loc = this.loc;

-

-	    scan(&tok);

-

-	    if( tok.value != TOK.TOKidentifier || tok.identifier != Id.line )

-			goto Lerr;

-

-	    scan(&tok);

-	    if( tok.value == TOK.TOKint32v || tok.value == TOK.TOKint64v )

-			linnum = tok.uns64value - 1;

-	    else

-			goto Lerr;

-

-	    while (1)

-	    {

-			switch (*p)

-			{

-			    case 0:

-			    case 0x1a:

-			    case '\n':

-				    Lnewline:

-					this.loc.linnum = linnum;

-					if( filespec.length )

-					    this.loc.filename = filespec;

-					return;

-

-			    case '\r':

-					p++;

-					if( *p != '\n')

-					{   p--;

-					    goto Lnewline;

-					}

-					continue;

-

-			    case ' ':

-			    case '\t':

-			    case '\v':

-			    case '\f':

-					p++;

-					continue;			// skip white space

-

-			    case '_':

-					if( mod && memcmp(p, cast(char*)"__FILE__", 8) == 0)

-					{

-					    p += 8;

-//!					    filespec = mem.strdup(loc.filename ? loc.filename : mod.identifier.toChars());

-					}

-					continue;

-

-			    case '"':

-					if( filespec )

-					    goto Lerr;

-					stringbuffer.offset = 0;

-					p++;

-					while (1)

-					{

-						uint c;

-					    c = *p;

-					    switch (c)

-					    {

-							case '\n':

-							case '\r':

-							case 0:

-							case 0x1a:

-							    goto Lerr;

-	

-							case '"':

-							    stringbuffer.write(cast(byte)0);

-	//						    filespec = mem.strdup((char *)stringbuffer.data);

-							    filespec = stringbuffer.toString.dup;

-							    p++;

-							    break;

-	

-							default:

-							    if( c & 0x80 )

-							    {

-									uint u = decodeUTF();

-									if( u == PS || u == LS )

-									    goto Lerr;

-							    }

-							    stringbuffer.write(c);

-							    p++;

-							    continue;

-						    }

-						    break;

-					}

-					continue;

-

-			    default:

-					if( *p & 0x80 )

-					{   

-						uint u = decodeUTF();

-					    if( u == PS || u == LS)

-						goto Lnewline;

-					}

-					goto Lerr;

-			}

-	    }

-

-	Lerr:

-	    errorLoc(loc, "#line integer [\"filespec\"]\\n expected");

-	}

-

-

-

-	/***************************************************

-	 * Parse doc comment embedded between t.ptr and p.

-	 * Remove trailing blanks and tabs from lines.

-	 * Replace all newlines with \n.

-	 * Remove leading comment character from each line.

-	 * Decide if it's a lineComment or a blockComment.

-	 * Append to previous one for this token.

-	 */

-

-	void getDocComment( Token *t, uint lineComment )

-	{

-	    auto OutBuffer buf = new OutBuffer;

-	    ubyte ct = t.ptr[2];

- 	    ubyte *q = t.ptr + 3;	// start of comment text

-	    int linestart = 0;

-

-	    ubyte *qend = p;

-

-	    if( ct == '*' || ct == '+')

-			qend -= 2;

-

-	    // Scan over initial row of ****'s or ++++'s or ////'s

-	    for (; q < qend; q++)

-	    {

-			if( *q != ct)

-			    break;

-	    }

-

-	    // Remove trailing row of ****'s or ++++'s

-	    if( ct != '/')

-	    {

-			for (; q < qend; qend--)

-			{

-				if( qend[-1] != ct)

-					break;

-			}

-	    }

-

-	    for (; q < qend; q++)

-	    {

-			ubyte c = *q;

-

-			switch (c)

-			{

-				case '*':

-				case '+':

-				if( linestart && c == ct)

-				{   linestart = 0;

-					// Trim preceding whitespace up to preceding \n

-					while (buf.offset && (buf.data[buf.offset - 1] == ' ' || buf.data[buf.offset - 1] == '\t'))

-					buf.offset--;

-					continue;

-				}

-				break;

-		

-				case ' ':

-				case '\t':

-				break;

-

-				case '\r':

-				if( q[1] == '\n')

-					continue;		// skip the \r

-				goto Lnewline;

-		

-				default:

-				if( c == 226)

-				{

-					// If LS or PS

-					if( q[1] == 128 &&

-					(q[2] == 168 || q[2] == 169))

-					{

-					q += 2;

-					goto Lnewline;

-					}

-				}

-				linestart = 0;

-				break;

-

-				Lnewline:

-				c = '\n';		// replace all newlines with \n

-				case '\n':

-				linestart = 1;

-		

-				// Trim trailing whitespace

-				while (buf.offset && (buf.data[buf.offset - 1] == ' ' || buf.data[buf.offset - 1] == '\t'))

-					buf.offset--;

-		

-				break;

-			}

-			buf.write(c);

-	    }

-	

-	    // Always end with a newline

-	    if( !buf.offset || buf.data[buf.offset - 1] != '\n' )

-			buf.writenl();

-	

-	    //buf.write(cast(char)0);

-	

-	    // It's a line comment if the start of the doc comment comes

-	    // after other non-whitespace on the same line.

-//	    ubyte** dc = (lineComment && anyToken)

-//				 ? &t.lineComment

-//				 : &t.blockComment;

-	

-	    char[] dc = (lineComment && anyToken) ? t.lineComment : t.blockComment;

-

-	    // Combine with previous doc comment, if any

-	    if( dc.length )

-			dc = combineComments( dc, buf.toString().dup );

-	    else

-			dc = buf.toString().dup;

-		

-//		writefln( dc );

-

-	    if( lineComment && anyToken )

-			t.lineComment = dc;

-		else

-			t.blockComment = dc;

-

-	}

-

-}

-

-// character maps

-static ubyte[256] cmtable;

-

-const int CMoctal 	= 0x1;

-const int CMhex 	= 0x2;

-const int CMidchar 	= 0x4;

-

-ubyte isoctal (ubyte c) { return cmtable[c] & CMoctal; }

-ubyte ishex   (ubyte c) { return cmtable[c] & CMhex; }

-ubyte isidchar(ubyte c) { return cmtable[c] & CMidchar; }

-

-static void cmtable_init()

-{

-    for( uint c = 0; c < cmtable.length; c++ )

-    {

-		if( '0' <= c && c <= '7' )

-		    cmtable[c] |= CMoctal;

-		if( isdigit(c) || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F') )

-		    cmtable[c] |= CMhex;

-		if( isalnum(c) || c == '_' )

-		    cmtable[c] |= CMidchar;

-    }

-}

-

-

-/+

-struct StringValue

-{

-    union

-    {

-		int intvalue;

-		void *ptrvalue;

-		dchar *string;

-    }

-

-    char[] lstring;

-}

-#define CASE_BASIC_TYPES			

-	case TOKwchar: case TOKdchar:		

-	case TOKbit: case TOKbool: case TOKchar:		

-	case TOKint8: case TOKuns8:		

-	case TOKint16: case TOKuns16:		

-	case TOKint32: case TOKuns32:		

-	case TOKint64: case TOKuns64:		

-	case TOKfloat32: case TOKfloat64: case TOKfloat80:		

-	case TOKimaginary32: case TOKimaginary64: case TOKimaginary80:	

-	case TOKcomplex32: case TOKcomplex64: case TOKcomplex80:	

-	case TOKvoid:

-

-#define CASE_BASIC_TYPES_X(t)					\

-	case TOKvoid:	 t = Type::tvoid;  goto LabelX;		\

-	case TOKint8:	 t = Type::tint8;  goto LabelX;		\

-	case TOKuns8:	 t = Type::tuns8;  goto LabelX;		\

-	case TOKint16:	 t = Type::tint16; goto LabelX;		\

-	case TOKuns16:	 t = Type::tuns16; goto LabelX;		\

-	case TOKint32:	 t = Type::tint32; goto LabelX;		\

-	case TOKuns32:	 t = Type::tuns32; goto LabelX;		\

-	case TOKint64:	 t = Type::tint64; goto LabelX;		\

-	case TOKuns64:	 t = Type::tuns64; goto LabelX;		\

-	case TOKfloat32: t = Type::tfloat32; goto LabelX;	\

-	case TOKfloat64: t = Type::tfloat64; goto LabelX;	\

-	case TOKfloat80: t = Type::tfloat80; goto LabelX;	\

-	case TOKimaginary32: t = Type::timaginary32; goto LabelX;	\

-	case TOKimaginary64: t = Type::timaginary64; goto LabelX;	\

-	case TOKimaginary80: t = Type::timaginary80; goto LabelX;	\

-	case TOKcomplex32: t = Type::tcomplex32; goto LabelX;	\

-	case TOKcomplex64: t = Type::tcomplex64; goto LabelX;	\

-	case TOKcomplex80: t = Type::tcomplex80; goto LabelX;	\

-	case TOKbit:	 t = Type::tbit;     goto LabelX;	\

-	case TOKchar:	 t = Type::tchar;    goto LabelX;	\

-	case TOKwchar:	 t = Type::twchar; goto LabelX;	\

-	case TOKdchar:	 t = Type::tdchar; goto LabelX;	\

-	LabelX

-+/

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/bug-indent.d
deleted file mode 100644
index 321ab6f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/bug-indent.d
+++ /dev/null
@@ -1,34 +0,0 @@
-class TemplatedClass(T) {}
-class TemplatedClass2(T,U) {}
-
-class Axxxxxxxxxxxxxxxx {
-alias A = int*;
-void f(){
-}
-}
-
-class C
-{
- //--------------| <= (1) - non first col comment -> indent
-Axxxxxxxxxxxxxxxx.A createAssignment()
-{
-	return(null);
-}
-void func2(Axxxxxxxxxxxxxxxx[] container){
-	foreach (v; container) {
-		v.f();
-	}
-}
-
- //                  | <= (2)
-void func3(TemplatedClass!int aValue)
-{
-}
-
-void func4(TemplatedClass2!(int, int) b){
-}
-}
-
-int main(){
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/casts.d
deleted file mode 100644
index 42d54916..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/casts.d
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo(int a)
-{
-   char ch;
-
-   ch = cast(char) a;
-   ch = cast(char) 45;
-   ch = (char) a; // not a d cast
-   ch = (int)45;
-   ch = cast(foo)*bar;
-   ch = cast(foo)-bar;
-   ch = cast(foo)+45;
-   ch = cast(foo)&45;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/const.d
deleted file mode 100644
index 778957fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/const.d
+++ /dev/null
@@ -1,9 +0,0 @@
-// hello
-A b() {
-    return null;
-}
-
-const(C) d() {
-    return null;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/d_sp_paren.d
deleted file mode 100644
index 2b28a7f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/d_sp_paren.d
+++ /dev/null
@@ -1,23 +0,0 @@
-version(unittest) {
-import foo;
-}
-
-void main() {
-scope(exit) {
-foo();
-}
-
-scope(success) suckit();
-
-scope f = new Foo();
-if(foo)
-{
-}
-
-try {
-throw(e);
-}
-catch(Exception e) {
-}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/delegate.d
deleted file mode 100644
index 0115ae00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/delegate.d
+++ /dev/null
@@ -1,20 +0,0 @@
-module er;
-
-void delegate(ubyte[] a) TSender;
-bool delegate(ushort a) TVerifier;
-typedef ushort          TAddr;
-
-public void delegate(ubyte[] a) TSender;
-public                       bool delegate(ushort a) TVerifier;
-public typedef ushort   TAddr;
-
-void delegate() dg;
-    dg = { int y; };
-
-    int opApply(int delegate(inout Type [, ...]) dg);
-
-void main()
-{
-   assert( findIf( "bcecg", ( int x ) { return x == 'a'; } ) == 5 );
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/enum.d
deleted file mode 100644
index 804ef27c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/enum.d
+++ /dev/null
@@ -1,6 +0,0 @@
-/* sized enum like in C# */
-enum Metrics : int {
-SM_CXSCREEN = 0,
-SM_CYSCREEN,
-SM_CXVSCROLL,
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/extern_.d
deleted file mode 100644
index a583b08e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/extern_.d
+++ /dev/null
@@ -1,6 +0,0 @@
-extern(D): void func();
-
-void x()
-{
-    int xx;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/funcfunc.d
deleted file mode 100644
index ee717abc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/funcfunc.d
+++ /dev/null
@@ -1,5 +0,0 @@
-int main()
-{
-   mWriter( "class Clst_"c )( cluster.getChild( HO_SHORT_NAME ).getText() )( " : Cluster {"c ).newline;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/imports.d
deleted file mode 100644
index 758fefb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/imports.d
+++ /dev/null
@@ -1,8 +0,0 @@
-
-private import mango.cache.Payload;
-
-private import mango.io.Exception,
-    mango.io.PickleRegistry;
-
-public  import mango.cluster.model.ICluster;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/invariant.d
deleted file mode 100644
index 46a8efdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/invariant.d
+++ /dev/null
@@ -1 +0,0 @@
-invariant (C) c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/numbers.d
deleted file mode 100644
index e51bf8ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/numbers.d
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/* This file goes over all the various number formats for D */
-
-int foo(int bar)
-{
-   int a;
-
-   /*
-    *  Interger Literals
-    */
-
-   /* Suffixes */
-   a = 0L + 123U + 345u + 456Lu + 567LU + 678UL + 789_uL;
-
-   /* Decimal */
-   a = 0 + 123456 + 123_456 + 1_2_3_4_5_6;
-
-   /* Binary */
-   a = 0b1010101 + 0B1001;
-
-   /* Octal */
-   a = 01234567_ + 07_6_5_2;
-
-   /* Hexadecimal */
-   a = 0x1234567890abcdefABCDEF_ + 0X7_6_5_2;
-
-   float  b;
-   real   c;
-   ifloat d;
-   ireal  e;
-
-   /* Floats: float [FloatSuffix] [ImaginarySuffix] */
-
-   /* HexFloat */
-   b = 0xabc.defp-1024 + 0x.defP-64 + 0x123p+32 + 0x123P+16  + 0x123p1024;
-   d = 0x123p45 + 0x234.fi + 0. + .3f;
-   e = 3 + 5i;
-   e = 3.4 + 5.6i;
-}
-
-/* test '..' ranges */
-void main() {
- char[] c = "kkkkkkkkkkkkkkkkkkkkk";
- writefln("%s", c[2..3]);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/sort_import.d
deleted file mode 100644
index d929f8e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/sort_import.d
+++ /dev/null
@@ -1,19 +0,0 @@
-// should be ddd, eee, fff
-import ddd;
-import fff;
-import eee;
-
-// should be aaa, ccc
-import ccc;
-import aaa;
-// should be just bbb
-import bbb;
-
-// should not change these, as it can't handle multi-line imports
-private import mango.ccc;
-private import mango.bbb,
-               mango.aaa;
-
-void foo();
-
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/square_indent_tab.d
deleted file mode 100644
index 1dee3a17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/square_indent_tab.d
+++ /dev/null
@@ -1,24 +0,0 @@
-auto getOperatorsMap() {
-	return [
-		"/"		: TokenType.Slash,
-		"/="	: TokenType.SlashAssign,
-		"."		: TokenType.Dot,
-		".."	: TokenType.DoubleDot,
-		"..."	: TokenType.TripleDot,
-		"&"		: TokenType.Ampersand,
-		"&="	: TokenType.AmpersandAssign,
-		"&&"	: TokenType.DoubleAmpersand,
-		"|"		: TokenType.Pipe,
-		"|="	: TokenType.PipeAssign,
-		"||"	: TokenType.DoublePipe,
-		"-"		: TokenType.Minus,
-		"-="	: TokenType.MinusAssign,
-		"--"	: TokenType.DoubleMinus,
-		"+"		: TokenType.Plus,
-		"+="	: TokenType.PlusAssign,
-		"++"	: TokenType.DoublePlus,
-		"<"		: TokenType.Less,
-		"<="	: TokenType.LessAssign,
-		"<<"	: TokenType.DoubleLess
-	];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if.d
deleted file mode 100644
index 24e6eaba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if.d
+++ /dev/null
@@ -1,14 +0,0 @@
-ClLinearExpression opBinary(string op) (double constant)
-    {
-        static if (op == "+")
-            return new ClLinearExpression(this, 1, constant);
-        else
-            static if (op == "-")
-                return new ClLinearExpression(this, 1, -constant);
-            else
-                static if (op == "*")
-                    return new ClLinearExpression(this, constant, 0);
-                else
-                    static if (op == "/")
-                        return new ClLinearExpression(this, 1.0 / constant, 0);
-    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if_in_struct.d
deleted file mode 100644
index be936335..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if_in_struct.d
+++ /dev/null
@@ -1,5 +0,0 @@
-struct Widget {

-	static if (true)

-		void fun() {

-		}

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/strings.d
deleted file mode 100644
index a62adec3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/strings.d
+++ /dev/null
@@ -1,32 +0,0 @@
-
-/* This file goes over all the various string formats for D */
-
-int foo(int bar)
-{
-   char [] a;
-   char b;
-
-   a = r"WYSIWYG";
-   a = `WYSIWYG`;
-   b = 'c';
-   a = x"12 34 5678 90";
-   a = "This\nis a \"test\"";
-   a = \' ~ \" ~ \? ~ \\ ~ \a ~ \b ~ \f ~ \n ~ \r ~ \t ~ \v;
-   a = \x1B ~ \0 ~ \74 ~ \123;
-   a = \u1234 ~ \U12345678;
-   a = \&amp; ~ 'a';
-   a = "Another" " " "Test";
-
-   /+ test back to back EscapeSequences +/
-   a = \r\n\xff\&amp;\u1234;
-
-   a = "char"c;
-   a = "wchar"w;
-   a = "dchar"d;
-
-   /*
-    * multi line string
-    */
-   a = r"Line 1
-         line 2";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template.d
deleted file mode 100644
index ba03e617..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template.d
+++ /dev/null
@@ -1,28 +0,0 @@
-
-template Foo(T, U)
-{
-class Bar { }
-
-T foo(T t, U u) { }
-
-T abc;
-
-typedef T*  FooType;
-typedef Tte**  FooType0;
-typedef int* FooType1;
-typedef const char FooType2;
-}
-
-alias Foo!(int, char) f;
-f.Bar b;
-f.foo(1,2);
-f.abc = 3;
-
-   to!string(10.0);
-   TFoo!int.t x;
-
-class Abc(T)
-{
-   T t;
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing000.d
deleted file mode 100644
index 627ca266..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing000.d
+++ /dev/null
@@ -1,12 +0,0 @@
-void fun() {

-	if (something(a1, a2))

-		return;

-	if (something!a1)

-		return;

-	if (something!(a1, a2) )

-		return;

-	if (something!(a1, a2).Ptr)

-		return;

-	if (something!a1.Ptr)

-		return;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing001.d
deleted file mode 100644
index 745e5b36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing001.d
+++ /dev/null
@@ -1,9 +0,0 @@
-void func0(TemplatedClass2!(int, int)   b){

-}

-

-void func1(TemplatedClass2!(int, int)b){

-}

-

-

-void func2(TemplatedClass!int   b){

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_use.d
deleted file mode 100644
index 94cdbf6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_use.d
+++ /dev/null
@@ -1,2 +0,0 @@
-auto x = a!"23" + a!`23` + a!`2
-3` + a!23 + a!23.23;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst01.d
deleted file mode 100644
index 3a3728f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst01.d
+++ /dev/null
@@ -1,23 +0,0 @@
-package void writeRegister(int aRegisterOffset, ushort aValue)
-in {
-    assert(aRegisterOffset >= 0);
-    assert(aRegisterOffset < IMAGE_SIZE);
-} body {
-int  idx = aRegisterOffset / 2;
-         mMemCache[idx] = aValue;
-         uint readback;
-         uint st;
-         uint st2;
-         volatile {
-             mMemImage[idx] = aValue;
-             //readback = (cast(uint*)mMemImage.ptr)[ idx/2 ];
-             //st = mMemImage[ 0x28/2 ];
-             //st2 = mMemImage[ 0x2A/2 ];
-         }
-         //if( aValue != readback )
-         {
-             //debug(IRQ) writefln( "writeRegister %04x, %04x", aRegisterOffset, aValue);
-         }
-         // comment
-}
-//
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst02.d
deleted file mode 100644
index 0b428d60..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst02.d
+++ /dev/null
@@ -1,30 +0,0 @@
-        package static ushort calcHeaderCrc(bool aStartupFrame, bool aSyncFrame, ushort aFrameId, ushort aPayloadWords) {
-            uint crcData = aPayloadWords;
-
-            crcData |= (aFrameId << 7);
-
-            if (aSyncFrame) {
-                crcData |= BIT_19;
-            }
-
-            if (aStartupFrame) {
-                crcData |= BIT_18;
-            }
-
-            ushort       crc       = 0x1a;
-            const ushort table[16] = [
-                                         0x0000, 0x0385, 0x070A, 0x048F,
-                                         0x0591, 0x0614, 0x029B, 0x011E,
-                                         0x00A7, 0x0322, 0x07AD, 0x0428,
-                                         0x0536, 0x06B3, 0x023C, 0x01B9];
-
-            for (int i = 0; i < 5; ++i) {
-                if (i != 0) {
-                    crcData <<= 4;
-                }
-                crc = ((crc << 4) & 0x7FF) ^ table[((crc >> 7) ^ (crcData >> 16)) & 0x0F];
-            }
-
-            return(crc);
-        }
- 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst03.d
deleted file mode 100644
index 611f12f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst03.d
+++ /dev/null
@@ -1,145 +0,0 @@
-import std.stdio;
-
-void foo()
-{
-float f = x % y;
-double d = x % y;
-real r = x % y;
-result = (x < y);        // false if x or y is nan
-assert(e == 0);
-int array[17];
-array[] = value;
-int array[17];
-for (i = 0; i < array.length; i++)
-   func(array[i]);
-int array[17];
-foreach (int value; array)
-   func(value);
-int[] array;
-
-array.length = array.length + 1;
-array[array.length - 1] = x;
-char[] s1;
-char[] s2;
-char[] s;
-
-s = s1 ~ s2;
-s ~= "hello";
-
-
-writefln("Calling all cars %s times!", ntimes);
-Louter:
-   for (i = 0; i < 10; i++)
-   {
-       for (j = 0; j < 10; j++)
-       {
-	   if (j == 3)
-	       break Louter;
-	   if (j == 4)
-	       continue Louter;
-       }
-   }
-   // break Louter goes here
-   typedef bit bHandle;
-   typedef int iHandle = -1;
-typedef void* Handle = cast(void*)(-1);
-Handle h;
-h = func();
-if (h != Handle.init)
-    ;
-char[] string = "hello";
-
-if (string < "betty")
-;
-int* p = address;
-
-volatile { i = *p; }
-
-char [] ml = "This text spans
-multiple
-lines
-";
-
-}
-
-void dostring(char[] s)
-{
-   switch (s)
-   {
-       case "hello":   ;
-       case "goodbye": ;
-       case "maybe":   ;
-       default:        ;
-   }
-}
-
-struct ABC
-{
-   int z;               // z is aligned to the default
-
- align (1) int x;       // x is byte aligned
- align (4)
- {
-   ...                  // declarations in {} are dword aligned
- }
- align (2):             // switch to word alignment from here on
-
-   int y;               // y is word aligned
-}
-
-struct Foo
-{
-   int i;
-   union
-   {
-      struct { int x; long y; }
-      char* p;
-   }
-}
-
-struct Foo { int x; int y; }    // note there is no terminating ;
-Foo foo;
-
-
-struct Foo { int x; int y; }
-
-off = Foo.y.offsetof;
-
-union U { int a; long b; }
-U x = { a:5 };
-
-struct S { int a; int b; }
-S x = { b:3, a:5 };
-
-int[3] a = [ 3, 2, 0 ];
-int[3] a = [ 3, 2 ];            // unsupplied initializers are 0, just like in C
-int[3] a = [ 2:0, 0:3, 1:2 ];
-int[3] a = [ 2:0, 0:3, 2 ];     // if not supplied, the index is the
-				// previous one plus one.
-
-enum color { black, red, green }
-int[3] c = [ black:3, green:2, red:5 ];
-
-char[] file = `c:\root\file.c`;
-char[] quoteString = \"  r"[^\\]*(\\.[^\\]*)*"  \";
-
-char[] hello = "hello world" \n;
-char[] foo_ascii = "hello";        // string is taken to be ascii
-wchar[] foo_wchar = "hello";       // string is taken to be wchar
-
-enum COLORS { red, blue, green };
-
-char[][COLORS.max + 1] cstring =
-[
-    COLORS.red   : "red",
-    COLORS.blue  : "blue",
-    COLORS.green : "green",
-];
-
-            const ushort table1[16] = [
-                                         0x00A7, 0x0322, 0x07AD, 0x0428,
-                                         0x0536, 0x06B3, 0x023C, 0x01B9];
-
-            const ushort table2[16] = [ 0x0000, 0x0385, 0x070A, 0x048F,
-                                         0x0536, 0x06B3, 0x023C, 0x01B9];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/type_spacing000.d
deleted file mode 100644
index e11e545b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/type_spacing000.d
+++ /dev/null
@@ -1,2 +0,0 @@
-alias jhash        hash;

-alias Foo!(int, char)    f;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces000.d
deleted file mode 100644
index d2f1b642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces000.d
+++ /dev/null
@@ -1,12 +0,0 @@
-struct A

-{

-	static if (true)

-	void f() { }

-}

-struct B

-{

-	static if(true)

-		int a;

-	else

-		int e;

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces001.d
deleted file mode 100644
index a59ab020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces001.d
+++ /dev/null
@@ -1,9 +0,0 @@
-module x;

-static if (1)

-    void fun()

-    {

-    }

-static if (1)

-    void gun()

-    {

-    }
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces002.d
deleted file mode 100644
index 5e45e999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces002.d
+++ /dev/null
@@ -1,19 +0,0 @@
-int super_fun(bool a, bool b, bool c, bool d)

-{

-    int i = 6;

-    static if (true)

-        while (true)

-            if(b)

-                return 1;

-    else if (c)

-        while (true)

-            if(d)

-                return 2;    

-    else

-        while (true)

-            if(a)

-                return 3;

-    while (d)

-        return 4;

-    return 1;

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-1.d
deleted file mode 100644
index c9f41d3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-1.d
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    while (a)
-    {
-        volatile if (b)
-            {
-	        b--;
-		break;
-            }
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-2.d
deleted file mode 100644
index bc5a0de4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-2.d
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    if (e)
-        volatile
-        {
-            a++;
-        }
-    return oldValue;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-3.d
deleted file mode 100644
index 039f788a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-3.d
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    if (e)
-    {
-        if (!value)
-            volatile e.value = value;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile.d
deleted file mode 100644
index c42d1893..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile.d
+++ /dev/null
@@ -1,27 +0,0 @@
-void foo(void)
-{
-while (nextSegmentIndex >= 0)
-{
-    Segment seg = map.segments[nextSegmentIndex--];
-    volatile if (seg.count)
-        {
-            currentTable = seg.table;
-            for (int j = currentTable.length - 1; j >= 0; --j)
-            {
-                if ((nextEntry = currentTable[j]) !is null)
-                {
-                    nextTableIndex = j - 1;
-                    return;
-                }
-            }
-        }
-}
-
-if (e)
-    volatile
-    {
-        oldValue = e.value;
-        e.value  = newValue;
-    }
-return oldValue;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/wysiwyg_strings.d
deleted file mode 100644
index cfdec32a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/wysiwyg_strings.d
+++ /dev/null
@@ -1,9 +0,0 @@
-auto s = `\`;
-auto t = `\a
-b
-`;
-
-auto u = r"\";
-auto v = r"\a
-b
-";
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/ecma/example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/ecma/example-1.es
deleted file mode 100644
index 0bc9b775..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/ecma/example-1.es
+++ /dev/null
@@ -1,10 +0,0 @@
-x = 0; // A global variable
-var y = 'Hello!'; // Another global variable
- 
-function f(){
-  var z = 'foxes'; // A local variable
-  twenty = 20; // Global because keyword var is not used
-  return x; // We can use x here because it is global
-}
-// The value of z is no longer available
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1122.java
deleted file mode 100644
index 5712f9ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1122.java
+++ /dev/null
@@ -1,2 +0,0 @@
-private void save() throws IOException {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1124.java
deleted file mode 100644
index dcea4172..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1124.java
+++ /dev/null
@@ -1,4 +0,0 @@
-new URL(url)
-.
-openConnection();
-new URL(url).openConnection();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1845.java
deleted file mode 100644
index cc7656ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1845.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Version implements Comparable<Version> {
-
-    @Override
-    public int compareTo(@NonNull Version that) {
-        return 0;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_670.java
deleted file mode 100644
index 52d64f1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_670.java
+++ /dev/null
@@ -1,3 +0,0 @@
-Class definition:
-public class A_Really_Really_Long_Class_Name extends Another_Really_Long_Class_Name {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Java8DoubleColon.java
deleted file mode 100644
index ec594909..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Java8DoubleColon.java
+++ /dev/null
@@ -1,10 +0,0 @@
-import java.util.Objects;
-import java.util.function.Predicate;
-
-public class Java8DoubleColon {
-public static void main(String[] args) {
-	Predicate<Object> p = Objects::nonNull;
-	System.out.println(false == p.test(null));
-	System.out.println(true == p.test(p));
-}
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation1.java
deleted file mode 100644
index d7417542..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation1.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.annotation;
- 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
- 
-@Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE,ElementType.METHOD,
- ElementType.CONSTRUCTOR,ElementType.ANNOTATION_TYPE,
- ElementType.PACKAGE,ElementType.FIELD,ElementType.LOCAL_VARIABLE})
-@Inherited
- 
-public @interface Unfinished {
-        public enum Priority { LOW, MEDIUM, HIGH }
-        String value();
-        String[] changedBy() default "";
-        String[] lastChangedBy() default "";
-        Priority priority() default Priority.MEDIUM;
-        String createdBy() default "James Gosling";
-        String lastChanged() default "08/07/2011";
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation2.java
deleted file mode 100644
index 596c2562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation2.java
+++ /dev/null
@@ -1 +0,0 @@
-public class Foo {private Runnable bar=new Runnable(){@Override @SuppressWarnings("baz") public void run(){ quux();}};}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation3.java
deleted file mode 100644
index 3d84c04c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation3.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class LocalTests extends IosTest {
-    /**
-     * Check that app started up correctly. Then check that app continually runs for 5 seconds.
-     * Then wait up to 20 seconds for the splash screen disappear.
-     * @throws InterruptedException
-     */
-    @Test(groups = {"testdroid", "local"})
-    public void checkAppForCrash() throws InterruptedException {
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/assert.java
deleted file mode 100644
index 8076663b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/assert.java
+++ /dev/null
@@ -1,9 +0,0 @@
-public class JavaClass {
-
-    public static void main(String[] args) {
-	/* assert EXPRESSION1 ; */
-	assert ( a != null ) && ( b != null );
-	/* assert EXPRESSION1 : EXPRESSION2 ; */
-        assert ( a != null ) && ( b != null ) : "Message";
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/cast.java
deleted file mode 100644
index 8f2d983b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/cast.java
+++ /dev/null
@@ -1,24 +0,0 @@
-public class JavaClass {
-    private boolean isButtonHit(ImageView imageView, int x, int y) {
-        if (imageView != null) {
-            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)imageView.getLayoutParams();
-            Rect buttonRect = new Rect((int) (layoutParams.leftMargin - buttonExtraMargin),
-                    (int) (layoutParams.topMargin - buttonExtraMargin),
-                    (int) (layoutParams.leftMargin + imageView.getWidth() + buttonExtraMargin),
-                    (int) (layoutParams.topMargin + imageView.getHeight() + buttonExtraMargin));
-
-            if (buttonRect.contains(x, y)) {
-                return true;
-            }
-        }
-
-        Map< ? , ? > map = (Map< ? , ? >)object;
-
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static List<Object> fromJSON(JSONArray obj) {
-        return (List<Object>)fromJSON((Object) obj);
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/double_brace.java
deleted file mode 100644
index 8ba15c47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/double_brace.java
+++ /dev/null
@@ -1,22 +0,0 @@
-member.func(new List() {{
-    add("Text");
-    add("Text",
-        "Hello");
-}});
-
-
-private static final Set<String> VALID_CODES = new HashSet<String>()
-{{
-	add("XZ13s");
-	add("AB21/X");
-	add("YYLEX");
-	add("AR2D");
- }};
-
-add(new JPanel(){{
-	setLayout(...);
-	setBorder(...);
-	add(new JLabel(...));
-	add(new JSpinner(...));
- }});
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/doxy-javadoc-alignment.java
deleted file mode 100644
index 838d765c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/doxy-javadoc-alignment.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * @author Firstname Lastname <address @ example.com>
- * @version 1.6 (current version number of program)
- * @since 1.2 (the version of the package to which this class was first added)
- */
-
-/**
- * Short one line description.                           (1)
- *
- * Longer description. If there were any, it would be    (2)
- * here.
- *
- * And even more explanations to follow in consecutive
- * paragraphs separated by HTML paragraph breaks...
- * or so we think, haha. After this paragraph, add a
- * reference to an @param to verify that it is ignored
- * since it does not occur at the beginning of the line.
- * Let's also throw in an @return to verify that it passes
- * the test as well.
- *
- * @param variable Description text text text.          (3)
- * @return Description text text text.
- */
-
-/**
- * Validates a chess move.
- *
- * Use {@link #doMove(int fromFile, int fromRank, int toFile, int toRank)} to move a piece.
- *
- * @param fromFile file from which a piece is being moved
- * @param fromRank rank from which a piece is being moved
- * @param toFile file to which a piece is being moved
- * @param toRank rank to which a piece is being moved
- * @return true if the move is valid, otherwise false
- * @since 1.0
- */
-
-/**
-* Draws as much of the specified image as is currently available
-* with its northwest corner at the specified coordinate (x, y).
-* This method will return immediately in all cases, even if the
-* entire image has not yet been scaled, dithered and converted
-* for the current output device.
-*
-* If the current output representation is not yet complete then
-* the method will return false and the indicated
-* {@link ImageObserver} object will be notified as the
-* conversion process progresses.
-*
-* @param img the image to be drawn
-* @param x,y the x- and y-coordinates of the northwest corner
-* of the destination rectangle in pixels
-* @param observer  the image observer to be notified as more
-* of the image is converted.  May be
-* null
-* @return true if the image is completely
-* loaded and was painted successfully;
-* false otherwise.
-* @see Image
-* @see ImageObserver
-* @since 1.0
-*/
-
-/**
-* @see #create(int, int, int, int)
-* @see #finalize()
-* @see Component#getGraphics()
-* @see Component#paint(Graphics)
-* @see Component#update(Graphics)
-* @since 1.0
-*/
-
-/**
-* Disposes of this graphics context once it is no longer
-* referenced.
-*
-* @see #dispose()
-* @since 1.0
-*/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/foreach.java
deleted file mode 100644
index e475dc29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/foreach.java
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-public class Foo {
-
-    public static void main(String[] args) {
- for (ProcessDefinition processDefinition : allOfTheDefinitions.getData()) {
-doit(processDefinition);
- }
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics.java
deleted file mode 100644
index 729013ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Note: Some tests running on this _input_ file rely upon that the tripple 
-// closing '>' are not separated by spaces or anything else!
-public class TestClass {
-private static void initMap(void) {
-	HashMap < String, HashMap < String, List < Track >>> resolutionTracks = new HashMap < String, HashMap < String, List < Track >>> ();
-}
-
-private static void addTrackToMap(String resolution, Track track, HashMap < String, HashMap < String, List < Track >>> resolutionTracks) {
-	HashMap<String, List<Track> > tracks = null;
-
-	if (resolutionTracks.containsKey(resolution)) {
-		tracks = resolutionTracks.get(resolution);
-	} else {
-		tracks = new HashMap<String, List<Track> >();
-		tracks.put("soun", new LinkedList<Track>());
-		tracks.put("vide", new LinkedList<Track>());
-		resolutionTracks.put(resolution, tracks);
-	}
-
-	if (track.getHandler() != null) {
-		if (track.getHandler().equals("soun")) {
-			List<Track> audioTracks = tracks.get("soun");
-			audioTracks.add(track);
-		} else if (track.getHandler().equals("vide")) {
-			List<Track> videoTracks = tracks.get("vide");
-			videoTracks.add(track);
-		}
-	}
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_return_type.java
deleted file mode 100644
index 818ac721..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_return_type.java
+++ /dev/null
@@ -1,8 +0,0 @@
-public class TestClass {
-    public static < T > void executeRequest(final HttpUriRequest request, final ITestClassAPIResponseListener<T> responseListener) {
-    }
-
-    public <T extends YourType> T mymethod(T type) {
-        return type;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_wildcard.java
deleted file mode 100644
index 358e333b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_wildcard.java
+++ /dev/null
@@ -1,25 +0,0 @@
-public class TestClass {
-    private Map< ? , ? > map1 = null;
-    private Map< ? , ? > map2 = null;
-    private Map< ? , ? > map3 = null;
-
-    public static HttpUriRequest getHttpUriRequest(TestClassAPIRequestMethod method, String apiPath) {
-        switch (method) {
-        case BOTTOM_LEFT:
-            break;
-        case GET:
-            req = new HttpGet(url);
-            break;
-        case POST:
-            req = new HttpPost(url);
-            break;
-        case PUT:
-            req = new HttpPut(url);
-            break;
-        case DELETE:
-            req = new HttpDelete(url);
-            break;
-        }
-        return req;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/i1121.java
deleted file mode 100644
index 18567ec3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/i1121.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Test {
-public static void main() {
-	btn.addActionListener(e->{
-			System.exit(0);
-		});
-}
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/issue_672.java
deleted file mode 100644
index 2f632625..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/issue_672.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public abstract class KeyValueItemWriter<K, V> implements ItemWriter<V>, InitializingBean {}
-//3456789=123456789=12
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/leading-tabs-for-java-lambda.java
deleted file mode 100644
index 19b6df0f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/leading-tabs-for-java-lambda.java
+++ /dev/null
@@ -1,29 +0,0 @@
-class MyClass {
-	void foo(List<Integer> arr) {
-		arr.forEach(n -> {
-			// Okay: This line will be indented with only tabs.
-			if (cond1) { // Okay
-				// BAD1: This line will be indented with tabs up to lambda brace level, then spaces for the rest.
-				if (cond2) // BAD2
-					// Okay
-					bar(); // Okay
-				if (cond3) // BAD3
-				{ // BAD4
-					// BAD5
-					bar(); // BAD6
-				} // Okay
-			} // Okay
-			if (cond4) { // Okay
-				/*
-				BAD7: C-style comments will also be affected on all lines.
-				*/
-			} // Okay
-			if (cond5) // Okay
-			{ // Okay
-				bar(); // BAD8
-			} // Okay
-			if (cond6) // Okay
-				bar; // Okay
-		});
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/long_cl_cmt.java
deleted file mode 100644
index 45e5252b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/long_cl_cmt.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Cls
-{
-public void f();
-}
-// no class end semicolon
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sf567.java
deleted file mode 100644
index 68a63221..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sf567.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.temp.test;
-
-public class Database
-{
-    private Database(String fileName) 
-    {
-        readConfig(fileName, "asdfasdf", 1);
-        readConfig(ame, "aasdf", 1);
-
-        Database.readConfig(fileName, "asdfasdf", 1);
-        Database.readConfig(ame, "aasdf", 1);
-    }
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_angle.java
deleted file mode 100644
index 1e11c4c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_angle.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class TestClassPrefetchData implements ITestClassAPIInputStreamResponseListener{
-    private class TestClassPrefetchDataWrite extends AsyncTask<Void, Void, Void>{
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_for_colon.java
deleted file mode 100644
index fecd1833..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_for_colon.java
+++ /dev/null
@@ -1 +0,0 @@
-for (Type var :     expr)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_before_byref.java
deleted file mode 100644
index 7927ee89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_before_byref.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public static void method() {
-	if (argA != null && argB != null) {
-	}
-	return (argA != null && argB != null);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_this_paren.java
deleted file mode 100644
index 628b327f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_this_paren.java
+++ /dev/null
@@ -1,9 +0,0 @@
-public class JavaClass {
-    public JavaClass() {
-        this(1);
-    }
-
-    public JavaClass(int i) {
-        super(i);
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/synchronized.java
deleted file mode 100644
index 369394b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/synchronized.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class A{
-    private synchronized static void g(){int x=1;}
-    synchronized A f(){return null;}
-    public void foo(){
-        g(); synchronized(this){g();}g();synchronized(this){synchronized(this){synchronized(this){g();}}g();}synchronized(this){g();}}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/try.java
deleted file mode 100644
index aea6a7f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/try.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public static void main(String[] args) {
-  try (File file = new File("filename.txt")) 
-  {
- doit(processDefinition);
- }
-           }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/variable_aligns.java
deleted file mode 100644
index 76c6131c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/variable_aligns.java
+++ /dev/null
@@ -1,35 +0,0 @@
-class Aligns {
-final int SZF = 4;
-final int SZ2F = 4;
-final int aBarF;
-final int someIntsF[];
-final int someIntsSzdF[4];
-final int[] someMoreIntsF;
-final int lotsOfIntsF[][][][][][];
-final int[][][][] lotsMoreIntsF;
-final Tem<Plate> edVarF;
-final int aBarSetF=null;
-final int someIntsSetF[]=null;
-final int someIntsSzdSetF[4]=null;
-final int[] someMoreIntsSetF=null;
-final int lotsOfIntsSetF[][][][][][]=null;
-final int[][][][] lotsMoreIntsSetF=null;
-final Tem<Plate> edVarF=null;
-int SZ = 4;
-int SZ2 = 4;
-int aBar;
-int someInts[];
-int someIntsSzd[4];
-int spacer;
-int[] someMoreInts;
-int lotsOfInts[][][][][][];
-int[][][][] lotsMoreInts;
-Tem<Plate> edVar;
-int aBarSet=null;
-int someIntsSet[]=null;
-int someIntsSzdSet[4]=null;
-int[] someMoreIntsSet=null;
-int lotsOfIntsSet[][][][][][]=null;
-int[][][][] lotsMoreIntsSet=null;
-Tem<Plate> edVar=null;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/1927.m
deleted file mode 100644
index 9f8d7a7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/1927.m
+++ /dev/null
@@ -1,17 +0,0 @@
-- (void) foo:(NSString*) inString
-{
-   @try {
-   }@catch(NSException* const inException)
-   {
-   }
-}
-
-- (void) bar:(NSString*) inString
-{
-   @try {
-   }
-   @catch (NSException* const inException){
-   }
-   @finally {
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Declarations.h
deleted file mode 100644
index e1ad3c6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Declarations.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-@interface EmptyClass : NSObject
--(void)aMessage:(id)arg;
-@end
-
-@interface EmptyClass : NSObject {}
--(void)aMessage:(id)arg;
-@end
-
-@interface NSObject (ObjectAdditions)
--(void)aMessage:(id)arg;
-@end
-
-@protocol TestProtocol
--(void)aMessage:(id)arg;
-@end
-
-@interface TestClass : NSObject <TestProtocol> {
-}
--(void)aMessage:(id)arg;
-@end
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.h
deleted file mode 100644
index 364b1de8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/NSObject.h>
-
-@interface Fraction: NSObject {
-    int numerator;
-    int denominator;
-}
-
--(void) print;
--(void) setNumerator: (int) d;
--(void) setDenominator: (int) d;
--(int) numerator;
--(int) denominator;
--(void) setNumDen :(int)n:(int)d;
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.m
deleted file mode 100644
index 20994f34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.m
+++ /dev/null
@@ -1,24 +0,0 @@
-#import "Fraction.h"
-#import <stdio.h>
-
-@implementation Fraction
--(void) print {
-    printf( "%i/%i", numerator, denominator );
-}
-
--(void) setNumerator: (int) n {
-    numerator = n;
-}
-
--(void) setDenominator: (int) d {
-    denominator = d;
-}
-
--(int) denominator {
-    return denominator;
-}
-
--(int) numerator {
-    return numerator;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2172.m
deleted file mode 100644
index 02584e91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2172.m
+++ /dev/null
@@ -1,10 +0,0 @@
-if (YES) {
-        NSString *sqlStr = [NSString stringWithFormat:@"INSERT INTO %@ (%@ , %@) VALUES
-                              ('%@','%@')"
-            , ContactsRemark_Table
-									, ContactsRemark_FollowId
-    , ContactsRemark_MarkName
-, followId
-            , markName
-            ];
-	}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2289.m
deleted file mode 100644
index c046cb1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2289.m
+++ /dev/null
@@ -1,5 +0,0 @@
-+ (void)foo:(bar)block {
-    for (int i = 0; i < 5; i++) @autoreleasepool {
-    	// stuff
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_681.oc
deleted file mode 100644
index fb4c6685..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_681.oc
+++ /dev/null
@@ -1,15 +0,0 @@
-int q;
-@interface MyClass ()
-@property (nonatomic, weak) UIView someView;
-@property (nonatomic, weak) UIView anotherView;
-@end
-@implementation MyClass
-- (void)someKindOfFunction
-{
-some code;
-}
-- (void)anotherOfFunction
-{
-some code;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/align-objc-like-xcode.m
deleted file mode 100644
index 6852ac12..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/align-objc-like-xcode.m
+++ /dev/null
@@ -1,8 +0,0 @@
-- (void)foo {
-[self dismissWithReason:DismissReason::Auto animated:TRUE];
-[self dismissWithReason:DismissReason::Auto
-animated:TRUE];
-[self
-dismissWithReason:DismissReason::Auto
-animated:TRUE];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/attribute_specifier_seqs.mm
deleted file mode 100644
index c9b6f24d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/attribute_specifier_seqs.mm
+++ /dev/null
@@ -1,19 +0,0 @@
-int w1[1];
-int w2 [[maybe_unused]] = 0;
-int w3 [[foo(w1[0])]];												// unknown attribute foo
-int w4 [[foo((w1[0]))]];											// unknown attribute foo
-int w5 [[foo(w1[0] [[maybe_unused]])]];								// unknown attribute foo
-int w6 [[foo(w1[0] [[maybe_unused]]), [[deprecated]]]];				// expected ] before [[deprecated
-int w7 [[w1[0]]] = 0;												// expected ] before [ in w1[
-int w8 [[ [[maybe_unused]] ]];										// expected ] before [[maybe_unused
-int w9 [ [ foo ] ] = 0;
-
-@implementation Foo
-- (void) message {
-Foo* foo = [[Foo alloc] init];
-}
-@end
-
-Foo* foo = [[Foo alloc] init];
-
-[[Foo sharedInstance] broadcast:[world hello]];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/available.m
deleted file mode 100644
index 8216d17f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/available.m
+++ /dev/null
@@ -1,12 +0,0 @@
--(void) test{
-  if (@available(macOS 10.12.2, *)) {
-      self.automaticTextCompletionEnabled = YES;
-      self.allowsCharacterPickerTouchBarItem = NO;
-  }
-
-  if (@available( macOS 10.12,*)) {
-      self.automaticTextCompletionEnabled = YES;
-      self.allowsCharacterPickerTouchBarItem = NO;
-  }
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_in_method.m
deleted file mode 100644
index e0dfcd76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_in_method.m
+++ /dev/null
@@ -1,66 +0,0 @@
-
-void Events1(NSString *    identifier, void (^handler)());
-
-void Events2(NSString *    identifier, void (^)());
-
-@implementation NSArray (WWDC)
-- (NSArray *)map:(id (^)(id))xform {
-    id result = [NSMutableArray array];
-    for (id elem in self)
-        [result addObject:xform(elem)];
-    return result;
-}
-
-- (NSArray *)collect:(BOOL ( ^ )(id))predicate {
-    id result = [NSMutableArray array];
-    for (id elem in self)
-        if (predicate(elem))
-            [result addObject:elem];
-    return result;
-}
-
-- (void)each:(void (^)(id object))block {
-    [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        block(obj);
-    }];
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL* (id item) {
-    return [item length] > 20;
-}];
-
-@end
-
-nestedMethodCall(methodCall( ^ BOOL * (id item) {
-  NSLog(@"methodCall")
-}));
-
-nestedMethodCall(
-    arg1,
-    methodCall(  ^ NSString * (id item) {
-        NSLog(@"methodCall")
-    }));
-
-nestedMethodCall(
-    arg1,
-    methodCall(  ^ {
-        NSLog(@"methodCall")
-    },
-    arg2)
-);
-
-nestedMethodCall(
-    methodCall(  ^ {
-        NSLog(@"methodCall")
-    })
-);
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_literal_protocol.m
deleted file mode 100644
index 02d1cfca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_literal_protocol.m
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)drawSomething:(id<MTLCommandBuffer>)commandBuffer {
-    [renderPass performDrawBlock:^(id<MTLRenderCommandEncoder> renderCommandEncoder) {
-        screenBlitObject.texture = src;
-
-        // Make sure the pipeline state pixelformat is the same as destination pixel format
-        [screenBlitObject updatePipelineState:dst.pixelFormat];
-
-        [screenBlitObject drawWithRenderCommandEncoder:renderCommandEncoder];
-    } withTargetTexture:dst andCommandBuffer:commandBuffer];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks.m
deleted file mode 100644
index 617e0b78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks.m
+++ /dev/null
@@ -1,15 +0,0 @@
-int* (  ^  blkReturningPointer)(int) = ^ int* (int a) {
-   return a + 1;
-};
-
-void (^ blk2)(int *) = ^(int *b) {
-   *b = 1;
-};
-
-
-int (^oneFrom)(int) = ^  (int anInt) {
-   return anInt - 1;
-};
-
-// this should not be flagged as OC_BLOCK_CARET
-int x = 12 ^ 23;
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align.m
deleted file mode 100644
index 2ddf75c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align.m
+++ /dev/null
@@ -1,14 +0,0 @@
-[[HRNewsService sharedInstance] unregisterPushToken:data
-                                            success:^{
-                                                self.notificationsEnabled = NO;
-                                                if (data.param) {
-                                                    self.loudNotifications = YES;
-                                                }
-                                            }
-                                            fail:^{
-                                                self.notificationsEnabled = NO;
-                                                if (data.param) {
-                                                    self.loudNotifications = YES;
-                                                }
-                                            }
-];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align2.m
deleted file mode 100644
index f4e875c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align2.m
+++ /dev/null
@@ -1,89 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void) method1 {
-    [session mergeCommonMovieItems:^(NSURL *exportURL, NSError *exportError) {
-        NSDictionary *settings = [self getSettings];
-
-        [session postSessionWithCallback:^(NSError *error, id d) {
-            if (error == nil) {
-                [session uploadSessionWithCallback:^(NSError *error, id d) {
-                    NSLog(@"OK");
-                }];
-            } else {
-                NSLog(@"Something went wrong: %@", error);
-                return;
-            }
-        }];
-    }];
-}
-
-- (void)postSelection:(NSString *)testName
-            selection:(NSString *)selection {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self warmup:^{
-            [self setReady];
-        }];
-    });
-
-    dispatch_after(retryTime, dispatch_get_main_queue(), ^(void) {
-        [self postSelection:testName selection:selection];
-    });
-
-    [TestClassRequest performMethod:TestClassRequestMethodPOST
-                    responseHandler:^(NSURLResponse *response) {
-                        dispatch_after(retryTime, dispatch_get_main_queue(), ^(void) {
-                            [self postSelection:testName selection:selection];
-                        });
-                    }];
-
-    [UIView transitionWithView:self.view.window duration:0.75 options:UIViewAnimationOptionTransitionFlipFromRight animations:^{
-        [self presentViewController:viewController animated:NO completion:nil];
-    } complete:^{}];
-}
-
-- (void)closeEditor {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if ([[TestClass sharedInstance] TestClassController] != nil && [[[TestClass sharedInstance] TestClassController] isKindOfClass:[TestClassSocialViewController class]]) {
-            [[TestClass sharedInstance].TestClassTransitionController transitionToViewController:[[TestClass sharedInstance] TestClassController] withCompletitionHandler:^{
-                [[TestClass sharedInstance] setTestClassVideoPlayerViewController:nil];
-            }];
-        } else if ([[TestClass sharedInstance] TestClassController] != nil && [[[TestClass sharedInstance] TestClassController] isKindOfClass:[TestClassModalViewController class]]) {
-            [[TestClass sharedInstance].TestClassTransitionController transitionToViewController:nil withCompletitionHandler:^{
-                [[TestClass sharedInstance] setTestClassVideoPlayerViewController:nil];
-            }];
-        } else {
-            [[TestClass sharedInstance] hideTestClass];
-        }
-    });
-}
-
-- (void)testMethodWrapper {
-    SEL testMethodForSelectorSel = @selector(testMethod:);
-    __block void *testMethodForSelectorBlock = TestFunction(encoderTest, testMethodForSelectorSel, ^id (__typeof (encoderTest) self, SEL aSelector) {
-        NSLog(@"OK");
-    });
-}
-
-- (void) method2 {
-    [TestClassRequest performMethod:TestClassRequestMethodPOST
-                    responseHandler:^(NSURLResponse *response, NSData *responseData, NSError *error) {
-                        [self checkPermissions:connection withCallback:^(NSError *error, id data) {
-                            [self bar];
-                        }];
-                    }];
-}
-
-- (void) method3 {
-    [TestClassRequest performMethod:TestClassRequestMethodPOST responseHandler:^(NSURLResponse *response, NSData *responseData, NSError *error) {
-        [self checkPermissions:connection withCallback:^(NSError *error, id data) {
-            [self bar];
-        }];
-    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/box.m
deleted file mode 100644
index 98a3516a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/box.m
+++ /dev/null
@@ -1,12 +0,0 @@
-NSArray *test = @[];
-NSNumber *test = @ (42 * 2);
-NSNumber *test = @4.0;
-NSDictionary *test = @{@"foo":@"bar"};
-
-@implementation UrlTemplateTest
-- (void)test {
-       NSString *test = @"";
-       NSString *string = [[NSMutableString alloc] initWithString:@""];
-       STAssertEqualObjects(string, @"", nil);
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/boxed_receiver.m
deleted file mode 100644
index 3460b920..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/boxed_receiver.m
+++ /dev/null
@@ -1,37 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@implementation TestClass
-
-- (NSDictionary *)constructUploadHeaders {
-    NSDictionary *headers;
-
-    headers = @{
-        @"Content-Length":[@(contentLength)stringValue],
-        @"Content-Length2": [contentLength stringValue],
-        @"Content-Disposition": [NSString stringWithFormat:@"name=\"%@\"; filename=\"%@\"", @"asset_data", identifier],
-        @"Content-Type": @"application/octet-stream",
-        @"ETag": uploadEtag
-    };
-
-    return headers;
-}
-
-- (BOOL)isStrimmed {
-    if ([(TestClassVideoEditorView *)   (self.parentComponentsView.superview)isTrimmed]) {
-        return YES;
-    }
-    if ([((TestClassVideoEditorView *)   self.parentComponentsView.superview)isTrimmed]) {
-        return YES;
-    }
-    return NO;
-}
-
-- (void)session {
-    TestCaseSessionInstance *session = ((TestClassVideoEditorView *)  self.parentComponentsView.superview).session;
-
-    [(TestClassVideoEditorView *)   (  self.parentComponentsView.superview) closeEditor];
-
-    [menubutton.badge setBadgeText:[@(count + 1) stringValue]];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1366.m
deleted file mode 100644
index 5e81ed4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1366.m
+++ /dev/null
@@ -1,14 +0,0 @@
-@implementation UCTestClass
-
-- (void) test{
-    
-    switch (test) {
-        case "longlonglonglong":{
-            i = 1;
-        }
-            break;
-    }
-}
-
-@end
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_167.m
deleted file mode 100644
index e404e2aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_167.m
+++ /dev/null
@@ -1,7 +0,0 @@
-- (void)dealloc {
-    [self closeFile];
-
-    [self setData:nil];
-
-    [super dealloc];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1674.m
deleted file mode 100644
index 82c20161..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1674.m
+++ /dev/null
@@ -1,4 +0,0 @@
-- (void) test{
-[test handleOpenURL:url
-                                                      sourceApplication:sourceApplication]
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1683.m
deleted file mode 100644
index 3ee562c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1683.m
+++ /dev/null
@@ -1 +0,0 @@
-[mutString addAttributes:@{ NSParagraphStyleAttributeName : style } range:range];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_340.m
deleted file mode 100644
index ea9f8201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_340.m
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-@implementation MyDocument
-- (void) locationManager: (CLLocationManager*) manager didFailWithError:(NSError *)error {
-
-  [UIAlertView showError: error
-               withTitle: NSLocalizedString(@"Your location cannot be determined",
-                               @"The location of the user cannot be guessed")
-                 message: NSLocalizedString(@"You can try again by pressing the refresh button",
-                             @"Recovery suggestion when the location cannot be found")];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_404.m
deleted file mode 100644
index 3ecb87f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_404.m
+++ /dev/null
@@ -1,6 +0,0 @@
-@interface Test1 : Test2
-@end
-
-
-@interface Test<T1: id<T3>> : Test2<P1>
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_497.m
deleted file mode 100644
index a976d43d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_497.m
+++ /dev/null
@@ -1,13 +0,0 @@
-NSArray *array = @[@1,
-                   @2,
-                   @3,
-                   @4];
-
-NSArray *array = @{ @1: @1,
-                    @2: @2,
-                    @3: @3,
-                    @4: @4 };
-
-int i = 1
-+ 1
-+ 2;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_841.m
deleted file mode 100644
index dea826d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_841.m
+++ /dev/null
@@ -1,4 +0,0 @@
-- (void)myMethod {
-    NSInteger rowCount = [sectionProvider collectionView:self.collectionView
-    numberOfRowsInSection:section];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_125-412.m
deleted file mode 100644
index c92d2e66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_125-412.m
+++ /dev/null
@@ -1,7 +0,0 @@
-[[NSFileManager defaultManager] createFileAtPath:path contents:data attributes:nil]
-
-[self.myProperty setObject:obj forKey:key];
-
-NSString *newValue = [@"my string" stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
-
-NSString *newValue = [myStrings[0] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_408.m
deleted file mode 100644
index c8a3a450..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_408.m
+++ /dev/null
@@ -1 +0,0 @@
-    CGFloat fontSize = floorf([font pointSize] * [self tileContentScale] + 0.5);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_477.m
deleted file mode 100644
index a1a81749..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_477.m
+++ /dev/null
@@ -1,3 +0,0 @@
-    [dataArray enumerateObjectsUsingBlock:^(dataType *data, NSUInteger idx, BOOL *stop) {
-         // Do stuff!
-     }];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/c-cpp-oc-wrapper.c
deleted file mode 100644
index 663a4cc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/c-cpp-oc-wrapper.c
+++ /dev/null
@@ -1,300 +0,0 @@
-// C/C++/Obj-C/Obj-C++ wrapper that exports C functions
-//
-// As an example, distributed with .c suffix,
-// but depending on extension needs, can be
-// compiled as C, C++, Obj-C or Obj-C++
-
-#include <stdio.h>
-#include <unistd.h>
-#include "TestClassNativeHelper.h"
-
-#undef NDEBUG
-
-#if defined(__ANDROID__)
-
-#define TCH_LOGI(...) __android_log_print(ANDROID_LOG_INFO, "TestClassNativeHelper", __VA_ARGS__)
-#define TCH_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, "TestClassNativeHelper", __VA_ARGS__)
-
-#ifndef NDEBUG
-#define TCH_LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, "TestClassNativeHelper", __VA_ARGS__)
-#else
-#define TCH_LOGV(...)
-#endif
-
-#define TCH_ELOG TCH_LOGV("%s", __FUNCTION__)
-
-void TCH_onTestClassUploadDidProgress(C_JNIEnv *env, jobject thiz, jint videoId, jdouble progress) {
-    TCH_ELOG;
-}
-
-#ifndef TCH_NELEM
-#define TCH_NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
-#endif
-
-static const char *kTCHTestClassClass = "com/testclass/TestClass/TestClass";
-static const char *kTCHTestClassLoader = "com.testclass.TestClass.TestClass";
-
-static const char *kTCHTestClassNativeListenerClass = "com/testclass/TestClass/communication/TestClassNativeListener";
-static const char *kTCHTestClassNativeListenerLoader = "com.testclass.TestClass.communication.TestClassNativeListener";
-
-static JavaVM *TCH_vm = NULL;
-
-static JNINativeMethod TCH_listenerMethods[] = {
-    { "onTestClassUploadDidProgress", "(ID)V", (void *)TCH_onTestClassUploadDidProgress },
-};
-
-static C_JNIEnv *TCH_getEnv() {
-    C_JNIEnv *ret = NULL;
-
-    if (TCH_vm == NULL) {
-        TCH_LOGE("TCH_getEnv failed, no JVM");
-        return NULL;
-    }
-
-#if defined(__cplusplus)
-    JNIEnv *env = NULL;
-
-    if (TCH_vm->GetEnv((void **)&env, JNI_VERSION_1_6) != JNI_OK) {
-        JavaVMAttachArgs args;
-        args.version = JNI_VERSION_1_6;
-        args.name = NULL;
-        args.group = NULL;
-
-        int attachStatus;
-        if ((attachStatus = TCH_vm->AttachCurrentThread(&env, &args)) < 0) {
-            TCH_LOGE("TCH_getEnv failed");
-        }
-    }
-    ret = (C_JNIEnv *)env;
-#else
-    JNIEnv *env = NULL;
-
-    if ((*TCH_vm)->GetEnv(TCH_vm, (void **)&env, JNI_VERSION_1_6) != JNI_OK) {
-        JavaVMAttachArgs args;
-        args.version = JNI_VERSION_1_6;
-        args.name = NULL;
-        args.group = NULL;
-
-        int attachStatus;
-        if ((attachStatus = (*TCH_vm)->AttachCurrentThread(TCH_vm, &env, &args)) < 0) {
-            TCH_LOGE("TCH_getEnv failed");
-        }
-    }
-    ret = env;
-#endif /* if defined(__cplusplus) */
-    return ret;
-}
-
-static jclass TCH_loadClass(C_JNIEnv *env, jobject activity, const char *className) {
-    jclass cls_Activity = (*env)->GetObjectClass((JNIEnv *)env, activity);
-    jmethodID mid_getClassLoader = (*env)->GetMethodID((JNIEnv *)env, cls_Activity, "getClassLoader", "()Ljava/lang/ClassLoader;");
-    jobject obj_classLoader = (*env)->CallObjectMethod((JNIEnv *)env, activity, mid_getClassLoader);
-
-    jclass cls_classLoader = (*env)->GetObjectClass((JNIEnv *)env, obj_classLoader);
-    jmethodID mid_loadClass = (*env)->GetMethodID((JNIEnv *)env, cls_classLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
-
-    jstring _className = (*env)->NewStringUTF((JNIEnv *)env, className);
-    jclass cls = (jclass)(*env)->CallObjectMethod((JNIEnv *)env, obj_classLoader, mid_loadClass, _className);
-
-    (*env)->DeleteLocalRef((JNIEnv *)env, _className);
-
-    if (!cls) {
-        TCH_LOGE("Couldn't find class %s", className);
-    }
-
-    return cls;
-}
-
-#define TCH_str2(x)             # x
-#define TCH_str(x)              TCH_str2(x)
-
-#define TCH_CLASS(_class)       tchClass_ ## _class
-
-#define TCH_LOCAL_CLASS(_class) local_tchClass_ ## _class
-
-#define TCH_REGISTER_CLASS(_class) \
-    jclass TCH_CLASS(_class) = NULL;
-
-#define TCH_EXTERN_CLASS(_class) \
-    jclass TCH_CLASS(_class);
-
-#define TCH_METHOD(_method)     tchMethod_ ## _method
-
-#define TCH_REGISTER_METHOD(_method) \
-    jmethodID TCH_METHOD(_method) = NULL;
-
-#define TCH_EXTERN_METHOD(_method) \
-    jmethodID TCH_METHOD(_method);
-
-#define TCH_REGISTER_NATIVES(_env, _class, methods) \
-    if ((*_env)->RegisterNatives((JNIEnv *)_env, TCH_CLASS(_class), methods, TCH_NELEM(methods)) < 0) { \
-        TCH_LOGE("RegisterNatives failed for %s\n", TCH_str(_class)); \
-    }
-
-#define TCH_FIND_CLASS(_env, _class, _className) \
-    jclass TCH_LOCAL_CLASS(_class) = (*_env)->FindClass((JNIEnv *)_env, _className); \
-    if (TCH_LOCAL_CLASS(_class) == NULL) { \
-        TCH_LOGE("Unable to find class %s\n", _className); \
-    } else { \
-        TCH_CLASS(_class) = (jclass)(*_env)->NewGlobalRef((JNIEnv *)_env, TCH_LOCAL_CLASS(_class)); \
-    }
-
-#define TCH_FIND_STATIC_METHOD(_env, _class, _method, _prototype) \
-    TCH_METHOD(_method) = (*_env)->GetStaticMethodID((JNIEnv *)_env, TCH_CLASS(_class), TCH_str(_method), _prototype); \
-    if (TCH_METHOD(_method) == NULL) { \
-        TCH_LOGE("Unable to find method %s", TCH_str(_method)); \
-    }
-
-#define TCH_FIND_STATIC_METHOD2(_env, _class, _method, _symbol, _prototype) \
-    TCH_METHOD(_method) = (*_env)->GetStaticMethodID((JNIEnv *)_env, TCH_CLASS(_class), TCH_str(_symbol), _prototype); \
-    if (TCH_METHOD(_method) == NULL) { \
-        TCH_LOGE("Unable to find method %s", TCH_str(_method)); \
-    }
-
-#define TCH_CALL_STATIC_METHOD_ARGS(_env, _class, _method, ...) \
-    (*_env)->CallStaticVoidMethod((JNIEnv *)_env, TCH_CLASS(_class), TCH_METHOD(_method), __VA_ARGS__);
-
-#define TCH_CALL_STATIC_METHOD_BOOL(_env, _class, _method) \
-    (*_env)->CallStaticBooleanMethod((JNIEnv *)_env, TCH_CLASS(_class), TCH_METHOD(_method));
-
-TCH_REGISTER_CLASS(testclassClass);
-TCH_REGISTER_METHOD(testclassConstructor);
-static jobject TCH_testclassInstance = NULL;
-
-TCH_REGISTER_CLASS(testclassNativeListenerClass);
-TCH_REGISTER_METHOD(testclassNativeListenerConstructor);
-static jobject TCH_testclassNativeListenerInstance = NULL;
-
-TCH_REGISTER_METHOD(isSupported);
-TCH_REGISTER_METHOD(initTestClass);
-
-static void TCH_preload(C_JNIEnv *env) {
-    TCH_ELOG;
-
-    if (TCH_CLASS(testclassClass) == NULL) {
-        TCH_FIND_CLASS(env, testclassClass, kTCHTestClassClass);
-    }
-
-    // Class really not found or not loaded, bail
-    if (TCH_CLASS(testclassClass) == NULL) {
-        return;
-    }
-
-    if (TCH_CLASS(testclassClass) != NULL && TCH_METHOD(isSupported) == NULL) {
-        TCH_FIND_STATIC_METHOD(env, testclassClass, isSupported, "()Z");
-        TCH_FIND_STATIC_METHOD(env, testclassClass, initTestClass, "(Lcom/testclass/TestClass/ITestClassListener;Landroid/app/Activity;)Z");
-
-        if (TCH_CLASS(testclassClass) != NULL) {
-            TCH_METHOD(testclassConstructor) = (*env)->GetMethodID((JNIEnv *)env, TCH_CLASS(testclassClass), "<init>", "()V");
-            jobject constructor = (*env)->NewObject((JNIEnv *)env, TCH_CLASS(testclassClass), TCH_METHOD(testclassConstructor));
-            TCH_testclassInstance = (*env)->NewGlobalRef((JNIEnv *)env, constructor);
-        }
-
-        if (TCH_CLASS(testclassNativeListenerClass) == NULL) {
-            TCH_FIND_CLASS(env, testclassNativeListenerClass, kTCHTestClassNativeListenerClass);
-        }
-
-        if (TCH_CLASS(testclassNativeListenerClass) != NULL) {
-            TCH_METHOD(testclassNativeListenerConstructor) = (*env)->GetMethodID((JNIEnv *)env, TCH_CLASS(testclassNativeListenerClass), "<init>", "()V");
-            jobject listener = (*env)->NewObject((JNIEnv *)env, TCH_CLASS(testclassNativeListenerClass), TCH_METHOD(testclassNativeListenerConstructor));
-            TCH_testclassNativeListenerInstance = (*env)->NewGlobalRef((JNIEnv *)env, listener);
-            TCH_REGISTER_NATIVES(env, testclassNativeListenerClass, TCH_listenerMethods);
-            TCH_LOGV("Initializing built-in listener");
-        }
-    }
-}
-
-#elif defined(__APPLE__)
-
-#ifndef NDEBUG
-#define TCH_LOGV(...)  NSLog(__VA_ARGS__)
-#else
-#define TCH_LOGV(...)
-#endif
-
-#define TCH_ELOG TCH_LOGV(@"%s", __FUNCTION__)
-
-#if defined(__cplusplus)
-#define TCH_NS(_class) ::_class
-#else
-#define TCH_NS(_class) _class
-#endif
-
-@interface TCH_delegateHandler : NSObject <TestClassDelegate>
-@end
-
-@implementation TCH_delegateHandler
-- (void)testclassUploadDidProgress:(NSNumber *)videoId progress:(NSNumber *)progress {
-    TCH_ELOG;
-}
-
-@end
-
-static TCH_delegateHandler *TCH_builtInHandler = nil;
-
-#endif /* if defined(__ANDROID__) */
-
-#if defined(__ANDROID__)
-
-void TCH_initTestClass(JNIEnv *env, jobject activity, jobject listener) {
-    TCH_ELOG;
-
-    C_JNIEnv *cenv = NULL;
-#if defined(__cplusplus)
-    cenv = (C_JNIEnv *)env;
-#else
-    cenv = env;
-#endif
-
-    if (TCH_vm == NULL) {
-        int status = (*cenv)->GetJavaVM((JNIEnv *)cenv, &TCH_vm);
-        if (status != 0) {
-            TCH_LOGE("GetJavaVM failed");
-            return;
-        }
-    }
-
-    TCH_CLASS(testclassClass) = TCH_loadClass(cenv, activity, kTCHTestClassLoader);
-    TCH_CLASS(testclassNativeListenerClass) = TCH_loadClass(cenv, activity, kTCHTestClassNativeListenerLoader);
-    TCH_preload(cenv);
-
-    jobject listenerRef = listener;
-    if (listenerRef == NULL) {
-        TCH_LOGV("Using built-in listener");
-        listenerRef = TCH_testclassNativeListenerInstance;
-    }
-
-    TCH_CALL_STATIC_METHOD_ARGS(cenv, testclassClass, initTestClass, listenerRef, activity);
-}
-
-#elif defined(__APPLE__)
-
-void TCH_initTestClass(UIViewController *viewController, id <TestClassDelegate>testclassDelegate) {
-    TCH_ELOG;
-
-    id <TestClassDelegate>testclassDelegateRef = testclassDelegate;
-    if (testclassDelegateRef == nil) {
-        TCH_builtInHandler = [[TCH_delegateHandler alloc] init];
-        testclassDelegateRef = TCH_builtInHandler;
-    }
-
-    [TCH_NS(TestClass) initWithDelegate : testclassDelegateRef andParentViewController : viewController];
-}
-
-#endif /* if defined(__ANDROID__) */
-
-bool TCH_isSupported(void) {
-    TCH_ELOG;
-    bool ret = false;
-
-#if defined(__ANDROID__)
-    C_JNIEnv *env = TCH_getEnv();
-    if (env && TCH_CLASS(testclassClass)) {
-        ret = (bool)TCH_CALL_STATIC_METHOD_BOOL(env, testclassClass, isSupported);
-    }
-#elif defined(__APPLE__)
-    ret = (bool) [TCH_NS(TestClass) isSupported];
-#endif
-
-    return ret;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cast.m
deleted file mode 100644
index daa9cb6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cast.m
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void) foo
-{
-    previewViewController.previewControllerDelegate = (id<TestClassDelegate>)[TestClass sharedInstance];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type1.m
deleted file mode 100644
index fb9bb4e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type1.m
+++ /dev/null
@@ -1,23 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)uploadWithClientData:(NSMutableDictionary *)data withCallback:(TestClassCallback)callback {
-    TestClassSessionInstance *session = [[TestClassSession sharedInstance] currentOrLastSession];
-
-    if (session == nil || data == nil) {
-        if (callback != nil)
-            return callback(nil, nil);
-        return;
-    }
-    [session mergeCommonMovieItems:^(NSURL *exportURL, NSError *exportError) {
-        if (exportError != nil)
-            return callback(exportError, nil);
-        NSDictionary *settings = [self getSettings];
-    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type2.m
deleted file mode 100644
index 27e31cdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type2.m
+++ /dev/null
@@ -1,32 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define TESTCLASS_SINGLETON_FOR_CLASS(classname, accessorname) \
-    static classname *shared##classname = nil;
-
-#define PUSH_CONTEXT(contextArg) \
-    EAGLContext *oldContext = [EAGLContext currentContext]; \
-    if (oldContext != contextArg) { \
-        [EAGLContext setCurrentContext:contextArg]; \
-    }
-
-#define POP_CONTEXT(contextArg) \
-    if (oldContext != contextArg) { \
-        [EAGLContext setCurrentContext:oldContext]; \
-    }
-
-#define CURRENT_CONTEXT \
-    NSOpenGLContext *currentContext = [NSOpenGLContext currentContext];
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-TESTCLASS_SINGLETON_FOR_CLASS(TestClass, sharedInstance);
-
-- (void) drawSomething {
-	PUSH_CONTEXT(_context);
-	POP_CONTEXT(_context);
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type3.m
deleted file mode 100644
index 8d8676c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type3.m
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define MACRO(foo) \
-    if (_##foo == NULL) { \
-        Log("do %s", str(foo)); \
-        _##foo = (foo##_t *)process(PR_FLAG, str(foo)); \
-    }
-
-#define OVERLOAD(base, foo) \
-    foo##_override_t * foo##_bar = (foo##_override_t *)process(base##_bar, str(foo)); \
-    _##foo##_override = (foo##_override_t *)process(base##_cache, str(foo));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type4.m
deleted file mode 100644
index dd4d55fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type4.m
+++ /dev/null
@@ -1,48 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-
-- (void)session_thumbnail_url:(NSDictionary *)data {
-    [session mergeCommonMovieItems:^(NSURL *exportURL, NSError *error) {
-#if 0
-        [response setValue:[thumbnailUrl absoluteString] forKey:@"thumbnail_url"];
-#else
-        NSString *extension = [thumbnailUrl pathExtension];
-        NSData *imageData = [NSData dataWithContentsOfURL:thumbnailUrl];
-        NSString *base64EncodedImage = [TestClassCommon Base64Encode:imageData];
-
-        NSString *base64Image = nil;
-        if ([extension isEqualToString:@"jpg"] == YES) {
-            base64Image = [NSString stringWithFormat:@"data:image/jpg;base64, %@", base64EncodedImage];
-        } else {
-            base64Image = [NSString stringWithFormat:@"data:image/png;base64, %@", base64EncodedImage];
-        }
-        [response setValue:base64Image forKey:@"thumbnail_url"];
-#endif
-
-        [TestClassWebViewController sendEvent:[NSString stringWithFormat:@"session_thumbnail:%@", sessionId] withArgs:response];
-    }];
-}
-
-- (void)addFoo:(NSDictionary *)postData {
-    [TestClassRequest performMethod:TestClassRequestMethodPOST
-                         onResource:resource
-                    usingParameters:postData
-                        withAccount:[TestClass account]
-             sendingProgressHandler:nil
-                    responseHandler:^(NSURLResponse *response, NSData *responseData, NSError *error) {
-                        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;
-                        if ([httpResponse statusCode] == 200) {
-#if DEBUG
-                            NSString *rsp = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
-                            TestClassLog(@"TOGGLE CONNECTION ADDED response:%li responseData:%@ error:%@", (long) [((NSHTTPURLResponse *) response) statusCode], rsp, [error localizedDescription]);
-#endif
-                            NSJSONSerialization *jsonConnection = [responseData TestClassJSONObject];
-                        }
-                    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert.m
deleted file mode 100644
index 58a4c894..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert.m
+++ /dev/null
@@ -1,53 +0,0 @@
-@protocol spacingProtocol
-
-@property NSInteger spacing;
-
-@end
-
-@interface cmt_insert
-
-+ (cmt_insert*) shareInstance;
-
-@property (readonly) BOOL isAvailable;
-
-@property (copy) NSArray<NSString*>* contents;
-
-- (void) updateContents:(NSArray<NSString*>*) inContents andRefresh:(BOOL) inRefresh;
-
-@end
-
-@implementation cmt_insert
-
-+ (cmt_insert*) sharedInstance {
-return nil;
-}
-
-- (BOOL) isAvailable {
-return YES;
-}
-
-- (NSArray<NSString*>*) contents {
-return @[];
-}
-
-- (void) setContents:(NSArray<NSString*>*) inContents {
-}
-
-- (void) updateContents:(NSArray<NSString*>*) inContents andRefresh:(BOOL) inRefresh {
-}
-
-@end
-
-@interface cmt_insert_with_protocol (spacingProtocol)
-@end
-
-@implementation cmt_insert_with_protocol (spacingProtocol)
-
-- (NSInteger) spacing {
-return 0;
-}
-
-- (void) setSpacing:(NSInteger) inSpacing {
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert2.m
deleted file mode 100644
index 4a31e975..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert2.m
+++ /dev/null
@@ -1,24 +0,0 @@
-
-NSURLResourceKey const NSURLCanonicalPathKey API_AVAILABLE(macosx(10.12), ios(10.0), watchos(3.0), tvos(10.0));
-
-@interface foo ()
-
-@property BOOL usesStrongWriteBarrier API_DEPRECATED("Garbage collection no longer supported", macosx(10.5, 10.12), ios(2.0, 10.0), watchos(2.0, 3.0), tvos(9.0, 10.0));
-
-static const NSWindowStyleMask NSResizableWindowMask API_DEPRECATED_WITH_REPLACEMENT("NSWindowStyleMaskResizable", macosx(10.0, 10.12)) = NSWindowStyleMaskResizable;
-
-- (NSString*) extensionForType:(NSString*) inFileType API_AVAILABLE(macosx(10.12), ios(10.0), watchos(3.0), tvos(10.0));
-
-@end
-
-@implementation foo
-
-- (NSString*) filePromiseProvider:(NSFilePromiseProvider*) inFilePromiseProvider fileNameForType:(NSString*) inFileType API_AVAILABLE(macos(10.12)) {
-}
-- (NSString*) filePromiseProvider:(NSFilePromiseProvider*) inFilePromiseProvider fileNameForType:(NSString*) inFileType API_DEPRECATED_WITH_REPLACEMENT(macos(10.12))
-{
-}
-- (NSString*) filePromiseProvider:(NSFilePromiseProvider*) inFilePromiseProvider fileNameForType:(NSString*) inFileType API_UNAVAILABLE(macos(10.12)) {
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/code_placeholder.m
deleted file mode 100644
index 6245bfa4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/code_placeholder.m
+++ /dev/null
@@ -1,5 +0,0 @@
-double delayInSeconds = 2.0;
-dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
-dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-    <#code to be executed on the main queue after delay#>
-});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/complex_method.m
deleted file mode 100644
index b22c34b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/complex_method.m
+++ /dev/null
@@ -1,30 +0,0 @@
-// Turn the document contents into a single savable lump of data
-- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError {
-#pragma unused(typeName)
-    
-    // Produce the data lump:
-    NSData * retval = [NSKeyedArchiver archivedDataWithRootObject:model];
-    
-    // If the lump is nil something went wrong
-    // fill out the error object to explain what wrent wrong
-    if ( outError != NULL ) {
-        // The sender wanted an error reported. If there
-        // was a problem, fill in an NSError object
-        if (retval == nil) {
-            // The error object should include an (unhelpful) 
-            // explanation of what happened
-            NSDictionary * userInfoDict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                               @"Internal error formatting data", NSLocalizedDescriptionKey, 
-                                               @"Archiving of data failed. Probably a bug.", NSLocalizedFailureReasonErrorKey, 
-                                               @"There's nothing you can do.", NSLocalizedRecoverySuggestionErrorKey, nil];
-            
-            *outError = [NSError errorWithDomain:LinearInternalErrorDomain
-                                                code:linErrCantFormatDocumentData 
-                                                userInfo:userInfoDict];
-        } else {
-            // No problem. Don't supply an error object.
-            *outError = nil;
-        }
-	}
-	return retval;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/delete-space-oc.mm
deleted file mode 100644
index 66e24dc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/delete-space-oc.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* EditorApplication */

-

-#include <string>

-

-#ifdef __OBJC__

-#import <Cocoa/Cocoa.h>

-

-class HierarchyState;

-@interface EditorApplication : NSObject

-{

-    IBOutlet id             m_MainWindow;

-    IBOutlet id             m_PaneController;

-    id                      m_RenderTimer;

-

-    IBOutlet id             m_CutItem;

-    IBOutlet id             m_CopyItem;

-    IBOutlet id             m_PasteItem;

-

-    IBOutlet id             m_DuplicateItem;

-    IBOutlet id             m_DeleteItem;

-

-    IBOutlet id             m_FrameSelectedItem;

-    IBOutlet id             m_FindItem;

-    IBOutlet id             m_SelectAllItem;

-}

-

-- (IBAction)SaveAssets:(id)sender;

-- (IBAction)CloseScene:(id)sender;

-- (IBAction)NewProject:(id)sender;

-- (IBAction)OpenProject:(id)sender;

-

-- (IBAction)SaveAsSceneToDisk:(id)sender;

-

-- (IBAction)EnterSerialNumber:(id)sender;

-- (IBAction)ReturnLicense:(id)sender;

-- (IBAction)CompileScene:(id)sender;

-- (IBAction)CompileSceneAutomatic:(id)sender;

-

-- (IBAction)saveDocument:(id)sender;

-

-- (IBAction)LoadSceneFromDisk:(id)sender;

-

-- (void)RemoveDisplayTimer;

-- (void)RegisterUpdateTimer:(int)frequency;

-

-- (void)refreshModifiedFile:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-- (void)closeFile:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-

-- (IBAction)ShowAboutDialog:(id)sender;

-- (IBAction)ShowPreferences:(id)sender;

-- (IBAction)ShowPackageManager:(id)sender;

-

-- (IBAction) delete:(id)sender;

-- (IBAction) copy:(id)action;

-- (IBAction)paste:(id)action;

-- (IBAction)duplicate:(id)action;

-- (IBAction)cut:(id)action;

-- (IBAction)selectAll:(id)action;

-- (IBAction)find:(id)action;

-- (IBAction)frameSelected:(id)action;

-- (IBAction)frameSelectedWithLock:(id)action;

-

-// Assetstore protocol handler and registration

-- (void)registerAssetStoreURLProtocol;

-- (void)getUrl:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-

-@end

-

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double-indent-objc-dict.m
deleted file mode 100644
index f94e5105..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double-indent-objc-dict.m
+++ /dev/null
@@ -1,17 +0,0 @@
-id a = @{
-  @"a": @1,
-  @"b": @2,
-};
-
-struct foo_t b = {
-  1,
-  2,
-};
-
-SomeObject *build()
-{
-  return @{
-    @"a": @1,
-    @"b": @2,
-  };
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double_angle_space.m
deleted file mode 100644
index f7164498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double_angle_space.m
+++ /dev/null
@@ -1,25 +0,0 @@
-static const NSArray< id< NSObject> > **controllers = nil;
-
-NSArray< id< BlockController> > *someMethod();
-
-@interface Fraction : NSObject
-void Compute(
-    Image< E::Matrix<SType, Dim,1> > const& src,
-    Image<E::Matrix<TType,Dim,1> >& dst);
-@end
-@implementation SomeClass
-- (void)initializeControllers:( NSArray< id< BlockController> > *)hybridContollers {
-    if (index < children.count) {
-        const unsigned int wl = w>>lvl;
-
-        assert(x<0 && y>=3);
-assert(y <0&&z> 2);
-assert(a>>1);
-assert(b >>1);
-
-    return static_cast< id <CKMountable>>(children[index]);
-  }
-
-NSArray<id< BlockController> > *controllers = hybridContollers;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/exceptions.m
deleted file mode 100644
index c8d6f6f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/exceptions.m
+++ /dev/null
@@ -1,23 +0,0 @@
-
-int main( int argc, const char *argv[] ) {
-	@try {
-		[NSException raise:NSInternalInconsistency
-					format:@"An internal inconsistency was raised"];
-	}
-	@catch (NSException *e) {
-		NSLog(@"Catch");
-	}
-	@finally {
-		NSLog(@"Finally");
-	}
-    
- @throw [NSException exceptionWithName:@"foo" reason:@"bar" userInfo:nil];
-
-NSException *exception = [NSException exceptionWithName: @"HotTeaException"
-                          reason: @"The tea is too hot"
-                          userInfo: nil];
-
-@throw exception;
-
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/extern-c-attribute.m
deleted file mode 100644
index fb84ce73..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/extern-c-attribute.m
+++ /dev/null
@@ -1,16 +0,0 @@
-struct
-{
-	int foo;
-} bar;
-
-extern "C"    int* i;
-extern "C" {  int* i; }
-int *i;
-extern "C"    NSString* i;
-extern "C" {  NSString* i; }
-NSString* i;
-
-__attribute__((visibility("default")))    int* i;
-__attribute__((visibility("default")))    NSString* i;
-
-#define DEFINE_NOTIFICATION(name) extern "C" __attribute__((visibility ("default")))    NSString*  const name = @#name;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for.m
deleted file mode 100644
index fc159fc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for.m
+++ /dev/null
@@ -1,12 +0,0 @@
-[[HRNewsService sharedInstance] fetchBreakingNewsItemWithId:self.breakingNewsId success:^(id responseObject) {
-        NSDictionary * thing;
-        for (NSArray * dictionary in photos) {
-        }
-} failure:^(NSError *error) {
-    // Failure?
-}];
-
-// We also need to consider cases where a non-pointer type (or, a pointer without the star) is declared in ObjC.
-for (id obj in someDictionary) {
-    NSLog(@"This could be anything! Objective-C really needs parametrized collections.");
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for2.m
deleted file mode 100644
index 535bc50b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for2.m
+++ /dev/null
@@ -1,2 +0,0 @@
-for (UIWindow *testWindow in [[UIApplication sharedApplication] windows]) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func-param-wrap-oc.mm
deleted file mode 100644
index 16f98ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func-param-wrap-oc.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-    if(progress <= 0)

-    {

-        [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,

-                                                           NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];

-    }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func_def.mm
deleted file mode 100644
index b3655728..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func_def.mm
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <Foundation/Foundation.h>
-
-extern "C" void function1(void *self, uint32_t *arg2, uint32_t * arg3);
-
-MACRO1(void, function2, type1 arg1, type2 arg2, const type1 * arg3);
-
-MACRO2(status_t, function3,
-    void *arg1,
-    const sp<IFoo>&arg2) {
-}
-
-MACRO2(type4, function4, const void **arg1, type1 arg2, const type3 * arg3, type4 arg4, type4 arg5, bool arg6) {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh137.m
deleted file mode 100644
index 779e0f2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh137.m
+++ /dev/null
@@ -1,18 +0,0 @@
-[UIView animateWithDuration:0.2f delay:0.f options:UIViewAnimationCurveEaseInOut animations: ^{
-    self.transform = CGAffineTransformMakeScale(1.05f, 1.05f);
-} completion: ^(BOOL finished) {
-    [UIView animateWithDuration:0.08f delay:0.f options:UIViewAnimationOptionCurveEaseInOut animations: ^{
-            self.transform = CGAffineTransformIdentity;
-            [UIView animateWithDuration:1 delay:0 options:0 animations:^   {
-                    // blah
-                } completion:nil];
-        }];
-}];
-
-dispatch_async(foo, ^{
-    dispatch_async(bar, ^{
-            dispatch_async(qux, ^{
-                    quz();
-                });
-        });
-})
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh293.m
deleted file mode 100644
index bb4cb52c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh293.m
+++ /dev/null
@@ -1,15 +0,0 @@
-self.someErrorView = ({
-    UIView *view = [[UIView alloc] init];
-    view.backgroundColor = [UIColor redColor];
-    [view addSubview:({
-        self.someErrorLabel = ({
-            UILabel *label = [[UILabel alloc] init];
-            label.textAlignment = NSTextAlignmentCenter;
-            label.backgroundColor = [UIColor clearColor];
-            label;
-        });
-    })];
-    view;
-});
-[self.view addSubview:self.someErrorView];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh511.m
deleted file mode 100644
index cee32794..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh511.m
+++ /dev/null
@@ -1,3 +0,0 @@
-BOOL valid = YES;
-NSDictionary *p = valid ? @{@"Test": @"Example"} : nil;
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/i1213.m
deleted file mode 100644
index f47e5964..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/i1213.m
+++ /dev/null
@@ -1,9 +0,0 @@
-int main (int argc, const char * argv[])
-{
-	switch (argc)
-	{
-	case 0 ... 1:
-		return 1;
-	}
-	return 0;
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-inside-ternary-operator.m
deleted file mode 100644
index ff979acf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-inside-ternary-operator.m
+++ /dev/null
@@ -1,102 +0,0 @@
-flag
-       ? [Cmpnt Cmpnt:(isChildActionSheet ? TypeBack : TypeCancel)]
-       : nil;
-
-
-[[BottomSheetItem alloc]
- iconName:selected
- ? g.re
-          .at
-          : g
-          .re
-          .at
-   builder:nil
-      handler:^{
-   }
-]
-
-
-[[BottomSheetItem alloc]
- iconName:selected
- ? iconName : g
-          .re
-          .at
-   builder:nil
-      handler:^{
-   }
-]
-
-(event
-  ?   [FSBottomSheetActionCellItemVariant
-        action:AKAction<> :: actionFromSenderlessBlock(^{
-  auto const strongSelf = weakSelf;
-})]
-  : nil);
-
-
-[[ViewController alloc] strategy: (strategy
-   ? [QuestionMarkStmt new]
-   : [ColonStmt new])
-toolbox: _one];
-
-[[ViewController alloc] strategy: (strategy
-   ?: [SourceStrategy new])
-toolbox: _two];
-
-
-
-flag1
-?   ( flag2
-          ? ( flag3
-             ?   [ViewController selector1:^{
-  NSLog(@"selector1");
-}]
-             :  [ViewController selector2:^(){
-  NSLog(@"selector2");
-}] )
-    :   ( result3  )
-  )
-    :  (  flag5
-    ? ( flag
-            ? result4
-        : [ViewController preSelector:flag selector3:{
-          .x = 10,
-        }])
-    :   (  flag6
-         ? [ViewController preSelector:flag selector3:^{
-        NSLog(@"selector3");
-      }]
-        : ( result7   )
-        )
-        );
-
-
-flag1
-?   result1
-            :  (
-              flag5
-    );
-
-
-
-showButton ? Action<>::actionFromBlock(^(Component *component) {
-          return nil;
-        }) : nil;
-
-showButton
-? Action<>::actionFromBlock(^(Component *component) {
-          return nil;
-        })
-         : nil;
-
-         showButton
-? Action<>::actionFromBlock(^(Component *component) {
-          return nil;
-        }) : nil;
-
-
-showButton
-    ? Action<>::actionFromBlock([](Component *component) {
-          return nil;
-        })
-    : nil;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-objc-block.m
deleted file mode 100644
index b882abf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-objc-block.m
+++ /dev/null
@@ -1,149 +0,0 @@
-const auto c =
-  [FDSTapTargetComponent
-   accessibilityContext:{
-     .accessibilityLabel = ^{
-		   return [AccessibilityLabelBuilder build];
-		 }
-   }];
-
-methodCall1(^{
-  send(component1);
-},
-           x);
-
-methodCall2( ^ {
-  send(component2);
-          });
-
-[array block:^ (id obj, NSUInteger idx, BOOL *stop) {
-        NSLog(@"Object at index %lu is %@", idx, obj);
-    }];
-
-
-    [UIView animateWithDuration:3.0f animation:^{
-      LOG(@"animate");
-    }
-    completion:^(BOOL finished){
-      LOG(@"finished");
-    }];
-
-[UIView
-     animationBlock: ^ {
-      [[Log alloc] callback:^NSString *(NSString *result){
-        return @"log";
-      }];
-    }
-    completion:^(BOOL finished){
-      LOG(@"finished");
-    }];
-
-
-methodCall3(x, ^KSC::ActionCell::Item (Item item) {
-              variant.action.send(component);
-      });
-
-methodCall4(  x, ^ id (Component *c) {
-                                NSLog(@"methodCall4");
-                              });
-
-methodCall5(  ^ id (Component *c) {
-                                NSLog(@"methodCall5");
-                              });
-
-methodCall6(  ^(NSString *)(Component *c) {
-                             return @"methodCall6";
-                           });
-
-methodCall7(^ (Component *c) {
-                             NSLog(@"methodCall7");
-                           }, y);
-
-  methodCall8(x,  ^(Component *c) {
-                             NSLog(@"methodCall8");
-                           }, y);
-
-
-                           [Object callMethod:xArg
-                           block:^id (Component *c) {
-                                NSLog(@"methodCall4");
-                           }];
-
-[Object callMethod:xArg
-                           block:^id (Component *c) {
-                                NSLog(@"methodCall5");
-                              }];
-
-[Object callMethod:xArg block:^(NSString *)(Component *c) {
-                             return @"methodCall6";
-                           }];
-
-
-[Object callMethod:xArg
-             block:^ (Component *c) {
-                             NSLog(@"methodCall7");
-                           }
-                           yMethod:yArg];
-
-  [Object callMethod:xArg
-  block:^(Component *c) {
-                             NSLog(@"methodCall8");
-                           }
-                           yMethod:yArg];
-
-[Object callMethod:xArg
-block:^(NSString *)(Component *c1) {
-                             [Object callMethod:xArg block:^(Component *c) {
-                             NSLog(@"methodCal9");
-                           }
-                           yMethod:yArg];
-                           }
-                           anotherBlock:^(NSString *)(Component *c2) {
-                             return @"methodCall10";
-                           }
-                           yetAnotherBlock:^(NSString *)(Component *c3) {
-                             return @"methodCall11";
-                           }];
-
-[dialog
-        dismissWithCompletion:^{
-          _deleteConversation(
-              strongSelf->_session,
-          ^{
-        if (auto const innerStrongSelf = weakSelf) {
-              [NavigationCoordinator(innerStrongSelf)
-              dismissViewController:innerStrongSelf
-              completion:nil];
-            }
-            });
-      }];
-
-
-      [FlexboxComponent
-newWithView:{
-   {
-  .accessibilityLabel = ^{
-    return
-  [[[[AccessibilityLabelBuilder builder]
-      appendPhrase:title]
-    appendPhrase:body]
-    getResult];
-    },
-   }
- }];
-
-
-MainComponent(
-  .builder = ^{
-  return
-  value;
-},
-param1,
-param2,
-  );
-
-KSC::map(
-  _items,
-      ^ ActionCell::Item (Item item)  {
-     return x;
-          }
-);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_boxed.m
deleted file mode 100644
index c7df968f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_boxed.m
+++ /dev/null
@@ -1,74 +0,0 @@
-
-- (IBAction) copy:(nullable id) inSender {
-NSPasteboard* const pasteboard = NSPasteboard.generalPasteboard;
-[pasteboard clearContents];
-[pasteboard writeObjects:@[
-[NSPasteboardItem pasteboardItemWithProvider:self forTypes:@[ NSPasteboardTypePDF ]
-andData:@[ kNSUTIExportedAgaroseGel,
-[NSKeyedArchiver archivedDataWithRootObject:self.selectedIndexes.count != 0 ? [self.gels objectsAtIndexes:self.selectedIndexes] : self.gels]
-]]
-]];
-}
-
-- (IBAction) copy:(nullable id) inSender {
-NSPasteboard* const pasteboard = NSPasteboard.generalPasteboard;
-[pasteboard clearContents];
-[pasteboard writeObjects:@[[NSPasteboardItem pasteboardItemWithProvider:self forTypes:@[ NSPasteboardTypePDF ] andData:@[
-kNSUTIExportedAgaroseGel, [NSKeyedArchiver archivedDataWithRootObject:self.selectedIndexes.count != 0 ? [self.gels objectsAtIndexes:self.selectedIndexes] : self.gels]
-]] ]];
-
-NSArray* a = @[];
-NSArray* b = @[@1,@2,@3];
-NSArray* c = @[
-@1, @2, @3
-];
-NSArray* d = @[@[@1], @[@2], @[@3]];
-NSArray* e = @[
-@[@1], @[@2], @[@3]
-];
-NSMutableArray* f = [NSMutableArray arrayWithArray:@[@[@1], @[@2], @[@3]]];
-NSMutableArray* g = [NSMutableArray arrayWithArray:@[
-@[@1], @[@2], @[@3]
-]];
-NSMutableDictionary* d1 = [NSMutableDictionary dictionaryWithDictionary:@{
-@"Keys":@[
-@{@"A": @1},
-@{@"B": @2}.
-@{@"C": @3}
-]
-}];
-}
-
-inline static void installGelMarkers(void) {
-[NSOperationQueue.mainQueue addOperationWithBlock:^{
-[accessoryView.textStorage setAttributedString:[[NSAttributedString alloc] initWithString:error.localizedDescription attributes:@{ NSFontAttributeName: [NSFont systemFontOfSize:NSFont.systemFontSize] }]];
-NSAlert *alert = [[NSAlert alloc] init];
-}];
-}
-
-[[NSAttributedString alloc] initWithString:inJunction.reverseName attributes:@{
-NSFontAttributeName: font,
-NSForegroundColorAttributeName: inJunction.reverseColor
-}];
-@{
-NSFontAttributeName: self.font,
-NSForegroundColorAttributeName: inJunction.forwardColor
-}
-[[NSAttributedString alloc] initWithString:inJunction.reverseName attributes:@{ NSFontAttributeName: font, NSForegroundColorAttributeName: inJunction.reverseColor }];
-[[NSAttributedString alloc] initWithString:inJunction.reverseName
-attributes:@{ NSFontAttributeName: font, NSForegroundColorAttributeName: inJunction.reverseColor }];
-- (void) drawReversePrimerForJunction:(GibsonJunction*) inJunction bounds:(NSRect) inBounds {
-NSString* const string1 = nil,
-string2 = nil,
-string3 = nil;
-//does not compile but does test shift operator formatting
-std::ostringstream ostream;
-ostream << "hello"
-<< ' '
-<< "world";
-NSString* const string = inJunction.reversePrimer;
-[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[string substringToIndex:range.location] attributes:@{
-NSFontAttributeName: self.font,
-NSForegroundColorAttributeName: inJunction.forwardColor
-}]];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_oc_inside_msg_sel.m
deleted file mode 100644
index f20cd048..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_oc_inside_msg_sel.m
+++ /dev/null
@@ -1,71 +0,0 @@
-[NSPasteboardItem pasteboardItemWithProvider:self
-		                      forTypes:@[ NSPasteboardTypePDF ]
-		                       andData:@[
-					   kNSUTIExportedAgaroseGel,
-					   [NSKeyedArchiver archivedDataWithRootObject:self.selectedIndexes.count != 0 ?[self.gels objectsAtIndexes:self.selectedIndexes] : self.gels]
-		    ]];
-
-[ViewController simple_First:firstArg
-simple_Two:secondArg
-simple_3:thirdArg];
-
-
-[ViewController preFirst:(
-                  pre_1_arg
-                )];
-
-[ViewController firstSelectorOne:arg1 preFirst:(
-                                        pre_1_arg
-                                      )];
-
-[ViewController preFirst:^{
-                  return arg4;
-                }
-        firstSelectorOne:arg1];
-
-[ViewController firstSelectorOne:arg1 preFirst:^{
-  return arg4;
-}];
-
-[ViewController firstSelectorOne:(flag
-                  ? arg5_1
-                  : arg5_2
-                ) toolbox:_toolbox];
-
-[ViewController preFirst:(
-                  pre_1_arg
-                )
-        firstSelectorOne:
-        arg1
-            selector_two:(
-              arg2
-            )
-              Selector_3:{
-                .arg3 = 1
-              }
-         fourth_Selector:^{
-           return arg4;
-         }
-       selector_number_5:(flag
-         ? arg5_1
-         : arg5_2
-       )
-       selector_number_5:(flag
-         ? arg5_1
-         : arg5_2
-       )
-                  sixSel:(flag
-                    ?: arg6_1)
-        seventh_selector:(
-          arg7
-        )
-              toolboxSel:toolboxArg];
-
-[[ViewController alloc] strategy:(strategy
-                          ? [QuestionMarkStmt new]
-                          : [ColonStmt new])
-                         toolbox:_one];
-
-[[ViewController alloc] strategy:(strategy
-                          ?: [SourceStrategy new])
-                         toolbox:_two];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_single_newline.m
deleted file mode 100644
index 27e79e8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_single_newline.m
+++ /dev/null
@@ -1,15 +0,0 @@
-
-- (BOOL)isSomethingTrue:(BOOL) something{
-    
-    if (something){
-	//Yes it's true
-
-        return YES;
-    }
-    else {
-        //No it's false
-        
-        return NO;
-    }
-    
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2629.m
deleted file mode 100644
index e690ea58..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2629.m
+++ /dev/null
@@ -1,20 +0,0 @@
-@implementation SomeClass
-- (void)someMethod
-{
-	   enumerateItems     (
-  ^(  NSInteger   section) {
-   } );
-}
-
-- (void)someOtherMethod
-{
-	items.enumerateItems (
-    ^(NSInteger section, NSInteger index, id<NSObject> object, BOOL *stop) {
-      enumerator(index, object, TypeInsert);
-    },
-    nil,
-		some_param
-  );
-}
-@end
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2631.m
deleted file mode 100644
index 7989b020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2631.m
+++ /dev/null
@@ -1,17 +0,0 @@
-@protocol SomeProtocol
-Props Method(const Contents &options = {});
-@end
-
-@interface SomeClass
-Props Method1(const Contents &options = {});
-@end
-
-
-@implementation SomeClass
-Props Method1(const Contents options = {});
-@end
-
-void Method2(const Contents options = {}) {
-}
-
-void Method3(const Contents &options = { .text = 10 });
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2675.m
deleted file mode 100644
index 1d4cafe2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2675.m
+++ /dev/null
@@ -1,66 +0,0 @@
-@interface Example1 : NSObject
-  typedef ObjectType0 X;
-typedef ObjectType1 _Nullable (^Handler1)(id<Fragment> fragment);
-typedef ObjectType2 _Nullable (^Handler2)(id<Fragment> fragment);
-@end
-
-@interface Example2 : NSObject
-  typedef ObjectType1 _Nullable (^Handler1)(id<Fragment> fragment);
-typedef ObjectType2 _Nullable (^Handler2)(id<Fragment> fragment);
-@end
-
-@interface AnotherExample1 : NSObject
-      SOME_MACRO_OPEN
-- (instancetype)init;
-
-SOME_MACRO_CLOSE
-@end
-
-SOME_MACRO_OPEN
-@interface AnotherExample2 : NSObject
-SOME_MACRO_CLOSE      
-- (instancetype)init;
-
-@end
-
-@interface SomeInterface : NSObject
-
-        // Some comment goes here
-@end
-
-@interface YetAnotherExample : NSObject
-
-      // What about this comment
-    // here
-- (instancetype)init;
-@end
-
-@interface YetOneAnotherExample : NSObject
-
-/// What about this comment
-/// here
-- (instancetype)init;
-@end
-
-@interface YetOneOtherExample : NSObject
-
-         /// What about this comment
-     /// here
-- (instancetype)init;
-@end
-
-
-@interface YetOneMoreExample : NSObject
-
-         /* Different comment pattern */
-- (instancetype)init;
-@end
-
-
-@interface YetOneMoreOtherExample : NSObject
-
-         /* Multiline
-         Comments
-         */
-- (instancetype)init;
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2722.m
deleted file mode 100644
index 65dcb131..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2722.m
+++ /dev/null
@@ -1,4 +0,0 @@
-// Pointer inside OC message
-[*messageClass.rlock () paramName : argValue];
-[*messageClass1  paramName1 :  argValue1];
-[*someClass->var sendMessage:@"message"];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2724.m
deleted file mode 100644
index 51c90671..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2724.m
+++ /dev/null
@@ -1,19 +0,0 @@
-// OC mesg inside array/dictionary
-_sections1 = @[
-[  SectionModel resultsWithContacts:contacts]
-];
-
-_sections2 = @[
-[[SectionModel mesg]  resultsWithContacts1: contacts1],
-[[SectionModel mesg]  resultsWithContacts2: contacts2]
-];
-
-_sections3 = @[[SectionModel resultsWithContacts:contacts]];
-
-@[
-  something
-  ];
-
-@[
-  [something mesg]
-  ];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2727.m
deleted file mode 100644
index f15542f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2727.m
+++ /dev/null
@@ -1,2 +0,0 @@
-typedef NSArray<NSString *> * (^   Finder )(NSArray *);
-typedef NSArray<     NSString *     >    *      (^ Handler )( NSDictionary< NSString * , NSArray * >  *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_3031.mm
deleted file mode 100644
index 028d55d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_3031.mm
+++ /dev/null
@@ -1,4 +0,0 @@
- if (flag) {
-      [video fcls:filter.class strength : fv];
-}
-[values forKey:(filterID)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/kw.m
deleted file mode 100644
index a4d25624..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/kw.m
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-#include <objc/Object.h>
-
-@protocol Job
-- do;
-@end
-
-@interface MyJob: Object<Job>
-- do;
-@end
-@implementation MyJob
-- do
-{
-	printf("Doing Job\n");
-	return self;
-}
-@end
-
-@interface JobExecutor: Object
-- doWith: (id<Job>) job for: (int) count;
-@end
-
-@implementation JobExecutor
-- doWith: (id<Job>) job for: (int) count
-{
-	for (int i = 0; i < count; ++i) {
-		[job do];
-	}
-	return self;
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/literals.mm
deleted file mode 100644
index 98522f3d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/literals.mm
+++ /dev/null
@@ -1,44 +0,0 @@
-
-NSDictionary *dictionary = @{@0: @"red",  @1: @"green",  @2: @"blue"};
-
-NSArray *array = @[@0, @1, @2, @YES, @'Z', @42U];
-
-NSArray *multilineArray = @[
-@0, @1, @2, @YES,
-@'Z', @42U
-];
-
-void main(int argc, const char *argv[]) {
-  // character literals.
-  NSNumber *theLetterZ = @'Z';          // equivalent to [NSNumber numberWithChar:'Z']
-
-  // integral literals.
-  NSNumber *fortyTwo = @42;             // equivalent to [NSNumber numberWithInt:42]
-  NSNumber *fortyTwoUnsigned = @42U;    // equivalent to [NSNumber numberWithUnsignedInt:42U]
-  NSNumber *fortyTwoLong = @42L;        // equivalent to [NSNumber numberWithLong:42L]
-  NSNumber *fortyTwoLongLong = @42LL;   // equivalent to [NSNumber numberWithLongLong:42LL]
-
-  // floating point literals.
-  NSNumber *piFloat = @3.141592654F;    // equivalent to [NSNumber numberWithFloat:3.141592654F]
-  NSNumber *piDouble = @3.1415926535;   // equivalent to [NSNumber numberWithDouble:3.1415926535]
-
-  // BOOL literals.
-  NSNumber *yesNumber = @YES;           // equivalent to [NSNumber numberWithBool:YES]
-  NSNumber *noNumber = @NO;             // equivalent to [NSNumber numberWithBool:NO]
-
-  // Raw string literals
-  NSString *rawString = [NSString stringWithFormat:@R"(embedded " quotes " )"];
-  NSString *delimiterRawString = [NSString stringWithFormat:@R"<<<(embedded "quotes ')<<<"];
-  NSString *groupIDString = [NSString stringWithFormat:@R"({"group_id " : " % @",})", groupID];
-  NSString *config = @R"({"config_v1" : [
-  {"op1" : {"type":{"unsupported1":{}}},"markers":[123]},
-  {"op2" : {"type":{"jobs":{"suspend":true,"resume":false}}},"markers":[1]},
-  {"op3" : {"type":{"Good Format":{}}},"markers":[123]}
-  ]})";
-
-
-#ifdef __cplusplus
-  NSNumber *trueNumber = @true;         // equivalent to [NSNumber numberWithBool:(BOOL)true]
-  NSNumber *falseNumber = @false;       // equivalent to [NSNumber numberWithBool:(BOOL)false]
-#endif
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/macro-close-brace.m
deleted file mode 100644
index 0eb3fa81..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/macro-close-brace.m
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#if TARGET_RT_BIG_ENDIAN
-#define FourCC2Str(fourcc) (const char[]) { *((char *) &fourcc), *(((char *) &fourcc) + 1), *(((char *) &fourcc) + 2), *(((char *) &fourcc) + 3), 0}
-#else
-#define FourCC2Str(fourcc) (const char[]) { *(((char *) &fourcc) + 3), *(((char *) &fourcc) + 2), *(((char *) &fourcc) + 1), *(((char *) &fourcc) + 0), 0}
-#endif
-
-#if 1
-#define SYNCHRONIZED_BEGIN(x) @synchronized(x) {
-#define SYNCHRONIZED_END }
-#else
-#define SYNCHRONIZED_BEGIN(x)
-#define SYNCHRONIZED_END
-#endif
-
-#define AUTORELEASEPOOL_BEGIN @autoreleasepool {
-#define AUTORELEASEPOOL_END }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/main.m
deleted file mode 100644
index f2fdf16a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/main.m
+++ /dev/null
@@ -1,21 +0,0 @@
-#import <stdio.h>
-#import "Fraction.h"
-
-int main( int argc, const char *argv[] ) {
-    // create a new instance
-    Fraction *frac = [[Fraction alloc] init];
-
-    // set the values
-    [frac setNumerator: 1];
-    [frac setDenominator: 3];
-
-    // print it
-    printf( "The fraction is: " );
-    [frac print];
-    printf( "\n" );
-
-    // free memory
-    [frac release];
-
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/method_ends_semicolon.m
deleted file mode 100644
index e3c5637e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/method_ends_semicolon.m
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass
-
-+ (void)cancelRequest:(id)request;
-
-@end
-
-@implementation TestClass
-
-// Occasionally there will be user errors where someone will
-// copy the interface method declaration to implementation
-// and leaves the semicolon
-+ (void)cancelRequest:(id)request;
-{
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/misc.m
deleted file mode 100644
index 5038a14c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/misc.m
+++ /dev/null
@@ -1,27 +0,0 @@
-- (id)init
-{
-GLfloat wc[3][3] = {{ 0.6, 0.6, 0.0 }, { 1.0, 0.7, 0.1 }, { 0.5, 0.7, 0.2
-},};
-GLfloat cc[3][3] = {{ 0.0, 0.0, 0.6 }, { 0.3, 0.1, 0.5 }, { 0.0, 0.0, 0.5
-},};
-GLfloat sc[3] = {0.75, 0.75, 0.75};
-
-return [self initWithWarmColors:(float *)&wc coolColors:(float *)&cc
-surfaceColor:sc enableTexturing:NO enableSpecular:YES
-enableQuakeDisruptor:NO];
-
-     [NSException raise:NSInternalInconsistency
-       format:@"An internal inconsistency was raised"];
-
-for (i = 0; i <[a count]; i++) {
-[thePerson setAmount:(1.5 * 17)forKey:@"overtime"];
-[screen showtext : x : y : @"Message"];
-	}
-}
-
-*outError = [NSError errorWithDomain:NSCocoaErrorDomain
-code:0
-userInfo:[NSDictionary
-dictionaryWithObject:@"Some Description"
-forKey:NSLocalizedDescriptionKey]];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks.m
deleted file mode 100644
index eab01db0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks.m
+++ /dev/null
@@ -1,53 +0,0 @@
-int (^myBlock)(int) = ^(int num) { return num * multiplier; };
-// for comparison
-int (*fcnptr)(int);
-
-int d = i % 10; 
-repeat(10, ^{ putc('0'+d); });
-
-
-void (^block)(void);
-typedef void (^vstr_t)(char *); 
-typedef void (^workBlk_t)(void);
-
-void AllLinesInFile(char *f, vstr_t block) {
-    FILE *fp = fopen(f, "r"); 
-    if (!fp) return; 
-    char line[1024]; 
-    while (fgets(line, 1024, fp))
-        block(line); 
-    fclose(fp);
-}
-
-
-@implementation NSArray (WWDC) 
-- (NSArray *)map:(id (^)(id))xform {
-    id result = [NSMutableArray array]; 
-    for (id elem in self)
-        [result addObject:xform(elem)]; 
-    return result;
-} 
-
-- (NSArray *)collect:(BOOL ( ^ )(id))predicate {
-    id result = [NSMutableArray array]; 
-    for (id elem in self)
-        if (predicate(elem)) 
-            [result addObject:elem];
-    return result;
-}
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL (id item) {
-    return [item length] > 20;
-}];
-
-// corner case: block literal in use with return type
-id longLines = [allLines collect: ^ BOOL* (id item) {
-   return [item length] > 20;
-}];
-
-@end
-
-// 1. block literal: ^{ ... };
-// 2. block declaration: return_t (^name) (int arg1, int arg2, ...) NB: return_t is optional and name is also optional
-// 3. block inline call ^ return_t (int arg) { ... }; NB: return_t is optional
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks_2.m
deleted file mode 100644
index 55636ae5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks_2.m
+++ /dev/null
@@ -1,18 +0,0 @@
-// Test a case where blocks wrapped by parentheses were causing the parser to crash
-int (^myBlock)(int) = ( ^(int num) {
-    return num * multiplier;
-});
-
-dispatch_async(thread, (^{
-    dispatch_async(thread, ^{
-        dispatch_async(thread, ^{
-            NSLog(@"Hooray for dispatch_async!");
-        });
-    });
-}));
-
-// Example of a unit test using Kiwi
-beforeAll(^{
-    NSString *serviceURL = [NSURL URLWithString:@"http://TEST_URL"];
-    NSLog(serviceURL);
-});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg.m
deleted file mode 100644
index cca460f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg.m
+++ /dev/null
@@ -1,3 +0,0 @@
-[obj doSomething:0 withArgs:@""];
-[@"" doSomething:0 withArgs:@""];
-NSString *result = (id)[obj arg:param value:3];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg_align.m
deleted file mode 100644
index 3b61a051..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg_align.m
+++ /dev/null
@@ -1,56 +0,0 @@
-
-BOOL immediatlyReady = [self ensureResource:mutableResources[0]
-                    existsInDirectoryAtPath:mutablePaths[0]
-                                  queueMode:mode
-                          completionHandler:completionHandler
-                               errorHandler:errorHandler];
-
-[myObject doFooWith1:arg1 name1:arg2  // some lines with >1 arg
-              error1:arg3];
-
-[myObject doFooWith2:arg4
-               name2:arg5 error2:arg6];
-
-[myObject doFooWith3:arg7
-          name3:arg8  // aligning keywords instead of colons
-          error3:arg9];
-
-[myObject doithereguysA:argA
- reallylongargname:argB another:argC];
-
- int foo()
-{
-[UIView transitionWithView:self.window
-                  duration:0.3
-                   options:UIViewAnimationOptionTransitionCrossDissolve
-                animations:^{
-                        BOOL oldState = [UIView areAnimationsEnabled];
-                        [UIView setAnimationsEnabled:NO];
-                        self.window.rootViewController = self.viewController;
-                        [UIView setAnimationsEnabled:oldState];
-                    }
-                completion:^(BOOL finished) {
-
-BOOL foo;
-                    }];
-}
-
- int foo2()
-{
-[UIView transitionWithView:self.window duration:0.3 options:UIViewAnimationOptionTransitionCrossDissolve animations:^{
-                        BOOL oldState = [UIView areAnimationsEnabled];
-                        [UIView setAnimationsEnabled:NO];
-                        self.window.rootViewController = self.viewController;
-                        [UIView setAnimationsEnabled:oldState];
-                    }
-                    completion:^(BOOL finished) {
-
-BOOL foo;
-                    }];
-
-        [[HRNewsService sharedInstance] registerPushToken:deviceToken success:^{
-            DLog(@"Finished Registering Push Token!");
-            self.notificationsEnabled = YES;
-        } fail:nil];
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/negative_value.m
deleted file mode 100644
index 9aa4dc80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/negative_value.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-
-int main(void) {
-	int i = -1;
-	NSNumber *foo1 = @-1;
-	NSNumber *foo2 = @(-1);
-	NSNumber *foo3 = @1;
-	NSNumber *foo4 = @(1);
-	NSNumber *foo5 = @(i);
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nelem.m
deleted file mode 100644
index d42ce3b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nelem.m
+++ /dev/null
@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-
-/* get #of elements in a static array */
-#ifndef NELEM
-#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
-#endif
-
-int main(void) {
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
deleted file mode 100644
index ea132bab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
+++ /dev/null
@@ -1,85 +0,0 @@
-mapToPtr(^(const LeftAddOn::Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr( x, ^ (const Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr( ^ (const Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr( arg1, ^ ( NSString * ) (const Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-}, arg2);
-
-mapToPtr(arg1, ^ ( NSString *) (const Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-});
-
-mapToPtr( ^() (const Props &addOnProps) {
-      FSTheme *const theme = AK::getTheme();
-}, arg2);
-
-
-
-methodCall(^{
-              variant.action.send(Cmpnt);
-      });
-
-      methodCall(
-        ^{
-              variant.action.send(Cmpnt);
-      }, x);
-
-
-methodCall(  x, ^id (Cmpnt *c) {
-                                NSLog(@"Something");
-                              });
-
-methodCall(  ^id (Cmpnt *c) {
-                                NSLog(@"Something");
-                              });
-
-methodCall(  ^(Cmpnt *c) {
-                             NSLog(@"Something");
-                           });
-
-methodCall(
-  ^ (Cmpnt *c) {
-                             NSLog(@"Something");
-                           }, y);
-
-  methodCall(x,  ^(Cmpnt *c) {
-                             NSLog(@"Something");
-                           }, y);
-
-
-methodCall(arg1,
-arg2, arg3);
-
-methodCall(arg1, arg2, arg3);
-
-methodCall(arg1, arg2, {
-  .x = 10,
-});
-
-methodCall(arg1, {
-  .x = 10,
-}, arg2);
-
-methodCall({
-  .x = 10,
-}, arg2);
-
-
-outerMethodCall(methodCall(^{
-  // action
-},
-                           x));
-
-outerMethodCall(methodCall(^{
-  variant.action.send(Cmpnt);
-},
-           x));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ns_enum.m
deleted file mode 100644
index cdd729d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ns_enum.m
+++ /dev/null
@@ -1,27 +0,0 @@
-// The semicolons at the end of these declarations are not superfluous.
-typedef NS_ENUM (NSUInteger, MyEnum) {MyValue1, MyValue2, MyValue3};
-typedef NS_OPTIONS (NSUInteger, MyBitmask) {MyBit1, MyBit2, MyBit3};
-
-// NS_ENUM specifies the type and name of the enum.
-typedef enum {
-MyValue1,
-MyValue2,
-MyValue3
-} MyEnum;
-typedef NS_ENUM (NSUInteger, MyEnum) {
-MyValue1,
-MyValue2,
-MyValue3
-};
-
-// NS_OPTIONS is equivalent to NS_ENUM, but semantically used for bitmask enums.
-typedef enum {
-MyBit1 = (1u << 0),
-MyBit2Longer = (1u << 1),
-MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-} MyBitmask;
-typedef NS_OPTIONS (NSUInteger, MyBitmask) {
-MyBit1 = (1u << 0),
-MyBit2Longer = (1u << 1),
-MyBit3ThatIsConsiderablyMoreVerbose = (1u << 2)
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc-split.m
deleted file mode 100644
index 3b656bfc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc-split.m
+++ /dev/null
@@ -1,10 +0,0 @@
-[self findstart:&startBarcode end:&endBarcode forLine:greenScalePixels derivative:greenDerivative centerAt:xAxisCenterPoint min:&minValue max:&maxValue];
-
-[self findstart:&startBarcode 
-            end:&endBarcode 
-        forLine:greenScalePixels 
-     derivative:greenDerivative 
-       centerAt:xAxisCenterPoint 
-            min:&minValue 
-            max:&maxValue];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_cond_colon.m
deleted file mode 100644
index 50cf56b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_cond_colon.m
+++ /dev/null
@@ -1,9 +0,0 @@
-[self.vendorID_TextField setStringValue:string ? string : @""];
-
-x = [NSString str:path];
-x = [NSString strFormat:@"Data/%s", path];
-x = path[0] == '/' ? path : "abc";
-x = path[0] == '/' ? [NSString str:path] : [NSString strFormat:@"Data/%s", path];
-
-id<MTLBuffer> buf = data ? [metal::g_Device newBufferWithBytes:data length:len options:MTLResourceOptionCPUCacheModeDefault]
-			: [metal::g_Device newBufferWithLength:len options:MTLResourceOptionCPUCacheModeDefault];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_msg_in_pp.m
deleted file mode 100644
index 8496973b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_msg_in_pp.m
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float) ((rgbValue & 0xFF0000) >> 16)) / 255.0 green:((float) ((rgbValue & 0xFF00) >> 8)) / 255.0 blue:((float) (rgbValue & 0xFF)) / 255.0 alpha:1.0]
-
-#if TARGET_OS_IPHONE
-#define GL_CONTEXT_ALLOC(parentContext) [[EAGLContext alloc] initWithAPI:GL_CONTEXT_VERSION(parentContext) sharegroup:[parentContext sharegroup]]
-#else
-#define GL_CONTEXT_ALLOC(parentContext) [[NSOpenGLContext alloc] initWithFormat:[[NSOpenGLPixelFormat alloc] initWithCGLPixelFormatObj:CGLGetPixelFormat([parentContext CGLContextObj])] shareContext:parentContext]
-#endif
-
-#define NSLocalizedString(key, comment) \
-    [TestClassBundle localizedStringForKey:(key) value:@"" table:nil]
-
-@interface TestClass : NSObject
-@end
-
-@implementation TestClass
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/pp_bool.m
deleted file mode 100644
index b1bf896c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/pp_bool.m
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#if TARGET_OS_MAC && !TARGET_OS_IPHONE
-#import <AppKit/AppKit.h>
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/properties.m
deleted file mode 100644
index 4de60057..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/properties.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#define nonnull_strong nonnull, strong
-#define myatomic nonatomic
-@interface UCTestClass ()
-
-@property (nonatomic, strong, null_unspecified, readonly) NSString* test1;
-@property (strong, readonly, nonatomic, nullable) NSString* test2;
-@property (strong, readonly, getter=test2Getter, nonatomic, nonnull) NSString* test3;
-@property (strong, readonly, getter=test2Getter, nonatomic, setter=test2Setter:, null_resettable) NSString* test4;
-@property (class, readonly, getter=test5Getter, nonatomic, nonnull, assign) NSString* test5;
-@property (class, assign, getter=test5Getter, myatomic, nonnull_strong) NSString* test6;
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/protocol.m
deleted file mode 100644
index 31a8b86f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/protocol.m
+++ /dev/null
@@ -1,30 +0,0 @@
-
-NSAssert( [self.delegate conformsToProtocol: @protocol( UISearchBarDelegate )], @"Some Error." );
-
-Protocol *counter = @protocol(ReferenceCounting);
-
-@protocol ReferenceCounting
-
-- setRefCount:(int)count;
-
-- (int)refCount;
-
-- incrementCount;
-
-- decrementCount;
-
-@end
-
-@interface Formatter : NSObject < Formatting, Prettifying >
-
-@end
-
-if ( [receiver conformsTo:@protocol(ReferenceCounting)] )
-   [receiver incrementCount];
-
-@protocol B;
-
-@protocol A
-- Foo:(id <B>)anObject;
-@end
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/react_native.m
deleted file mode 100644
index eadf314f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/react_native.m
+++ /dev/null
@@ -1,42 +0,0 @@
-#import "FOOAddressBookManager.h"
-#import <React/RCTBridge.h>
-#import <React/RCTEventDispatcher.h>
-
-/*
- * #define RCT_EXPORT_METHOD(method) \
- *  - (void)__rct_export__##method { \
- *    __attribute__((used, section("__DATA,RCTExport"))) \
- *    static const char *__rct_export_entry__[] = { __func__, #method }; \
- *  } \
- *  - (void)method \
- */
-
-@interface FOOAddressBook:NSObject
-@end
-
-@implementation FOOAddressBookManager
-
-RCT_EXPORT_MODULE(FOOAddressBook)
-
-RCT_EXPORT_METHOD(getAddresses:  (NSDictionary*)  data callback:(RCTResponseSenderBlock)   callback)
-{
-    NSMutableArray* addresses = [[FOOAddressBook sharedInstance] getAddresses:data];
-    if (addresses != nil)
-        callback(@[[NSNull null], addresses]);
-    else
-        callback(@[@"getAddresses returned nil."]);
-}
-
-RCT_EXPORT_METHOD(getStatus  :   (RCTResponseSenderBlock)  callback)
-{
-    callback(@[[NSNull null], [[FOOAddressBook sharedInstance] getStatus]]);
-}
-
-RCT_EXPORT_METHOD(requestAccess  :  (RCTResponseSenderBlock)   callback)
-{
-    [[FOOAddressBook sharedInstance] requestAccess:^(NSString* status) {
-        callback(@[[NSNull null], status]);
-    }];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/real_world_file.m
deleted file mode 100644
index 26ec3cb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/real_world_file.m
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- File: ATColorTableController.m
- Abstract: A controller used by the ATImageTextCell to edit the color property. It is implemented in an abstract enough way to be used by a class other than the cell. 
- 
- Version: 1.0
- 
- Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
- Inc. ("Apple") in consideration of your agreement to the following
- terms, and your use, installation, modification or redistribution of
- this Apple software constitutes acceptance of these terms.  If you do
- not agree with these terms, please do not use, install, modify or
- redistribute this Apple software.
- 
- In consideration of your agreement to abide by the following terms, and
- subject to these terms, Apple grants you a personal, non-exclusive
- license, under Apple's copyrights in this original Apple software (the
- "Apple Software"), to use, reproduce, modify and redistribute the Apple
- Software, with or without modifications, in source and/or binary forms;
- provided that if you redistribute the Apple Software in its entirety and
- without modifications, you must retain this notice and the following
- text and disclaimers in all such redistributions of the Apple Software.
- Neither the name, trademarks, service marks or logos of Apple Inc. may
- be used to endorse or promote products derived from the Apple Software
- without specific prior written permission from Apple.  Except as
- expressly stated in this notice, no other rights or licenses, express or
- implied, are granted by Apple herein, including but not limited to any
- patent rights that may be infringed by your derivative works or by other
- works in which the Apple Software may be incorporated.
- 
- The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
- MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
- THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
- OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
- 
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
- MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
- AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
- STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- 
- Copyright (C) 2009 Apple Inc. All Rights Reserved.
- 
- */
-
-#import "ATColorTableController.h"
-#import "ATPopupWindow.h"
-
-@implementation ATColorTableController
-
-+ (ATColorTableController *)sharedColorTableController {
-    static ATColorTableController *gSharedColorTableController = nil;
-    if (gSharedColorTableController == nil) {
-        gSharedColorTableController = [[[self class] alloc] initWithNibName:@"ColorTable" bundle:[NSBundle bundleForClass:[self class]]];
-    }
-    return gSharedColorTableController;
-}
-
-@synthesize delegate = _delegate;
-@dynamic selectedColor, selectedColorName;
-
-- (void)dealloc {
-    [_colorList release];
-    [_colorNames release];
-    [_window release];
-    [super dealloc];
-}
-
-- (void)loadView {
-    [super loadView];
-    _colorList = [[NSColorList colorListNamed:@"Crayons"] retain];
-    _colorNames = [[_colorList allKeys] retain];
-    [_tableColorList setIntercellSpacing:NSMakeSize(3, 3)];
-    [_tableColorList setTarget:self];
-    [_tableColorList setAction:@selector(_tableViewAction:)];
-}
-
-- (NSColor *)selectedColor {
-    NSString *name = [self selectedColorName];
-    if (name != nil) {
-        return [_colorList colorWithKey:name];
-    } else {
-        return nil;
-    }
-}
-
-- (NSString *)selectedColorName {
-    if ([_tableColorList selectedRow] != -1) {
-        return [_colorNames objectAtIndex:[_tableColorList selectedRow]];
-    } else {
-        return nil;
-    }
-}
-
-- (void)_selectColor:(NSColor *)color {
-    // Search for that color in our list
-    NSInteger row = 0;
-    for (NSString *name in _colorNames) {
-        NSColor *colorInList = [_colorList colorWithKey:name];
-        if ([color isEqual:colorInList]) {
-            break;
-        }
-        row++;
-    }    
-    _updatingSelection = YES;
-    if (row != -1) {
-        [_tableColorList scrollRowToVisible:row];
-        [_tableColorList selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-    } else {
-        [_tableColorList scrollRowToVisible:0];
-        [_tableColorList selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO];
-    }
-    _updatingSelection = NO;
-}
-
-- (void)_createWindowIfNeeded {
-    if (_window == nil) {
-        NSRect viewFrame = self.view.frame;
-        // Create and setup our window
-        _window = [[ATPopupWindow alloc] initWithContentRect:viewFrame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
-        [_window setReleasedWhenClosed:NO];
-        [_window setLevel:NSPopUpMenuWindowLevel];
-        [_window setHasShadow:YES];        
-        [[_window contentView] addSubview:self.view];
-        [_window makeFirstResponder:_tableColorList];
-        
-        // Make the window have a clear color and be non-opaque for our pop-up animation
-        [_window setBackgroundColor:[NSColor clearColor]];
-        [_window setOpaque:NO];
-    }
-}
-
-- (void)_windowClosed:(NSNotification *)note {
-    if (_eventMonitor) {
-        [NSEvent removeMonitor:_eventMonitor];
-        _eventMonitor = nil;
-    }
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowWillCloseNotification object:_window];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationDidResignActiveNotification object:nil];
-}
-
-- (void)_closeAndSendAction:(BOOL)sendAction {
-    [_window close];
-    if (sendAction) {
-        if ([self.delegate respondsToSelector:@selector(colorTableController:didChooseColor:named:)]) {
-            [self.delegate colorTableController:self didChooseColor:self.selectedColor named:self.selectedColorName];
-        }
-    } else {
-        if ([self.delegate respondsToSelector:@selector(didCancelColorTableController:)]) {
-            [self.delegate didCancelColorTableController:self];
-        }
-    }
-}
-
-- (void)_windowShouldClose:(NSNotification *)note {
-    [self _closeAndSendAction:NO];
-}
-
-- (void)editColor:(NSColor *)color locatedAtScreenRect:(NSRect)rect {
-    [self _createWindowIfNeeded];
-    [self _selectColor:color];
-    NSPoint origin = rect.origin;
-    NSRect windowFrame = [_window frame];
-    // The origin is the lower left; subtract the window's height
-    origin.y -= NSHeight(windowFrame);
-    // Center the popup window under the rect
-    origin.y += floor(NSHeight(rect) / 3.0);
-    origin.x -= floor(NSWidth(windowFrame) / 2.0);
-    origin.x += floor(NSWidth(rect) / 2.0);
-    
-    [_window setFrameOrigin:origin];
-    [_window popup];
-    
-    // Add some watches on the window and application
-    [[NSNotificationCenter defaultCenter] addObserver:self 
-                                             selector:@selector(_windowClosed:) 
-                                             name:NSWindowWillCloseNotification 
-                                             object:_window];
-   
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowShouldClose:) name:NSApplicationDidResignActiveNotification object:nil];
-    
-    // Start watching events to figure out when to close the window
-    NSAssert(_eventMonitor == nil, @"_eventMonitor should not be created yet");
-    _eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask | NSKeyDownMask handler: ^(NSEvent *incomingEvent) {
-        NSEvent *result = incomingEvent;
-        NSWindow *targetWindowForEvent = [incomingEvent window];
-        if (targetWindowForEvent != _window) {
-            [self _closeAndSendAction:NO];
-        } else if ([incomingEvent type] == NSKeyDown) {
-            if ([incomingEvent keyCode] == 53) {
-                // Escape
-                [self _closeAndSendAction:NO];
-                result = nil; // Don't process the event
-            } else if ([incomingEvent keyCode] == 36) {
-                // Enter
-                [self _closeAndSendAction:YES];
-                result = nil;
-            }
-        }
-        return result;
-    }];
-}
-
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
-    return _colorNames.count;
-}
-
-- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    return [_colorNames objectAtIndex:row];
-}
-
-- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    NSColor *color = [_colorList colorWithKey:[_colorNames objectAtIndex:row]];
-    [cell setColor:color];
-}
-
-- (void)_tableViewAction:(id)sender {
-    [self _closeAndSendAction:YES];
-}
-
-@end
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/receiver.m
deleted file mode 100644
index 274d4130..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/receiver.m
+++ /dev/null
@@ -1,10 +0,0 @@
-#import <Cocoa/Cocoa.h>
-
-@implementation MyDocument
-
-- (NSString*) appPath {
-  [ AClass         AFunc ];
-  return [NSSearchPathForDirectoriesInDomains (  NSDocumentDirectory,       NSUserDomainMask, YES    )             lastObject];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/return_type.m
deleted file mode 100644
index 62a5c246..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/return_type.m
+++ /dev/null
@@ -1,36 +0,0 @@
-#import <Foundation/NSObject.h>
-#import <stdio.h>
-
-@interface Fraction : NSObject {
-    int numerator;
-    int denominator;
-}
--(void)  print;
--(void)setNumerator:(int)d;
--(void)setDenominator:(int)d;
--(int) numerator;
--(int)denominator;
--(void) setNumDen:(int)n:(int)d;
-@end
-
-@implementation Fraction
--(void)print {
-    printf("%i/%i", numerator, denominator);
-}
-
--(void) setNumerator:(int)n {
-    numerator = n;
-}
-
--(void)     setDenominator:(int)d {
-    denominator = d;
-}
-
--(int) denominator {
-    return(denominator);
-}
-
--(int) numerator {
-    return(numerator);
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/selector.m
deleted file mode 100644
index a5a89475..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/selector.m
+++ /dev/null
@@ -1,7 +0,0 @@
-@selector(methodNameWithArg:);
-@selector   (methodNameNoArg);
-@selector       (methodNameArg1:arg2: );
-
-NSArray *sortedTZs = [ [ NSTimeZone knownTimeZoneNames ]
-sortedArrayUsingSelector : @selector ( compare: ) ];
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import.m
deleted file mode 100644
index 1a227b7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// should be ddd, eee, fff
-#import "ddd"
-#import "fff"
-#import "eee"
-
-#import "ccc"
-#import "aaa"
-// should be just bbb
-#import "bbb"
-
-#import "sort_import.h"
-#import "sort_import+internal.h"
-#import "sort_import+public.h"
-
-#import "Action+Internal.h"
-#import "Action+Public.h"
-#import <UIKit/UIKit.h>
-#import "Action.h"
-
-#include "Test+Internal.h"
-#include "Test.h"
-
-#import "Something_Internal.h"
-#import "Something_Public.h"
-#import "Something.h"
-
-#import "AAA"
-#import "BBB.h"
-#include "DDD"
-#import "EEE.h"
-#import <KKK>
-#include "CCC.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import_group.m
deleted file mode 100644
index 9e14f0fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import_group.m
+++ /dev/null
@@ -1,48 +0,0 @@
-#import "ddd"
-#import "fff"
-#import "eee"
-
-#import "ccc"
-#import "aaa"
-#import "bbb"
-
-#import "Action+Public.h"
-
-
-
-#import "sort_import.h"
-#import "sort_import+internal.h"
-
-#import "sort_import+public.h"
-#import <Foundation/Foundation.h>
-
-#import "Action+Internal.h"
-#import "Action+Internal.hpp"
-#import "Action+Public.h"
-#import <UIKit/UIKit.h>
-#import "Action.h"
-
-#include "Test+Internal.h"
-#include "Test.h"
-
-#import "DDD.h"
-#import "BBB.h"
-
-#import "Something_Internal.h"
-#import "Something_Public.h"
-#import "Something.h"
-
-#import "AAA"
-#import "BBB.h"
-#import <SSS>
-#import "AAABBB"
-#import "AAA"
-#include "DDD"
-
-#import "EEE.h"
-#import <KKK>
-#import <KKK> // Duplicate with comment
-#import <SSS>
-#include "CCC.h"
-
-#include "Test.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_angle.m
deleted file mode 100644
index 259d2011..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_angle.m
+++ /dev/null
@@ -1,21 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TestClass2 : TestClassNavigationViewController{
-    BOOL foo;
-}
-
-@implementation TestClass2
-
-@end
-
-@interface TestClass : TestClassNavigationViewController<UIWebViewDelegate, UIActionSheetDelegate>{
-    NSURL *webpageUrl;
-    UIWebView *webView;
-    BOOL toolbarVisible;
-    BOOL loading;
-    NSString *endPrefix;
-}
-
-@implementation TestClass
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_oc_msg_receiver.m
deleted file mode 100644
index aad36be5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_oc_msg_receiver.m
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@implementation TestClass
-
-- (void)testMethod {
-    NSData *jsonData = [self dataUsingEncoding:NSUTF8StringEncoding];
-    id jsonParsedObj = [jsonSerializationClass JSONObjectWithData:jsonData options:0 error:&jsonError];
-    NSString *ret = [[TestClass sharedInstance] testString];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_before_oc_proto_list.m
deleted file mode 100644
index c0d96bdb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_before_oc_proto_list.m
+++ /dev/null
@@ -1,25 +0,0 @@
-@protocol ControllerDelegate<NSObject, Controller>
-@end
-
-@protocol Controller  <NSObject>
-@end
-
-@interface CollectionViewController ()  <DataSource> {
-}
-@end
-
-@interface CollectionViewController (Flow)<FlowDelegate> : NSObject
-{
-  NSDictionary <NSString *, NSString *> dict;
-}
-@end
-
-@interface MyClass : NSObject  <Protocol_A, Protocol_B>
-
-@end
-
-@implementation ViewController
-- (void)someMethod {
-  auto const *dict = [NSMutableDictionary  < NSString *, NSString * > new];
-}
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_inside_braces_oc_dict.m
deleted file mode 100644
index 272a2f28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_inside_braces_oc_dict.m
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <Foundation/Foundation>
-
-int main(void) {
-    NSDictionary *productParameters = @{   @"id": appStoreID   };
-    NSDictionary *options = @{   AVURLAssetPreferPreciseDurationAndTimingKey: @YES   };
-    NSDictionary *baz = @{foo  : bar};
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_boxed.m
deleted file mode 100644
index 0c6948c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_boxed.m
+++ /dev/null
@@ -1,9 +0,0 @@
-
-- (void) foo {
-   NSArray* a = @[];
-   NSDictionary* b = @{};
-   NSArray<NSString*>* array = @[@"hello", @"world"];
-   NSDictionary<NSString*, NSString*>* dictionary = @{@"foo":@"bar", @"foo2":@"bar2"};
-   
-   	NSString* const type = [pasteboard availableTypeFromArray:@[NSPasteboardTypeString]];
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_catch.m
deleted file mode 100644
index a5354dfe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_catch.m
+++ /dev/null
@@ -1,18 +0,0 @@
-
-- (void) foo:(NSString*) inString
-{
-   @try {
-   }@catch(NSException* const inException)
-   {
-   }
-}
-
-- (void) bar:(NSString*) inString
-{
-   @try {
-   }
-   @catch (NSException* const inException){
-   }
-   @finally {
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_classname_paren-r.m
deleted file mode 100644
index 1076bbb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_classname_paren-r.m
+++ /dev/null
@@ -1,2 +0,0 @@
-@interface TestObject(categoryName) <ProtocolName> : BaseClass
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_synchronized.m
deleted file mode 100644
index e4de748b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_synchronized.m
+++ /dev/null
@@ -1,11 +0,0 @@
-- (void) unobserveAllKeyPaths {
-@synchronized(self){
-}
-}
-#if 1
-#define SYNCHRONIZED_BEGIN(x) @synchronized(x) {
-#define SYNCHRONIZED_END }
-#else
-#define SYNCHRONIZED_BEGIN(x)
-#define SYNCHRONIZED_END
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/string.m
deleted file mode 100644
index f3fca80f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/string.m
+++ /dev/null
@@ -1,11 +0,0 @@
-
-- (void)moreScannedData:(Image*)img from:(int)start to:(int)stop;
--(void)moreScannedData : (Image*)img from : (int)start to : (int)stop;
-
-public bool Enabled
-{
-    NSString* whatever = @"some lovely text, the fox and co";
-
-    a = (enderedImage->h - toplines - bottomlines);
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ternary.m
deleted file mode 100644
index 3fdddd93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ternary.m
+++ /dev/null
@@ -1,5 +0,0 @@
-NSString *str = (otherString ?: @"this is the placeholder");
-NSString *str2 = (str ? otherString : @"this is the other placeholder");
-NSString *str3 = str ? [[NSString alloc] initWithString:str] : @"this is the third placeholder";
-id str4 = str ? [self methodWithParameter1:@{@"bla": ({[self anotherMethod:@{@"id": @1}];})}
-                                andParameter2:@{@"dict_key": @{@"nested_dict_key_1": @(1), @"nested_dict_key_2": @"colon:in:string"}}] : [self anotherMethod:str? @1 : @2];
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/typeof.m
deleted file mode 100644
index d5183a1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/typeof.m
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.m>
-
-@implementation MyViewController
-
-- (void)method1 {
-    __weak __typeof(self)weakSelf1 = self;
-    __weak typeof(self)weakSelf2 = self;
-    __weak MyViewController *weakSelf3 = self;
-    NSString* srcStr = [[NSString alloc] initWithBytes: kShaderSource length: sizeof(kShaderSource) encoding: NSASCIIStringEncoding];
-}
-
-@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/Issue_2586.pawn
deleted file mode 100644
index 89558691..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/Issue_2586.pawn
+++ /dev/null
@@ -1,5 +0,0 @@
-static stock const data[][] =
-{
-	{0b00000011001111000010011100000000, 0b00000011001111000010011100000000},
-	{0b00000011001111000010011100000000, 0b00000011001111000010011100000000}
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/comment.p
deleted file mode 100644
index 785521ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/comment.p
+++ /dev/null
@@ -1,38 +0,0 @@
-/* parse C comments interactively, using events and a state machine */
-main()
-    state plain
-@keypressed(key) <plain>
-    {
-    state (key == '/') slash
-    if (key != '/')
-        echo key
-    }
-@keypressed(key) <slash>
-    {
-    state (key != '/') plain
-    state (key == '*') comment
-    echo '/'    /* print '/' held back from previous state */
-    if (key != '/')
-        echo key
-    }
-@keypressed(key) <comment>
-    {
-    echo key
-    state (key == '*') star
-    }
-@keypressed(key) <star>
-    {
-    echo key
-    state (key != '*') comment
-    state (key == '/') plain
-    }
-echo(key) <plain, slash>
-    printchar key, yellow
-echo(key) <comment, star>
-    printchar key, green
-printchar(ch, colour)
-    {
-    setattr .foreground = colour
-    printf "%c", ch
-    }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/crusty_ex-1.sma
deleted file mode 100644
index 35ee0515..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/crusty_ex-1.sma
+++ /dev/null
@@ -1,26 +0,0 @@
-public hudtext16(textblock[],colr,colg,colb,posx,posy,screen,time,id)
-{
-	new y
-	if(contain(textblock,"^n") == -1) { // if there is no linebreak in the text, we can just show it as it is
-		set_hudmessage(colr, colg, colb, float(posx)/1000.0, float(posy)/1000.0, 0, 6.0, float(time), 0.2, 0.2, screen)
-		show_hudmessage(id,textblock)
-	}
-	else { // more than one line
-		new out[128],rowcounter=0,tmp[512],textremain=true;y=screen
-
-		new i = contain(textblock,"^n")
-		
-		do
-		{
-		}
-		while(textremain > 0);
-		
-		copy(out,i,textblock) // we need to get the first line of text before the loop
-		
-		do
-		{
-		}
-		while(textremain)
-	}
-	return screen-y // we will return how many screens of text we printed
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/enum.pawn
deleted file mode 100644
index 588efc35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/enum.pawn
+++ /dev/null
@@ -1,82 +0,0 @@
-
-enum rect { left, top , right, bottom }
-
-enum boot (<<= 1) { a=1, b, c, d }
-
-enum booty (<<= 1)
-{
-a=1, b, c, d
-}
-
-forward addvector(a[], const b[], size)
-
-enum message {
-	text[40 char],
-	priority
-}
-
-enum token
-	{
-	t_type,
-	Rational: t_value,
-	t_word[20],
-	}
-
-new bool:flag = true
-
-increment(&value, incr=1) value += incr
-
-new msg[message] = { !"My Text", 1 }
-main() {
-	new my_rect[rect]
-	
-	my_rect[left] = 10
-	my_rect[right] = 100
-	my_rect[top] = 10
-	my_rect[bottom] = 100
-
-	for (new i = 0; rect:i < rect; i++)
-		my_rect[rect:i] *= 2
-	
-	new vect[3] = { 1, 2, 3 }
-	addvector(vect, {5, 5, 5}, 3)
-	
-	new Float:xpos
-	new Float:ypos
-	
-	new a = 5
-	increment(a)
-	increment(a, _)
-	increment(a, 1)
-}
-
-sum(a, b)
-	return a + b
-
-power(x, y)
-    {
-    /* returns x raised to the power of y */
-    assert y >= 0
-    new r = 1
-    for (new i = 0; i < y; i++)
-        r *= x
-    return r
-    }
-
-addvector(a[], const b[], size)
-    {
-    for (new i = 0; i < size; i++)
-        a[i] += b[i]
-    }
-
-stock remove_filepath(szFilePath[], szFile[], pMax)
-{
-       new len = strlen(szFilePath);
-
-       while ((--len >= 0) && (szFilePath[len] != '/') &&
-(szFilePath[len] != '\'')) { }
-
-       copy(szFile, pMax, szFilePath[len + 1]);
-
-       return;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/functions.pawn
deleted file mode 100644
index cdda5e05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/functions.pawn
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// prototypes
-forward bar()
-native baz()
-foo();
-
-enum rect { left, top , right, bottom }
-native intersect[rect](src1[rect], src2[rect])
-
-native getparam(a[], b[], size) = host_getparam
-
-// function w/o brace
-main()
-printf("hello\n")
-foo() bar()
-
-stock ts_is_waiting(id) return(ts_get_message(id) == TSMSG_WAITING)
-
-// regular old functions
-baz() {
-	do_something()
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/gh419.pawn
deleted file mode 100644
index 9db7b08f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/gh419.pawn
+++ /dev/null
@@ -1,8 +0,0 @@
-#if AMXX_VERSION_NUM < 183
-public client_disconnect( player_id )
-#else
-public client_disconnected( player_id )
-#endif
-{
-
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/preproc.pawn
deleted file mode 100644
index e15d360e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/preproc.pawn
+++ /dev/null
@@ -1,7 +0,0 @@
-#define SetTeleType(%1,%2) set_pev( %1, pev_iuser1, %2 )
-#define SetTeleMate(%1,%2) set_pev( %1, pev_iuser2, %2*7)
-
-#define x(%0,%1)\
-        y(%1,%0)
-
-#emit CONST.pri 1911
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/rpn_calc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/rpn_calc.pawn
deleted file mode 100644
index 2965d9c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/rpn_calc.pawn
+++ /dev/null
@@ -1,71 +0,0 @@
-/* main rpn parser and lexical analysis, part of the RPN calculator */
-#include <rational>
-#include <string>
-enum token
-    {
-               t_type,            /* operator or token type */
-    Rational: t_value,            /* value, if t_type is "Number" */
-               t_word[20],        /* raw string */
-    }
-
-const Number    = '0'
-const EndOfExpr = '#'
-
-rpncalc(const string[])
-    {
-    new index
-    new field[token]
-    for ( ;; )
-        {
-        field = gettoken(string, index)
-        switch (field[t_type])
-             {
-             case Number:
-                 push field[t_value]
-             case '+':
-                 push pop() + pop()
-             case '-':
-                 push - pop() + pop()
-             case '*':
-                 push pop() * pop()
-             case '/', ':':
-                 push 1.0 / pop() * pop()
-             case EndOfExpr:
-                 break    /* exit "for" loop */
-             default:
-                 printf "Unknown operator '%s'\n", field[t_word]
-             }
-        }
-
-	printf "Result = %r\n", pop()
-	
-    if (clearstack())
-        print "Stack not empty\n", red
-    }
-
-gettoken(const string[], &index)
-    {
-    /* first get the next "word" from the string */
-    new word[20]
-    word = strtok(string, index)
-    /* then parse it */
-    new field[token]
-    field[t_word] = word
-    if (strlen(word) == 0)
-        {
-        field[t_type] = EndOfExpr /* special "stop" symbol */
-        field[t_value] = 0
-        }
-    else if ('0' <= word[0] <= '9')
-        {
-        field[t_type] = Number
-        field[t_value] = rationalstr(word)
-        }
-    else
-        {
-        field[t_type] = word[0]
-        field[t_value] = 0
-        }
-    return field
-    }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/str-escape.p
deleted file mode 100644
index 5600eae3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/str-escape.p
+++ /dev/null
@@ -1,6 +0,0 @@
-main()
-{
-	printf "This is a testof the ^" alternate escape char, value 0x5e"
-	printf "If ^" it doesn't work, there ^"should be some errors"
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/switch-vsemi.sma
deleted file mode 100644
index c2efacfb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/switch-vsemi.sma
+++ /dev/null
@@ -1,16 +0,0 @@
-public plugin_init()

-{

-	new i=5

-	

-	switch(i){

-		case 3: return false

-		case 5:

-		{

-			i = 6

-			return true

-		}

-		default: {

-			return true

-		}

-	}

-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/tags.pawn
deleted file mode 100644
index 4193b2a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/tags.pawn
+++ /dev/null
@@ -1,63 +0,0 @@
-
-enum token
-	{
-	t_type,
-	Rational: t_value,
-	t_word[20],
-	}
-
-
-new bool:flag = true     /* "flag" can only hold "true" or "false" */
-const error:success = 0
-const error:fatal= 1
-const error:nonfatal = 2
-error:errno = fatal
-
-native printf(const format[], {Float, _}: ...);
-
-	new Float:chance_to_avoid = (p_resists[id][RESISTIDX_FIRE] >= RESIST_MAX_VALUE) ?
-	  1.00 : (float( p_resists[id][RESISTIDX_FIRE] ) / float( RESIST_MAX_VALUE ))
-
-    xplevel_lev[j] = XP_PER_LEVEL_BASE_LT + ( (j - 10) * XP_PER_LEVEL_LT) +
-                     floatround( float( j / 20 ) * XP_PER_LEVEL_LT );
-
-
-main() {
-	new Float:xpos
-	new Float:ypos
-
-	new apple:elstar    /* variable "elstar" with tag "apple" */
-	new orange:valencia /* variable "valencia" with tag "orange" */
-	new x               /* untagged variable "x" */
-	elstar = valencia   /* tag mismatch */
-	elstar = x          /* tag mismatch */
-	x = valencia        /* ok */
-
-	new Float:chance_to_avoid = (p_resists[id][RESISTIDX_FIRE] >= RESIST_MAX_VALUE) ?
-	  1.00 : (float( p_resists[id][RESISTIDX_FIRE] ) / float( RESIST_MAX_VALUE ))
-
-	xplevel_lev[j] = XP_PER_LEVEL_BASE_LT + ( (j - 10) * XP_PER_LEVEL_LT) +
-	  floatround( float( j / 20 ) * XP_PER_LEVEL_LT );
-
-	if (apple:valencia < elstar)
-		valencia = orange:elstar
-		
-some_label:	// target for a goto
-	#pragma rational Float
-	
-	new Float:limit = -5.0
-	new Float:value = -1.0
-	if (value < limit)
-	     printf("Value %f below limit %f\n", _:value, _:limit)
-	else
-	     printf("Value above limit\n")
-	goto some_label
-}
-
-foo()
-	if (ape)
-		dofunc(1)
-	else if (monkey)
-		dofunc(2)
-	else
-		dofunc(3)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/test1.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/test1.pawn
deleted file mode 100644
index ecefe6e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/test1.pawn
+++ /dev/null
@@ -1,59 +0,0 @@
-
-#define SCROLLMSG_SIZE 512
-
-#define SCROLLMSG_SIZE  512
-
-#define MIN(%1,%2)  ((%1) < (%2) ? (%1) : (%2))
-#define MAX(%1,%2)   ((%1)>(%2)?(%1):(%2))
-
-
-//Why doesn't it make them all one space?
-
-#define ADMIN_NORMAL   (1<<1)
-#define ADMIN_STEAM            (1<<2)
-
-
-#define ADMIN_NORMAL    (1<<1)
-#define ADMIN_STEAM             (1<<2)
-
-//Why space before and after colon?
-
-new Float:g_xPos
-new Float : g_xPos
-
-// col1
- // col2
-  // col3
-   // col4
-    // col5
-
-//Why so many tabs?
-main() {
-       remove_task(123)                /* remove current messaging */
-
-       remove_user_flags(0, read_flags("z"))           // Remove 'user' flag from server rights
-
-       new idtype = ADMIN_STEAM | ADMIN_LOOKUP // trail 1
-       new idtype = ADMIN_STEAM|ADMIN_LOOKUP // trail 2
-                                              // trail 3
-                                              // trail 4
-
-       if (idtype & ADMIN_STEAM)
-       {
-       a++
-       }
-       else if (equali(t_arg, "ip"))
-       {
-       b++
-       }
-
-       for (new _i=0; _i<_num; _i++)
-	{
-	c++
-	}
-
-	for (new _i = 0; _i < _num; _i++)
-	{
-	d++
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/traffic.p
deleted file mode 100644
index f5cf0f7f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/traffic.p
+++ /dev/null
@@ -1,28 +0,0 @@
-/* traffic light synchronizer, using states in an event-driven model */
-#include <time>
-main()                                state green_wait
-@keypressed(key) <green_wait>         state yellow_wait
-@keypressed(key) <red_walk, red_wait> state red_walk
-@keypressed(key) <>                   {} /* fallback */
-@timer()         <yellow_wait>        state red_walk
-@timer()         <red_walk>           state red_wait
-@timer()         <red_wait>           state green_wait
-@timer()         <>                   {} /* fallback */
-entry() <green_wait>
-    print "Green / Don't walk\n"
-entry() <yellow_wait>
-    {
-    print "Yellow / Don't walk\n"
-    settimer 2000
-    }
-entry() <red_walk>
-    {
-    print "Red / Walk\n"
-    settimer 5000
-    }
-entry() <red_wait>
-    {
-    print "Red / Don't walk\n"
-    settimer 2000
-    }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/unbraced.p
deleted file mode 100644
index 10c41663..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/unbraced.p
+++ /dev/null
@@ -1,10 +0,0 @@
-
-public eBombPickUp(id)
-	if (BombPickUp)
-		announceEvent(id, "PICKED_BOMB")
-
-stock Float:operator-(Float:oper)
-	return oper^Float:((-1)^((-1)/2)); /* IEEE values are sign/magnitude */
-
-native Float:  floatadd( Float:dividend, Float:divisor );
-native Result: dbi_query( Sql:_sql, _query[], { Float, _ }: ... );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/issue_527.sqc
deleted file mode 100644
index 5514ff31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/issue_527.sqc
+++ /dev/null
@@ -1,17 +0,0 @@
-void myfunc1()

-{

-    EXEC SQL create or replace

-        function my_func (in_str IN varchar2)

-        return date

-        IS

-        x date;

-    BEGIN

-    IF in_str IS NULL THEN

-        x:  = NULL;

-    ELSIF substr(in_str, 5,  1) = '-' THEN

-    x := to_date(in_str, 'YYYY-MM-DD HH24:MI:SS');

-    END IF;

-    return x;

-    END my_func;

-    END-EXEC;

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/mysql.sqc
deleted file mode 100644
index 197c2847..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/mysql.sqc
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-/*----------------------------------------------------------------*/
-EXEC SQL INCLUDE SQLCA;
-short sqlcode;
-
-EXEC SQL BEGIN DECLARE SECTION;
-int     host_a;
-double  host_b;
-char    host_c;
-EXEC SQL END DECLARE SECTION;
-
-EXEC SQL DECLARE csr1 CURSOR FOR
-SELECT a, b, c
-  FROM table1
- WHERE x = :hostvar1;
-
-/* dollar sign notation */
-$DECLARE cursorName CURSOR for
-  SELECT
-    a,
-    b
-  INTO
-    $struct->a,
-    $struct->b
-  FROM table;
-
-/*----------------------------------------------------------------*/
-void main (void)
-{
-        hostvar1 = 42;
-
-        EXEC SQL OPEN csr1;
-        if (sqlcode < 0)
-                exit(0);
-
-        while (rc >= 0 && rc != 100)
-        {
-                EXEC SQL FETCH csr1 INTO :host_a, :host_b, :host_c;
-                printf("Fetch %d, %lf, %s\n", host_a, host_b, host_c);
-        }
-
-        EXEC SQL CLOSE csr1;
-}
-
-void foo(void)
-{
-	strcpy(demoquery1,"some SQL statement");
-	EXEC SQL prepare demo3id from :demoquery1;
-	/* a comment */
-	EXEC SQL declare demo3cursor cursor for demo3id;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/sta-select.sqc
deleted file mode 100644
index 863edf5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/sta-select.sqc
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************
-**
-** A sample program that demonstrates the use of Static embedded SQL.
-** Before compiling this program, be sure you have created a table
-** called video and inserted some tuples in it. 
-**
-********************************************************/
-#include <stdio.h>
-
-/* sqlca: is the sql communications area. All error codes
-   are returned from db2 in that structure which is filled
-   each time an interaction with db2 takes place.
-*/
-
-EXEC SQL INCLUDE SQLCA;          /* SQL communication area structure */
-
-EXEC SQL BEGIN DECLARE SECTION;  /* declare host variables    */
- char db_name[8];                /* database name             */
- char video_title[30];           /* title of the video        */
- short video_id;                 /* serial number             */
- char director[20];              /* director name             */
-EXEC SQL END DECLARE SECTION;
-
-/* These lines are redundant here because the default
-   action is to continue. They just show the kind of
-   errors that could arise and one way to control them.
-*/
-
-EXEC SQL WHENEVER SQLWARNING CONTINUE;  /* sqlca.sqlcode > 0    */
-EXEC SQL WHENEVER SQLERROR CONTINUE;    /* sqlca.sqlcode < 0    */
-EXEC SQL WHENEVER NOT FOUND CONTINUE;   /* sqlca.sqlcode = 100  */
-                                        /* sqlca.sqlcode = 0 (no error) */
-
-void main() {
-
-strcpy(db_name, "csc343h");
-
-/* C variables are preceded by a colon when they are passed to DB2 */
-
-EXEC SQL CONNECT TO :db_name;
-
-if (sqlca.sqlcode != 0) {
-        printf("Connect failed!: reason %ld\n", sqlca.sqlcode);
-        exit(1);
-}
-
-/* cursor delcaration. Have to declare a cursor each time you
-   want tuples back from db2
-*/
-
-EXEC SQL DECLARE c1 CURSOR FOR
-        SELECT video_title
-        FROM video;
-
-/* you have to open the cursor in order to get tuples back */
-
-EXEC SQL OPEN c1;
-
-do {
-
-  /* fetch tuples from the cursor. This will execute the statement
-     the cursor implements and will return the results */
-
-  EXEC SQL FETCH c1 into :video_title;
-  if (SQLCODE != 0) break;	/* SQLCODE refers to sqlca.sqlcode */
-
-  /* host variables should have ':' prefix when they are used in DB2 commands */
-
-  printf("%s\n",video_title);
-
-} while (1);
-EXEC SQL CLOSE c1;
-EXEC SQL CONNECT RESET;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2090.vala
deleted file mode 100644
index 22698792..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2090.vala
+++ /dev/null
@@ -1 +0,0 @@
-int? some_int = null;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2270.vala
deleted file mode 100644
index 7bb897d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2270.vala
+++ /dev/null
@@ -1 +0,0 @@
-new Gtk.Label (_("Label text"));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/advanced.vala
deleted file mode 100644
index 2b85c031..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/advanced.vala
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Advanced Vala Sample Code */
-using GLib;
-public class Sample : Object {
-   public string name { get; set; }
-      public signal void foo ();
-     public Sample (construct string! name) {
-  }
-public void run () {
-          foo += s => {
-                      stdout.printf ("Lambda expression %s!\n", name);
-  };
-
-         /* Calling lambda expression */
-            foo ();
-    }
-    static int main (string[] args) {
-           foreach (string arg in args) {
-                       var sample = new Sample (arg);
-                      sample.run ();
-                     /* Object will automatically be freed
-                      * at the end of the block */
-       }
-      return 0;
-    }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/gh287.vala
deleted file mode 100644
index fcb6fca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/gh287.vala
+++ /dev/null
@@ -1,32 +0,0 @@
-int main () {
-        key_press_event.connect ((e) => {
-            switch (e.keyval) {
-                case Gdk.Key.@0:
-                    if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0) {
-                        action_zoom_default_font ();
-                        return true;
-                    }
-
-                    break;
-                case Gdk.Key.@1: //alt+[1-8]
-                case Gdk.Key.@7:
-                case Gdk.Key.@8:
-                    if (((e.state & Gdk.ModifierType.MOD1_MASK) != 0) && settings.alt_changes_tab) {
-                        var i = e.keyval - 49;
-                        if (i > notebook.n_tabs - 1)
-                            return false;
-
-                        notebook.current = notebook.get_tab_by_index ((int) i);
-                        return true;
-                    }
-
-                    break;
-                default:
-                    assert_not_reached () ;
-            }
-
-            return false;
-        });
-        
-    return 0 ; 
-    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/list.vala
deleted file mode 100644
index e9b48acc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/list.vala
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-using GLib;
-
-public class GListTest : Object
-{
- public GListTest { }
-
-    static int main (string[] args) {
-     List<string> list;
-            list.append("TestString1");
-  list.append("myTest");
-        message ("list.length()=%d", list.length());
-
-	for ( int i = 0; i < list.length(); i++) {
-                    string list2 = list.nth_data(i);
-                    message ("%s", list2);
-                }
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/preproc.vala
deleted file mode 100644
index 3ab2ccc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/preproc.vala
+++ /dev/null
@@ -1,10 +0,0 @@
-int main () {
-#if WANT_TO_COMPILE_THIS
-gtkwidget.clicked.connect( (widdget) => { message ("Clicked" ) ; }) ;
-#else
-gtkwidget.enabled.connect( (widdget) => {
-message ("Clicked" ) ;
-}) ;
-#endif
-return 0 ;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str.vala
deleted file mode 100644
index 11f19c01..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str.vala
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Advanced Vala Sample Code */
-using GLib;
-public class Sample : Object {
-   public string name { get; set; }
-      public signal void foo ();
-     public Sample (construct string! name) {
-  }
-public void run () {
-          foo += s => {
-                      stdout.printf ("Lambda expression %s!\n", name);
-  };
-
-         /* Calling lambda expression */
-            foo ();
-    }
-    static int main (string[] args) {
-       string sql = """ SELECT name "my_name" 
-                        FROM table
-                        WHERE id='4'
-                  """ ;
-         var where = """ WHERE name LIKE '%blah% 
-         """ ;
-           foreach (string arg in args) {
-                       var sample = new Sample (arg);
-                      sample.run ();
-                     /* Object will automatically be freed
-                      * at the end of the block */
-       }
-      return 0;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str2.vala
deleted file mode 100644
index 9d8798b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str2.vala
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Advanced Vala Sample Code */
-using GLib;
-public class Sample : Object {
-   public string name { get; set; }
-      public signal void foo ();
-     public Sample (construct string! name) {
-  }
-public void run () {
-          foo += s => {
-                      stdout.printf ("Lambda expression %s!\n", name);
-  };
-
-         /* Calling lambda expression */
-            foo ();
-    }
-    static int main (string[] args) {
-       string sql = """SELECT name	"my_name"
-	FROM table
-	WHERE id='4'
-""" ;
-         var where = """ WHERE name LIKE '%blah%
-	""" ;
-           foreach (string arg in args) {
-                       var sample = new Sample (arg);
-                      sample.run ();
-                     /* Object will automatically be freed
-                      * at the end of the block
-                      * a	tab	b
-                      * c	tab	d
-                      */
-       }
-      return 0;
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/java.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/java.test
deleted file mode 100644
index 314b8778..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/java.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Test cases specifically for the Java language.
-#
-# Range: 80000 - 89999
-# test.name  config.file  input.file
-
-80000  ben_099.cfg                          java/assert.java
-80010  annotation.cfg                       java/annotation1.java
-80011  empty.cfg                            java/annotation2.java
-80012  nl_after_annotation-f.cfg            java/annotation2.java
-80013  nl_between_annotation-f.cfg          java/annotation2.java
-80014  annotation.cfg                       java/annotation2.java
-80020  java_foreach.cfg                     java/foreach.java
-80030  indent_var_def.cfg                   java/variable_aligns.java
-80040  empty.cfg                            java/try.java
-80050  jdbi-r.cfg                           java/double_brace.java
-80051  jdbi-f.cfg                           java/double_brace.java
-80060  java_synchronized_1.cfg              java/synchronized.java
-80061  java_synchronized_2.cfg              java/synchronized.java
-80062  sp_this_paren.cfg                    java/sp_this_paren.java
-80063  empty.cfg                            java/i1121.java
-80064  mod_add_long_class_closebrace_comment-1.cfg  java/long_cl_cmt.java
-80065  empty.cfg                            java/Java8DoubleColon.java
-80066  sp_after_for_colon.cfg               java/sp_after_for_colon.java
-80067  doxy-javadoc-alignment.cfg           java/doxy-javadoc-alignment.java
-
-80100  align_same_func_call_params-t.cfg    java/sf567.java
-
-80200  sp_before_byref-r.cfg                java/sp_before_byref.java
-80201  template_angles.cfg                  java/generics.java
-80202  aet.cfg                              java/generics_wildcard.java
-80203  aet.cfg                              java/generics_return_type.java
-80204  aet.cfg                              java/cast.java
-80205  aet.cfg                              java/sp_after_angle.java
-80206  aet.cfg                              java/annotation3.java
-
-80300  Issue_670.cfg                        java/Issue_670.java
-80301  issue_672.cfg                        java/issue_672.java
-80302  Issue_1845.cfg                       java/Issue_1845.java
-80303  Issue_1122.cfg                       java/Issue_1122.java
-80304  Issue_1124-f.cfg                     java/Issue_1124.java
-80305  Issue_1124-r.cfg                     java/Issue_1124.java
-80306  leading-tabs-for-java-lambda.cfg     java/leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/objective-c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/objective-c.test
deleted file mode 100644
index 23e02a10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/objective-c.test
+++ /dev/null
@@ -1,180 +0,0 @@
-# Test cases specifically for the Objective C language.
-#
-# Range: 50000 - 59999
-# test.name  config.file  input.file
-
-# The .h file needs a language override
-50001  oc1.cfg                              oc/Fraction.h                   OC
-50002  oc2.cfg                              oc/Fraction.m
-50003  oc2.cfg                              oc/main.m
-50004  oc4.cfg                              oc/string.m
-50005  oc5.cfg                              oc/Declarations.h               OC
-50006  oc6.cfg                              oc/exceptions.m
-50007  oc7.cfg                              oc/misc.m
-50008  oc8.cfg                              oc/protocol.m
-50009  oc9.cfg                              oc/literals.mm
-
-50010  sp_after_oc_return_type_add.cfg      oc/return_type.m
-50011  sp_after_oc_return_type_force.cfg    oc/return_type.m
-50012  sp_after_oc_return_type_remove.cfg   oc/return_type.m
-
-50014  sp_oc_classname_paren-r.cfg          oc/sp_oc_classname_paren-r.m
-50015  oc10.cfg                             oc/receiver.m
-
-50016  oc11.cfg                             oc/ternary.m
-50017  ternary_short.cfg                    oc/ternary.m
-
-50018  indent_inside_ternary_operator.cfg   oc/indent-inside-ternary-operator.m
-
-50020  sp_after_oc_at_sel_add.cfg           oc/selector.m
-50021  sp_after_oc_at_sel_force.cfg         oc/selector.m
-50022  sp_after_oc_at_sel_remove.cfg        oc/selector.m
-
-50025  oc6.cfg                              oc/exceptions.m
-50026  sp_after_throw_remove.cfg            oc/exceptions.m
-
-50030  sort_imports.cfg                     oc/sort_import.m
-50031  mod_sort_incl_import_prioritize_filename.cfg oc/sort_import.m
-50032  mod_sort_incl_import_ignore_extension.cfg oc/sort_import.m
-50033  mod_sort_incl_import_prioritize_extensionless.cfg oc/sort_import.m
-50034  mod_sort_incl_import_prioritize_angle_over_quotes.cfg oc/sort_import.m
-50035  mod_sort_incl_import_grouping_enabled.cfg oc/sort_import_group.m
-
-50040  objc_complex_method.cfg              oc/complex_method.m
-
-50050  objc_complex_method.cfg              oc/real_world_file.m
-
-50060  align_oc_msg_colon_span-1.cfg        oc/oc-split.m
-50061  bug_167.cfg                          oc/bug_167.m
-
-50062  aet.cfg                              oc/issue_2631.m
-
-50070  blocks.cfg                           oc/blocks.m
-50071  sp_before_oc_block_caret_force.cfg   oc/blocks.m
-50072  sp_before_oc_block_caret_remove.cfg  oc/blocks.m
-50073  sp_after_oc_block_caret_add.cfg      oc/blocks.m
-50074  sp_after_oc_block_caret_force.cfg    oc/blocks.m
-50075  blocks.cfg                           oc/blocks.m
-50076  sp_before_oc_block_caret_remove.cfg  oc/blocks.m
-
-50077  blocks.cfg                           oc/more_blocks.m
-50078  sp_before_oc_block_caret_force.cfg   oc/more_blocks.m
-50079  sp_before_oc_block_caret_remove.cfg  oc/more_blocks.m
-50080  sp_after_oc_block_caret_add.cfg      oc/more_blocks.m
-50081  sp_after_oc_block_caret_force.cfg    oc/more_blocks.m
-50082  blocks.cfg                           oc/more_blocks.m
-50083  sp_before_oc_block_caret_remove.cfg  oc/more_blocks.m
-50084  nl_brace_square.cfg                  oc/more_blocks.m
-50085  nl_after_func_body-3.cfg             oc/block_in_method.m
-50086  issue_2643.cfg                       oc/block_in_method.m
-50087  indent_oc_inside_msg_sel.cfg         oc/indent_oc_inside_msg_sel.m
-
-50090  oc12.cfg                             oc/kw.m
-50091  issue_2656.cfg                       oc/block_in_method.m
-
-50095  oc13.cfg                             oc/box.m
-50100  bug_340.cfg                          oc/bug_340.m
-
-50110  oc14.cfg                             oc/msg_align.m
-50111  del_semicolon.cfg                    oc/ns_enum.m
-50112  empty.cfg                            oc/ns_enum.m
-50113  sp_enum_paren-r.cfg                  oc/ns_enum.m
-
-50120  gh137.cfg                            oc/gh137.m
-
-50200  sp_block_as_argument.cfg             oc/more_blocks_2.m
-50201  sp_block_as_argument.cfg             oc/blocks_align.m
-50202  sp_block_as_argument2.cfg            oc/blocks_align.m
-50203  sp_block_as_argument3.cfg            oc/blocks_align.m
-50204  sp_block_as_argument4.cfg            oc/blocks_align.m
-50205  sp_block_as_argument5.cfg            oc/msg_align.m
-50206  aet.cfg                              oc/issue_2727.m
-50207  issue_3031.cfg                       oc/issue_3031.mm
-
-50300  sp_after_send_oc_colon-f.cfg         oc/msg.m
-
-50400  oc16.cfg                             oc/for.m
-
-50410  oc_cond_colon.cfg                    oc/oc_cond_colon.m              OC+
-50411  attribute_specifier_seqs.cfg         oc/attribute_specifier_seqs.mm  OC+
-
-50500  oc17.cfg                             oc/code_placeholder.m
-
-50510  gh293.a.cfg                          oc/gh293.m
-50511  gh293.b.cfg                          oc/gh293.m
-50512  sp_oc_catch.cfg                      oc/sp_oc_catch.m
-50513  sp_oc_boxed.cfg                      oc/sp_oc_boxed.m
-50514  indent_boxed.cfg                     oc/indent_boxed.m
-50515  sp_oc_synchronized.cfg               oc/sp_oc_synchronized.m
-
-50600  nl_oc_block_brace-f.cfg              oc/bug_i_477.m
-50601  empty.cfg                            oc/bug_i_408.m
-50602  bug_i_125-412.cfg                    oc/bug_i_125-412.m
-50603  oc18.cfg                             oc/gh511.m
-50604  objc_bug_497.cfg                     oc/bug_497.m
-50605  empty.cfg                            oc/bug_404.m
-50606  oc19.cfg                             oc/bug_1366.m
-50607  aet-sp_after_oc_msg_receiver.cfg     oc/sp_after_oc_msg_receiver.m
-50608  aet.cfg                              oc/blocks_align2.m
-50609  sp_arith-f.cfg                       oc/negative_value.m
-50610  aet.cfg                              oc/nelem.m
-50611  aet.cfg                              oc/for2.m
-50612  aet.cfg                              oc/chunk_ends_type1.m
-50613  aet.cfg                              oc/chunk_ends_type2.m
-50614  aet.cfg                              oc/chunk_ends_type3.m
-50615  aet.cfg                              oc/block_literal_protocol.m
-50616  aet.cfg                              oc/oc_msg_in_pp.m
-50617  aet.cfg                              oc/boxed_receiver.m
-50618  aet-func_def.cfg                     oc/func_def.mm
-50619  aet.cfg                              oc/cast.m
-50620  aet.cfg                              oc/sp_after_angle.m
-50621  aet.cfg                              oc/Fraction.h
-50622  aet.cfg                              oc/c-cpp-oc-wrapper.c
-50623  aet.cfg                              oc/extern-c-attribute.m
-50624  aet.cfg                              oc/typeof.m
-50625  aet-sp_inside_braces_oc_dict.cfg     oc/sp_inside_braces_oc_dict.m
-50626  aet.cfg                              oc/chunk_ends_type4.m
-50627  aet.cfg                              oc/method_ends_semicolon.m
-50628  aet.cfg                              oc/macro-close-brace.m
-50629  aet.cfg                              oc/pp_bool.m
-
-50630  nl_func_call_args_multi_line_ignore_closures.cfg oc/nl_func_call_args_multi_line_ignore_closures.m
-
-50700  cmt_insert-0.cfg                     oc/cmt_insert.m
-50701  cmt_insert-0.cfg                     oc/cmt_insert2.m
-
-50800  obj-c-properties.cfg                 oc/properties.m
-50801  empty.cfg                            oc/i1213.m
-50802  obj-c-available.cfg                  oc/available.m
-50803  indent_single_newline.cfg            oc/indent_single_newline.m
-
-50804  aet.cfg                              oc/issue_2629.m
-50805  aet.cfg                              oc/issue_2724.m
-
-50810  bug_841.cfg                          oc/bug_841.m
-50811  oc_bug_1674.cfg                      oc/bug_1674.m
-50812  oc_bug_1683.cfg                      oc/bug_1683.m
-
-50813  sp_before_oc_proto_list_add.cfg      oc/sp_before_oc_proto_list.m
-50814  sp_before_oc_proto_list_force.cfg    oc/sp_before_oc_proto_list.m
-50815  sp_before_oc_proto_list_remove.cfg   oc/sp_before_oc_proto_list.m
-
-50816  issue_2675.cfg                       oc/issue_2675.m
-50817  aet.cfg                              oc/issue_2722.m
-
-50900  1927.cfg                             oc/1927.m
-50901  Issue_2172.cfg                       oc/Issue_2172.m
-50902  empty.cfg                            oc/Issue_2289.m
-50903  Issue_681.cfg                        oc/Issue_681.oc
-
-50904  double_angle_space_1.cfg             oc/double_angle_space.m
-50905  double_angle_space_2.cfg             oc/double_angle_space.m
-50906  double_angle_space_3.cfg             oc/double_angle_space.m
-
-#
-# adopt tests from UT
-10018  delete-space-oc.cfg                  oc/delete-space-oc.mm
-10019  empty.cfg                            oc/func-param-wrap-oc.mm
-10020  align-objc-like-xcode.cfg            oc/align-objc-like-xcode.m
-10021  double-indent-objc-dict.cfg          oc/double-indent-objc-dict.m
-10022  indent-objc-block.cfg                oc/indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/pawn.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/pawn.test
deleted file mode 100644
index 7f92b452..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/pawn.test
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Test cases specifically for the Pawn language.
-#
-# Range: 60000 - 69999
-# test.name  config.file  input.file
-
-60000  pawn.cfg                             pawn/functions.pawn
-60001  pawn.cfg                             pawn/comment.p
-60002  pawn.cfg                             pawn/traffic.p
-60003  pawn.cfg                             pawn/tags.pawn
-60004  pawn.cfg                             pawn/enum.pawn
-60005  pawn.cfg                             pawn/unbraced.p
-
-60010  pawn-escape.cfg                      pawn/str-escape.p
-
-60020  pawn-escape.cfg                      pawn/switch-vsemi.sma
-
-60030  amxmodx.cfg                          pawn/crusty_ex-1.sma
-
-60040  amxmodx.cfg                          pawn/preproc.pawn
-
-60050  mod_full_brace_function-f.cfg        pawn/gh419.pawn
-
-60100  Issue_2586.cfg                       pawn/Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_format_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_format_tests.py
deleted file mode 100755
index 671188c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_format_tests.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-#
-# Reads tests from the .test files on the command line (or the built-in set)
-# and runs them, or writes a CTest script to run them.
-#
-# * @author  Ben Gardner        October 2009
-# * @author  Guy Maurel         October 2015
-# * @author  Matthew Woehlke    June 2018
-#
-
-import argparse
-import os
-import sys
-
-import test_uncrustify as tu
-
-
-# -----------------------------------------------------------------------------
-def main(argv):
-    parser = argparse.ArgumentParser(description='Run uncrustify format tests')
-    tu.add_format_tests_arguments(parser)
-    args = tu.parse_args(parser)
-
-    # Read tests
-    tests = []
-    print('Tests: {!s}'.format(args.tests))
-    for group in args.tests:
-        tests_file = os.path.join(tu.test_dir, '{}.test'.format(group))
-        tests += tu.read_format_tests(tests_file, group)
-
-    if args.write_ctest:
-        tu.config.python_exe = args.python
-        tu.config.uncrustify_exe = tu.fixup_ctest_path(
-            tu.config.uncrustify_exe, args.cmake_config)
-
-        with open(args.write_ctest, 'wt') as f:
-            for test in tests:
-                test.print_as_ctest(f)
-
-    else:
-        if args.select:
-            s = tu.Selector(args.select)
-        else:
-            s = None
-
-        counts = tu.run_tests(tests, args, s)
-        tu.report(counts)
-
-        if counts['failing'] > 0:
-            sys.exit(2)
-        if counts['mismatch'] > 0 or counts['unstable'] > 0:
-            sys.exit(1)
-
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_sources_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_sources_tests.py
deleted file mode 100755
index ebbc6623..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_sources_tests.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-#
-# Checks the formatting of uncrustify's own sources.
-#
-# * @author  Matthew Woehlke    June 2018
-#
-
-import argparse
-import os
-import sys
-
-import test_uncrustify as tu
-
-
-# -----------------------------------------------------------------------------
-def main(argv):
-    parser = argparse.ArgumentParser(description='Run uncrustify source tests')
-    tu.add_source_tests_arguments(parser)
-    args = tu.parse_args(parser)
-
-    # Get required filesystem information
-    root = os.path.dirname(tu.test_dir)
-    src_dir = os.path.join(root, 'src')
-    config = os.path.join(root, 'forUncrustifySources.cfg')
-
-    # Create tests
-    tests = []
-    for s in os.listdir(src_dir):
-        if os.path.splitext(s)[1] in ('.cpp', '.h'):
-            t = tu.SourceTest()
-            filepath = os.path.join(src_dir, s)
-            t.build(test_input=filepath, test_lang='CPP', test_config=config,
-                    test_expected=filepath)
-            tests.append(t)
-
-    counts = tu.run_tests(tests, args)
-    tu.report(counts)
-
-    if counts['failing'] > 0:
-        sys.exit(2)
-    if counts['mismatch'] > 0:
-        sys.exit(1)
-
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_test.py
deleted file mode 100755
index 7b5a9d57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_test.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-#
-# Runs a single test. Results are printed out.
-#
-# * @author  Matthew Woehlke    June 2018
-#
-
-import test_uncrustify as tu
-
-import argparse
-import sys
-
-
-# -----------------------------------------------------------------------------
-def main():
-    parser = argparse.ArgumentParser(description='Run uncrustify test')
-    tu.add_test_arguments(parser)
-    args = tu.parse_args(parser)
-
-    test = tu.FormatTest()
-    test.build_from_args(args)
-
-    try:
-        test.run(args)
-    except tu.Failure as f:
-        sys.stderr.write('{}\n'.format(f))
-        sys.exit(-1)
-
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-if __name__ == '__main__':
-    main()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/staging.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/staging.test
deleted file mode 100644
index 8c5284d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/staging.test
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This file contains tests that are failing and need resolution
-#
-# Range: reserve ID from dedicated language range
-# test.name  config.file  input.file  lang
-
-19000~ UNI-58354.cfg                        cs/UNI-58354.cs     CS
-39000~ UNI-64325.cfg                        cpp/UNI-64325.cpp   CPP
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/__init__.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/__init__.py
deleted file mode 100644
index bf83b667..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Entry point for uncrustify test utilities.
-#
-# * @author  Matthew Woehlke    June 2018
-#
-
-from .ansicolor import printc
-
-from .config import config, test_dir, all_tests
-
-from .failure import (Failure, ExecutionFailure, MissingFailure,
-                      MismatchFailure, UnstableFailure)
-
-from .selector import Selector
-
-from .test import SourceTest, FormatTest
-
-from .utilities import (add_test_arguments, add_format_tests_arguments,
-                        add_source_tests_arguments, parse_args, run_tests,
-                        read_format_tests, report, fixup_ctest_path)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/ansicolor.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/ansicolor.py
deleted file mode 100644
index 44d6dbd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/ansicolor.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Print in color, if possible.
-#
-# * @author  Matthew Woehlke    June 2018
-#
-
-# Curses setup might fail...
-try:
-    import curses
-    import sys
-
-    curses.setupterm()
-
-    if sys.stdout.isatty():
-        def _tparm(p, *args):
-            return curses.tparm(p, *args).decode('ascii')
-
-        _setf = curses.tigetstr('setaf') or curses.tigetstr('setf')
-        _setb = curses.tigetstr('setab') or curses.tigetstr('setb')
-        _bold = curses.tigetstr('bold')
-        _reset = _tparm(curses.tigetstr('sgr0'))
-
-    else:
-        def _tparm(p, *args):
-            return ''
-
-        _setf = ''
-        _setb = ''
-        _bold = ''
-        _reset = ''
-
-    # -------------------------------------------------------------------------
-    def printc(ctext, ntext='', fore=None, back=None, bold=False):
-        reset = ""
-
-        if bold:
-            ctext = _tparm(_bold) + ctext
-            reset = _reset
-
-        if fore is not None:
-            ctext = _tparm(_setf, fore) + ctext
-            reset = _reset
-
-        if back is not None:
-            ctext = _tparm(_setf, back) + ctext
-            reset = _reset
-
-        print(ctext + reset + ntext)
-
-# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-# ...so if something went wrong, provide a fall-back instead
-except Exception:
-    # -------------------------------------------------------------------------
-    def printc(ctext, ntext, *args, **kwargs):
-        print(ctext + ntext)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/config.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/config.py
deleted file mode 100644
index 4370816d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/config.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Global state.
-#
-# * @author  Ben Gardner        October 2009
-# * @author  Guy Maurel         October 2015
-# * @author  Matthew Woehlke    June 2018
-#
-
-import os
-
-test_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-
-# sorted by lexicographic order
-all_tests = [
-    'c-sharp',
-    'c',
-    'cpp',
-    'd',
-    'ecma',
-    'imported',
-    'java',
-    'objective-c',
-    'pawn',
-    'staging',
-    'vala',
-]
-
-FAIL_ATTRS     = {'bold': True}
-PASS_ATTRS     = {'fore': 2}  # Green
-MISMATCH_ATTRS = {'fore': 1}  # Red
-UNSTABLE_ATTRS = {'fore': 6}  # Cyan
-SKIP_ATTRS     = {'fore': 3}  # Yellow
-
-
-# =============================================================================
-class config(object):
-    uncrustify_exe = None
-    python_exe = None
-    git_exe = 'git'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/failure.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/failure.py
deleted file mode 100644
index 0972930f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/failure.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# Exceptions when a test fails.
-#
-# * @author  Matthew Woehlke    June 2018
-#
-
-
-# =============================================================================
-class Failure(Exception):
-    pass
-
-# =============================================================================
-class TestDeclarationParseError(Failure):
-    # -------------------------------------------------------------------------
-    def __init__(self, test_suite, line_number):
-        self.test_suite = test_suite
-        self.line_number = line_number
-
-    # -------------------------------------------------------------------------
-    def __str__(self):
-        return 'Error parsing line {!r} from the {!r} test suite'.format(
-            self.line_number, self.test_suite)
-
-
-# =============================================================================
-class ExecutionFailure(Failure):
-    # -------------------------------------------------------------------------
-    def __init__(self, exception):
-        self.exception = exception
-
-    # -------------------------------------------------------------------------
-    def __str__(self):
-        return str(self.exception)
-
-
-# =============================================================================
-class MissingFailure(Failure):
-    # -------------------------------------------------------------------------
-    def __init__(self, exception, missing_path):
-        self.exception = exception
-        self.missing_path = missing_path
-
-    # -------------------------------------------------------------------------
-    def __str__(self):
-        return 'Expected output file not found: {!r}'.format(self.missing_path)
-
-
-# =============================================================================
-class MismatchFailure(Failure):
-    # -------------------------------------------------------------------------
-    def __init__(self, expected, actual):
-        self.expected_path = expected
-        self.actual_path = actual
-
-    # -------------------------------------------------------------------------
-    def __str__(self):
-        return 'Output {!r} does not match expected output {!r}'.format(
-            self.actual_path, self.expected_path)
-
-
-# =============================================================================
-class UnstableFailure(Failure):
-    # -------------------------------------------------------------------------
-    def __init__(self, expected, actual):
-        self.expected_path = expected
-        self.actual_path = actual
-
-    # -------------------------------------------------------------------------
-    def __str__(self):
-        return 'Output {!r} does not match expected output {!r}'.format(
-            self.actual_path, self.expected_path)
-
-# =============================================================================
-class UnexpectedlyPassingFailure(Failure):
-    # -------------------------------------------------------------------------
-    def __init__(self, expected, actual):
-        self.expected_path = expected
-        self.actual_path = actual
-
-    # -------------------------------------------------------------------------
-    def __str__(self):
-        return 'Output {!r} unexpectedly matches expected output {!r}'.format(
-            self.actual_path, self.expected_path)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/selector.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/selector.py
deleted file mode 100644
index 93646257..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/selector.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Utility class to match test filters.
-#
-# * @author  Matthew Woehlke    June 2018
-#
-
-
-# =============================================================================
-class Selector(object):
-    # -------------------------------------------------------------------------
-    def __init__(self, s):
-        class Range(object):
-            pass
-
-        self.ranges = []
-        for p in s.split(','):
-            r = Range()
-            if ':' in p:
-                r.group, p = p.split(':')
-            else:
-                r.group = None
-            if '-' in p:
-                r.lower, r.upper = map(int, p.split('-'))
-            else:
-                r.lower = int(p)
-                r.upper = int(p)
-            self.ranges.append(r)
-
-    # -------------------------------------------------------------------------
-    def test(self, name):
-        group, num = name.split(':')
-        num = int(num)
-
-        for r in self.ranges:
-            if r.group is not None and r.group != group:
-                continue
-            if num < r.lower or num > r.upper:
-                continue
-            return True
-
-        return False
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/test.py
deleted file mode 100644
index 5f33fbbb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/test.py
+++ /dev/null
@@ -1,292 +0,0 @@
-# Class encapsulating a unit test.
-#
-# * @author  Ben Gardner        October 2009
-# * @author  Guy Maurel         October 2015
-# * @author  Matthew Woehlke    June 2018
-#
-
-import filecmp
-import os
-import re
-import subprocess
-import sys
-import errno
-
-from .ansicolor import printc
-from .config import (config, test_dir, FAIL_ATTRS, PASS_ATTRS,
-                     MISMATCH_ATTRS, UNSTABLE_ATTRS)
-from .failure import (ExecutionFailure, MismatchFailure, MissingFailure,
-                      TestDeclarationParseError, UnexpectedlyPassingFailure,
-                      UnstableFailure)
-
-
-# =============================================================================
-class SourceTest(object):
-    # -------------------------------------------------------------------------
-    def __init__(self):
-        self.test_result_dir = 'results'
-
-        self.diff_text = 'MISMATCH'
-        self.diff_attrs = MISMATCH_ATTRS
-        self.diff_exception = MismatchFailure
-
-    # -------------------------------------------------------------------------
-    def _check_attr(self, name):
-        if not hasattr(self, name) or getattr(self, name) is None:
-            raise AttributeError(
-                'Test is missing required attribute {!r}'.format(name))
-
-    # -------------------------------------------------------------------------
-    def _make_abs(self, name, base):
-        path = getattr(self, name)
-        if not os.path.isabs(path):
-            setattr(self, name, os.path.join(test_dir, base, path))
-
-    # -------------------------------------------------------------------------
-    def _diff(self, expected, actual):
-        sys.stdout.flush()
-        cmd = [config.git_exe, 'diff', '--no-index', expected, actual]
-        subprocess.call(cmd)
-
-    # -------------------------------------------------------------------------
-    def build(self, test_input, test_lang, test_config, test_expected):
-        self.test_name = os.path.basename(test_input)
-        self.test_lang = test_lang
-        self.test_input = test_input
-        self.test_config = test_config
-        self.test_expected = test_expected
-        self.test_xfail = False
-
-    # -------------------------------------------------------------------------
-    def _check(self):
-        self._check_attr('test_name')
-        self._check_attr('test_lang')
-        self._check_attr('test_input')
-        self._check_attr('test_config')
-        self._check_attr('test_expected')
-        self._check_attr('test_xfail')
-
-    # -------------------------------------------------------------------------
-    def run(self, args):
-        self._check()
-
-        _expected = self.test_expected
-        _result = os.path.join(args.result_dir, self.test_result_dir,
-                               os.path.basename(os.path.dirname(_expected)),
-                               os.path.basename(_expected))
-
-        if args.verbose:
-            print(self.test_name)
-            print('  Language : {}'.format(self.test_lang))
-            print('     Input : {}'.format(self.test_input))
-            print('    Config : {}'.format(self.test_config))
-            print('  Expected : {}'.format(_expected))
-            print('    Result : {}'.format(_result))
-            print('     XFail : {}'.format(self.test_xfail))
-
-        if not os.path.exists(os.path.dirname(_result)):
-            try:
-                os.makedirs(os.path.dirname(_result))
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    raise
-
-        cmd = [
-            config.uncrustify_exe,
-            '-q',
-            '-l', self.test_lang,
-            '-c', self.test_config,
-            '-f', self.test_input,
-            '-o', _result
-        ]
-        if args.debug:
-            cmd += [
-                '-LA',
-                '-p', _result + '.unc'
-            ]
-
-        else:
-            cmd += ['-LA']
-
-        if args.show_commands:
-            printc('RUN: ', repr(cmd))
-
-        try:
-            output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-        except subprocess.CalledProcessError as exc:
-            output = exc.output
-            if not self.test_xfail:
-                print(output.rstrip())
-                msg = '{} (Uncrustify error code {})'
-                msg = msg.format(self.test_name, exc.returncode)
-                printc('FAILED: ', msg, **FAIL_ATTRS)
-                raise ExecutionFailure(exc)
-            elif args.xdiff:
-                print(output.rstrip())
-        finally:
-            if args.debug:
-                with open(_result + '.log', 'wt') as f:
-                    f.write(output)
-
-        try:
-            has_diff = not filecmp.cmp(_expected, _result)
-            if has_diff and not self.test_xfail:
-                if args.diff:
-                    self._diff(_expected, _result)
-                printc('{}: '.format(self.diff_text),
-                       self.test_name, **self.diff_attrs)
-                raise self.diff_exception(_expected, _result)
-            if not has_diff and self.test_xfail:
-                raise UnexpectedlyPassingFailure(_expected, _result)
-            if has_diff and self.test_xfail:
-                if args.xdiff:
-                    self._diff(_expected, _result)
-                    if not args.show_all:
-                        printc('XFAILED: ', self.test_name, **PASS_ATTRS)
-        except OSError as exc:
-            printc('MISSING: ', self.test_name, **self.diff_attrs)
-            raise MissingFailure(exc, _expected)
-
-
-# =============================================================================
-class FormatTest(SourceTest):
-    pass_config = ['test_config', 'test_rerun_config']
-    pass_input = ['test_input', 'test_expected']
-    pass_expected = ['test_expected', 'test_rerun_expected']
-
-    re_test_declaration = re.compile(r'^(?P<num>\d+)(?P<mark>[~!]*)\s+'
-                          r'(?P<config>\S+)\s+(?P<input>\S+)'
-                          r'(?:\s+(?P<lang>\S+))?$')
-
-    # -------------------------------------------------------------------------
-    def _build_pass(self, i):
-        p = SourceTest()
-
-        p.test_name = self.test_name
-        p.test_lang = self.test_lang
-        p.test_config = getattr(self, self.pass_config[i])
-        p.test_input = getattr(self, self.pass_input[i])
-        p.test_expected = getattr(self, self.pass_expected[i])
-        p.test_xfail = self.test_xfail
-        if i == 1 and not os.path.exists(p.test_expected):
-            p.test_expected = getattr(self, self.pass_expected[0])
-
-        return p
-
-    # -------------------------------------------------------------------------
-    def _build_passes(self):
-        self._check()
-        self._check_attr('test_rerun_config')
-        self._check_attr('test_rerun_expected')
-
-        self._make_abs('test_input', 'input')
-        self._make_abs('test_config', 'config')
-        self._make_abs('test_expected', 'expected')
-        self._make_abs('test_rerun_config', 'config')
-        self._make_abs('test_rerun_expected', 'expected')
-
-        self.test_passes = [
-            self._build_pass(0),
-            self._build_pass(1)]
-
-        self.test_passes[1].test_name = self.test_name + ' (re-run)'
-        self.test_passes[1].test_result_dir = 'results_2'
-        self.test_passes[1].diff_text = 'UNSTABLE'
-        self.test_passes[1].diff_attrs = UNSTABLE_ATTRS
-        self.test_passes[1].diff_exception = UnstableFailure
-
-    # -------------------------------------------------------------------------
-    def build_from_declaration(self, decl, group, line_number):
-        match = self.re_test_declaration.match(decl)
-        if not match:
-            raise TestDeclarationParseError(group, line_number)
-
-        num = match.group('num')
-        is_rerun = ('!' in match.group('mark'))
-        is_xfail = ('~' in match.group('mark'))
-
-        self.test_xfail = is_xfail
-
-        self.test_config = match.group('config')
-        self.test_input = match.group('input')
-
-        test_dir = os.path.dirname(self.test_input)
-        test_filename = os.path.basename(self.test_input)
-
-        if match.group('lang'):
-            self.test_lang = match.group('lang')
-        else:
-            self.test_lang = test_dir
-
-        self.test_expected = os.path.join(
-            test_dir, '{}-{}'.format(num, test_filename))
-
-        def rerun_file(name):
-            parts = name.split('.')
-            return '.'.join(parts[:-1] + ['rerun'] + parts[-1:])
-
-        if is_rerun:
-            self.test_rerun_config = rerun_file(self.test_config)
-            self.test_rerun_expected = rerun_file(self.test_expected)
-        else:
-            self.test_rerun_config = self.test_config
-            self.test_rerun_expected = self.test_expected
-
-        self.test_name = '{}:{}'.format(group, num)
-
-        self._build_passes()
-
-    # -------------------------------------------------------------------------
-    def build_from_args(self, args):
-        self.test_name = args.name
-        self.test_lang = args.lang
-        self.test_input = args.input
-        self.test_config = args.config
-        self.test_expected = args.expected
-        self.test_rerun_config = args.rerun_config or args.config
-        self.test_rerun_expected = args.rerun_expected or args.expected
-        self.test_xfail = args.xfail
-
-        self._build_passes()
-
-    # -------------------------------------------------------------------------
-    def print_as_ctest(self, out_file=sys.stdout):
-        self._check()
-
-        def to_cmake_path(obj):
-            if type(obj) is dict:
-                return {k: to_cmake_path(v) for k, v in obj.items()}
-            if type(obj) is str:
-                return obj.replace(os.sep, '/')
-            return obj
-
-        runner = os.path.join(test_dir, 'run_test.py')
-
-        out_file.write(
-            ('add_test({test_name}\n' +
-             '  "{python_exe}" -S "{test_runner}" "{test_name}"\n' +
-             '    --executable     "{uncrustify_exe}"\n' +
-             '    --lang           "{test_lang}"\n' +
-             '    --input          "{test_input}"\n' +
-             '    --config         "{test_config}"\n' +
-             '    --expected       "{test_expected}"\n' +
-             '    --rerun-config   "{test_rerun_config}"\n' +
-             '    --rerun-expected "{test_rerun_expected}"\n' +
-             '    -d --git         "{git_exe}"\n' +
-             '{xfail}' +
-             ')\n').format(
-                 test_runner=to_cmake_path(runner),
-                 python_exe=to_cmake_path(config.python_exe),
-                 uncrustify_exe=to_cmake_path(config.uncrustify_exe),
-                 git_exe=to_cmake_path(config.git_exe),
-                 xfail=('    --xfail\n' if self.test_xfail else ''),
-                 **to_cmake_path(self.__dict__)))
-        out_file.write(
-            ('set_tests_properties({}\n' +
-             '  PROPERTIES LABELS "{}"\n)\n').format(
-                 self.test_name, self.test_name.split(':')[0]))
-
-    # -------------------------------------------------------------------------
-    def run(self, args):
-        for p in self.test_passes:
-            p.run(args)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/utilities.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/utilities.py
deleted file mode 100644
index 2d930222..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/utilities.py
+++ /dev/null
@@ -1,210 +0,0 @@
-# Logic for listing and running tests.
-#
-# * @author  Ben Gardner        October 2009
-# * @author  Guy Maurel         October 2015
-# * @author  Matthew Woehlke    June 2018
-#
-
-import argparse
-import os
-import subprocess
-import sys
-
-from .ansicolor import printc
-from .config import config, all_tests, FAIL_ATTRS, PASS_ATTRS, SKIP_ATTRS
-from .failure import (Failure, MismatchFailure, UnexpectedlyPassingFailure,
-                      UnstableFailure)
-from .test import FormatTest
-
-
-# -----------------------------------------------------------------------------
-def _add_common_arguments(parser):
-    parser.add_argument('-c', '--show-commands', action='store_true',
-                        help='show commands')
-
-    parser.add_argument('-v', '--verbose', action='store_true',
-                        help='show detailed test information')
-
-    parser.add_argument('-d', '--diff', action='store_true',
-                        help='show diff on failure')
-
-    parser.add_argument('-x', '--xdiff', action='store_true',
-                        help='show diff on expected failure')
-
-    parser.add_argument('-g', '--debug', action='store_true',
-                        help='generate debug files (.log, .unc)')
-
-    parser.add_argument('-e', '--executable', type=str, required=True,
-                        metavar='PATH',
-                        help='uncrustify executable to test')
-
-    parser.add_argument('--git', type=str, default=config.git_exe,
-                        metavar='PATH',
-                        help='git executable to use to generate diffs')
-
-    parser.add_argument('--result-dir', type=str, default=os.getcwd(),
-                        metavar='DIR',
-                        help='location to which results will be written')
-
-
-# -----------------------------------------------------------------------------
-def add_test_arguments(parser):
-    _add_common_arguments(parser)
-
-    parser.add_argument("name",                 type=str, metavar='NAME')
-    parser.add_argument("--lang",               type=str, required=True)
-    parser.add_argument("--input",              type=str, required=True)
-    parser.add_argument("--config",             type=str, required=True)
-    parser.add_argument("--expected",           type=str, required=True)
-    parser.add_argument("--rerun-config",       type=str, metavar='INPUT')
-    parser.add_argument("--rerun-expected",     type=str, metavar='CONFIG')
-    parser.add_argument("--xfail",              action='store_true')
-
-
-# -----------------------------------------------------------------------------
-def add_source_tests_arguments(parser):
-    _add_common_arguments(parser)
-
-    parser.add_argument('-p', '--show-all', action='store_true',
-                        help='show passed/skipped tests')
-
-
-# -----------------------------------------------------------------------------
-def add_format_tests_arguments(parser):
-    _add_common_arguments(parser)
-
-    parser.add_argument('-p', '--show-all', action='store_true',
-                        help='show passed/skipped tests')
-
-    parser.add_argument('-r', '--select', metavar='CASE(S)', type=str,
-                        help='select tests to be executed')
-
-    parser.add_argument('tests', metavar='TEST', type=str, nargs='*',
-                        default=all_tests,
-                        help='test(s) to run (default all)')
-
-    # Arguments for generating the CTest script; users should not use these
-    # directly
-    parser.add_argument("--write-ctest", type=str, help=argparse.SUPPRESS)
-    parser.add_argument("--cmake-config", type=str, help=argparse.SUPPRESS)
-    parser.add_argument("--python", type=str, help=argparse.SUPPRESS)
-
-
-# -----------------------------------------------------------------------------
-def parse_args(parser):
-    args = parser.parse_args()
-
-    if args.git is not None:
-        config.git_exe = args.git
-
-    config.uncrustify_exe = args.executable
-    if not os.path.exists(config.uncrustify_exe):
-        msg = 'Specified uncrustify executable {!r} does not exist'.format(
-            config.uncrustify_exe)
-        printc("FAILED: ", msg, **FAIL_ATTRS)
-        sys.exit(-1)
-
-    # Do a sanity check on the executable
-    try:
-        with open(os.devnull, 'w') as bitbucket:
-            subprocess.check_call([config.uncrustify_exe, '--help'],
-                                  stdout=bitbucket)
-    except Exception as exc:
-        msg = ('Specified uncrustify executable {!r} ' +
-               'does not appear to be usable: {!s}').format(
-            config.uncrustify_exe, exc)
-        printc("FAILED: ", msg, **FAIL_ATTRS)
-        sys.exit(-1)
-
-    return args
-
-
-# -----------------------------------------------------------------------------
-def run_tests(tests, args, selector=None):
-    pass_count = 0
-    fail_count = 0
-    mismatch_count = 0
-    unstable_count = 0
-    unexpectedly_passing_count = 0
-
-    for test in tests:
-        if selector is not None and not selector.test(test.test_name):
-            if args.show_all:
-                printc("SKIPPED: ", test.test_name, **SKIP_ATTRS)
-            continue
-
-        try:
-            test.run(args)
-            if args.show_all:
-                outcome = 'XFAILED' if test.test_xfail else 'PASSED'
-                printc('{}: '.format(outcome), test.test_name, **PASS_ATTRS)
-            pass_count += 1
-        except UnstableFailure:
-            unstable_count += 1
-        except MismatchFailure:
-            mismatch_count += 1
-        except UnexpectedlyPassingFailure:
-            unexpectedly_passing_count += 1
-        except Failure:
-            fail_count += 1
-
-    return {
-        'passing': pass_count,
-        'failing': fail_count,
-        'mismatch': mismatch_count,
-        'unstable': unstable_count,
-        'xpass': unexpectedly_passing_count
-    }
-
-
-# -----------------------------------------------------------------------------
-def report(counts):
-    total = sum(counts.values())
-    print('{passing} / {total} tests passed'.format(total=total, **counts))
-    if counts['failing'] > 0:
-        printc('{failing} tests failed to execute'.format(**counts),
-               **FAIL_ATTRS)
-    if counts['mismatch'] > 0:
-        printc(
-            '{mismatch} tests did not match the expected output'.format(
-                **counts),
-            **FAIL_ATTRS)
-    if counts['unstable'] > 0:
-        printc('{unstable} tests were unstable'.format(**counts),
-               **FAIL_ATTRS)
-    if counts['xpass'] > 0:
-        printc('{xpass} tests passed but were expected to fail'
-            .format(**counts), **FAIL_ATTRS)
-
-
-# -----------------------------------------------------------------------------
-def read_format_tests(filename, group):
-    tests = []
-
-    print("Processing " + filename)
-    with open(filename, 'rt') as f:
-        for line_number, line in enumerate(f, 1):
-            line = line.strip()
-            if not len(line):
-                continue
-            if line.startswith('#'):
-                continue
-
-            test = FormatTest()
-            test.build_from_declaration(line, group, line_number)
-            tests.append(test)
-
-    return tests
-
-
-# -----------------------------------------------------------------------------
-def fixup_ctest_path(path, config):
-    if config is None:
-        return path
-
-    dirname, basename = os.path.split(path)
-    if os.path.basename(dirname).lower() == config.lower():
-        dirname, junk = os.path.split(dirname)
-        return os.path.join(dirname, '${CTEST_CONFIGURATION_TYPE}', basename)
-
-    return path
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/tests.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/tests.vpj
deleted file mode 100644
index a5ed4fd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/tests.vpj
+++ /dev/null
@@ -1,354 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-   Version="10.0"
-   VendorName="SlickEdit"
-   WorkingDir=".">
-   <Config
-      Name="Release"
-      OutputFile=""
-      CompilerConfigName="">
-      <Menu>
-         <Target
-            Name="Compile"
-            MenuCaption="&amp;Compile"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveCurrent"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Build"
-            MenuCaption="&amp;Build"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveWorkspaceFiles"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Rebuild"
-            MenuCaption="&amp;Rebuild"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveWorkspaceFiles"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Debug"
-            MenuCaption="&amp;Debug"
-            SaveOption="SaveNone"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Execute"
-            MenuCaption="E&amp;xecute"
-            SaveOption="SaveNone"
-            RunFromDir="%rw">
-            <Exec CmdLine='"tests.exe"'/>
-         </Target>
-      </Menu>
-   </Config>
-   <CustomFolders>
-      <Folder
-         Name="Source Files"
-         Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
-      </Folder>
-      <Folder
-         Name="Header Files"
-         Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-      </Folder>
-      <Folder
-         Name="Resource Files"
-         Filters="*.ico;*.cur;*.dlg"/>
-      <Folder
-         Name="Bitmaps"
-         Filters="*.bmp"/>
-      <Folder
-         Name="Other Files"
-         Filters="">
-      </Folder>
-   </CustomFolders>
-   <Files AutoFolders="DirectoryView">
-      <Folder Name="config">
-         <F N="config/1liner-split.cfg"/>
-         <F N="config/align-1.cfg"/>
-         <F N="config/align-2.cfg"/>
-         <F N="config/align-3.cfg"/>
-         <F N="config/amxmodx.cfg"/>
-         <F N="config/avalon.cfg"/>
-         <F N="config/avalon2.cfg"/>
-         <F N="config/avalon3.cfg"/>
-         <F N="config/avalon4.cfg"/>
-         <F N="config/ben.cfg"/>
-         <F N="config/blc-1.cfg"/>
-         <F N="config/bool-pos-eol.cfg"/>
-         <F N="config/bool-pos-sol.cfg"/>
-         <F N="config/brace-allman.cfg"/>
-         <F N="config/brace-banner.cfg"/>
-         <F N="config/brace-gnu.cfg"/>
-         <F N="config/brace-kr.cfg"/>
-         <F N="config/brace-remove-2.cfg"/>
-         <F N="config/brace-remove-all.cfg"/>
-         <F N="config/brace-ws.cfg"/>
-         <F N="config/brace-ws2.cfg"/>
-         <F N="config/byref-center.cfg"/>
-         <F N="config/byref-left.cfg"/>
-         <F N="config/byref-right.cfg"/>
-         <F N="config/case-1.cfg"/>
-         <F N="config/case-2.cfg"/>
-         <F N="config/case-3.cfg"/>
-         <F N="config/cast-sp-a.cfg"/>
-         <F N="config/cast-sp-r.cfg"/>
-         <F N="config/cast-type.cfg"/>
-         <F N="config/cast-types.txt"/>
-         <F N="config/clark.cfg"/>
-         <F N="config/class-colon-pos-eol-add.cfg"/>
-         <F N="config/class-colon-pos-eol.cfg"/>
-         <F N="config/class-colon-pos-sol-add.cfg"/>
-         <F N="config/class-colon-pos-sol.cfg"/>
-         <F N="config/class-nl_func-add.cfg"/>
-         <F N="config/class-nl_func-del.cfg"/>
-         <F N="config/cpp_to_c-1.cfg"/>
-         <F N="config/cpp_to_c-2.cfg"/>
-         <F N="config/cpp_to_c-3.cfg"/>
-         <F N="config/custom-open.cfg"/>
-         <F N="config/custom-open2.cfg"/>
-         <F N="config/d-tst2.cfg"/>
-         <F N="config/d.cfg"/>
-         <F N="config/d2.cfg"/>
-         <F N="config/empty_body.cfg"/>
-         <F N="config/func-def-1.cfg"/>
-         <F N="config/func-def-2.cfg"/>
-         <F N="config/func-def-3.cfg"/>
-         <F N="config/getset.cfg"/>
-         <F N="config/indent-1.cfg"/>
-         <F N="config/indent.cfg"/>
-         <F N="config/mod-paren.cfg"/>
-         <F N="config/mono.cfg"/>
-         <F N="config/nl-comment.cfg"/>
-         <F N="config/nl_after_func_body-2.cfg"/>
-         <F N="config/nl_after_func_body.cfg"/>
-         <F N="config/nl_class-a.cfg"/>
-         <F N="config/nl_class-r.cfg"/>
-         <F N="config/nl_namespace-a.cfg"/>
-         <F N="config/nl_namespace-r.cfg"/>
-         <F N="config/nl_semicolon.cfg"/>
-         <F N="config/nl_template_class-force.cfg"/>
-         <F N="config/nl_template_class-remove.cfg"/>
-         <F N="config/nl_try-a.cfg"/>
-         <F N="config/op-space-force.cfg"/>
-         <F N="config/op-space-remove.cfg"/>
-         <F N="config/pascal_ptr.cfg"/>
-         <F N="config/pawn-escape.cfg"/>
-         <F N="config/pawn.cfg"/>
-         <F N="config/pp-indent-1.cfg"/>
-         <F N="config/pp-indent-2.cfg"/>
-         <F N="config/pp-indent-3.cfg"/>
-         <F N="config/preproc-cleanup.cfg"/>
-         <F N="config/sim.cfg"/>
-         <F N="config/template_sp-force.cfg"/>
-         <F N="config/template_sp-remove.cfg"/>
-         <F N="config/width-2.cfg"/>
-         <F N="config/width.cfg"/>
-         <F N="config/xml-str.cfg"/>
-      </Folder>
-      <Folder Name="input">
-         <Folder Name="c">
-            <F N="input/c/align-equ.c"/>
-            <F N="input/c/align-struct-init.c"/>
-            <F N="input/c/align-typedef.c"/>
-            <F N="input/c/bool-pos.c"/>
-            <F N="input/c/brace-remove.c"/>
-            <F N="input/c/braces-2.c"/>
-            <F N="input/c/braces-3.c"/>
-            <F N="input/c/braces-4.c"/>
-            <F N="input/c/braces-5.c"/>
-            <F N="input/c/braces.c"/>
-            <F N="input/c/bugs-1.c"/>
-            <F N="input/c/bugs-2.c"/>
-            <F N="input/c/bugs-3.c"/>
-            <F N="input/c/bugs-4.c"/>
-            <F N="input/c/bugs-5.c"/>
-            <F N="input/c/bugs-6.c"/>
-            <F N="input/c/bugs-7.c"/>
-            <F N="input/c/bugs.c"/>
-            <F N="input/c/case.c"/>
-            <F N="input/c/casts.c"/>
-            <F N="input/c/code_width.c"/>
-            <F N="input/c/colon-asm.c"/>
-            <F N="input/c/comment-indent.c"/>
-            <F N="input/c/define-if-indent.c"/>
-            <F N="input/c/dos.c"/>
-            <F N="input/c/enum-struct-init.c"/>
-            <F N="input/c/fcn_type.c"/>
-            <F N="input/c/funcfunc.c"/>
-            <F N="input/c/function-def.c"/>
-            <F N="input/c/global-vars.c"/>
-            <F N="input/c/i2c-core.c"/>
-            <F N="input/c/ifdef-indent.c"/>
-            <F N="input/c/ifdef-nest.c"/>
-            <F N="input/c/indent-assign.c"/>
-            <F N="input/c/mac.c"/>
-            <F N="input/c/minus-minus.c"/>
-            <F N="input/c/nl-semicolon.c"/>
-            <F N="input/c/nl-ver-def.c"/>
-            <F N="input/c/one-liner-init.c"/>
-            <F N="input/c/pascal_ptr.c"/>
-            <F N="input/c/pp-space.c"/>
-            <F N="input/c/return-multi.c"/>
-            <F N="input/c/struct-brace.c"/>
-            <F N="input/c/switch-case.c"/>
-            <F N="input/c/type-cast.c"/>
-            <F N="input/c/vb-do.c"/>
-            <F N="input/c/xml.c"/>
-         </Folder>
-         <Folder Name="cpp">
-            <F N="input/cpp/align-func-params.cpp"/>
-            <F N="input/cpp/alt_tokens.cpp"/>
-            <F N="input/cpp/bool.cpp"/>
-            <F N="input/cpp/byref.cpp"/>
-            <F N="input/cpp/class-init.cpp"/>
-            <F N="input/cpp/class.h"/>
-            <F N="input/cpp/constructor.cpp"/>
-            <F N="input/cpp/cout.cpp"/>
-            <F N="input/cpp/ctor-var.cpp"/>
-            <F N="input/cpp/custom-open.cpp"/>
-            <F N="input/cpp/Example.h"/>
-            <F N="input/cpp/exception.cpp"/>
-            <F N="input/cpp/extern_c.h"/>
-            <F N="input/cpp/function-def.cpp"/>
-            <F N="input/cpp/misc.cpp"/>
-            <F N="input/cpp/misc2.cpp"/>
-            <F N="input/cpp/nl-class.h"/>
-            <F N="input/cpp/nl-namespace.h"/>
-            <F N="input/cpp/nl_func.cpp"/>
-            <F N="input/cpp/operator.cpp"/>
-            <F N="input/cpp/sim.h"/>
-            <F N="input/cpp/strings.cpp"/>
-            <F N="input/cpp/templ_class.h"/>
-            <F N="input/cpp/templates.cpp"/>
-            <F N="input/cpp/Timestamp.h"/>
-         </Folder>
-         <Folder Name="cs">
-            <F N="input/cs/getset.cs"/>
-            <F N="input/cs/region.cs"/>
-            <F N="input/cs/simple.cs"/>
-            <F N="input/cs/var-member.cs"/>
-         </Folder>
-         <Folder Name="d">
-            <F N="input/d/bug-indent.d"/>
-            <F N="input/d/casts.d"/>
-            <F N="input/d/delegate.d"/>
-            <F N="input/d/funcfunc.d"/>
-            <F N="input/d/HashMap.d"/>
-            <F N="input/d/imports.d"/>
-            <F N="input/d/Lexer.d"/>
-            <F N="input/d/numbers.d"/>
-            <F N="input/d/strings.d"/>
-            <F N="input/d/template.d"/>
-            <F N="input/d/tst01.d"/>
-            <F N="input/d/tst02.d"/>
-            <F N="input/d/volatile-1.d"/>
-            <F N="input/d/volatile-2.d"/>
-            <F N="input/d/volatile-3.d"/>
-            <F N="input/d/volatile.d"/>
-         </Folder>
-         <Folder Name="oc">
-            <F N="input/oc/Fraction.h"/>
-            <F N="input/oc/Fraction.m"/>
-            <F N="input/oc/main.m"/>
-         </Folder>
-         <Folder Name="pawn">
-            <F N="input/pawn/comment.p"/>
-            <F N="input/pawn/enum.pawn"/>
-            <F N="input/pawn/functions.pawn"/>
-            <F N="input/pawn/rpn_calc.pawn"/>
-            <F N="input/pawn/str-escape.p"/>
-            <F N="input/pawn/tags.pawn"/>
-            <F N="input/pawn/test1.pawn"/>
-            <F N="input/pawn/traffic.p"/>
-            <F N="input/pawn/unbraced.p"/>
-         </Folder>
-         <Folder Name="sql">
-            <F N="input/sql/mysql.sqc"/>
-            <F N="input/sql/sta-select.sqc"/>
-         </Folder>
-      </Folder>
-      <Folder Name="output">
-         <Folder Name="c">
-            <F N="output/c/00000-comment-indent.c"/>
-            <F N="output/c/00010-braces.c"/>
-            <F N="output/c/00011-braces.c"/>
-            <F N="output/c/00012-braces.c"/>
-            <F N="output/c/00013-braces.c"/>
-            <F N="output/c/00014-braces.c"/>
-            <F N="output/c/00015-braces.c"/>
-            <F N="output/c/00020-define-if-indent.c"/>
-            <F N="output/c/00060-braces-2.c"/>
-            <F N="output/c/00061-braces-3.c"/>
-            <F N="output/c/00062-braces-4.c"/>
-            <F N="output/c/00065-braces-5.c"/>
-            <F N="output/c/00101-bugs-1.c"/>
-            <F N="output/c/00102-bugs-2.c"/>
-            <F N="output/c/00103-bugs-3.c"/>
-            <F N="output/c/00104-bugs-4.c"/>
-            <F N="output/c/00105-bugs-5.c"/>
-            <F N="output/c/00106-bugs-6.c"/>
-            <F N="output/c/00130-minus-minus.c"/>
-            <F N="output/c/00150-casts.c"/>
-            <F N="output/c/00301-align-struct-init.c"/>
-            <F N="output/c/00401-align-equ.c"/>
-            <F N="output/c/00411-align-typedef.c"/>
-            <F N="output/c/00600-dos.c"/>
-            <F N="output/c/00601-mac.c"/>
-            <F N="output/c/00901-code_width.c"/>
-            <F N="output/c/00910-pascal_ptr.c"/>
-         </Folder>
-         <Folder Name="cpp">
-            <F N="output/cpp/30000-cout.cpp"/>
-            <F N="output/cpp/30001-alt_tokens.cpp"/>
-            <F N="output/cpp/30002-constructor.cpp"/>
-            <F N="output/cpp/30003-strings.cpp"/>
-            <F N="output/cpp/30010-class.h"/>
-            <F N="output/cpp/30020-bool.cpp"/>
-            <F N="output/cpp/30021-byref.cpp"/>
-            <F N="output/cpp/30022-extern_c.h"/>
-            <F N="output/cpp/30031-operator.cpp"/>
-         </Folder>
-         <Folder Name="cs">
-            <F N="output/cs/10000-simple.cs"/>
-         </Folder>
-         <Folder Name="d">
-            <F N="output/d/40000-HashMap.d"/>
-            <F N="output/d/40001-imports.d"/>
-            <F N="output/d/40002-volatile.d"/>
-            <F N="output/d/40003-volatile-1.d"/>
-            <F N="output/d/40004-volatile-2.d"/>
-            <F N="output/d/40005-volatile-3.d"/>
-            <F N="output/d/40010-template.d"/>
-         </Folder>
-         <Folder Name="pawn">
-            <F N="output/pawn/60000-functions.pawn"/>
-            <F N="output/pawn/60001-comment.p"/>
-            <F N="output/pawn/60002-traffic.p"/>
-            <F N="output/pawn/60003-tags.pawn"/>
-            <F N="output/pawn/60004-enum.pawn"/>
-            <F N="output/pawn/60005-unbraced.p"/>
-            <F N="output/pawn/60010-str-escape.p"/>
-         </Folder>
-      </Folder>
-      <F N="c-sharp.test"/>
-      <F N="c.test"/>
-      <F N="cpp.test"/>
-      <F N="d.test"/>
-      <F N="difftest.sh"/>
-      <F N="java.test"/>
-      <F N="objective-c.test"/>
-      <F N="pawn.test"/>
-      <F N="run_tests.py"/>
-   </Files>
-   <CompatibleVersions>
-      <PrevVersion VersionNumber="9.0"/>
-      <PrevVersion VersionNumber="9.1"/>
-   </CompatibleVersions>
-</Project>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/vala.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/vala.test
deleted file mode 100644
index d2305595..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/vala.test
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Test cases specifically for the Vala language.
-#
-# Range: 70000 - 79999
-# test.name  config.file  input.file
-
-70000  ben_100.cfg                          vala/list.vala
-70001  ben_101.cfg                          vala/advanced.vala
-70010  ben_102.cfg                          vala/verbatim_str.vala
-70011  ben_103.cfg                          vala/verbatim_str2.vala
-70012  ben2.cfg                             vala/verbatim_str2.vala
-70020  ben_104.cfg                          vala/preproc.vala
-70287  ben_105.cfg                          vala/gh287.vala
-70300  Issue_2090.cfg                       vala/Issue_2090.vala
-70301  Issue_2270.cfg                       vala/Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpj
deleted file mode 100644
index 97b2b50a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpj
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-   Version="10.0"
-   VendorName="SlickEdit"
-   WorkingDir=".">
-   <Config
-      Name="Release"
-      OutputFile=""
-      CompilerConfigName="">
-      <Menu>
-         <Target
-            Name="Compile"
-            MenuCaption="&amp;Compile"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveCurrent"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Build"
-            MenuCaption="&amp;Build"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveWorkspaceFiles"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Rebuild"
-            MenuCaption="&amp;Rebuild"
-            CaptureOutputWith="ProcessBuffer"
-            SaveOption="SaveWorkspaceFiles"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Debug"
-            MenuCaption="&amp;Debug"
-            SaveOption="SaveNone"
-            RunFromDir="%rw">
-            <Exec/>
-         </Target>
-         <Target
-            Name="Execute"
-            MenuCaption="E&amp;xecute"
-            SaveOption="SaveNone"
-            RunFromDir="%rw">
-            <Exec CmdLine='"uncrustify.exe"'/>
-         </Target>
-      </Menu>
-   </Config>
-   <Files>
-      <Folder
-         Name="Source Files"
-         Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
-         <F N="src/align.cpp"/>
-         <F N="src/align_stack.cpp"/>
-         <F N="src/args.cpp"/>
-         <F N="src/backup.cpp"/>
-         <F N="src/brace_cleanup.cpp"/>
-         <F N="src/braces.cpp"/>
-         <F N="src/chunk_list.cpp"/>
-         <F N="src/ChunkStack.cpp"/>
-         <F N="src/combine.cpp"/>
-         <F N="src/compat_posix.cpp"/>
-         <F N="src/compat_win32.cpp"/>
-         <F N="src/defines.cpp"/>
-         <F N="src/detect.cpp"/>
-         <F N="src/indent.cpp"/>
-         <F N="src/keywords.cpp"/>
-         <F N="src/lang_pawn.cpp"/>
-         <F N="src/logger.cpp"/>
-         <F N="src/logmask.cpp"/>
-         <F N="src/md5.cpp"/>
-         <F N="src/newlines.cpp"/>
-         <F N="src/options.cpp"/>
-         <F N="src/output.cpp"/>
-         <F N="src/parens.cpp"/>
-         <F N="src/parse_frame.cpp"/>
-         <F N="src/punctuators.cpp"/>
-         <F N="src/semicolons.cpp"/>
-         <F N="src/sorting.cpp"/>
-         <F N="src/space.cpp"/>
-         <F N="src/tokenize.cpp"/>
-         <F N="src/tokenize_cleanup.cpp"/>
-         <F N="src/unc_text.cpp"/>
-         <F N="src/uncrustify.cpp"/>
-         <F N="src/unicode.cpp"/>
-         <F N="src/universalindentgui.cpp"/>
-         <F N="src/width.cpp"/>
-      </Folder>
-      <Folder
-         Name="Header Files"
-         Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-         <F N="src/align_stack.h"/>
-         <F N="src/args.h"/>
-         <F N="src/backup.h"/>
-         <F N="src/base_types.h"/>
-         <F N="src/char_table.h"/>
-         <F N="src/chunk_list.h"/>
-         <F N="src/ChunkStack.h"/>
-         <F N="src/config.h"/>
-         <F N="src/ListManager.h"/>
-         <F N="src/log_levels.h"/>
-         <F N="src/logger.h"/>
-         <F N="src/logmask.h"/>
-         <F N="src/md5.h"/>
-         <F N="src/options.h"/>
-         <F N="src/prototypes.h"/>
-         <F N="src/punctuators.h"/>
-         <F N="src/token_enum.h"/>
-         <F N="src/token_names.h"/>
-         <F N="src/unc_ctype.h"/>
-         <F N="src/unc_text.h"/>
-         <F N="src/uncrustify_types.h"/>
-         <F N="src/uncrustify_version.h"/>
-         <F N="win32/windows_compat.h"/>
-      </Folder>
-      <Folder
-         Name="Other Files"
-         Filters="">
-         <F N="src/config.h.in"/>
-         <F N="src/Makefile.am"/>
-         <F N="src/uncrustify_version.h.in"/>
-      </Folder>
-   </Files>
-   <CompatibleVersions>
-      <PrevVersion VersionNumber="9.0"/>
-      <PrevVersion VersionNumber="9.1"/>
-   </CompatibleVersions>
-</Project>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpw b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpw
deleted file mode 100644
index 245d8153..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpw
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE Workspace SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpw.dtd">
-<Workspace Version="10.0" VendorName="SlickEdit">
-	<Projects>
-		<Project File="extras.vpj"/>
-		<Project File="tests/tests.vpj"/>
-		<Project File="uncrustify.vpj"/>
-	</Projects>
-	<CompatibleVersions>
-		<PrevVersion VersionNumber="9.0"/>
-		<PrevVersion VersionNumber="9.1"/>
-	</CompatibleVersions>
-</Workspace>